tor-webwml.git

@@ -1996,8 +1996,8 @@ versions.

 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 @@ How do I keep the same key?</a></h3>

 <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 @@ all the relays (comma-separated) that are under your control:

 <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>