aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2012-09-14 02:41:13 -0400
committerRoger Dingledine <arma@torproject.org>2012-09-14 02:41:13 -0400
commit9ab3b332aec076451dd93d11ce7ce1fd81ff7294 (patch)
tree1d92e0318acf5961d8c5b2c7e11ec307b6971052 /doc
parentabbde7b1849768c96b3ebf2e08e4f844c0775b9d (diff)
parent909691f1ae9e2b8cd806cdf43b43f99b97c5c0f4 (diff)
downloadtor-9ab3b332aec076451dd93d11ce7ce1fd81ff7294.tar
tor-9ab3b332aec076451dd93d11ce7ce1fd81ff7294.tar.gz
Merge branch 'maint-0.2.3'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index cf5945df1..03cc50d63 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -83,7 +83,7 @@ COMMAND-LINE OPTIONS
Other options can be specified on the command-line in the format "--option
value", in the format "option value", or in a configuration file. For
instance, you can tell Tor to start listening for SOCKS connections on port
-9999 by passing --SOCKSPort 9999 or SOCKPort 9999 to it on the command line,
+9999 by passing --SOCKSPort 9999 or SOCKSPort 9999 to it on the command line,
or by putting "SOCKSPort 9999" in the configuration file. You will need to
quote options with spaces in them: if you want Tor to log all debugging
messages to debug.log, you will probably need to say --Log 'debug file