[tor-commits] [tor/master] 21151: document datadir default decently.

[nickm at torproject.org]

commit 411736a13250586c03ca75a268a458a52ee731ae
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 17 12:10:43 2017 -0400

    21151: document datadir default decently.
---
 changes/data_dir_default_doc | 3 +++
 doc/tor.1.txt                | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/data_dir_default_doc b/changes/data_dir_default_doc
new file mode 100644
index 0000000..6b49bb2
--- /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 2f8d7bd..568771a 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