[or-cvs] and add SocksTimeout to the man page

[arma at seul.org]

Update of /home2/or/cvsroot/tor/doc
In directory moria:/home/arma/work/onion/cvs/tor/doc

Modified Files:
	tor.1.in 
Log Message:
and add SocksTimeout to the man page
and stop shouting when we talk about Socks


Index: tor.1.in
===================================================================
RCS file: /home2/or/cvsroot/tor/doc/tor.1.in,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -d -r1.140 -r1.141
--- tor.1.in	20 Mar 2006 20:15:50 -0000	1.140
+++ tor.1.in	21 Mar 2006 23:30:24 -0000	1.141
@@ -224,7 +224,7 @@ available. This is untested and probably
 
 .SH CLIENT OPTIONS
 .PP
-The following options are useful only for clients (that is, if \fBSOCKSPort\fP is non-zero):
+The following options are useful only for clients (that is, if \fBSocksPort\fP is non-zero):
 .LP
 .TP
 \fBAllowInvalidNodes\fR \fBentry\fR|\fBexit\fR|\fBmiddle\fR|\fBintroduction\fR|\fBrendezvous\fR|...\fP
@@ -359,24 +359,30 @@ A list of preferred nodes to use for the
 A list of nodes to never use when choosing a rendezvous point.
 .LP
 .TP
-\fBSOCKSPort \fR\fIPORT\fP
-Advertise this port to listen for connections from SOCKS-speaking
+\fBSocksPort \fR\fIPORT\fP
+Advertise 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)
 .LP
 .TP
-\fBSOCKSListenAddress \fR\fIIP\fR[:\fIPORT\fR]\fP
-Bind to this address to listen for connections from SOCKS-speaking
+\fBSocksListenAddress \fR\fIIP\fR[:\fIPORT\fR]\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.
 .LP
 .TP
-\fBSOCKSPolicy \fR\fIpolicy\fR,\fIpolicy\fR,\fI...\fP
-Set an entrance policy for this server, to limit who can connect to the SOCKS ports. 
+\fBSocksPolicy \fR\fIpolicy\fR,\fIpolicy\fR,\fI...\fP
+Set an entrance policy for this server, to limit who can connect to the
+Socks ports.
 The policies have the same form as exit policies below.
 .LP
 .TP
+\fBSocksTimeout \fR\fINUM\fP
+Let a socks connection wait NUM seconds unattached before we fail it.
+(Default: 2 minutes.)
+.LP
+.TP
 \fBTrackHostExits \fR\fIhost\fR,\fI.domain\fR,\fI...\fR\fP
 For each value in the comma separated list, Tor will track recent connections
 to hosts that match this value and attempt to