[tor-commits] [tor/release-0.2.4] Manpage: refer to ExcludeExitNodes, not the nonexistent ExcludeEntryNodes

[arma at torproject.org]

commit 8aded5b07c14824b6fcbd7583af9ed4f4d8466d3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Apr 13 18:27:08 2013 -0400

    Manpage: refer to ExcludeExitNodes, not the nonexistent ExcludeEntryNodes
    
    Spotted on tor-talk by "hamahangi".
---
 changes/fix-geoipexclude-doc |    4 ++++
 doc/tor.1.txt                |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/changes/fix-geoipexclude-doc b/changes/fix-geoipexclude-doc
new file mode 100644
index 0000000..63b544e
--- /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 f35d639..adcf6b7 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__,__...__::