Merge commit 'a6e635ca7d905d9ec3ffd708db2694f680b03aae'

docs/content/en/getting-started/configuration-markup.md

@@ -84,25 +84,45 @@ typographer|[Goldmark Extensions: Typographer]|:heavy_check_mark:
 [PHP Markdown Extra: Definition lists]: https://michelf.ca/projects/php-markdown/extra/#def-list
 [PHP Markdown Extra: Footnotes]: https://michelf.ca/projects/php-markdown/extra/#footnotes
 
-#### Extras extension
+#### Extras
 
 {{< new-in 0.126.0 >}}
 
-Configure the extras extension to enable [inserted text], [mark text], [subscript], and [superscript] elements in Markdown.
+Enable [deleted text], [inserted text], [mark text], [subscript], and [superscript] elements in Markdown.
 
 Element|Markdown|Rendered
 :--|:--|:--
-Inserted text|`++foo++`|`<ins>foo</ins>`
-Mark text|`==bar==`|`<mark>bar</mark>`
+Deleted text|`~~foo~~`|`<del>foo</del>`
+Inserted text|`++bar++`|`<ins>bar</ins>`
+Mark text|`==baz==`|`<mark>baz</mark>`
 Subscript|`H~2~O`|`H<sub>2</sub>O`
 Superscript|`1^st^`|`1<sup>st</sup>`
 
+[deleted text]: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/del
 [inserted text]: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/ins
 [mark text]: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/mark
 [subscript]: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/sub
 [superscript]: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/sup
 
-#### Passthrough extension
+To avoid a conflict when enabling the Hugo Goldmark Extras subscript extension, if you want to render subscript and strikethrough text concurrently you must:
+
+1. Disable the Goldmark strikethrough extension
+2. Enable the Hugo Goldmark Extras delete extension
+
+For example:
+
+{{< code-toggle file=hugo >}}
+[markup.goldmark.extensions]
+strikethrough = false
+
+[markup.goldmark.extensions.extras.delete]
+enable = true
+
+[markup.goldmark.extensions.extras.subscript]
+enable = true
+{{< /code-toggle >}}
+
+#### Passthrough
 
 {{< new-in 0.122.0 >}}
 
@@ -110,7 +130,7 @@ Enable the passthrough extension to include mathematical equations and expressio
 
 [mathematics in Markdown]: content-management/mathematics/
 
-#### Typographer extension
+#### Typographer
 
 The Typographer extension replaces certain character combinations with HTML entities as specified below:
 

docs/content/en/getting-started/configuration.md

@@ -378,13 +378,9 @@ Module configuration see [module configuration](/hugo-modules/configuration/).
 
 See [custom output formats].
 
-###### paginate
+###### pagination
 
-(`int`) Default number of elements per page in [pagination](/templates/pagination/). Default is `10`.
-
-###### paginatePath
-
-(`string`) The path element used during pagination (`https://example.org/page/2`). Default is `page`.
+See [configure pagination](/templates/pagination/#configuration).
 
 ###### permalinks
 
@@ -442,7 +438,7 @@ See [Segments](#configure-segments).
 
 ###### sitemap
 
-Default [sitemap configuration](/templates/sitemap-template/#configuration).
+Default [sitemap configuration](/templates/sitemap/#configuration).
 
 ###### summaryLength
 
@@ -962,4 +958,3 @@ Some use cases for this feature:
 [kind]: /getting-started/glossary/#page-kind
 [output format]: /getting-started/glossary/#output-format
 [type]: /getting-started/glossary/#content-type
-

docs/content/en/getting-started/glossary.md

@@ -104,7 +104,7 @@ A classification of content inferred from the top-level directory name or the `t
 
 ###### content view
 
-A template called with the `.Page.Render` method. See [details](/templates/views/).
+A template called with the `.Page.Render` method. See [details](/templates/content-view/).
 
 ###### context
 
@@ -132,7 +132,6 @@ To determine the current environment within a template, use the [`hugo.Environme
 
 A predefined key-value pair in front matter such as `date` or `title`. See also [parameter](#parameter).
 
-
 ###### flag
 
 An option passed to a command-line program, beginning with one or two hyphens. See [details](/commands/hugo/).
@@ -212,6 +211,10 @@ A directory that contains an index.md file and zero or more [resources](#resourc
 
 Any [page kind](#page-kind) that receives a page [collection](#collection) in [context](#context). This includes the home page, [section pages](#section-page), [taxonomy pages](#taxonomy-page), and [term pages](#term-page).
 
+###### list template
+
+Any template that renders a [list page](#list-page). This includes [home](/templates/types/#home), [section](/templates/types/#section), [taxonomy](/templates/types/#taxonomy), and [term](/templates/types/#term) templates.
+
 ###### localization
 
 Adaptation of a site to meet language and regional requirements. This includes translations, language-specific media, date and currency formats, etc. See [details](/content-management/multilingual/) and the [W3C definition](https://www.w3.org/International/questions/qa-i18n). Abbreviated l10n.
@@ -256,7 +259,7 @@ A data structure with or without associated [methods](#method).
 
 ###### ordered taxonomy
 
-Created by invoking the [`Alphabetical`] or [`ByCount`] method on a [taxonomy object](#taxonomy-object), which is a [map](#map), an ordered taxonomy is a [slice](#slice), where each element is an object that contains the [term](#term) and a slice of its [weighted pages](#weighted-page).
+Created by invoking the [`Alphabetical`] or [`ByCount`] method on a [`Taxonomy`](#taxonomy-object) object, which is a [map](#map), an ordered taxonomy is a [slice](#slice), where each element is an object that contains the [term](#term) and a slice of its [weighted pages](#weighted-page).
 
 [`Alphabetical`]: /methods/taxonomy/alphabetical/
 [`ByCount`]: /methods/taxonomy/bycount/
@@ -271,7 +274,7 @@ A directory that encapsulates both content and associated [resources](#resource)
 
 ###### page collection
 
-A slice of page objects.
+A slice of `Page` objects.
 
 ###### page kind
 
@@ -287,15 +290,19 @@ A file within a [page bundle](#page-bundle). Capture one or more page resources
 
 ###### pager
 
-Created during [pagination](#pagination), a pager contains a subset of a section list, and navigation links to other pagers.
+Created during [pagination](#pagination), a pager contains a subset of a list page and navigation links to other pagers.
 
 ###### paginate
 
-To split a [section](#section) list into two or more [pagers](#pager) See [details](/templates/pagination/).
+To split a list page into two or more subsets.
 
 ###### pagination
 
-The process of [paginating](#paginate) a [section](#section) list.
+The process of [paginating](#paginate) a list page. See [details](/templates/pagination/).
+
+###### paginator
+
+A collection of [pagers](#pager).
 
 ###### parameter
 
@@ -394,7 +401,7 @@ Raw string literals are character sequences between backticks, as in \`bar\`. Wi
 
 ###### taxonomic weight
 
-Defined in front matter and unique to each taxonomy, this [weight](#weight) determines the sort order of page collections contained within a [taxonomy object](#taxonomy-object). See [details](/templates/taxonomy-templates/#assign-weight).
+Defined in front matter and unique to each taxonomy, this [weight](#weight) determines the sort order of page collections contained within a [`Taxonomy`](#taxonomy-object) object. See [details](/content-management/taxonomies/#order-taxonomies).
 
 ###### taxonomy
 
@@ -454,7 +461,7 @@ Used to position an element within a collection sorted by weight. Assign weights
 
 ###### weighted page
 
-Contained within a [taxonomy object](#taxonomy-object), a weighted page is a [map](#map) with two elements: a `Page` object, and its [taxonomic weight](#taxonomic-weight) as defined in front matter. Access the elements using the `Page` and `Weight` keys.
+Contained within a [`Taxonomy`](#taxonomy-object) object, a weighted page is a [map](#map) with two elements: a `Page` object, and its [taxonomic weight](#taxonomic-weight) as defined in front matter. Access the elements using the `Page` and `Weight` keys.
 
 ###### zero time