summaryrefslogtreecommitdiff
path: root/doc/tor.1.in
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-10-16 03:52:37 +0000
committerRoger Dingledine <arma@torproject.org>2007-10-16 03:52:37 +0000
commitece556f60016ef8a1baf45b0ba709f483cd94a68 (patch)
tree01046bffd5a0534b5742664fb2ffab3e1e7fd3d7 /doc/tor.1.in
parentbed218afc95e38df354b9c4d92028b06d918469e (diff)
downloadtor-ece556f60016ef8a1baf45b0ba709f483cd94a68.tar.gz
tor-ece556f60016ef8a1baf45b0ba709f483cd94a68.zip
give PublishServerDescriptor a real man page entry
svn:r11971
Diffstat (limited to 'doc/tor.1.in')
-rw-r--r--doc/tor.1.in16
1 files changed, 10 insertions, 6 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 4b5a6d6eea..b3d2cc883e 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -811,12 +811,16 @@ This directive can be specified multiple times to bind to multiple
addresses/ports.
.LP
.TP
-\fBPublishServerDescriptor \fR\fB0\fR|\fB1\fR\fP
-If set to 0, Tor will act as a server if you have an ORPort
-defined, but it will not publish its descriptor to the dirservers. This
-option is useful if you're testing out your server, or if you're using
-a Tor controller that handles directory publishing for you.
-(Default: 1)
+\fBPublishServerDescriptor \fR\fB0\fR|\fB1\fR|\fBv1\fR|\fBv2\fR|\fBv3\fR|\fBbridge\fR|\fBhidserv\fR, ...\fP
+This option is only considered if you have an ORPort defined. You can
+choose multiple arguments, separated by commas.
+
+If set to 0, Tor will act as a server but it will not publish its
+descriptor to the directory authorities. (This is useful if you're
+testing out your server, or if you're using a Tor controller that handles
+directory publishing for you.) Otherwise, Tor will publish its descriptor
+to all directory authorities of the type(s) specified. The value "1" is
+treated as a synonym for the default, which is currently "v1,v2".
.LP
.TP
\fBRedirectExit \fR\fIpattern target\fP