summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-03-14 11:25:54 -0400
committerNick Mathewson <nickm@torproject.org>2017-03-14 11:25:54 -0400
commit92813941b5f467b878485eb3c141c59f48736847 (patch)
tree8d6d45ed5704e12ee66ea40023d787139b651a94
parente2cd600da6e99c38193a6bd326b4208b1fc380d8 (diff)
downloadtor-92813941b5f467b878485eb3c141c59f48736847.tar.gz
tor-92813941b5f467b878485eb3c141c59f48736847.zip
#21720: Update "directory server options" preamble in manpage
-rw-r--r--changes/bug217205
-rw-r--r--doc/tor.1.txt5
2 files changed, 8 insertions, 2 deletions
diff --git a/changes/bug21720 b/changes/bug21720
new file mode 100644
index 0000000000..6d2fbcf711
--- /dev/null
+++ b/changes/bug21720
@@ -0,0 +1,5 @@
+ o Documentation:
+ - Update the description of the directory server options in the manual
+ page, to clarify that DirPort is no longer necessary to be a directory
+ cache. Closes ticket 21720.
+
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index de2e2b4a04..1665cfe947 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2121,8 +2121,9 @@ is non-zero):
DIRECTORY SERVER OPTIONS
------------------------
-The following options are useful only for directory servers (that is,
-if DirPort is non-zero):
+The following options are useful only for directory servers. (Relays with
+enough bandwidth automatically become directory servers; see DirCache for
+details.)
[[DirPortFrontPage]] **DirPortFrontPage** __FILENAME__::
When this option is set, it takes an HTML file and publishes it as "/" on