summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-06-18 15:32:13 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2014-06-18 17:09:36 -0700
commit35e57db5c292957e74c24eb2cee63928c7865cc6 (patch)
tree621399c4d37e60257ac48689b96780ba33a528d1 /README
parent9fc5c8d7af31a47d8e3e8ea6dbb541178ec9ca66 (diff)
Finished first draft of Haddock writer.
Diffstat (limited to 'README')
-rw-r--r--README12
1 files changed, 6 insertions, 6 deletions
diff --git a/README b/README
index 1883ecd57..122db23ec 100644
--- a/README
+++ b/README
@@ -18,10 +18,10 @@ Org-mode], [DocBook], and [Word docx]; and it can write plain text,
[markdown], [reStructuredText], [XHTML], [HTML 5], [LaTeX] (including
[beamer] slide shows), [ConTeXt], [RTF], [OPML], [DocBook],
[OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki markup],
-[EPUB] (v2 or v3), [FictionBook2], [Textile], [groff man] pages,
-[Emacs Org-Mode], [AsciiDoc], [InDesign ICML], and [Slidy],
-[Slideous], [DZSlides], [reveal.js] or [S5] HTML slide shows. It can
-also produce [PDF] output on systems where LaTeX is installed.
+[Haddock markup], [EPUB] (v2 or v3), [FictionBook2], [Textile],
+[groff man] pages, [Emacs Org-Mode], [AsciiDoc], [InDesign ICML],
+and [Slidy], [Slideous], [DZSlides], [reveal.js] or [S5] HTML slide shows.
+It can also produce [PDF] output on systems where LaTeX is installed.
Pandoc's enhanced version of markdown includes syntax for footnotes,
tables, flexible ordered lists, definition lists, fenced code blocks,
@@ -169,8 +169,8 @@ General options
`context` (ConTeXt), `man` (groff man), `mediawiki` (MediaWiki markup),
`textile` (Textile), `org` (Emacs Org-Mode), `texinfo` (GNU Texinfo),
`opml` (OPML), `docbook` (DocBook), `opendocument` (OpenDocument), `odt`
- (OpenOffice text document), `docx` (Word docx),
- `rtf` (rich text format), `epub` (EPUB v2 book), `epub3`
+ (OpenOffice text document), `docx` (Word docx), `haddock` (Haddock
+ markup), `rtf` (rich text format), `epub` (EPUB v2 book), `epub3`
(EPUB v3), `fb2` (FictionBook2 e-book), `asciidoc` (AsciiDoc),
`icml` (InDesign ICML), `slidy` (Slidy HTML and javascript slide show),
`slideous` (Slideous HTML and javascript slide show), `dzslides`