Commit a68e6ea9 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Fix documentation of torrc search order 

We are searching @CONFDIR@ before $HOME, but the documentation
implied otherwise.

I screwed this up in f5e86bcd, when I
first documented the $HOME/.torrc possibility.

Fix for bug 9213; bugfix on 0.2.3.18-rc.
parent a83abcf5

changes/bug9213_doc

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Documentation:

    - Correctly document that we search for a system torrc file before

      looking in ~/.torrc. Fixes documentation side of 9213; bugfix

      on 0.2.3.18-rc.

doc/tor.1.txt

+4 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ COMMAND-LINE OPTIONS 


[[opt-f]] **-f** __FILE__::

    Specify a new configuration file to contain further Tor configuration

    options. (Default: $HOME/.torrc, or @CONFDIR@/torrc if that file is not

    options. (Default: @CONFDIR@/torrc, or $HOME/.torrc if that file is not

    found)



[[opt-defaults-torrc]] **--defaults-torrc** __FILE__::
@@ -2103,6 +2103,9 @@ FILES 
**@CONFDIR@/torrc**::

    The configuration file, which contains "option value" pairs.



**$HOME/.torrc**::

    Fallback location for torrc, if @CONFDIR@/torrc is not found.



**@LOCALSTATEDIR@/lib/tor/**::

    The tor process stores keys and other data here.