Merge commit '7125ad401ad043e46262afc7eca8dceb6d54bb9e'

docs/content/en/content-management/comments.md

@@ -24,7 +24,7 @@ Hugo comes with all the code you need to load Disqus into your templates. Before
 
 Disqus comments require you set a single value in your [site's configuration file][configuration] like so:
 
-{{< code-toggle file="hugo" >}}
+{{< code-toggle file=hugo >}}
 [services.disqus]
 shortname = 'your-disqus-shortname'
 {{</ code-toggle >}}
@@ -48,6 +48,7 @@ Disqus has its own [internal template](/templates/internal/#disqus) available, t
 These are some alternatives to Disqus:
 
 * [Cactus Comments](https://cactus.chat/docs/integrations/hugo/) (Open Source, Matrix appservice, Docker install)
+* [Comentario](https://gitlab.com/comentario/comentario) (Open Source, self-hosted, Go/Angular, run locally, in Docker or Kubernetes)
 * [Commento](https://commento.io/) (Open Source, available as a service, local install, or docker image)
 * [Giscus](https://giscus.app/) (Open source, comments system powered by GitHub Discussions)
 * [Graph Comment](https://graphcomment.com/)

docs/content/en/content-management/image-processing/index.md

@@ -505,7 +505,7 @@ hugo --gc
 [mounted]: /hugo-modules/configuration#module-configuration-mounts
 [page bundle]: /content-management/page-bundles
 [`lang.FormatNumber`]: /functions/lang/formatnumber
-[filters]: /functions/images
+[filters]: /functions/images/filter/#image-filters
 [github.com/disintegration/imaging]: <https://github.com/disintegration/imaging#image-resizing>
 [Smartcrop]: <https://github.com/muesli/smartcrop#smartcrop>
 [Exif]: <https://en.wikipedia.org/wiki/Exif>

docs/content/en/content-management/menus.md

@@ -48,7 +48,7 @@ To add a page to the "main" menu:
 
 {{< code-toggle file=content/about.md fm=true >}}
 title = 'About'
-menu = 'main'
+menus = 'main'
 {{< /code-toggle >}}
 
 Access the entry with `site.Menus.main` in your templates. See [menu templates] for details.
@@ -57,11 +57,15 @@ To add a page to the "main" and "footer" menus:
 
 {{< code-toggle file=content/contact.md fm=true >}}
 title = 'Contact'
-menu = ['main','footer']
+menus = ['main','footer']
 {{< /code-toggle >}}
 
 Access the entry with `site.Menus.main` and `site.Menus.footer` in your templates. See [menu templates] for details.
 
+{{% note %}}
+The configuration key in the examples above is `menus`. The `menu` (singular) configuration key is an alias for `menus`.
+{{% /note %}}
+
 ### Properties {#properties-front-matter}
 
 Use these properties when defining menu entries in front matter:
@@ -96,11 +100,11 @@ This front matter menu entry demonstrates some of the available properties:
 
 {{< code-toggle file=content/products/software.md fm=true >}}
 title = 'Software'
-[menu.main]
+[[menus.main]]
 parent = 'Products'
 weight = 20
 pre = '<i class="fa-solid fa-code"></i>'
-[menu.main.params]
+[menus.main.params]
 class = 'center'
 {{< /code-toggle >}}
 
@@ -111,17 +115,17 @@ Access the entry with `site.Menus.main` in your templates. See [menu templates]
 To define entries for the "main" menu:
 
 {{< code-toggle file=hugo >}}
-[[menu.main]]
+[[menus.main]]
 name = 'Home'
 pageRef = '/'
 weight = 10
 
-[[menu.main]]
+[[menus.main]]
 name = 'Products'
 pageRef = '/products'
 weight = 20
 
-[[menu.main]]
+[[menus.main]]
 name = 'Services'
 pageRef = '/services'
 weight = 30
@@ -132,12 +136,12 @@ This creates a menu structure that you can access with `site.Menus.main` in your
 To define entries for the "footer" menu:
 
 {{< code-toggle file=hugo >}}
-[[menu.footer]]
+[[menus.footer]]
 name = 'Terms'
 pageRef = '/terms'
 weight = 10
 
-[[menu.footer]]
+[[menus.footer]]
 name = 'Privacy'
 pageRef = '/privacy'
 weight = 20
@@ -145,6 +149,10 @@ weight = 20
 
 This creates a menu structure that you can access with `site.Menus.footer` in your templates. See [menu templates] for details.
 
+{{% note %}}
+The configuration key in the examples above is `menus`. The `menu` (singular) configuration key is an alias for `menus`.
+{{% /note %}}
+
 ### Properties {#properties-site-configuration}
 
 {{% note %}}
@@ -177,34 +185,34 @@ url
 This nested menu demonstrates some of the available properties:
 
 {{< code-toggle file=hugo >}}
-[[menu.main]]
+[[menus.main]]
 name = 'Products'
 pageRef = '/products'
 weight = 10
 
-[[menu.main]]
+[[menus.main]]
 name = 'Hardware'
 pageRef = '/products/hardware'
 parent = 'Products'
 weight = 1
 
-[[menu.main]]
+[[menus.main]]
 name = 'Software'
 pageRef = '/products/software'
 parent = 'Products'
 weight = 2
 
-[[menu.main]]
+[[menus.main]]
 name = 'Services'
 pageRef = '/services'
 weight = 20
 
-[[menu.main]]
+[[menus.main]]
 name = 'Hugo'
 pre = '<i class="fa fa-heart"></i>'
 url = 'https://gohugo.io/'
 weight = 30
-[menu.main.params]
+[menus.main.params]
 rel = 'external'
 {{< /code-toggle >}}
 

docs/content/en/content-management/multilingual.md

@@ -71,7 +71,7 @@ disabled
 : (`bool`) If `true`, Hugo will not render content for this language. Default is `false`.
 
 languageCode
-: (`string`) The language tag as defined by [RFC 5646]. This value may include upper and lower case characters, hyphens or underscores, and does not affect localization or URLs. Hugo uses this value to populate the `language` element in the [built-in RSS template], and the `lang` attribute of the `html` element in the [built-in alias template]. Examples:
+: (`string`) The language tag as defined by [RFC 5646]. This value may include upper and lower case characters, hyphens, or underscores, and does not affect localization or URLs. Hugo uses this value to populate the `language` element in the [built-in RSS template], and the `lang` attribute of the `html` element in the [built-in alias template]. Examples:
 
 - `en`
 - `en-GB`
@@ -546,12 +546,12 @@ languageCode = 'de-DE'
 languageName = 'Deutsch'
 weight = 1
 
-[[languages.de.menu.main]]
+[[languages.de.menus.main]]
 name = 'Produkte'
 pageRef = '/products'
 weight = 10
 
-[[languages.de.menu.main]]
+[[languages.de.menus.main]]
 name = 'Leistungen'
 pageRef = '/services'
 weight = 20
@@ -561,12 +561,12 @@ languageCode = 'en-US'
 languageName = 'English'
 weight = 2
 
-[[languages.en.menu.main]]
+[[languages.en.menus.main]]
 name = 'Products'
 pageRef = '/products'
 weight = 10
 
-[[languages.en.menu.main]]
+[[languages.en.menus.main]]
 name = 'Services'
 pageRef = '/services'
 weight = 20
@@ -579,13 +579,12 @@ With a more complex menu structure, create a [configuration directory] and split
 ```text
 config/
 └── _default/
-    ├── menus/
-    │  ├── menu.de.toml
-    │  └── menu.en.toml
+    ├── menus.de.toml
+    ├── menus.en.toml
     └── hugo.toml
 ```
 
-{{< code-toggle file=config/_default/menus/menu.de >}}
+{{< code-toggle file=config/_default/menus.de >}}
 [[main]]
 name = 'Produkte'
 pageRef = '/products'
@@ -596,7 +595,7 @@ pageRef = '/services'
 weight = 20
 {{< /code-toggle >}}
 
-{{< code-toggle file=config/_default/menus/menu.en >}}
+{{< code-toggle file=config/_default/menus.en >}}
 [[main]]
 name = 'Products'
 pageRef = '/products'
@@ -627,12 +626,12 @@ The `identifier` depends on how you define menu entries:
 For example, if you define menu entries in site configuration:
 
 {{< code-toggle file=hugo >}}
-[[menu.main]]
+[[menus.main]]
   identifier = 'products'
   name = 'Products'
   pageRef = '/products'
   weight = 10
-[[menu.main]]
+[[menus.main]]
   identifier = 'services'
   name = 'Services'
   pageRef = '/services'

docs/content/en/content-management/summaries.md

@@ -73,7 +73,7 @@ Cons
 
 Because there are multiple ways in which a summary can be specified it is useful to understand the order of selection Hugo follows when deciding on the text to be returned by `.Summary`. It is as follows:
 
-1. If there is a `<!--more-->`> summary divider present in the article the text up to the divider will be provided as per the manual summary split method
+1. If there is a `<!--more-->` summary divider present in the article, the text up to the divider will be provided as per the manual summary split method
 2. If there is a `summary` variable in the article front matter the value of the variable will be provided as per the front matter summary method
 3. The text at the start of the article will be provided as per the automatic summary split method