4 files changed, 64 insertions, 35 deletions
diff --git a/doc/README.md b/doc/README.md
index ecb8dc80fd..b2a0c2dcb7 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1,9 +1,6 @@
-Bitcoin 0.10.99
+Bitcoin Core 0.10.99
 =====================
 
-Copyright (c) 2009-2014 Bitcoin Developers
-
-
 Setup
 ---------------------
 [Bitcoin Core](http://bitcoin.org/en/download) is the original Bitcoin client and it builds the backbone of the network. However, it downloads and stores the entire history of Bitcoin transactions (which is currently several GBs); depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once. If you would like the process to go faster you can [download the blockchain directly](bootstrap.md).
@@ -51,7 +48,7 @@ Development
 ---------------------
 The Bitcoin repo's [root README](https://github.com/bitcoin/bitcoin/blob/master/README.md) contains relevant information on the development process and automated testing.
 
-- [Coding Guidelines](coding.md)
+- [Developer Notes](developer-notes.md)
 - [Multiwallet Qt Development](multiwallet-qt.md)
 - [Release Notes](release-notes.md)
 - [Release Process](release-process.md)
diff --git a/doc/README_windows.txt b/doc/README_windows.txt
index 5ac1152055..c582941696 100644
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@ -1,13 +1,5 @@
-Bitcoin 0.10.99
-
-Copyright (c) 2009-2014 Bitcoin Core Developers
-
-Distributed under the MIT software license, see the accompanying
-file COPYING or http://www.opensource.org/licenses/mit-license.php.
-This product includes software developed by the OpenSSL Project for use in
-the OpenSSL Toolkit (https://www.openssl.org/).  This product includes
-cryptographic software written by Eric Young (eay@cryptsoft.com).
-
+Bitcoin Core 0.10.99
+=====================
 
 Intro
 -----
diff --git a/doc/assets-attribution.md b/doc/assets-attribution.md
index 6c5f91a834..31fe4e5b7a 100644
--- a/doc/assets-attribution.md
+++ b/doc/assets-attribution.md
@@ -1,14 +1,5 @@
 The following is a list of assets used in the bitcoin source and their proper attribution.
 
-[Wladimir van der Laan](https://github.com/laanwj)
------------------------
-#### Info
-* License: MIT
-
-### Assets Used
-	src/qt/res/icons/watch*.png, src/qt/res/icons/tx_in.png,
-    src/qt/res/icons/tx_inout.png,
-
 [Typicons/Stephen Hutchings](http://typicons.com)
 -----------------------
 
@@ -30,7 +21,7 @@ The following is a list of assets used in the bitcoin source and their proper at
     src/qt/res/icons/overview.png, src/qt/res/icons/quit.png,
     src/qt/res/icons/receive.png, src/qt/res/icons/remove.png,
     src/qt/res/icons/send.png, src/qt/res/icons/synced.png,
-    src/qt/res/icons/transaction*.png, src/qt/res/icons/tx_input.png,
+    src/qt/res/icons/transaction*.png, src/qt/res/icons/tx_output.png,
 
 Jonas Schnelli
 -----------------------
@@ -38,18 +29,19 @@ Jonas Schnelli
 ### Info
 * Designer: Jonas Schnelli
 * Bitcoin Icon: (based on the original bitcoin logo from Bitboy)
-* Some icons are based on Stephan Hutchings Typicons
+* Some icons are based on Stephan Hutchings Typicons (these are under CC BY-SA license)
 * License: MIT
 
 ### Assets Used
     src/qt/res/icons/about.png, src/qt/res/icons/about_qt.png,
-    src/qt/res/icons/clock*.png, src/qt/res/icons/connect[0-3].png,
-    src/qt/res/icons/eye_minus.png, src/qt/res/icons/verify.png,
-    src/qt/res/icons/eye_plus.png, src/qt/res/icons/tx_inout.png,
-    src/qt/res/icons/tx_output.png, src/qt/res/icons/bitcoin.icns,
-    src/qt/res/src/bitcoin.svg, src/qt/res/src/bitcoin.ico,
-    src/qt/res/src/bitcoin.png, src/qt/res/src/bitcoin_testnet.png,
-    docs/bitcoin_logo_doxygen.png, src/qt/res/src/tx*.svg,
-    src/qt/res/src/connect*.svg, src/qt/res/src/clock*.svg,
-    src/qt/res/src/mine.svg, src/qt/res/src/qt.svg,
+    src/qt/res/icons/bitcoin.icns, src/qt/res/icons/bitcoin.ico,
+    src/qt/res/icons/bitcoin.png, src/qt/res/icons/clock*.png,
+    src/qt/res/icons/connect[0-3].png, src/qt/res/icons/eye_minus.png,
+    src/qt/res/icons/eye_plus.png, src/qt/res/icons/verify.png,
+    src/qt/res/icons/tx_inout.png, src/qt/res/icons/tx_input.png,
+    src/qt/res/icons/unit_btc.png, src/qt/res/icons/unit_mbtc.png,
+    src/qt/res/icons/unit_ubtc.png, src/qt/res/src/verify.svg
+    src/qt/res/src/bitcoin.svg, src/qt/res/src/clock*.svg,
+    src/qt/res/src/connect*.svg, src/qt/res/src/mine.svg,
+    src/qt/res/src/qt.svg, src/qt/res/src/tx*.svg,
     src/qt/res/src/verify.svg,
diff --git a/doc/coding.md b/doc/developer-notes.md
index 43294dbe4c..eaeb90da1d 100644
--- a/doc/coding.md
+++ b/doc/developer-notes.md
@@ -89,6 +89,41 @@ Not OK (used plenty in the current source, but not picked up):
 A full list of comment syntaxes picked up by doxygen can be found at http://www.stack.nl/~dimitri/doxygen/manual/docblocks.html,
 but if possible use one of the above styles.
 
+Development tips and tricks
+---------------------------
+
+**compiling for debugging**
+
+Run configure with the --enable-debug option, then make. Or run configure with
+CXXFLAGS="-g -ggdb -O0" or whatever debug flags you need.
+
+**debug.log**
+
+If the code is behaving strangely, take a look in the debug.log file in the data directory;
+error and debugging messages are written there.
+
+The -debug=... command-line option controls debugging; running with just -debug will turn
+on all categories (and give you a very large debug.log file).
+
+The Qt code routes qDebug() output to debug.log under category "qt": run with -debug=qt
+to see it.
+
+**testnet and regtest modes**
+
+Run with the -testnet option to run with "play bitcoins" on the test network, if you
+are testing multi-machine code that needs to operate across the internet.
+
+If you are testing something that can run on one machine, run with the -regtest option.
+In regression test mode, blocks can be created on-demand; see qa/rpc-tests/ for tests
+that run in -regtest mode.
+
+**DEBUG_LOCKORDER**
+
+Bitcoin Core is a multithreaded application, and deadlocks or other multithreading bugs
+can be very difficult to track down. Compiling with -DDEBUG_LOCKORDER (configure
+CXXFLAGS="-DDEBUG_LOCKORDER -g") inserts run-time checks to keep track of which locks
+are held, and adds warnings to the debug.log file if inconsistencies are detected.
+
 Locking/mutex usage notes
 -------------------------
 
@@ -136,3 +171,16 @@ Threads
 - BitcoinMiner : Generates bitcoins (if wallet is enabled).
 
 - Shutdown : Does an orderly shutdown of everything.
+
+Pull Request Terminology
+------------------------
+
+Concept ACK - Agree with the idea and overall direction, but haven't reviewed the code changes or tested them.
+
+utACK (untested ACK) - Reviewed and agree with the code changes but haven't actually tested them.
+
+Tested ACK - Reviewed the code changes and have verified the functionality or bug fix.
+
+ACK -  A loose ACK can be confusing. It's best to avoid them unless it's a documentation/comment only change in which case there is nothing to test/verify; therefore the tested/untested distinction is not there.
+
+NACK - Disagree with the code changes/concept. Should be accompanied by an explanation.