From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 31 Jul 2010 17:23:41 +0000 (-0400)
Subject: Clarify that cmd-line options override torrc options
X-Git-Tag: tor-0.2.2.15-alpha~53^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=883af78a9d536562345d2713edebb13f8978a72a;p=thirdparty%2Ftor.git

Clarify that cmd-line options override torrc options
---

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 222aaf103c..db623c8da9 100644
--- 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