aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-01-03 00:45:12 +0000
committerRoger Dingledine <arma@torproject.org>2006-01-03 00:45:12 +0000
commit4f033b0028a5347d70310f075bb6af65927c90d4 (patch)
tree188512e6dc1c4106451874a4029247c3b51d1b7b
parent16ee6830b63ef545e7c77b6594b212e07f0f95c9 (diff)
downloadtor-4f033b0028a5347d70310f075bb6af65927c90d4.tar
tor-4f033b0028a5347d70310f075bb6af65927c90d4.tar.gz
make the commenting in the torrc.sample consistent, and try to
explain in it what comments are. svn:r5711
-rw-r--r--src/config/torrc.sample.in26
1 files changed, 15 insertions, 11 deletions
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 473fd1699..241d48fb5 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -1,18 +1,22 @@
## Configuration file for a typical Tor user
-## Last updated 26 October 2005 for Tor 0.1.1.9-alpha.
+## Last updated 2 January 2006 for Tor 0.1.1.11-alpha.
## (May or may not work for older or newer versions of Tor.)
-#
+##
+## Lines that begin with "## " try to explain what's going on. Lines
+## that begin with just "#" are disabled commands: you can enable them
+## by removing the "#" symbol.
+##
## See the man page, or http://tor.eff.org/tor-manual.html, for more
## options you can use in this file.
-#
-# On Unix, Tor will look for this file in someplace like "~/.tor/torrc" or
-# "/etc/torrc"
-#
-# On Windows, Tor will look for the configuration file in someplace like
-# "Application Data\tor\torrc" or "Application Data\<username>\tor\torrc"
-#
-# With the default Mac OS X installer, Tor will look in ~/.tor/torrc or
-# /Library/Tor/torrc
+##
+## On Unix, Tor will look for this file in someplace like "~/.tor/torrc" or
+## "/etc/torrc"
+##
+## On Windows, Tor will look for the configuration file in someplace like
+## "Application Data\tor\torrc" or "Application Data\<username>\tor\torrc"
+##
+## With the default Mac OS X installer, Tor will look in ~/.tor/torrc or
+## /Library/Tor/torrc
## Replace this with "SocksPort 0" if you plan to run Tor only as a