Skip to content

Commit

Permalink
more dashpay.io->dash.org
Browse files Browse the repository at this point in the history
Closes #689
  • Loading branch information
UdjinM6 authored and schinzelh committed Feb 1, 2016
1 parent c0ec48a commit 826cba7
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 28 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
2 changes: 1 addition & 1 deletion contrib/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion doc/gitian-building.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/guide-startmany.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
18 changes: 2 additions & 16 deletions doc/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion share/setup.nsi.in
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/darksend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/dashd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
2 changes: 1 addition & 1 deletion src/pow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/qt/guiconstants.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit 826cba7

Please sign in to comment.