Do not recommend use of nicknames in MapAddress manpage

diff --git a/changes/bug18312 b/changes/bug18312
new file mode 100644 (file)
index 0000000..7dcb326
--- /dev/null
+++ b/changes/bug18312
@@ -0,0 +1,4 @@
+  o Documentation:
+    - Stop recommending use of nicknames to identify relays in our
+      MapAddress documentation. Closes ticket 18312.
+

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 262a36ee9f968c6849a80d27e9e5f132e81b7713..787223d701019d914c96e5645d8204803765551d 100644 (file)
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -961,12 +961,12 @@ The following options are useful only for clients (that is, if
     When a request for address arrives to Tor, it will transform to newaddress
     before processing it. For example, if you always want connections to
     www.example.com to exit via __torserver__ (where __torserver__ is the
-    nickname of the server), use "MapAddress www.example.com
+    fingerprint of the server), use "MapAddress www.example.com
     www.example.com.torserver.exit". If the value is prefixed with a
     "\*.", matches an entire domain. For example, if you
     always want connections to example.com and any if its subdomains
     to exit via
-    __torserver__ (where __torserver__ is the nickname of the server), use
+    __torserver__ (where __torserver__ is the fingerprint of the server), use
     "MapAddress \*.example.com \*.example.com.torserver.exit". (Note the
     leading "*." in each part of the directive.) You can also redirect all
     subdomains of a domain to a single address. For example, "MapAddress