diff --git a/src/common/tortls.c b/src/common/tortls.c
index d9e71a6380..7f601258c4 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -37,7 +37,7 @@ const char tortls_c_id[] =
 /** How long do identity certificates live? (sec) */
 #define IDENTITY_CERT_LIFETIME  (365*24*60*60)
 
-/* DOCDOC */
+/** Structure holding the TLS state for a single connection. */
 typedef struct tor_tls_context_t {
   SSL_CTX *ctx;
 } tor_tls_context_t;
diff --git a/src/common/util.c b/src/common/util.c
index 02f7b1731a..fe1daa359a 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -926,10 +926,10 @@ parse_rfc1123_time(const char *buf, time_t *t)
   return 0;
 }
 
-/** Set <b>buf</b> to the ISO???? encoding of the local value of <b>t</b>.
+/** Set <b>buf</b> to the ISO8601 encoding of the local value of <b>t</b>.
  * The buffer must be at least ISO_TIME_LEN+1 bytes long.
  *
- * (ISO???? format is 2006-10-29 10:57:20)
+ * (ISO8601 format is 2006-10-29 10:57:20)
  */
 void
 format_local_iso_time(char *buf, time_t t)
@@ -938,7 +938,7 @@ format_local_iso_time(char *buf, time_t t)
   strftime(buf, ISO_TIME_LEN+1, "%Y-%m-%d %H:%M:%S", tor_localtime_r(&t, &tm));
 }
 
-/** Set <b>buf</b> to the ISO???? encoding of the GMT value of <b>t</b>.
+/** Set <b>buf</b> to the ISO8601 encoding of the GMT value of <b>t</b>.
  * The buffer must be at least ISO_TIME_LEN+1 bytes long.
  */
 void
diff --git a/src/or/or.h b/src/or/or.h
index 792b69b126..2a169b508b 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1048,7 +1048,9 @@ typedef struct {
   /** List of signed_descriptor_t for older router descriptors we're
    * caching. */
   smartlist_t *old_routers;
-  /** DOCDOC */
+  /** Mmaped file holding server descriptors.  If present, any router whose
+   * cache_info.saved_location == SAVED_IN_CACHE is stored in this file
+   * starting at cache_info.saved_offset */
   tor_mmap_t *mmap_descriptors;
 } routerlist_t;