aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-12 11:36:41 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-12 11:36:41 -0400
commit8fa7bcead5d8344b80ee295f3c1e0e15fd37ba87 (patch)
tree63aa0ee61be96f53aa90279fd02b92b1d29ec76a
parent621e95a4f3e1e896ee41e261f5e0c953fb6101a9 (diff)
parent2c88dd7f95604f445f05976dd2d34847e065349f (diff)
downloadtor-8fa7bcead5d8344b80ee295f3c1e0e15fd37ba87.tar
tor-8fa7bcead5d8344b80ee295f3c1e0e15fd37ba87.tar.gz
Merge remote-tracking branch 'origin/maint-0.2.2'
-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 8fe4fe8bc..3b31e60a8 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -325,7 +325,7 @@ Other options can be specified either on the command-line (--option
**Log** **[**__domain__,...**]**__minSeverity__[-__maxSeverity__] ... **file** __FILENAME__ +
-**Log** **[**__domain__,...**]**__minSeverity__[-__maxSeverity__] ... **stderr**|**stdout**|**syslog** ::
+**Log** **[**__domain__,...**]**__minSeverity__[-__maxSeverity__] ... **stderr**|**stdout**|**syslog**::
As above, but select messages by range of log severity __and__ by a
set of "logging domains". Each logging domain corresponds to an area of
functionality inside Tor. You can specify any number of severity ranges