[or-cvs] [tor/maint-0.2.2] Update documentation for PublishServerDescriptor (0.2.2.x)

[nickm@xxxxxxxxxxxxxx]

commit 20d493308a50d3acc10ba27ac78d4258045f8ede
Author: Robert Ransom <rransom.8774@xxxxxxxxx>
Date:   Wed Feb 9 03:14:51 2011 -0800

    Update documentation for PublishServerDescriptor (0.2.2.x)
---
 doc/tor.1.txt |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 81f1ee6..c0957fc 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -882,9 +882,9 @@ is non-zero):
     specified in ORPort. (Default: 0.0.0.0) This directive can be specified
     multiple times to bind to multiple addresses/ports.
 
-**PublishServerDescriptor** **0**|**1**|**v1**|**v2**|**v3**|**bridge**|**hidserv**,**...**::
+**PublishServerDescriptor** **0**|**1**|**v1**|**v2**|**v3**|**bridge**,**...**::
     This option specifies which descriptors Tor will publish when acting as
-    a relay or hidden service. You can
+    a relay. You can
     choose multiple arguments, separated by commas.
  +
     If this option is set to 0, Tor will not publish its
@@ -892,7 +892,7 @@ is non-zero):
     out your server, or if you're using a Tor controller that handles directory
     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 or a hidden service, publish the
+    which means "if running as a server, publish the
     appropriate descriptors to the authorities".
 
 **ShutdownWaitLength** __NUM__::