Merge pull request #3405

80d2f80 wallet2: Update function parameter documentation (leonklingele)

1 files changed, 15 insertions, 13 deletions

diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 69b63876a..61e6927bc 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -477,21 +477,23 @@ namespace tools
       bool two_random = false, bool create_address_file = false);
     /*!
      * \brief Creates a wallet from a public address and a spend/view secret key pair.
-     * \param  wallet_              Name of wallet file
-     * \param  password             Password of wallet file
-     * \param  viewkey              view secret key
-     * \param  spendkey             spend secret key
-     * \param  create_address_file  Whether to create an address file
+     * \param  wallet_                 Name of wallet file
+     * \param  password                Password of wallet file
+     * \param  account_public_address  The account's public address
+     * \param  spendkey                spend secret key
+     * \param  viewkey                 view secret key
+     * \param  create_address_file     Whether to create an address file
      */
     void generate(const std::string& wallet, const epee::wipeable_string& password,
       const cryptonote::account_public_address &account_public_address,
       const crypto::secret_key& spendkey, const crypto::secret_key& viewkey, bool create_address_file = false);
     /*!
      * \brief Creates a watch only wallet from a public address and a view secret key.
-     * \param  wallet_              Name of wallet file
-     * \param  password             Password of wallet file
-     * \param  viewkey              view secret key
-     * \param  create_address_file  Whether to create an address file
+     * \param  wallet_                 Name of wallet file
+     * \param  password                Password of wallet file
+     * \param  account_public_address  The account's public address
+     * \param  viewkey                 view secret key
+     * \param  create_address_file     Whether to create an address file
      */
     void generate(const std::string& wallet, const epee::wipeable_string& password,
       const cryptonote::account_public_address &account_public_address,
@@ -561,9 +563,9 @@ namespace tools
     void load(const std::string& wallet, const epee::wipeable_string& password);
     void store();
     /*!
-     * \brief store_to - stores wallet to another file(s), deleting old ones
-     * \param path     - path to the wallet file (keys and address filenames will be generated based on this filename)
-     * \param password - password to protect new wallet (TODO: probably better save the password in the wallet object?)
+     * \brief store_to  Stores wallet to another file(s), deleting old ones
+     * \param path      Path to the wallet file (keys and address filenames will be generated based on this filename)
+     * \param password  Password to protect new wallet (TODO: probably better save the password in the wallet object?)
      */
     void store_to(const std::string &path, const epee::wipeable_string &password);
 
@@ -959,7 +961,7 @@ namespace tools
     /*!
      * \brief  Set the label of the given tag.
      * \param  tag            Tag's name (which must be non-empty).
-     * \param  label          Tag's description.
+     * \param  description    Tag's description.
      */
     void set_account_tag_description(const std::string& tag, const std::string& description);