[or-cvs] MaxConn has been obsolete for a while now.

[arma@xxxxxxxx]

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

Modified Files:
	tor.1.in 
Log Message:
MaxConn has been obsolete for a while now.
Document ConnLimit, which is the opposite.


Index: tor.1.in
===================================================================
RCS file: /home2/or/cvsroot/tor/doc/tor.1.in,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -d -r1.124 -r1.125
--- tor.1.in	5 Feb 2006 22:45:02 -0000	1.124
+++ tor.1.in	9 Feb 2006 02:59:10 -0000	1.125
@@ -49,6 +49,17 @@ advertised bandwidth rate) can thus redu
 server without impacting network performance.
 .LP
 .TP
+\fBConnLimit \fR\fINUM\fP
+The minimum number of file descriptors that must be available to
+the Tor process before it will start. Tor will ask the OS for as
+many file descriptors as the OS will allow (you can find this
+by "ulimit -H -n"). If this number is less than ConnLimit, then
+Tor will refuse to start.
+
+You probably don't need to adjust this. It has no effect on
+Windows since that platform lacks getrlimit(). (Default: 1024)
+.LP
+.TP
 \fBControlPort \fR\fIPort\fP
 If set, Tor will accept connections from the same machine (localhost only) on
 this port, and allow those connections to control the Tor process using the
@@ -153,11 +164,6 @@ option may appear more than once in a co
 are sent to all the logs that match their severity level.
 .LP
 .TP
-\fBMaxConn \fR\fINUM\fP
-Maximum number of simultaneous sockets allowed.  You probably don't need
-to adjust this. (Default: 1024)
-.LP
-.TP
 \fBOutboundBindAddress \fR\fIIP\fP
 Make all outbound connections originate from the IP address specified.  This
 is only useful when you have multiple network interfaces, and you want all