fix some typos

diff --git a/doc/tor.1.in b/doc/tor.1.in
index 1ad59ddb292f176bbc58c91e48de8d9a99143ea4..8a34b63f21cd2dd92711c7a31755910bbcae3427 100644 (file)
--- 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 a6b25822393b6884580925b6caa3f494be495349..06d16f4462b2877b49522603cdb4b209de5a6d47 100644 (file)
--- 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 52d92079bb830ab87be55bcc7e72348f5e81cfc2..3fd7e0e87094eeec55e05c5e268137f7cb25368c 100644 (file)
--- 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;