[tor-commits] [tor/master] Document disable option for ControlSocket and SocksSocket

[nickm at torproject.org]

commit 78956f5d857f573106fd4dd4d2f9220af32be1b3
Author: Andrea Shepard <andrea at torproject.org>
Date:   Fri Jan 9 20:54:59 2015 +0000

    Document disable option for ControlSocket and SocksSocket
---
 doc/tor.1.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 43aade9..7f280d1 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -294,7 +294,7 @@ GENERAL OPTIONS
 
 [[ControlSocket]] **ControlSocket** __Path__::
     Like ControlPort, but listens on a Unix domain socket, rather than a TCP
-    socket. (Unix and Unix-like systems only.)
+    socket. '0' disables ControlSocket (Unix and Unix-like systems only.)
 
 [[ControlSocketsGroupWritable]] **ControlSocketsGroupWritable** **0**|**1**::
     If this option is set to 0, don't allow the filesystem group to read and
@@ -485,7 +485,7 @@ GENERAL OPTIONS
 
 [[SocksSocket]] **SocksSocket** __Path__::
     Like SocksPort, but listens on a Unix domain socket, rather than a TCP
-    socket. (Unix and Unix-like systems only.)
+    socket.  '0' disables SocksSocket (Unix and Unix-like systems only.)
 
 [[SocksSocketsGroupWritable]] **SocksSocketsGroupWritable** **0**|**1**::
     If this option is set to 0, don't allow the filesystem group to read and