Imported Upstream version 1.8.0.1

1 files changed, 46 insertions, 9 deletions

diff --git a/man/man1/markdown2pdf.1.md b/man/man1/markdown2pdf.1.md
index 3947ef8da..efbdc8184 100644
--- a/man/man1/markdown2pdf.1.md
+++ b/man/man1/markdown2pdf.1.md
@@ -1,6 +1,6 @@
 % MARKDOWN2PDF(1) Pandoc User Manuals
-% John MacFarlane and Recai Oktas
-% January 8, 2008
+% John MacFarlane, Paulo Tanimoto, and Recai Oktas
+% January 29, 2011
 
 # NAME
 
@@ -48,6 +48,9 @@ packages are not included in your latex setup, they can be obtained from
 -N, \--number-sections
 :   Number section headings in LaTeX output.  (Default is not to number them.)
 
+\--listings
+:   Use listings package for LaTeX code blocks
+
 \--template=*FILE*
 :   Use *FILE* as a custom template for the generated document. Implies
     `-s`. See the section TEMPLATES in `pandoc`(1) for information about
@@ -56,10 +59,8 @@ packages are not included in your latex setup, they can be obtained from
 
 -V KEY=VAL, \--variable=*KEY:VAL*
 :   Set the template variable KEY to the value VAL when rendering the
-    document in standalone mode. This is only useful when the
-    `--template` option is used to specify a custom template, since
-    pandoc automatically sets the variables used in the default
-    templates.
+    document in standalone mode.  Use this to set the font size when
+    using the default LaTeX template: `-V fontsize=12pt`.
 
 -H *FILE*, \--include-in-header=*FILE*
 :   Include (LaTeX) contents of *FILE* at the end of the header.  Implies
@@ -71,10 +72,46 @@ packages are not included in your latex setup, they can be obtained from
 -A *FILE*, \--include-after-body=*FILE*
 :   Include (LaTeX) contents of *FILE* at the end of the document body.
 
--C *FILE*, \--custom-header=*FILE*
-:   Use contents of *FILE* as the document header. *Note: This option is
-    deprecated. Users should transition to using `--template` instead.*
+\--bibliography=*FILE*
+:   Specify bibliography database to be used in resolving
+    citations. The database type will be determined from the
+    extension of *FILE*, which may be `.xml` (MODS format),
+    `.bib` (BibTeX format), or `.json` (citeproc JSON).
+
+\--csl=*FILE*
+:   Specify [CSL] style to be used in formatting citations and
+    the bibliography. If *FILE* is not found, pandoc will look
+    for it in
+
+        $HOME/.csl
+
+    in unix and
+
+        C:\Documents And Settings\USERNAME\Application Data\csl
+
+    in Windows. If the `--csl` option is not specified, pandoc
+    will use a default style:  either `default.csl` in the
+    user data directory (see `--data-dir`), or, if that is
+    not present, the Chicago author-date style.
+
+\--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:
+
+        $HOME/.pandoc
+
+    in unix and
+
+        C:\Documents And Settings\USERNAME\Application Data\pandoc
+
+    in Windows. A `reference.odt`, `epub.css`, `templates` directory,
+    or `s5` directory placed in this directory will override pandoc's
+    normal defaults.
 
 # SEE ALSO
 
 `pandoc`(1), `pdflatex`(1)
+
+[CSL]: CitationStyles.org
+