Update long descriptions to (almost) sync with upstream cabal file: Mention new writer for ZimWiki. Mention reader for TWiki markup. Mention explicitly each of readers XHTML and HTML 5. Reorder readers and writers.

1 files changed, 30 insertions, 25 deletions

diff --git a/debian/control.in b/debian/control.in
index 602ab03b1..d5d05daf5 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -71,14 +71,15 @@ Description: general markup converter
  from one markup format to another,
  and a command-line tool that uses this library.
  It can read several dialects of Markdown and (subsets of) HTML,
- reStructuredText, LaTeX, DocBook, MediaWiki markup, Haddock markup,
+ reStructuredText, LaTeX, DocBook,
+ MediaWiki markup, TWiki markup, Haddock markup,
  OPML, Emacs Org-mode, txt2tags, Word Docx, ODT, and Textile,
- and it can write Markdown, reStructuredText, HTML,
+ and it can write Markdown, reStructuredText, XHTML, HTML 5,
  LaTeX (including rendering as plain PDF or beamer slide shows),
- ConTeXt, DocBook, OPML, OpenDocument, ODT, Word docx, RTF,
- MediaWiki, DokuWiki, Textile, groff man pages, GNU Texinfo,
+ ConTeXt, DocBook, OPML, TEI, OpenDocument, ODT, Word docx, RTF,
+ MediaWiki, DokuWiki, ZimWiki, Textile, groff man pages, GNU Texinfo,
  plain text, Emacs Org-Mode, AsciiDoc, Haddock markup,
- EPUB (v2 or v3), FictionBook2, InDesign ICML, TEI Simple,
+ EPUB (v2 and v3), FictionBook2, InDesign ICML,
  and several kinds of HTML/javascript slide shows
  (S5, Slidy, Slideous, DZSlides, reveal.js).
  .
@@ -112,14 +113,15 @@ Description: general markup converter - data files
  from one markup format to another,
  and a command-line tool that uses this library.
  It can read several dialects of Markdown and (subsets of) HTML,
- reStructuredText, LaTeX, DocBook, MediaWiki markup, Haddock markup,
+ reStructuredText, LaTeX, DocBook,
+ MediaWiki markup, TWiki markup, Haddock markup,
  OPML, Emacs Org-mode, txt2tags, Word Docx, ODT, and Textile,
- and it can write Markdown, reStructuredText, HTML,
+ and it can write Markdown, reStructuredText, XHTML, HTML 5,
  LaTeX (including rendering as plain PDF or beamer slide shows),
- ConTeXt, DocBook, OPML, OpenDocument, ODT, Word docx, RTF,
- MediaWiki, DokuWiki, Textile, groff man pages, GNU Texinfo,
+ ConTeXt, DocBook, OPML, TEI, OpenDocument, ODT, Word docx, RTF,
+ MediaWiki, DokuWiki, ZimWiki, Textile, groff man pages, GNU Texinfo,
  plain text, Emacs Org-Mode, AsciiDoc, Haddock markup,
- EPUB (v2 or v3), FictionBook2, InDesign ICML, TEI Simple,
+ EPUB (v2 and v3), FictionBook2, InDesign ICML,
  and several kinds of HTML/javascript slide shows
  (S5, Slidy, Slideous, DZSlides, reveal.js).
  .
@@ -151,14 +153,15 @@ Description: general markup converter - libraries
  from one markup format to another,
  and a command-line tool that uses this library.
  It can read several dialects of Markdown and (subsets of) HTML,
- reStructuredText, LaTeX, DocBook, MediaWiki markup, Haddock markup,
+ reStructuredText, LaTeX, DocBook,
+ MediaWiki markup, TWiki markup, Haddock markup,
  OPML, Emacs Org-mode, txt2tags, Word Docx, ODT, and Textile,
- and it can write Markdown, reStructuredText, HTML,
+ and it can write Markdown, reStructuredText, XHTML, HTML 5,
  LaTeX (including rendering as plain PDF or beamer slide shows),
- ConTeXt, DocBook, OPML, OpenDocument, ODT, Word docx, RTF,
- MediaWiki, DokuWiki, Textile, groff man pages, GNU Texinfo,
+ ConTeXt, DocBook, OPML, TEI, OpenDocument, ODT, Word docx, RTF,
+ MediaWiki, DokuWiki, ZimWiki, Textile, groff man pages, GNU Texinfo,
  plain text, Emacs Org-Mode, AsciiDoc, Haddock markup,
- EPUB (v2 or v3), FictionBook2, InDesign ICML, TEI Simple,
+ EPUB (v2 and v3), FictionBook2, InDesign ICML,
  and several kinds of HTML/javascript slide shows
  (S5, Slidy, Slideous, DZSlides, reveal.js).
  .
@@ -186,14 +189,15 @@ Description: general markup converter - library documentation
  from one markup format to another,
  and a command-line tool that uses this library.
  It can read several dialects of Markdown and (subsets of) HTML,
- reStructuredText, LaTeX, DocBook, MediaWiki markup, Haddock markup,
+ reStructuredText, LaTeX, DocBook,
+ MediaWiki markup, TWiki markup, Haddock markup,
  OPML, Emacs Org-mode, txt2tags, Word Docx, ODT, and Textile,
- and it can write Markdown, reStructuredText, HTML,
+ and it can write Markdown, reStructuredText, XHTML, HTML 5,
  LaTeX (including rendering as plain PDF or beamer slide shows),
- ConTeXt, DocBook, OPML, OpenDocument, ODT, Word docx, RTF,
- MediaWiki, DokuWiki, Textile, groff man pages, GNU Texinfo,
+ ConTeXt, DocBook, OPML, TEI, OpenDocument, ODT, Word docx, RTF,
+ MediaWiki, DokuWiki, ZimWiki, Textile, groff man pages, GNU Texinfo,
  plain text, Emacs Org-Mode, AsciiDoc, Haddock markup,
- EPUB (v2 or v3), FictionBook2, InDesign ICML, TEI Simple,
+ EPUB (v2 and v3), FictionBook2, InDesign ICML,
  and several kinds of HTML/javascript slide shows
  (S5, Slidy, Slideous, DZSlides, reveal.js).
  .
@@ -222,14 +226,15 @@ Description: general markup converter - profiling libraries
  from one markup format to another,
  and a command-line tool that uses this library.
  It can read several dialects of Markdown and (subsets of) HTML,
- reStructuredText, LaTeX, DocBook, MediaWiki markup, Haddock markup,
+ reStructuredText, LaTeX, DocBook,
+ MediaWiki markup, TWiki markup, Haddock markup,
  OPML, Emacs Org-mode, txt2tags, Word Docx, ODT, and Textile,
- and it can write Markdown, reStructuredText, HTML,
+ and it can write Markdown, reStructuredText, XHTML, HTML 5,
  LaTeX (including rendering as plain PDF or beamer slide shows),
- ConTeXt, DocBook, OPML, OpenDocument, ODT, Word docx, RTF,
- MediaWiki, DokuWiki, Textile, groff man pages, GNU Texinfo,
+ ConTeXt, DocBook, OPML, TEI, OpenDocument, ODT, Word docx, RTF,
+ MediaWiki, DokuWiki, ZimWiki, Textile, groff man pages, GNU Texinfo,
  plain text, Emacs Org-Mode, AsciiDoc, Haddock markup,
- EPUB (v2 or v3), FictionBook2, InDesign ICML, TEI Simple,
+ EPUB (v2 and v3), FictionBook2, InDesign ICML,
  and several kinds of HTML/javascript slide shows
  (S5, Slidy, Slideous, DZSlides, reveal.js).
  .