Merge #945: More dash->dashcore

a5328a1 Change Dash -> Dash Core where appropriate (in strings)

b8696d9 Change user/group dash->dashcore

69dc9f1 Change dash->dashcore for /etc/ and /var/lib/ folders

contrib/debian/examples/dash.conf

@@ -71,7 +71,7 @@
 #rpcuser=Ulysseys
 #rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593
 
-# How many seconds dash will wait for a complete RPC HTTP request.
+# How many seconds Dash Core will wait for a complete RPC HTTP request.
 # after the HTTP connection is established. 
 #rpcclienttimeout=30
 

contrib/debian/manpages/dash.conf.5

@@ -1,12 +1,12 @@
 .TH DASH.CONF "5" "June 2016" "dash.conf 0.12"
 .SH NAME
-dash.conf \- dash configuration file
+dash.conf \- Dash Core configuration file
 .SH SYNOPSIS
 All command-line options (except for '\-conf') may be specified in a configuration file, and all configuration file options may also be specified on the command line. Command-line options override values set in the configuration file.
 .TP
 The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character. Please refer to dashd(1) for a up to date list of valid options.
 .TP
-The configuration file is not automatically created; you can create it using your favorite plain-text editor. By default, dashd(1) will look for a file named dash.conf(5) in the dash data directory, but both the data directory and the configuration file path may be changed using the '\-datadir' and '\-conf' command-line arguments.
+The configuration file is not automatically created; you can create it using your favorite plain-text editor. By default, dashd(1) will look for a file named dash.conf(5) in the Dash Core data directory, but both the data directory and the configuration file path may be changed using the '\-datadir' and '\-conf' command-line arguments.
 .SH LOCATION
 dash.conf should be located in $HOME/.dashcore
 

contrib/init/dashd.conf

@@ -4,12 +4,12 @@ start on runlevel [2345]
 stop on starting rc RUNLEVEL=[016]
 
 env BITCOIND_BIN="/usr/bin/dashd"
-env BITCOIND_USER="dash"
+env BITCOIND_USER="dashcore"
-env BITCOIND_GROUP="dash"
+env BITCOIND_GROUP="dashcore"
 env BITCOIND_PIDDIR="/var/run/dashd"
 # upstart can't handle variables constructed with other variables
 env BITCOIND_PIDFILE="/var/run/dashd/dashd.pid"
-env BITCOIND_CONFIGFILE="/etc/dash/dash.conf"
+env BITCOIND_CONFIGFILE="/etc/dashcore/dash.conf"
 env BITCOIND_DATADIR="/var/lib/dashd"
 
 expect fork

contrib/init/dashd.init

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-#  dashd The dash core server.
+#  dashd The Dash Core server.
 #
 #
 # chkconfig: 345 80 20

contrib/init/dashd.openrc

@@ -2,18 +2,18 @@
 
 # backward compatibility for existing gentoo layout 
 #
-if [ -d "/var/lib/dash/.dash" ]; then
+if [ -d "/var/lib/dashcore/.dashcore" ]; then
-	BITCOIND_DEFAULT_DATADIR="/var/lib/dash/.dash"
+	BITCOIND_DEFAULT_DATADIR="/var/lib/dashcore/.dashcore"
 else
 	BITCOIND_DEFAULT_DATADIR="/var/lib/dashd"
 fi
 
-BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/dash/dash.conf}
+BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/dashcore/dash.conf}
 BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/dashd}
 BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/dashd.pid}
 BITCOIND_DATADIR=${BITCOIND_DATADIR:-${BITCOIND_DEFAULT_DATADIR}}
-BITCOIND_USER=${BITCOIND_USER:-${BITCOIN_USER:-dash}}
+BITCOIND_USER=${BITCOIND_USER:-${BITCOIN_USER:-dashcore}}
-BITCOIND_GROUP=${BITCOIND_GROUP:-dash}
+BITCOIND_GROUP=${BITCOIND_GROUP:-dashcore}
 BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/dashd}
 BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}}
 BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}"

contrib/init/dashd.openrcconf

@@ -1,7 +1,7 @@
 # /etc/conf.d/dashd: config file for /etc/init.d/dashd
 
 # Config file location
-#BITCOIND_CONFIGFILE="/etc/dash/dash.conf"
+#BITCOIND_CONFIGFILE="/etc/dashcore/dash.conf"
 
 # What directory to write pidfile to?  (created and owned by $BITCOIND_USER)
 #BITCOIND_PIDDIR="/var/run/dashd"
@@ -13,8 +13,8 @@
 #BITCOIND_DATADIR="/var/lib/dashd"
 
 # User and group to own dashd process
-#BITCOIND_USER="dash"
+#BITCOIND_USER="dashcore"
-#BITCOIND_GROUP="dash"
+#BITCOIND_GROUP="dashcore"
 
 # Path to dashd executable
 #BITCOIND_BIN="/usr/bin/dashd"

contrib/init/dashd.service

@@ -3,13 +3,13 @@ Description=Dash's distributed currency daemon
 After=network.target
 
 [Service]
-User=dash
+User=dashcore
-Group=dash
+Group=dashcore
 
 Type=forking
 PIDFile=/var/lib/dashd/dashd.pid
 ExecStart=/usr/bin/dashd -daemon -pid=/var/lib/dashd/dashd.pid \
--conf=/etc/dash/dash.conf -datadir=/var/lib/dashd -disablewallet
+-conf=/etc/dashcore/dash.conf -datadir=/var/lib/dashd -disablewallet
 
 Restart=always
 PrivateTmp=true

contrib/qt_translations.py

@@ -2,7 +2,7 @@
 
 # Helpful little script that spits out a comma-separated list of
 # language codes for Qt icons that should be included
-# in binary dash distributions
+# in binary Dash Core distributions
 
 import glob
 import os

contrib/spendfrom/spendfrom.py

@@ -33,7 +33,7 @@ def check_json_precision():
         raise RuntimeError("JSON encode/decode loses precision")
 
 def determine_db_dir():
-    """Return the default location of the dash data directory"""
+    """Return the default location of the Dash Core data directory"""
     if platform.system() == "Darwin":
         return os.path.expanduser("~/Library/Application Support/DashCore/")
     elif platform.system() == "Windows":
@@ -63,7 +63,7 @@ def read_bitcoin_config(dbdir):
     return dict(config_parser.items("all"))
 
 def connect_JSON(config):
-    """Connect to a dash JSON-RPC server"""
+    """Connect to a Dash Core JSON-RPC server"""
     testnet = config.get('testnet', '0')
     testnet = (int(testnet) > 0)  # 0/1 in config file, convert to True/False
     if not 'rpcport' in config:

depends/README.md

@@ -40,7 +40,7 @@ The following can be set when running make: make FOO=bar
     DEBUG: disable some optimizations and enable more runtime checking
 
 If some packages are not built, for example `make NO_WALLET=1`, the appropriate
-options will be passed to dash's configure. In this case, `--disable-wallet`.
+options will be passed to Dash Core's configure. In this case, `--disable-wallet`.
 
 Additional targets:
 

doc/assets-attribution.md

@@ -1 +1 @@
-The list of assets used in the dash source and their attribution can now be found in [contrib/debian/copyright](../contrib/debian/copyright).
+The list of assets used in the Dash Core source and their attribution can now be found in [contrib/debian/copyright](../contrib/debian/copyright).

doc/build-unix.md

@@ -6,7 +6,7 @@ Some notes on how to build Dash Core in Unix.
 
 Note
 ---------------------
-Always use absolute paths to configure and compile dash and the dependencies,
+Always use absolute paths to configure and compile Dash Core and the dependencies,
 for example, when specifying the the path of the dependency:
 
 	../dist/configure --enable-cxx --disable-shared --with-pic --prefix=$BDB_PREFIX
@@ -211,7 +211,7 @@ Hardening enables the following features:
 
 * Non-executable Stack
     If the stack is executable then trivial stack based buffer overflow exploits are possible if
-    vulnerable buffers are found. By default, dash should be built with a non-executable stack
+    vulnerable buffers are found. By default, Dash Core should be built with a non-executable stack
     but if one of the libraries it uses asks for an executable stack or someone makes a mistake
     and uses a compiler extension which requires an executable stack, it will silently build an
     executable without the non-executable stack protection.
@@ -227,7 +227,7 @@ Hardening enables the following features:
 
 Disable-wallet mode
 --------------------
-When the intention is to run only a P2P node without a wallet, dash may be compiled in
+When the intention is to run only a P2P node without a wallet, Dash Core may be compiled in
 disable-wallet mode with:
 
     ./configure --disable-wallet

doc/gitian-building.md

@@ -300,7 +300,7 @@ cd ..
 
 **Note**: When sudo asks for a password, enter the password for the user *debian* not for *root*.
 
-Clone the git repositories for dash and Gitian.
+Clone the git repositories for Dash Core and Gitian.
 
 ```bash
 git clone https://github.com/devrandom/gitian-builder.git
@@ -339,7 +339,7 @@ Getting and building the inputs
 --------------------------------
 
 Follow the instructions in [doc/release-process.md](release-process.md#fetch-and-build-inputs-first-time-or-when-dependency-versions-change)
-in the dash repository under 'Fetch and build inputs' to install sources which require
+in the Dash Core repository under 'Fetch and build inputs' to install sources which require
 manual intervention. Also optionally follow the next step: 'Seed the Gitian sources cache
 and offline git repositories' which will fetch the remaining files required for building
 offline.
@@ -348,7 +348,7 @@ Building Dash Core
 ----------------
 
 To build Dash Core (for Linux, OS X and Windows) just follow the steps under 'perform
-Gitian builds' in [doc/release-process.md](release-process.md#perform-gitian-builds) in the dash repository.
+Gitian builds' in [doc/release-process.md](release-process.md#perform-gitian-builds) in the Dash Core repository.
 
 This may take some time as it will build all the dependencies needed for each descriptor.
 These dependencies will be cached after a successful build to avoid rebuilding them when possible.

doc/init.md

@@ -13,7 +13,7 @@ can be found in the contrib/init folder.
 1. Service User
 ---------------------------------
 
-All three Linux startup configurations assume the existence of a "dash" user
+All three Linux startup configurations assume the existence of a "dashcore" user
 and group.  They must be created before attempting to use these scripts.
 The OS X configuration assumes dashd will be set up for the current user.
 
@@ -54,15 +54,15 @@ see `contrib/debian/examples/dash.conf`.
 All three configurations assume several paths that might need to be adjusted.
 
 Binary:              `/usr/bin/dashd`  
-Configuration file:  `/etc/dash/dash.conf`  
+Configuration file:  `/etc/dashcore/dash.conf`  
 Data directory:      `/var/lib/dashd`  
 PID file:            `/var/run/dashd/dashd.pid` (OpenRC and Upstart) or `/var/lib/dashd/dashd.pid` (systemd)  
 Lock file:           `/var/lock/subsys/dashd` (CentOS)  
 
 The configuration file, PID directory (if applicable) and data directory
-should all be owned by the dash user and group.  It is advised for security
+should all be owned by the dashcore user and group.  It is advised for security
 reasons to make the configuration file and data directory only readable by the
-dash user and group.  Access to dash-cli and other dashd rpc clients
+dashcore user and group.  Access to dash-cli and other dashd rpc clients
 can then be controlled by group membership.
 
 3b) Mac OS X
@@ -116,7 +116,7 @@ This Launch Agent will cause dashd to start whenever the user logs in.
 
 NOTE: This approach is intended for those wanting to run dashd as the current user.
 You will need to modify org.dash.dashd.plist if you intend to use it as a
-Launch Daemon with a dedicated dash user.
+Launch Daemon with a dedicated dashcore user.
 
 5. Auto-respawn
 -----------------------------------

doc/tor.md

@@ -51,7 +51,7 @@ If you configure your Tor system accordingly, it is possible to make your node a
 reachable from the Tor network. Add these lines to your /etc/tor/torrc (or equivalent
 config file):
 
-	HiddenServiceDir /var/lib/tor/dash-service/
+	HiddenServiceDir /var/lib/tor/dashcore-service/
 	HiddenServicePort 9999 127.0.0.1:9999
 	HiddenServicePort 19999 127.0.0.1:19999
 
@@ -61,7 +61,7 @@ your dashd's P2P listen port (9999 by default).
 	-externalip=X   You can tell Dash Core about its publicly reachable address using
 	                this option, and this can be a .onion address. Given the above
 	                configuration, you can find your onion address in
-	                /var/lib/tor/dash-service/hostname. Onion addresses are given
+	                /var/lib/tor/dashcore-service/hostname. Onion addresses are given
 	                preference for your node to advertize itself with, for connections
 	                coming from unroutable addresses (such as 127.0.0.1, where the
 	                Tor proxy typically runs).

src/init.cpp

@@ -892,7 +892,7 @@ void InitLogging()
     LogPrintf("Dash Core version %s (%s)\n", FormatFullVersion(), CLIENT_DATE);
 }
 
-/** Initialize dash.
+/** Initialize Dash Core.
  *  @pre Parameters should be parsed and config file should be read.
  */
 bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)

src/qt/guiutil.cpp

@@ -788,7 +788,7 @@ bool SetStartOnSystemStartup(bool fAutoStart)
 LSSharedFileListItemRef findStartupItemInList(LSSharedFileListRef list, CFURLRef findUrl);
 LSSharedFileListItemRef findStartupItemInList(LSSharedFileListRef list, CFURLRef findUrl)
 {
-    // loop through the list of startup items and try to find the dash app
+    // loop through the list of startup items and try to find the Dash Core app
     CFArrayRef listSnapshot = LSSharedFileListCopySnapshot(list, NULL);
     for(int i = 0; i < CFArrayGetCount(listSnapshot); i++) {
         LSSharedFileListItemRef item = (LSSharedFileListItemRef)CFArrayGetValueAtIndex(listSnapshot, i);
@@ -833,7 +833,7 @@ bool SetStartOnSystemStartup(bool fAutoStart)
     LSSharedFileListItemRef foundItem = findStartupItemInList(loginItems, bitcoinAppUrl);
 
     if(fAutoStart && !foundItem) {
-        // add dash app to startup item list
+        // add Dash Core app to startup item list
         LSSharedFileListInsertItemURL(loginItems, kLSSharedFileListItemBeforeFirst, NULL, NULL, bitcoinAppUrl, NULL, NULL);
     }
     else if(!fAutoStart && foundItem) {

src/rpcmasternode.cpp

@@ -1,5 +1,4 @@
-// Copyright (c) 2010 Satoshi Nakamoto
+// Copyright (c) 2014-2016 The Dash Core developers
-// Copyright (c) 2009-2012 The Bitcoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/test/README.md

@@ -1,6 +1,6 @@
 # Notes
 The sources in this directory are unit test cases.  Boost includes a
-unit testing framework, and since dash already uses boost, it makes
+unit testing framework, and since Dash Core already uses boost, it makes
 sense to simply use this framework rather than require developers to
 configure some other framework (we want as few impediments to creating
 unit tests as possible).

src/wallet/rpcwallet.cpp

@@ -2191,7 +2191,7 @@ UniValue encryptwallet(const UniValue& params, bool fHelp)
     // slack space in .dat files; that is bad if the old data is
     // unencrypted private keys. So:
     StartShutdown();
-    return "wallet encrypted; dash server stopping, restart to run with encrypted wallet. The keypool has been flushed, you need to make a new backup.";
+    return "Wallet encrypted; Dash Core server stopping, restart to run with encrypted wallet. The keypool has been flushed, you need to make a new backup.";
 }
 
 UniValue lockunspent(const UniValue& params, bool fHelp)