summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-02-22 18:25:16 -0500
committerNick Mathewson <nickm@torproject.org>2011-02-22 18:25:16 -0500
commitf16178c08fce1255d06cd5410a626e351f679ef2 (patch)
tree540f432dfc006061822098d29a144755e80b4b63 /doc
parentc2f111a631292b38b25635334afd628cb1024265 (diff)
parent530e87ce316f8a3feb1b116c89cc703090217e2d (diff)
downloadtor-f16178c08fce1255d06cd5410a626e351f679ef2.tar.gz
tor-f16178c08fce1255d06cd5410a626e351f679ef2.zip
Merge remote branch 'origin/maint-0.2.2'
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 19454a7e53..8897141585 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -330,7 +330,7 @@ Other options can be specified either on the command-line (--option
set of "logging domains". Each logging domain corresponds to an area of
functionality inside Tor. You can specify any number of severity ranges
for a single log statement, each of them prefixed by a comma-separated
- list of logging domains. You can prefix a domain with ~ to indicate
+ list of logging domains. You can prefix a domain with $$~$$ to indicate
negation, and use * to indicate "all domains". If you specify a severity
range without a list of domains, it matches all domains. +
+