diff --git a/ChangeLog b/ChangeLog
index b11c40dfa..cdc07f757 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,25 +1,25 @@
 Changes in version 0.1.2.5-xxxx - 200?-??-??
   o Minor features:
     - Start using the state file to store bandwidth accounting data:
-      the bw_accounting file is now obsolete.  We'll keep generating it
+      the bw_accounting file is now obsolete. We'll keep generating it
       for a while for people who are still using 0.1.2.4-alpha.
-    - Try to batch changes to the state so that we do as few disk writes
-      as possible while still storing important things in a timely
-      fashion.
+    - Try to batch changes to the state file so that we do as few
+      disk writes as possible while still storing important things in
+      a timely fashion.
     - Ongoing work on eventdns infrastructure: add dns server and ipv6
       support.
 
   o Major bugfixes:
     - Fix a longstanding bug in eventdns that prevented the count of
-      timed-out resolves from ever being reset.   This bug caused us
-      to give up on a nameserver the third time it timed out, and try it 10
-      seconds later... and to give up on it every time it timed out after
-      that. (May fix bug 326.)
+      timed-out resolves from ever being reset. This bug caused us to
+      give up on a nameserver the third time it timed out, and try it
+      10 seconds later... and to give up on it every time it timed out
+      after that. (May fix bug 326.)
 
   o Minor bugfixes:
     - Fix a bug when a PF socket is first used.  (Patch from Fabian
       Keil.)
-    - Fix an assert failure when the directory authority sets
+    - Fix an assert failure when a directory authority sets
       AuthDirRejectUnlisted and then receives a descriptor from an
       unlisted router (reported by seeess).
     - Fix a bug on the Windows implementation of tor_mmap_file that
@@ -32,8 +32,8 @@ Changes in version 0.1.2.5-xxxx - 200?-??-??
     - Clients do not store bandwidth history in their state files. (This
       shouldn't be an exploitable security issue, but it's better to be
       safe.)
-    - When generating bandwidth history, round down to the nearest 1k. When
-      storing accounting data, round up to the nearest 1k.
+    - When generating bandwidth history, round down to the nearest
+      1k. When storing accounting data, round up to the nearest 1k.
 
   o Controller features:
     - Have GETINFO dir/status/* work on hosts with DirPort disabled.
diff --git a/doc/TODO b/doc/TODO
index 5d6ec2a0d..1842be21b 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -436,6 +436,7 @@ NR- write a spec appendix for 'being nice with tor'
   - tor-in-the-media page
   - Remove need for HACKING file.
   - Figure out licenses for website material.
+  - Specify the keys and key rotation schedules and stuff
 
 Website:
   - and remove home and make the "Tor" picture be the link to home.
diff --git a/doc/control-spec.txt b/doc/control-spec.txt
index 0f964ae97..ffe862c78 100644
--- a/doc/control-spec.txt
+++ b/doc/control-spec.txt
@@ -930,6 +930,11 @@ $Id$
      "650" SP "ADDRMAP" SP Address SP Address SP Expiry
      Expiry = DQOUTE ISOTime DQUOTE / "NEVER"
 
+  [XXX We should rename this to ADDRESSMAP. -RD]
+
+  [FFF We should add a SOURCE=%s argument for extended events,
+   which specifies what exit node told us this addressmap. -RD]
+
 4.1.8. Descriptors uploaded to us in our role as authoritative dirserver
 
   Syntax:
@@ -966,10 +971,10 @@ $Id$
      CLOCK_JUMPED
      "time=NUM"
        Tor spent enough time without CPU cycles that it has closed all
-       its circuits and will establishing them anew. This typically
+       its circuits and will establish them anew. This typically
        happens when a laptop goes to sleep and then wakes up again. It
        also happens when the system is swapping so heavily that Tor is
-       starving. The "time" argument includes the number of seconds Tor
+       starving. The "time" argument specifies the number of seconds Tor
        thinks it was unconscious for.
        This status event is sent as NOTICE severity normally, but WARN
        severity if Tor is acting as a server currently.
diff --git a/doc/tor-spec.txt b/doc/tor-spec.txt
index 2ebd350db..1f18f199c 100644
--- a/doc/tor-spec.txt
+++ b/doc/tor-spec.txt
@@ -282,7 +282,7 @@ TODO:
    are able and willing to support.  Parties can only communicate if they
    have some connection protocol version in common.
 
-   Version 0.1.2.0-alpha and earlier don't understand VERSIONS cells,
+   Version 0.1.x.y-alpha and earlier don't understand VERSIONS cells,
    and therefore don't support version negotiation.  Thus, waiting until
    the other side has sent a VERSIONS cell won't work for these servers:
    if they send no cells back, it is impossible to tell whether they
diff --git a/src/or/connection.c b/src/or/connection.c
index 1b733f58b..ea7bc7170 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1994,7 +1994,7 @@ connection_state_is_connecting(connection_t *conn)
   return 0;
 }
 
-/** Alloocates a base64'ed authenticator for use in http or https
+/** Allocates a base64'ed authenticator for use in http or https
  * auth, based on the input string <b>authenticator</b>. Returns it
  * if success, else returns NULL. */
 char *