aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MANUAL.txt1
-rw-r--r--pandoc.cabal10
2 files changed, 6 insertions, 5 deletions
diff --git a/MANUAL.txt b/MANUAL.txt
index 98607df76..d5396bacf 100644
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -223,6 +223,7 @@ General options
- `docbook` ([DocBook])
- `docx` ([Word docx])
- `epub` ([EPUB])
+ - `fb2` ([FictionBook2] e-book)
- `gfm` ([GitHub-Flavored Markdown]),
or `markdown_github`, which provides deprecated and less accurate
support for Github-Flavored Markdown; please use `gfm` instead,
diff --git a/pandoc.cabal b/pandoc.cabal
index 383a35931..5010215f2 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -19,11 +19,11 @@ description: Pandoc is a Haskell library for converting from one markup
(subsets of) HTML, reStructuredText, LaTeX, DocBook, JATS,
MediaWiki markup, TWiki markup, TikiWiki markup, Creole 1.0,
Haddock markup, OPML, Emacs Org-Mode, Emacs Muse, txt2tags,
- Vimwiki, Word Docx, ODT, and Textile, and it can write
- Markdown, reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt,
- DocBook, JATS, OPML, TEI, OpenDocument, ODT, Word docx,
- RTF, MediaWiki, DokuWiki, ZimWiki, Textile, groff man,
- groff ms, plain text, Emacs Org-Mode, AsciiDoc,
+ Vimwiki, Word Docx, ODT, EPUB, FictionBook2, and Textile,
+ and it can write Markdown, reStructuredText, XHTML, HTML 5,
+ LaTeX, ConTeXt, DocBook, JATS, OPML, TEI, OpenDocument,
+ ODT, Word docx, RTF, MediaWiki, DokuWiki, ZimWiki, Textile,
+ groff man, groff ms, plain text, Emacs Org-Mode, AsciiDoc,
Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign
ICML, Muse, LaTeX beamer slides, PowerPoint, and several
kinds of HTML/JavaScript slide shows (S5, Slidy, Slideous,