Merge commit '9aec42c5452b3eb224888c50ba1c3f3b68a447e9'

18 files changed, 313 insertions, 162 deletions

diff --git a/docs/content/en/about/hugo-and-gdpr.md b/docs/content/en/about/hugo-and-gdpr.md
index d82368afc..85e996f59 100644
--- a/docs/content/en/about/hugo-and-gdpr.md
+++ b/docs/content/en/about/hugo-and-gdpr.md
@@ -131,4 +131,4 @@ enableDNT
 : Enabling this for the vimeo shortcode, the Vimeo player will be blocked from tracking any session data, including all cookies and stats.
 
 simple
-: If simple mode is enabled, the video thumbnail is fetched from Vimeo's servers and it is overlayed with a play button. If the user clicks to play the video, it will open in a new tab directly on Vimeo's website.
+: If simple mode is enabled, the video thumbnail is fetched from Vimeo's servers and it is overlaid with a play button. If the user clicks to play the video, it will open in a new tab directly on Vimeo's website.
diff --git a/docs/content/en/commands/hugo_gen_chromastyles.md b/docs/content/en/commands/hugo_gen_chromastyles.md
index bcb2fbf08..3ec890412 100644
--- a/docs/content/en/commands/hugo_gen_chromastyles.md
+++ b/docs/content/en/commands/hugo_gen_chromastyles.md
@@ -21,7 +21,7 @@ hugo gen chromastyles [flags] [args]
 
 ```
   -h, --help                    help for chromastyles
-      --highlightStyle string   style used for highlighting lines (see https://github.com/alecthomas/chroma) (default "bg:#ffffcc")
+      --highlightStyle string   style used for highlighting lines (see https://github.com/alecthomas/chroma)
       --linesStyle string       style used for line numbers (see https://github.com/alecthomas/chroma)
       --style string            highlighter style (see https://xyproto.github.io/splash/docs/) (default "friendly")
 ```
diff --git a/docs/content/en/commands/hugo_gen_doc.md b/docs/content/en/commands/hugo_gen_doc.md
index d0b01a938..13fb23106 100644
--- a/docs/content/en/commands/hugo_gen_doc.md
+++ b/docs/content/en/commands/hugo_gen_doc.md
@@ -12,7 +12,7 @@ Generate Markdown documentation for the Hugo CLI.
 Generate Markdown documentation for the Hugo CLI.
 			This command is, mostly, used to create up-to-date documentation
 	of Hugo's command-line interface for https://gohugo.io/.
-	
+
 	It creates one Markdown file per command with front matter suitable
 	for rendering in Hugo.
 
diff --git a/docs/content/en/commands/hugo_mod_get.md b/docs/content/en/commands/hugo_mod_get.md
index 784e81f44..f4803d723 100644
--- a/docs/content/en/commands/hugo_mod_get.md
+++ b/docs/content/en/commands/hugo_mod_get.md
@@ -22,7 +22,12 @@ Install a specific version:
 
     hugo mod get github.com/gohugoio/testshortcodes@v0.3.0
 
-Install the latest versions of all module dependencies:
+Install the latest versions of all direct module dependencies:
+
+    hugo mod get
+    hugo mod get ./... (recursive)
+
+Install the latest versions of all module dependencies (direct and indirect):
 
     hugo mod get -u
     hugo mod get -u ./... (recursive)
diff --git a/docs/content/en/content-management/comments.md b/docs/content/en/content-management/comments.md
index 751fb89bf..df9453c48 100644
--- a/docs/content/en/content-management/comments.md
+++ b/docs/content/en/content-management/comments.md
@@ -48,6 +48,7 @@ These are some alternatives to Disqus:
 
 * [Cactus Comments](https://cactus.chat/docs/integrations/hugo/) (Open Source, Matrix appservice, Docker install)
 * [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/)
 * [Hyvor Talk](https://talk.hyvor.com/) (Available as a service)
 * [IntenseDebate](https://intensedebate.com/)
diff --git a/docs/content/en/content-management/image-processing/index.md b/docs/content/en/content-management/image-processing/index.md
index 124cadc68..3e9513a75 100644
--- a/docs/content/en/content-management/image-processing/index.md
+++ b/docs/content/en/content-management/image-processing/index.md
@@ -301,7 +301,7 @@ In the example above, on the second line, we have reversed width and height to r
 
 ### Anchor
 
-When using the [`Crop`] or [`Fill`] method, the _anchor_ determines the placement of the crop box. You may specify `TopLeft`, `Top`, `TopRight`, `Left`, `Center`,`Right`, `BottomLeft`, `Bottom`, `BottomRight`, or `Smart`.
+When using the [`Crop`] or [`Fill`] method, the _anchor_ determines the placement of the crop box. You may specify `TopLeft`, `Top`, `TopRight`, `Left`, `Center`, `Right`, `BottomLeft`, `Bottom`, `BottomRight`, or `Smart`.
 
 The default value is `Smart`, which uses [Smartcrop] image analysis to determine the optimal placement of the crop box. You may override the default value in the [site configuration].
 
diff --git a/docs/content/en/content-management/urls.md b/docs/content/en/content-management/urls.md
index 5b8218f64..60f9615b8 100644
--- a/docs/content/en/content-management/urls.md
+++ b/docs/content/en/content-management/urls.md
@@ -102,11 +102,11 @@ With this content structure:
 ```text
 content/
 ├── posts/
-│   ├── bash-in-slow-motion.md
-│   └── tls-in-a-nutshell.md
+│   ├── bash-in-slow-motion.md
+│   └── tls-in-a-nutshell.md
 ├── tutorials/
-│   ├── git-for-beginners.md
-│   └── javascript-bundling-with-hugo.md
+│   ├── git-for-beginners.md
+│   └── javascript-bundling-with-hugo.md
 └── _index.md
 ```
 
@@ -165,15 +165,15 @@ With this content structure:
 
 ```text
 content/
-├── de/
-│   ├── books/
-│   │   ├── les-miserables.md
-│   │   └── the-hunchback-of-notre-dame.md
-│   └── _index.md
-└── en/
+├── en/
+│   ├── books/
+│   │   ├── les-miserables.md
+│   │   └── the-hunchback-of-notre-dame.md
+│   └── _index.md
+└── es/
     ├── books/
-    │   ├── les-miserables.md
-    │   └── the-hunchback-of-notre-dame.md
+    │   ├── les-miserables.md
+    │   └── the-hunchback-of-notre-dame.md
     └── _index.md
 ```
 
@@ -197,7 +197,7 @@ books = "/books/:slug/"
 books = "/books/"
 
 [languages.es]
-contentDir = 'content/de'
+contentDir = 'content/es'
 languageCode = 'es-ES'
 languageDirection = 'ltr'
 languageName = 'Español'
@@ -215,21 +215,21 @@ The structure of the published site will be:
 ```text
 public/
 ├── en/
-│   ├── books/
-│   │   ├── les-miserables/
-│   │   │   └── index.html
-│   │   ├── the-hunchback-of-notre-dame/
-│   │   │   └── index.html
-│   │   └── index.html
-│   └── index.html
+│   ├── books/
+│   │   ├── les-miserables/
+│   │   │   └── index.html
+│   │   ├── the-hunchback-of-notre-dame/
+│   │   │   └── index.html
+│   │   └── index.html
+│   └── index.html
 ├── es/
-│   ├── libros/
-│   │   ├── les-miserables/
-│   │   │   └── index.html
-│   │   ├── the-hunchback-of-notre-dame/
-│   │   │   └── index.html
-│   │   └── index.html
-│   └── index.html
+│   ├── libros/
+│   │   ├── les-miserables/
+│   │   │   └── index.html
+│   │   ├── the-hunchback-of-notre-dame/
+│   │   │   └── index.html
+│   │   └── index.html
+│   └── index.html
 └── index.html
 ````
 
diff --git a/docs/content/en/getting-started/configuration-markup.md b/docs/content/en/getting-started/configuration-markup.md
index 56d300275..dca2b3c52 100644
--- a/docs/content/en/getting-started/configuration-markup.md
+++ b/docs/content/en/getting-started/configuration-markup.md
@@ -24,7 +24,7 @@ Below are all markup related configuration in Hugo with their default settings:
 
 ## Goldmark
 
-[Goldmark](https://github.com/yuin/goldmark/) is from Hugo 0.60 the default library used for Markdown. It's fast, it's [CommonMark](https://spec.commonmark.org/0.29/) compliant and it's very flexible.
+[Goldmark](https://github.com/yuin/goldmark/) is from Hugo 0.60 the default library used for Markdown. It's fast, it's [CommonMark](https://spec.commonmark.org/current/) compliant and it's very flexible.
 
 This is the default configuration:
 
diff --git a/docs/content/en/getting-started/directory-structure.md b/docs/content/en/getting-started/directory-structure.md
index 676b7bd1c..ecdda25cd 100644
--- a/docs/content/en/getting-started/directory-structure.md
+++ b/docs/content/en/getting-started/directory-structure.md
@@ -1,6 +1,6 @@
 ---
 title: Directory structure
-description: Hugo's CLI scaffolds a project directory structure and then takes that single directory and uses it as the input to create a complete website.
+description: Each Hugo project is a directory, with subdirectories that contribute to the content, structure, behavior, and presentation of your site.
 categories: [fundamentals,getting started]
 keywords: [source, organization, directories]
 menu:
@@ -12,80 +12,202 @@ aliases: [/overview/source-directory/]
 toc: true
 ---
 
-## New site scaffolding
+## Site skeleton
 
-{{< youtube sB0HLHjgQ7E >}}
+Hugo generates a project skeleton when you create a new site. For example, this command:
 
-Running `hugo new site example` from the command line creates a directory structure with the following elements:
+```text
+hugo new site my-site
+```
+
+Creates this directory structure:
 
 ```txt
-example/
+my-site/
 ├── archetypes/
 │   └── default.md
 ├── assets/
 ├── content/
 ├── data/
+├── i18n/
 ├── layouts/
-├── public/
 ├── static/
 ├── themes/
-└── hugo.toml
+└── hugo.toml         <-- site configuration
 ```
 
-## Directory structure explained
+Depending on requirements, you may wish to organize your site configuration into subdirectories:
+
+```txt
+my-site/
+├── archetypes/
+│   └── default.md
+├── assets/
+├── config/           <-- site configuration
+│   └── _default/
+│       └── hugo.toml
+├── content/
+├── data/
+├── i18n/
+├── layouts/
+├── static/
+└── themes/
+```
+
+When you build your site, Hugo creates a `public` directory, and typically a `resources` directory as well:
+
+```txt
+my-site/
+├── archetypes/
+│   └── default.md
+├── assets/
+├── config/       
+│   └── _default/
+│       └── hugo.toml
+├── content/
+├── data/
+├── i18n/
+├── layouts/
+├── public/       <-- created when you build your site
+├── resources/    <-- created when you build your site
+├── static/
+└── themes/
+```
+
+## Directories
+
+Each of the subdirectories contributes to the content, structure, behavior, or presentation of your site.
+
+archetypes
+: The `archetypes` directory contains templates for new content. See&nbsp;[details](/content-management/archetypes/).
+
+assets
+: The `assets` directory contains global resources typically passed through an asset pipeline. This includes resources such as images, CSS, Sass, JavaScript, and TypeScript. See&nbsp;[details](/hugo-pipes/introduction/).
+
+config
+: The `config` directory contains your site configuration, possibly split into multiple subdirectories and files. For projects with minimal configuration or projects that do not need to behave differently in different environments, a single configuration file named `hugo.toml` in the root of the project is sufficient. See&nbsp;[details](/getting-started/configuration/#configuration-directory).
+
+content
+: The `content` directory contains the markup files (typically markdown) and page resources that comprise the content of your site. See&nbsp;[details](/content-management/organization/).
 
-The following is a high-level overview of each of the directories with links to each of their respective sections within the Hugo docs.
+data
+: The `data` directory contains data files (JSON, TOML, YAML, or XML) that augment content, configuration, localization, and navigation. See&nbsp;[details](/templates/data-templates/).
 
-[`archetypes`](/content-management/archetypes/)
-: You can create new content files in Hugo using the `hugo new content` command.
-By default, Hugo will create new content files with at least `date`, `title` (inferred from the file name), and `draft = true`. This saves time and promotes consistency for sites using multiple content types. You can create your own [archetypes] with custom preconfigured front matter fields as well.
+i18n
+: The `i18n` directory contains translation tables for multilingual sites. See&nbsp;[details](/content-management/multilingual/).
 
-[`assets`]
-: Stores all the files which need be processed by [Hugo Pipes](/hugo-pipes/). Only the files whose `.Permalink` or `.RelPermalink` are used will be published to the `public` directory.
+layouts
+: The layouts directory contains templates to transform content, data, and resources into a complete website. See&nbsp;[details](/templates/).
 
-[`config`](/getting-started/configuration/)
-: Hugo ships with a large number of [configuration directives].
-The [configuration directory](/getting-started/configuration/#configuration-directory) is where those directives are stored as JSON, YAML, or TOML files. Every root setting object can stand as its own file and structured by environments.
-Projects with minimal settings and no need for environment awareness can use a single `hugo.toml` file at its root.
+public
+: The `public` directory contains the published website, generated when you run the `hugo` command. Hugo recreates this directory and its content as needed. See&nbsp;[details](/getting-started/usage/#build-your-site).
 
-Many sites may need little to no configuration, but Hugo ships with a large number of [configuration directives] for more granular directions on how you want Hugo to build your website. Note: the `config` directory is not created by default.
+resources
+: The `resources` directory contains cached output from Hugo's asset pipelines, generated when you run the `hugo` or `hugo server` commands. By default this cache directory includes CSS and images. Hugo recreates this directory and its content as needed.
 
-[`content`]
-: All content for your website will live inside this directory. Each top-level folder in Hugo is considered a [content section]. For example, if your site has three main sections---`blog`, `articles`, and `tutorials`---you will have three directories at `content/blog`, `content/articles`, and `content/tutorials`. Hugo uses sections to assign default [content types].
+static
+: The `static` directory contains files that will be copied to the public directory when you build your site. For example: `favicon.ico`, `robots.txt`, and files that verify site ownership. Before the introduction of [page bundles](/getting-started/glossary/#page-bundle) and [asset pipelines](/hugo-pipes/introduction/), the `static` directory was also used for images, CSS, and JavaScript. See&nbsp;[details](/content-management/static-files/).
 
-[`data`](/templates/data-templates/)
-: This directory is used to store configuration files that can be
-used by Hugo when generating your website. You can write these files in YAML, JSON, or TOML format. In addition to the files you add to this folder, you can also create [data templates] that pull from dynamic content.
+themes
+: The `themes` directory contains one or more [themes](/getting-started/glossary/#theme), each in its own subdirectory.
 
-[`layouts`]
-: Stores templates in the form of `.html` files that specify how views of your content will be rendered into a static website. Templates include [list pages][lists], your [homepage], [taxonomy templates], [partials], [single page templates][singles], and more.
+## Union file system
 
-[`static`]
-: Stores all the static content: images, CSS, JavaScript, etc. When Hugo builds your site, all assets inside your static directory are copied over as-is. A good example of using the `static` folder is for [verifying site ownership on Google Search Console][searchconsole], where you want Hugo to copy over a complete HTML file without modifying its content.
+Hugo creates a union file system, allowing you to mount two or more directories to the same location. For example, let's say your home directory contains a Hugo project in one directory, and shared content in another:
+
+```text
+home/
+└── user/
+    ├── my-site/            
+    │   ├── content/
+    │   │   ├── books/
+    │   │   │   ├── _index.md
+    │   │   │   ├── book-1.md
+    │   │   │   └── book-2.md
+    │   │   └── _index.md
+    │   ├── themes/
+    │   │   └── my-theme/
+    │   └── hugo.toml
+    └── shared-content/     
+        └── films/
+            ├── _index.md
+            ├── film-1.md
+            └── film-2.md
+```
+
+You can include the shared content when you build your site using mounts. In your site configuration:
+
+{{< code-toggle file=hugo copy=false >}}
+[[module.mounts]]
+source = 'content'
+target = 'content'
+
+[[module.mounts]]
+source = '/home/user/shared-content'
+target = 'content'
+{{< /code-toggle >}}
+
+{{% note %}}
+When you overlay one directory on top of another, you must mount both directories.
+
+If you think you need a symbolic link in your project directory, use Hugo's union file system instead.
+{{% /note %}}
+
+After mounting, the union file system has this structure:
+
+```text
+home/
+└── user/
+    └── my-site/
+        ├── content/
+        │   ├── books/
+        │   │   ├── _index.md
+        │   │   ├── book-1.md
+        │   │   └── book-2.md
+        │   ├── films/
+        │   │   ├── _index.md
+        │   │   ├── film-1.md
+        │   │   └── film-2.md
+        │   └── _index.md
+        ├── themes/
+        │   └── my-theme/
+        └── hugo.toml
+```
 
 {{% note %}}
-From **Hugo 0.31** you can have multiple static directories.
+When two or more files have the same path, the order of precedence follows the order of the mounts. For example, if the shared content directory contains `books/book-1.md`, it will be ignored because the project's content directory was mounted first.
 {{% /note %}}
 
-[`resources`]
-: Caches some files to speed up generation. Can be also used by template authors to distribute built Sass files, so you don't have to have the preprocessor installed. Note: resources directory is not created by default.
-
-[archetypes]: /content-management/archetypes/
-[`assets`]: /hugo-pipes/introduction#asset-directory
-[configuration directives]: /getting-started/configuration/#all-configuration-settings
-[`content`]: /content-management/organization/
-[content section]: /content-management/sections/
-[content types]: /content-management/types/
-[data templates]: /templates/data-templates/
-[homepage]: /templates/homepage/
-[`layouts`]: /templates/
-[`static`]: /content-management/static-files/
-[`resources`]: /getting-started/configuration/#configure-file-caches
-[lists]: /templates/lists/
-[pagevars]: /variables/page/
-[partials]: /templates/partials/
-[searchconsole]: https://support.google.com/webmasters/answer/9008080#zippy=%2Chtml-file-upload
-[singles]: /templates/single-page-templates/
-[taxonomies]: /content-management/taxonomies/
-[taxonomy templates]: /templates/taxonomy-templates/
-[types]: /content-management/types/
+You can mount directories to `archetypes`, `assets`, `content`, `data`, `i18n`, `layouts`, and `static`. See&nbsp;[details](/hugo-modules/configuration/#module-configuration-mounts).
+
+You can also mount directories from Git repositories using Hugo Modules. See&nbsp;[details](/hugo-modules/).
+
+
+## Theme skeleton
+
+Hugo generates a functional theme skeleton when you create a new theme. For example, this command:
+
+```text
+hugo new theme my-theme
+```
+
+Creates this directory structure (subdirectories not shown):
+
+```text
+my-theme/
+├── archetypes/
+├── assets/
+├── content/
+├── data/
+├── i18n/
+├── layouts/
+├── static/
+├── LICENSE
+├── README.md
+├── hugo.toml
+└── theme.toml
+```
+
+Using the union file system described above, Hugo mounts each of these directories to the corresponding location in the project. When two files have the same path, the file in the project directory takes precedence. This allows you, for example, to override a theme's template by placing a copy in the same location within the project directory.
+
+If you are simultaneously using components from two or more themes or modules, and there's a path collision, the first mount takes precedence.
diff --git a/docs/content/en/getting-started/glossary.md b/docs/content/en/getting-started/glossary.md
index 8ff61d6b1..834f72ec5 100644
--- a/docs/content/en/getting-started/glossary.md
+++ b/docs/content/en/getting-started/glossary.md
@@ -130,7 +130,7 @@ Used within a [template action](#template-action) and associated with an [object
 
 ### module
 
-Like a [theme](#theme), a module is a packaged combination of [archetypes](#archetype), assets, content, data, [templates](#template), translations, or configuration settings. A module may serve as the basis for a new site, or to augment an existing site. See [details](/hugo-modules/).
+Like a [theme](#theme), a module is a packaged combination of [archetypes](#archetype), assets, content, data, [templates](#template), translation tables, static files, or configuration settings. A module may serve as the basis for a new site, or to augment an existing site. See [details](/hugo-modules/).
 
 ### object
 
@@ -192,9 +192,9 @@ A [template](#template) that overrides standard markdown rendering. See [details
 
 ### resource
 
-Any file consumed by the build process to augment or generate content, structure, behavior, or presentation. For example: images, videos, content snippets, CSS, Sass, Javascript, and data.
+Any file consumed by the build process to augment or generate content, structure, behavior, or presentation. For example: images, videos, content snippets, CSS, Sass, JavaScript, and data.
 
-Hugo supports three types of resources: page resources (located in a [page bundle](/getting-started/glossary/#page-bundle)), global resources (located in the assets directory), and remote resources (typically accessed via https).
+Hugo supports three types of resources: page resources (located in a [page bundle](/getting-started/glossary/#page-bundle)), global resources (located in the assets directory), and remote resources (typically accessed via HTTPS).
 
 ### scalar
 
@@ -230,7 +230,7 @@ Content with the "taxonomy" [page kind](#page-kind). Typically a listing of [ter
 
 ### template
 
-An HTML file with [template actions](#template-action), located within the layouts directory of a project, theme, or module. See&nbsp;[details](/templates/).
+A file with [template actions](#template-action), located within the layouts directory of a project, theme, or module. See&nbsp;[details](/templates/).
 
 ### template action
 
@@ -246,7 +246,7 @@ Content with the "term" [page kind](#page-kind). Typically a listing of [regular
 
 ### theme
 
-A packaged combination of [archetypes](#archetype), assets, content, data, [templates](#template), translations, or configuration settings. A theme may serve as the basis for a new site, or to augment an existing site. See also [module](#module).
+A packaged combination of [archetypes](#archetype), assets, content, data, [templates](#template), translation tables, static files, or configuration settings. A theme may serve as the basis for a new site, or to augment an existing site. See also [module](#module).
 
 ### token
 
diff --git a/docs/content/en/hosting-and-deployment/hosting-on-firebase.md b/docs/content/en/hosting-and-deployment/hosting-on-firebase.md
index a5094a23f..3b1ba9dcd 100644
--- a/docs/content/en/hosting-and-deployment/hosting-on-firebase.md
+++ b/docs/content/en/hosting-and-deployment/hosting-on-firebase.md
@@ -54,7 +54,7 @@ Here you will be redirected to login in your GitHub account to get permissions.
 7. For which GitHub repository would you like to set up a GitHub workflow? (format: user/repository) 
 
 Include the repository you will use in the format above (Account/Repo)
-Firebase script with retrive credentials, create a service account you can later manage in your GitHub settings.
+Firebase script with retrieve credentials, create a service account you can later manage in your GitHub settings.
 
 8. Set up the workflow to run a build script before every deploy? 
 
diff --git a/docs/content/en/hosting-and-deployment/hosting-on-github/index.md b/docs/content/en/hosting-and-deployment/hosting-on-github/index.md
index bfb16dc81..4dc88faf1 100644
--- a/docs/content/en/hosting-and-deployment/hosting-on-github/index.md
+++ b/docs/content/en/hosting-and-deployment/hosting-on-github/index.md
@@ -1,6 +1,6 @@
 ---
 title: Host on GitHub Pages
-description: Deploy Hugo as a GitHub Pages project or personal/organizational site and automate the whole process with Github Actions
+description: Deploy Hugo as a GitHub Pages project or personal/organizational site and automate the whole process with GitHub Actions
 categories: [hosting and deployment]
 keywords: [github,git,deployment,hosting]
 menu:
diff --git a/docs/content/en/showcase/digitalgov/featured.png b/docs/content/en/showcase/digitalgov/featured.png
index 5663180f9..7d065dce9 100644
--- a/docs/content/en/showcase/digitalgov/featured.png
+++ b/docs/content/en/showcase/digitalgov/featured.png
diff --git a/docs/content/en/templates/rss.md b/docs/content/en/templates/rss.md
index 90b5155ad..0250e8f54 100644
--- a/docs/content/en/templates/rss.md
+++ b/docs/content/en/templates/rss.md
@@ -1,6 +1,6 @@
 ---
 title: RSS templates
-description: Hugo ships with its own RSS 2.0 template that requires almost no configuration, or you can create your own RSS templates.
+description: Use the built-in RSS template, or create your own.
 keywords: [rss, xml, templates]
 categories: [templates]
 menu:
@@ -11,75 +11,81 @@ weight: 160
 toc: tr