summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2017-08-09 15:07:49 -0400
committerRoger Dingledine <arma@torproject.org>2017-08-09 15:07:49 -0400
commit77bb85ba873425b6c7b48d4c93bde1f434a37314 (patch)
tree0f984036f2285e26f2d07dcbe5a375aed6464412 /doc
parentd655388a4a7c6a4415c8a48d410809591385c344 (diff)
downloadtor-77bb85ba873425b6c7b48d4c93bde1f434a37314.tar.gz
tor-77bb85ba873425b6c7b48d4c93bde1f434a37314.zip
fix description of PublishServerDescriptor
the values of "v3" and "bridge" have to do with *where* you publish to, not whether you publish.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 11e4680d28..2e11534a68 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1815,13 +1815,13 @@ is non-zero):
+
If this option is set to 0, Tor will not publish its
descriptors to any directories. (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 descriptors of all
- type(s) specified. The default is "1",
- which means "if running as a server, publish the
- appropriate descriptors to the authorities". Other possibilities are
- "v3", meaning "publish if running as a relay", and
- "bridge", meaning "publish if running as a bridge".
+ out your server, or if you're using a Tor controller that handles
+ directory publishing for you.) Otherwise, Tor will publish its
+ descriptors of all type(s) specified. The default is "1", which
+ means "if running as a relay or bridge, publish descriptors to the
+ appropriate authorities". Other possibilities are "v3", meaning
+ "publish as if you're a relay", and "bridge", meaning "publish as
+ if you're a bridge".
[[ShutdownWaitLength]] **ShutdownWaitLength** __NUM__::
When we get a SIGINT and we're a server, we begin shutting down: