Merge commit '00c4484c7092181729f6f470805bc7d72e8ad17b'

3 files changed, 79 insertions, 97 deletions

diff --git a/docs/config/_default/config.toml b/docs/config/_default/config.toml
index 4d3bb1f60..f4965dff1 100644
--- a/docs/config/_default/config.toml
+++ b/docs/config/_default/config.toml
@@ -1,19 +1,28 @@
 baseURL = "https://gohugo.io/"
-paginate = 100
 defaultContentLanguage = "en"
 enableEmoji = true
-# Set the unicode character used for the "return" link in page footnotes.
-footnotereturnlinkcontents = "↩"
-languageCode = "en-us"
-title = "Hugo"
-
 googleAnalytics = "UA-7131036-4"
-
+ignoreErrors = ["error-remote-getjson", "error-missing-instagram-accesstoken"]
+languageCode = "en-us"
+paginate = 100
 pluralizeListTitles = false
+timeZone = "Europe/Oslo"
+title = "Hugo"
 
 # We do redirects via Netlify's _redirects file, generated by Hugo (see "outputs" below).
 disableAliases = true
 
+[minify]
+[minify.tdewolff]
+[minify.tdewolff.html]
+keepWhitespace = true
+
+[module]
+[module.hugoVersion]
+min = "0.56.0"
+[[module.imports]]
+path = "github.com/gohugoio/gohugoioTheme"
+
 [outputs]
 home = [ "HTML", "RSS", "REDIR", "HEADERS" ]
 section = [ "HTML", "RSS"]
@@ -48,13 +57,10 @@ maxAge = "1440h"
 dir = ":resourceDir/_gen"
 maxAge = -1
 
-
 [related]
-
 threshold = 80
 includeNewer = true
 toLower = false
-
 [[related.indices]]
 name = "keywords"
 weight = 100
@@ -66,25 +72,13 @@ pattern = "2006"
 [social]
 twitter = "GoHugoIO"
 
-
-# MARKDOWN
-## Configuration for BlackFriday markdown parser: https://github.com/russross/blackfriday
-[blackfriday]
-plainIDAnchors = true
-# See https://github.com/gohugoio/hugo/issues/2424
-hrefTargetBlank = false
-angledQuotes = false
-latexDashes = true
-
 [imaging]
 # See https://github.com/disintegration/imaging
 # CatmullRom is a sharp bicubic filter which should fit the docs site well with its many screenshots.
 # Note that you can also set this per image processing.
 resampleFilter = "CatmullRom"
-
 # Default JPEG quality setting. Default is 75.
 quality = 75
-
 anchor = "smart"
 
 [taxonomies]
diff --git a/docs/config/_default/menus/menus.en.toml b/docs/config/_default/menus/menus.en.toml
index a31218a4f..7a956a47f 100644
--- a/docs/config/_default/menus/menus.en.toml
+++ b/docs/config/_default/menus/menus.en.toml
@@ -1,114 +1,102 @@
 [[docs]]
   name = "About Hugo"
-  weight = 1
+  weight = 10
   identifier = "about"
   url = "/about/"
 
 [[docs]]
+  name = "Installation"
+  weight = 20
+  identifier = "installation"
+  url = "/installation/"
+
+[[docs]]
   name = "Getting Started"
-  weight = 5
+  weight = 30
   identifier = "getting-started"
   url = "/getting-started/"
 
 [[docs]]
   name = "Hugo Modules"
-  weight = 15
+  weight = 40
   identifier = "modules"
   post = "break"
   url = "/hugo-modules/"
 
-# Core Menus
+# Core menus
 
 [[docs]]
   name = "Content Management"
-  weight = 20
+  weight = 50
   identifier = "content-management"
   post = "expanded"
   url = "/content-management/"
 
 [[docs]]
   name = "Templates"
-  weight = 25
+  weight = 60
   identifier = "templates"
-
   url = "/templates/"
 
 [[docs]]
   name = "Functions"
-  weight = 30
+  weight = 70
   identifier = "functions"
   url = "/functions/"
 
 [[docs]]
   name = "Variables"
-  weight = 35
+  weight = 80
   identifier = "variables"
   url = "/variables/"
+
 [[docs]]
   name = "Hugo Pipes"
-  weight = 36
+  weight = 90
   identifier = "pipes"
   url = "/hugo-pipes/"
+
 [[docs]]
   name = "CLI"
-  weight = 40
+  weight = 100
   post = "break"
   identifier = "commands"
   url = "/commands/"
 
-
-
-# LOW LEVEL ITEMS
-
+# Low level items
 
 [[docs]]
   name = "Troubleshooting"
-  weight = 60
+  weight = 110
   identifier = "troubleshooting"
   url = "/troubleshooting/"
 
 [[docs]]
   name = "Tools"
-  weight = 70
+  weight = 120
   identifier = "tools"
   url = "/tools/"
 
 [[docs]]
   name = "Hosting & Deployment"
-  weight = 80
+  weight = 130
   identifier = "hosting-and-deployment"
   url = "/hosting-and-deployment/"
 
 [[docs]]
   name = "Contribute"
-  weight = 100
+  weight = 140
   post = "break"
   identifier = "contribute"
   url = "/contribute/"
 
-#[[docs]]
-#  name = "Tags"
-#  weight = 120
-#  identifier = "tags"
-#  url = "/tags/"
-
-
-# [[docs]]
-#   name = "Categories"
-#   weight = 140
-#   identifier = "categories"
-#   url = "/categories/"
-
 ######## QUICKLINKS
 
-  [[quicklinks]]
-    name = "Fundamentals"
-    weight = 1
-    identifier = "fundamentals"
-    url = "/tags/fundamentals/"
-
-
-
+[[quicklinks]]
+  name = "Fundamentals"
+  weight = 1
+  identifier = "fundamentals"
+  url = "/tags/fundamentals/"
 
 ######## GLOBAL ITEMS TO BE SHARED WITH THE HUGO SITES
 
@@ -118,37 +106,37 @@
     identifier = "news"
     url = "/news/"
 
-  [[global]]
-    name = "Docs"
-    weight = 5
-    identifier = "docs"
-    url = "/documentation/"
-
-  [[global]]
-    name = "Themes"
-    weight = 10
-    identifier = "themes"
-    url = "https://themes.gohugo.io/"
-
-    [[global]]
-      name = "Showcase"
-      weight = 20
-      identifier = "showcase"
-      url = "/showcase/"
-
-  # Anything with a weight > 100 gets an external icon
-  [[global]]
-    name = "Community"
-    weight = 150
-    icon = true
-    identifier = "community"
-    post = "external"
-    url = "https://discourse.gohugo.io/"
-
-
-  [[global]]
-    name = "GitHub"
-    weight = 200
-    identifier = "github"
-    post = "external"
-    url = "https://github.com/gohugoio/hugo"
\ No newline at end of file
+[[global]]
+  name = "Docs"
+  weight = 5
+  identifier = "docs"
+  url = "/documentation/"
+
+[[global]]
+  name = "Themes"
+  weight = 10
+  identifier = "themes"
+  url = "https://themes.gohugo.io/"
+
+[[global]]
+  name = "Showcase"
+  weight = 20
+  identifier = "showcase"
+  url = "/showcase/"
+
+# Anything with a weight > 100 gets an external icon
+
+[[global]]
+  name = "Community"
+  weight = 150
+  icon = true
+  identifier = "community"
+  post = "external"
+  url = "https://discourse.gohugo.io/"
+
+[[global]]
+  name = "GitHub"
+  weight = 200
+  identifier = "github"
+  post = "external"
+  url = "https://github.com/gohugoio/hugo"
diff --git a/docs/config/production/config.toml b/docs/config/production/config.toml
index 961f04d35..a54fe5669 100644
--- a/docs/config/production/config.toml
+++ b/docs/config/production/config.toml
@@ -1,6 +1,6 @@
 # Config for production
 
-# This is turned off in development as it is relatively slow. 
+# This is turned off in development as it is relatively slow.
 # This is needed to get accurate lastMod and Git commit info
 # on the docs pages.
 enableGitInfo = true
\ No newline at end of file