diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-02-09 17:56:52 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-02-09 17:56:52 +0000 |
| commit | 50113a28424e7a862b17d197e86cede9bcceedfc (patch) | |
| tree | cc23404e65ad74fbf9fc3901c7cfdf7d498b64c1 | |
| parent | 2475e331249097e723c3e40135ead42a638ceb6c (diff) | |
| download | tor-50113a28424e7a862b17d197e86cede9bcceedfc.tar.gz tor-50113a28424e7a862b17d197e86cede9bcceedfc.zip | |
other cleanups
svn:r13448
| -rw-r--r-- | doc/spec/control-spec.txt | 11 | ||||
| -rw-r--r-- | doc/tor.1.in | 12 |
2 files changed, 15 insertions, 8 deletions
diff --git a/doc/spec/control-spec.txt b/doc/spec/control-spec.txt index e6015704f4..20515cadf7 100644 --- a/doc/spec/control-spec.txt +++ b/doc/spec/control-spec.txt @@ -744,9 +744,9 @@ $Id$ Same as passing 'EXTENDED' to SETEVENTS; this is the preferred way to request the extended event syntax. - 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.) + This will not be always-enabled until at least two stable releases + after 0.1.2.3-alpha, the release where it was first used for + anything. VERBOSE_NAMES @@ -757,9 +757,8 @@ $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.) + This will not be always-enabled until at least two stable releases + after 0.1.2.2-alpha, the release where it was first available. 3.20. RESOLVE diff --git a/doc/tor.1.in b/doc/tor.1.in index 6d0c7163af..9f430f4700 100644 --- a/doc/tor.1.in +++ b/doc/tor.1.in @@ -1,4 +1,4 @@ -.TH TOR 1 "January 2006" "TOR" +.TH TOR 1 "February 2008" "TOR" .SH NAME tor \- The second-generation onion router .SH SYNOPSIS @@ -1003,7 +1003,15 @@ Tor clients up to 0.1.0.x). \fBV2AuthoritativeDirectory \fR\fB0\fR|\fB1\fR\fP When this option is set in addition to \fBAuthoritativeDirectory\fP, Tor generates version 2 network statuses and serves descriptors, etc as -described in doc/spec/dir-spec.txt. +described in doc/spec/dir-spec-v2.txt (for Tor clients and servers +running 0.1.1.x and 0.1.2.x). +.LP +.TP +\fBV3AuthoritativeDirectory \fR\fB0\fR|\fB1\fR\fP +When this option is set in addition to \fBAuthoritativeDirectory\fP, Tor +generates version 3 network statuses and serves descriptors, etc as +described in doc/spec/dir-spec.txt (for Tor clients and servers +running at least 0.2.0.x). .LP .TP \fBVersioningAuthoritativeDirectory \fR\fB0\fR|\fB1\fR\fP |