From 1fa50c778c375df3779287041b87678deb0694fb Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 4 Oct 2010 12:58:20 -0400 Subject: [PATCH] Clarify PublishServerDescriptor even more --- doc/tor.1.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index e44966506b..df2b17ed08 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -867,15 +867,17 @@ is non-zero): multiple times to bind to multiple addresses/ports. **PublishServerDescriptor** **0**|**1**|**v1**|**v2**|**v3**|**bridge**|**hidserv**,**...**:: - This option specifies which descriptors Tor will publish. You can + This option specifies which descriptors Tor will publish when acting as + a relay or hidden service. You can choose multiple arguments, separated by commas. + - If set to 0, Tor will not publish its + 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 "publish the appropriate descriptors to the authorities". + which means "if running as a server or a hidden service, publish the + appropriate descriptors to the authorities". **ShutdownWaitLength** __NUM__:: When we get a SIGINT and we're a server, we begin shutting down: