Document all the arguments of PublishServerDescriptor.

Implements 15645.

diff --git a/changes/bug15645 b/changes/bug15645
new file mode 100644 (file)
index 0000000..781d20e
--- /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 b4a3cc5f754a6097147432c94fc240bb8090865c..11e4680d2871ac370aafcc696fece9b22eafb95b 100644 (file)
--- 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: