summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrl1987 <rl1987@sdf.lonestar.org>2020-03-05 17:41:49 +0200
committerrl1987 <rl1987@sdf.lonestar.org>2020-03-05 17:41:49 +0200
commitef991b04e26eb4db445f9e5c1d82b1dea3f4007f (patch)
treee1c2286effcd70f8dc4f7fea930f8e7dd055cc2e
parentba8d71d9c37dcce213a0386e96731de5ba7d80fa (diff)
downloadtor-ef991b04e26eb4db445f9e5c1d82b1dea3f4007f.tar.gz
tor-ef991b04e26eb4db445f9e5c1d82b1dea3f4007f.zip
Refrain from mentioning nicknames in manpage section for MyFamily.
Also, fix a typo.
-rw-r--r--changes/doc334173
-rw-r--r--doc/tor.1.txt5
2 files changed, 4 insertions, 4 deletions
diff --git a/changes/doc33417 b/changes/doc33417
new file mode 100644
index 0000000000..0fc868fc65
--- /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 9f428cb797..3b70bfca5d 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