Merge branch '0.6.0.x' into 0.6.x

Conflicts:
	src/qt/locale/bitcoin_fa.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_sv.ts

6 files changed, 17 insertions, 18 deletions

diff --git a/contrib/debian/control b/contrib/debian/control
index b81c02ec1a..d0a2d57c9e 100644
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -43,7 +43,7 @@ Description: peer-to-peer network based digital currency - daemon
 Package: bitcoin-qt
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: peer-to-peer network based digital currency - QT GUI
+Description: peer-to-peer network based digital currency - Qt GUI
  Bitcoin is a free open source peer-to-peer electronic cash system that
  is completely decentralized, without the need for a central server or
  trusted parties.  Users hold the crypto keys to their own money and
@@ -55,4 +55,4 @@ Description: peer-to-peer network based digital currency - QT GUI
  Full transaction history is stored locally at each client.  This
  requires 2+ GB of space, slowly growing.
  .
- This package provides bitcoin-qt, a GUI for Bitcoin based on QT.
+ This package provides Bitcoin-Qt, a GUI for Bitcoin based on Qt.
diff --git a/contrib/debian/copyright b/contrib/debian/copyright
index 71fa77cf6c..b99604913c 100644
--- a/contrib/debian/copyright
+++ b/contrib/debian/copyright
@@ -6,7 +6,7 @@ Source: http://sourceforge.net/projects/bitcoin/files/
  https://github.com/bitcoin/bitcoin
 
 Files: *
-Copyright: 2009-2011, Bitcoin Developers
+Copyright: 2009-2012, Bitcoin Developers
 License: Expat
 Comment: The Bitcoin Developers encompasses the current developers listed on bitcoin.org,
          as well as the numerous contributors to the project.
@@ -55,9 +55,8 @@ Comment: Icon Pack: Human-O2
 
 Files: src/qt/res/icons/transaction*.png
 Copyright: md2k7
-License: You are free to do with these icons as you wish, including selling,
- copying, modifying etc.
-Comment: Site: https://forum.bitcoin.org/index.php?topic=15276.0
+License: Expat
+Comment: Site: https://bitcointalk.org/index.php?topic=15276.0
 
 Files: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png,
       src/qt/res/icons/editcopy.png, src/qt/res/icons/editpaste.png,
@@ -70,7 +69,7 @@ Comment: Icon Pack: Crystal SVG
 Files: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png
 Copyright: Bitboy (optimized for 16x16 by Wladimir van der Laan)
 License: PUB-DOM
-Comment: Site: http://forum.bitcoin.org/?topic=1756.0
+Comment: Site: https://bitcointalk.org/?topic=1756.0
 
 Files:  scripts/img/reload.xcf, src/qt/res/movies/update_spinner.mng
 Copyright: Everaldo (Everaldo Coelho)
diff --git a/doc/README b/doc/README
index 6e55c247ca..3544f9e733 100644
--- a/doc/README
+++ b/doc/README
@@ -18,7 +18,7 @@ with each other, with the help of a P2P network to check for double-spending.
 
 Setup
 -----
-You need the Qt4 run-time libraries to run bitcoin-qt. On Debian or Ubuntu:
+You need the Qt4 run-time libraries to run Bitcoin-Qt. On Debian or Ubuntu:
   sudo apt-get install libqtgui4
 
 Unpack the files into a directory and run:
diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt
index 0b0e377065..72487ca351 100644
--- a/doc/assets-attribution.txt
+++ b/doc/assets-attribution.txt
@@ -26,9 +26,10 @@ Site: http://findicons.com/icon/93743/blocks_gnome_netstatus_0
 
 Icon: src/qt/res/icons/transaction*.png
 Designer: md2k7
-Site: https://forum.bitcoin.org/index.php?topic=15276.0
+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,
@@ -41,7 +42,7 @@ License: LGPL
 Icon: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png
 Designer: Bitboy (optimized for 16x16 by Wladimir van der Laan)
 License: Public Domain
-Site: http://forum.bitcoin.org/?topic=1756.0
+Site: https://bitcointalk.org/?topic=1756.0
 
 Icon:  scripts/img/reload.xcf (modified),src/qt/res/movies/update_spinner.mng
 Icon Pack: Kids
diff --git a/doc/readme-qt.rst b/doc/readme-qt.rst
index 294f31ac24..f55b9e7bd2 100644
--- a/doc/readme-qt.rst
+++ b/doc/readme-qt.rst
@@ -1,4 +1,4 @@
-Bitcoin-qt: Qt4 GUI for Bitcoin
+Bitcoin-Qt: Qt4 GUI for Bitcoin
 ===============================
 
 Build instructions
@@ -27,21 +27,20 @@ Alternatively, install Qt Creator and open the `bitcoin-qt.pro` file.
 
 An executable named `bitcoin-qt` will be built.
 
-
 Windows
 --------
 
 Windows build instructions:
 
-- Download the `QT Windows SDK`_ and install it. You don't need the Symbian stuff, just the desktop Qt.
+- Download the `Qt Windows SDK`_ and install it. You don't need the Symbian stuff, just the desktop Qt.
 
 - Download and extract the `dependencies archive`_  [#]_, or compile openssl, boost and dbcxx yourself.
 
 - Copy the contents of the folder "deps" to "X:\\QtSDK\\mingw", replace X:\\ with the location where you installed the Qt SDK. Make sure that the contents of "deps\\include" end up in the current "include" directory.
 
-- Open the .pro file in QT creator and build as normal (ctrl-B)
+- Open the bitcoin-qt.pro file in Qt Creator and build as normal (ctrl-B)
 
-.. _`QT Windows SDK`: http://qt.nokia.com/downloads/sdk-windows-cpp
+.. _`Qt Windows SDK`: http://qt.nokia.com/downloads/sdk-windows-cpp
 .. _`dependencies archive`: https://download.visucore.com/bitcoin/qtgui_deps_1.zip
 .. [#] PGP signature: https://download.visucore.com/bitcoin/qtgui_deps_1.zip.sig (signed with RSA key ID `610945D0`_)
 .. _`610945D0`: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x610945D0
@@ -61,7 +60,7 @@ Mac OS X
 	sudo port selfupdate
 	sudo port install boost db48 miniupnpc
 
-- Open the .pro file in Qt Creator and build as normal (cmd-B)
+- Open the bitcoin-qt.pro file in Qt Creator and build as normal (cmd-B)
 
 .. _`Qt Mac OS X SDK`: http://qt.nokia.com/downloads/sdk-mac-os-cpp
 .. _`MacPorts`: http://www.macports.org/install.php
@@ -70,7 +69,7 @@ Mac OS X
 Build configuration options
 ============================
 
-UPNnP port forwarding
+UPnP port forwarding
 ---------------------
 
 To use UPnP for port forwarding behind a NAT router (recommended, as more connections overall allow for a faster and more stable bitcoin experience), pass the following argument to qmake:
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
index e6c00e39d8..eb820ade6d 100644
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -17,7 +17,7 @@ createArgs(int nRequired, const char* address1=NULL, const char* address2=NULL)
     result.push_back(nRequired);
     Array addresses;
     if (address1) addresses.push_back(address1);
-    if (address2) addresses.push_back(address1);
+    if (address2) addresses.push_back(address2);
     result.push_back(addresses);
     return result;
 }