Fix documentation about how not to be an OP

svn:r2342

diff --git a/doc/tor.1.in b/doc/tor.1.in
index 91dc6dc6641a12abf8da103fa6c9775fb71d347e..df338c22645e4a2b1f750fae95d66a82968da5a2 100644 (file)
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -128,7 +128,9 @@ A list of preferred nodes to use for the rendezvous point, if possible.
 A list of nodes to never use when choosing a rendezvous point.
 .TP
 \fBsocksport \fR\fIPORT\fP
-Bind to this port to listen for connections from socks-speaking applications.
+Bind to this port to listen for connections from SOCKS-speaking applications.
+Set this to 0 if you don't want to allow application connections. (Default:
+9050)
 .TP
 \fBsocksbindaddress \fR\fIIP\fP
 Bind to this address to listen for connections from socks-speaking applications. (Default: 127.0.0.1) You can also specify a port (e.g. 192.168.0.1:9100). This directive can be specified multiple times to bind to multiple addresses/ports.

diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index e43c512b4536e15f52f39c04d5ed30c4460fb184..9156f979dbe6b18073b51e3ba2f14da95f1d6d6e 100644 (file)
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -4,7 +4,7 @@
 # servers, and from them they get a list of currently up nodes.
 RouterFile @CONFDIR@/dirservers
 
-# Comment out if you don't want to allow applications to connect.
+# Replace this with "SocksPort 0" if you don't want clients to connect.
 SocksPort 9050
 SocksBindAddress 127.0.0.1 # accept connections only from localhost
 #SocksBindAddress 192.168.0.1:9100 # listen on a chosen IP/port