Spell-check strings and comments

svn:r3052

13 files changed, 23 insertions, 23 deletions

diff --git a/src/or/buffers.c b/src/or/buffers.c
index 3bdd7982e..db4d4c173 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -70,7 +70,7 @@ static INLINE int buf_ensure_capacity(buf_t *buf, size_t capacity)
 static INLINE void buf_shrink_if_underfull(buf_t *buf) {
   size_t new_len;
   /* If the buffer is at least .25 full, or if shrinking the buffer would
-   * put it onder MIN_BUF_SHRINK_SIZE, don't do it. */
+   * put it under MIN_BUF_SHRINK_SIZE, don't do it. */
   if (buf->datalen >= buf->len/4 || buf->len < 2*MIN_BUF_SHRINK_SIZE)
     return;
   /* Shrink new_len by powers of 2 until: datalen is at least 1/4 of
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index ad5764fff..c688be70b 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -604,7 +604,7 @@ static int did_circs_fail_last_period = 0;
 circuit_t *circuit_launch_by_identity(uint8_t purpose, const char *exit_digest)
 {
   if (!has_fetched_directory) {
-    log_fn(LOG_DEBUG,"Haven't fetched directory yet; cancelling circuit launch.");
+    log_fn(LOG_DEBUG,"Haven't fetched directory yet; canceling circuit launch.");
     return NULL;
   }
 
diff --git a/src/or/config.c b/src/or/config.c
index c51da00a0..f02f18cc3 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -329,7 +329,7 @@ options_act(void) {
 
   /* Set up accounting */
   if (accounting_parse_options(options, 0)<0) {
-    log_fn(LOG_ERR,"Error in accouting options");
+    log_fn(LOG_ERR,"Error in accounting options");
     return -1;
   }
   if (accounting_is_enabled(options))
@@ -499,7 +499,7 @@ static config_var_t *config_find_option(const char *key)
       return &config_vars[i];
     }
   }
-  /* Okay, unrecogized options */
+  /* Okay, unrecognized options */
   return NULL;
 }
 
@@ -1522,7 +1522,7 @@ static char *get_windows_conf_root(void)
   if (is_set)
     return path;
 
-  /* Find X:\documents and settings\username\applicatation data\ .
+  /* Find X:\documents and settings\username\application data\ .
    * We would use SHGetSpecialFolder path, but that wasn't added until IE4.
    */
   if (!SUCCEEDED(SHGetSpecialFolderLocation(NULL, CSIDL_APPDATA,
@@ -1909,7 +1909,7 @@ add_single_log_option(or_options_t *options, int minSeverity, int maxSeverity,
 }
 
 /** Convert all old-style logging options to new-style Log options. Return 0
- * on success, -1 on faulure. */
+ * on success, -1 on failure. */
 static int
 normalize_log_options(or_options_t *options)
 {
@@ -2077,7 +2077,7 @@ parse_redirect_line(smartlist_t *result, struct config_line_t *line)
 /** Read the contents of a DirServer line from <b>line</b>.  Return 0
  * if the line is well-formed, and 0 if it isn't.  If
  * <b>validate_only</b> is 0, and the line is well-formed, then add
- * the dirserver desribed in the line as a valid server. */
+ * the dirserver described in the line as a valid server. */
 static int
 parse_dir_server_line(const char *line, int validate_only)
 {
diff --git a/src/or/connection.c b/src/or/connection.c
index fb7efdc24..1f7529f08 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1005,7 +1005,7 @@ int connection_handle_write(connection_t *conn) {
 
   conn->timestamp_lastwritten = now;
 
-  /* Sometimes, "writeable" means "connected". */
+  /* Sometimes, "writable" means "connected". */
   if (connection_state_is_connecting(conn)) {
     if (getsockopt(conn->s, SOL_SOCKET, SO_ERROR, (void*)&e, &len) < 0) {
       log_fn(LOG_WARN,"getsockopt() syscall failed?! Please report to tor-ops.");
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index c3aa0b969..2156b5284 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -899,7 +899,7 @@ static int generate_runningrouters(crypto_pk_env_t *private_key)
   }
   runningrouters_is_dirty = 0;
 
-  /* We don't cache runnning-routers to disk, so there's no point in
+  /* We don't cache running-routers to disk, so there's no point in
    * authdirservers caching it. */
   /* dirserv_set_cached_directory(the_runningrouters, time(NULL), 1); */
 
diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index c14db675e..e957e4936 100644
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -64,7 +64,7 @@ typedef enum {
  *    connections, but provide bandwidth until we run out.
  * 5. Then we hibernate until the end of the interval.
  *
- * If the interval ends before we run out of bandwdith, we go back to
+ * If the interval ends before we run out of bandwidth, we go back to
  * step one.
  */
 
@@ -153,7 +153,7 @@ accounting_parse_options(or_options_t *options, int validate_only)
   case UNIT_MONTH:
     d = tor_parse_long(smartlist_get(items,1), 10, 1, 28, &ok, NULL);
     if (!ok) {
-      log_fn(LOG_WARN, "Monthy accounting must start begin on a day between 1 and 28");
+      log_fn(LOG_WARN, "Monthly accounting must start begin on a day between 1 and 28");
       goto err;
     }
     break;
diff --git a/src/or/main.c b/src/or/main.c
index d4983ce11..58d7efdb3 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1247,9 +1247,9 @@ int nt_service_install()
    *    separate process (as now) or that can install and run itself
    *    as an NT service.  I have no idea how hard this is.
    *
-   * Notes about develiping NT services:
+   * Notes about developing NT services:
    *
-   * 1. Don't count on your CWD. If an abolute path is not given, the
+   * 1. Don't count on your CWD. If an absolute path is not given, the
    *    fopen() function goes wrong.
    * 2. The parameters given to the nt_service_body() function differ
    *    from those given to main() function.
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 53689ad03..48f60ee8c 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -5,7 +5,7 @@ const char rendclient_c_id[] = "$Id$";
 
 /**
  * \file rendclient.c
- * \brief Client code to access location-hiddenn services.
+ * \brief Client code to access location-hidden services.
  **/
 
 #include "or.h"
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index f8bc5005a..a6f28a4b8 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -81,7 +81,7 @@ rend_mid_establish_intro(circuit_t *circ, const char *request, size_t request_le
     circuit_mark_for_close(c);
   }
 
-  /* Acknlowedge the request. */
+  /* Acknowledge the request. */
   if (connection_edge_send_command(NULL,circ,
                                    RELAY_COMMAND_INTRO_ESTABLISHED,
                                    "", 0, NULL)<0) {
@@ -199,7 +199,7 @@ rend_mid_establish_rendezvous(circuit_t *circ, const char *request, size_t reque
     goto err;
   }
 
-  /* Acknlowedge the request. */
+  /* Acknowledge the request. */
   if (connection_edge_send_command(NULL,circ,
                                    RELAY_COMMAND_RENDEZVOUS_ESTABLISHED,
                                    "", 0, NULL)<0) {
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index d9ec3f574..10bc3c6ea 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -209,7 +209,7 @@ int rend_config_services(or_options_t *options, int validate_only)
       continue;
     }
     if (!service) {
-      log_fn(LOG_WARN, "HiddenServicePort with no preceeding HiddenServiceDir directive");
+      log_fn(LOG_WARN, "HiddenServicePort with no preceding HiddenServiceDir directive");
       rend_service_free(service);
       return -1;
     }
@@ -925,7 +925,7 @@ rend_consider_services_upload(time_t now) {
 }
 
 /** Log the status of introduction points for all rendezvous services
- * at log severity <b>serverity</b>.
+ * at log severity <b>severity</b>.
  */
 void
 rend_service_dump_stats(int severity)
diff --git a/src/or/rephist.c b/src/or/rephist.c
index 792825665..0cba10ec8 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -18,7 +18,7 @@ typedef struct link_history_t {
   time_t since;
   /** When did we most recently note a change to this link */
   time_t changed;
-  /** How many times did extending from OR1 to OR2 succeeed? */
+  /** How many times did extending from OR1 to OR2 succeed? */
   unsigned long n_extend_ok;
   /** How many times did extending from OR1 to OR2 fail? */
   unsigned long n_extend_fail;
@@ -599,7 +599,7 @@ rep_hist_get_bandwidth_lines(void)
       /* We haven't been through the circular array yet; time starts at i=0.*/
       i = 0;
     else
-      /* We've been arround the array at least once.  The next i to be
+      /* We've been around the array at least once.  The next i to be
          overwritten is the oldest. */
       i = b->next_max_idx;
 
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 4fdaaf51b..1a879a538 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -786,7 +786,7 @@ router_add_to_routerlist(routerinfo_t *router) {
       if (router->is_verified) {
         /* The new verified router replaces the old one; remove the
          * old one.  And carry on to the end of the list, in case
-         * there are more old unverifed routers with this nickname
+         * there are more old unverified routers with this nickname
          */
         /* mark-for-close connections using the old key, so we can
          * make new ones with the new key.
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 7e54f6ee9..2387e4a47 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -1409,7 +1409,7 @@ int tor_version_as_new_as(const char *platform, const char *cutoff) {
   char tmp[128];
 
   if (tor_version_parse(cutoff, &cutoff_version)<0) {
-    log_fn(LOG_WARN,"Bug: cutoff version '%s' unparsable.",cutoff);
+    log_fn(LOG_WARN,"Bug: cutoff version '%s' unparseable.",cutoff);
     return 0;
   }
   if (strcmpstart(platform,"Tor ")) /* nonstandard Tor; be safe and say yes */
@@ -1423,7 +1423,7 @@ int tor_version_as_new_as(const char *platform, const char *cutoff) {
   strlcpy(tmp, start, s-start+1);
 
   if (tor_version_parse(tmp, &router_version)<0) {
-    log_fn(LOG_INFO,"Router version '%s' unparsable.",tmp);
+    log_fn(LOG_INFO,"Router version '%s' unparseable.",tmp);
     return 1; /* be safe and say yes */
   }