Merge pull request #6400

1327897 Reformat help text of estimatefee and estimatepriority to match other help texts. (Pavel Janík)

src/rpcmining.cpp

@@ -666,16 +666,15 @@ UniValue estimatefee(const UniValue& params, bool fHelp)
     if (fHelp || params.size() != 1)
         throw runtime_error(
             "estimatefee nblocks\n"
-            "\nEstimates the approximate fee per kilobyte\n"
+            "\nEstimates the approximate fee per kilobyte needed for a transaction to begin\n"
-            "needed for a transaction to begin confirmation\n"
+            "confirmation within nblocks blocks.\n"
-            "within nblocks blocks.\n"
             "\nArguments:\n"
             "1. nblocks     (numeric)\n"
             "\nResult:\n"
-            "n :    (numeric) estimated fee-per-kilobyte\n"
+            "n              (numeric) estimated fee-per-kilobyte\n"
             "\n"
-            "-1.0 is returned if not enough transactions and\n"
+            "A negative value is returned if not enough transactions and blocks\n"
-            "blocks have been observed to make an estimate.\n"
+            "have been observed to make an estimate.\n"
             "\nExample:\n"
             + HelpExampleCli("estimatefee", "6")
             );
@@ -698,16 +697,15 @@ UniValue estimatepriority(const UniValue& params, bool fHelp)
     if (fHelp || params.size() != 1)
         throw runtime_error(
             "estimatepriority nblocks\n"
-            "\nEstimates the approximate priority\n"
+            "\nEstimates the approximate priority a zero-fee transaction needs to begin\n"
-            "a zero-fee transaction needs to begin confirmation\n"
+            "confirmation within nblocks blocks.\n"
-            "within nblocks blocks.\n"
             "\nArguments:\n"
             "1. nblocks     (numeric)\n"
             "\nResult:\n"
-            "n :    (numeric) estimated priority\n"
+            "n              (numeric) estimated priority\n"
             "\n"
-            "-1.0 is returned if not enough transactions and\n"
+            "A negative value is returned if not enough transactions and blocks\n"
-            "blocks have been observed to make an estimate.\n"
+            "have been observed to make an estimate.\n"
             "\nExample:\n"
             + HelpExampleCli("estimatepriority", "6")
             );