From: Sebastian Hahn <sebastian@torproject.org>
Date: Fri, 10 Sep 2010 23:41:33 +0000 (+0200)
Subject: Document multiline options in the manpage
X-Git-Tag: tor-0.2.2.17-alpha~32^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dab6cf4cbb35e27dd1d13f7deeb3e25f7dfcd5c;p=thirdparty%2Ftor.git

Document multiline options in the manpage
---

diff --git a/changes/torrc_continuation b/changes/torrc_continuation
index f40e970c04..f63937e42a 100644
--- a/changes/torrc_continuation
+++ b/changes/torrc_continuation
@@ -2,4 +2,5 @@
     - Support line continuations in torrc.  If a line ends with a
       single backslash character, the newline is ignored, and the
       configuration value is treated as continuing on the next line.
+      Implements bug 1929.
 
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