clean up the server docs for ulimit -n

svn:r5036

2 files changed, 10 insertions, 7 deletions

diff --git a/doc/TODO b/doc/TODO
index 9a6886ad97..bace51bee8 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -37,7 +37,7 @@ NR- write a spec appendix for 'being nice with tor'
 
 for 0.1.1.x:
 R - are dirservers auto-verifying duplicate nicknames?
-  - tor should auto-sort the recommended-versions strings 
+  o tor should auto-sort the recommended-versions strings 
     (with the new smartlist sort stuff maybe)
   - setconf SocksBindAddress kills tor if it fails to bind
 
diff --git a/doc/tor-doc-server.html b/doc/tor-doc-server.html
index 2d6fbdb1c3..fc0a5adfce 100644
--- a/doc/tor-doc-server.html
+++ b/doc/tor-doc-server.html
@@ -268,12 +268,15 @@ into a chroot jail</a>.)
 </p>
 
 <p>
-11. (Unix only.) Your operating system probably limits the number of open
-file descriptors per process to 1024 (or even less). If you plan to be
-running a fast exit node, this is probably not enough. You should run
-"ulimit -n 8192" (as root) and then su to the user that will run Tor,
-or change your defaults (on Debian, add a line like "toruser hard nofile
-8192" to your /etc/security/limits.conf file).
+11. (Unix only.) Your operating system probably limits the number
+of open file descriptors per process to 1024 (or even less). If
+you plan to be running a fast exit node, this is probably not
+enough. On Linux, you should add a line like "toruser hard nofile
+8192" to your /etc/security/limits.conf file, where toruser is
+the user that runs the Tor process. If that doesn't work, see <a
+href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#FileDescriptors">this
+FAQ entry</a> for other suggested ways to run "ulimit -n 8192" before
+you launch Tor.
 </p>
 
 <p>