aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2012-07-28 01:05:43 -0700
committerWladimir J. van der Laan <laanwj@gmail.com>2012-07-28 01:05:43 -0700
commit3c83387c298b6462b176fe6f335502770007f192 (patch)
treee3a22e57d11797f5fe164e3b4f0aa3b7294f7b12
parentc1aed4eff468d8152231b7a857c2edd4e10eca80 (diff)
parent6986c779f03f5e25b37904ea2d34b50d8a45e2fb (diff)
downloadbitcoin-3c83387c298b6462b176fe6f335502770007f192.tar.xz
Merge pull request #1635 from Diapolo/update_helpMessage
update HelpMessage()
-rw-r--r--src/init.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 35230095a8..5fbe9d5d64 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -216,6 +216,7 @@ bool static Bind(const CService &addr, bool fError = true) {
std::string HelpMessage()
{
string strUsage = _("Options:") + "\n" +
+ " -? " + _("This help message") + "\n" +
" -conf=<file> " + _("Specify configuration file (default: bitcoin.conf)") + "\n" +
" -pid=<file> " + _("Specify pid file (default: bitcoind.pid)") + "\n" +
" -gen " + _("Generate coins") + "\n" +
@@ -279,15 +280,13 @@ std::string HelpMessage()
" -checkblocks=<n> " + _("How many blocks to check at startup (default: 2500, 0 = all)") + "\n" +
" -checklevel=<n> " + _("How thorough the block verification is (0-6, default: 1)") + "\n" +
" -loadblock=<file> " + _("Imports blocks from external blk000?.dat file") + "\n" +
- _("\nBlock creation options:\n") +
- " -blockminsize=<n> " + _("Minimum size, in bytes (default: 0)\n") +
- " -blockmaxsize=<n> " + _("Maximum size, in bytes (default: 250000)\n") +
- " -blockprioritysize=<n> " + _("Maximum bytes of high-priority/low-fee transactions (default: 27000)\n") +
- " -? " + _("This help message") + "\n";
+ "\n" + _("Block creation options:") + "\n" +
+ " -blockminsize=<n> " + _("Set minimum block size in bytes (default: 0)") + "\n" +
+ " -blockmaxsize=<n> " + _("Set maximum block size in bytes (default: 250000)") + "\n" +
+ " -blockprioritysize=<n> " + _("Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)") + "\n" +
- strUsage += string() +
- _("\nSSL options: (see the Bitcoin Wiki for SSL setup instructions)") + "\n" +
+ "\n" + _("SSL options: (see the Bitcoin Wiki for SSL setup instructions)") + "\n" +
" -rpcssl " + _("Use OpenSSL (https) for JSON-RPC connections") + "\n" +
" -rpcsslcertificatechainfile=<file.cert> " + _("Server certificate file (default: server.cert)") + "\n" +
" -rpcsslprivatekeyfile=<file.pem> " + _("Server private key (default: server.pem)") + "\n" +