Merge commit 'f96384a3b596f9bc0a3a035970b09b2c601f0ccb'

7 files changed, 11 insertions, 45 deletions

diff --git a/docs/content/en/about/_index.md b/docs/content/en/about/_index.md
index 8ed441b61..91260a4a6 100644
--- a/docs/content/en/about/_index.md
+++ b/docs/content/en/about/_index.md
@@ -2,19 +2,14 @@
 title: About Hugo
 linktitle: Overview
 description: Hugo's features, roadmap, license, and motivation.
-date: 2017-02-01
-publishdate: 2017-02-01
-lastmod: 2017-02-01
 categories: []
 keywords: []
 menu:
   docs:
-    parent: "about"
+    parent: about
     weight: 1
 weight: 1
-draft: false
 aliases: [/about-hugo/,/docs/]
-toc: false
 ---
 
 Hugo is not your average static site generator.
diff --git a/docs/content/en/about/benefits.md b/docs/content/en/about/benefits.md
index 925da1732..91c243413 100644
--- a/docs/content/en/about/benefits.md
+++ b/docs/content/en/about/benefits.md
@@ -2,19 +2,12 @@
 title: The Benefits of Static Site Generators
 linktitle: The Benefits of Static
 description: Improved performance, security and ease of use are just a few of the reasons static site generators are so appealing.
-date: 2017-02-01
-publishdate: 2017-02-01
-lastmod: 2017-02-01
 keywords: [ssg,static,performance,security]
 menu:
   docs:
-    parent: "about"
+    parent: about
     weight: 30
 weight: 30
-sections_weight: 30
-draft: false
-aliases: []
-toc: false
 ---
 
 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.
diff --git a/docs/content/en/about/features.md b/docs/content/en/about/features.md
index fc3d5a030..6fac68cdd 100644
--- a/docs/content/en/about/features.md
+++ b/docs/content/en/about/features.md
@@ -1,17 +1,11 @@
 ---
 title: Hugo Features
-linktitle: 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.
-date: 2017-02-01
-publishdate: 2017-02-01
-lastmod: 2017-02-01
 menu:
   docs:
-    parent: "about"
+    parent: about
     weight: 20
 weight: 20
-sections_weight: 20
-draft: false
 toc: true
 ---
 
diff --git a/docs/content/en/about/hugo-and-gdpr.md b/docs/content/en/about/hugo-and-gdpr.md
index 2d4fba872..3e0a160c7 100644
--- a/docs/content/en/about/hugo-and-gdpr.md
+++ b/docs/content/en/about/hugo-and-gdpr.md
@@ -2,16 +2,13 @@
 title: Hugo and the  General Data Protection Regulation (GDPR)
 linktitle: Hugo and GDPR
 description: About how to configure your Hugo site to meet the new regulations.
-date: 2018-05-25
 layout: single
 keywords: ["GDPR", "Privacy", "Data Protection"]
 menu:
   docs:
-    parent: "about"
+    parent: about
     weight: 5
 weight: 5
-sections_weight: 5
-draft: false
 aliases: [/privacy/,/gdpr/]
 toc: true
 ---
@@ -57,7 +54,6 @@ disable = false
 privacyEnhanced = false
 {{< /code-toggle >}}
 
-
 ## Disable All Services
 
 An example Privacy Config that disables all the relevant services in Hugo. With this configuration, the other settings will not matter.
@@ -91,9 +87,9 @@ respectDoNotTrack
 useSessionStorage
 : Enabling this will disable the use of Cookies and use Session Storage to Store the GA Client ID.
 
-{{% warning %}}
+{{% note %}}
 `useSessionStorage` is not supported when using Google Analytics v4 (gtag.js).
-{{% /warning %}}
+{{% /note %}}
 
 ### Instagram
 
diff --git a/docs/content/en/about/license.md b/docs/content/en/about/license.md
index ae74b6047..267ec95a0 100644
--- a/docs/content/en/about/license.md
+++ b/docs/content/en/about/license.md
@@ -2,24 +2,20 @@
 title: Apache License
 linktitle: License
 description: Hugo v0.15 and later are released under the Apache 2.0 license.
-date: 2016-02-01
-publishdate: 2016-02-01
-lastmod: 2016-03-02
 categories: ["about hugo"]
 keywords: ["License","apache"]
 menu:
   docs:
-    parent: "about"
+    parent: about
     weight: 60
 weight: 60
-sections_weight: 60
 aliases: [/meta/license]
 toc: true
 ---
 
 {{% note %}}
 Hugo v0.15 and later are released under the Apache 2.0 license.
-Earlier versions of Hugo were released under the [Simple Public License](https://opensource.org/licenses/Simple-2.0).
+Earlier versions of Hugo were released under the [Simple Public License](https://opensource.org/license/simpl-2-0-html/).
 {{% /note %}}
 
 _Version 2.0, January 2004_ <br>
@@ -148,7 +144,7 @@ _END OF TERMS AND CONDITIONS_
 
 To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets `[]` replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same “printed page” as the copyright notice for easier identification within third-party archives.
 
-{{< code file="apache-notice.txt" download="apache-notice.txt" >}}
+{{< code file="apache-notice.txt" >}}
 Copyright [yyyy] [name of copyright owner]
 
 Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docs/content/en/about/security-model/index.md b/docs/content/en/about/security-model/index.md
index d4dacd9bf..a909a4236 100644
--- a/docs/content/en/about/security-model/index.md
+++ b/docs/content/en/about/security-model/index.md
@@ -1,15 +1,13 @@
 ---
 title: Hugo's Security Model
 description: A summary of Hugo's security model.
-date: 2019-10-01
 layout: single
 keywords: ["Security", "Privacy"]
 menu:
   docs:
-    parent: "about"
+    parent: about
     weight: 4
 weight: 5
-sections_weight: 5
 aliases: [/security/]
 toc: true
 ---
diff --git a/docs/content/en/about/what-is-hugo.md b/docs/content/en/about/what-is-hugo.md
index d61f821cd..3097de50e 100644
--- a/docs/content/en/about/what-is-hugo.md
+++ b/docs/content/en/about/what-is-hugo.md
@@ -1,18 +1,12 @@
 ---
 title: What is Hugo
-linktitle: What is Hugo
 description: Hugo is a fast and modern static site generator written in Go, and designed to make website creation fun again.
-date: 2017-02-01
-publishdate: 2017-02-01
-lastmod: 2017-02-01
 layout: single
 menu:
   docs:
-    parent: "about"
+    parent: about
     weight: 10
 weight: 10
-sections_weight: 10
-draft: false
 aliases: [/overview/introduction/,/about/why-i-built-hugo/]
 toc: true
 ---