Ticket #13158: 0001-and-usage-clarification-Fixes-13158.patch

File 0001-and-usage-clarification-Fixes-13158.patch, 2.0 KB (added by joanq, 4 years ago)
  • doc/tor.1.txt

    From 31ac0f85cd113ef028210547f2cd501ae8998004 Mon Sep 17 00:00:00 2001
    From: Joan Queralt <jqueraltmo@gmail.com>
    Date: Mon, 2 Nov 2015 01:36:19 +0100
    Subject: [PATCH] + and / usage clarification - Fixes #13158
    
    ---
     doc/tor.1.txt | 11 +++++++----
     1 file changed, 7 insertions(+), 4 deletions(-)
    
    diff --git a/doc/tor.1.txt b/doc/tor.1.txt
    index 916433b..04826b3 100644
    a b complicated for options that are allowed to occur more than once: if you 
    128128specify four SOCKSPorts in your configuration file, and one more SOCKSPort on
    129129the command line, the option on the command line will replace __all__ of the
    130130SOCKSPorts in the configuration file.  If this isn't what you want, prefix
    131 the option name with a plus sign, and it will be appended to the previous set
    132 of options instead.
     131the option name with a plus sign (+), and it will be appended to the previous
     132set of options instead.  For example, setting SOCKSPort 9100 will use only
     133port 9100, but setting +SOCKSPort 9100 will use ports 9100 and 9050 (because
     134this is the default).
    133135
    134136Alternatively, you might want to remove every instance of an option in the
    135137configuration file, and not replace it at all: you might want to say on the
    136138command line that you want no SOCKSPorts at all.  To do that, prefix the
    137 option name with a forward slash.
     139option name with a forward slash (/).  You can use the plus sign (+) and the
     140forward slash (/) in the configuration file and on the command line.
    138141
    139142GENERAL OPTIONS
    140143---------------
    __DataDirectory__**/control_auth_cookie**:: 
    25572560    overridden by the CookieAuthFile config option. Regenerated on startup. See
    25582561    control-spec.txt in https://spec.torproject.org/[torspec] for details.
    25592562    Only used when cookie authentication is enabled.
    2560  
     2563
    25612564__DataDirectory__**/lock**::
    25622565    This file is used to prevent two Tor instances from using same data
    25632566    directory. If access to this file is locked, data directory is already