Clarify that cmd-line options override torrc options

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 222aaf103c42625e34c00235fd5abff6bb74096f..db623c8da96bc214447a23c7ee180da405e0c53d 100644 (file)
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -64,7 +64,8 @@ OPTIONS
 Other options can be specified either on the command-line (--option
     value), or in the configuration file (option value or option "value").
     Options are case-insensitive. C-style escaped characters are allowed inside
-    quoted values.
+    quoted values.   Options on the command line take precedence over
+    options found in the configuration file.
 
 **BandwidthRate** __N__ **bytes**|**KB**|**MB**|**GB**::
     A token bucket limits the average incoming bandwidth usage on this node to