Consolidate site configuration

Merged settings from config.toml in project root into
config/_default/config.toml.

Closes #1596

2 files changed, 16 insertions, 102 deletions

diff --git a/config.toml b/config.toml
deleted file mode 100644
index ef8d99d6d..000000000
--- a/config.toml
+++ /dev/null
@@ -1,80 +0,0 @@
-baseURL = "https://gohugo.io/"
-paginate =  100
-defaultContentLanguage = "en"
-enableEmoji = true
-timeZone = "Europe/Oslo"
-# Set the unicode character used for the "return" link in page footnotes.
-footnotereturnlinkcontents = "↩"
-languageCode = "en-us"
-title = "Hugo"
-
- ignoreErrors = ["error-remote-getjson", "error-missing-instagram-accesstoken"]
-
-
-googleAnalytics = "UA-7131036-4"
-
-pluralizeListTitles = false
-
-# We do redirects via Netlify's _redirects file, generated by Hugo (see "outputs" below).
-disableAliases = true
-
-[minify]
-  [minify.tdewolff]
-    [minify.tdewolff.css]
-    [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"]
-
-[mediaTypes]
-[mediaTypes."text/netlify"]
-delimiter = ""
-
-[outputFormats]
-[outputFormats.REDIR]
-mediatype = "text/netlify"
-baseName = "_redirects"
-isPlainText = true
-notAlternative = true
-[outputFormats.HEADERS]
-mediatype = "text/netlify"
-baseName = "_headers"
-isPlainText = true
-notAlternative = true
-
-[related]
-
-threshold = 80
-includeNewer = true
-toLower = false
-
-[[related.indices]]
-name = "keywords"
-weight = 100
-[[related.indices]]
-name  = "date"
-weight = 10
-pattern = "2006"
-
-[social]
-twitter = "GoHugoIO"
-
-
-[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"
diff --git a/config/_default/config.toml b/config/_default/config.toml
index 4d3bb1f60..f4965dff1 100644
--- a/config/_default/config.toml
+++ b/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]