Added mention of vimwiki raeder more places.

4 files changed, 58 insertions, 49 deletions

diff --git a/MANUAL.txt b/MANUAL.txt
index 275b47c72..d200c2f0c 100644
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -16,17 +16,19 @@ another, and a command-line tool that uses this library. It can read
 Markdown], [MultiMarkdown], and (subsets of) [Textile],
 [reStructuredText], [HTML], [LaTeX], [MediaWiki markup], [TWiki markup],
 [Haddock markup], [OPML], [Emacs Org mode], [DocBook], [Muse], [txt2tags],
-[EPUB], [ODT], [Vimwiki] and [Word docx]; and it can write plain text, 
-[Markdown], [CommonMark], [PHP Markdown Extra], [GitHub-Flavored Markdown],
-[MultiMarkdown], [reStructuredText], [XHTML], [HTML5], [LaTeX]
-\(including [`beamer`] slide shows\), [ConTeXt], [RTF], [OPML],
-[DocBook], [OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki
-markup], [DokuWiki markup], [ZimWiki markup], [Haddock markup], [EPUB]
-\(v2 or v3\), [FictionBook2], [Textile], [groff man], [groff ms], [Emacs
-Org mode], [AsciiDoc], [InDesign ICML], [TEI Simple], [Muse] and [Slidy],
-[Slideous], [DZSlides], [reveal.js] or [S5] HTML slide shows. It can
-also produce [PDF] output on systems where LaTeX, ConTeXt, `pdfroff`, or
-`wkhtmltopdf` is installed.
+[Vimwiki], [EPUB], [ODT], and [Word docx]; and it can
+write plain text, [Markdown], [CommonMark], [PHP Markdown
+Extra], [GitHub-Flavored Markdown], [MultiMarkdown],
+[reStructuredText], [XHTML], [HTML5], [LaTeX] \(including
+[`beamer`] slide shows\), [ConTeXt], [RTF], [OPML], [DocBook],
+[OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki
+markup], [DokuWiki markup], [ZimWiki markup], [Haddock markup],
+[EPUB] \(v2 or v3\), [FictionBook2], [Textile], [groff man],
+[groff ms], [Emacs Org mode], [AsciiDoc], [InDesign ICML], [TEI
+Simple], [Muse] and [Slidy], [Slideous], [DZSlides], [reveal.js]
+or [S5] HTML slide shows. It can also produce [PDF] output on
+systems where LaTeX, ConTeXt, `pdfroff`, or `wkhtmltopdf` is
+installed.
 
 Pandoc's enhanced version of Markdown includes syntax for [footnotes],
 [tables], flexible [ordered lists], [definition lists], [fenced code
@@ -98,6 +100,7 @@ Markdown can be expected to be lossy.
 [InDesign ICML]: https://www.adobe.com/content/dam/Adobe/en/devnet/indesign/cs55-docs/IDML/idml-specification.pdf
 [TEI Simple]: https://github.com/TEIC/TEI-Simple
 [Muse]: https://amusewiki.org/library/manual
+[Vimwiki]: https://vimwiki.github.io
 
 Using `pandoc`
 --------------
diff --git a/README.md b/README.md
index bd5a4a31c..ce6d55008 100644
--- a/README.md
+++ b/README.md
@@ -16,28 +16,32 @@ The universal markup converter
 
 Pandoc is a [Haskell] library for converting from one markup format to
 another, and a command-line tool that uses this library. It can read
-[Markdown], [CommonMark], [PHP Markdown Extra], [GitHub-Flavored Markdown],
-[MultiMarkdown], and (subsets of) [Textile], [reStructuredText], [HTML],
-[LaTeX], [MediaWiki markup], [TWiki markup], [Haddock markup], [OPML], [Emacs
-Org mode], [DocBook], [txt2tags], [Muse], [EPUB], [ODT] and [Word docx];
-and it can write plain text, [Markdown], [CommonMark], [PHP Markdown Extra],
-[GitHub-Flavored Markdown], [MultiMarkdown], [reStructuredText], [XHTML],
-[HTML5], [LaTeX] \(including [`beamer`] slide shows\), [ConTeXt], [RTF], [OPML],
-[DocBook], [OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki
+[Markdown], [CommonMark], [PHP Markdown Extra], [GitHub-Flavored
+Markdown], [MultiMarkdown], and (subsets of) [Textile],
+[reStructuredText], [HTML], [LaTeX], [MediaWiki markup], [TWiki markup],
+[Haddock markup], [OPML], [Emacs Org mode], [DocBook], [Muse], [txt2tags],
+[Vimwiki], [EPUB], [ODT], and [Word docx]; and it can
+write plain text, [Markdown], [CommonMark], [PHP Markdown
+Extra], [GitHub-Flavored Markdown], [MultiMarkdown],
+[reStructuredText], [XHTML], [HTML5], [LaTeX] \(including
+[`beamer`] slide shows\), [ConTeXt], [RTF], [OPML], [DocBook],
+[OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki
 markup], [DokuWiki markup], [ZimWiki markup], [Haddock markup],
-[EPUB] \(v2 or v3\), [FictionBook2], [Textile], [groff man] pages,
-[Emacs Org mode], [AsciiDoc], [InDesign ICML], [TEI Simple], [Muse], and [Slidy],
-[Slideous], [DZSlides], [reveal.js] or [S5] HTML slide shows. It can also
-produce [PDF] output on systems where LaTeX, ConTeXt, or `wkhtmltopdf` is
+[EPUB] \(v2 or v3\), [FictionBook2], [Textile], [groff man],
+[groff ms], [Emacs Org mode], [AsciiDoc], [InDesign ICML], [TEI
+Simple], [Muse] and [Slidy], [Slideous], [DZSlides], [reveal.js]
+or [S5] HTML slide shows. It can also produce [PDF] output on
+systems where LaTeX, ConTeXt, `pdfroff`, or `wkhtmltopdf` is
 installed.
 
 Pandoc's enhanced version of Markdown includes syntax for [footnotes],
-[tables], flexible [ordered lists], [definition lists], [fenced code blocks],
-[superscripts and subscripts], [strikeout], [metadata blocks], automatic tables of
-contents, embedded LaTeX [math], [citations], and [Markdown inside HTML block
-elements]. (These enhancements, described
-further under [Pandoc's Markdown], can be disabled using the
-`markdown_strict` input or output format.)
+[tables], flexible [ordered lists], [definition lists], [fenced code
+blocks], [superscripts and subscripts], [strikeout], [metadata blocks],
+automatic tables of contents, embedded LaTeX [math], [citations], and
+[Markdown inside HTML block elements][Extension:
+`markdown_in_html_blocks`]. (These enhancements, described further under
+[Pandoc's Markdown], can be disabled using the `markdown_strict` input
+or output format.)
 
 In contrast to most existing tools for converting Markdown to HTML, which
 use regex substitutions, pandoc has a modular design: it consists of a
@@ -98,6 +102,7 @@ Markdown can be expected to be lossy.
 [InDesign ICML]: https://www.adobe.com/content/dam/Adobe/en/devnet/indesign/cs55-docs/IDML/idml-specification.pdf
 [TEI Simple]: https://github.com/TEIC/TEI-Simple
 [Muse]: https://amusewiki.org/library/manual
+[Vimwiki]: https://vimwiki.github.io
 
 
 
diff --git a/linux/control.in b/linux/control.in
index db261be04..79e0b1b6f 100644
--- a/linux/control.in
+++ b/linux/control.in
@@ -9,16 +9,17 @@ Suggests: texlive-latex-recommended, texlive-xetex,
  texlive-fonts-recommended
 Maintainer: John MacFarlane <jgm@berkeley.edu>
 Description: general markup converter
- Pandoc is a Haskell library for converting 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, TWiki markup, Haddock markup, OPML,
- Emacs Org-Mode, txt2tags, Muse, 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,
- Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign ICML,
- Muse, and several kinds of HTML/javascript slide shows
- (S5, Slidy, Slideous, DZSlides, reveal.js).
+  Pandoc is a Haskell library for converting 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, TWiki markup, Haddock markup, OPML,
+  Emacs Org-Mode, txt2tags, Muse, 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, Haddock markup, EPUB (v2 and v3),
+  FictionBook2, InDesign ICML, Muse, and several kinds of
+  HTML/javascript slide shows (S5, Slidy, Slideous,
+  DZSlides, reveal.js).
diff --git a/pandoc.cabal b/pandoc.cabal
index ff61c6a2c..3b644c7d0 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -18,13 +18,13 @@ Description:     Pandoc is a Haskell library for converting from one markup
                  this library. It can read several dialects of Markdown and
                  (subsets of) HTML, reStructuredText, LaTeX, DocBook,
                  MediaWiki markup, TWiki markup, Haddock markup, OPML,
-                 Emacs Org-Mode, txt2tags, Muse, 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,
-                 Haddock markup, EPUB (v2 and v3), FictionBook2,
-                 InDesign ICML, Muse, and several kinds of
+                 Emacs Org-Mode, txt2tags, Muse, 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, Haddock markup, EPUB (v2 and v3),
+                 FictionBook2, InDesign ICML, Muse, and several kinds of
                  HTML/javascript slide shows (S5, Slidy, Slideous,
                  DZSlides, reveal.js).
                  .