summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-03-20 20:15:50 +0000
committerRoger Dingledine <arma@torproject.org>2006-03-20 20:15:50 +0000
commit173b16cd1e01e97e210c921183fa18d15f7dfb02 (patch)
treea0c970a6223c65f748b0c37f9494cd681d4e2b4a
parent6449e2f6d6cf1e261a446892821c21f7d07ec508 (diff)
downloadtor-173b16cd1e01e97e210c921183fa18d15f7dfb02.tar.gz
tor-173b16cd1e01e97e210c921183fa18d15f7dfb02.zip
clean up man page entries on EntryNodes and ExitNodes
svn:r6202
-rw-r--r--doc/tor.1.in24
1 files changed, 14 insertions, 10 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 04bb3fa1a3..12cd0dd561 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -242,28 +242,32 @@ you are reliable and high-bandwidth enough to be a useful server.)
(Default: 0)
.LP
.TP
+\fBExcludeNodes \fR\fInickname\fR,\fInickname\fR,\fI...\fP
+A list of nodes to never use when building a circuit.
+.LP
+.TP
\fBEntryNodes \fR\fInickname\fR,\fInickname\fR,\fI...\fP
-A list of preferred nodes to use for the first hop in the circuit, if possible.
+A list of preferred nodes to use for the first hop in the circuit.
+These are treated only as preferences unless StrictEntryNodes (see
+below) is also set.
.LP
.TP
\fBExitNodes \fR\fInickname\fR,\fInickname\fR,\fI...\fP
-A list of preferred nodes to use for the last hop in the circuit, if possible.
+A list of preferred nodes to use for the last hop in the circuit.
+These are treated only as preferences unless StrictExitNodes (see
+below) is also set.
.LP
.TP
-\fBExcludeNodes \fR\fInickname\fR,\fInickname\fR,\fI...\fP
-A list of nodes to never use when building a circuit.
+\fBStrictEntryNodes \fR\fB0\fR|\fB1\fR\fP
+If 1, Tor will never use any nodes besides those listed in "EntryNodes" for
+the first hop of a circuit.
.LP
.TP
\fBStrictExitNodes \fR\fB0\fR|\fB1\fR\fP
-If 1, Tor will never use any nodes besides those listed in "exitnodes" for
+If 1, Tor will never use any nodes besides those listed in "ExitNodes" for
the last hop of a circuit.
.LP
.TP
-\fBStrictEntryNodes \fR\fB0\fR|\fB1\fR\fP
-If 1, Tor will never use any nodes besides those listed in "entrynodes" for
-the first hop of a circuit.
-.LP
-.TP
\fBFascistFirewall \fR\fB0\fR|\fB1\fR\fP
If 1, Tor will only create outgoing connections to ORs running on ports that
your firewall allows (defaults to 80 and 443; see \fBFirewallPorts\fR). This will