Commit 1dab6cf4 authored by Sebastian Hahn's avatar Sebastian Hahn
Browse files

Document multiline options in the manpage

parent a05ef55b

changes/torrc_continuation

+1 −0
Changes for changes/torrc_continuation: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -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.

doc/tor.1.txt

+4 −1
Changes for doc/tor.1.txt: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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