aboutsummaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
Diffstat (limited to 'README')
-rw-r--r--README24
1 files changed, 15 insertions, 9 deletions
diff --git a/README b/README
index dbeb23df6..55b74ba9f 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
% Pandoc User's Guide
% John MacFarlane
-% May 27, 2015
+% July 15, 2015
Synopsis
========
@@ -395,9 +395,9 @@ General writer options
of template syntax. If no extension is specified, an extension
corresponding to the writer will be added, so that `--template=special`
looks for `special.html` for HTML output. If the template is not
- found, pandoc will search for it in the user data directory
- (see `--data-dir`). If this option is not used, a default
- template appropriate for the output format will be used (see
+ found, pandoc will search for it in the `templates` subdirectory of
+ the user data directory (see `--data-dir`). If this option is not used,
+ a default template appropriate for the output format will be used (see
`-D/--print-default-template`).
`-V` *KEY*[`=`*VAL*], `--variable=`*KEY*[`:`*VAL*]
@@ -411,12 +411,14 @@ General writer options
`-D` *FORMAT*, `--print-default-template=`*FORMAT*
-: Print the default template for an output *FORMAT*. (See `-t`
- for a list of possible *FORMAT*s.)
+: Print the system default template for an output *FORMAT*. (See `-t`
+ for a list of possible *FORMAT*s.) Templates in the user data
+ directory are ignored.
`--print-default-data-file=`*FILE*
-: Print a default data file.
+: Print a system default data file. Files in the user data directory
+ are ignored.
`--no-wrap`
@@ -3369,6 +3371,7 @@ Alexander Sulfrian,
Alexander V Vershilov,
Alfred Wechselberger,
Andreas Lööw,
+Andrew Dunning,
Antoine Latter,
Arlo O'Keeffe,
Artyom Kazak,
@@ -3414,6 +3417,7 @@ infinity0x,
Jaime Marquínez Ferrándiz,
James Aspnes,
Jamie F. Olson,
+Jan Larres,
Jason Ronallo,
Jeff Arnold,
Jeff Runningen,
@@ -3452,6 +3456,7 @@ Neil Mayhew,
Nick Bart,
Nicolas Kaiser,
Nikolay Yakimov,
+nkalvi,
Paulo Tanimoto,
Paul Rivier,
Peter Wang,
@@ -3480,8 +3485,9 @@ Tom Leese,
Uli Köhler,
Václav Zeman,
Viktor Kronvall,
-Vincent, and
-Wikiwide.
+Vincent,
+Wikiwide, and
+Xavier Olive.
[markdown]: http://daringfireball.net/projects/markdown/
[reStructuredText]: http://docutils.sourceforge.net/docs/ref/rst/introduction.html