7 files changed, 19 insertions, 15 deletions
diff --git a/src/pubkey/dh/dh.h b/src/pubkey/dh/dh.h
index 738b3f9c4..88b57922d 100644
--- a/src/pubkey/dh/dh.h
+++ b/src/pubkey/dh/dh.h
@@ -56,7 +56,7 @@ class BOTAN_DLL DH_PrivateKey : public DH_PublicKey,
       * Load a DH private key
       * @param alg_id the algorithm id
       * @param key_bits the subject public key
-      * @rng a random number generator
+      * @param rng a random number generator
       */
       DH_PrivateKey(const AlgorithmIdentifier& alg_id,
                     const MemoryRegion<byte>& key_bits,
diff --git a/src/pubkey/ecdh/ecdh.h b/src/pubkey/ecdh/ecdh.h
index 19621f2ca..ea1205a48 100644
--- a/src/pubkey/ecdh/ecdh.h
+++ b/src/pubkey/ecdh/ecdh.h
@@ -75,7 +75,8 @@ class BOTAN_DLL ECDH_PrivateKey : public ECDH_PublicKey,
 
       /**
       * Generate a new private key
-      * @param the domain parameters to used for this key
+      * @param rng a random number generator
+      * @param domain parameters to used for this key
       */
       ECDH_PrivateKey(RandomNumberGenerator& rng,
                       const EC_Domain_Params& domain) :
diff --git a/src/pubkey/ecdsa/ecdsa.h b/src/pubkey/ecdsa/ecdsa.h
index 62bd007f9..5e10c837d 100644
--- a/src/pubkey/ecdsa/ecdsa.h
+++ b/src/pubkey/ecdsa/ecdsa.h
@@ -72,7 +72,8 @@ class BOTAN_DLL ECDSA_PrivateKey : public ECDSA_PublicKey,
 
       /**
       * Generate a new private key
-      * @param the domain parameters to used for this key
+      * @param rng a random number generator
+      * @param domain parameters to used for this key
       */
       ECDSA_PrivateKey(RandomNumberGenerator& rng,
                        const EC_Domain_Params& domain) :
@@ -83,7 +84,8 @@ class BOTAN_DLL ECDSA_PrivateKey : public ECDSA_PublicKey,
       * @param domain parameters
       * @param x the private key
       */
-      ECDSA_PrivateKey(const EC_Domain_Params& domain, const BigInt& x) :
+      ECDSA_PrivateKey(const EC_Domain_Params& domain,
+                       const BigInt& x) :
          EC_PrivateKey(domain, x) {}
 
       bool check_key(RandomNumberGenerator& rng, bool) const;
diff --git a/src/pubkey/gost_3410/gost_3410.h b/src/pubkey/gost_3410/gost_3410.h
index 36fa2912d..5148b0204 100644
--- a/src/pubkey/gost_3410/gost_3410.h
+++ b/src/pubkey/gost_3410/gost_3410.h
@@ -78,7 +78,8 @@ class BOTAN_DLL GOST_3410_PrivateKey : public GOST_3410_PublicKey,
 
       /**
       * Generate a new private key
-      * @param the domain parameters to used for this key
+      * @param rng a random number generator
+      * @param domain parameters to used for this key
       */
       GOST_3410_PrivateKey(RandomNumberGenerator& rng,
                            const EC_Domain_Params& domain) :
diff --git a/src/pubkey/pk_keys.h b/src/pubkey/pk_keys.h
index da73db0ee..781c8e70f 100644
--- a/src/pubkey/pk_keys.h
+++ b/src/pubkey/pk_keys.h
@@ -40,7 +40,7 @@ class BOTAN_DLL Public_Key
       * of the test
       * @return true if the test is passed
       */
-      virtual bool check_key(RandomNumberGenerator&, bool) const
+      virtual bool check_key(RandomNumberGenerator& rng, bool strong) const
          { return true; }
 
       /**
diff --git a/src/pubkey/pubkey.h b/src/pubkey/pubkey.h
index d94b3e2e4..f6a120654 100644
--- a/src/pubkey/pubkey.h
+++ b/src/pubkey/pubkey.h
@@ -145,7 +145,7 @@ class BOTAN_DLL PK_Signer
 
       /**
       * Add a message part (single byte).
-      * @param the byte to add
+      * @param in the byte to add
       */
       void update(byte in) { update(&in, 1); }
 
diff --git a/src/pubkey/x509_key.h b/src/pubkey/x509_key.h
index d9e9f2d7c..4ac6eab3d 100644
--- a/src/pubkey/x509_key.h
+++ b/src/pubkey/x509_key.h
@@ -23,42 +23,42 @@ namespace X509 {
 /**
 * BER encode a key
 * @param key the public key to encode
-* @return the BER encoding of this key
+* @return BER encoding of this key
 */
 BOTAN_DLL MemoryVector<byte> BER_encode(const Public_Key& key);
 
 /**
 * PEM encode a public key into a string.
 * @param key the key to encode
-* @return the PEM encoded key
+* @return PEM encoded key
 */
 BOTAN_DLL std::string PEM_encode(const Public_Key& key);
 
 /**
 * Create a public key from a data source.
 * @param source the source providing the DER or PEM encoded key
-* @return the new public key object
+* @return new public key object
 */
 BOTAN_DLL Public_Key* load_key(DataSource& source);
 
 /**
 * Create a public key from a file
-* @param file pathname to the file to load
-* @return the new public key object
+* @param filename pathname to the file to load
+* @return new public key object
 */
 BOTAN_DLL Public_Key* load_key(const std::string& filename);
 
 /**
 * Create a public key from a memory region.
 * @param enc the memory region containing the DER or PEM encoded key
-* @return the new public key object
+* @return new public key object
 */
 BOTAN_DLL Public_Key* load_key(const MemoryRegion<byte>& enc);
 
 /**
 * Copy a key.
 * @param key the public key to copy
-* @return the new public key object
+* @return new public key object
 */
 BOTAN_DLL Public_Key* copy_key(const Public_Key& key);
 
@@ -68,7 +68,7 @@ BOTAN_DLL Public_Key* copy_key(const Public_Key& key);
 * constraints to be placed in the return value is derived
 * @param limits additional limits that will be incorporated into the
 * return value
-* @return the combination of key type specific constraints and
+* @return combination of key type specific constraints and
 * additional limits
 */
 BOTAN_DLL Key_Constraints find_constraints(const Public_Key& pub_key,