[tor-commits] [tor/master] Refrain from mentioning nicknames in manpage section for MyFamily.

[dgoulet at torproject.org]

commit ef991b04e26eb4db445f9e5c1d82b1dea3f4007f
Author: rl1987 <rl1987 at sdf.lonestar.org>
Date:   Thu Mar 5 17:41:49 2020 +0200

    Refrain from mentioning nicknames in manpage section for MyFamily.
    
    Also, fix a typo.
---
 changes/doc33417 | 3 +++
 doc/tor.1.txt    | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/changes/doc33417 b/changes/doc33417
new file mode 100644
index 000000000..0fc868fc6
--- /dev/null
+++ b/changes/doc33417
@@ -0,0 +1,3 @@
+  o Documentation (manpage):
+    - Refrain from mentioning nicknames in manpage section for MyFamily torrc
+      option. Resolves issue 33417.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 9f428cb79..3b70bfca5 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2363,14 +2363,11 @@ is non-zero):
     list itself, but it won't hurt if it does.) Do not list any bridge relay as it would
     compromise its concealment. +
      +
-    When listing a node, it's better to list it by fingerprint than by
-    nickname: fingerprints are more reliable. +
-     +
     If you run more than one relay, the MyFamily option on each relay
     **must** list all other relays, as described above. +
      +
     Note: do not use MyFamily when configuring your Tor instance as a
-    brigde.
+    bridge.
 
 [[Nickname]] **Nickname** __name__::
     Set the server's nickname to \'name'. Nicknames must be between 1 and 19