diff --git a/doc/TODO b/doc/TODO
index 60f08dd231..5e3289cd67 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -271,6 +271,7 @@ Deferred from 0.1.2.x:
       - Implement
 
 Minor items for 0.1.2.x as time permits:
+  - Flesh out options_description array in src/or/config.c
   - Don't let 'newnym' be triggered more often than every n seconds.
   - change log_fn() to log() on notice/warn/err logs where we can.
   - the deb now uses --verify-config to distinguish between configuration
diff --git a/doc/tor.1.in b/doc/tor.1.in
index e531d07469..e8e1b529cc 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -372,7 +372,7 @@ NodeFamily is only needed when a server doesn't list the family itself
 .LP
 .TP
 \fBEnforceDistinctSubnets \fR\fB0\fR|\fB1\fR\fP
-If 1, Tor will not put two servers whose IP addressess are "too
+If 1, Tor will not allow two servers whose IP addressess are "too
 close" to appear on the same circuit.  Currently, two addresses are
 "too close" if they lie in the same /16 range. (Default: 1)