Merge #13069: docs: Fix typos

MarcoFalke · MarcoFalke · commit 472fe8a2ce9f · 2018-05-30T16:02:09.000-04:00
d8c4998 Fix typos (practicalswift) Pull request description: Fix typos. Tree-SHA512: 9af52a9799e6892b162e4aa1bcd6585502e10650b8aced59e7346dbb2f08544330081eb79328255fad1d358c095507956e049d354c4383b6965d4d5a7d635425
diff --git a/src/index/txindex.cpp b/src/index/txindex.cpp
@@ -170,7 +170,7 @@ void TxIndex::BlockConnected(const std::shared_ptr<const CBlock>& block, const C
         }
     } else {
         // Ensure block connects to an ancestor of the current best block. This should be the case
-        // most of the time, but may not be immediately after the the sync thread catches up and sets
+        // most of the time, but may not be immediately after the sync thread catches up and sets
         // m_synced. Consider the case where there is a reorg and the blocks on the stale branch are
         // in the ValidationInterface queue backlog even after the sync thread has caught up to the
         // new chain tip. In this unlikely event, log a warning and let the queue clear.
@@ -212,7 +212,7 @@ void TxIndex::ChainStateFlushed(const CBlockLocator& locator)
     }
 
     // This checks that ChainStateFlushed callbacks are received after BlockConnected. The check may fail
-    // immediately after the the sync thread catches up and sets m_synced. Consider the case where
+    // immediately after the sync thread catches up and sets m_synced. Consider the case where
     // there is a reorg and the blocks on the stale branch are in the ValidationInterface queue
     // backlog even after the sync thread has caught up to the new chain tip. In this unlikely
     // event, log a warning and let the queue clear.
diff --git a/src/util.h b/src/util.h
@@ -353,7 +353,7 @@ std::unique_ptr<T> MakeUnique(Args&&... args)
  * CPU-intensive and non-interactive. See SCHED_BATCH in sched(7) for details.
  *
  * @return The return value of sched_setschedule(), or 1 on systems without
- * sched_setchedule().
+ * sched_setschedule().
  */
 int ScheduleBatchPriority(void);
 
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
@@ -559,7 +559,7 @@ UniValue importwallet(const JSONRPCRequest& request)
         file.seekg(0, file.beg);
 
         // Use uiInterface.ShowProgress instead of pwallet.ShowProgress because pwallet.ShowProgress has a cancel button tied to AbortRescan which
-        // we don't want for this progress bar shoing the import progress. uiInterface.ShowProgress does not have a cancel button.
+        // we don't want for this progress bar showing the import progress. uiInterface.ShowProgress does not have a cancel button.
         uiInterface.ShowProgress(_("Importing..."), 0, false); // show progress dialog in GUI
         while (file.good()) {
             uiInterface.ShowProgress("", std::max(1, std::min(99, (int)(((double)file.tellg() / (double)nFilesize) * 100))), false);
diff --git a/test/functional/p2p_invalid_tx.py b/test/functional/p2p_invalid_tx.py
@@ -81,7 +81,7 @@ def run_test(self):
         self.reconnect_p2p(num_connections=2)
 
         self.log.info('Test orphan transaction handling ... ')
-        # Create a root transaction that we withold until all dependend transactions
+        # Create a root transaction that we withhold until all dependend transactions
         # are sent out and in the orphan cache
         SCRIPT_PUB_KEY_OP_TRUE = b'\x51\x75' * 15 + b'\x51'
         tx_withhold = CTransaction()

Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ std::unique_ptr<T> MakeUnique(Args&&... args)`
`353`	`353`	`* CPU-intensive and non-interactive. See SCHED_BATCH in sched(7) for details.`
`354`	`354`	`*`
`355`	`355`	`* @return The return value of sched_setschedule(), or 1 on systems without`
`356`		`- * sched_setchedule().`
	`356`	`+ * sched_setschedule().`
`357`	`357`	`*/`
`358`	`358`	`int ScheduleBatchPriority(void);`
`359`	`359`