diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-14 14:58:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-14 14:58:51 -0400 |
| commit | 75706527c16fc62ec7db4e496db76e21c79c664a (patch) | |
| tree | 9e8292bfb488577fb0d0c8bae7b5394aa257710f | |
| parent | 4fdce6b091181f01295270eedb23ef7735904635 (diff) | |
| download | tor-75706527c16fc62ec7db4e496db76e21c79c664a.tar.gz tor-75706527c16fc62ec7db4e496db76e21c79c664a.zip | |
Document --hush; fix documentation for --quiet.
| -rw-r--r-- | changes/doc_hush | 3 | ||||
| -rw-r--r-- | doc/tor.1.txt | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/changes/doc_hush b/changes/doc_hush new file mode 100644 index 0000000000..b3a67aac53 --- /dev/null +++ b/changes/doc_hush @@ -0,0 +1,3 @@ + o Documentation: + - Fix the documentation for the --hush and --quiet command line options, + which changed their behavior back in 0.2.3.3-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 78a33ca793..468ed63943 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -62,10 +62,13 @@ OPTIONS **--version**:: Display Tor version and exit. -**--quiet**:: - Do not start Tor with a console log unless explicitly requested to do so. - (By default, Tor starts out logging messages at level "notice" or higher to - the console, until it has parsed its configuration.) +**--quiet**|**--hush**:: + Override the default console log. By default, Tor starts out logging + messages at level "notice" and higher to the console. It stops doing so + after it parses its configuration, if the configuration tells it to log + anywhere else. You can override this behavior with the **--hush** option, + which tells Tor to only send warnings and errors to the console, or with + the **--quiet** option, which tells Tor not to log to the console at all. Other options can be specified either on the command-line (--option value), or in the configuration file (option value or option "value"). |