[or-cvs] clarify sockspolicy, exitpolicy rules

[Roger Dingledine]

Update of /home/or/cvsroot/src/config
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/config

Modified Files:
	torrc.sample.in 
Log Message:
clarify sockspolicy, exitpolicy rules


Index: torrc.sample.in
===================================================================
RCS file: /home/or/cvsroot/src/config/torrc.sample.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- torrc.sample.in	4 Aug 2004 06:17:24 -0000	1.14
+++ torrc.sample.in	6 Aug 2004 10:11:57 -0000	1.15
@@ -9,11 +9,12 @@
 SocksBindAddress 127.0.0.1 # accept connections only from localhost
 #SocksBindAddress 192.168.0.1:9100 # listen on a chosen IP/port
 
-# Entry policies to allow/deny SOCKS requests based on IP.  By default,
-# we accept all requests from SocksBindAddress.
+# Entry policies to allow/deny SOCKS requests based on IP. First
+# entry that matches wins. If no SocksPolicy is set, we accept all
+# (and only) requests from SocksBindAddress.
 #
-#SocksPolicy accept 192.168.0.1/16:*
-#SocksPolicy reject *:*
+#SocksPolicy accept 192.168.0.1/16
+#SocksPolicy reject *
 
 # By default, we send log messages to stdout.  If you want
 # them to go somewhere else, uncomment one or more of these example
@@ -53,7 +54,8 @@
 # Uncomment this to mirror the directory for others (please do)
 #DirPort 9030
 
-## A comma-separated list of exit policies. If you want to *replace*
+## A comma-separated list of exit policies. They're considered first
+## to last, and the first match wins. If you want to *replace*
 ## the default exit policy, end this with either a reject *:* or an
 ## accept *:*. Otherwise, you're *augmenting* (prepending to) the
 ## default exit policy. Leave commented to just use the default.