aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-05-26 07:42:06 +0000
committerRoger Dingledine <arma@torproject.org>2007-05-26 07:42:06 +0000
commit1c3f8640243ec1958477990078d0b79d90a055d5 (patch)
tree5767b80773ebece9b3d378df54296b73e6b8e00b
parent62a98c878c9ee79463e7562b3f2b6a4d305beafc (diff)
downloadtor-1c3f8640243ec1958477990078d0b79d90a055d5.tar
tor-1c3f8640243ec1958477990078d0b79d90a055d5.tar.gz
cleanups on man page from edmanm
svn:r10350
-rw-r--r--doc/tor.1.in18
1 files changed, 9 insertions, 9 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 261558169..0e9a69416 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -776,7 +776,7 @@ next day. All times are local, and given in 24-hour time. (Defaults to
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, like all other
-ServerDNS options, only affects name lookup that your server does on
+ServerDNS options, only affects name lookups that your server does on
behalf of clients. Also, it only takes effect if Tor was built with
eventdns support. (Defaults to use the system DNS configuration.)
.LP
@@ -786,8 +786,8 @@ 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 affects name lookup that your server does on
-behalf of clients, and only takes effect if Tor was build with
+This option only affects name lookups that your server does on
+behalf of clients, and only takes effect if Tor was built with
eventdns support.
(Defaults to "0".)
.LP
@@ -797,8 +797,8 @@ 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 affects name lookup that your server does on
-behalf of clients, and only takes effect if Tor was build with
+This option only affects name lookups that your server does on
+behalf of clients, and only takes effect if Tor was built with
eventdns support.
(Defaults to "1".)
.LP
@@ -807,8 +807,8 @@ eventdns support.
When we're detecting DNS hijacking, make sure that these \fIvalid\fP
addresses aren't getting redirected. If they are, then our DNS is
completely useless, and we'll reset our exit policy to "reject *:*".
-This option only affects name lookup that your server does on
-behalf of clients, and only takes effect if Tor was build with
+This option only affects name lookups that your server does on
+behalf of clients, and only takes effect if Tor was built with
eventdns support.
(Defaults to "www.google.com, www.mit.edu, www.yahoo.com,
www.slashdot.org".)
@@ -819,8 +819,8 @@ When this option is disabled, Tor does not try to resolve hostnames
containing illegal characters (like @ and :) rather than sending them to an
exit node to be resolved. This helps trap accidental attempts to resolve
URLs and so on.
-This option only affects name lookup that your server does on
-behalf of clients, and only takes effect if Tor was build with
+This option only affects name lookups that your server does on
+behalf of clients, and only takes effect if Tor was built with
eventdns support.
(Default: 0)