From ec5dc431def8fd7aa43dab1f59fb20dcd2933d16 Mon Sep 17 00:00:00 2001
From: John MacFarlane <fiddlosopher@gmail.com>
Date: Thu, 7 Feb 2013 19:58:28 -0800
Subject: [PATCH] Changes to --version.
Print default user data directory.
Put language names in lowercase and omit 'alert' and 'alert_indent'.
---
README | 6 ++++--
pandoc.hs | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/README b/README
index 7bb099521..34d465d25 100644
--- a/README
+++ b/README
@@ -188,7 +188,7 @@ General options
`--data-dir=`*DIRECTORY*
: Specify the user data directory to search for pandoc data files.
If this option is not specified, the default user data directory
- will be used:
+ will be used. This is
$HOME/.pandoc
@@ -200,7 +200,9 @@ General options
C:\Users\USERNAME\AppData\Roaming\pandoc
- in Windows 7. A `reference.odt`, `reference.docx`, `default.csl`,
+ in Windows 7. (You can find the default user data directory
+ on your system by looking at the output of `pandoc --version`.)
+ A `reference.odt`, `reference.docx`, `default.csl`,
`epub.css`, `templates`, `slidy`, `slideous`, or `s5` directory
placed in this directory will override pandoc's normal defaults.
diff --git a/pandoc.hs b/pandoc.hs
index f3d493e13..203dcf882 100644
--- a/pandoc.hs
+++ b/pandoc.hs
@@ -707,7 +707,7 @@ options =
prg <- getProgName
defaultDatadir <- getAppUserDataDirectory "pandoc"
UTF8.hPutStrLn stdout (prg ++ " " ++ pandocVersion ++
- compileInfo ++ "\nDefault data directory: " ++
+ compileInfo ++ "\nDefault user data directory: " ++
defaultDatadir ++ copyrightMessage)
exitWith ExitSuccess ))
"" -- "Print version"