other cleanups that have been sitting in my sandbox

svn:r13649

6 files changed, 8 insertions, 8 deletions

diff --git a/src/common/aes.c b/src/common/aes.c
index d1698604cd..3a17af7f33 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -135,9 +135,9 @@ static void rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr,
 /*======================================================================*/
 /* Interface to AES code, and counter implementation */
 
-/** Implements an aes counter-mode cipher. */
+/** Implements an AES counter-mode cipher. */
 struct aes_cnt_cipher {
-  /** This next element (howevever it's defined) is the AES key. */
+/** This next element (however it's defined) is the AES key. */
 #if defined(USE_OPENSSL_EVP)
   EVP_CIPHER_CTX key;
 #elif defined(USE_OPENSSL_AES)
diff --git a/src/common/container.h b/src/common/container.h
index 6d38563b5f..72fbfcd318 100644
--- a/src/common/container.h
+++ b/src/common/container.h
@@ -207,7 +207,7 @@ DECLARE_MAP_FNS(digestmap_t, const char *, digestmap_);
 
 #undef DECLARE_MAP_FNS
 
-/** Used to iterate over the key-value pairs in a map <b>map</b> in order.
+/** Iterates over the key-value pairs in a map <b>map</b> in order.
  * <b>prefix</b> is as for DECLARE_MAP_FNS (i.e., strmap_ or digestmap_).
  * The map's keys and values are of type keytype and valtype respectively;
  * each iteration assigns them to keyvar and valvar.
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 2259d9e5a7..fb9b26a82a 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1306,7 +1306,7 @@ _check_no_tls_errors(const char *fname, int line)
 }
 
 /** Return true iff the initial TLS connection at <b>tls</b> did not use a v2
- * TLS handshake. Output undefined if the handshake isn't finished. */
+ * TLS handshake. Output is undefined if the handshake isn't finished. */
 int
 tor_tls_used_v1_handshake(tor_tls_t *tls)
 {
diff --git a/src/or/config.c b/src/or/config.c
index 75e88bfe3a..ba5ccaa90a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2446,7 +2446,7 @@ options_init(or_options_t *options)
   config_init(&options_format, options);
 }
 
-/** Set all vars in the configuration object 'options' to their default
+/** Set all vars in the configuration object <b>options</b> to their default
  * values. */
 static void
 config_init(config_format_t *fmt, void *options)
diff --git a/src/or/geoip.c b/src/or/geoip.c
index 9f93159e30..49f1746b52 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -296,8 +296,8 @@ geoip_get_history_start(void)
 
 /** Helper type: used to sort per-country totals by value. */
 typedef struct c_hist_t {
-  char country[3]; /**< two-leter country code. */
-  unsigned total; /**< total ips seen in this country. */
+  char country[3]; /**< Two-letter country code. */
+  unsigned total; /**< Total IP addresses seen in this country. */
 } c_hist_t;
 
 /** Sorting helper: return -1, 1, or 0 based on comparison of two
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index d6a4316f24..3a2d0e8158 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3939,7 +3939,7 @@ update_consensus_router_descriptor_downloads(time_t now)
   log_info(LD_DIR,
            "%d router descriptors downloadable. %d delayed; %d present "
            "(%d of those were in old_routers); %d would_reject; "
-           "%d wouldnt_use, %d in progress.",
+           "%d wouldnt_use; %d in progress.",
            smartlist_len(downloadable), n_delayed, n_have, n_in_oldrouters,
            n_would_reject, n_wouldnt_use, n_inprogress);