[or-cvs] [tor/master] fix some typos

[arma@xxxxxxxx]

Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date: Sat, 19 Dec 2009 05:12:00 -0500
Subject: fix some typos
Commit: 5fee54a50f0c282193037649cf9c334c3e01dadb

---
 doc/tor.1.in         |    4 ++--
 doc/translations.txt |    6 +++---
 src/or/or.h          |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/tor.1.in b/doc/tor.1.in
index 1ad59dd..8a34b63 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -428,11 +428,11 @@ directory connections, when possible. (Default: 1)
 .TP
 \fBCircuitPriorityHalflife \fR\fBNUM\fB1\fP
 If this value is set, we override the default algorithm for choosing which
-circuit's cells to deliver or relay first.  When the value is 0, we
+circuit's cell to deliver or relay next.  When the value is 0, we
 round-robin between the active circuits on a connection, delivering one cell
 from each in turn.  When the value is positive, we prefer delivering cells
 from whichever connection has the lowest weighted cell count, where cells are
-weighted exponentially according to the supplied CircuitPrioirityHalflife
+weighted exponentially according to the supplied CircuitPriorityHalflife
 value (in seconds).  If this option is not set at all, we use the behavior
 recommended in the current consensus networkstatus.
 This is an advanced option; you generally shouldn't have mess with it.
diff --git a/doc/translations.txt b/doc/translations.txt
index a6b2582..06d16f4 100644
--- a/doc/translations.txt
+++ b/doc/translations.txt
@@ -31,7 +31,7 @@ The current pootle configuration is checked into subversion as well:
 
 TorCheck uses our translation portal to accept translations. Users use
 the portal to check in their changes.  To make use of the translations
-that users have commited to the translations/ subversion module, you'll
+that users have committed to the translations/ subversion module, you'll
 need to ensure that you have a current checked out copy of TorCheck:
 
     cd check/trunk/i18n/
@@ -75,7 +75,7 @@ And finally check in the changes:
 Torbutton uses our translation portal to accept translations. Users use
 the portal to check in their changes.
 
-To make use of the translations that users have commited to the translations/
+To make use of the translations that users have committed to the translations/
 subversion module, you'll need to ensure that you have a current checked out
 copy of them in your torbutton git checkout:
 
@@ -145,7 +145,7 @@ After this process is done, you then need to regenerate the mozilla
 .dtd and .properties files as specified above.
 
 
-Regardless of wether or not you had changes in the torbutton strings, if there
+Regardless of whether or not you had changes in the torbutton strings, if there
 were updated strings in pootle that you checked out from svn you now need to
 convert from .po and move the newly updated mozilla files into the current
 stable locale directory. First convert them with the 'mkmoz.sh' script and
diff --git a/src/or/or.h b/src/or/or.h
index 52d9207..3fd7e0e 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2021,7 +2021,7 @@ typedef struct {
   /** True iff this is the cell count for a circuit's previous
    * connection. */
   unsigned int is_for_p_conn : 1;
-  /** The position of the circuit within the or connection's priority
+  /** The position of the circuit within the OR connection's priority
    * queue. */
   int heap_index;
 } cell_ewma_t;
-- 
1.5.6.5