Document --hush; fix documentation for --quiet.

diff --git a/changes/doc_hush b/changes/doc_hush
new file mode 100644 (file)
index 0000000..b3a67aa
--- /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 78a33ca7937b3253a8970b439df60570db18c386..468ed639433a6a9145584ab2b89c72d394113dac 100644 (file)
--- 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").