From 826cba78a53ceade08e6df85954901cd666a616e Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Sun, 31 Jan 2016 16:11:16 +0300 Subject: [PATCH] more dashpay.io->dash.org Closes #689 --- README.md | 4 ++-- configure.ac | 2 +- contrib/debian/control | 2 +- doc/gitian-building.md | 2 +- doc/guide-startmany.md | 2 +- doc/release-process.md | 18 ++---------------- share/setup.nsi.in | 2 +- src/darksend.cpp | 4 ++-- src/dashd.cpp | 2 +- src/pow.cpp | 2 +- src/qt/guiconstants.h | 2 +- 11 files changed, 14 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index d288afdf6..e36535b4d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Dash Core staging tree 0.12 =============================== -https://www.dashpay.io +https://www.dash.org Copyright (c) 2009-2016 Bitcoin Core Developers @@ -18,7 +18,7 @@ are carried out collectively by the network. Dash Core is the name of open source software which enables the use of this currency. For more information, as well as an immediately useable, binary version of -the Dash Core software, see https://www.dashpay.io/downloads. +the Dash Core software, see https://www.dash.org/downloads. License diff --git a/configure.ac b/configure.ac index 34d57b49b..4cd889c78 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ define(_CLIENT_VERSION_REVISION, 1) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2016) -AC_INIT([Dash Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@dashpay.io],[dash]) +AC_INIT([Dash Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@dash.org],[dash]) AC_CONFIG_SRCDIR([src/main.cpp]) AC_CONFIG_HEADERS([src/config/dash-config.h]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/contrib/debian/control b/contrib/debian/control index 72cfb9747..bcd0726d8 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -22,7 +22,7 @@ Build-Depends: debhelper, libqrencode-dev, libprotobuf-dev, protobuf-compiler Standards-Version: 3.9.2 -Homepage: http://www.dashpay.io/ +Homepage: http://www.dash.org/ Vcs-Git: git://github.com/dashpay/dash.git Vcs-Browser: http://github.com/dashpay/dash diff --git a/doc/gitian-building.md b/doc/gitian-building.md index d287c675e..b90724d39 100644 --- a/doc/gitian-building.md +++ b/doc/gitian-building.md @@ -11,7 +11,7 @@ the same, tested dependencies are used and statically built into the executable. Multiple developers build the source code by following a specific descriptor ("recipe"), cryptographically sign the result, and upload the resulting signature. These results are compared and only if they match, the build is accepted and uploaded -to dashpay.io. +to dash.org. More independent gitian builders are needed, which is why I wrote this guide. It is preferred to follow these steps yourself instead of using someone else's diff --git a/doc/guide-startmany.md b/doc/guide-startmany.md index 109405cdc..af995c9a7 100644 --- a/doc/guide-startmany.md +++ b/doc/guide-startmany.md @@ -135,7 +135,7 @@ You can confirm that remote server is on the correct block by issuing ```dashd getinfo``` -and comparing with the official explorer at http://explorer.dashpay.io/chain/Dash +and comparing with the official explorer at http://explorer.dash.org/chain/Dash ### Local diff --git a/doc/release-process.md b/doc/release-process.md index 250eb63b8..c8cef7da9 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -131,23 +131,9 @@ rm SHA256SUMS ``` (the digest algorithm is forced to sha256 to avoid confusion of the `Hash:` header that GPG adds with the SHA256 used for the files) -- Upload zips and installers, as well as `SHA256SUMS.asc` from last step, to the bitcoin.org server - into `/var/www/bin/bitcoin-core-${VERSION}` +- Upload zips and installers, as well as `SHA256SUMS.asc` from last step, to the dash.org server -- Update dashpay.io version ***TODO*** - - - First, check to see if the dashpay.io maintainers have prepared a - release: https://github.com/bitcoin/bitcoin.org/labels/Releases - - - If they have, it will have previously failed their Travis CI - checks because the final release files weren't uploaded. - Trigger a Travis CI rebuild---if it passes, merge. - - - If they have not prepared a release, follow the Bitcoin.org release - instructions: https://github.com/bitcoin/bitcoin.org#release-notes - - - After the pull request is merged, the website will automatically show the newest version within 15 minutes, as well - as update the OS download links. Ping @saivann/@harding (saivann/harding on Freenode) in case anything goes wrong +- Update dash.org - Announce the release: diff --git a/share/setup.nsi.in b/share/setup.nsi.in index 083ec8875..4470618cb 100644 --- a/share/setup.nsi.in +++ b/share/setup.nsi.in @@ -7,7 +7,7 @@ SetCompressor /SOLID lzma !define REGKEY "SOFTWARE\$(^Name)" !define VERSION @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@ !define COMPANY "Dash Core project" -!define URL https://www.dashpay.io/ +!define URL https://www.dash.org/ # MUI Symbol Definitions !define MUI_ICON "@abs_top_srcdir@/share/pixmaps/bitcoin.ico" diff --git a/src/darksend.cpp b/src/darksend.cpp index 95c1d2c02..691c99812 100644 --- a/src/darksend.cpp +++ b/src/darksend.cpp @@ -39,8 +39,8 @@ CActiveMasternode activeMasternode; /* *** BEGIN DARKSEND MAGIC - DASH ********** Copyright (c) 2014-2015, Dash Developers - eduffield - evan@dashpay.io - udjinm6 - udjinm6@dashpay.io + eduffield - evan@dash.org + udjinm6 - udjinm6@dash.org */ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand, CDataStream& vRecv) diff --git a/src/dashd.cpp b/src/dashd.cpp index ad94af7b6..e6bbbde98 100644 --- a/src/dashd.cpp +++ b/src/dashd.cpp @@ -23,7 +23,7 @@ * * \section intro_sec Introduction * - * This is the developer documentation of the reference client for an experimental new digital currency called Dash (http://www.dashpay.io/), + * This is the developer documentation of the reference client for an experimental new digital currency called Dash (http://www.dash.org/), * which enables instant payments to anyone, anywhere in the world. Dash uses peer-to-peer technology to operate * with no central authority: managing transactions and issuing money are carried out collectively by the network. * diff --git a/src/pow.cpp b/src/pow.cpp index ade2ec915..96329198c 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -80,7 +80,7 @@ unsigned int static KimotoGravityWell(const CBlockIndex* pindexLast) { } unsigned int static DarkGravityWave(const CBlockIndex* pindexLast) { - /* current difficulty formula, dash - DarkGravity v3, written by Evan Duffield - evan@dashpay.io */ + /* current difficulty formula, dash - DarkGravity v3, written by Evan Duffield - evan@dash.org */ const CBlockIndex *BlockLastSolved = pindexLast; const CBlockIndex *BlockReading = pindexLast; int64_t nActualTimespan = 0; diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h index 74d5f39b0..47974d89c 100644 --- a/src/qt/guiconstants.h +++ b/src/qt/guiconstants.h @@ -46,7 +46,7 @@ static const int MAX_URI_LENGTH = 255; #define SPINNER_FRAMES 35 #define QAPP_ORG_NAME "Dash" -#define QAPP_ORG_DOMAIN "dashpay.io" +#define QAPP_ORG_DOMAIN "dash.org" #define QAPP_APP_NAME_DEFAULT "Dash-Qt" #define QAPP_APP_NAME_TESTNET "Dash-Qt-testnet"