r8859@totoro: nickm | 2006-10-03 14:25:27 -0400

 More about versioning. Also, cravenly postpone final v0 control protocol deprecation till 0.1.3.x.


svn:r8590

1 files changed, 7 insertions, 3 deletions

diff --git a/doc/control-spec.txt b/doc/control-spec.txt
index e3d065e87..f6e51476a 100644
--- a/doc/control-spec.txt
+++ b/doc/control-spec.txt
@@ -618,7 +618,7 @@ $Id$
      Same as passing 'EXTENDED' to SETEVENTS; this is the preferred way to
      request the extended event syntax.
 
-     This will not be enabled-by-default until at least XXX (or, at least two
+     This will not be always-enabled until at least XXX (or, at least two
      stable releases after XXX, the release where it was first used for
      anything.)
 
@@ -631,6 +631,10 @@ $Id$
      LongName format includes a Fingerprint, an indication of Named status,
      and a Nickname (if one is known).
 
+     This will not be always-enabled until at least 0.1.4.x (or at least two
+     stable releases after 0.1.2.2-alpha, the release where it was first
+     available.)
+
 4. Replies
 
   Reply codes follow the same 3-character format as used by SMTP, with the
@@ -870,12 +874,12 @@ $Id$
   If you ask for lots of events, and 16MB of them queue up on the buffer,
   the Tor process will close the socket.
 
-5.3. Backward compatibility
+5.3. Backward compatibility with v0 control protocol.
 
   For backward compatibility with the "version 0" control protocol, Tor checks
   whether the third octet the first command is zero.  If it is, Tor
   assumes that version 0 is in use.  This feature is deprecated, and will be
-  removed in the 0.1.2.x Tor development series.
+  removed in the 0.1.3.x Tor development series.
 
   In order to detect which version of the protocol is supported controllers
   should send the sequence [00 00 0D 0A].  This is a valid and unrecognized