diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-07-31 13:23:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-07-31 13:23:41 -0400 |
| commit | 883af78a9d536562345d2713edebb13f8978a72a (patch) | |
| tree | 73f67b213f01fcd6c86b946ba5e895c29e7719f5 /doc/tor.1.txt | |
| parent | 39378bf1829dc9f5c9a1172442dcb8b9864ec25c (diff) | |
| download | tor-883af78a9d536562345d2713edebb13f8978a72a.tar.gz tor-883af78a9d536562345d2713edebb13f8978a72a.zip | |
Clarify that cmd-line options override torrc options
Diffstat (limited to 'doc/tor.1.txt')
| -rw-r--r-- | doc/tor.1.txt | 3 |
1 files changed, 2 insertions, 1 deletions
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 |