Merge commit '87de22d7464e239c775fbd48ebce1665d5b1e80d'

7 files changed, 40 insertions, 40 deletions

diff --git a/docs/content/en/about/_index.md b/docs/content/en/about/_index.md
index 91260a4a6..3a8319029 100644
--- a/docs/content/en/about/_index.md
+++ b/docs/content/en/about/_index.md
@@ -1,14 +1,15 @@
 ---
 title: About Hugo
-linktitle: Overview
+linkTitle: Overview
 description: Hugo's features, roadmap, license, and motivation.
 categories: []
 keywords: []
 menu:
   docs:
+    identifier: about-hugo-overview
     parent: about
-    weight: 1
-weight: 1
+    weight: 10
+weight: 10
 aliases: [/about-hugo/,/docs/]
 ---
 
diff --git a/docs/content/en/about/benefits.md b/docs/content/en/about/benefits.md
index 91c243413..f1fc0cfb6 100644
--- a/docs/content/en/about/benefits.md
+++ b/docs/content/en/about/benefits.md
@@ -1,13 +1,13 @@
 ---
-title: The Benefits of Static Site Generators
-linktitle: The Benefits of Static
+title: Benefits of static site generators
+linkTitle: Static site generators
 description: Improved performance, security and ease of use are just a few of the reasons static site generators are so appealing.
 keywords: [ssg,static,performance,security]
 menu:
   docs:
     parent: about
-    weight: 30
-weight: 30
+    weight: 40
+weight: 40
 ---
 
 The purpose of website generators is to render content into HTML files. Most are "dynamic site generators." That means the HTTP server---i.e., the program that sends files to the browser to be viewed---runs the generator to create a new HTML file every time an end user requests a page.
@@ -18,7 +18,7 @@ Hugo takes caching a step further and all HTML files are rendered on your comput
 
 This has many benefits. The most noticeable is performance. HTTP servers are *very* good at sending files---so good, in fact, that you can effectively serve the same number of pages with a fraction of the memory and CPU needed for a dynamic site.
 
-## More on Static Site Generators
+## More on static site generators
 
 * ["An Introduction to Static Site Generators", David Walsh]
 * ["Hugo vs. WordPress page load speed comparison: Hugo leaves WordPress in its dust", GettingThingsTech][hugovwordpress]
diff --git a/docs/content/en/about/features.md b/docs/content/en/about/features.md
index 6fac68cdd..dcb85e8b5 100644
--- a/docs/content/en/about/features.md
+++ b/docs/content/en/about/features.md
@@ -1,11 +1,11 @@
 ---
-title: Hugo Features
+title: Hugo features
 description: Hugo boasts blistering speed, robust content management, and a powerful templating language making it a great fit for all kinds of static websites.
 menu:
   docs:
     parent: about
-    weight: 20
-weight: 20
+    weight: 30
+weight: 30
 toc: true
 ---
 
@@ -40,7 +40,7 @@ toc: true
 * ["Minutes to Read"][pagevars] functionality
 * ["WordCount"][pagevars] functionality
 
-## Additional Features
+## Additional features
 
 * Integrated [Disqus] comment support
 * Integrated [Google Analytics] support
diff --git a/docs/content/en/about/hugo-and-gdpr.md b/docs/content/en/about/hugo-and-gdpr.md
index b028c4543..d82368afc 100644
--- a/docs/content/en/about/hugo-and-gdpr.md
+++ b/docs/content/en/about/hugo-and-gdpr.md
@@ -1,14 +1,14 @@
 ---
-title: Hugo and the  General Data Protection Regulation (GDPR)
-linktitle: Hugo and GDPR
+title: Hugo and the General Data Protection Regulation
+linkTitle: Hugo and the GDPR
 description: About how to configure your Hugo site to meet the new regulations.
 layout: single
 keywords: ["GDPR", "Privacy", "Data Protection"]
 menu:
   docs:
     parent: about
-    weight: 5
-weight: 5
+    weight: 60
+weight: 60
 aliases: [/privacy/,/gdpr/]
 toc: true
 ---
@@ -17,7 +17,7 @@ toc: true
 
  **Hugo is a static site generator. By using Hugo you are already standing on very solid ground. Static HTML files on disk are much easier to reason about compared to server and database driven web sites.**
 
- But even static websites can integrate with external services, so from version `0.41`, Hugo provides a **Privacy Config** that covers the relevant built-in templates.
+ But even static websites can integrate with external services, so from version `0.41`, Hugo provides a **privacy configuration** that covers the relevant built-in templates.
 
  Note that:
 
@@ -25,9 +25,9 @@ toc: true
  * These settings work with the [internal templates](/templates/internal/). Some theme may contain custom templates for embedding services like Google Analytics. In that case these options have no effect.
  * We will continue this work and improve this further in future Hugo versions.
 
-## All Privacy Settings
+## All privacy settings
 
-Below are all privacy settings and their default value. These settings need to be put in your site config (e.g. `hugo.toml`).
+Below are all privacy settings and their default value. These settings need to be put in your site configuration (e.g. `hugo.toml`).
 
 {{< code-toggle file="hugo" >}}
 [privacy]
@@ -54,11 +54,11 @@ disable = false
 privacyEnhanced = false
 {{< /code-toggle >}}
 
-## Disable All Services
+## Disable all services
 
-An example Privacy Config that disables all the relevant services in Hugo. With this configuration, the other settings will not matter.
+An example privacy configuration that disables all the relevant services in Hugo. With this configuration, the other settings will not matter.
 
- {{< code-toggle file="hugo" >}}
+{{< code-toggle file="hugo" >}}
 [privacy]
 [privacy.disqus]
 disable = true
@@ -74,7 +74,7 @@ disable = true
 disable = true
 {{< /code-toggle >}}
 
-## The Privacy Settings Explained
+## The privacy settings explained
 
 ### GoogleAnalytics
 
diff --git a/docs/content/en/about/license.md b/docs/content/en/about/license.md
index 267ec95a0..dc560b33f 100644
--- a/docs/content/en/about/license.md
+++ b/docs/content/en/about/license.md
@@ -1,14 +1,13 @@
 ---
-title: Apache License
-linktitle: License
+title: License
 description: Hugo v0.15 and later are released under the Apache 2.0 license.
 categories: ["about hugo"]
 keywords: ["License","apache"]
 menu:
   docs:
     parent: about
-    weight: 60
-weight: 60
+    weight: 70
+weight: 70
 aliases: [/meta/license]
 toc: true
 ---
diff --git a/docs/content/en/about/security-model/index.md b/docs/content/en/about/security-model/index.md
index a909a4236..3b93167ab 100644
--- a/docs/content/en/about/security-model/index.md
+++ b/docs/content/en/about/security-model/index.md
@@ -1,18 +1,18 @@
 ---
-title: Hugo's Security Model
+title: Hugo's security model
 description: A summary of Hugo's security model.
 layout: single
 keywords: ["Security", "Privacy"]
 menu:
   docs:
     parent: about
-    weight: 4
-weight: 5
+    weight: 50
+weight: 50
 aliases: [/security/]
 toc: true
 ---
 
-## Runtime Security
+## Runtime security
 
 Hugo produces static output, so once built, the runtime is the browser (assuming the output is HTML) and any server (API) that you integrate with.
 
@@ -25,7 +25,7 @@ But when developing and building your site, the runtime is the `hugo` executable
 * User-defined components have read-only access to the filesystem.
 * We shell out to some external binaries to support [Asciidoctor](/content-management/formats/#list-of-content-formats) and similar, but those binaries and their flags are predefined and disabled by default (see [Security Policy](#security-policy)). General functions to run arbitrary external OS commands have been [discussed](https://github.com/gohugoio/hugo/issues/796), but not implemented because of security concerns.
 
-## Security Policy
+## Security policy
 
 Hugo has a built-in security policy that restricts access to [os/exec](https://pkg.go.dev/os/exec), remote communication and similar.
 
@@ -33,19 +33,19 @@ The default configuration is listed below. Any build using features not in the a
 
 {{< code-toggle config="security" />}}
 
-Note that these and other config settings in Hugo can be overridden by the OS environment. If you want to block all remote HTTP fetching of data:
+Note that these and other configuration settings in Hugo can be overridden by the OS environment. If you want to block all remote HTTP fetching of data:
 
 ```txt
 HUGO_SECURITY_HTTP_URLS=none hugo
 ```
 
-## Dependency Security
+## Dependency security
 
 Hugo is built as a static binary using [Go Modules](https://github.com/golang/go/wiki/Modules) to manage its dependencies. Go Modules have several safeguards, one of them being the `go.sum` file. This is a database of the expected cryptographic checksums of all of your dependencies, including transitive dependencies.
 
 [Hugo Modules](/hugo-modules/) is a feature built on top of the functionality of Go Modules. Like Go Modules, a Hugo project using Hugo Modules will have a `go.sum` file. We recommend that you commit this file to your version control system. The Hugo build will fail if there is a checksum mismatch, which would be an indication of [dependency tampering](https://julienrenaux.fr/2019/12/20/github-actions-security-risk/).
 
-## Web Application Security
+## Web application security
 
 These are the security threats as defined by [OWASP](https://en.wikipedia.org/wiki/OWASP).
 
diff --git a/docs/content/en/about/what-is-hugo.md b/docs/content/en/about/what-is-hugo.md
index 3097de50e..9e28346dd 100644
--- a/docs/content/en/about/what-is-hugo.md
+++ b/docs/content/en/about/what-is-hugo.md
@@ -5,8 +5,8 @@ layout: single
 menu:
   docs:
     parent: about
-    weight: 10
-weight: 10
+    weight: 20
+weight: 20
 aliases: [/overview/introduction/,/about/why-i-built-hugo/]
 toc: true
 ---
@@ -17,15 +17,15 @@ Websites built with Hugo are extremely fast and secure. Hugo sites can be hosted
 
 We think of Hugo as the ideal website creation tool with nearly instant build times, able to rebuild whenever a change is made.
 
-## How Fast is Hugo?
+## How fast is Hugo?
 
 {{< youtube "CdiDYZ51a2o" >}}
 
-## What Does Hugo Do?
+## What does Hugo do?
 
 In technical terms, Hugo takes a source directory of files and templates and uses these as input to create a complete website.
 
-## Who Should Use Hugo?
+## Who should use Hugo?
 
 Hugo is for people that prefer writing in a text editor over a browser.