diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-10-04 12:56:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-10-04 12:56:05 -0400 |
| commit | 5eb3630f1a4fbd32cd73450d5da007ac4d7a6d85 (patch) | |
| tree | 31c84eff9c63e5a13fe515af4cd3d1826d9d8a55 /doc/tor.1.txt | |
| parent | 69b4138c006d74878a426d74829d90b024c4827d (diff) | |
| parent | 8d87040e13d4c3c95c23abc7232a71e686a65e45 (diff) | |
| download | tor-5eb3630f1a4fbd32cd73450d5da007ac4d7a6d85.tar tor-5eb3630f1a4fbd32cd73450d5da007ac4d7a6d85.tar.gz | |
Merge remote branch 'rransom/manpage-fixes' into maint-0.2.2
Diffstat (limited to 'doc/tor.1.txt')
| -rw-r--r-- | doc/tor.1.txt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 620f93874..e44966506 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -779,9 +779,9 @@ is non-zero): **BridgeRelay** **0**|**1**:: Sets the relay to act as a "bridge" with respect to relaying connections - from bridge users to the Tor network. Mainly it influences how the relay - will cache and serve directory information. Usually used in combination - with PublishServerDescriptor. + from bridge users to the Tor network. It mainly causes Tor to publish a + server descriptor to the bridge database, rather than publishing a relay + descriptor to the public directory authorities. **ContactInfo** __email_address__:: Administrative contact information for server. This line might get picked @@ -867,15 +867,15 @@ is non-zero): multiple times to bind to multiple addresses/ports. **PublishServerDescriptor** **0**|**1**|**v1**|**v2**|**v3**|**bridge**|**hidserv**,**...**:: - This option is only considered if you have an ORPort defined. You can + This option specifies which descriptors Tor will publish. 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 + If 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 descriptor to all - directory authorities of the type(s) specified. The value "1" is the - default, which means "publish to the appropriate authorities". + 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". **ShutdownWaitLength** __NUM__:: When we get a SIGINT and we're a server, we begin shutting down: |