Merge branch 'master' into text

2 files changed, 9 insertions, 9 deletions

diff --git a/changelog.md b/changelog.md
index 7d414b69d..abca5320c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1207,7 +1207,7 @@
     + Properly escape attributes in Markdown writer (#5369).
     + Be sure implicit figures work in list contexts (#5368).
       Previously they would sometimes not work: e.g., when they
-      occured in final paragraphs in lists that were originally
+      occurred in final paragraphs in lists that were originally
       parsed as Plain and converted later using PlainToPara.
 
   * Docx writer: Use `w:br` without attributes for line breaks (#5377).
@@ -6304,7 +6304,7 @@
       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.
@@ -6411,7 +6411,7 @@
 
     + 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
@@ -11893,7 +11893,7 @@
     + 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.
 
@@ -12187,7 +12187,7 @@
     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.
@@ -12241,7 +12241,7 @@
   * A new generic block container (`Div`) has been added to `Block`,
     and a generic inline container (`Span`) has been added to `Inline`.
     These can take attributes.  They will render in HTML, Textile,
-    MediaWiki, Org, RST and and Markdown (with `markdown_in_html`
+    MediaWiki, Org, RST and Markdown (with `markdown_in_html`
     extension) as HTML `<div>` and `<span>` elements; in other formats
     they will simply pass through their contents.  But they can be
     targeted by scripts.
@@ -13238,7 +13238,7 @@
 ### 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`:
@@ -13475,7 +13475,7 @@
       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:
diff --git a/src/Text/Pandoc/Parsing.hs b/src/Text/Pandoc/Parsing.hs
index 9ea6335f8..f56b13b66 100644
--- a/src/Text/Pandoc/Parsing.hs
+++ b/src/Text/Pandoc/Parsing.hs
@@ -1326,7 +1326,7 @@ type SubstTable = M.Map Key Inlines
 
 --  | Add header to the list of headers in state, together
 --  with its associated identifier.  If the identifier is null
---  and the auto_identifers extension is set, generate a new
+--  and the auto_identifiers extension is set, generate a new
 --  unique identifier, and update the list of identifiers
 --  in state.  Issue a warning if an explicit identifier
 --  is encountered that duplicates an earlier identifier