diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-09-24 13:43:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-24 13:43:55 -0400 |
| commit | c8e1538a0bdcb83dc2aeec075dcffdcac5bf45b7 (patch) | |
| tree | f933499da338335c3454a4e82151a1d3af59341e /doc | |
| parent | 9b49a89430eac9a50fdb067aefec9d1561872796 (diff) | |
| parent | 851255170aaa419e9c8f2a7d1b3c7a124a9c2783 (diff) | |
| download | tor-c8e1538a0bdcb83dc2aeec075dcffdcac5bf45b7.tar tor-c8e1538a0bdcb83dc2aeec075dcffdcac5bf45b7.tar.gz | |
Merge remote branch 'sebastian/continuation'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 235d04be8..fe69a2d3f 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -65,7 +65,10 @@ 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. Options on the command line take precedence over - options found in the configuration file. + options found in the configuration file, except indicated otherwise. To + split one configuration entry into multiple lines, use a single \ before + the end of the line. Comments can be used in such multiline entries, but + they must start at the beginning of a line. **BandwidthRate** __N__ **bytes**|**KB**|**MB**|**GB**:: A token bucket limits the average incoming bandwidth usage on this node to |