Merge branch '0.6.0.x' into 0.6.x

10 files changed, 16 insertions, 16 deletions

diff --git a/doc/Doxyfile b/doc/Doxyfile
index 08d4f8c37f..c32d0f8959 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -203,7 +203,7 @@ TAB_SIZE               = 8
 # For example adding "sideeffect=\par Side Effects:\n" will allow you to 
 # put the command \sideeffect (or @sideeffect) in the documentation, which 
 # will result in a user-defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
+# You can put \n in the value part of an alias to insert newlines.
 
 ALIASES                = 
 
diff --git a/doc/unit-tests.txt b/doc/unit-tests.txt
index f76970d51e..a12786512d 100644
--- a/doc/unit-tests.txt
+++ b/doc/unit-tests.txt
@@ -12,9 +12,9 @@ make -f makefile.unix test_bitcoin  # Replace makefile.unix if you're not on uni
 If all tests succeed the last line of output will be:
 *** No errors detected
 
-To add more tests, add BOOST_AUTO_TEST_CASE's to the existing
+To add more tests, add BOOST_AUTO_TEST_CASE functions to the existing
 .cpp files in the test/ directory or add new .cpp files that
-implement new BOOST_AUTO_TEST_SUITE's (the makefiles are
+implement new BOOST_AUTO_TEST_SUITE sections (the makefiles are
 set up to add test/*.cpp to test_bitcoin automatically).
 
 
diff --git a/src/addrman.h b/src/addrman.h
index c45379872c..526c838025 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -173,13 +173,13 @@ private:
     // last used nId
     int nIdCount;
 
-    // table with information about all nId's
+    // table with information about all nIds
     std::map<int, CAddrInfo> mapInfo;
 
     // find an nId based on its network address
     std::map<CNetAddr, int> mapAddr;
 
-    // randomly-ordered vector of all nId's
+    // randomly-ordered vector of all nIds
     std::vector<int> vRandom;
 
     // number of "tried" entries
@@ -252,8 +252,8 @@ public:
         // * nNew
         // * nTried
         // * number of "new" buckets
-        // * all nNew addrinfo's in vvNew
-        // * all nTried addrinfo's in vvTried
+        // * all nNew addrinfos in vvNew
+        // * all nTried addrinfos in vvTried
         // * for each bucket:
         //   * number of elements
         //   * for each element: index
diff --git a/src/init.cpp b/src/init.cpp
index 1fecfbe2f4..7bea45bbad 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -76,7 +76,7 @@ void Shutdown(void* parg)
         printf("Bitcoin exiting\n\n");
         fExit = true;
 #ifndef QT_GUI
-        // ensure non-UI client get's exited here, but let Bitcoin-Qt reach return 0; in bitcoin.cpp
+        // ensure non-UI client gets exited here, but let Bitcoin-Qt reach 'return 0;' in bitcoin.cpp
         exit(0);
 #endif
     }
diff --git a/src/main.cpp b/src/main.cpp
index 79ecb18be8..320a8df205 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -561,7 +561,7 @@ bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs,
 
         // Continuously rate-limit free transactions
         // This mitigates 'penny-flooding' -- sending thousands of free transactions just to
-        // be annoying or make other's transactions take longer to confirm.
+        // be annoying or make others' transactions take longer to confirm.
         if (nFees < MIN_RELAY_TX_FEE)
         {
             static CCriticalSection cs;
@@ -1054,7 +1054,7 @@ bool CTransaction::FetchInputs(CTxDB& txdb, const map<uint256, CTxIndex>& mapTes
         }
     }
 
-    // Make sure all prevout.n's are valid:
+    // Make sure all prevout.n indexes are valid:
     for (unsigned int i = 0; i < vin.size(); i++)
     {
         const COutPoint prevout = vin[i].prevout;
@@ -1290,7 +1290,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex)
     // being sent to another address.
     // See BIP30 and http://r6.ca/blog/20120206T005236Z.html for more information.
     // This logic is not necessary for memory pool transactions, as AcceptToMemoryPool
-    // already refuses previously-known transaction id's entirely.
+    // already refuses previously-known transaction ids entirely.
     // This rule applies to all blocks whose timestamp is after March 15, 2012, 0:00 UTC.
     // On testnet it is enabled as of februari 20, 2012, 0:00 UTC.
     if (pindex->nTime > 1331769600 || (fTestNet && pindex->nTime > 1329696000))
diff --git a/src/main.h b/src/main.h
index 241ef46c8f..a906ff51ca 100644
--- a/src/main.h
+++ b/src/main.h
@@ -551,7 +551,7 @@ public:
             if (nBlockSize == 1)
             {
                 // Transactions under 10K are free
-                // (about 4500bc if made of 50bc inputs)
+                // (about 4500 BTC if made of 50 BTC inputs)
                 if (nBytes < 10000)
                     nMinFee = 0;
             }
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 210a03df6f..21e766c9e2 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -288,7 +288,7 @@ int main(int argc, char *argv[])
                 clientmodel = 0;
                 walletmodel = 0;
             }
-            // Shutdown the core and it's threads, but don't exit Bitcoin-Qt here
+            // Shutdown the core and its threads, but don't exit Bitcoin-Qt here
             Shutdown(NULL);
         }
         else
diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp
index 9a9a4890dc..d4715abaec 100644
--- a/src/qt/bitcoinunits.cpp
+++ b/src/qt/bitcoinunits.cpp
@@ -99,7 +99,7 @@ QString BitcoinUnits::format(int unit, qint64 n, bool fPlus)
     QString quotient_str = QString::number(quotient);
     QString remainder_str = QString::number(remainder).rightJustified(num_decimals, '0');
 
-    // Right-trim excess 0's after the decimal point
+    // Right-trim excess zeros after the decimal point
     int nTrim = 0;
     for (int i = remainder_str.size()-1; i>=2 && (remainder_str.at(i) == '0'); --i)
         ++nTrim;
diff --git a/src/script.cpp b/src/script.cpp
index 2b3a7f2009..5003b1f0ad 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -1679,7 +1679,7 @@ unsigned int CScript::GetSigOpCount(const CScript& scriptSig) const
             return 0;
     }
 
-    /// ... and return it's opcount:
+    /// ... and return its opcount:
     CScript subscript(data.begin(), data.end());
     return subscript.GetSigOpCount(true);
 }
diff --git a/src/util.cpp b/src/util.cpp
index 01c5799b43..7ec2a82c64 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -373,7 +373,7 @@ string FormatMoney(int64 n, bool fPlus)
     int64 remainder = n_abs%COIN;
     string str = strprintf("%"PRI64d".%08"PRI64d, quotient, remainder);
 
-    // Right-trim excess 0's before the decimal point:
+    // Right-trim excess zeros before the decimal point:
     int nTrim = 0;
     for (int i = str.size()-1; (str[i] == '0' && isdigit(str[i-2])); --i)
         ++nTrim;