Use the new name Bitcoin Core Daemon instead of Bitcoin server #3801

paveljanik commented at 9:58 AM on March 5, 2014: contributor

The name of the daemon was changed from Bitcoin server to Bitcoin Core Daemon. This change fixes the --help usage text accordingly.

Use the new name Bitcoin Core Daemon instead of Bitcoin server 974a26f17c

laanwj commented at 10:05 AM on March 5, 2014: member

Does bitcoin-cli need a similar update?

Use the new name Bitcoin Core instead of Bitcoin for RPC client 6a337ee053

sipa commented at 3:53 PM on March 10, 2014: member

ACK

int03h commented at 11:32 PM on March 10, 2014: none

ACK

The botcoin-cli name is Bitcoin Core RPC client. 403f151313

in src/bitcoin-cli.cpp:None in 6a337ee053 outdated

  36 | @@ -37,7 +37,7 @@ static bool AppInitRPC(int argc, char* argv[])
  37 |      if (argc<2 || mapArgs.count("-?") || mapArgs.count("--help"))
  38 |      {
  39 |          // First part of help message is specific to RPC client
  40 | -        std::string strUsage = _("Bitcoin RPC client version") + " " + FormatFullVersion() + "\n\n" +
  41 | +        std::string strUsage = _("Bitcoin Core version") + " " + FormatFullVersion() + "\n\n" +

laanwj commented at 10:34 AM on March 16, 2014:

Ehh don't remove the 'RPC client' part here

laanwj commented at 7:36 AM on March 20, 2014: member

ACK after squashing to one commit.

laanwj referenced this in commit ba0621e6bf on Mar 20, 2014

Use the new name Bitcoin Core in the usage string. 0c030f0475

Update the usage string. c63dc4664d

in src/bitcoin-cli.cpp:None in 403f151313 outdated

  36 | @@ -37,7 +37,7 @@ static bool AppInitRPC(int argc, char* argv[])
  37 |      if (argc<2 || mapArgs.count("-?") || mapArgs.count("--help"))
  38 |      {
  39 |          // First part of help message is specific to RPC client
  40 | -        std::string strUsage = _("Bitcoin RPC client version") + " " + FormatFullVersion() + "\n\n" +
  41 | +        std::string strUsage = _("Bitcoin Core RPC client version") + " " + FormatFullVersion() + "\n\n" +
  42 |              _("Usage:") + "\n" +
  43 |                "  bitcoin-cli [options] <command> [params]  " + _("Send command to Bitcoin server") + "\n" +

laanwj commented at 9:01 AM on March 31, 2014:

You forgot here

in src/bitcoind.cpp:None in 403f151313 outdated

  81 | @@ -82,9 +82,9 @@ bool AppInit(int argc, char* argv[])
  82 |              // First part of help message is specific to bitcoind / RPC client
  83 |              std::string strUsage = _("Bitcoin Core Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n\n" +
  84 |                  _("Usage:") + "\n" +
  85 | -                  "  bitcoind [options]                     " + _("Start Bitcoin server") + "\n" +
  86 | +                  "  bitcoind [options]                     " + _("Start Bitcoin Core Daemon") + "\n" +
  87 |                  _("Usage (deprecated, use bitcoin-cli):") + "\n" +
  88 | -                  "  bitcoind [options] <command> [params]  " + _("Send command to Bitcoin server") + "\n" +
  89 | +                  "  bitcoind [options] <command> [params]  " + _("Send command to Bitcoin Core Daemon") + "\n" +

laanwj commented at 9:02 AM on March 31, 2014:

Just make this "Send command to Bitcoin Core" without the Daemon as it's also possible to send commands to an GUI in -server mode.

paveljanik commented at 9:59 AM on March 31, 2014: contributor

Done both. The web UI doesn't allow me to squash commits into one and I do not see how to clone the patch-2 to my local machine, sorry.

BitcoinPullTester commented at 10:03 AM on March 31, 2014: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/c63dc4664daf80ea6e3bf4c2baf409ef14329529 for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.

laanwj referenced this in commit db3a5e4151 on Mar 31, 2014

laanwj commented at 10:07 AM on March 31, 2014: member

Committed via db3a5e4 (I did the squashing for you this time)

laanwj closed this on Mar 31, 2014

MathyV referenced this in commit e741e32032 on Oct 27, 2014

DrahtBot locked this on Sep 8, 2021