Skip to content
Snippets Groups Projects
Commit a68e6ea9 authored by Nick Mathewson's avatar Nick Mathewson :game_die:
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
No related branches found
No related tags found
No related merge requests found
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.
......@@ -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.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment