aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-09-10 15:54:16 -0400
committerNick Mathewson <nickm@torproject.org>2012-12-06 11:23:43 -0500
commitded70363a71ab52b965998c90587fb398e5048f0 (patch)
tree1d1a118d25bf4f1a8af4e7fcf912e40e7bf1ab48 /doc
parent5c51b3f1f0d4c394392aa6fce89bbe0960117771 (diff)
downloadtor-ded70363a71ab52b965998c90587fb398e5048f0.tar
tor-ded70363a71ab52b965998c90587fb398e5048f0.tar.gz
Rename DirServer to DirAuthority
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 1a7f8d597..112af81fb 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -292,7 +292,7 @@ GENERAL OPTIONS
**DataDirectory** __DIR__::
Store working data in DIR (Default: @LOCALSTATEDIR@/lib/tor)
-**DirServer** [__nickname__] [**flags**] __address__:__port__ __fingerprint__::
+**DirAuthority** [__nickname__] [**flags**] __address__:__port__ __fingerprint__::
Use a nonstandard authoritative directory server at the provided address
and port, with the specified key fingerprint. This option can be repeated
many times, for multiple authoritative directory servers. Flags are
@@ -309,8 +309,8 @@ GENERAL OPTIONS
flag "v3ident=**fp**" is given, the dirserver is a v3 directory authority
whose v3 long-term signing key has the fingerprint **fp**. +
+
- If no **dirserver** line is given, Tor will use the default directory
- servers. NOTE: this option is intended for setting up a private Tor
+ If no **DirAuthority** line is given, Tor will use the default directory
+ authorities. NOTE: this option is intended for setting up a private Tor
network with its own directory authorities. If you use it, you will be
distinguishable from other users, because you won't believe the same
authorities they do.
@@ -326,7 +326,7 @@ GENERAL OPTIONS
**AlternateHSAuthority** [__nickname__] [**flags**] __address__:__port__ __fingerprint__ +
**AlternateBridgeAuthority** [__nickname__] [**flags**] __address__:__port__ __ fingerprint__::
- These options behave as DirServer, but they replace fewer of the
+ These options behave as DirAuthority, but they replace fewer of the
default directory authorities. Using
AlternateDirAuthority replaces the default Tor directory authorities, but
leaves the default hidden service authorities and bridge authorities in