diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:35:44 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:35:44 +0000 |
commit | 4fb6e53968c38a3bbfa9cfa728da1d31fe3dd3fe (patch) | |
tree | 449f4009f16f8897e7bdd37dafea4f4bd6e28e61 | |
parent | 3171daef6c106023a5fcbc80e66c0e0a9552c4d8 (diff) | |
parent | 566f556c40069ed06c8b734433a2859f4917d242 (diff) | |
download | bitcoin-4fb6e53968c38a3bbfa9cfa728da1d31fe3dd3fe.tar.xz |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
doc/unit-tests.txt
-rw-r--r-- | doc/Doxyfile | 2 | ||||
-rw-r--r-- | doc/unit-tests.txt | 4 | ||||
-rw-r--r-- | src/init.cpp | 2 | ||||
-rw-r--r-- | src/main.cpp | 6 | ||||
-rw-r--r-- | src/main.h | 2 | ||||
-rw-r--r-- | src/qt/bitcoin.cpp | 2 | ||||
-rw-r--r-- | src/qt/bitcoinunits.cpp | 2 | ||||
-rw-r--r-- | src/script.cpp | 2 | ||||
-rw-r--r-- | src/util.cpp | 2 |
9 files changed, 12 insertions, 12 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/init.cpp b/src/init.cpp index 27e709a6ea..c147732d09 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -79,7 +79,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 ac26fd7ff6..c30a2ecd4b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -567,7 +567,7 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi // 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; @@ -1064,7 +1064,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; @@ -1299,7 +1299,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 fd24818647..fa4db67ac8 100644 --- a/src/main.h +++ b/src/main.h @@ -558,7 +558,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 d08e8d6aa0..0a48b55951 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -295,7 +295,7 @@ int main(int argc, char *argv[]) window.hide(); guiref = 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 1fc53440d9..a78763e31d 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -1603,7 +1603,7 @@ 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 e6c4ed341a..b5971ec724 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -353,7 +353,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; |