summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-04-13 18:27:08 -0400
committerNick Mathewson <nickm@torproject.org>2013-04-13 18:28:06 -0400
commit8aded5b07c14824b6fcbd7583af9ed4f4d8466d3 (patch)
treed7bd12877abc8fca96e03c730360db58fa84b8a7
parent97246a5b6d6c2e25db14e7a82f4a01b876447101 (diff)
downloadtor-8aded5b07c14824b6fcbd7583af9ed4f4d8466d3.tar.gz
tor-8aded5b07c14824b6fcbd7583af9ed4f4d8466d3.zip
Manpage: refer to ExcludeExitNodes, not the nonexistent ExcludeEntryNodes
Spotted on tor-talk by "hamahangi".
-rw-r--r--changes/fix-geoipexclude-doc4
-rw-r--r--doc/tor.1.txt4
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/fix-geoipexclude-doc b/changes/fix-geoipexclude-doc
new file mode 100644
index 0000000000..63b544ef29
--- /dev/null
+++ b/changes/fix-geoipexclude-doc
@@ -0,0 +1,4 @@
+ o Documentation fixes:
+ - Fix the GeoIPExcludeUnknown documentation to refer to ExcludeExitNodes
+ rather than the currently nonexistent ExcludeEntryNodes. Spotted by
+ "hamahangi" on tor-talk.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index f35d639580..adcf6b7182 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -695,10 +695,10 @@ The following options are useful only for clients (that is, if
**GeoIPExcludeUnknown** **0**|**1**|**auto**::
If this option is set to 'auto', then whenever any country code is set in
- ExcludeNodes or ExcludeEntryNodes, all nodes with unknown country (\{??} and
+ ExcludeNodes or ExcludeExitNodes, all nodes with unknown country (\{??} and
possibly \{A1}) are treated as excluded as well. If this option is set to
'1', then all unknown countries are treated as excluded in ExcludeNodes
- and ExcludeEntryNodes. This option has no effect when a GeoIP file isn't
+ and ExcludeExitNodes. This option has no effect when a GeoIP file isn't
configured or can't be found. (Default: auto)
**ExitNodes** __node__,__node__,__...__::