doc fixes from karsten

svn:r12603

diff --git a/doc/spec/dir-spec.txt b/doc/spec/dir-spec.txt
index 0e6343e6c390924dbb64f2539734b18a6d71dc36..f47eb4f5240d89c24fc5f837ca854fe509c75b0a 100644 (file)
--- a/doc/spec/dir-spec.txt
+++ b/doc/spec/dir-spec.txt
@@ -556,6 +556,13 @@ $Id$
         it is prefixed with "opt"; it should be so prefixed until these
         versions are obsolete.]
 
+   "hidden-service-dir" NL
+
+       [At most once.]
+
+       Present only if this router stores and serves v2 hidden service
+       descriptors.
+
 2.2. Extra-info documents
 
    Extra-info documents consist of the following items:
@@ -908,6 +915,7 @@ $Id$
              circuits.
           "Fast" if the router is suitable for high-bandwidth circuits.
           "Guard" if the router is suitable for use as an entry guard.
+          "HSDir" if the router is considered a v2 hidden service directory.
           "Named" if the router's identity-nickname mapping is canonical,
              and this authority binds names.
           "Stable" if the router is suitable for long-lived circuits.
@@ -1017,6 +1025,10 @@ $Id$
    supports the functionality clients need.  (Currently, this is
    0.2.0.?????-alpha or later.)
 
+   "HSDir" -- A router is a v2 hidden service directory if it stores and
+   serves v2 hidden service descriptors and the authority managed to connect
+   to it successfully within the last 24 hours.
+
    Directory server administrators may label some servers or IPs as
    blacklisted, and elect not to include them in their network-status lists.
 

diff --git a/doc/tor.1.in b/doc/tor.1.in
index bf2832f67ecd7e31116de96ff5c427c2fe734358..879690b818b041b14f2ff1e7a060b3218e3dffbd 100644 (file)
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -985,6 +985,11 @@ periodically (every 15 minutes) writes statistics about hidden service
 usage to a file \fBhsusage\fP  in its data directory. (Default: 0)
 .LP
 .TP
+\fBHidServDirectoryV2 \fR\fB0\fR|\fB1\fR\fP
+When this option is set, Tor accepts and serves v2 hidden service
+descriptors. (Default: 0)
+.LP
+.TP
 \fBDirPort \fR\fIPORT\fP
 Advertise the directory service on this port.
 .LP