Update man page, changelog, authors.

4 files changed, 33 insertions, 12 deletions

diff --git a/AUTHORS.md b/AUTHORS.md
index c06b9c3c4..3b6b8da55 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -72,6 +72,7 @@
 - Henrik Tramberend
 - Henry de Valence
 - Hubert Plociniczak
+- Igor Khorlo
 - Ilya V. Portnov
 - Ivo Clarysse
 - J. Lewis Muir
diff --git a/MANUAL.txt b/MANUAL.txt
index cedfe3cb7..792e8c49d 100644
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -1,6 +1,6 @@
 % Pandoc User's Guide
 % John MacFarlane
-% July 15, 2018
+% July 19, 2018
 
 Synopsis
 ========
diff --git a/changelog b/changelog
index e90ff295d..4538657c0 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,25 @@
+pandoc (2.2.2.1)
+
+  * Fix regression finding templates in user data directory (#4777).
+    Under version 2.2.1 and prior pandoc found latex templates in the
+    templates directory under the data directory, but this broke in 2.2.2.
+
+  * Fix for bug in parsing `\input` in `rawLaTeXBlock` and
+    `rawLaTeXInline` (#4781). (This primarily affects the markdown
+    reader, and other readers that accept raw tex.)
+    Starting in 2.2.2, everything after an `\input` (or `\include`)
+    in a markdown file would be parsed as raw LaTeX.
+
+  * MANUAL:
+
+    + Clarify `gfm` vs `markdown_github` (#4783, Mauro Bieg).
+    * Use `keywords` instead of `tags` in YAML metadata example (#4779).
+      Unlike `tags`, `keywords` is used in some of the writers
+      and default templates.
+
+  * Add missing `rollingLinks` option to revealjs template (#4778,
+    Igor Khorlo).
+
 pandoc (2.2.2)
 
   * Use HsYAML instead of yaml for translations and YAML metadata (#4747).
diff --git a/man/pandoc.1 b/man/pandoc.1
index 543039adb..8034512c3 100644
--- a/man/pandoc.1
+++ b/man/pandoc.1
@@ -1,5 +1,5 @@
 .\"t
-.TH PANDOC 1 "July 15, 2018" "pandoc 2.2.2"
+.TH PANDOC 1 "July 19, 2018" "pandoc 2.2.2.1"
 .SH NAME
 pandoc - general markup converter
 .SH SYNOPSIS
@@ -231,10 +231,9 @@ Specify input format.
 .IP \[bu] 2
 \f[C]fb2\f[] (FictionBook2 e\-book)
 .IP \[bu] 2
-\f[C]gfm\f[] (GitHub\-Flavored Markdown), or \f[C]markdown_github\f[],
-which provides deprecated and less accurate support for Github\-Flavored
-Markdown; please use \f[C]gfm\f[] instead, unless you need to use
-extensions other than \f[C]smart\f[].
+\f[C]gfm\f[] (GitHub\-Flavored Markdown), or the deprecated and less
+accurate \f[C]markdown_github\f[]; use \f[C]markdown_github\f[] only if
+you need extensions not supported in \f[C]gfm\f[].
 .IP \[bu] 2
 \f[C]haddock\f[] (Haddock markup)
 .IP \[bu] 2
@@ -312,10 +311,9 @@ Specify output format.
 .IP \[bu] 2
 \f[C]fb2\f[] (FictionBook2 e\-book)
 .IP \[bu] 2
-\f[C]gfm\f[] (GitHub\-Flavored Markdown), or \f[C]markdown_github\f[],
-which provides deprecated and less accurate support for Github\-Flavored
-Markdown; please use \f[C]gfm\f[] instead, unless you use extensions
-that do not work with \f[C]gfm\f[].
+\f[C]gfm\f[] (GitHub\-Flavored Markdown), or the deprecated and less
+accurate \f[C]markdown_github\f[]; use \f[C]markdown_github\f[] only if
+you need extensions not supported in \f[C]gfm\f[].
 .IP \[bu] 2
 \f[C]haddock\f[] (Haddock markup)
 .IP \[bu] 2
@@ -3810,7 +3808,7 @@ title:\ \ \[aq]This\ is\ the\ title:\ it\ contains\ a\ colon\[aq]
 author:
 \-\ Author\ One
 \-\ Author\ Two
-tags:\ [nothing,\ nothingness]
+keywords:\ [nothing,\ nothingness]
 abstract:\ |
 \ \ This\ is\ the\ abstract.
 
@@ -5241,7 +5239,7 @@ Also, \f[C]raw_tex\f[] only affects \f[C]gfm\f[] output, not input.
 .TP
 .B \f[C]gfm\f[] (GitHub\-Flavored Markdown)
 \f[C]pipe_tables\f[], \f[C]raw_html\f[], \f[C]fenced_code_blocks\f[],
-\f[C]auto_identifiers\f[], \f[C]ascii_identifiers\f[],
+\f[C]gfm_auto_identifiers\f[], \f[C]ascii_identifiers\f[],
 \f[C]backtick_code_blocks\f[], \f[C]autolink_bare_uris\f[],
 \f[C]intraword_underscores\f[], \f[C]strikeout\f[],
 \f[C]hard_line_breaks\f[], \f[C]emoji\f[],