5 files changed, 33 insertions, 17 deletions
diff --git a/doc/Tor.txt b/doc/Tor.txt
index e088d87105..f515f96f49 100644
--- a/doc/Tor.txt
+++ b/doc/Tor.txt
@@ -28,10 +28,6 @@ outgoing connections be anonimized, but more is possible.
                 need to set this if it's the same as -proxy. You can use -notor
                 to explicitly disable access to hidden service.
 
--dnsseed        DNS seeds are not resolved directly when a SOCKS5 proxy server is
-                set. Rather, a short-lived proxy connection to the dns seed
-                hostname is attempted, and peer addresses are requested.
-
 -listen         When using -proxy, listening is disabled by default. If you want
                 to run a hidden service (see next section), you'll need to enable
                 it explicitly.
diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt
index 4a4ab08685..c66665d012 100644
--- a/doc/assets-attribution.txt
+++ b/doc/assets-attribution.txt
@@ -29,6 +29,7 @@ Designer: md2k7
 Site: https://bitcointalk.org/index.php?topic=15276.0
 License: You are free to do with these icons as you wish, including selling,
  copying, modifying etc.
+License: MIT
 
 Icon: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png,
       src/qt/res/icons/editcopy.png, src/qt/res/icons/editpaste.png,
diff --git a/doc/coding.txt b/doc/coding.txt
index b3c812a486..0813105e73 100644
--- a/doc/coding.txt
+++ b/doc/coding.txt
@@ -44,7 +44,7 @@ bn      CBigNum
 Locking/mutex usage notes
 
 The code is multi-threaded, and uses mutexes and the
-CRITICAL_BLOCK/TRY_CRITICAL_BLOCK macros to protect data structures.
+LOCK/TRY_LOCK macros to protect data structures.
 
 Deadlocks due to inconsistent lock ordering (thread 1 locks cs_main
 and then cs_wallet, while thread 2 locks them in the opposite order:
diff --git a/doc/release-notes.txt b/doc/release-notes.txt
index 5374847b51..c2fdc425fd 100644
--- a/doc/release-notes.txt
+++ b/doc/release-notes.txt
@@ -1,4 +1,3 @@
-
 (note: this is a temporary file, to be added-to by anybody, and deleted at
 release time)
 
@@ -6,7 +5,25 @@ Building this from
 
 	$ git shortlog --no-merges v0.6.3..
 
+How to Upgrade
+--------------
 
+If you are running an older version, shut it down. Wait
+until it has completely shut down (which might take a few minutes for older
+versions), then run the installer (on Windows) or just copy over
+/Applications/Bitcoin-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux).
+
+If you were running on Linux with a version that might have been compiled
+with a different version of Berkeley DB (for example, if you were using an
+Ubuntu PPA version), then run the old version again with the -detachdb
+argument and shut it down; if you do not, then the new version will not
+be able to read the database files and will exit with an error.
+
+Incompatible Changes
+--------------------
+* Replaced the 'getmemorypool' RPC command with 'getblocktemplate/submitblock'
+  and 'getrawmempool' commands.
+* Remove deprecated RPC 'getblocknumber'
 
 Bitcoin Improvement Proposals implemented
 -----------------------------------------
@@ -24,7 +41,9 @@ Core bitcoin handling and blockchain database
 * Database: better validation of on-disk stored data
 * Database: minor optimizations and reliability improvements
 * -loadblock=FILE will import an external block file
-* Additional DoS prevention measures
+* Additional DoS (denial-of-service) prevention measures
+* New blockchain checkpoint at block 193,000
+* (Windows only): enable ASLR and DEP for bitcoind.exe
 
 
 JSON-RPC API
@@ -43,7 +62,7 @@ JSON-RPC API
 * Rework gettransaction, getblock calls. 'gettransaction' responds for
   non-wallet TXs now.
 * Remove deprecated RPC 'getblocknumber'
-* New blockchain checkpoint at block 193,000
+* Remove superceded RPC 'getmemorypool' (see BIP 22, above)
 * listtransactions output now displays "smart" times for transactions,
   and 'blocktime' and 'timereceived' fields were added
 
@@ -51,7 +70,7 @@ JSON-RPC API
 P2P networking
 --------------
 * IPv6 support
-* Tor hidden service support
+* Tor hidden service support (see doc/Tor.txt)
 * Attempts to fix "stuck blockchain download" problems
 * Replace BDB database "addr.dat" with internally-managed "peers.dat"
   file containing peer address data.
@@ -83,7 +102,7 @@ Qt GUI
 * Override progress bar design on platforms with segmented progress bars to assist with readability
 * Added 'immature balance' display on the overview page
 * (Windows only): enable ASLR and DEP for bitcoin-qt.exe
-* (Windows only): add meta-data to bitcoin-qt.exe (e.g. description)
+* (Windows only): add meta-data to bitcoin-qt.exe (e.g. description and version)
 
 Internal codebase
 -----------------
@@ -95,4 +114,4 @@ Miscellaneous
 -------------
 * Reopen debug.log upon SIGHUP
 * Bash programmable completion for bitcoind(1)
-* On supported OS's, each thread is given a useful name
+* On supported OSes, each thread is given a useful name
diff --git a/doc/release-process.txt b/doc/release-process.txt
index 59488a7bfe..8443961d27 100644
--- a/doc/release-process.txt
+++ b/doc/release-process.txt
@@ -2,7 +2,7 @@
 
 * update (commit) version in sources
   bitcoin-qt.pro
-  src/version.h
+  src/clientversion.h
   share/setup.nsi
   doc/README*
 
@@ -21,7 +21,7 @@
    export VERSION=0.5.1
    cd ./gitian-builder
 
-  * Fetch and build inputs:
+  * Fetch and build inputs: (first time, or when dependency versions change)
    mkdir -p inputs; cd inputs/
    wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.6.tar.gz' -O miniupnpc-1.6.tar.gz
    wget 'http://www.openssl.org/source/openssl-1.0.1b.tar.gz'
@@ -29,15 +29,15 @@
    wget 'http://zlib.net/zlib-1.2.6.tar.gz'
    wget 'ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.9.tar.gz'
    wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2'
-   wget 'http://downloads.sourceforge.net/project/boost/boost/1.47.0/boost_1_47_0.tar.bz2'
+   wget 'http://downloads.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.bz2'
    wget 'http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz'
    cd ..
    ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win32.yml
-   cp build/out/boost-win32-1.47.0-gitian.zip inputs/
+   mv build/out/boost-win32-1.50.0-gitian2.zip inputs/
    ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/qt-win32.yml
-   cp build/out/qt-win32-4.7.4-gitian.zip inputs/
+   mv build/out/qt-win32-4.7.4-gitian.zip inputs/
    ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-win32.yml
-   cp build/out/bitcoin-deps-0.0.3.zip inputs/
+   mv build/out/bitcoin-deps-0.0.3.zip inputs/
 
   * Build bitcoind and bitcoin-qt on Linux32, Linux64, and Win32:
    ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian.yml