Replace "@return a blah" and "@return the blah" with just "@return blah"

36 files changed, 168 insertions, 168 deletions

diff --git a/src/algo_factory/algo_cache.h b/src/algo_factory/algo_cache.h
index ad8d41383..376af130b 100644
--- a/src/algo_factory/algo_cache.h
+++ b/src/algo_factory/algo_cache.h
@@ -32,7 +32,7 @@ class Algorithm_Cache
       /**
       * @param algo_spec names the requested algorithm
       * @param pref_provider suggests a preferred provider
-      * @return a prototype object, or NULL
+      * @return prototype object, or NULL
       */
       const T* get(const std::string& algo_spec,
                    const std::string& pref_provider);
diff --git a/src/alloc/secmem.h b/src/alloc/secmem.h
index d1a3ba7bd..39b5549a9 100644
--- a/src/alloc/secmem.h
+++ b/src/alloc/secmem.h
@@ -24,7 +24,7 @@ class MemoryRegion
       /**
       * Find out the size of the buffer, i.e. how many objects of type T it
       * contains.
-      * @return the size of the buffer
+      * @return size of the buffer
       */
       u32bit size() const { return used; }
 
@@ -36,37 +36,37 @@ class MemoryRegion
 
       /**
       * Get a pointer to the first element in the buffer.
-      * @return a pointer to the first element in the buffer
+      * @return pointer to the first element in the buffer
       */
       operator T* () { return buf; }
 
       /**
       * Get a constant pointer to the first element in the buffer.
-      * @return a constant pointer to the first element in the buffer
+      * @return constant pointer to the first element in the buffer
       */
       operator const T* () const { return buf; }
 
       /**
       * Get a pointer to the first element in the buffer.
-      * @return a pointer to the first element in the buffer
+      * @return pointer to the first element in the buffer
       */
       T* begin() { return buf; }
 
       /**
       * Get a constant pointer to the first element in the buffer.
-      * @return a constant pointer to the first element in the buffer
+      * @return constant pointer to the first element in the buffer
       */
       const T* begin() const { return buf; }
 
       /**
       * Get a pointer to the last element in the buffer.
-      * @return a pointer to the last element in the buffer
+      * @return pointer to the last element in the buffer
       */
       T* end() { return (buf + size()); }
 
       /**
       * Get a constant pointer to the last element in the buffer.
-      * @return a constant pointer to the last element in the buffer
+      * @return constant pointer to the last element in the buffer
       */
       const T* end() const { return (buf + size()); }
 
@@ -98,7 +98,7 @@ class MemoryRegion
       * Copy the contents of another buffer into this buffer.
       * The former contents of *this are discarded.
       * @param other the buffer to copy the contents from.
-      * @return a reference to *this
+      * @return reference to *this
       */
       MemoryRegion<T>& operator=(const MemoryRegion<T>& other)
          { if(this != &other) set(other); return (*this); }
@@ -299,7 +299,7 @@ class MemoryVector : public MemoryRegion<T>
       /**
       * Copy the contents of another buffer into this buffer.
       * @param in the buffer to copy the contents from
-      * @return a reference to *this
+      * @return reference to *this
       */
       MemoryVector<T>& operator=(const MemoryRegion<T>& in)
          { if(this != &in) set(in); return (*this); }
@@ -352,7 +352,7 @@ class SecureVector : public MemoryRegion<T>
       /**
       * Copy the contents of another buffer into this buffer.
       * @param in the buffer to copy the contents from
-      * @return a reference to *this
+      * @return reference to *this
       */
       SecureVector<T>& operator=(const MemoryRegion<T>& in)
          { if(this != &in) set(in); return (*this); }
diff --git a/src/asn1/asn1_oid.h b/src/asn1/asn1_oid.h
index e6d077bee..b3db97744 100644
--- a/src/asn1/asn1_oid.h
+++ b/src/asn1/asn1_oid.h
@@ -31,13 +31,13 @@ class BOTAN_DLL OID : public ASN1_Object
 
       /**
       * Get this OID as list (vector) of its components.
-      * @return a vector representing this OID
+      * @return vector representing this OID
       */
       std::vector<u32bit> get_id() const { return id; }
 
       /**
       * Get this OID as a string
-      * @return a string representing this OID
+      * @return string representing this OID
       */
       std::string as_string() const;
 
@@ -55,7 +55,7 @@ class BOTAN_DLL OID : public ASN1_Object
       /**
       * Add a component to this OID.
       * @param new_comp the new component to add to the end of this OID
-      * @return a reference to *this
+      * @return reference to *this
       */
       OID& operator+=(u32bit new_comp);
 
diff --git a/src/block/block_cipher.h b/src/block/block_cipher.h
index 73c72a9e4..c1b58996e 100644
--- a/src/block/block_cipher.h
+++ b/src/block/block_cipher.h
@@ -40,12 +40,12 @@ class BOTAN_DLL BlockCipher : public SymmetricAlgorithm
       const u32bit BLOCK_SIZE;
 
       /**
-      * @return the native parallelism of this cipher in blocks
+      * @return native parallelism of this cipher in blocks
       */
       virtual u32bit parallelism() const { return 1; }
 
       /**
-      * @return the prefererred parallelism of this cipher in bytes
+      * @return prefererred parallelism of this cipher in bytes
       */
       u32bit parallel_bytes() const
          {
diff --git a/src/block/gost_28147/gost_28147.h b/src/block/gost_28147/gost_28147.h
index dbea932a0..ec23466f4 100644
--- a/src/block/gost_28147/gost_28147.h
+++ b/src/block/gost_28147/gost_28147.h
@@ -24,7 +24,7 @@ class BOTAN_DLL GOST_28147_89_Params
       /**
       * @param row the row
       * @param col the column
-      * @return the sbox entry at this row/column
+      * @return sbox entry at this row/column
       */
       byte sbox_entry(u32bit row, u32bit col) const;
 
diff --git a/src/cert/cvc/eac_asn_obj.h b/src/cert/cvc/eac_asn_obj.h
index 9eaf02f63..d0bab6fdd 100644
--- a/src/cert/cvc/eac_asn_obj.h
+++ b/src/cert/cvc/eac_asn_obj.h
@@ -26,13 +26,13 @@ class BOTAN_DLL EAC_Time : public ASN1_Object
 
       /**
       * Get a this objects value as a string.
-      * @return the date string
+      * @return date string
       */
       std::string as_string() const;
 
       /**
       * Get a this objects value as a readable formatted string.
-      * @return the date string
+      * @return date string
       */
       std::string readable_string() const;
 
@@ -72,19 +72,19 @@ class BOTAN_DLL EAC_Time : public ASN1_Object
 
       /**
       * Get the year value of this objects.
-      * @return the year value
+      * @return year value
       */
       u32bit get_year() const;
 
       /**
       * Get the month value of this objects.
-      * @return the month value
+      * @return month value
       */
       u32bit get_month() const;
 
       /**
       * Get the day value of this objects.
-      * @return the day value
+      * @return day value
       */
       u32bit get_day() const;
 
@@ -174,13 +174,13 @@ class BOTAN_DLL ASN1_EAC_String: public ASN1_Object
 
       /**
       * Get this objects string value.
-      * @return the string value
+      * @return string value
       */
       std::string value() const;
 
       /**
       * Get this objects string value.
-      * @return the string value in iso8859 encoding
+      * @return string value in iso8859 encoding
       */
       std::string iso_8859() const;
 
diff --git a/src/cert/cvc/signed_obj.h b/src/cert/cvc/signed_obj.h
index c0ae2cfc5..0c0fb30af 100644
--- a/src/cert/cvc/signed_obj.h
+++ b/src/cert/cvc/signed_obj.h
@@ -24,7 +24,7 @@ class BOTAN_DLL EAC_Signed_Object
    public:
       /**
       * Get the TBS (to-be-signed) data in this object.
-      * @return the DER encoded TBS data of this object
+      * @return DER encoded TBS data of this object
       */
       virtual SecureVector<byte> tbs_data() const = 0;
 
@@ -32,7 +32,7 @@ class BOTAN_DLL EAC_Signed_Object
       * Get the signature of this object as a concatenation, i.e. if the
       * signature consists of multiple parts (like in the case of ECDSA)
       * these will be concatenated.
-      * @return the signature as a concatenation of its parts
+      * @return signature as a concatenation of its parts
       */
 
       /*
@@ -67,13 +67,13 @@ class BOTAN_DLL EAC_Signed_Object
 
       /**
       * BER encode this object.
-      * @return the result containing the BER representation of this object.
+      * @return result containing the BER representation of this object.
       */
       SecureVector<byte> BER_encode() const;
 
       /**
       * PEM encode this object.
-      * @return the result containing the PEM representation of this object.
+      * @return result containing the PEM representation of this object.
       */
       std::string PEM_encode() const;
 
diff --git a/src/cert/x509/crl_ent.h b/src/cert/x509/crl_ent.h
index 2b06189e4..ec90750db 100644
--- a/src/cert/x509/crl_ent.h
+++ b/src/cert/x509/crl_ent.h
@@ -23,19 +23,19 @@ class BOTAN_DLL CRL_Entry : public ASN1_Object
 
       /**
       * Get the serial number of the certificate associated with this entry.
-      * @return the certificate's serial number
+      * @return certificate's serial number
       */
       MemoryVector<byte> serial_number() const { return serial; }
 
       /**
       * Get the revocation date of the certificate associated with this entry
-      * @return the certificate's revocation date
+      * @return certificate's revocation date
       */
       X509_Time expire_time() const { return time; }
 
       /**
       * Get the entries reason code
-      * @return the reason code
+      * @return reason code
       */
       CRL_Code reason_code() const { return reason; }
 
diff --git a/src/cert/x509/pkcs10.h b/src/cert/x509/pkcs10.h
index 9b435de52..d1be9e0d3 100644
--- a/src/cert/x509/pkcs10.h
+++ b/src/cert/x509/pkcs10.h
@@ -23,38 +23,38 @@ class BOTAN_DLL PKCS10_Request : public X509_Object
    public:
       /**
       * Get the subject public key.
-      * @return the subject public key
+      * @return subject public key
       */
       Public_Key* subject_public_key() const;
 
       /**
       * Get the raw DER encoded public key.
-      * @return the raw DER encoded public key
+      * @return raw DER encoded public key
       */
       MemoryVector<byte> raw_public_key() const;
 
       /**
       * Get the subject DN.
-      * @return the subject DN
+      * @return subject DN
       */
       X509_DN subject_dn() const;
 
       /**
       * Get the subject alternative name.
-      * @return the subject alternative name.
+      * @return subject alternative name.
       */
       AlternativeName subject_alt_name() const;
 
       /**
       * Get the key constraints for the key associated with this
       * PKCS#10 object.
-      * @return the key constraints
+      * @return key constraints
       */
       Key_Constraints constraints() const;
 
       /**
       * Get the extendend key constraints (if any).
-      * @return the extended key constraints
+      * @return extended key constraints
       */
       std::vector<OID> ex_constraints() const;
 
@@ -67,13 +67,13 @@ class BOTAN_DLL PKCS10_Request : public X509_Object
       /**
       * Return the constraint on the path length defined
       * in the BasicConstraints extension.
-      * @return the path limit
+      * @return path limit
       */
       u32bit path_limit() const;
 
       /**
       * Get the challenge password for this request
-      * @return the challenge password for this request
+      * @return challenge password for this request
       */
       std::string challenge_password() const;
 
diff --git a/src/cert/x509/x509_ca.h b/src/cert/x509/x509_ca.h
index 6f36444ee..97be6a415 100644
--- a/src/cert/x509/x509_ca.h
+++ b/src/cert/x509/x509_ca.h
@@ -30,7 +30,7 @@ class BOTAN_DLL X509_CA
       * @param rng the rng to use
       * @param not_before the starting time for the certificate
       * @param not_after the expiration time for the certificate
-      * @return the resulting certificate
+      * @return resulting certificate
       */
       X509_Certificate sign_request(const PKCS10_Request& req,
                                     RandomNumberGenerator& rng,
@@ -39,7 +39,7 @@ class BOTAN_DLL X509_CA
 
       /**
       * Get the certificate of this CA.
-      * @return the CA certificate
+      * @return CA certificate
       */
       X509_Certificate ca_certificate() const;
 
@@ -48,7 +48,7 @@ class BOTAN_DLL X509_CA
       * @param rng the random number generator to use
       * @param next_update the time to set in next update in seconds
       * as the offset from the current time
-      * @return the new CRL
+      * @return new CRL
       */
       X509_CRL new_crl(RandomNumberGenerator& rng,
                        u32bit next_update = 0) const;
diff --git a/src/cert/x509/x509_crl.h b/src/cert/x509/x509_crl.h
index 74427fbef..c2b3c4f5c 100644
--- a/src/cert/x509/x509_crl.h
+++ b/src/cert/x509/x509_crl.h
@@ -31,13 +31,13 @@ class BOTAN_DLL X509_CRL : public X509_Object
 
       /**
       * Get the entries of this CRL in the form of a vector.
-      * @return a vector containing the entries of this CRL.
+      * @return vector containing the entries of this CRL.
       */
       std::vector<CRL_Entry> get_revoked() const;
 
       /**
       * Get the issuer DN of this CRL.
-      * @return the CRLs issuer DN
+      * @return CRLs issuer DN
       */
       X509_DN issuer_dn() const;
 
@@ -49,19 +49,19 @@ class BOTAN_DLL X509_CRL : public X509_Object
 
       /**
       * Get the serial number of this CRL.
-      * @return the CRLs serial number
+      * @return CRLs serial number
       */
       u32bit crl_number() const;
 
       /**
       * Get the CRL's thisUpdate value.
-      * @return the CRLs thisUpdate
+      * @return CRLs thisUpdate
       */
       X509_Time this_update() const;
 
       /**
       * Get the CRL's nextUpdate value.
-      * @return the CRLs nextdUpdate
+      * @return CRLs nextdUpdate
       */
       X509_Time next_update() const;
 
diff --git a/src/cert/x509/x509_obj.h b/src/cert/x509/x509_obj.h
index c7f92fa9d..52b76d218 100644
--- a/src/cert/x509/x509_obj.h
+++ b/src/cert/x509/x509_obj.h
@@ -33,7 +33,7 @@ class BOTAN_DLL X509_Object
       * @param rng the random number generator to use
       * @param alg_id the algorithm identifier of the signature scheme
       * @param tbs the tbs bits to be signed
-      * @return the signed X509 object
+      * @return signed X509 object
       */
       static MemoryVector<byte> make_signed(class PK_Signer* signer,
                                             RandomNumberGenerator& rng,
diff --git a/src/cert/x509/x509cert.h b/src/cert/x509/x509cert.h
index 4a9d11f7f..dc7ef4dbb 100644
--- a/src/cert/x509/x509cert.h
+++ b/src/cert/x509/x509cert.h
@@ -24,19 +24,19 @@ class BOTAN_DLL X509_Certificate : public X509_Object
    public:
      /**
      * Get the public key associated with this certificate.
-     * @return the subject public key of this certificate
+     * @return subject public key of this certificate
      */
       Public_Key* subject_public_key() const;
 
       /**
       * Get the issuer certificate DN.
-      * @return the issuer DN of this certificate
+      * @return issuer DN of this certificate
       */
       X509_DN issuer_dn() const;
 
       /**
       * Get the subject certificate DN.
-      * @return the subject DN of this certificate
+      * @return subject DN of this certificate
       */
       X509_DN subject_dn() const;
 
@@ -50,7 +50,7 @@ class BOTAN_DLL X509_Certificate : public X509_Object
       * "X509v3.BasicConstraints.is_ca", "X509v3.ExtendedKeyUsage",
       * "X509v3.CertificatePolicies", "X509v3.SubjectKeyIdentifier" or
       * "X509.Certificate.serial".
-      * @return the value(s) of the specified parameter
+      * @return value(s) of the specified parameter
       */
       std::vector<std::string> subject_info(const std::string& name) const;
 
@@ -58,43 +58,43 @@ class BOTAN_DLL X509_Certificate : public X509_Object
       * Get a value for a specific subject_info parameter name.
       * @param name the name of the paramter to look up. Possible names are
       * "X509.Certificate.v2.key_id" or "X509v3.AuthorityKeyIdentifier".
-      * @return the value(s) of the specified parameter
+      * @return value(s) of the specified parameter
       */
       std::vector<std::string> issuer_info(const std::string& name) const;
 
       /**
       * Get the notBefore of the certificate.
-      * @return the notBefore of the certificate
+      * @return notBefore of the certificate
       */
       std::string start_time() const;
 
       /**
       * Get the notAfter of the certificate.
-      * @return the notAfter of the certificate
+      * @return notAfter of the certificate
       */
       std::string end_time() const;
 
       /**
       * Get the X509 version of this certificate object.
-      * @return the X509 version
+      * @return X509 version
       */
       u32bit x509_version() const;
 
       /**
       * Get the serial number of this certificate.
-      * @return the certificates serial number
+      * @return certificates serial number
       */
       MemoryVector<byte> serial_number() const;
 
       /**
       * Get the DER encoded AuthorityKeyIdentifier of this certificate.
-      * @return the DER encoded AuthorityKeyIdentifier
+      * @return DER encoded AuthorityKeyIdentifier
       */
       MemoryVector<byte> authority_key_id() const;
 
       /**
       * Get the DER encoded SubjectKeyIdentifier of this certificate.
-      * @return the DER encoded SubjectKeyIdentifier
+      * @return DER encoded SubjectKeyIdentifier
       */
       MemoryVector<byte> subject_key_id() const;
 
@@ -113,14 +113,14 @@ class BOTAN_DLL X509_Certificate : public X509_Object
       /**
       * Get the path limit as defined in the BasicConstraints extension of
       * this certificate.
-      * @return the path limit
+      * @return path limit
       */
       u32bit path_limit() const;
 
       /**
       * Get the key constraints as defined in the KeyUsage extension of this
       * certificate.
-      * @return the key constraints
+      * @return key constraints
       */
       Key_Constraints constraints() const;
 
@@ -128,14 +128,14 @@ class BOTAN_DLL X509_Certificate : public X509_Object
       * Get the key constraints as defined in the ExtendedKeyUsage
       * extension of this
       * certificate.
-      * @return the key constraints
+      * @return key constraints
       */
       std::vector<std::string> ex_constraints() const;
 
       /**
       * Get the policies as defined in the CertificatePolicies extension
       * of this certificate.
-      * @return the certificate policies
+      * @return certificate policies
       */
       std::vector<std::string> policies() const;
 
diff --git a/src/cert/x509/x509self.h b/src/cert/x509/x509self.h
index 741350067..df5731050 100644
--- a/src/cert/x509/x509self.h
+++ b/src/cert/x509/x509self.h
@@ -174,7 +174,7 @@ namespace X509 {
 * associated with this self-signed certificate
 * @param hash_fn the hash function to use
 * @param rng the rng to use
-* @return the newly created self-signed certificate
+* @return newly created self-signed certificate
 */
 BOTAN_DLL X509_Certificate
 create_self_signed_cert(const X509_Cert_Options& opts,
@@ -188,7 +188,7 @@ create_self_signed_cert(const X509_Cert_Options& opts,
 * @param key the key used to sign this request
 * @param rng the rng to use
 * @param hash_fn the hash function to use
-* @return the newly created PKCS#10 request
+* @return newly created PKCS#10 request
 */
 BOTAN_DLL PKCS10_Request create_cert_req(const X509_Cert_Options& opts,
                                          const Private_Key& key,
diff --git a/src/filters/data_src.h b/src/filters/data_src.h
index c69aa84b0..bf3bfa99b 100644
--- a/src/filters/data_src.h
+++ b/src/filters/data_src.h
@@ -26,7 +26,7 @@ class BOTAN_DLL DataSource
       *
       * @param out the byte array to write the result to
       * @param length the length of the byte array out
-      * @return the length in bytes that was actually read and put
+      * @return length in bytes that was actually read and put
       * into out
       */
       virtual u32bit read(byte out[], u32bit length) = 0;
@@ -39,7 +39,7 @@ class BOTAN_DLL DataSource
       * @param out the byte array to write the output to
       * @param length the length of the byte array out
       * @param peek_offset the offset into the stream to read at
-      * @return the length in bytes that was actually read and put
+      * @return length in bytes that was actually read and put
       * into out
       */
       virtual u32bit peek(byte out[], u32bit length,
@@ -59,7 +59,7 @@ class BOTAN_DLL DataSource
       /**
       * Read one byte.
       * @param out the byte to read to
-      * @return the length in bytes that was actually read and put
+      * @return length in bytes that was actually read and put
       * into out
       */
       u32bit read_byte(byte& out);
@@ -67,7 +67,7 @@ class BOTAN_DLL DataSource
       /**
       * Peek at one byte.
       * @param out an output byte
-      * @return the length in bytes that was actually read and put
+      * @return length in bytes that was actually read and put
       * into out
       */
       u32bit peek_byte(byte& out) const;
@@ -75,7 +75,7 @@ class BOTAN_DLL DataSource
       /**
       * Discard the next N bytes of the data
       * @param N the number of bytes to discard
-      * @return the number of bytes actually discarded
+      * @return number of bytes actually discarded
       */
       u32bit discard_next(u32bit N);
 
diff --git a/src/filters/pipe.h b/src/filters/pipe.h
index 4f66b51d9..b7f09199b 100644
--- a/src/filters/pipe.h
+++ b/src/filters/pipe.h
@@ -116,7 +116,7 @@ class BOTAN_DLL Pipe : public DataSource
       * Find out how many bytes are ready to read.
       * @param msg the number identifying the message
       * for which the information is desired
-      * @return the number of bytes that can still be read
+      * @return number of bytes that can still be read
       */
       u32bit remaining(message_id msg = DEFAULT_MESSAGE) const;
 
@@ -127,7 +127,7 @@ class BOTAN_DLL Pipe : public DataSource
       *
       * @param output the byte array to write the read bytes to
       * @param length the length of the byte array output
-      * @return the number of bytes actually read into output
+      * @return number of bytes actually read into output
       */
       u32bit read(byte output[], u32bit length);
 
@@ -138,7 +138,7 @@ class BOTAN_DLL Pipe : public DataSource
       * @param output the byte array to write the read bytes to
       * @param length the length of the byte array output
       * @param msg the number identifying the message to read from
-      * @return the number of bytes actually read into output
+      * @return number of bytes actually read into output
       */
       u32bit read(byte output[], u32bit length, message_id msg);
 
@@ -149,21 +149,21 @@ class BOTAN_DLL Pipe : public DataSource
       *
       * @param output the byte to write the result to
       * @param msg the message to read from
-      * @return the number of bytes actually read into output
+      * @return number of bytes actually read into output
       */
       u32bit read(byte& output, message_id msg = DEFAULT_MESSAGE);
 
       /**
       * Read the full contents of the pipe.
       * @param msg the number identifying the message to read from
-      * @return a SecureVector holding the contents of the pipe
+      * @return SecureVector holding the contents of the pipe
       */
       SecureVector<byte> read_all(message_id msg = DEFAULT_MESSAGE);
 
       /**
       * Read the full contents of the pipe.
       * @param msg the number identifying the message to read from
-      * @return a string holding the contents of the pipe
+      * @return string holding the contents of the pipe
       */
       std::string read_all_as_string(message_id = DEFAULT_MESSAGE);
 
@@ -173,7 +173,7 @@ class BOTAN_DLL Pipe : public DataSource
       * @param output the byte array to write the peeked message part to
       * @param length the length of the byte array output
       * @param offset the offset from the current position in message
-      * @return the number of bytes actually peeked and written into output
+      * @return number of bytes actually peeked and written into output
       */
       u32bit peek(byte output[], u32bit length, u32bit offset) const;
 
@@ -184,7 +184,7 @@ class BOTAN_DLL Pipe : public DataSource
       * @param length the length of the byte array output
       * @param offset the offset from the current position in message
       * @param msg the number identifying the message to peek from
-      * @return the number of bytes actually peeked and written into output
+      * @return number of bytes actually peeked and written into output
       */
       u32bit peek(byte output[], u32bit length,
                   u32bit offset, message_id msg) const;
@@ -195,7 +195,7 @@ class BOTAN_DLL Pipe : public DataSource
       * @param output the byte to write the peeked message byte to
       * @param offset the offset from the current position in message
       * @param msg the number identifying the message to peek from
-      * @return the number of bytes actually peeked and written into output
+      * @return number of bytes actually peeked and written into output
       */
       u32bit peek(byte& output, u32bit offset,
                   message_id msg = DEFAULT_MESSAGE) const;
@@ -214,7 +214,7 @@ class BOTAN_DLL Pipe : public DataSource
 
       /**
       * Get the number of messages the are in this pipe.
-      * @return the number of messages the are in this pipe
+      * @return number of messages the are in this pipe
       */
       message_id message_count() const;
 
diff --git a/src/hash/hash.h b/src/hash/hash.h
index 4f753f765..cdf90f184 100644
--- a/src/hash/hash.h
+++ b/src/hash/hash.h
@@ -31,7 +31,7 @@ class BOTAN_DLL HashFunction : public BufferedComputation
 
       /**
       * Get the name of this algorithm.
-      * @return the name of this algorithm
+      * @return name of this algorithm
       */
       virtual std::string name() const = 0;
 
diff --git a/src/libstate/libstate.h b/src/libstate/libstate.h
index d7fb6e02c..eeb38287a 100644
--- a/src/libstate/libstate.h
+++ b/src/libstate/libstate.h
@@ -35,12 +35,12 @@ class BOTAN_DLL Library_State
       void initialize(bool thread_safe);
 
       /**
-      * @return the global Algorithm_Factory
+      * @return global Algorithm_Factory
       */
       Algorithm_Factory& algorithm_factory() const;
 
       /**
-      * @return the global RandomNumberGenerator
+      * @return global RandomNumberGenerator
       */
       RandomNumberGenerator& global_rng();
 
@@ -111,7 +111,7 @@ class BOTAN_DLL Library_State
       std::string deref_alias(const std::string& alias) const;
 
       /**
-      * @return a newly created Mutex (free with delete)
+      * @return newly created Mutex (free with delete)
       */
       Mutex* get_mutex() const;
    private:
@@ -155,7 +155,7 @@ BOTAN_DLL void set_global_state(Library_State* state);
 /**
 * Swap the current state for another
 * @param new_state the new state object to use
-* @return the previous state (or NULL if none)
+* @return previous state (or NULL if none)
 */
 BOTAN_DLL Library_State* swap_global_state(Library_State* new_state);
 
diff --git a/src/libstate/look_pk.h b/src/libstate/look_pk.h
index e1dc1d95c..c980e5f8d 100644
--- a/src/libstate/look_pk.h
+++ b/src/libstate/look_pk.h
@@ -19,7 +19,7 @@ namespace Botan {
 *
 * @param key the key that will work inside the encryptor
 * @param eme determines the algorithm and encoding
-* @return the public key encryptor object
+* @return public key encryptor object
 */
 inline PK_Encryptor* get_pk_encryptor(const Public_Key& key,
                                       const std::string& eme)
@@ -33,7 +33,7 @@ inline PK_Encryptor* get_pk_encryptor(const Public_Key& key,
 *
 * @param key the key that will work inside the decryptor
 * @param eme determines the algorithm and encoding
-* @return the public key decryptor object
+* @return public key decryptor object
 */
 inline PK_Decryptor* get_pk_decryptor(const Private_Key& key,
                                       const std::string& eme)
@@ -48,7 +48,7 @@ inline PK_Decryptor* get_pk_decryptor(const Private_Key& key,
 * @param key the key that will work inside the signer
 * @param emsa determines the algorithm, encoding and hash algorithm
 * @param sig_format the signature format to be used
-* @return the public key signer object
+* @return public key signer object
 */
 inline PK_Signer* get_pk_signer(const Private_Key& key,
                                 const std::string& emsa,
@@ -64,7 +64,7 @@ inline PK_Signer* get_pk_signer(const Private_Key& key,
 * @param key the key that will work inside the verifier
 * @param emsa determines the algorithm, encoding and hash algorithm
 * @param sig_format the signature format to be used
-* @return the public key verifier object
+* @return public key verifier object
 */
 inline PK_Verifier* get_pk_verifier(const Public_Key& key,
                                     const std::string& emsa,
@@ -79,7 +79,7 @@ inline PK_Verifier* get_pk_verifier(const Public_Key& key,
 *
 * @param key the key that will work inside the key agreement
 * @param kdf the kdf algorithm to use
-* @return the key agreement algorithm
+* @return key agreement algorithm
 */
 inline PK_Key_Agreement* get_pk_kas(const PK_Key_Agreement_Key& key,
                                        const std::string& kdf)
diff --git a/src/libstate/lookup.h b/src/libstate/lookup.h
index aa3a65f96..76e06b2de 100644
--- a/src/libstate/lookup.h
+++ b/src/libstate/lookup.h
@@ -64,7 +64,7 @@ retrieve_mac(const std::string& algo_spec)
 * @deprecated Call algorithm_factory() directly
 *
 * @param algo_spec the name of the desired block cipher
-* @return a pointer to the block cipher object
+* @return pointer to the block cipher object
 */
 inline BlockCipher* get_block_cipher(const std::string& algo_spec)
    {
@@ -77,7 +77,7 @@ inline BlockCipher* get_block_cipher(const std::string& algo_spec)
 * @deprecated Call algorithm_factory() directly
 *
 * @param algo_spec the name of the desired stream cipher
-* @return a pointer to the stream cipher object
+* @return pointer to the stream cipher object
 */
 inline StreamCipher* get_stream_cipher(const std::string& algo_spec)
    {
@@ -90,7 +90,7 @@ inline StreamCipher* get_stream_cipher(const std::string& algo_spec)
 * @deprecated Call algorithm_factory() directly
 *
 * @param algo_spec the name of the desired hash function
-* @return a pointer to the hash function object
+* @return pointer to the hash function object
 */
 inline HashFunction* get_hash(const std::string& algo_spec)
    {
@@ -103,7 +103,7 @@ inline HashFunction* get_hash(const std::string& algo_spec)
 * @deprecated Call algorithm_factory() directly
 *
 * @param algo_spec the name of the desired MAC
-* @return a pointer to the MAC object
+* @return pointer to the MAC object
 */
 inline MessageAuthenticationCode* get_mac(const std::string& algo_spec)
    {
@@ -114,7 +114,7 @@ inline MessageAuthenticationCode* get_mac(const std::string& algo_spec)
 /**
 * String to key algorithm factory method.
 * @param algo_spec the name of the desired string to key (S2K) algorithm
-* @return a pointer to the string to key algorithm object
+* @return pointer to the string to key algorithm object
 */
 BOTAN_DLL S2K* get_s2k(const std::string& algo_spec);
 
@@ -127,7 +127,7 @@ BOTAN_DLL S2K* get_s2k(const std::string& algo_spec);
 /**
 * Factory method for EME (message-encoding methods for encryption) objects
 * @param algo_spec the name of the EME to create
-* @return a pointer to the desired EME object
+* @return pointer to the desired EME object
 */
 BOTAN_DLL EME*  get_eme(const std::string& algo_spec);
 
@@ -135,14 +135,14 @@ BOTAN_DLL EME*  get_eme(const std::string& algo_spec);
 * Factory method for EMSA (message-encoding methods for signatures
 * with appendix) objects
 * @param algo_spec the name of the EME to create
-* @return a pointer to the desired EME object
+* @return pointer to the desired EME object
 */
 BOTAN_DLL EMSA* get_emsa(const std::string& algo_spec);
 
 /**
 * Factory method for KDF (key derivation function)
 * @param algo_spec the name of the KDF to create
-* @return a pointer to the desired KDF object
+* @return pointer to the desired KDF object
 */
 BOTAN_DLL KDF*  get_kdf(const std::string& algo_spec);
 
@@ -158,7 +158,7 @@ BOTAN_DLL KDF*  get_kdf(const std::string& algo_spec);
 * @param iv the initialization vector to be used
 * @param direction determines whether the filter will be an encrypting
 * or decrypting filter
-* @return a pointer to the encryption or decryption filter
+* @return pointer to the encryption or decryption filter
 */
 BOTAN_DLL Keyed_Filter* get_cipher(const std::string& algo_spec,
                                    const SymmetricKey& key,
@@ -172,7 +172,7 @@ BOTAN_DLL Keyed_Filter* get_cipher(const std::string& algo_spec,
 * the filter
 * @param direction determines whether the filter will be an encrypting
 * or decrypting filter
-* @return a pointer to the encryption or decryption filter
+* @return pointer to the encryption or decryption filter
 */
 BOTAN_DLL Keyed_Filter* get_cipher(const std::string& algo_spec,
                                    const SymmetricKey& key,
@@ -185,7 +185,7 @@ BOTAN_DLL Keyed_Filter* get_cipher(const std::string& algo_spec,
 * @param algo_spec the name of the desired cipher
 * @param direction determines whether the filter will be an encrypting or
 * decrypting filter
-* @return a pointer to the encryption or decryption filter
+* @return pointer to the encryption or decryption filter
 */
 BOTAN_DLL Keyed_Filter* get_cipher(const std::string& algo_spec,
                                    Cipher_Dir direction);
diff --git a/src/libstate/oid_lookup/oids.h b/src/libstate/oid_lookup/oids.h
index fdfe61f7c..70b7dee81 100644
--- a/src/libstate/oid_lookup/oids.h
+++ b/src/libstate/oid_lookup/oids.h
@@ -31,7 +31,7 @@ BOTAN_DLL bool have_oid(const std::string& oid);
 /**
 * Resolve an OID
 * @param oid the OID to look up
-* @return the name associated with this OID
+* @return name associated with this OID
 */
 BOTAN_DLL std::string lookup(const OID& oid);
 
@@ -39,7 +39,7 @@ BOTAN_DLL std::string lookup(const OID& oid);
 * Find the OID to a name. The lookup will be performed in the
 * general OID section of the configuration.
 * @param name the name to resolve
-* @return the OID associated with the specified name
+* @return OID associated with the specified name
 */
 BOTAN_DLL OID lookup(const std::string& name);
 
diff --git a/src/libstate/scan_name.h b/src/libstate/scan_name.h
index 49c3d3765..3d11d54f6 100644
--- a/src/libstate/scan_name.h
+++ b/src/libstate/scan_name.h
@@ -28,22 +28,22 @@ class BOTAN_DLL SCAN_Name
       SCAN_Name(std::string algo_spec);
 
       /**
-      * @return the original input string
+      * @return original input string
       */
       std::string as_string() const { return orig_algo_spec; }
 
       /**
-      * @return the algorithm name
+      * @return algorithm name
       */
       std::string algo_name() const { return alg_name; }
 
       /**
-      * @return the algorithm name plus any arguments
+      * @return algorithm name plus any arguments
       */
       std::string algo_name_and_args() const;
 
       /**
-      * @return the number of arguments
+      * @return number of arguments
       */
       u32bit arg_count() const { return args.size(); }
 
@@ -57,32 +57,32 @@ class BOTAN_DLL SCAN_Name
 
       /**
       * @param i which argument
-      * @return the ith argument
+      * @return ith argument
       */
       std::string arg(u32bit i) const;
 
       /**
       * @param i which argument
       * @param def_value the default value
-      * @return the ith argument or the default value
+      * @return ith argument or the default value
       */
       std::string arg(u32bit i, const std::string& def_value) const;
 
       /**
       * @param i which argument
       * @param def_value the default value
-      * @return the ith argument as a u32bit, or the default value
+      * @return ith argument as a u32bit, or the default value
       */
       u32bit arg_as_u32bit(u32bit i, u32bit def_value) const;
 
       /**
-      * @return the cipher mode (if any)
+      * @return cipher mode (if any)
       */
       std::string cipher_mode() const
          { return (mode_info.size() >= 1) ? mode_info[0] : ""; }
 
       /**
-      * @return the cipher mode padding (if any)
+      * @return cipher mode padding (if any)
       */
       std::string cipher_mode_pad() const
          { return (mode_info.size() >= 2) ? mode_info[1] : ""; }
diff --git a/src/mac/mac.h b/src/mac/mac.h
index 52ff9c94c..4518d91ad 100644
--- a/src/mac/mac.h
+++ b/src/mac/mac.h
@@ -36,7 +36,7 @@ class BOTAN_DLL MessageAuthenticationCode : public BufferedComputation,
 
       /**
       * Get the name of this algorithm.
-      * @return the name of this algorithm
+      * @return name of this algorithm
       */
       virtual std::string name() const = 0;
 
diff --git a/src/math/bigint/bigint.h b/src/math/bigint/bigint.h
index cd1aebf00..81defd201 100644
--- a/src/math/bigint/bigint.h
+++ b/src/math/bigint/bigint.h
@@ -220,7 +220,7 @@ class BOTAN_DLL BigInt
      /**
      * Return the word at a specified position of the internal register
      * @param n position in the register
-     * @return the value at position n
+     * @return value at position n
      */
      word word_at(u32bit n) const
         { return ((n < size()) ? reg[n] : 0); }
@@ -371,7 +371,7 @@ class BOTAN_DLL BigInt
      * @param rng a random number generator
      * @param min the minimum value
      * @param max the maximum value
-     * @return a random integer between min and max
+     * @return random integer between min and max
      */
      static BigInt random_integer(RandomNumberGenerator& rng,
                                   const BigInt& min,
diff --git a/src/pubkey/dl_algo/dl_algo.h b/src/pubkey/dl_algo/dl_algo.h
index 445f6c3f9..429bfb554 100644
--- a/src/pubkey/dl_algo/dl_algo.h
+++ b/src/pubkey/dl_algo/dl_algo.h
@@ -28,7 +28,7 @@ class BOTAN_DLL DL_Scheme_PublicKey : public virtual Public_Key
 
       /**
       * Get the DL domain parameters of this key.
-      * @return the DL domain parameters of this key
+      * @return DL domain parameters of this key
       */
       const DL_Group& get_domain() const { return group; }
 
@@ -39,25 +39,25 @@ class BOTAN_DLL DL_Scheme_PublicKey : public virtual Public_Key
 
       /**
       * Get the prime p of the underlying DL group.
-      * @return the prime p
+      * @return prime p
       */
       const BigInt& group_p() const { return group.get_p(); }
 
       /**
       * Get the prime q of the underlying DL group.
-      * @return the prime q
+      * @return prime q
       */
       const BigInt& group_q() const { return group.get_q(); }
 
       /**
       * Get the generator g of the underlying DL group.
-      * @return the generator g
+      * @return generator g
       */
       const BigInt& group_g() const { return group.get_g(); }
 
       /**
       * Get the underlying groups encoding format.
-      * @return the encoding format
+      * @return encoding format
       */
       virtual DL_Group::Format group_format() const = 0;
 
@@ -82,7 +82,7 @@ class BOTAN_DLL DL_Scheme_PrivateKey : public virtual DL_Scheme_PublicKey,
 
       /**
       * Get the secret key x.
-      * @return the secret key
+      * @return secret key
       */
       const BigInt& get_x() const { return x; }
 
diff --git a/src/pubkey/dl_group/dl_group.h b/src/pubkey/dl_group/dl_group.h
index a84a85f87..885ccd2f9 100644
--- a/src/pubkey/dl_group/dl_group.h
+++ b/src/pubkey/dl_group/dl_group.h
@@ -22,19 +22,19 @@ class BOTAN_DLL DL_Group
    public:
       /**
       * Get the prime p.
-      * @return the prime p
+      * @return prime p
       */
       const BigInt& get_p() const;
 
       /**
       * Get the prime q.
-      * @return the prime q
+      * @return prime q
       */
       const BigInt& get_q() const;
 
       /**
       * Get the base g.
-      * @return the base g
+      * @return base g
       */
       const BigInt& get_g() const;
 
@@ -68,14 +68,14 @@ class BOTAN_DLL DL_Group
       /**
       * Encode this group into a string using PEM encoding.
       * @param format the encoding format
-      * @return the string holding the PEM encoded group
+      * @return string holding the PEM encoded group
       */
       std::string PEM_encode(Format format) const;
 
       /**
       * Encode this group into a string using DER encoding.
       * @param format the encoding format
-      * @return the string holding the DER encoded group
+      * @return string holding the DER encoded group
       */
       SecureVector<byte> DER_encode(Format format) const;
 
diff --git a/src/pubkey/ecdh/ecdh.h b/src/pubkey/ecdh/ecdh.h
index ea1205a48..f0872c5cc 100644
--- a/src/pubkey/ecdh/ecdh.h
+++ b/src/pubkey/ecdh/ecdh.h
@@ -46,12 +46,12 @@ class BOTAN_DLL ECDH_PublicKey : public virtual EC_PublicKey
       * Get the maximum number of bits allowed to be fed to this key.
       * This is the bitlength of the order of the base point.
 
-      * @return the maximum number of input bits
+      * @return maximum number of input bits
       */
       u32bit max_input_bits() const { return domain().get_order().bits(); }
 
       /**
-      * @return the public point value
+      * @return public point value
       */
       MemoryVector<byte> public_value() const
          { return EC2OSP(public_point(), PointGFp::UNCOMPRESSED); }
diff --git a/src/pubkey/if_algo/if_algo.h b/src/pubkey/if_algo/if_algo.h
index 764a99e13..d0a1ec197 100644
--- a/src/pubkey/if_algo/if_algo.h
+++ b/src/pubkey/if_algo/if_algo.h
@@ -34,12 +34,12 @@ class BOTAN_DLL IF_Scheme_PublicKey : public virtual Public_Key
       MemoryVector<byte> x509_subject_public_key() const;
 
       /**
-      * @return the public modulus
+      * @return public modulus
       */
       const BigInt& get_n() const { return n; }
 
       /**
-      * @return the public exponent
+      * @return public exponent
       */
       const BigInt& get_e() const { return e; }
 
@@ -73,13 +73,13 @@ class BOTAN_DLL IF_Scheme_PrivateKey : public virtual IF_Scheme_PublicKey,
 
       /**
       * Get the first prime p.
-      * @return the prime p
+      * @return prime p
       */
       const BigInt& get_p() const { return p; }
 
       /**
       * Get the second prime q.
-      * @return the prime q
+      * @return prime q
       */
       const BigInt& get_q() const { return q; }
 
diff --git a/src/pubkey/pk_keys.h b/src/pubkey/pk_keys.h
index b1036152d..8f086c617 100644
--- a/src/pubkey/pk_keys.h
+++ b/src/pubkey/pk_keys.h
@@ -23,13 +23,13 @@ class BOTAN_DLL Public_Key
    public:
       /**
       * Get the name of the underlying public key scheme.
-      * @return the name of the public key scheme
+      * @return name of the public key scheme
       */
       virtual std::string algo_name() const = 0;
 
       /**
       * Get the OID of the underlying public key scheme.
-      * @return the OID of the public key scheme
+      * @return OID of the public key scheme
       */
       virtual OID get_oid() const;
 
@@ -45,19 +45,19 @@ class BOTAN_DLL Public_Key
 
       /**
       * Find out the number of message parts supported by this scheme.
-      * @return the number of message parts
+      * @return number of message parts
       */
       virtual u32bit message_parts() const { return 1; }
 
       /**
       * Find out the message part size supported by this scheme/key.
-      * @return the size of the message parts
+      * @return size of the message parts in bits
       */
       virtual u32bit message_part_size() const { return 0; }
 
       /**
       * Get the maximum message size in bits supported by this public key.
-      * @return the maximum message in bits
+      * @return maximum message size in bits
       */
       virtual u32bit max_input_bits() const = 0;
 
diff --git a/src/pubkey/pk_ops.h b/src/pubkey/pk_ops.h
index 7a5b1d94d..b15a8d8cd 100644
--- a/src/pubkey/pk_ops.h
+++ b/src/pubkey/pk_ops.h
@@ -51,19 +51,19 @@ class BOTAN_DLL Signature
    public:
       /**
       * Find out the number of message parts supported by this scheme.
-      * @return the number of message parts
+      * @return number of message parts
       */
       virtual u32bit message_parts() const { return 1; }
 
       /**
       * Find out the message part size supported by this scheme/key.
-      * @return the size of the message parts
+      * @return size of the message parts
       */
       virtual u32bit message_part_size() const { return 0; }
 
       /**
       * Get the maximum message size in bits supported by this public key.
-      * @return the maximum message in bits
+      * @return maximum message in bits
       */
       virtual u32bit max_input_bits() const = 0;
 
@@ -87,19 +87,19 @@ class BOTAN_DLL Verification
    public:
       /**
       * Get the maximum message size in bits supported by this public key.
-      * @return the maximum message in bits
+      * @return maximum message in bits
       */
       virtual u32bit max_input_bits() const = 0;
 
       /**
       * Find out the number of message parts supported by this scheme.
-      * @return the number of message parts
+      * @return number of message parts
       */
       virtual u32bit message_parts() const { return 1; }
 
       /**
       * Find out the message part size supported by this scheme/key.
-      * @return the size of the message parts
+      * @return size of the message parts
       */
       virtual u32bit message_part_size() const { return 0; }
 
diff --git a/src/pubkey/pkcs8.h b/src/pubkey/pkcs8.h
index 542d5bb2d..3da96d840 100644
--- a/src/pubkey/pkcs8.h
+++ b/src/pubkey/pkcs8.h
@@ -34,7 +34,7 @@ BOTAN_DLL SecureVector<byte> BER_encode(const Private_Key& key);
 /**
 * Get a string containing a PEM encoded private key.
 * @param key the key to encode
-* @return the encoded key
+* @return encoded key
 */
 BOTAN_DLL std::string PEM_encode(const Private_Key& key);
 
@@ -46,7 +46,7 @@ BOTAN_DLL std::string PEM_encode(const Private_Key& key);
 * @param pbe_algo the name of the desired password-based encryption
          algorithm; if empty ("") a reasonable (portable/secure)
          default will be chosen.
-* @return the encrypted key in binary BER form
+* @return encrypted key in binary BER form
 */
 BOTAN_DLL SecureVector<byte> BER_encode(const Private_Key& key,
                                         RandomNumberGenerator& rng,
@@ -62,7 +62,7 @@ BOTAN_DLL SecureVector<byte> BER_encode(const Private_Key& key,
 * @param pbe_algo the name of the desired password-based encryption
          algorithm; if empty ("") a reasonable (portable/secure)
          default will be chosen.
-* @return the encrypted key in PEM form
+* @return encrypted key in PEM form
 */
 BOTAN_DLL std::string PEM_encode(const Private_Key& key,
                                  RandomNumberGenerator& rng,
@@ -119,7 +119,7 @@ inline void encrypt_key(const Private_Key& key,
 * @param source the data source providing the encoded key
 * @param rng the rng to use
 * @param ui the user interface to be used for passphrase dialog
-* @return the loaded private key object
+* @return loaded private key object
 */
 BOTAN_DLL Private_Key* load_key(DataSource& source,
                                 RandomNumberGenerator& rng,
@@ -130,7 +130,7 @@ BOTAN_DLL Private_Key* load_key(DataSource& source,
 * @param rng the rng to use
 * @param pass the passphrase to decrypt the key. Provide an empty
 * string if the key is not encoded.
-* @return the loaded private key object
+* @return loaded private key object
 */
 BOTAN_DLL Private_Key* load_key(DataSource& source,
                                 RandomNumberGenerator& rng,
@@ -141,7 +141,7 @@ BOTAN_DLL Private_Key* load_key(DataSource& source,
 * @param filename the path to the file containing the encoded key
 * @param rng the rng to use
 * @param ui the user interface to be used for passphrase dialog
-* @return the loaded private key object
+* @return loaded private key object
 */
 BOTAN_DLL Private_Key* load_key(const std::string& filename,
                                 RandomNumberGenerator& rng,
@@ -152,7 +152,7 @@ BOTAN_DLL Private_Key* load_key(const std::string& filename,
 * @param rng the rng to use
 * @param pass the passphrase to decrypt the key. Provide an empty
 * string if the key is not encoded.
-* @return the loaded private key object
+* @return loaded private key object
 */
 BOTAN_DLL Private_Key* load_key(const std::string& filename,
                                 RandomNumberGenerator& rng,
@@ -162,7 +162,7 @@ BOTAN_DLL Private_Key* load_key(const std::string& filename,
 * Copy an existing encoded key object.
 * @param key the key to copy
 * @param rng the rng to use
-* @return the new copy of the key
+* @return new copy of the key
 */
 BOTAN_DLL Private_Key* copy_key(const Private_Key& key,
                                 RandomNumberGenerator& rng);
diff --git a/src/pubkey/pubkey.h b/src/pubkey/pubkey.h
index d034427e1..ff4355675 100644
--- a/src/pubkey/pubkey.h
+++ b/src/pubkey/pubkey.h
@@ -43,7 +43,7 @@ class BOTAN_DLL PK_Encryptor
       * @param in the message as a byte array
       * @param length the length of the above byte array
       * @param rng the random number source to use
-      * @return the encrypted message
+      * @return encrypted message
       */
       SecureVector<byte> encrypt(const byte in[], u32bit length,
                                  RandomNumberGenerator& rng) const
@@ -55,7 +55,7 @@ class BOTAN_DLL PK_Encryptor
       * Encrypt a message.
       * @param in the message
       * @param rng the random number source to use
-      * @return the encrypted message
+      * @return encrypted message
       */
       SecureVector<byte> encrypt(const MemoryRegion<byte>& in,
                                  RandomNumberGenerator& rng) const
@@ -65,7 +65,7 @@ class BOTAN_DLL PK_Encryptor
 
       /**
       * Return the maximum allowed message size in bytes.
-      * @return the maximum message size in bytes
+      * @return maximum message size in bytes
       */
       virtual u32bit maximum_input_size() const = 0;
 
@@ -89,7 +89,7 @@ class BOTAN_DLL PK_Decryptor
       * Decrypt a ciphertext.
       * @param in the ciphertext as a byte array
       * @param length the length of the above byte array
-      * @return the decrypted message
+      * @return decrypted message
       */
       SecureVector<byte> decrypt(const byte in[], u32bit length) const
          {
@@ -99,7 +99,7 @@ class BOTAN_DLL PK_Decryptor
       /**
       * Decrypt a ciphertext.
       * @param in the ciphertext
-      * @return the decrypted message
+      * @return decrypted message
       */
       SecureVector<byte> decrypt(const MemoryRegion<byte>& in) const
          {
@@ -128,7 +128,7 @@ class BOTAN_DLL PK_Signer
       * @param in the message to sign as a byte array
       * @param length the length of the above byte array
       * @param rng the rng to use
-      * @return the signature
+      * @return signature
       */
       SecureVector<byte> sign_message(const byte in[], u32bit length,
                                       RandomNumberGenerator& rng);
@@ -137,7 +137,7 @@ class BOTAN_DLL PK_Signer
       * Sign a message.
       * @param in the message to sign
       * @param rng the rng to use
-      * @return the signature
+      * @return signature
       */
       SecureVector<byte> sign_message(const MemoryRegion<byte>& in,
                                       RandomNumberGenerator& rng)
@@ -166,7 +166,7 @@ class BOTAN_DLL PK_Signer
       * Get the signature of the so far processed message (provided by the
       * calls to update()).
       * @param rng the rng to use
-      * @return the signature of the total message
+      * @return signature of the total message
       */
       SecureVector<byte> signature(RandomNumberGenerator& rng);
 
diff --git a/src/s2k/s2k.h b/src/s2k/s2k.h
index 5263dfd68..59e789a15 100644
--- a/src/s2k/s2k.h
+++ b/src/s2k/s2k.h
@@ -21,13 +21,13 @@ class BOTAN_DLL S2K
    public:
 
       /**
-      * @return a new instance of this same algorithm
+      * @return new instance of this same algorithm
       */
       virtual S2K* clone() const = 0;
 
       /**
       * Get the algorithm name.
-      * @return the name of this S2K algorithm
+      * @return name of this S2K algorithm
       */
       virtual std::string name() const = 0;
 
diff --git a/src/sym_algo/sym_algo.h b/src/sym_algo/sym_algo.h
index f1a4955ca..60180de90 100644
--- a/src/sym_algo/sym_algo.h
+++ b/src/sym_algo/sym_algo.h
@@ -38,7 +38,7 @@ class BOTAN_DLL SymmetricAlgorithm
 
       /**
       * The name of the algorithm.
-      * @return the name of the algorithm
+      * @return name of the algorithm
       */
       virtual std::string name() const = 0;
 
diff --git a/src/utils/buf_comp/buf_comp.h b/src/utils/buf_comp/buf_comp.h
index 6ec21c0d0..e807e6abf 100644
--- a/src/utils/buf_comp/buf_comp.h
+++ b/src/utils/buf_comp/buf_comp.h
@@ -67,7 +67,7 @@ class BOTAN_DLL BufferedComputation
       /**
       * Complete the computation and retrieve the
       * final result.
-      * @return a SecureVector holding the result
+      * @return SecureVector holding the result
       */
       SecureVector<byte> final()
          {
diff --git a/src/utils/version.h b/src/utils/version.h
index 9ed776ed7..13d0ac8bb 100644
--- a/src/utils/version.h
+++ b/src/utils/version.h
@@ -19,7 +19,7 @@ namespace Botan {
 
 /**
 * Get the version string identifying the version of Botan.
-* @return the version string
+* @return version string
 */
 BOTAN_DLL std::string version_string();
 
@@ -27,25 +27,25 @@ BOTAN_DLL std::string version_string();
 * Return the date this version of botan was released, in an
 * integer of the form YYYYMMDD. For instance a version released
 * on May 21, 2013 would return the integer 20130521
-* @return the release date
+* @return release date
 */
 BOTAN_DLL u32bit version_datestamp();
 
 /**
 * Get the major version number.
-* @return the major version number
+* @return major version number
 */
 BOTAN_DLL u32bit version_major();
 
 /**
 * Get the minor version number.
-* @return the minor version number
+* @return minor version number
 */
 BOTAN_DLL u32bit version_minor();
 
 /**
 * Get the patch number.
-* @return the patch number
+* @return patch number
 */
 BOTAN_DLL u32bit version_patch();