V0.12.0.x merge master

doc/build-unix.md

@@ -145,10 +145,10 @@ Berkeley DB
 It is recommended to use Berkeley DB 4.8. If you have to build it yourself:
 
 ```bash
-BITCOIN_ROOT=$(pwd)
+DASH_ROOT=$(pwd)
 
 # Pick some path to install BDB to, here we create a directory within the dash directory
-BDB_PREFIX="${BITCOIN_ROOT}/db4"
+BDB_PREFIX="${DASH_ROOT}/db4"
 mkdir -p $BDB_PREFIX
 
 # Fetch the source and verify that it is not tampered with
@@ -164,7 +164,7 @@ cd db-4.8.30.NC/build_unix/
 make install
 
 # Configure Dash Core to use our own-built instance of BDB
-cd $BITCOIN_ROOT
+cd $DASH_ROOT
 ./configure (other args...) LDFLAGS="-L${BDB_PREFIX}/lib/" CPPFLAGS="-I${BDB_PREFIX}/include/"
 ```
 
@@ -181,7 +181,7 @@ If you need to build Boost yourself:
 
 Security
 --------
-To help make your dash installation more secure by making certain attacks impossible to
+To help make your Dash installation more secure by making certain attacks impossible to
 exploit even if a vulnerability is found, binaries are hardened by default.
 This can be disabled with:
 
@@ -205,21 +205,21 @@ Hardening enables the following features:
 
     To test that you have built PIE executable, install scanelf, part of paxutils, and use:
 
-    	scanelf -e ./dash
+    	scanelf -e ./dashd
 
     The output should contain:
      TYPE
     ET_DYN
 
 * Non-executable Stack
     If the stack is executable then trivial stack based buffer overflow exploits are possible if
-    vulnerable buffers are found. By default, bitcoin should be built with a non-executable stack
+    vulnerable buffers are found. By default, dash 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.
 
     To verify that the stack is non-executable after compiling use:
-    `scanelf -e ./dash`
+    `scanelf -e ./dashd`
 
     the output should contain:
 	STK/REL/PTL
@@ -229,7 +229,7 @@ Hardening enables the following features:
 
 Disable-wallet mode
 --------------------
-When the intention is to run only a P2P node without a wallet, bitcoin may be compiled in
+When the intention is to run only a P2P node without a wallet, dash may be compiled in
 disable-wallet mode with:
 
     ./configure --disable-wallet

doc/gitian-building.md

@@ -287,6 +287,9 @@ git checkout v${VERSION}
 cd ..
 ```
 
+**Note**: if you've installed Gitian before May 16, 2015, please update to the latest version, see https://github.com/devrandom/gitian-builder/issues/86
+
+
 Setting up gitian images
 -------------------------
 

doc/release-notes.md

@@ -1,5 +1,34 @@
-Dash Core release notes can be found here:
-- [v0.11.0](release-notes/release-notes-0.11.0.md) released Jan/15/2015
-- [v0.11.1](release-notes/release-notes-0.11.1.md) released Feb/10/2015.
-- [v0.11.2](release-notes/release-notes-0.11.2.md) released Mar/25/2015.
-- [v0.12.0](release-notes/release-notes-0.12.0.md) not released yet.
+Dash Core 0.12
+==================
+
+Dash Core tree 0.12.x release notes can be found here:
+- [v0.12.0](release-notes/dash/release-notes-0.12.0.md) not released yet.
+
+Dash Core tree 0.12.x is a fork of Bitcoin Core tree 0.10.2
+
+
+
+Older releases
+--------------
+
+Dash was previously known as Darkcoin.
+
+Darkcoin tree 0.8.x was a fork of Litecoin tree 0.8, original name was XCoin
+which was first released on Jan/18/2014.
+
+Darkcoin tree 0.9.x was the open source implementation of masternodes based on
+the 0.8.x tree and was first released on Mar/13/2014.
+
+Darkcoin tree 0.10.x used to be the closed source implementation of Darksend
+which was released open source on Sep/25/2014.
+
+Dash Core tree 0.11.x was a fork of Bitcoin Core tree 0.9, Darkcoin was rebranded
+to Dash.
+
+These release are considered obsolete. Old changelogs can be found here:
+
+- [v0.11.2](release-notes/dash/release-notes-0.11.2.md) released Mar/25/2015
+- [v0.11.1](release-notes/dash/release-notes-0.11.1.md) released Feb/10/2015
+- [v0.11.0](release-notes/dash/release-notes-0.11.0.md) released Jan/15/2015
+- [v0.10.x](release-notes/dash/release-notes-0.10.0.md) released Sep/25/2014
+- [v0.9.x](release-notes/dash/release-notes-0.9.0.md) released Mar/13/2014