summaryrefslogtreecommitdiff
path: root/doc/tor.1.txt
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2010-09-11 01:41:33 +0200
committerSebastian Hahn <sebastian@torproject.org>2010-09-11 01:44:20 +0200
commit1dab6cf4cbb35e27dd1d13f7deeb3e25f7dfcd5c (patch)
tree70d57de9d51e5e00115fead17c25d2bafbd4f528 /doc/tor.1.txt
parenta05ef55b66684d3355b213f8df366c23d0128eca (diff)
downloadtor-1dab6cf4cbb35e27dd1d13f7deeb3e25f7dfcd5c.tar.gz
tor-1dab6cf4cbb35e27dd1d13f7deeb3e25f7dfcd5c.zip
Document multiline options in the manpage
Diffstat (limited to 'doc/tor.1.txt')
-rw-r--r--doc/tor.1.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 3b7e30bdfb..8c581c407c 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