summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-03-17 12:10:43 -0400
committerNick Mathewson <nickm@torproject.org>2017-03-17 12:10:43 -0400
commit411736a13250586c03ca75a268a458a52ee731ae (patch)
treef2c52ecacb0b9451012475798ce203c50a7f6398
parent58680d04299ab69ea99ee86c5f1a194f44fc1d12 (diff)
downloadtor-411736a13250586c03ca75a268a458a52ee731ae.tar.gz
tor-411736a13250586c03ca75a268a458a52ee731ae.zip
21151: document datadir default decently.
-rw-r--r--changes/data_dir_default_doc3
-rw-r--r--doc/tor.1.txt4
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/data_dir_default_doc b/changes/data_dir_default_doc
new file mode 100644
index 0000000000..6b49bb2a65
--- /dev/null
+++ b/changes/data_dir_default_doc
@@ -0,0 +1,3 @@
+ o Documentation:
+ - Correct the documentation about the default DataDirectory value.
+ Closes ticket 21151.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 2f8d7bdd09..568771a123 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -394,7 +394,9 @@ GENERAL OPTIONS
[[DataDirectory]] **DataDirectory** __DIR__::
Store working data in DIR. Can not be changed while tor is running.
- (Default: @LOCALSTATEDIR@/lib/tor)
+ (Default: ~/.tor if your home directory is not /; otherwise,
+ @LOCALSTATEDIR@/lib/tor. On Windows, the default is
+ your ApplicationData folder.)
[[DataDirectoryGroupReadable]] **DataDirectoryGroupReadable** **0**|**1**::
If this option is set to 0, don't allow the filesystem group to read the