diff options
author | Roger Dingledine <arma@torproject.org> | 2006-09-25 05:59:13 +0000 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2006-09-25 05:59:13 +0000 |
commit | ad430b9561be97fc3438ed87b2b2453ce41eae43 (patch) | |
tree | d79e87d84f05e4d005d0b7013323ef2492568397 /doc/tor.1.in | |
parent | bc848c8740a5f64cc52b97bccd03da7f64347da2 (diff) | |
download | tor-ad430b9561be97fc3438ed87b2b2453ce41eae43.tar.gz tor-ad430b9561be97fc3438ed87b2b2453ce41eae43.zip |
checkpoint changelog and general polishing
svn:r8497
Diffstat (limited to 'doc/tor.1.in')
-rw-r--r-- | doc/tor.1.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in index effd59b7ef..5284fd645a 100644 --- a/doc/tor.1.in +++ b/doc/tor.1.in @@ -635,7 +635,7 @@ next day. All times are local, and given in 24-hour time. (Defaults to \fBServerDNSResolvConfFile \fR\fIfilename\fP Overrides the default DNS configuration with the configuration in \fIfilename\fP. The file format is the same as the standard Unix -"\fBresolv.conf\fP" file (7). This option only effects name lookup for +"\fBresolv.conf\fP" file (7). This option only affects name lookup for addresses requested by clients; and only takes effect if Tor was built with eventdns support. (Defaults to use the system DNS configuration.) .LP @@ -645,7 +645,7 @@ 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 "example.com", and a client tries to connect to "www", the client will be connected to "www.example.com". -This option only effects name lookup for addresses requested by clients. +This option only affects name lookup for addresses requested by clients. (Defaults to "0".) .LP .TP @@ -653,7 +653,7 @@ This option only effects name lookup for addresses requested by clients. When this option is set to 1, we will test periodically to determine whether our local nameservers have been configured to hijack failing DNS requests (usually to an advertising site). If they are, we will attempt to correct -this. This option only effects name lookup for addresses requested by +this. This option only affects name lookup for addresses requested by clients; and only takes effect if Tor was built with eventdns support. (Defaults to "1".) |