checkpoint changelog and general polishing

svn:r8497

5 files changed, 14 insertions, 9 deletions

diff --git a/doc/TODO b/doc/TODO
index a9f133616b..0952840602 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -270,6 +270,10 @@ Deferred from 0.1.2.x:
       - Implement
 
 Minor items for 0.1.2.x as time permits:
+  - 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
+    errors and other errors. Should the rpm, the ports, etc do this too?
   X If we try to publish as a nickname that's already claimed, should
     we append a number (or increment the number) and try again? This
     way people who read their logs can fix it as before, but people
diff --git a/doc/control-spec.txt b/doc/control-spec.txt
index a79973e3e0..a6757718dd 100644
--- a/doc/control-spec.txt
+++ b/doc/control-spec.txt
@@ -347,7 +347,7 @@ $Id$
       set through any mechanism.
 
     "address" -- the best guess at our external IP address. If we
-      have no guess, return a 551 error.
+      have no guess, return a 551 error. (Added in 0.1.2.2-alpha)
 
     "circuit-status"
       A series of lines as for a circuit status event. Each line is of
diff --git a/doc/socks-extensions.txt b/doc/socks-extensions.txt
index 8040a8b03f..46cd983f84 100644
--- a/doc/socks-extensions.txt
+++ b/doc/socks-extensions.txt
@@ -47,10 +47,11 @@ Tor's extensions to the SOCKS protocol
   (We support RESOLVE in SOCKS4 too, even though it is unnecessary.)
 
   For SOCKS5 only, we support reverse resolution with a new command value,
-  "RESOLVE_PTR".  In response to a "RESOLVE_PTR" SOCKS5 command with an IPv4
-  address as its target, Tor attempts to find the canonical hostname for that
-  IPv4 record, and returns it in the "server bound address" portion of the
-  reply.  (This was not supported before Tor 0.1.2.2-alpha)
+  "RESOLVE_PTR" [F1]. In response to a "RESOLVE_PTR" SOCKS5 command with
+  an IPv4 address as its target, Tor attempts to find the canonical
+  hostname for that IPv4 record, and returns it in the "server bound
+  address" portion of the reply.
+  (This command was not supported before Tor 0.1.2.2-alpha.)
 
 3. HTTP-resistance
 
diff --git a/doc/tor-win32-mingw-creation.txt b/doc/tor-win32-mingw-creation.txt
index 9a6b7f1de1..654b7104ed 100644
--- a/doc/tor-win32-mingw-creation.txt
+++ b/doc/tor-win32-mingw-creation.txt
@@ -73,7 +73,7 @@ Type "make install"
 OR 
 
 Make zlib1.dll:
-Type "cd tor-mingw/zlib-1.2.3"/
+Type "cd tor-mingw/zlib-1.2.3/"
 Type "./configure"
 Type "make -f win32/Makefile.gcc"
 
diff --git a/doc/tor.1.in b/doc/tor.1.in
index effd59b7ef..5284fd645a 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -635,7 +635,7 @@ next day.  All times are local, and given in 24-hour time.  (Defaults to
 \fBServerDNSResolvConfFile \fR\fIfilename\fP
 Overrides the default DNS configuration with the configuration in
 \fIfilename\fP.  The file format is the same as the standard Unix
-"\fBresolv.conf\fP" file (7).  This option only effects name lookup for
+"\fBresolv.conf\fP" file (7).  This option only affects name lookup for
 addresses requested by clients; and only takes effect if Tor was built with
 eventdns support.  (Defaults to use the system DNS configuration.)
 .LP
@@ -645,7 +645,7 @@ If set to \fB1\fP, then we will search for addresses in the local search
 domain.  For example, if this system is configured to believe it is in
 "example.com", and a client tries to connect to "www", the client will be
 connected to "www.example.com".
-This option only effects name lookup for addresses requested by clients.
+This option only affects name lookup for addresses requested by clients.
 (Defaults to "0".)
 .LP
 .TP
@@ -653,7 +653,7 @@ This option only effects name lookup for addresses requested by clients.
 When this option is set to 1, we will test periodically to determine whether
 our local nameservers have been configured to hijack failing DNS requests
 (usually to an advertising site).  If they are, we will attempt to correct
-this.  This option only effects name lookup for addresses requested by
+this.  This option only affects name lookup for addresses requested by
 clients; and only takes effect if Tor was built with eventdns support.
 (Defaults to "1".)