@@ -14,7 +14,7 @@ Pandoc is a [Haskell] library for converting from one markup format to
1414another, and a command-line tool that uses this library. It can read
1515[markdown] and (subsets of) [Textile], [reStructuredText], [HTML],
1616and [LaTeX]; and it can write plain text, [markdown], [reStructuredText],
17−[HTML], [LaTeX], [LaTeX beamer], [ConTeXt], [RTF], [DocBook XML],
17+[XHTML], [HTML 5], [LaTeX], [LaTeX beamer], [ConTeXt], [RTF], [DocBook XML],
1818[OpenDocument XML], [ODT], [GNU Texinfo], [MediaWiki markup], [EPUB],
1919[Textile], [groff man] pages, [Emacs Org-Mode], [AsciiDoc], and [Slidy],
2020[DZSlides], or [S5] HTML slide shows.
@@ -151,19 +151,19 @@ Options
151151`-t` *FORMAT*, `-w` *FORMAT*, `--to=`*FORMAT*, `--write=`*FORMAT*
152152: Specify output format. *FORMAT* can be `native` (native Haskell),
153153 `json` (JSON version of native AST), `plain` (plain text),
154− `markdown` (markdown), `rst` (reStructuredText), `html` (HTML), `latex`
155− (LaTeX), `beamer` (LaTeX beamer), `context` (ConTeXt), `man` (groff
156− man), `mediawiki` (MediaWiki markup), `textile` (Textile), `org`
157− (Emacs Org-Mode), `texinfo` (GNU Texinfo), `docbook` (DocBook XML),
158− `opendocument` (OpenDocument XML), `odt` (OpenOffice text document),
159− `epub` (EPUB book), `asciidoc` (AsciiDoc), `slidy` (Slidy HTML and
160− javascript slide show), `dzslides` (HTML5 + javascript slide show),
154+ `markdown` (markdown), `rst` (reStructuredText), `html` (XHTML 1),
155+ `html5` (HTML 5), `latex` (LaTeX), `beamer` (LaTeX beamer), `context`
156+ (ConTeXt), `man` (groff man), `mediawiki` (MediaWiki markup), `textile`
157+ (Textile), `org` (Emacs Org-Mode), `texinfo` (GNU Texinfo), `docbook`
158+ (DocBook XML), `opendocument` (OpenDocument XML), `odt` (OpenOffice text
159+ document), `epub` (EPUB book), `asciidoc` (AsciiDoc), `slidy` (Slidy HTML
160+ and javascript slide show), `dzslides` (HTML5 + javascript slide show),
161161 `s5` (S5 HTML and javascript slide show), or `rtf` (rich text format).
162− Note that `odt` and `epub` output will not be directed to *stdout*; an
163− output filename must be specified using the `-o/--output` option. If
164− `+lhs` is appended to `markdown`, `rst`, `latex`, or `html`, the output
165− will be rendered as literate Haskell source: see [Literate Haskell
166− support](#literate-haskell-support), below.
162+ Note that `odt` and `epub` output will not be directed to *stdout*;
163+ an output filename must be specified using the `-o/--output` option.
164+ If `+lhs` is appended to `markdown`, `rst`, `latex`, `html`, or `html5`,
165+ the output will be rendered as literate Haskell source: see [Literate
166+ Haskell support](#literate-haskell-support), below.
167167
168168`-s`, `--standalone`
169169: Produce output with an appropriate header and footer (e.g. a
@@ -214,7 +214,7 @@ Options
214214
215215`-5`, `--html5`
216216: Produce HTML5 instead of HTML4. This option has no effect for writers
217− other than `html`.
217+ other than `html`. (*Deprecated:* Use the `html5` output format instead.)
218218
219219`--no-highlight`
220220: Disables syntax highlighting for code blocks and inlines, even when
@@ -277,11 +277,11 @@ Options
277277 images, and videos. The resulting file should be "self-contained,"
278278 in the sense that it needs no external files and no net access to be
279279 displayed properly by a browser. This option works only with HTML output
280− formats, including `html`, `html+lhs`, `s5`, `slidy`, and `dzslides`.
281− Scripts, images, and stylesheets at absolute URLs will be downloaded;
282− those at relative URLs will be sought first relative to the working
283− directory, then relative to the user data directory (see `--data-dir`),
284− and finally relative to pandoc's default data directory.
280+ formats, including `html`, `html5`, `html+lhs`, `html5+lhs`, `s5`,
281+ `slidy`, and `dzslides`. Scripts, images, and stylesheets at absolute URLs
282+ will be downloaded; those at relative URLs will be sought first relative
283+ to the working directory, then relative to the user data directory (see
284+ `--data-dir`), and finally relative to pandoc's default data directory.
285285
286286`--offline`
287287: Deprecated synonym for `--self-contained`.
@@ -1994,8 +1994,8 @@ Literate Haskell support
19941994========================
19951995
19961996If you append `+lhs` to an appropriate input or output format (`markdown`,
1997−`rst`, or `latex` for input or output; `html` for output only), pandoc
1998−will treat the document as literate Haskell source. This means that
1997+`rst`, or `latex` for input or output; `html` or `html5` for output only),
1998+pandoc will treat the document as literate Haskell source. This means that
19991999
20002000 - In markdown input, "bird track" sections will be parsed as Haskell
20012001 code rather than block quotations. Text between `\begin{code}`
@@ -2052,6 +2052,7 @@ Christopher Sawicki, Kelsey Hightower.
20522052[S5]: http://meyerweb.com/eric/tools/s5/
20532053[Slidy]: http://www.w3.org/Talks/Tools/Slidy/
20542054[HTML]: http://www.w3.org/TR/html40/
2055+[XHTML]: http://www.w3.org/TR/xhtml1/
20552056[LaTeX]: http://www.latex-project.org/
20562057[LaTeX beamer]: http://www.tex.ac.uk/CTAN/macros/latex/contrib/beamer
20572058[ConTeXt]: http://www.pragma-ade.nl/