[tor-commits] r26968: {website} Remove nicknames from website doc (website/trunk/docs/en)

[Sebastian Hahn]

Author: sebastian
Date: 2014-10-05 18:13:54 +0000 (Sun, 05 Oct 2014)
New Revision: 26968

Modified:
   website/trunk/docs/en/faq.wml
Log:
Remove nicknames from website doc

Modified: website/trunk/docs/en/faq.wml
===================================================================
--- website/trunk/docs/en/faq.wml	2014-10-04 02:14:32 UTC (rev 26967)
+++ website/trunk/docs/en/faq.wml	2014-10-05 18:13:54 UTC (rev 26968)
@@ -1996,8 +1996,8 @@
 href="https://secure.wikimedia.org/wikipedia/en/wiki/ISO_3166-1_alpha-2"
 >2
     letter ISO3166 country code</a> in curly braces (for example <tt>{de}</tt>),
-    or an ip address pattern (for example 255.254.0.0/8), or a node
-    nickname. Make sure there are no spaces between the commas and the
+    or an ip address pattern (for example 255.254.0.0/8).
+    Make sure there are no spaces between the commas and the
     list items.
     </p>
     <p>
@@ -2810,9 +2810,8 @@
 
 <p>
  When upgrading your Tor relay, or running it on a different computer,
- the important part is to keep the same nickname (defined in your torrc
- file) and the same identity key (stored in "keys/secret_id_key" in
- your DataDirectory).
+ the important part is to keep the same identity key (stored in
+ "keys/secret_id_key" in your DataDirectory).
 </p>
 <p>
 This means that if you're upgrading your Tor relay and you keep the same
@@ -2948,10 +2947,7 @@
 
 <p>
 where each fingerprint is the 40 character identity fingerprint (without
-spaces). You can also list them by nickname, but fingerprint is safer.
-Be
-sure to prefix the digest strings with a dollar sign ('$') so that the
-digest is not confused with a nickname in the config file.
+spaces).
 </p>
 
 <p>