[or-cvs] backport clientonly/nopublish man page entries

[arma@xxxxxxxx]

Update of /home/or/cvsroot/tor/doc
In directory moria:/home/arma/work/onion/tor-010x/tor/doc

Modified Files:
      Tag: tor-0_1_0-patches
	tor.1.in 
Log Message:
backport clientonly/nopublish man page entries


Index: tor.1.in
===================================================================
RCS file: /home/or/cvsroot/tor/doc/tor.1.in,v
retrieving revision 1.87
retrieving revision 1.87.2.1
diff -u -d -r1.87 -r1.87.2.1
--- tor.1.in	27 May 2005 11:57:52 -0000	1.87
+++ tor.1.in	9 Jun 2005 09:16:25 -0000	1.87.2.1
@@ -168,6 +168,9 @@
 is to run as a client unless ORPort is configured.  (Usually,
 you don't need to set this; Tor is pretty smart at figuring out whether
 you are reliable and high-bandwidth enough to be a useful server.)
+
+This option will likely be deprecated in the future; see the NoPublish
+option below. (Default: 0)
 .TP
 \fBEntryNodes \fR\fInickname\fR,\fInickname\fR,\fI...\fP
 A list of preferred nodes to use for the first hop in the circuit, if possible.
@@ -330,6 +333,13 @@
 \fBNickname \fR\fIname\fP
 Set the server's nickname to 'name'.
 .TP
+\fBNoPublish \fR\fB0\fR|\fB1\fR\fP
+If you set NoPublish 1, Tor will act as a server if you have an ORPort
+defined, but it will not publish its descriptor to the dirservers. This
+option is useful if you're testing out your server, or if you're using
+alternate dirservers (e.g. for other Tor networks such as Blossom).
+(Default: 0)
+.TP
 \fBNumCPUs \fR\fInum\fP
 How many processes to use at once for decrypting onionskins. (Default: 1)
 .TP