[tor-commits] [tor/master] Document all the arguments of PublishServerDescriptor.

[nickm at torproject.org]

commit d655388a4a7c6a4415c8a48d410809591385c344
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 9 11:17:27 2017 -0400

    Document all the arguments of PublishServerDescriptor.
    
    Implements 15645.
---
 changes/bug15645 | 3 +++
 doc/tor.1.txt    | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug15645 b/changes/bug15645
new file mode 100644
index 000000000..781d20e09
--- /dev/null
+++ b/changes/bug15645
@@ -0,0 +1,3 @@
+  o Documentation:
+    - Document all values of PublishServerDescriptor in the manpage.
+      Closes ticket 15645.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index b4a3cc5f7..11e4680d2 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1819,7 +1819,9 @@ is non-zero):
     publishing for you.) Otherwise, Tor will publish its descriptors of all
     type(s) specified. The default is "1",
     which means "if running as a server, publish the
-    appropriate descriptors to the authorities".
+    appropriate descriptors to the authorities". Other possibilities are
+    "v3", meaning "publish if running as a relay", and
+    "bridge", meaning "publish if running as a bridge".
 
 [[ShutdownWaitLength]] **ShutdownWaitLength** __NUM__::
     When we get a SIGINT and we're a server, we begin shutting down: