Skip to content
Browse files

Bugfix: Correct English grammar regarding "'s"

  • Loading branch information...
1 parent 3c726dd commit b49f1398a1a02eab06def81a9d25b972c81b8fe1 @luke-jr luke-jr committed Jul 26, 2012
Showing with 19 additions and 19 deletions.
  1. +1 −1 doc/Doxyfile
  2. +2 −2 doc/Tor.txt
  3. +2 −2 doc/unit-tests.txt
  4. +4 −4 src/addrman.h
  5. +1 −1 src/init.cpp
  6. +3 −3 src/main.cpp
  7. +1 −1 src/qt/bitcoin.cpp
  8. +1 −1 src/qt/bitcoingui.cpp
  9. +1 −1 src/qt/bitcoinunits.cpp
  10. +1 −1 src/script.cpp
  11. +1 −1 src/util.cpp
  12. +1 −1 src/version.h
View
2 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 =
View
4 doc/Tor.txt
@@ -56,8 +56,8 @@ config file):
HiddenServiceDir /var/lib/tor/bitcoin-service/
HiddenServicePort 8333 127.0.0.1:8333
-The directory can be different of course, but (both) 8333's should be equal to your
-bitcoind's P2P listen port (8333 by default).
+The directory can be different of course, but (both) port numbers should be equal to
+your bitcoind's P2P listen port (8333 by default).
-externalip=X You can tell bitcoin about its publicly reachable address using
this option, and this can be a .onion address. Given the above
View
4 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).
View
8 src/addrman.h
@@ -174,13 +174,13 @@ class CAddrMan
// 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
@@ -253,8 +253,8 @@ class CAddrMan
// * 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
View
2 src/init.cpp
@@ -82,7 +82,7 @@ void Shutdown(void* parg)
printf("Bitcoin exited\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
}
View
6 src/main.cpp
@@ -564,7 +564,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;
@@ -1102,7 +1102,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;
@@ -1338,7 +1338,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
// 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.
int64 nBIP30SwitchTime = 1331769600;
bool fEnforceBIP30 = (pindex->nTime > nBIP30SwitchTime);
View
2 src/qt/bitcoin.cpp
@@ -299,7 +299,7 @@ int main(int argc, char *argv[])
window.setWalletModel(0);
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
View
2 src/qt/bitcoingui.cpp
@@ -492,7 +492,7 @@ void BitcoinGUI::setNumConnections(int count)
void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks)
{
- // don't show / hide progressBar and it's label if we have no connection(s) to the network
+ // don't show / hide progressBar and its label if we have no connection(s) to the network
if (!clientModel || clientModel->getNumConnections() == 0)
{
progressBarLabel->setVisible(false);
View
2 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;
View
2 src/script.cpp
@@ -1811,7 +1811,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);
}
View
2 src/util.cpp
@@ -348,7 +348,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;
View
2 src/version.h
@@ -10,7 +10,7 @@
// client versioning
//
-// These need to be macro's, as version.cpp's voodoo requires it
+// These need to be macros, as version.cpp's voodoo requires it
#define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 6
#define CLIENT_VERSION_REVISION 99

0 comments on commit b49f139

Please sign in to comment.
Something went wrong with that request. Please try again.