git.iko.soy/typeable/pandoc
on master help sign in
Changes to --version.
ec5dc43John MacFarlane
README+4−2
compare with master
unifiedsplit
@@ -188,7 +188,7 @@ General options
188`--data-dir=`*DIRECTORY*
188`--data-dir=`*DIRECTORY*
189: Specify the user data directory to search for pandoc data files.
189: Specify the user data directory to search for pandoc data files.
190 If this option is not specified, the default user data directory
190 If this option is not specified, the default user data directory
191− will be used:
191+ will be used. This is
192
192
193 $HOME/.pandoc
193 $HOME/.pandoc
194
194
@@ -200,7 +200,9 @@ General options
200
200
201 C:\Users\USERNAME\AppData\Roaming\pandoc
201 C:\Users\USERNAME\AppData\Roaming\pandoc
202
202
203+ in Windows 7. (You can find the default user data directory
204+ on your system by looking at the output of `pandoc --version`.)
203− in Windows 7. A `reference.odt`, `reference.docx`, `default.csl`,
205+ A `reference.odt`, `reference.docx`, `default.csl`,
204 `epub.css`, `templates`, `slidy`, `slideous`, or `s5` directory
206 `epub.css`, `templates`, `slidy`, `slideous`, or `s5` directory
205 placed in this directory will override pandoc's normal defaults.
207 placed in this directory will override pandoc's normal defaults.
206
208
pandoc.hs+1−1
@@ -707,7 +707,7 @@ options =
707 prg <- getProgName
707 prg <- getProgName
708 defaultDatadir <- getAppUserDataDirectory "pandoc"
708 defaultDatadir <- getAppUserDataDirectory "pandoc"
709 UTF8.hPutStrLn stdout (prg ++ " " ++ pandocVersion ++
709 UTF8.hPutStrLn stdout (prg ++ " " ++ pandocVersion ++
710− compileInfo ++ "\nDefault data directory: " ++
710+ compileInfo ++ "\nDefault user data directory: " ++
711 defaultDatadir ++ copyrightMessage)
711 defaultDatadir ++ copyrightMessage)
712 exitWith ExitSuccess ))
712 exitWith ExitSuccess ))
713 "" -- "Print version"
713 "" -- "Print version"