@@ -273,26 +273,26 @@ General options
273273 (LaTeX), `beamer` (LaTeX beamer slide show), `context` (ConTeXt),
274274 `man` (groff man), `mediawiki` (MediaWiki markup), `dokuwiki`
275275 (DokuWiki markup), `textile` (Textile), `org` (Emacs Org mode),
276− `texinfo` (GNU Texinfo), `opml` (OPML), `docbook` (DocBook),
277− `opendocument` (OpenDocument), `odt` (OpenOffice text document),
278− `docx` (Word docx), `haddock` (Haddock markup), `rtf` (rich text
279− format), `epub` (EPUB v2 book), `epub3` (EPUB v3), `fb2`
280− (FictionBook2 e-book), `asciidoc` (AsciiDoc), `icml` (InDesign
281− ICML), `tei` (TEI Simple), `slidy` (Slidy HTML and javascript slide
282− show), `slideous` (Slideous HTML and javascript slide show),
283− `dzslides` (DZSlides HTML5 + javascript slide show), `revealjs`
284− (reveal.js HTML5 + javascript slide show), `s5` (S5 HTML and javascript
285− slide show), or the path of a custom lua writer (see [Custom
286− writers], below). Note that `odt`, `epub`, and
287− `epub3` output will not be directed to *stdout*; an output
288− filename must be specified using the `-o/--output` option. If
289− `+lhs` is appended to `markdown`, `rst`, `latex`, `beamer`,
290− `html`, or `html5`, the output will be rendered as literate
291− Haskell source: see [Literate Haskell
292− support], below. Markdown syntax
293− extensions can be individually enabled or disabled by appending
294− `+EXTENSION` or `-EXTENSION` to the format name, as described
295− above under `-f`.
276+ `texinfo` (GNU Texinfo), `opml` (OPML), `docbook` (DocBook 4),
277+ `docbook5` (DocBook 5), `opendocument` (OpenDocument), `odt`
278+ (OpenOffice text document), `docx` (Word docx), `haddock`
279+ (Haddock markup), `rtf` (rich text format), `epub` (EPUB v2
280+ book), `epub3` (EPUB v3), `fb2` (FictionBook2 e-book),
281+ `asciidoc` (AsciiDoc), `icml` (InDesign ICML), `tei` (TEI
282+ Simple), `slidy` (Slidy HTML and javascript slide show),
283+ `slideous` (Slideous HTML and javascript slide show),
284+ `dzslides` (DZSlides HTML5 + javascript slide show),
285+ `revealjs` (reveal.js HTML5 + javascript slide show), `s5`
286+ (S5 HTML and javascript slide show), or the path of a custom
287+ lua writer (see [Custom writers], below). Note that `odt`,
288+ `epub`, and `epub3` output will not be directed to *stdout*;
289+ an output filename must be specified using the `-o/--output`
290+ option. If `+lhs` is appended to `markdown`, `rst`, `latex`,
291+ `beamer`, `html`, or `html5`, the output will be rendered as
292+ literate Haskell source: see [Literate Haskell support],
293+ below. Markdown syntax extensions can be individually
294+ enabled or disabled by appending `+EXTENSION` or
295+ `-EXTENSION` to the format name, as described above under `-f`.
296296
297297`-o` *FILE*, `--output=`*FILE*
298298
@@ -547,7 +547,7 @@ General writer options
547547: Include an automatically generated table of contents (or, in
548548 the case of `latex`, `context`, `docx`, and `rst`, an instruction to create
549549 one) in the output document. This option has no effect on `man`,
550− `docbook`, `slidy`, `slideous`, `s5`, or `odt` output.
550+ `docbook`, `docbook5`, `slidy`, `slideous`, `s5`, or `odt` output.
551551
552552`--toc-depth=`*NUMBER*
553553
@@ -909,7 +909,7 @@ Math rendering in HTML
909909
910910`--mathml`[`=`*URL*]
911911
912−: Convert TeX math to [MathML] (in `docbook` as well as `html` and `html5`).
912+: Convert TeX math to [MathML] (in `docbook`, `docbook5`, `html` and `html5`).
913913 In standalone `html` output, a small javascript (or a link to such a
914914 script if a *URL* is supplied) will be inserted that allows the MathML to
915915 be viewed on some browsers.