From 41cf6d540fbc7c6033dad09fb27a68ad1da4c629 Mon Sep 17 00:00:00 2001
From: Alexander Krotov <ilabdsf@gmail.com>
Date: Mon, 2 Jul 2018 18:51:51 +0300
Subject: More spellcheck

---
 changelog | 64 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

(limited to 'changelog')

diff --git a/changelog b/changelog
index 285e39e2d..74ca30edf 100644
--- a/changelog
+++ b/changelog
@@ -432,7 +432,7 @@ pandoc (2.1.3)
   * JATS writer: Remove extraneous, significant whitespace (#4335,
     Nokome Bentley).
 
-  * html2pdf: inject base tag wih current working directory (#4413, Mauro
+  * html2pdf: inject base tag with current working directory (#4413, Mauro
     Bieg).  This helps ensure that linked resources are included.
 
   * Add Semigroup instances for everything for which we defined a
@@ -580,7 +580,7 @@ pandoc (2.1.2)
   * Docx reader (Jesse Rosenthal, except where noted):
 
     + Handle nested sdt tags (#4415).
-    + Don't look up dependant run styles if `+styles` is enabled.
+    + Don't look up dependent run styles if `+styles` is enabled.
     + Move pandoc inline styling inside custom-style span.
     + Read custom styles (#1843).  This will read all paragraph and
       character classes as divs and spans, respectively. Dependent styles
@@ -2283,7 +2283,7 @@ pandoc (2.0)
 
   * Removed `hard_line_breaks` extension from `markdown_github` (#3594).
     GitHub has two Markdown modes, one for long-form documents like READMEs
-    and one for short things like issue coments. In issue comments, a line
+    and one for short things like issue comments. In issue comments, a line
     break is treated as a hard line break. In README, wikis, etc., it is
     treated as a space as in regular Markdown.  Since pandoc is more likely to
     be used to convert long-form documents from GitHub Markdown,
@@ -2636,7 +2636,7 @@ pandoc (2.0)
     top-level `Text.Pandoc` module.
 
     + Changed `StringWriter` -> `TextWriter`.
-    + `getWriter` now retuns a pair of a reader and
+    + `getWriter` now returns a pair of a reader and
       `Extensions`, instead of building the extensions into the
       reader (#3659).  The calling code must explicitly set
       `readerExtensions` using the `Extensions` returned.  The
@@ -3049,7 +3049,7 @@ pandoc (2.0)
       of item disappear or are misplaced.  Use `\texttt` instead.
     + Fix problem with escaping in `lstinline` (#1629).  Previously the
       LaTeX writer created invalid LaTeX when `--listings` was specified and
-      a code span occured inside emphasis or another construction.
+      a code span occurred inside emphasis or another construction.
     + Fix error with line breaks after empty content (#2874).  LaTeX
       requires something before a line break, so we insert a `~` if no
       printable content has yet been emitted.
@@ -3156,7 +3156,7 @@ pandoc (2.0)
 
     + Don't drop smartTag contents (#2242).
     + Handle local namespace declarations (#3365).  Previously we didn't
-      recognize math, for example, when the xmlns declaration occured on
+      recognize math, for example, when the xmlns declaration occurred on
       the element and not the root.
     + More efficient trimSps (#1530).  Replacing `trimLineBreaks`.  This
       does the work of `normalizeSpaces` as well, so we avoid the need for
@@ -3390,7 +3390,7 @@ pandoc (2.0)
     + Allow `]` inside group in option brackets (#3857).
     + lstinline with braces can be used (verb cannot be used with braces)
       (Marc Schreiber, #3535).
-    + Fix keyval funtion: pandoc did not parse options in braces correctly
+    + Fix keyval function: pandoc did not parse options in braces correctly
       (Marc Schreiber, #3642).
     + When parsing raw LaTeX commands, include trailing space (#1773).
       Otherwise things like `\noindent foo` break and turn into
@@ -3482,7 +3482,7 @@ pandoc (2.0)
       parse, the parser was applied too often, consuming too much of the
       input. This only affects `many1Till p end` where `p` matches on a
       prefix of `end`.
-    + Provide `parseFromString` (#3690).  This is a verison of
+    + Provide `parseFromString` (#3690).  This is a version of
       `parseFromString` specialied to ParserState, which resets
       `stateLastStrPos` at the end.  This is almost always what we want.
       This fixes a bug where `_hi_` wasn't treated as emphasis in the
@@ -3588,7 +3588,7 @@ pandoc (2.0)
     + Use `unicode-math` (Vaclav Haisman).  Use `mathspec` with only
       XeLaTeX on request.
     + Don't load `fontspec` before `unicode-math` (over there).
-      The `unicode-math` package loads `fontspec` so explict loading of
+      The `unicode-math` package loads `fontspec` so explicit loading of
       `fontspec` before `unicode-math` is not necessary.
     + Use `unicode-math` by default in default.latex template.  mathspec will
       be used in xelatex if the `mathspec` variable is set; otherwise
@@ -4241,7 +4241,7 @@ pandoc (1.18)
     is now used in parsing RST and Markdown line blocks, DocBook
     `linegroup`/`line` combinations, and Org-mode `VERSE` blocks.
     Previously `Para` blocks with hard linebreaks were used.  `LineBlock`s
-    are handled specially in the following ouput formats: AsciiDoc
+    are handled specially in the following output formats: AsciiDoc
     (as `[verse]` blocks), ConTeXt (`\startlines`/`\endlines`),
     HTML (`div` with a style), Markdown (line blocks if `line_blocks`
     is enabled), Org-mode (`VERSE` blocks), RST (line blocks). In
@@ -4388,7 +4388,7 @@ pandoc (1.18)
       comma-separated list.
     + Give precedence to later meta lines.  The last meta-line of any given
       type is the significant line.  Previously the value of the first line
-      was kept, even if more lines of the same type were encounterd.
+      was kept, even if more lines of the same type were encountered.
     + Read LaTeX_header as header-includes.  LaTeX-specific header commands
       can be defined in `#+LaTeX_header` lines.  They are parsed as
       format-specific inlines to ensure that they will only show up in LaTeX
@@ -4436,7 +4436,7 @@ pandoc (1.18)
       be able to figure out internal links to a header in a docx if the
       anchor span was empty. We change that to read the inlines out of the
       first anchor span in a header.
-    + Let headers use exisiting id.  Previously we always generated an id for
+    + Let headers use existing id.  Previously we always generated an id for
       headers (since they wouldn't bring one from Docx). Now we let it use an
       existing one if possible. This should allow us to recurs through anchor
       spans.
@@ -4543,7 +4543,7 @@ pandoc (1.18)
     + Don't emit HTML for tables unless `raw_html` extension is set (#3154).
       Emit `[TABLE]` if no suitable table formats are enabled and raw HTML
       is disabled.
-    + Check for the `raw_html` extension before emiting a raw HTML block.
+    + Check for the `raw_html` extension before emitting a raw HTML block.
     + Abstract out note/ref function (Jesse Rosenthal).
     + Add ReaderT monad for environment variables (Jesse Rosenthal).
 
@@ -5023,7 +5023,7 @@ pandoc (1.17.1)
       character.  Empty rows where parsed as alignment rows and dropped from
       the output.
     + Fix spacing after LaTeX-style symbols.
-      The org-reader was droping space after unescaped LaTeX-style symbol
+      The org-reader was dropping space after unescaped LaTeX-style symbol
       commands: `\ForAll \Auml` resulted in `∀Ä` but should give `∀ Ä`
       instead.  This seems to be because the LaTeX-reader treats the
       command-terminating space as part of the command.  Dropping the trailing
@@ -5117,7 +5117,7 @@ pandoc (1.17.1)
     + Clarified documentation of `implicit_header_references` (#2904).
     + Improved documentation of `--columns` option.
 
-  * Added appveyor setup, with artefacts (Jan Schulz).
+  * Added appveyor setup, with artifacts (Jan Schulz).
 
   * stack.yaml versions: Use proper flags used for texmath, pandoc-citeproc.
 
@@ -5356,7 +5356,7 @@ pandoc (1.16.0.1)
 
   * Entity handling fixes: improved handling of entities like
     `&lang;` that require a trailing semicolon.  Allow uppercase
-    `x` in numerical hexidecimal character references, working
+    `x` in numerical hexadecimal character references, working
     around a tagsoup bug.
 
   * `stack.yaml` - use lts-4.0, but with older aeson to avoid excessive
@@ -6852,7 +6852,7 @@ pandoc (1.14)
   * `Text.Pandoc.Shared`:
 
     + Make safeRead safe (#1801, Matthew Pickering).
-    + Addded `mapLeft`, `hush` (Matthew Pickering).
+    + Added `mapLeft`, `hush` (Matthew Pickering).
 
   * `Text.Pandoc.Pretty`:
 
@@ -6920,7 +6920,7 @@ pandoc (1.14)
 
     + Use `text:p` instead of `text:h` for title.
       Using `text:h` causes problems with numbering.  Closes #2059.
-      Thansk to @nkalvi for diagnosing this.
+      Thanks to @nkalvi for diagnosing this.
 
   * reveal.js template:
 
@@ -7026,7 +7026,7 @@ pandoc (1.13.2)
     + Parse RST class directives. The class directive accepts one or more
       class names, and creates a Div value with those classes.  If the
       directive has an indented body, the body is parsed as the children of
-      the Div.  If not, the first block folowing the directive is made a
+      the Div.  If not, the first block following the directive is made a
       child of the Div. This differs from the behavior of rst2xml, which
       does not create a Div element.  Instead, the specified classes are
       applied to each child of the directive.  However, most Pandoc Block
@@ -7971,7 +7971,7 @@ pandoc (1.13)
     different versions of the `directory` library.
 
   + Added `Text.Pandoc.Compat.Except` to allow building against
-    different verions of `mtl`.
+    different versions of `mtl`.
 
   * Code cleanup in some writers, using Reader monad to avoid
     passing options parameter around (Matej Kollar).
@@ -8631,7 +8631,7 @@ pandoc (1.12.2)
     + Parse contents of curly quotes or matched `"` as quotes.
     + Support `\textnormal` as span with class `nodecor`.
       This is needed for pandoc-citeproc.
-    + Improved citation parsing.  This fixes a run-time error that occured
+    + Improved citation parsing.  This fixes a run-time error that occurred
       with `\citet{}` (empty list of keys).  It also ensures that empty keys
       don't get produced.
 
@@ -8914,7 +8914,7 @@ pandoc (1.12)
     to make that the current directory before running pandoc. (#942)
 
   * Better error reporting in some readers, due to changes in `readWith`:
-    the line in which the error occured is printed, with a caret pointing
+    the line in which the error occurred is printed, with a caret pointing
     to the column.
 
   * All slide formats now support incremental slide view for definition lists.
@@ -9608,7 +9608,7 @@ pandoc (1.11)
     + Include HTML TOC, even in epub2.  The TOC is included in `<spine>`,
       but `linear` is set to `no` unless the `--toc` option is specified.
       Include `<guide>` element in OPF.  This should allow the TOC to
-      be useable in Kindles when converted with kindlegen. Closes #773.
+      be usable in Kindles when converted with kindlegen. Closes #773.
 
   * `Text.Pandoc.Parsing`: Optimized `oneOfStringsCI`.
     This dramatically reduces the speed penalty that comes from enabling the
@@ -9973,7 +9973,7 @@ pandoc (1.10)
   [API changes]
 
   * `Text.Pandoc.Definition`: Added `Attr` field to `Header`.
-    Previously header identifers were autogenerated by the writers.
+    Previously header identifiers were autogenerated by the writers.
     Now they are added in the readers (either automatically or explicitly).
 
   * `Text.Pandoc.Builder`:
@@ -10210,7 +10210,7 @@ pandoc (1.10)
       incorrectly implented RST-style autolinks for URLs and email
       addresses.  This has been fixed.  Now an autolink is done this way:
       `"$":http://myurl.com`.
-    + Fixed footnotes bug in textile.  This affected notes occuring
+    + Fixed footnotes bug in textile.  This affected notes occurring
       before punctuation, e.g. `foo[1].`.  Closes #518.
 
   * LaTeX reader:
@@ -11243,7 +11243,7 @@ pandoc (1.9)
     Items are no longer installed as root.
     Man pages are zipped and given proper permissions.
 
-  * Modified windows installer generater to use cabal-dev.
+  * Modified windows installer generator to use cabal-dev.
 
   * Setup: Making man pages now works with cabal-dev (at least on OSX). In
     Setup.hs we now invoke 'runghc' in a way that points it to the correct
@@ -12286,7 +12286,7 @@ pandoc (1.5)
       better browsers) as text/html.
     + Removed Text.Pandoc.LaTeXMathML.  The module was no longer
       necessary; it was replaced by two lines in pandoc.hs.
-    + Replaced LaTeXMathML.js.commend and LaTeXMathML.js.packed with a
+    + Replaced LaTeXMathML.js.comment and LaTeXMathML.js.packed with a
       single combined file, LaTeXMathML.js.
 
   * Added --data-dir option.
@@ -12520,7 +12520,7 @@ pandoc (1.4)
   * Replaced old headers with templates.  Now users have much more
     control over the way documents appear in --standalone mode,
     and writer code is simplified.  Resolves Issues #59, 147.
-    Every effort has been made to retain backwards compatibilty.
+    Every effort has been made to retain backwards compatibility.
     So, the --custom-header option should still work as before.
 
     + Added Text.Pandoc.Templates.  This provides functions for
@@ -13488,7 +13488,7 @@ pandoc (0.46) unstable; urgency=low
 
     + Don't interpret contents of style tags as markdown.
       (Resolves Issue #40.)
-      - Added htmlStyle, analagous to htmlScript.
+      - Added htmlStyle, analogous to htmlScript.
       - Use htmlStyle in htmlBlockElement and rawHtmlInline.
       - Moved "script" from the list of tags that can be either block or
         inline to the list of block tags.
@@ -14267,7 +14267,7 @@ pandoc (0.4) unstable; urgency=low
       notes and add information to state. (Reference keys may be needed
       at this stage.) Finally, parse everything else.
     + Replaced named constants like 'emphStart' with literals.
-    + Removed an extra occurance of escapedChar in definition of inline.
+    + Removed an extra occurrence of escapedChar in definition of inline.
 
   * RST reader:
 
@@ -14307,7 +14307,7 @@ pandoc (0.4) unstable; urgency=low
     + The Html header is now written programmatically, so it has been
       removed from the 'headers' directory. The S5 header is still
       needed, but the doctype and some of the meta declarations have
-      been removed, since they are written programatically. This change
+      been removed, since they are written programmatically. This change
       introduces a new dependency on the xhtml package.
     + Fixed two bugs in email obfuscation involving improper escaping
       of '&' in the `<noscript>` section and in `--strict` mode. Resolves
@@ -14616,7 +14616,7 @@ pandoc (0.3) unstable; urgency=low
     + win-pkg target creates Windows binary package.
     + tarball target creates distribution source tarball.
     + website target generates pandoc's website automatically, including
-      demos.  New 'web' directory containts files needed for construction
+      demos.  New 'web' directory contains files needed for construction
       of the website (which will be created as the 'pandoc' subdirectory
       of 'web').
     + Makefile checks to see if we're running Windows/Cygwin; if so,
-- 
cgit v1.2.3


From f44be8c08f18edc4563ca75c7f60efa92fc088b1 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 15 Jul 2018 13:44:43 -0700
Subject: Bump to 2.2.2 and update changelog.

---
 changelog    | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pandoc.cabal |   2 +-
 2 files changed, 156 insertions(+), 1 deletion(-)

(limited to 'changelog')

diff --git a/changelog b/changelog
index 74ca30edf..ebe5de455 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,158 @@
+pandoc (2.2.2)
+
+  * Use HsYAML instead of yaml for translations and YAML metadata (#4747).
+    yaml wraps a C library; HsYAML is pure Haskell.  Advances #4535.
+
+    Note: HsYAML implements YAML 1.2, in which the valid true
+    values are `true`, `True`, `TRUE`.  This means a change in
+    the semantics of YAML metadata that could affect users:
+    `y`, `yes`, and `on` no longer count as true values.
+
+  * Fix regression: make `--pdf-engine` work with full paths (#4681, Mauro
+    Bieg).
+
+  * CommonMark reader: Handle ascii_identifiers extension (#4742,
+    Anders Waldenborg).  Non-ascii characters were not stripped from
+    identifiers even if the `ascii_identifiers` extension was enabled (which is
+    is by default for gfm).
+
+  * TikiWiki reader: Improve list parsing (#4722, Mauro Bieg).
+    Remove trailing Space from list items.  Parse lists that have no space
+    after marker.
+
+  * LaTeX reader:
+
+    + Treat `lilypond` as a verbatim environment (#4725).
+    + Parse figure label into Image id (#4700, Mauro Bieg).
+    + Beamer: Allow "noframenumbering" option (#4696, Raymond Ehlers).
+    + Allow spaces around `\graphicspath` arguments (#4698).
+    + Handle includes without surrounding blanklines (#4553).
+      In addition, `\input` can now be used in an inline context,
+      e.g. to provide part of a paragraph, as it can in LaTeX.
+    + In `rawLaTeXBlock`, handle macros that resolve to a
+      `\begin` or `\end` (#4667).
+    + In `rawLaTeXBlock`, don't expand macros in macro definitions (#4653).
+      Note that this only affected LaTeX in markdown.
+    + Tighten up reading of beamer overlay specifications (#4669).
+      Ideally we'd turn these on only when reading beamer, but currently
+      beamer is not distinguished from latex as an input format.
+      This commit also activates parsing of overlay specifications
+      after commands in general (e.g. `\item`), since they can occur
+      in many contexts in beamer.
+    + Parse more siunitx unit commands (#4296, #4773).
+    + Be more forgiving in key/value option parsing (#4761).
+
+  * Markdown reader: Allow empty code spans, e.g. `` ` ` ``.
+
+  * Muse reader (Alexander Krotov, except where indicated):
+
+    + Get rid of non-exhaustive pattern match warning (Mauro Bieg).
+    + Add support for floating images.
+    + Add support for images with specified width.
+    + Parse image URLs without "guard" and "takeExtension".
+    + Split link and image parsing into separate functions.
+    + Parse links starting with "URL:" explicitly instead of trying to strip
+      "URL:" prefix after parsing.
+
+  * Texinfo writer: Use `@sup` and `@sub` instead of custom macros (#4728,
+    Alexander Krotov).
+
+  * Markdown writer: Preserve `implicit_figures` with attributes, even if
+    `implicit_attributes` is not set, by rendering in raw HTML (#4677).
+
+  * Docx writer: Be sensitive to `toc` in YAML metadata (#4645).
+
+  * ODT/OpenDocument writer: Make internal links work (#4358).
+    This adds proper bookmarks to the headers with non-null IDs.
+
+  * EPUB writer: Properly escape pagetitle.  Previously we weren't escaping `&`
+    and other XML characters in the pagetitle, so a title containing a `&`
+    would be invalid.
+
+  * AsciiDoc Writer: Eescape square brackets at start of line (#4545, Mauro
+    Bieg).
+
+  * RST writer:
+
+    + Don't treat 'example' as a syntax name (#4748).
+      This fixes conversions from org with example blocks.
+    + Support `--number-sections` via the `section-numbering`
+      directive in standalone output.
+
+  * reveal.js writer and template: reuse mathjax URL
+    provided by the argument to `--mathjax` or the normal pandoc default,
+    rather than a hard-coded one in the template (#4701).
+
+  * LaTeX writer:
+
+    + Properly handle footnotes in table captions (#4683).
+      Refactored code from figure captions to use in both places.
+    + In beamer output, fix single digit column percentage (#4690, Mauro
+      Bieg).
+
+  * FB2 writer (Alexander Krotov):
+
+    + Convert Plain to Para in annotation (#2424).
+    + Fix order of items in title-info (#2424).
+
+  * Custom writer: fix error message on script failure (Albert Krewinkel).
+    Error messages produced by Lua were not displayed by Pandoc.
+
+  * Text.Pandoc.PDF:
+
+    + Revert fix for #4484 (only compress images on last run, #4755).
+      This will mean some increase in the time it takes to
+      produce an image-heavy PDF with xelatex, but it will
+      make tables of contents correct, which is more important.
+    + Fix logic error in runTeXProgram.  We were running the tex program one
+      more time than requested.  This should speed up pdf production.
+
+  * Allow `--template` to take a URL as argument.
+
+  * Text.Pandoc.Highlighting: Add missing re-export of `breezeDark`
+    highlighting style (#4687, Adrian Sieber, API change).
+
+  * Clarify macOS install in INSTALL.md (#4661).  Make the binary package
+    installer the recommended method, and note that on some older versions of
+    macOS, homebrew installs from source and takes a lot of disk space (#4664,
+    Ian).
+
+  * MANUAL:
+
+    + Clarify EPUB linked media (#4756, Mauro Bieg)
+    + Update manual for "true" YAML values.  Now that we're using HsYAML and
+      YAML 1.2, the valid true values are `true`, `True`, `TRUE`.  NOTE!  `y`,
+      `yes`, `on` no longer count as true values.
+    + Document `-F` as alias for `--filter` (thanks to Gandalf Saxe).
+    + Update manual on how math is rendered in LaTeX.
+    + Add proxy description (#4131, Mauro Bieg).
+    + Clarify that `--toc` requires `--standalone` (#4703).
+    + Update citation styles link (#4699, wiefling).
+
+  * In API docs, clarify how `Ext_east_asian_line_breaks` extension works
+    (kaizshang91).  Note that it will not take effect when readers/writers are
+    called as libraries (#4674).
+
+  * Improved translations/fr (#4766, lux-lth).
+
+  * Removed inadvertently added .orig files from repository (#4648).
+
+  * Remove `network-uri` flag and use 'Network.Socket'.
+    This removes a compiler warning.  There is no need for the old network-uri
+    flag, since network 2.6 was released in 2014.
+
+  * Add stack.lts10.yaml, stack.lts11.yaml.  use lts-12 in stack.yaml.
+
+  * Bump upper bounds for dependent packages.
+
+  * Exclude foundation 0.0.21 for ghc 7.10.  Otherwise cabal gets
+    confused because of the way ghc 7.10 is excluded in foundation's
+    cabal file.  This can be removed when haskell-foundation/foundation#500
+    is fixed.
+
+  * Require cabal-version >= 2.0.  This is needed for haddock-library.
+
+
 pandoc (2.2.1)
 
   * Restored and undeprecated gladtex for HTML math (#4607).
diff --git a/pandoc.cabal b/pandoc.cabal
index 4bd386948..d82d8659d 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -1,5 +1,5 @@
 name:            pandoc
-version:         2.2.1
+version:         2.2.2
 cabal-version:   >= 2.0
 build-type:      Custom
 license:         GPL-2
-- 
cgit v1.2.3


From ef07db6cefb34b5a6d89fc7d40e0144b6d6440b6 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 15 Jul 2018 15:05:05 -0700
Subject: Small edits in changelog.

---
 changelog | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'changelog')

diff --git a/changelog b/changelog
index ebe5de455..1b80c50d9 100644
--- a/changelog
+++ b/changelog
@@ -11,10 +11,10 @@ pandoc (2.2.2)
   * Fix regression: make `--pdf-engine` work with full paths (#4681, Mauro
     Bieg).
 
-  * CommonMark reader: Handle ascii_identifiers extension (#4742,
+  * CommonMark reader: Handle `ascii_identifiers` extension (#4742,
     Anders Waldenborg).  Non-ascii characters were not stripped from
-    identifiers even if the `ascii_identifiers` extension was enabled (which is
-    is by default for gfm).
+    identifiers even if the `ascii_identifiers` extension was
+    enabled (which is is by default for gfm).
 
   * TikiWiki reader: Improve list parsing (#4722, Mauro Bieg).
     Remove trailing Space from list items.  Parse lists that have no space
@@ -65,12 +65,12 @@ pandoc (2.2.2)
   * ODT/OpenDocument writer: Make internal links work (#4358).
     This adds proper bookmarks to the headers with non-null IDs.
 
-  * EPUB writer: Properly escape pagetitle.  Previously we weren't escaping `&`
-    and other XML characters in the pagetitle, so a title containing a `&`
-    would be invalid.
+  * EPUB writer: Properly escape pagetitle.  Previously we weren't
+    escaping `&` and other XML characters in the pagetitle, so a title
+    containing a `&` would be invalid.
 
-  * AsciiDoc Writer: Eescape square brackets at start of line (#4545, Mauro
-    Bieg).
+  * AsciiDoc Writer: Eescape square brackets at start of line (#4545,
+    Mauro Bieg).
 
   * RST writer:
 
@@ -104,8 +104,8 @@ pandoc (2.2.2)
       This will mean some increase in the time it takes to
       produce an image-heavy PDF with xelatex, but it will
       make tables of contents correct, which is more important.
-    + Fix logic error in runTeXProgram.  We were running the tex program one
-      more time than requested.  This should speed up pdf production.
+    + Fix logic error in `runTeXProgram`.  We were running the tex program
+      one more time than requested.  This should speed up PDF production.
 
   * Allow `--template` to take a URL as argument.
 
@@ -114,15 +114,15 @@ pandoc (2.2.2)
 
   * Clarify macOS install in INSTALL.md (#4661).  Make the binary package
     installer the recommended method, and note that on some older versions of
-    macOS, homebrew installs from source and takes a lot of disk space (#4664,
-    Ian).
+    macOS, homebrew installs from source and takes a lot of disk space
+    (#4664, Ian).
 
   * MANUAL:
 
     + Clarify EPUB linked media (#4756, Mauro Bieg)
     + Update manual for "true" YAML values.  Now that we're using HsYAML and
-      YAML 1.2, the valid true values are `true`, `True`, `TRUE`.  NOTE!  `y`,
-      `yes`, `on` no longer count as true values.
+      YAML 1.2, the valid true values are `true`, `True`, `TRUE`.  NOTE!
+      `y`, `yes`, `on` no longer count as true values.
     + Document `-F` as alias for `--filter` (thanks to Gandalf Saxe).
     + Update manual on how math is rendered in LaTeX.
     + Add proxy description (#4131, Mauro Bieg).
@@ -130,16 +130,16 @@ pandoc (2.2.2)
     + Update citation styles link (#4699, wiefling).
 
   * In API docs, clarify how `Ext_east_asian_line_breaks` extension works
-    (kaizshang91).  Note that it will not take effect when readers/writers are
-    called as libraries (#4674).
+    (kaizshang91).  Note that it will not take effect when readers/writers
+    are called as libraries (#4674).
 
   * Improved translations/fr (#4766, lux-lth).
 
-  * Removed inadvertently added .orig files from repository (#4648).
+  * Removed inadvertently added `.orig` files from repository (#4648).
 
   * Remove `network-uri` flag and use 'Network.Socket'.
-    This removes a compiler warning.  There is no need for the old network-uri
-    flag, since network 2.6 was released in 2014.
+    This removes a compiler warning.  There is no need for the old
+    `network-uri` flag, since network 2.6 was released in 2014.
 
   * Add stack.lts10.yaml, stack.lts11.yaml.  use lts-12 in stack.yaml.
 
-- 
cgit v1.2.3


From 75cf1f59ff30115ce235edf5ca17abb903d78d6c Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 15 Jul 2018 16:09:11 -0700
Subject: Update changelog.

---
 changelog | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'changelog')

diff --git a/changelog b/changelog
index 1b80c50d9..e90ff295d 100644
--- a/changelog
+++ b/changelog
@@ -42,7 +42,14 @@ pandoc (2.2.2)
     + Parse more siunitx unit commands (#4296, #4773).
     + Be more forgiving in key/value option parsing (#4761).
 
-  * Markdown reader: Allow empty code spans, e.g. `` ` ` ``.
+  * Markdown reader:
+
+    + Allow empty code spans, e.g. `` ` ` ``.
+    + Emojis are now wrapped in Spans with class `emoji` and
+      attribute `data-emoji` (Anders Waldenborg, #4743).
+      This allows the writer to handle them in a special way
+      (e.g. using a special font, or just rendering the
+      emoji name).
 
   * Muse reader (Alexander Krotov, except where indicated):
 
@@ -60,6 +67,11 @@ pandoc (2.2.2)
   * Markdown writer: Preserve `implicit_figures` with attributes, even if
     `implicit_attributes` is not set, by rendering in raw HTML (#4677).
 
+  * Markdown and commonmark/github writers now respect the `emoji`
+    extension.  So, `-f markdown+emoji -t markdown+emoji` now leaves
+    `:smile:` as `:smile:` rather than converting it to a smile
+    character.
+
   * Docx writer: Be sensitive to `toc` in YAML metadata (#4645).
 
   * ODT/OpenDocument writer: Make internal links work (#4358).
@@ -98,6 +110,11 @@ pandoc (2.2.2)
   * Custom writer: fix error message on script failure (Albert Krewinkel).
     Error messages produced by Lua were not displayed by Pandoc.
 
+  * Text.Pandoc.Emoji now exports `emojiToInline`, which returns a Span
+    inline containing the emoji character and some attributes with metadata
+    (class `emoji`, attribute `data-emoji` with emoji name).  (API change,
+    Anders Waldenborg, #4743).
+
   * Text.Pandoc.PDF:
 
     + Revert fix for #4484 (only compress images on last run, #4755).
-- 
cgit v1.2.3


From 31ef9959b810c1bc62228cfe658fcfb12cee9ffb Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Thu, 19 Jul 2018 21:51:56 -0700
Subject: Update man page, changelog, authors.

---
 AUTHORS.md   |  1 +
 MANUAL.txt   |  2 +-
 changelog    | 22 ++++++++++++++++++++++
 man/pandoc.1 | 20 +++++++++-----------
 4 files changed, 33 insertions(+), 12 deletions(-)

(limited to 'changelog')

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[],
-- 
cgit v1.2.3


From 5866892a9d9a17403894cea97370e1c2be4fcb03 Mon Sep 17 00:00:00 2001
From: Kirill Müller <krlmlr@users.noreply.github.com>
Date: Sat, 4 Aug 2018 21:17:10 +0200
Subject: Describe required space as breaking change (#4808)

---
 changelog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'changelog')

diff --git a/changelog b/changelog
index 4538657c0..37bb6e071 100644
--- a/changelog
+++ b/changelog
@@ -2610,6 +2610,11 @@ pandoc (2.0)
       (since the two-space version of a line break doesn't work inside ATX
       headers, and neither version works inside Setext headers).
 
+    + A space between the opening # and the header is now required for
+      pandoc and GitHub markdown (but not the other flavors). Disable
+      the `space_in_atx_header` extension (#3512) to restore the
+      original behavior.
+
 
   * Org reader (Albert Krewinkel, unless noted):
 
-- 
cgit v1.2.3


From d8a614d7bb04efe898dbd0d9bbf74fe5d79db902 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 5 Aug 2018 12:40:56 -0700
Subject: Bump to 2.2.3, update changelog and man page.

---
 MANUAL.txt   |  2 +-
 changelog    | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/pandoc.1 | 37 +++++++++++++++-----------
 pandoc.cabal |  2 +-
 4 files changed, 110 insertions(+), 17 deletions(-)

(limited to 'changelog')

diff --git a/MANUAL.txt b/MANUAL.txt
index 759050023..acbf62e1f 100644
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -1,6 +1,6 @@
 % Pandoc User's Guide
 % John MacFarlane
-% July 19, 2018
+% August 5, 2018
 
 Synopsis
 ========
diff --git a/changelog b/changelog
index 37bb6e071..e3b3085ac 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,89 @@
+pandoc (2.2.3)
+
+  * RST reader: improve parsing of inline interpreted text roles (#4811).
+
+    + Use a Span with class "title-reference" for the default
+      title-reference role.
+    + Use `B.text` to split up contents into `Space`s, `SoftBreak`s,
+      and `Str`s for `title-reference`.
+    + Use Code with class "interpreted-text" instead of Span and Str for
+      unknown roles.  (The RST writer has also been modified to round-trip
+      this properly.)
+    + Disallow blank lines in interpreted text.
+    + Backslash-escape now works in interpreted text.
+    + Backticks followed by alphanumerics no longer end interpreted text.
+    + Remove support for nested inlines (Francesco Occhipinti).
+      RST does not allow nested emphasis, links, or other inline
+      constructs.  This fixes several bugs (#4581, #4561, #4792).
+
+  * Org reader: fix parsers relying on `parseFromString` (#4784, Albert
+    Krewinkel).  Emphasis was not parsed when it followed directly after
+    some block types (e.g., lists).
+
+  * Markdown reader: Allow unquoted numbers and booleans as YAML mapping
+    keys.  Previously in 2.2.2 you could not do
+    ```
+    ---
+    0: bar
+    ...
+    ```
+    but only
+    ```
+    ---
+    '0': bar
+    ...
+    ```
+    With this change, both forms work.
+
+  * DocBook reader: metadata handling improvements.
+    Now we properly parse title and subtitle elements that are direct
+    children of book and article (as well as children of bookinfo,
+    articleinfo, or info).  We also now use the `subtitle` metadata
+    field for subtitles, rather than tacking the subtitle on to the
+    title.
+
+  * RST writer:
+
+    + Allow images to be directly nested within links (#4810, Francesco
+      Occhipinti).
+    + Use `titleblock` instead of `title` variable for title block (#4803,
+      Francesco Occhipinti).  `titleblock` contains a properly formatted
+      title and subtitle (using top-level headers).  `title` and
+      `subtitle` variables are still available and just contain the
+      title and subtitle text.  Note that this change will require an
+      update to custom rst templates.
+    + Render Code with class "interpreted-text" as interpreted text role.
+
+  * MediaWiki writer: Avoid extra blank line in tables with empty cells
+    (#4794).  Note that the old output is semantically identical, but the
+    new output looks better.
+
+  * Lua Utils module: add function `blocks_to_inlines` (#4799, Albert
+    Krewinkel).  Exposes a function converting which flattenes a list of
+    blocks into a list of inlines. An example use case would be the
+    conversion of Note elements into other inlines.
+
+  * RST template:  use `titleblock` instead of `title`.  Users of
+    custom RST templates will want to update this.
+
+  * LaTeX template: Moved some beamer code in default.latex template.
+    This change allows beamer themes to change the template and font (as
+    Metropolis does) (#4450).
+
+  * Better error message on `-t pdf -o out.pdf` (#1155, Mauro Bieg).
+
+  * Added test case for #4669 to repository.
+
+  * INSTALL.md: Fix broken link for cabal-install (#4806, ChanHoHo).
+
+  * MANUAL.txt:
+
+    + Add beamer info for slide backgrounds (#4802, John Muccigrosso).
+    + Clarify when `csquotes` is used in LaTeX writer (#4514).
+    + Add `commonmark` to list of output formats where `raw_tex` has an
+      effect (see #4527).
+
+
 pandoc (2.2.2.1)
 
   * Fix regression finding templates in user data directory (#4777).
diff --git a/man/pandoc.1 b/man/pandoc.1
index 8034512c3..51cc168b2 100644
--- a/man/pandoc.1
+++ b/man/pandoc.1
@@ -1,5 +1,5 @@
 .\"t
-.TH PANDOC 1 "July 19, 2018" "pandoc 2.2.2.1"
+.TH PANDOC 1 "August 5, 2018" "pandoc 2.2.3"
 .SH NAME
 pandoc - general markup converter
 .SH SYNOPSIS
@@ -187,8 +187,9 @@ requires \f[C]fontspec\f[].
 If the \f[C]mathspec\f[] variable is set, \f[C]xelatex\f[] will use
 \f[C]mathspec\f[] instead of \f[C]unicode\-math\f[].
 The \f[C]upquote\f[] and \f[C]microtype\f[] packages are used if
-available, and \f[C]csquotes\f[] will be used for typography if added to
-the template or included in any header file.
+available, and \f[C]csquotes\f[] will be used for typography if
+\f[C]\\usepackage{csquotes}\f[] is present in the template or included
+via \f[C]/H/\-\-include\-in\-header\f[].
 The \f[C]natbib\f[], \f[C]biblatex\f[], \f[C]bibtex\f[], and
 \f[C]biber\f[] packages can optionally be used for citation rendering.
 .SS Reading from the Web
@@ -2364,7 +2365,7 @@ addition to \f[C]markdown\f[]):
 .RE
 .TP
 .B output formats
-\f[C]textile\f[]
+\f[C]textile\f[], \f[C]commonmark\f[]
 .RS
 .RE
 .SS Extension: \f[C]native_divs\f[]
@@ -5562,32 +5563,38 @@ User\[aq]s Guide may also be used: \f[C]allowdisplaybreaks\f[],
 \f[C]allowframebreaks\f[], \f[C]b\f[], \f[C]c\f[], \f[C]t\f[],
 \f[C]environment\f[], \f[C]label\f[], \f[C]plain\f[], \f[C]shrink\f[],
 \f[C]standout\f[], \f[C]noframenumbering\f[].
-.SS Background in reveal.js
+.SS Background in reveal.js and beamer
+.PP
+Background images can be added to self\-contained reveal.js slideshows
+and to beamer slideshows.
 .PP
-Background images can be added to self\-contained reveal.js slideshows.
+For the same image on every slide, use the configuration option
+\f[C]background\-image\f[] either in the YAML metadata block or as a
+command\-line variable.
+(There are no other options in beamer and the rest of this section
+concerns reveal.js slideshows.)
 .PP
-For the same image on every slide, use the reveal.js configuration
-option \f[C]parallaxBackgroundImage\f[] either in the YAML metadata
-block or as a command\-line variable.
+For reveal.js, you can instead use the reveal.js\-native option
+\f[C]parallaxBackgroundImage\f[].
 You can also set \f[C]parallaxBackgroundHorizontal\f[] and
 \f[C]parallaxBackgroundVertical\f[] the same way and must also set
 \f[C]parallaxBackgroundSize\f[] to have your values take effect.
 .PP
-To set an image for a particular slide, add
+To set an image for a particular reveal.js slide, add
 \f[C]{data\-background\-image="/path/to/image"}\f[] to the first
 slide\-level header on the slide (which may even be empty).
 .PP
 In reveal.js\[aq]s overview mode, the parallaxBackgroundImage will show
 up only on the first slide.
 .PP
-Other background settings also work on individual slides, including
-\f[C]data\-background\-size\f[], \f[C]data\-background\-repeat\f[],
-\f[C]data\-background\-color\f[], \f[C]data\-transition\f[], and
-\f[C]data\-transition\-speed\f[].
+Other reveal.js background settings also work on individual slides,
+including \f[C]data\-background\-size\f[],
+\f[C]data\-background\-repeat\f[], \f[C]data\-background\-color\f[],
+\f[C]data\-transition\f[], and \f[C]data\-transition\-speed\f[].
 .PP
 See the reveal.js documentation for more details.
 .PP
-For example:
+For example in reveal.js:
 .IP
 .nf
 \f[C]
diff --git a/pandoc.cabal b/pandoc.cabal
index 355670312..92f2fb2ca 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -1,5 +1,5 @@
 name:            pandoc
-version:         2.2.2.1
+version:         2.2.3
 cabal-version:   2.0
 build-type:      Custom
 license:         GPL-2
-- 
cgit v1.2.3


From 030e8969c766446f498a478c142c200946b63089 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Mon, 6 Aug 2018 21:37:15 -0700
Subject: Bump to 2.2.3.1, update man page and changelog.

---
 MANUAL.txt   | 2 +-
 changelog    | 6 ++++++
 man/pandoc.1 | 2 +-
 pandoc.cabal | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'changelog')

diff --git a/MANUAL.txt b/MANUAL.txt
index acbf62e1f..739859071 100644
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -1,6 +1,6 @@
 % Pandoc User's Guide
 % John MacFarlane
-% August 5, 2018
+% August 6, 2018
 
 Synopsis
 ========
diff --git a/changelog b/changelog
index e3b3085ac..755150d77 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+pandoc (2.2.3.1)
+
+  * Markdown reader: Fix parsing of embedded mappings in YAML metadata
+    (#4817).  This fixes a regression in 2.2.3 which caused embedded
+    mappings (e.g. mappings in sequences) not to work in YAML metadata.
+
 pandoc (2.2.3)
 
   * RST reader: improve parsing of inline interpreted text roles (#4811).
diff --git a/man/pandoc.1 b/man/pandoc.1
index 51cc168b2..97d51cea4 100644
--- a/man/pandoc.1
+++ b/man/pandoc.1
@@ -1,5 +1,5 @@
 .\"t
-.TH PANDOC 1 "August 5, 2018" "pandoc 2.2.3"
+.TH PANDOC 1 "August 6, 2018" "pandoc 2.2.3.1"
 .SH NAME
 pandoc - general markup converter
 .SH SYNOPSIS
diff --git a/pandoc.cabal b/pandoc.cabal
index 92f2fb2ca..d8d78cf3c 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -1,5 +1,5 @@
 name:            pandoc
-version:         2.2.3
+version:         2.2.3.1
 cabal-version:   2.0
 build-type:      Custom
 license:         GPL-2
-- 
cgit v1.2.3


From 672804922542cc3d3a1719a2b4064ba91fccc6c8 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Tue, 7 Aug 2018 09:30:34 -0700
Subject: Bump to 2.2.3.2, update man page, changelog.

---
 MANUAL.txt   |  2 +-
 changelog    | 10 ++++++++++
 man/pandoc.1 |  2 +-
 pandoc.cabal |  2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'changelog')

diff --git a/MANUAL.txt b/MANUAL.txt
index 739859071..b0c89b795 100644
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -1,6 +1,6 @@
 % Pandoc User's Guide
 % John MacFarlane
-% August 6, 2018
+% August 7, 2018
 
 Synopsis
 ========
diff --git a/changelog b/changelog
index 755150d77..aee13a76b 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,13 @@
+pandoc (2.2.3.2)
+
+  * Markdown reader: Properly handle boolean values in YAML metadata (#4819).
+    This fixes a regression in 2.2.3, which cause boolean values to
+    be parsed as MetaInlines instead of MetaBool.
+
+    We here record another undocumented (but desirable) change in 2.2.3:
+    numerical metadata fields are now parsed as MetaInlines rather than
+    MetaString.
+
 pandoc (2.2.3.1)
 
   * Markdown reader: Fix parsing of embedded mappings in YAML metadata
diff --git a/man/pandoc.1 b/man/pandoc.1
index 97d51cea4..910f80825 100644
--- a/man/pandoc.1
+++ b/man/pandoc.1
@@ -1,5 +1,5 @@
 .\"t
-.TH PANDOC 1 "August 6, 2018" "pandoc 2.2.3.1"
+.TH PANDOC 1 "August 7, 2018" "pandoc 2.2.3.2"
 .SH NAME
 pandoc - general markup converter
 .SH SYNOPSIS
diff --git a/pandoc.cabal b/pandoc.cabal
index d8d78cf3c..08289adf1 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -1,5 +1,5 @@
 name:            pandoc
-version:         2.2.3.1
+version:         2.2.3.2
 cabal-version:   2.0
 build-type:      Custom
 license:         GPL-2
-- 
cgit v1.2.3


From 7d0bcbb1f059d435a20b7f3fd36257d86578fffc Mon Sep 17 00:00:00 2001
From: Alexander Krotov <ilabdsf@gmail.com>
Date: Mon, 3 Sep 2018 19:35:39 +0300
Subject: Fix "new new" typo in changelog

---
 changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'changelog')

diff --git a/changelog b/changelog
index aee13a76b..1b550d56d 100644
--- a/changelog
+++ b/changelog
@@ -7304,7 +7304,7 @@ pandoc (1.13.2.1)
 
 pandoc (1.13.2)
 
-  * TWiki Reader: add new new twiki reader (API change, Alexander Sulfrian).
+  * TWiki Reader: add new twiki reader (API change, Alexander Sulfrian).
 
   * Markdown reader:
 
-- 
cgit v1.2.3


From d2e32f257e7c2e07023d154f907387d140af3f40 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 16 Sep 2018 11:17:23 -0700
Subject: Update changelog, AUTHORS.md.

---
 AUTHORS.md |   3 +
 changelog  | 234 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 237 insertions(+)

(limited to 'changelog')

diff --git a/AUTHORS.md b/AUTHORS.md
index 3b6b8da55..99cba1c2d 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -15,6 +15,7 @@
 - Andreas Lööw
 - Andrew Dunning
 - Antoine Latter
+- Antonio Terceiro
 - Arata Mizuki
 - Arlo O'Keeffe
 - Artyom Kazak
@@ -75,6 +76,7 @@
 - Igor Khorlo
 - Ilya V. Portnov
 - Ivo Clarysse
+- J. B. Rainsberger
 - J. Lewis Muir
 - Jaime Marquínez Ferrándiz
 - Jakob Voß
@@ -96,6 +98,7 @@
 - Jonas Smedegaard
 - Jonathan Daugherty
 - Jose Luis Duran
+- José de Mattos Neto
 - Josef Svenningsson
 - Julien Cretel
 - Juliusz Gonera
diff --git a/changelog b/changelog
index 1b550d56d..5ef674b65 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,237 @@
+pandoc (2.3)
+
+  * Add `--metadata-file` option (Mauro Bieg, #1960), which allows
+    users to specify metadata in a YAML file, regardless of the
+    input format (#1960).
+
+  * Text.Pandoc.Writers.Shared: export `isDisplayMath` (API change).
+
+  * Text.Pandoc.Readers.Markdown: export `yamlToMeta` (API change,
+    Mauro Bieg).
+
+  * Text.Pandoc.Readers.LaTeX.Types:
+
+    + New type `ArgSpec` (API change).
+    + Second parameter of `Macro` constructor is now `[ArgSpec]` instead of
+      `Int` (API change).
+
+  * Markdown reader:
+
+    + Use `tex` instead of `latex` for raw tex-ish content. We can't
+      always tell if it's LaTeX, ConTeXt, or plain TeX. Better just to
+      use `tex` always. Note that if `context` or `latex` specifically
+      is desired, you can still force that in a markdown document by
+      using the raw attribute. Note that this change may affect some
+      filters, if they assume that raw tex parsed by the Markdown reader
+      will be RawBlock (Format `latex`). In most cases it should be
+      trivial to modify the filters to accept `tex` as well.
+    + Refactor and reorganize YAML code (Mauro Bieg).
+
+  * HTML reader:
+
+    + Parse `<script type="math/tex` tags as math (#4877).
+      These are used by MathJax in some configurations.
+    + Extract spaces inside links instead of trimming them
+      (Alexander Krotov, #4845).
+    + Added round-trip tests (Alexander Krotov).
+    + Make parsing sensitive to the `raw_tex` extension (#1126). This now
+      allows raw LaTeX environments, `\ref`, and `\eqref` to be parsed
+      (which is helpful for translation HTML documents using MathJaX).
+
+  * Org reader (Albert Krewinkel):
+
+    + Respect export option `p` for planning info.  Inclusion of planning info
+      (`*DEADLINE*`, `*SCHEDULED*`, and `*CLOSED*`) can be controlled via the
+      `p` export option: setting the option to `t` will add all planning
+      information in a *Plain* block below the respective headline.
+    + Org reader internals: don't rely on RecordWildCards and ViewPatterns
+      ghc extensions.
+    + Strip planning info from output.  Planning info is parsed, but not
+      included in the output (as is the default with Emacs Org-mode, #4867).
+
+  * LaTeX reader:
+
+    + Handle parameter patterns for `\def` (#4768, #4771).
+      For example:  `\def\foo#1[#2]{#1 and #2}`.
+    + Allow `%` characters in URLs. This affects `\href` and `\url` (#4832).
+    + Fixed parsing of `\texorpdfstring`. We were returning the wrong
+      argument as the content.
+    + Support `blockcquote`, `foreignblockquote`, `foreigncblockquote`,
+      `hyphenblockquote`, `hyphencblockquote`, `enquote*`, `foreignquote`,
+      `hyphenquote` from `csquotes` (#4848). Note that `foreignquote`
+      will be parsed as a regular Quoted inline (not using the quotes
+      appropriate to the foreign language).
+    + Support more text-mode accents (#4652). Add support for `\|`, `\b`, `\G`,
+      `\h`, `\d`, `\f`, `\r`, `\t`, `\U`, `\i`, `\j`, `\newtie`,
+      `\textcircled`. Also fall back to combining characters when composed
+      characters are not available.
+    + Resolve `\ref` for figure numbers.
+    + Support `mintinline` (#4365, Marc Schreiber).
+    + Fix siunitx unit commands so they are only recognized in
+      siunitx contexts (#4842). For example, `\l` outside of an
+      siunitx context should be l-slash, not l (for liter).
+    + Fix double `unnumbered` class (#4838). The `unnumbered` class
+      was being included twice for starred sections.
+
+  * RST reader: Don't skip link definitions after comments (#4860).
+
+  * Muse reader (Alexander Krotov):
+
+    + Close the `</quote>` in indented tag test.
+      There is already a separate test for unclosed `</quote>`.
+    + Autonumber sections in the correct order.  Parsing now stops
+      at each section header to ensure the header is registered before
+      parsing of the next section starts.
+    + Move duplicate code into `headingStart` function.
+    + Allow newline after opening `*` or `**`.
+    + Don't allow digits after closing marker in lightweight markup
+      This change makes reader more compatible with Emacs Muse.
+    + Parse `<verse>` tag in one pass instead of using
+      `parseFromString`. This change makes it possible to have
+      verbatim `</verse>` tag inside verse.
+
+  * ODT reader:  deal gracefully with missing `<office:font-face-decls/>`
+    (#4336). This allows pandoc to parse ODT document produced by KDE's
+    Calligra.
+
+  * Muse writer (Alexander Krotov):
+
+    + Output headers without asterisks if not on the top level.
+    + Never wrap definition list terms.
+    + Set `envInsideBlock = True` when rendering notes.
+    + Use `""` instead of `[]` for empty String.
+    + Check for whitespace in the beginning and end of Str's.
+    + Escape `-`, `;` and `>` in the beginning of strings.
+    + Escape list markers in the beginning of notes.
+    + Normalize inline list before testing if tags should be used.
+    + Use tags instead of lightweight markup for empty strings.
+    + Use lightweight markup when possible.
+    + Escape empty strings.  This guarantees that `conditionalEscapeString`
+      never returns empty string.
+    + Wrap conditionalEscapeString result into `Muse` type.
+      This removes the need to pass `envInsideLinkDescription` to it.
+    + Separate `shouldEscapeString` function.
+    + Simplify inline list rendering.
+    + Replace newlines in strings with spaces.
+
+  * Docx writer:
+
+    + Add MetaString case for abstract, subtitle (#4900, Mauro Bieg).
+    + Properly handle display math in spans (#4826). This isn't a
+      complete solution, since other nestings of display math may still
+      cause problems, but it should work for what is by far the most
+      common case.
+
+  * HTML writer:
+
+    + Always output `<dt>` element, even if it is empty (#4883,
+      Alexander Krotov).
+    + Don't prefix `epub:` attributes with `data-`.
+
+  * Org writer: Don't escape literal `_`, `^` (#4882). Org doesn't
+    recognize these escapes.
+
+  * ODT writer: Fix percentage image scaling (#4881, Nils Carlson).
+    Image scaling was broken when a width was set to a percentage.
+
+  * EPUB writer: set `epub:type` on body element in each chapter,
+    depending on the `epub:type` of the first section (#4823). This
+    only affects epub3. See
+    http://www.idpf.org/epub/profiles/edu/structure/#h.l0bzsloklt10
+
+  * FB2 writer: put `coverpage` element between title and date rather than in
+    `document-info` element (#4854).
+
+  * Markdown writer: Escape `~` if strikeout extension enabled (#4840).
+
+  * Haddock writer: Use proper format for latex math in haddock (#4571, Joe
+    Hermaszewski). Inline math in `\(..\)`, display math in `\[..\]`,
+    tex is now used. Previously we'd "fake it with unicode" and fall
+    back to tex when that didn't work. But newer haddock versions
+    support latex math.
+
+  * TEI writer:
+
+    + Ensure that title element is always present, even if empty (#4839).
+    + Put author tags in the template, rather than adding them in
+      the writer (#4839).
+
+  * LaTeX writer/template: be sensitive to `filecolor` variable (#4822).
+    `linkcolor` only affects internal links, and `urlcolor` only
+    affects linked URLs.  For external links, the option to use is
+    `filecolor`.
+
+  * ConTeXt writer: output raw `tex` blocks as well as `context` (#969).
+
+  * RST writer:
+
+    + Use `.. raw:: latex` for `tex` content.
+    + Use `.. container` for generic Divs, instead of raw HTML.
+    + Render Divs with admonition classes as admonitions (#4833).
+      Also omit Div with class `admonition-title`. These are generated
+      by the RST reader and should be omitted on round-trip.
+
+  * Text.Pandoc.PDF: fix message printed when rsvg-convert is not available
+    (#4855, Antonio Terceiro).
+
+  * HTML5 template: add the `title-block-header` identifier to the
+    `header` element, to make it easier to style precisely (#4767,
+    J. B. Rainsberger).
+
+  * OpenDocument template: Remove unnecessary indenting of TOC title (#4798,
+    José de Mattos Neto).
+
+  * latex template: Add support for $toc-title$ to LaTeX (and PDF)
+    (#4853, Wandmalfarbe).
+
+  * TEI template: improve `publicationStmt`. Add support for
+    `publisher`, `address`, `pubPlace`, and `date` variables.
+
+  * beamer template: Support "toc-title" (#4835, Cyril Roelandt).
+
+  * Text.Pandoc.Extensions: Fix haddock on `Ext_footnotes` (Chris Martin).
+
+  * Lua: cleanup Lua utils, remove unused functions (Albert Krewinkel).
+
+  * MANUAL.txt:
+
+    + Clarify that `--biblatex/--natbib` don't work directly for PDF
+      (#4904).
+    + Document `epub:type` attribute (Mauro Bieg, #4901)
+    + Clarify when `--resource-path` has an effect.
+    + More detail on customization in syntax highlighting section.
+    + Document encoding issue with `--listings` (#4871, Damien Clochard).
+    + Remove docs on removed `--katex-stylesheet` (Mauro Bieg, #4862).
+
+  * CONTRIBUTING.md:
+
+    + Link to lua-filters repository (#4874).
+    + Fix mistake in REPL instructions for stack. (#4849, Brian Leung).
+
+  * lua-filters.md: add links to filters, and to lua-filters repository
+    (#4874).
+
+  * INSTALL.md:
+
+    + Indicate that cabal >= 2.0 is needed.
+    + Added chocolatey installation method (#4844, Miodrag Milić).
+
+  * Travis: exclude round-trip tests, except for nightly test which can fail.
+
+  * Use latest texmath, pandoc-citeproc.
+
+  * Use a patched version of foundation until
+    https://github.com/haskell-foundation/foundation/pull/503
+    is fixed.
+
+  * Clean up appveyor build and Windows package creation.
+    We now use 64-bit stack and ghc 8.4.3, lts-12 for the 64-bit build. The
+    WiX-based msi is now 64-bit for 64-bit builds (fixing #4795).
+
+  * Remove obsolete RELEASE-CHECKLIST.md.
+
+  * Added additional compiler warnings in Makefile and CI builds.
+
 pandoc (2.2.3.2)
 
   * Markdown reader: Properly handle boolean values in YAML metadata (#4819).
-- 
cgit v1.2.3


From b694cdd9a673642ee957d317dc8849a2e81f6537 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 16 Sep 2018 20:43:25 -0700
Subject: Update changelog.

---
 changelog | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'changelog')

diff --git a/changelog b/changelog
index 5ef674b65..1c3498945 100644
--- a/changelog
+++ b/changelog
@@ -26,6 +26,8 @@ pandoc (2.3)
       will be RawBlock (Format `latex`). In most cases it should be
       trivial to modify the filters to accept `tex` as well.
     + Refactor and reorganize YAML code (Mauro Bieg).
+    + Make `example_lists` work for interrupted lists
+      without `startnum` (#4908).
 
   * HTML reader:
 
@@ -202,6 +204,7 @@ pandoc (2.3)
     + More detail on customization in syntax highlighting section.
     + Document encoding issue with `--listings` (#4871, Damien Clochard).
     + Remove docs on removed `--katex-stylesheet` (Mauro Bieg, #4862).
+    + Use https for context wiki links (#4910).
 
   * CONTRIBUTING.md:
 
-- 
cgit v1.2.3


From 5baea569c71536a973aa95c124a28a9eb6bb5a4a Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sat, 22 Sep 2018 16:24:31 -0700
Subject: Update changelog.

---
 changelog | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

(limited to 'changelog')

diff --git a/changelog b/changelog
index 1c3498945..e4574137f 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,53 @@
+pandoc (X.Y.Z)
+
+  * RST reader:
+
+    + Parse RST inlines containing newlines (#4912, Francesco Occhipinti).
+      This eliminates a regression introduced after pandoc 2.1.1, which
+      caused inline constructions containing newlines not to be recognized.
+    + Fix bug with internal link targets (#4919).  They were gobbling up
+      indented content underneath.
+
+  * Markdown reader: distinguish autolinks in the AST.  With this change,
+    autolinks are parsed as Links with the `uri` class. (The same is true
+    for bare links, if the `autolink_bare_uris` extension is enabled.)
+    Email autolinks are parsed as Links with the `email` class.  This
+    allows the distinction to be represented in the AST.
+
+  * Muse reader (Alexander Krotov):
+
+    + Added additional tests.
+    + Simplify tag parsers.
+    + Do not allow code markup to be followed by digit.
+    + Simplify ordered list parsing.
+    + Remove heading level limit.
+    + Simplify `<literal>` tag parsers
+    + Cleanup and convert to applicative style.
+    + Simplify `lchop`.
+    + Parse Text instead of String. Benchmark shows 7% improvement.
+    + Get rid of HTML parser dependency.
+
+  * ConTeXt writer: change `\` to `/` in Windows image paths (#4918).
+    We do this in the LaTeX writer, and it avoids problems.
+    Note that `/` works as a LaTeX path separator on Windows.
+
+  * HTML writer: don't add `uri` class to presumed autolinks.
+    Formerly the `uri` class was added to autolinks by
+    the HTML writer, but it had to guess what was an autolink
+    and could not distinguish `[http://example.com](http://example.com)`
+    from `<http://example.com>`.  It also incorrectly recognized
+    `[pandoc](pandoc)` as an autolink.  Now the HTML writer
+    simply passes through the `uri` attribute if it is present,
+    but does not add anything.
+
+  * Textile writer: don't represent `uri` class explicitly
+    for autolinks (#4913).
+
+  * Lua filters (Albert Krewinkel):
+
+    + Cleanup filter execution code.
+    + Better error on test failure.
+
 pandoc (2.3)
 
   * Add `--metadata-file` option (Mauro Bieg, #1960), which allows
-- 
cgit v1.2.3


From e6e1176da38bd0405a1974e616e48fa9f7529394 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Thu, 27 Sep 2018 22:23:12 -0700
Subject: Update changelog, AUTHORS.md.

---
 AUTHORS.md |  4 ++++
 changelog  | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 69 insertions(+), 12 deletions(-)

(limited to 'changelog')

diff --git a/AUTHORS.md b/AUTHORS.md
index 99cba1c2d..9c319d0bb 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -28,6 +28,7 @@
 - Bjorn Buckwalter
 - Bradley Kuhn
 - Brent Yorgey
+- Brian Leung
 - Bryan O'Sullivan
 - Caleb McDaniel
 - Calvin Beck
@@ -75,6 +76,7 @@
 - Hubert Plociniczak
 - Igor Khorlo
 - Ilya V. Portnov
+- Ivan Trubach
 - Ivo Clarysse
 - J. B. Rainsberger
 - J. Lewis Muir
@@ -96,6 +98,7 @@
 - John Muccigrosso
 - John Luke Bentley
 - Jonas Smedegaard
+- Jonas Scholl
 - Jonathan Daugherty
 - Jose Luis Duran
 - José de Mattos Neto
@@ -138,6 +141,7 @@
 - Nick Bart
 - Nicolas Kaiser
 - Nikolay Yakimov
+- Nils Carlson
 - Nokome Bentley
 - Oliver Matthews
 - Ophir Lifshitz
diff --git a/changelog b/changelog
index e4574137f..faf997d0d 100644
--- a/changelog
+++ b/changelog
@@ -14,31 +14,70 @@ pandoc (X.Y.Z)
     Email autolinks are parsed as Links with the `email` class.  This
     allows the distinction to be represented in the AST.
 
+  * Org reader: force inline code blocks to honor export options
+    (Brian Leung).
+
   * Muse reader (Alexander Krotov):
 
     + Added additional tests.
-    + Simplify tag parsers.
     + Do not allow code markup to be followed by digit.
-    + Simplify ordered list parsing.
     + Remove heading level limit.
     + Simplify `<literal>` tag parsers
-    + Cleanup and convert to applicative style.
-    + Simplify `lchop`.
     + Parse Text instead of String. Benchmark shows 7% improvement.
     + Get rid of HTML parser dependency.
+    + Various code improvements.
 
   * ConTeXt writer: change `\` to `/` in Windows image paths (#4918).
     We do this in the LaTeX writer, and it avoids problems.
     Note that `/` works as a LaTeX path separator on Windows.
 
-  * HTML writer: don't add `uri` class to presumed autolinks.
-    Formerly the `uri` class was added to autolinks by
-    the HTML writer, but it had to guess what was an autolink
-    and could not distinguish `[http://example.com](http://example.com)`
-    from `<http://example.com>`.  It also incorrectly recognized
-    `[pandoc](pandoc)` as an autolink.  Now the HTML writer
-    simply passes through the `uri` attribute if it is present,
-    but does not add anything.
+  * LaTeX writer:
+
+    + Add support for multiprenote and multipostnote arguments
+      with `--biblatex` (Brian Leung, #4930).  The multiprenotes occur before
+      the first prefix of a multicite, and the multipostnotes follow the
+      last suffix.
+    + Fix a use of `last` that might take empty list.  If you ran with
+      `--biblatex` and have an empty document (metadata but no blocks),
+      pandoc would previously raise an error because of the use of
+      `last` on an empty list.
+
+  * RTF writer: Fix build failure with ghc-8.6.1 caused by missing
+    MonadFail instance (Jonas Scholl).
+
+  * ODT Writer: Improve table header row style handling (Nils Carlson).
+    This changes the way styles for cells in the header row
+    and normal rows are handled in ODT tables.
+    Previously a new (but identical) style was generated for
+    every table, specifying the style of the cells within the table.
+    After this change there are two style definitions for table cells,
+    one for the cells in the header row, one for all other cells.
+    This doesn't change the actual styles, but makes post-processing
+    changes to the table styles much simpler as it is no longer
+    necessary to introduce new styles for header rows and there are
+    now only two styles where there was previously one per table.
+
+  * HTML writer:
+
+    + Don't add `uri` class to presumed autolinks.  Formerly the `uri`
+      class was added to autolinks by the HTML writer, but it had to
+      guess what was an autolink and could not distinguish
+      `[http://example.com](http://example.com)` from
+      `<http://example.com>`.  It also incorrectly recognized
+      `[pandoc](pandoc)` as an autolink.  Now the HTML writer
+      simply passes through the `uri` attribute if it is present,
+      but does not add anything.
+    + Avoid adding extra section nestings for revealjs.
+      Previously revealjs title slides at level (slidelevel - 1)
+      were nested under an extra section element, even when
+      the section contained no additional (vertical) content.
+      That caused problems for some transition effects.
+    + Omit unknown attributes in EPUB2 output.  For example,
+      `epub:type` attributes should not be passed through,
+      or the epub produced will not validate.
+
+  * JATS writer: remove 'role' attribute on 'bold' and 'sc' elements (#4937).
+    The JATS spec does not allow these.
 
   * Textile writer: don't represent `uri` class explicitly
     for autolinks (#4913).
@@ -48,6 +87,20 @@ pandoc (X.Y.Z)
     + Cleanup filter execution code.
     + Better error on test failure.
 
+  * HTML, Muse reader tests: reduce time taken by round-trip test.
+
+  * Added cabal.project.
+
+  * MANUAL: `epub:type` is only useful for epub3 (Maura Bieg).
+
+  * Use hslua v1.0.0 (Albert Krewinkel).
+
+  * Fix `translations/ru` to use modern Russian orthography
+    (Ivan Trubach).
+
+  * Build Windows binary using ghc 8.6.1 and cabal new-build. This
+    fixes issues with segfaults in the 32-bit Windows binaries (#4283).
+
 pandoc (2.3)
 
   * Add `--metadata-file` option (Mauro Bieg, #1960), which allows
-- 
cgit v1.2.3


From c07b9aebc2bc7e95da7a6feab26ce14e2e5f4a0e Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Thu, 27 Sep 2018 23:09:06 -0700
Subject: Version to 2.3.1.

---
 MANUAL.txt   | 2 +-
 changelog    | 2 +-
 man/pandoc.1 | 6 +++---
 pandoc.cabal | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'changelog')

diff --git a/MANUAL.txt b/MANUAL.txt
index c390fef07..351929e92 100644
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -1,6 +1,6 @@
 % Pandoc User's Guide
 % John MacFarlane
-% September 16, 2018
+% September 27, 2018
 
 Synopsis
 ========
diff --git a/changelog b/changelog
index faf997d0d..f436ceb80 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-pandoc (X.Y.Z)
+pandoc (2.3.1)
 
   * RST reader:
 
diff --git a/man/pandoc.1 b/man/pandoc.1
index 5ba57f79f..00cdfdc00 100644
--- a/man/pandoc.1
+++ b/man/pandoc.1
@@ -1,5 +1,5 @@
 .\"t
-.TH PANDOC 1 "September 16, 2018" "pandoc 2.3"
+.TH PANDOC 1 "September 27, 2018" "pandoc 2.3.1"
 .SH NAME
 pandoc - general markup converter
 .SH SYNOPSIS
@@ -5786,8 +5786,8 @@ iBooks\-specific metadata, with the following fields:
 .RE
 .SS The \f[C]epub:type\f[] attribute
 .PP
-You can mark up the header that corresponds to an EPUB chapter using the
-\f[C]epub:type\f[] attribute.
+For \f[C]epub3\f[] output, you can mark up the header that corresponds
+to an EPUB chapter using the \f[C]epub:type\f[] attribute.
 For example, to set the attribute to the value \f[C]prologue\f[], use
 this markdown:
 .IP
diff --git a/pandoc.cabal b/pandoc.cabal
index 1c27e0b97..6edbc8ba0 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -1,5 +1,5 @@
 name:            pandoc
-version:         2.3
+version:         2.3.1
 cabal-version:   2.0
 build-type:      Custom
 license:         GPL-2
-- 
cgit v1.2.3


From c292a0bae3167570511543d3d96a0385b9b5f2d8 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Fri, 28 Sep 2018 10:40:17 -0700
Subject: Update changelog.

---
 changelog | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'changelog')

diff --git a/changelog b/changelog
index f436ceb80..e01a19158 100644
--- a/changelog
+++ b/changelog
@@ -14,8 +14,10 @@ pandoc (2.3.1)
     Email autolinks are parsed as Links with the `email` class.  This
     allows the distinction to be represented in the AST.
 
-  * Org reader: force inline code blocks to honor export options
-    (Brian Leung).
+  * Org reader:
+
+    + Force inline code blocks to honor export options (Brian Leung).
+    + Parse empty argument array in inline src blocks (Brian Leung).
 
   * Muse reader (Alexander Krotov):
 
@@ -156,6 +158,9 @@ pandoc (2.3)
 
   * LaTeX reader:
 
+    + Split some general-purpose definitions into a separate, unexported
+      module, Text.Pandoc.Readers.LaTeX.Parsing.  This is to avoid
+      out-of-memory errors compiling the LaTeX reader.
     + Handle parameter patterns for `\def` (#4768, #4771).
       For example:  `\def\foo#1[#2]{#1 and #2}`.
     + Allow `%` characters in URLs. This affects `\href` and `\url` (#4832).
-- 
cgit v1.2.3