diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-12-17 22:58:14 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-12-17 22:58:14 +0000 |
| commit | 2ad36f68c8e5bbbc0f284c04f266f80866d2aef9 (patch) | |
| tree | 8468c4b90118a244057daa207acaffae5f5ed77c /doc | |
| parent | 03f413f5c7220be2d3313489a836fb92b67a6b1c (diff) | |
| download | tor-2ad36f68c8e5bbbc0f284c04f266f80866d2aef9.tar.gz tor-2ad36f68c8e5bbbc0f284c04f266f80866d2aef9.zip | |
Rename ServerDNSAllowBrokenResolvConf to ServerDNSAllowBrokenConfig.
(Many users have no idea what a resolv.conf is, and shouldn't be forced to learn. The old option will keep working for now.)
Also, document it.
svn:r17661
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.in | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in index b723110a1a..76c8b47c8b 100644 --- a/doc/tor.1.in +++ b/doc/tor.1.in @@ -975,6 +975,14 @@ ServerDNS options, only affects name lookups that your server does on behalf of clients. (Defaults to use the system DNS configuration.) .LP .TP +\fBServerDNSAllowBrokenConfig \fR\fB0\fR|\fB1\fR\fP +If this option is false, Tor exits immediately if there are problems +parsing the system DNS configuration or connecting to nameservers. +Otherwise, Tor continues to periodically retry the system namesevers +until it eventually succeeds. +(Defaults to "1".) +.LP +.TP \fBServerDNSSearchDomains \fR\fB0\fR|\fB1\fR\fP If set to \fB1\fP, then we will search for addresses in the local search domain. For example, if this system is configured to believe it is in @@ -1332,7 +1340,7 @@ non-default set of DirServers is set. Cannot be unset while Tor is running. .PD 0 .RS 12 -.IP "ServerDNSAllowBrokenResolvConf 1" +.IP "ServerDNSAllowBrokenConfig 1" .IP "DirAllowPrivateAddresses 1" .IP "EnforceDistinctSubnets 0" .IP "AssumeReachable 1" |