[or-cvs] [tor/maint-0.2.2] Remove country codes from EntryNodes manpage entry

[nickm at torproject.org]

commit f2bb7b17d7453a14d2be931f3e21c51f623443e4
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Fri Jan 28 14:15:01 2011 +0100

    Remove country codes from EntryNodes manpage entry
---
 changes/bug2450 |    5 +++++
 doc/tor.1.txt   |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/changes/bug2450 b/changes/bug2450
new file mode 100644
index 0000000..b3b50dd
--- /dev/null
+++ b/changes/bug2450
@@ -0,0 +1,5 @@
+  o Minor bugfixes:
+    - Country codes aren't supported in EntryNodes until 0.2.3.x.
+      Don't mention them in the manpage. Fixes bug 2450, issue
+      spotted by keb and G-Lo.
+
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 8fe73b0..6c9636c 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -471,7 +471,7 @@ The following options are useful only for clients (that is, if
     list.
 
 **EntryNodes** __node__,__node__,__...__::
-    A list of identity fingerprints, nicknames, country codes and address
+    A list of identity fingerprints, nicknames and address
     patterns of nodes to use for the first hop in normal circuits. These are
     treated only as preferences unless StrictNodes (see below) is also set.