Merge commit '83bef6955e014d40c0f00db9cebe09113154e999'

375 files changed, 901 insertions, 397 deletions

diff --git a/docs/config.toml b/docs/config.toml
index c66fbd15d..279c24b16 100644
--- a/docs/config.toml
+++ b/docs/config.toml
@@ -271,3 +271,139 @@ anchor = "smart"
     identifier = "github"
     post = "external"
     url = "https://github.com/gohugoio/hugo"
+
+### LANGUAGES ###
+
+[languages]
+  [languages.en]
+    contentDir = "content/en"
+    languageName = "English"
+    weight = 1
+  [languages.zh]
+    contentDir = "content/zh"
+    languageName = "中文"
+    weight = 2
+
+
+### LANGUAGE-SPECIFIC MENUS ###
+
+# Chinese menus
+
+[[languages.zh.menu.docs]]
+  name = "关于 Hugo"
+  weight = 1
+  identifier = "about"
+  url = "/zh/about/"
+
+[[languages.zh.menu.docs]]
+  name = "入门"
+  weight = 5
+  identifier = "getting-started"
+  url = "/zh/getting-started/"
+
+[[languages.zh.menu.docs]]
+  name = "主题"
+  weight = 15
+  identifier = "themes"
+  post = "break"
+  url = "/zh/themes/"
+
+# Core languages.zh.menus
+
+[[languages.zh.menu.docs]]
+  name = "内容管理"
+  weight = 20
+  identifier = "content-management"
+  post = "expanded"
+  url = "/zh/content-management/"
+
+[[languages.zh.menu.docs]]
+  name = "模板"
+  weight = 25
+  identifier = "templates"
+  url = "/zh/templates/"
+
+[[languages.zh.menu.docs]]
+  name = "函数"
+  weight = 30
+  identifier = "functions"
+  url = "/zh/functions/"
+
+[[languages.zh.menu.docs]]
+  name = "变量"
+  weight = 35
+  identifier = "variables"
+  url = "/zh/variables/"
+
+[[languages.zh.menu.docs]]
+  name = "CLI"
+  weight = 40
+  post = "break"
+  identifier = "commands"
+  url = "/commands/"
+
+# LOW LEVEL ITEMS
+[[languages.zh.menu.docs]]
+  name = "故障排除"
+  weight = 60
+  identifier = "troubleshooting"
+  url = "/zh/troubleshooting/"
+
+[[languages.zh.menu.docs]]
+  name = "工具"
+  weight = 70
+  identifier = "tools"
+  url = "/zh/tools/"
+
+[[languages.zh.menu.docs]]
+  name = "托管与部署"
+  weight = 80
+  identifier = "hosting-and-deployment"
+  url = "/zh/hosting-and-deployment/"
+
+[[languages.zh.menu.docs]]
+  name = "贡献"
+  weight = 100
+  post = "break"
+  identifier = "contribute"
+  url = "/zh/contribute/"
+
+[[languages.zh.menu.global]]
+  name = "新闻"
+  weight = 1
+  identifier = "news"
+  url = "/zh/news/"
+
+[[languages.zh.menu.global]]
+  name = "文档"
+  weight = 5
+  identifier = "docs"
+  url = "/zh/documentation/"
+
+[[languages.zh.menu.global]]
+  name = "主题"
+  weight = 10
+  identifier = "themes"
+  url = "https://themes.gohugo.io/"
+
+[[languages.zh.menu.global]]
+  name = "作品展示"
+  weight = 20
+  identifier = "showcase"
+  url = "/zh/showcase/"
+
+# Anything with a weight > 100 gets an external icon
+[[languages.zh.menu.global]]
+  name = "社区"
+  weight = 150
+  icon = true
+  identifier = "community"
+  post = "external"
+  url = "https://discourse.gohugo.io/"
+
+[[languages.zh.menu.global]]
+  name = "GitHub"
+  weight = 200
+  identifier = "github"
+  post = "external"
+  url = "https://github.com/gohugoio/hugo"
diff --git a/docs/content/_index.md b/docs/content/en/_index.md
index 30269eb23..30269eb23 100644
--- a/docs/content/_index.md
+++ b/docs/content/en/_index.md
diff --git a/docs/content/about/_index.md b/docs/content/en/about/_index.md
index 8ed441b61..8ed441b61 100644
--- a/docs/content/about/_index.md
+++ b/docs/content/en/about/_index.md
diff --git a/docs/content/about/benefits.md b/docs/content/en/about/benefits.md
index 0ba28c5cc..0ba28c5cc 100644
--- a/docs/content/about/benefits.md
+++ b/docs/content/en/about/benefits.md
diff --git a/docs/content/about/features.md b/docs/content/en/about/features.md
index 9d29c5bd3..9d29c5bd3 100644
--- a/docs/content/about/features.md
+++ b/docs/content/en/about/features.md
diff --git a/docs/content/about/license.md b/docs/content/en/about/license.md
index a8e7c4abd..a8e7c4abd 100644
--- a/docs/content/about/license.md
+++ b/docs/content/en/about/license.md
diff --git a/docs/content/about/new-in-032/index.md b/docs/content/en/about/new-in-032/index.md
index b8ca6430e..b8ca6430e 100644
--- a/docs/content/about/new-in-032/index.md
+++ b/docs/content/en/about/new-in-032/index.md
diff --git a/docs/content/about/new-in-032/sunset.jpg b/docs/content/en/about/new-in-032/sunset.jpg
index 7d7307bed..7d7307bed 100644
--- a/docs/content/about/new-in-032/sunset.jpg
+++ b/docs/content/en/about/new-in-032/sunset.jpg
diff --git a/docs/content/about/what-is-hugo.md b/docs/content/en/about/what-is-hugo.md
index 2c7339f7c..2c7339f7c 100644
--- a/docs/content/about/what-is-hugo.md
+++ b/docs/content/en/about/what-is-hugo.md
diff --git a/docs/content/commands/hugo.md b/docs/content/en/commands/hugo.md
index 18aed3b75..18aed3b75 100644
--- a/docs/content/commands/hugo.md
+++ b/docs/content/en/commands/hugo.md
diff --git a/docs/content/commands/hugo_benchmark.md b/docs/content/en/commands/hugo_benchmark.md
index 63348c36d..63348c36d 100644
--- a/docs/content/commands/hugo_benchmark.md
+++ b/docs/content/en/commands/hugo_benchmark.md
diff --git a/docs/content/commands/hugo_check.md b/docs/content/en/commands/hugo_check.md
index 239934dc2..239934dc2 100644
--- a/docs/content/commands/hugo_check.md
+++ b/docs/content/en/commands/hugo_check.md
diff --git a/docs/content/commands/hugo_check_ulimit.md b/docs/content/en/commands/hugo_check_ulimit.md
index 340a51259..340a51259 100644
--- a/docs/content/commands/hugo_check_ulimit.md
+++ b/docs/content/en/commands/hugo_check_ulimit.md
diff --git a/docs/content/commands/hugo_config.md b/docs/content/en/commands/hugo_config.md
index 66f3372ac..66f3372ac 100644
--- a/docs/content/commands/hugo_config.md
+++ b/docs/content/en/commands/hugo_config.md
diff --git a/docs/content/commands/hugo_convert.md b/docs/content/en/commands/hugo_convert.md
index 7ed15d309..7ed15d309 100644
--- a/docs/content/commands/hugo_convert.md
+++ b/docs/content/en/commands/hugo_convert.md
diff --git a/docs/content/commands/hugo_convert_toJSON.md b/docs/content/en/commands/hugo_convert_toJSON.md
index 03e2f692e..03e2f692e 100644
--- a/docs/content/commands/hugo_convert_toJSON.md
+++ b/docs/content/en/commands/hugo_convert_toJSON.md
diff --git a/docs/content/commands/hugo_convert_toTOML.md b/docs/content/en/commands/hugo_convert_toTOML.md
index 9abb418bb..9abb418bb 100644
--- a/docs/content/commands/hugo_convert_toTOML.md
+++ b/docs/content/en/commands/hugo_convert_toTOML.md
diff --git a/docs/content/commands/hugo_convert_toYAML.md b/docs/content/en/commands/hugo_convert_toYAML.md
index 8d87896eb..8d87896eb 100644
--- a/docs/content/commands/hugo_convert_toYAML.md
+++ b/docs/content/en/commands/hugo_convert_toYAML.md
diff --git a/docs/content/commands/hugo_env.md b/docs/content/en/commands/hugo_env.md
index b6062724e..b6062724e 100644
--- a/docs/content/commands/hugo_env.md
+++ b/docs/content/en/commands/hugo_env.md
diff --git a/docs/content/commands/hugo_gen.md b/docs/content/en/commands/hugo_gen.md
index 025fe5875..025fe5875 100644
--- a/docs/content/commands/hugo_gen.md
+++ b/docs/content/en/commands/hugo_gen.md
diff --git a/docs/content/commands/hugo_gen_autocomplete.md b/docs/content/en/commands/hugo_gen_autocomplete.md
index 2d327f64d..2d327f64d 100644
--- a/docs/content/commands/hugo_gen_autocomplete.md
+++ b/docs/content/en/commands/hugo_gen_autocomplete.md
diff --git a/docs/content/commands/hugo_gen_chromastyles.md b/docs/content/en/commands/hugo_gen_chromastyles.md
index 4db33e88e..4db33e88e 100644
--- a/docs/content/commands/hugo_gen_chromastyles.md
+++ b/docs/content/en/commands/hugo_gen_chromastyles.md
diff --git a/docs/content/commands/hugo_gen_doc.md b/docs/content/en/commands/hugo_gen_doc.md
index 2abf0c5a3..2abf0c5a3 100644
--- a/docs/content/commands/hugo_gen_doc.md
+++ b/docs/content/en/commands/hugo_gen_doc.md
diff --git a/docs/content/commands/hugo_gen_man.md b/docs/content/en/commands/hugo_gen_man.md
index 50b72d892..50b72d892 100644
--- a/docs/content/commands/hugo_gen_man.md
+++ b/docs/content/en/commands/hugo_gen_man.md
diff --git a/docs/content/commands/hugo_import.md b/docs/content/en/commands/hugo_import.md
index 5dae58bea..5dae58bea 100644
--- a/docs/content/commands/hugo_import.md
+++ b/docs/content/en/commands/hugo_import.md
diff --git a/docs/content/commands/hugo_import_jekyll.md b/docs/content/en/commands/hugo_import_jekyll.md
index c61116c6f..c61116c6f 100644
--- a/docs/content/commands/hugo_import_jekyll.md
+++ b/docs/content/en/commands/hugo_import_jekyll.md
diff --git a/docs/content/commands/hugo_list.md b/docs/content/en/commands/hugo_list.md
index 69c3f8aa8..69c3f8aa8 100644
--- a/docs/content/commands/hugo_list.md
+++ b/docs/content/en/commands/hugo_list.md
diff --git a/docs/content/commands/hugo_list_drafts.md b/docs/content/en/commands/hugo_list_drafts.md
index c5f6251fa..c5f6251fa 100644
--- a/docs/content/commands/hugo_list_drafts.md
+++ b/docs/content/en/commands/hugo_list_drafts.md
diff --git a/docs/content/commands/hugo_list_expired.md b/docs/content/en/commands/hugo_list_expired.md
index 6e5bc37b0..6e5bc37b0 100644
--- a/docs/content/commands/hugo_list_expired.md
+++ b/docs/content/en/commands/hugo_list_expired.md
diff --git a/docs/content/commands/hugo_list_future.md b/docs/content/en/commands/hugo_list_future.md
index 4fc138442..4fc138442 100644
--- a/docs/content/commands/hugo_list_future.md
+++ b/docs/content/en/commands/hugo_list_future.md
diff --git a/docs/content/commands/hugo_new.md b/docs/content/en/commands/hugo_new.md
index 448951c94..448951c94 100644
--- a/docs/content/commands/hugo_new.md
+++ b/docs/content/en/commands/hugo_new.md
diff --git a/docs/content/commands/hugo_new_site.md b/docs/content/en/commands/hugo_new_site.md
index 65316f7cb..65316f7cb 100644
--- a/docs/content/commands/hugo_new_site.md
+++ b/docs/content/en/commands/hugo_new_site.md
diff --git a/docs/content/commands/hugo_new_theme.md b/docs/content/en/commands/hugo_new_theme.md
index a7def203d..a7def203d 100644
--- a/docs/content/commands/hugo_new_theme.md
+++ b/docs/content/en/commands/hugo_new_theme.md
diff --git a/docs/content/commands/hugo_server.md b/docs/content/en/commands/hugo_server.md
index c3ed93bc9..c3ed93bc9 100644
--- a/docs/content/commands/hugo_server.md
+++ b/docs/content/en/commands/hugo_server.md
diff --git a/docs/content/commands/hugo_version.md b/docs/content/en/commands/hugo_version.md
index 308013a4f..308013a4f 100644
--- a/docs/content/commands/hugo_version.md
+++ b/docs/content/en/commands/hugo_version.md
diff --git a/docs/content/content-management/_index.md b/docs/content/en/content-management/_index.md
index 28f2ecf82..28f2ecf82 100644
--- a/docs/content/content-management/_index.md
+++ b/docs/content/en/content-management/_index.md
diff --git a/docs/content/content-management/archetypes.md b/docs/content/en/content-management/archetypes.md
index 902373d83..904ca8c31 100644
--- a/docs/content/content-management/archetypes.md
+++ b/docs/content/en/content-management/archetypes.md
@@ -32,8 +32,8 @@ The above will create a new content file in `content/posts/my-first-post.md` usi
 
 1. `archetypes/posts.md`
 2. `archetypes/default.md`
-3. `themes/my-theme/posts.md`
-4. `themes/my-theme/default.md`
+3. `themes/my-theme/archetypes/posts.md`
+4. `themes/my-theme/archetypes/default.md`
 
 The last two list items is only applicable if you use a theme and it uses the `my-theme` theme name as an example.
 
diff --git a/docs/content/content-management/authors.md b/docs/content/en/content-management/authors.md
index afc94fa62..afc94fa62 100644
--- a/docs/content/content-management/authors.md
+++ b/docs/content/en/content-management/authors.md
diff --git a/docs/content/content-management/comments.md b/docs/content/en/content-management/comments.md
index 20932a825..20932a825 100644
--- a/docs/content/content-management/comments.md
+++ b/docs/content/en/content-management/comments.md
diff --git a/docs/content/content-management/cross-references.md b/docs/content/en/content-management/cross-references.md
index 2980719e9..2980719e9 100644
--- a/docs/content/content-management/cross-references.md
+++ b/docs/content/en/content-management/cross-references.md
diff --git a/docs/content/content-management/formats.md b/docs/content/en/content-management/formats.md
index be6fb40e4..6c53ab467 100644
--- a/docs/content/content-management/formats.md
+++ b/docs/content/en/content-management/formats.md
@@ -29,7 +29,7 @@ Before you begin writing your content in markdown, Blackfriday has a known issue
 
 You can configure multiple aspects of Blackfriday as show in the following list. See the docs on [Configuration][config] for the full list of explicit directions you can give to Hugo when rendering your site.
 
-{{< readfile file="/content/readfiles/bfconfig.md" markdown="true" >}}
+{{< readfile file="/content/en/readfiles/bfconfig.md" markdown="true" >}}
 
 ## Extend Markdown
 
diff --git a/docs/content/content-management/front-matter.md b/docs/content/en/content-management/front-matter.md
index bf067797c..bf067797c 100644
--- a/docs/content/content-management/front-matter.md
+++ b/docs/content/en/content-management/front-matter.md
diff --git a/docs/content/content-management/image-processing/index.md b/docs/content/en/content-management/image-processing/index.md
index ecc85bb51..ecc85bb51 100644
--- a/docs/content/content-management/image-processing/index.md
+++ b/docs/content/en/content-management/image-processing/index.md
diff --git a/docs/content/content-management/image-processing/sunset.jpg b/docs/content/en/content-management/image-processing/sunset.jpg
index 7d7307bed..7d7307bed 100644
--- a/docs/content/content-management/image-processing/sunset.jpg
+++ b/docs/content/en/content-management/image-processing/sunset.jpg
diff --git a/docs/content/content-management/menus.md b/docs/content/en/content-management/menus.md
index c2eadf50f..c2eadf50f 100644
--- a/docs/content/content-management/menus.md
+++ b/docs/content/en/content-management/menus.md
diff --git a/docs/content/content-management/multilingual.md b/docs/content/en/content-management/multilingual.md
index 28a6e4fec..28a6e4fec 100644
--- a/docs/content/content-management/multilingual.md
+++ b/docs/content/en/content-management/multilingual.md
diff --git a/docs/content/content-management/organization/1-featured-content-bundles.png b/docs/content/en/content-management/organization/1-featured-content-bundles.png
index 1706a29d6..1706a29d6 100644
--- a/docs/content/content-management/organization/1-featured-content-bundles.png
+++ b/docs/content/en/content-management/organization/1-featured-content-bundles.png
diff --git a/docs/content/content-management/organization/index.md b/docs/content/en/content-management/organization/index.md
index b810f6179..b810f6179 100644
--- a/docs/content/content-management/organization/index.md
+++ b/docs/content/en/content-management/organization/index.md
diff --git a/docs/content/content-management/page-bundles.md b/docs/content/en/content-management/page-bundles.md
index 34620a5e2..639d81eff 100644
--- a/docs/content/content-management/page-bundles.md
+++ b/docs/content/en/content-management/page-bundles.md
@@ -21,13 +21,16 @@ A Page Bundle can be one of:
 -   Leaf Bundle (leaf means it has no children)
 -   Branch Bundle (home page, section, taxonomy terms, taxonomy list)
 
-|                 | Leaf Bundle                                            | Branch Bundle                                           |
-|-----------------|--------------------------------------------------------|---------------------------------------------------------|
-| Usage           | Collection of resources (pages, images etc.) for single pages    | Collection of non-page resources (images etc.)for list pages |
-| Index file name | `index.md` [^fn:1]                                     | `_index.md` [^fn:1]                                     |
-| Layout type     | `single`                                               | `list`                                                  |
-| Nesting         | Doesn't allow nesting of more bundles under it         | Allows nesting of leaf/branch bundles under it          |
-| Example         | `content/posts/my-post/index.md`                       | `content/posts/_index.md`                               |
+|                                     | Leaf Bundle                                              | Branch Bundle                                                                                                                                                                                                      |
+|-------------------------------------|----------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  |
+| Usage                               | Collection of content and attachments for single pages   | Collection of attachments for section pages (home page, section, taxonomy terms, taxonomy list)                                                                                                                    |
+| Index file name                     | `index.md` [^fn:1]                                       | `_index.md` [^fn:1]                                                                                                                                                                                                |
+| Allowed Resources                   | Page and non-page (like images, pdf, etc.) types         | Only non-page (like images, pdf, etc.) types                                                                                                                                                                       |
+| Where can the Resources live?       | At any directory level within the leaf bundle directory. | Only in the directory level **of** the branch bundle directory i.e. the directory containing the `_index.md` ([ref](https://discourse.gohugo.io/t/question-about-content-folder-structure/11822/4?u=kaushalmodi)). |
+| Layout type                         | `single`                                                 | `list`                                                                                                                                                                                                             |
+| Nesting                             | Does not allow nesting of more bundles under it          | Allows nesting of leaf or branch bundles under it                                                                                                                                                                  |
+| Example                             | `content/posts/my-post/index.md`                         | `content/posts/_index.md`                                                                                                                                                                                          |
+| Content from non-index page files .. | Accessed only as page resources                          | Accessed only as regular pages                                                                                                                                                                                     |
 
 
 ## Leaf Bundles {#leaf-bundles}
diff --git a/docs/content/content-management/page-resources.md b/docs/content/en/content-management/page-resources.md
index cefb1cd47..cefb1cd47 100644
--- a/docs/content/content-management/page-resources.md
+++ b/docs/content/en/content-management/page-resources.md
diff --git a/docs/content/content-management/related.md b/docs/content/en/content-management/related.md
index 6f66e4468..6f66e4468 100644
--- a/docs/content/content-management/related.md
+++ b/docs/content/en/content-management/related.md
diff --git a/docs/content/content-management/sections.md b/docs/content/en/content-management/sections.md
index e53e0feb7..79ae201d4 100644
--- a/docs/content/content-management/sections.md
+++ b/docs/content/en/content-management/sections.md
@@ -81,7 +81,7 @@ With the available [section variables and methods](#section-page-variables-and-m
 
 Also see [Page Variables](/variables/page/).
 
-{{< readfile file="/content/readfiles/sectionvars.md" markdown="true" >}}
+{{< readfile file="/content/en/readfiles/sectionvars.md" markdown="true" >}}
 
 ## Content Section Lists
 
diff --git a/docs/content/content-management/shortcodes.md b/docs/content/en/content-management/shortcodes.md
index e5bc85265..e56873312 100644
--- a/docs/content/content-management/shortcodes.md
+++ b/docs/content/en/content-management/shortcodes.md
@@ -235,7 +235,7 @@ By adding the preceding `hidecaption` example, the following HTML will be added
 
 #### Example `instagram` Display
 
-Using the preceding `instagram` with hidecaption` example above, the following simulates the displayed experience for visitors to your website. Naturally, the final display will be contingent on your stylesheets and surrounding markup.
+Using the preceding `instagram` with `hidecaption` example above, the following simulates the displayed experience for visitors to your website. Naturally, the final display will be contingent on your stylesheets and surrounding markup.
 
 {{< instagram BWNjjyYFxVx hidecaption >}}
 
diff --git a/docs/content/content-management/static-files.md b/docs/content/en/content-management/static-files.md
index fe5ea77e0..fe5ea77e0 100644
--- a/docs/content/content-management/static-files.md
+++ b/docs/content/en/content-management/static-files.md
diff --git a/docs/content/content-management/summaries.md b/docs/content/en/content-management/summaries.md
index 1c341400e..1c341400e 100644
--- a/docs/content/content-management/summaries.md
+++ b/docs/content/en/content-management/summaries.md
diff --git a/docs/content/content-management/syntax-highlighting.md b/docs/content/en/content-management/syntax-highlighting.md
index e7eb011c8..b2d7a4552 100644
--- a/docs/content/content-management/syntax-highlighting.md
+++ b/docs/content/en/content-management/syntax-highlighting.md
@@ -1,6 +1,6 @@
 ---
 title: Syntax Highlighting
-description: Hugo comes with reallly fast syntax highlighting from Chroma.
+description: Hugo comes with really fast syntax highlighting from Chroma.
 date: 2017-02-01
 publishdate: 2017-02-01
 keywords: [highlighting,pygments,chroma,code blocks,syntax]
@@ -18,7 +18,7 @@ toc: true
 
 From Hugo 0.28, the default syntax hightlighter in Hugo is [Chroma](https://github.com/alecthomas/chroma); it is built in Go and is really, really fast -- and for the most important parts compatible with Pygments.
 
-If you want to continue to use Pygments (see below), set `pygmentsUseClassic=true` in your site config.
+If you want to continue to use Pygments (see below), set `pygmentsUseClasses=true` in your site config.
 
 The example below shows a simple code snippet from the Hugo source highlighted with the `highlight` shortcode. Note that the gohugo.io site is generated with `pygmentsUseClasses=true` (see [Generate Syntax Highlighter CSS](#generate-syntax-highlighter-css)).
 
diff --git a/docs/content/content-management/taxonomies.md b/docs/content/en/content-management/taxonomies.md
index 287c6f899..287c6f899 100644
--- a/docs/content/content-management/taxonomies.md
+++ b/docs/content/en/content-management/taxonomies.md
diff --git a/docs/content/content-management/toc.md b/docs/content/en/content-management/toc.md
index 681416a72..681416a72 100644
--- a/docs/content/content-management/toc.md
+++ b/docs/content/en/content-management/toc.md
diff --git a/docs/content/content-management/types.md b/docs/content/en/content-management/types.md
index dc412af19..dc412af19 100644
--- a/docs/content/content-management/types.md
+++ b/docs/content/en/content-management/types.md
diff --git a/docs/content/content-management/urls.md b/docs/content/en/content-management/urls.md
index d33725b72..d33725b72 100644
--- a/docs/content/content-management/urls.md
+++ b/docs/content/en/content-management/urls.md
diff --git a/docs/content/contribute/_index.md b/docs/content/en/contribute/_index.md
index 5e46ae287..5e46ae287 100644
--- a/docs/content/contribute/_index.md
+++ b/docs/content/en/contribute/_index.md
diff --git a/docs/content/contribute/development.md b/docs/content/en/contribute/development.md
index 67bc6c2b6..67bc6c2b6 100644
--- a/docs/content/contribute/development.md
+++ b/docs/content/en/contribute/development.md
diff --git a/docs/content/contribute/documentation.md b/docs/content/en/contribute/documentation.md
index e8603d432..e8603d432 100644
--- a/docs/content/contribute/documentation.md
+++ b/docs/content/en/contribute/documentation.md
diff --git a/docs/content/contribute/themes.md b/docs/content/en/contribute/themes.md
index 256f46093..256f46093 100644
--- a/docs/content/contribute/themes.md
+++ b/docs/content/en/contribute/themes.md
diff --git a/docs/content/documentation.md b/docs/content/en/documentation.md
index 9371dbdf0..9371dbdf0 100644
--- a/docs/content/documentation.md
+++ b/docs/content/en/documentation.md
diff --git a/docs/content/functions/GetPage.md b/docs/content/en/functions/GetPage.md
index 1a8a51c13..1a8a51c13 100644
--- a/docs/content/functions/GetPage.md
+++ b/docs/content/en/functions/GetPage.md
diff --git a/docs/content/functions/NumFmt.md b/docs/content/en/functions/NumFmt.md
index 795eaaea8..795eaaea8 100644
--- a/docs/content/functions/NumFmt.md
+++ b/docs/content/en/functions/NumFmt.md
diff --git a/docs/content/functions/_index.md b/docs/content/en/functions/_index.md
index df10f2ae5..df10f2ae5 100644
--- a/docs/content/functions/_index.md
+++ b/docs/content/en/functions/_index.md
diff --git a/docs/content/functions/abslangurl.md b/docs/content/en/functions/abslangurl.md
index 418ff50fd..418ff50fd 100644
--- a/docs/content/functions/abslangurl.md
+++ b/docs/content/en/functions/abslangurl.md
diff --git a/docs/content/functions/absurl.md b/docs/content/en/functions/absurl.md
index a31dbb0b4..a31dbb0b4 100644
--- a/docs/content/functions/absurl.md
+++ b/docs/content/en/functions/absurl.md
diff --git a/docs/content/functions/adddate.md b/docs/content/en/functions/adddate.md
index 19eabff7f..19eabff7f 100644
--- a/docs/content/functions/adddate.md
+++ b/docs/content/en/functions/adddate.md
diff --git a/docs/content/functions/after.md b/docs/content/en/functions/after.md
index f01ba1436..f01ba1436 100644
--- a/docs/content/functions/after.md
+++ b/docs/content/en/functions/after.md
diff --git a/docs/content/functions/apply.md b/docs/content/en/functions/apply.md
index 9690837d6..9690837d6 100644
--- a/docs/content/functions/apply.md
+++ b/docs/content/en/functions/apply.md
diff --git a/docs/content/functions/base64.md b/docs/content/en/functions/base64.md
index 2f0729b85..2f0729b85 100644
--- a/docs/content/functions/base64.md
+++ b/docs/content/en/functions/base64.md
diff --git a/docs/content/functions/chomp.md b/docs/content/en/functions/chomp.md
index 04fd5e478..04fd5e478 100644
--- a/docs/content/functions/chomp.md
+++ b/docs/content/en/functions/chomp.md
diff --git a/docs/content/functions/cond.md b/docs/content/en/functions/cond.md
index 16c1f105f..16c1f105f 100644
--- a/docs/content/functions/cond.md
+++ b/docs/content/en/functions/cond.md
diff --git a/docs/content/functions/countrunes.md b/docs/content/en/functions/countrunes.md
index 8fdbdadb6..8fdbdadb6 100644
--- a/docs/content/functions/countrunes.md
+++ b/docs/content/en/functions/countrunes.md
diff --git a/docs/content/functions/countwords.md b/docs/content/en/functions/countwords.md
index 44f9360c9..44f9360c9 100644
--- a/docs/content/functions/countwords.md
+++ b/docs/content/en/functions/countwords.md
diff --git a/docs/content/functions/dateformat.md b/docs/content/en/functions/dateformat.md
index 5a7afed97..5a7afed97 100644
--- a/docs/content/functions/dateformat.md
+++ b/docs/content/en/functions/dateformat.md
diff --git a/docs/content/functions/default.md b/docs/content/en/functions/default.md
index 4f34ed37a..4f34ed37a 100644
--- a/docs/content/functions/default.md
+++ b/docs/content/en/functions/default.md
diff --git a/docs/content/functions/delimit.md b/docs/content/en/functions/delimit.md
index 5a92f76e0..083e8baf8 100644
--- a/docs/content/functions/delimit.md
+++ b/docs/content/en/functions/delimit.md
@@ -36,7 +36,7 @@ The examples of `delimit` that follow all use the same front matter:
 {{< code file="delimit-example-front-matter.toml" nocopy="true" >}}
 +++
 title: I love Delimit
-keywords: [ "tag1", "tag2", "tag3" ]
+tags: [ "tag1", "tag2", "tag3" ]
 +++
 {{< /code >}}
 
diff --git a/docs/content/functions/dict.md b/docs/content/en/functions/dict.md
index 9887dbaf9..9887dbaf9 100644
--- a/docs/content/functions/dict.md
+++ b/docs/content/en/functions/dict.md
diff --git a/docs/content/functions/echoparam.md b/docs/content/en/functions/echoparam.md
index 47e35f5c7..47e35f5c7 100644
--- a/docs/content/functions/echoparam.md
+++ b/docs/content/en/functions/echoparam.md
diff --git a/docs/content/functions/emojify.md b/docs/content/en/functions/emojify.md
index 2e82d8a08..2e82d8a08 100644
--- a/docs/content/functions/emojify.md
+++ b/docs/content/en/functions/emojify.md
diff --git a/docs/content/functions/eq.md b/docs/content/en/functions/eq.md
index 77f75db37..77f75db37 100644
--- a/docs/content/functions/eq.md
+++ b/docs/content/en/functions/eq.md
diff --git a/docs/content/functions/errorf.md b/docs/content/en/functions/errorf.md
index 9105ff840..9105ff840 100644
--- a/docs/content/functions/errorf.md
+++ b/docs/content/en/functions/errorf.md
diff --git a/docs/content/functions/fileExists.md b/docs/content/en/functions/fileExists.md
index 3d535aaca..3d535aaca 100644
--- a/docs/content/functions/fileExists.md
+++ b/docs/content/en/functions/fileExists.md
diff --git a/docs/content/functions/findRe.md b/docs/content/en/functions/findRe.md
index 23817c575..23817c575 100644
--- a/docs/content/functions/findRe.md
+++ b/docs/content/en/functions/findRe.md
diff --git a/docs/content/functions/first.md b/docs/content/en/functions/first.md
index 29ba3ac1c..29ba3ac1c 100644
--- a/docs/content/functions/first.md
+++ b/docs/content/en/functions/first.md
diff --git a/docs/content/functions/float.md b/docs/content/en/functions/float.md
index 2a5f7579c..2a5f7579c 100644
--- a/docs/content/functions/float.md
+++ b/docs/content/en/functions/float.md
diff --git a/docs/content/functions/format.md b/docs/content/en/functions/format.md
index 1d498cc3b..1d498cc3b 100644
--- a/docs/content/functions/format.md
+++ b/docs/content/en/functions/format.md
diff --git a/docs/content/functions/ge.md b/docs/content/en/functions/ge.md
index ecc2a0223..ecc2a0223 100644
--- a/docs/content/functions/ge.md
+++ b/docs/content/en/functions/ge.md
diff --git a/docs/content/functions/get.md b/docs/content/en/functions/get.md
index f6d6a6e31..f6d6a6e31 100644
--- a/docs/content/functions/get.md
+++ b/docs/content/en/functions/get.md
diff --git a/docs/content/functions/getenv.md b/docs/content/en/functions/getenv.md
index 8153cc07c..8153cc07c 100644
--- a/docs/content/functions/getenv.md
+++ b/docs/content/en/functions/getenv.md
diff --git a/docs/content/functions/gt.md b/docs/content/en/functions/gt.md
index 75b5fff0f..75b5fff0f 100644
--- a/docs/content/functions/gt.md
+++ b/docs/content/en/functions/gt.md
diff --git a/docs/content/functions/hasPrefix.md b/docs/content/en/functions/hasPrefix.md
index 3deac60c3..3deac60c3 100644
--- a/docs/content/functions/hasPrefix.md
+++ b/docs/content/en/functions/hasPrefix.md
diff --git a/docs/content/functions/haschildren.md b/docs/content/en/functions/haschildren.md
index ff1b796cc..ff1b796cc 100644
--- a/docs/content/functions/haschildren.md
+++ b/docs/content/en/functions/haschildren.md
diff --git a/docs/content/functions/hasmenucurrent.md b/docs/content/en/functions/hasmenucurrent.md
index eac41103e..eac41103e 100644
--- a/docs/content/functions/hasmenucurrent.md
+++ b/docs/content/en/functions/hasmenucurrent.md
diff --git a/docs/content/functions/highlight.md b/docs/content/en/functions/highlight.md
index f0845227d..f0845227d 100644
--- a/docs/content/functions/highlight.md
+++ b/docs/content/en/functions/highlight.md
diff --git a/docs/content/functions/htmlEscape.md b/docs/content/en/functions/htmlEscape.md
index a1a2d6d55..a1a2d6d55 100644
--- a/docs/content/functions/htmlEscape.md
+++ b/docs/content/en/functions/htmlEscape.md
diff --git a/docs/content/functions/htmlUnescape.md b/docs/content/en/functions/htmlUnescape.md
index d0ef7540c..d0ef7540c 100644
--- a/docs/content/functions/htmlUnescape.md
+++ b/docs/content/en/functions/htmlUnescape.md
diff --git a/docs/content/functions/humanize.md b/docs/content/en/functions/humanize.md
index 2b9a98132..2b9a98132 100644
--- a/docs/content/functions/humanize.md
+++ b/docs/content/en/functions/humanize.md
diff --git a/docs/content/functions/i18n.md b/docs/content/en/functions/i18n.md
index c4b89c322..c4b89c322 100644
--- a/docs/content/functions/i18n.md
+++ b/docs/content/en/functions/i18n.md
diff --git a/docs/content/functions/imageConfig.md b/docs/content/en/functions/imageConfig.md
index 614d04711..614d04711 100644
--- a/docs/content/functions/imageConfig.md
+++ b/docs/content/en/functions/imageConfig.md
diff --git a/docs/content/functions/in.md b/docs/content/en/functions/in.md
index d3a27bc87..d3a27bc87 100644
--- a/docs/content/functions/in.md
+++ b/docs/content/en/functions/in.md
diff --git a/docs/content/functions/index-function.md b/docs/content/en/functions/index-function.md
index e5f039caf..e5f039caf 100644
--- a/docs/content/functions/index-function.md
+++ b/docs/content/en/functions/index-function.md
diff --git a/docs/content/functions/int.md b/docs/content/en/functions/int.md
index f5416c1dc..f5416c1dc 100644
--- a/docs/content/functions/int.md
+++ b/docs/content/en/functions/int.md
diff --git a/docs/content/functions/intersect.md b/docs/content/en/functions/intersect.md
index a607ff217..a607ff217 100644
--- a/docs/content/functions/intersect.md
+++ b/docs/content/en/functions/intersect.md
diff --git a/docs/content/functions/ismenucurrent.md b/docs/content/en/functions/ismenucurrent.md
index 647dcdcf0..647dcdcf0 100644
--- a/docs/content/functions/ismenucurrent.md
+++ b/docs/content/en/functions/ismenucurrent.md
diff --git a/docs/content/functions/isset.md b/docs/content/en/functions/isset.md
index 8f2c3f7ad..8f2c3f7ad 100644
--- a/docs/content/functions/isset.md
+++ b/docs/content/en/functions/isset.md
diff --git a/docs/content/functions/jsonify.md b/docs/content/en/functions/jsonify.md
index 5c670244f..5c670244f 100644
--- a/docs/content/functions/jsonify.md
+++ b/docs/content/en/functions/jsonify.md
diff --git a/docs/content/functions/lang.Merge.md b/docs/content/en/functions/lang.Merge.md
index 6e1d41c0f..6e1d41c0f 100644
--- a/docs/content/functions/lang.Merge.md
+++ b/docs/content/en/functions/lang.Merge.md
diff --git a/docs/content/functions/last.md b/docs/content/en/functions/last.md
index ea633837b..ea633837b 100644
--- a/docs/content/functions/last.md
+++ b/docs/content/en/functions/last.md
diff --git a/docs/content/functions/le.md b/docs/content/en/functions/le.md
index 054937f08..054937f08 100644
--- a/docs/content/functions/le.md
+++ b/docs/content/en/functions/le.md
diff --git a/docs/content/functions/len.md b/docs/content/en/functions/len.md
index b8e380e49..b8e380e49 100644
--- a/docs/content/functions/len.md
+++ b/docs/content/en/functions/len.md
diff --git a/docs/content/functions/lower.md b/docs/content/en/functions/lower.md
index a42081b68..a42081b68 100644
--- a/docs/content/functions/lower.md
+++ b/docs/content/en/functions/lower.md
diff --git a/docs/content/functions/lt.md b/docs/content/en/functions/lt.md
index 288d59446..288d59446 100644
--- a/docs/content/functions/lt.md
+++ b/docs/content/en/functions/lt.md
diff --git a/docs/content/functions/markdownify.md b/docs/content/en/functions/markdownify.md
index 50cf3e120..50cf3e120 100644
--- a/docs/content/functions/markdownify.md
+++ b/docs/content/en/functions/markdownify.md
diff --git a/docs/content/functions/math.md b/docs/content/en/functions/math.md
index eb38fdd0b..eb38fdd0b 100644
--- a/docs/content/functions/math.md
+++ b/docs/content/en/functions/math.md
diff --git a/docs/content/functions/md5.md b/docs/content/en/functions/md5.md
index 31197f218..31197f218 100644
--- a/docs/content/functions/md5.md
+++ b/docs/content/en/functions/md5.md
diff --git a/docs/content/functions/ne.md b/docs/content/en/functions/ne.md
index b672d730c..b672d730c 100644
--- a/docs/content/functions/ne.md
+++ b/docs/content/en/functions/ne.md
diff --git a/docs/content/functions/now.md b/docs/content/en/functions/now.md
index fcd86231e..8c706835b 100644
--- a/docs/content/functions/now.md
+++ b/docs/content/en/functions/now.md
@@ -21,7 +21,7 @@ aliases: []
 
 See [`time.Time`](https://godoc.org/time#Time).
 
-For example, building your site on June 24, 2017 with the following templating:
+For example, building your site on June 24, 2017, with the following templating:
 
 ```
 <div>
@@ -29,7 +29,7 @@ For example, building your site on June 24, 2017 with the following templating:
 </div>
 ```
 
-Which will produce the following:
+would produce the following:
 
 ```
 <div>
@@ -40,5 +40,11 @@ Which will produce the following:
 The above example uses the [`.Format` function](/functions/format), which page includes a full listing of date formatting using Golang's layout string.
 
 {{% note %}}
-Older Hugo themes may use the deprecated `.Now` (uppercase). Be sure to use the lowercase `.now` in your templating.
+Older Hugo themes may still be using the obsolete Page’s `.Now` (uppercase with leading dot), which causes build error that looks like the following:
+
+    ERROR ... Error while rendering "..." in "...": ...
+    executing "..." at <.Now.Format>:
+    can't evaluate field Now in type *hugolib.PageOutput
+
+Be sure to use `now` (lowercase with _**no**_ leading dot) in your templating.
 {{% /note %}}
diff --git a/docs/content/functions/param.md b/docs/content/en/functions/param.md
index 6e81bb025..6e81bb025 100644
--- a/docs/content/functions/param.md
+++ b/docs/content/en/functions/param.md
diff --git a/docs/content/functions/partialCached.md b/docs/content/en/functions/partialCached.md
index 515143d46..515143d46 100644
--- a/docs/content/functions/partialCached.md
+++ b/docs/content/en/functions/partialCached.md
diff --git a/docs/content/functions/plainify.md b/docs/content/en/functions/plainify.md
index 89e7880cd..89e7880cd 100644
--- a/docs/content/functions/plainify.md
+++ b/docs/content/en/functions/plainify.md
diff --git a/docs/content/functions/pluralize.md b/docs/content/en/functions/pluralize.md
index 49ce39344..49ce39344 100644
--- a/docs/content/functions/pluralize.md
+++ b/docs/content/en/functions/pluralize.md
diff --git a/docs/content/functions/print.md b/docs/content/en/functions/print.md
index fffbb79dc..fffbb79dc 100644
--- a/docs/content/functions/print.md
+++ b/docs/content/en/functions/print.md
diff --git a/docs/content/functions/printf.md b/docs/content/en/functions/printf.md
index dabb97c05..dabb97c05 100644
--- a/docs/content/functions/printf.md
+++ b/docs/content/en/functions/printf.md
diff --git a/docs/content/functions/println.md b/docs/content/en/functions/println.md
index 36dbfaed6..36dbfaed6 100644
--- a/docs/content/functions/println.md
+++ b/docs/content/en/functions/println.md
diff --git a/docs/content/functions/querify.md b/docs/content/en/functions/querify.md
index e90e07450..e90e07450 100644
--- a/docs/content/functions/querify.md
+++ b/docs/content/en/functions/querify.md
diff --git a/docs/content/functions/range.md b/docs/content/en/functions/range.md
index 6f007e93d..6f007e93d 100644
--- a/docs/content/functions/range.md
+++ b/docs/content/en/functions/range.md
diff --git a/docs/content/functions/readdir.md b/docs/content/en/functions/readdir.md
index 21f626692..21f626692 100644
--- a/docs/content/functions/readdir.md
+++ b/docs/content/en/functions/readdir.md
diff --git a/docs/content/functions/readfile.md b/docs/content/en/functions/readfile.md
index bcd845c96..bcd845c96 100644
--- a/docs/content/functions/readfile.md
+++ b/docs/content/en/functions/readfile.md
diff --git a/docs/content/functions/ref.md b/docs/content/en/functions/ref.md
index d63c0a89d..d63c0a89d 100644
--- a/docs/content/functions/ref.md
+++ b/docs/content/en/functions/ref.md
diff --git a/docs/content/functions/relLangURL.md b/docs/content/en/functions/relLangURL.md
index 7b70c1117..7b70c1117 100644
--- a/docs/content/functions/relLangURL.md
+++ b/docs/content/en/functions/relLangURL.md
diff --git a/docs/content/functions/relref.md b/docs/content/en/functions/relref.md
index ea992af2f..ea992af2f 100644
--- a/docs/content/functions/relref.md
+++ b/docs/content/en/functions/relref.md
diff --git a/docs/content/functions/relurl.md b/docs/content/en/functions/relurl.md
index aa1536544..aa1536544 100644
--- a/docs/content/functions/relurl.md
+++ b/docs/content/en/functions/relurl.md
diff --git a/docs/content/functions/render.md b/docs/content/en/functions/render.md
index a4abfa81d..a4abfa81d 100644
--- a/docs/content/functions/render.md
+++ b/docs/content/en/functions/render.md
diff --git a/docs/content/functions/replace.md b/docs/content/en/functions/replace.md
index aeb19f296..aeb19f296 100644
--- a/docs/content/functions/replace.md
+++ b/docs/content/en/functions/replace.md
diff --git a/docs/content/functions/replacere.md b/docs/content/en/functions/replacere.md
index 0571c92b2..0571c92b2 100644
--- a/docs/content/functions/replacere.md
+++ b/docs/content/en/functions/replacere.md
diff --git a/docs/content/functions/safeCSS.md b/docs/content/en/functions/safeCSS.md
index 11c10923b..11c10923b 100644
--- a/docs/content/functions/safeCSS.md
+++ b/docs/content/en/functions/safeCSS.md
diff --git a/docs/content/functions/safeHTML.md b/docs/content/en/functions/safeHTML.md
index 5a59fc2cb..5a59fc2cb 100644
--- a/docs/content/functions/safeHTML.md
+++ b/docs/content/en/functions/safeHTML.md
diff --git a/docs/content/functions/safeHTMLAttr.md b/docs/content/en/functions/safeHTMLAttr.md
index a5ecaa68b..a5ecaa68b 100644
--- a/docs/content/functions/safeHTMLAttr.md
+++ b/docs/content/en/functions/safeHTMLAttr.md
diff --git a/docs/content/functions/safeJS.md b/docs/content/en/functions/safeJS.md
index e614e48bf..e614e48bf 100644
--- a/docs/content/functions/safeJS.md
+++ b/docs/content/en/functions/safeJS.md
diff --git a/docs/content/functions/safeURL.md b/docs/content/en/functions/safeURL.md
index cb9979cd3..cb9979cd3 100644
--- a/docs/content/functions/safeURL.md
+++ b/docs/content/en/functions/safeURL.md
diff --git a/docs/content/functions/scratch.md b/docs/content/en/functions/scratch.md
index 9df78fe43..9df78fe43 100644
--- a/docs/content/functions/scratch.md
+++ b/docs/content/en/functions/scratch.md
diff --git a/docs/content/functions/seq.md b/docs/content/en/functions/seq.md
index 8bef589c5..8bef589c5 100644
--- a/docs/content/functions/seq.md
+++ b/docs/content/en/functions/seq.md
diff --git a/docs/content/functions/sha.md b/docs/content/en/functions/sha.md
index 4e1243469..4e1243469 100644
--- a/docs/content/functions/sha.md
+++ b/docs/content/en/functions/sha.md
diff --git a/docs/content/functions/shuffle.md b/docs/content/en/functions/shuffle.md
index 9945ba752..9945ba752 100644
--- a/docs/content/functions/shuffle.md
+++ b/docs/content/en/functions/shuffle.md
diff --git a/docs/content/functions/singularize.md b/docs/content/en/functions/singularize.md
index 885eae23d..885eae23d 100644
--- a/docs/content/functions/singularize.md
+++ b/docs/content/en/functions/singularize.md
diff --git a/docs/content/functions/slice.md b/docs/content/en/functions/slice.md
index c8847c0c2..c8847c0c2 100644
--- a/docs/content/functions/slice.md
+++ b/docs/content/en/functions/slice.md
diff --git a/docs/content/functions/slicestr.md b/docs/content/en/functions/slicestr.md
index 3d245de3d..3d245de3d 100644
--- a/docs/content/functions/slicestr.md
+++ b/docs/content/en/functions/slicestr.md
diff --git a/docs/content/functions/sort.md b/docs/content/en/functions/sort.md
index b83e6b0bd..b83e6b0bd 100644
--- a/docs/content/functions/sort.md
+++ b/docs/content/en/functions/sort.md
diff --git a/docs/content/functions/split.md b/docs/content/en/functions/split.md
index c42f8eb9d..c42f8eb9d 100644
--- a/docs/content/functions/split.md
+++ b/docs/content/en/functions/split.md
diff --git a/docs/content/functions/string.md b/docs/content/en/functions/string.md
index d1e1962de..d1e1962de 100644
--- a/docs/content/functions/string.md
+++ b/docs/content/en/functions/string.md
diff --git a/docs/content/functions/strings.TrimLeft.md b/docs/content/en/functions/strings.TrimLeft.md
index 246facd62..246facd62 100644
--- a/docs/content/functions/strings.TrimLeft.md
+++ b/docs/content/en/functions/strings.TrimLeft.md
diff --git a/docs/content/functions/strings.TrimPrefix.md b/docs/content/en/functions/strings.TrimPrefix.md
index eeeecf76e..eeeecf76e 100644
--- a/docs/content/functions/strings.TrimPrefix.md
+++ b/docs/content/en/functions/strings.TrimPrefix.md
diff --git a/docs/content/functions/strings.TrimRight.md b/docs/content/en/functions/strings.TrimRight.md
index 44cb9edcf..44cb9edcf 100644
--- a/docs/content/functions/strings.TrimRight.md
+++ b/docs/content/en/functions/strings.TrimRight.md
diff --git a/docs/content/functions/strings.TrimSuffix.md b/docs/content/en/functions/strings.TrimSuffix.md
index 208e0968d..208e0968d 100644
--- a/docs/content/functions/strings.TrimSuffix.md
+++ b/docs/content/en/functions/strings.TrimSuffix.md
diff --git a/docs/content/functions/substr.md b/docs/content/en/functions/substr.md
index 9dde05ec9..9dde05ec9 100644
--- a/docs/content/functions/substr.md
+++ b/docs/content/en/functions/substr.md
diff --git a/docs/content/functions/time.md b/docs/content/en/functions/time.md
index 306d32649..306d32649 100644
--- a/docs/content/functions/time.md
+++ b/docs/content/en/functions/time.md
diff --git a/docs/content/functions/title.md b/docs/content/en/functions/title.md
index 63a34835f..63a34835f 100644
--- a/docs/content/functions/title.md
+++ b/docs/content/en/functions/title.md
diff --git a/docs/content/functions/trim.md b/docs/content/en/functions/trim.md
index 81ed05c60..81ed05c60 100644
--- a/docs/content/functions/trim.md
+++ b/docs/content/en/functions/trim.md
diff --git a/docs/content/functions/truncate.md b/docs/content/en/functions/truncate.md
index 0336853c1..0336853c1 100644
--- a/docs/content/functions/truncate.md
+++ b/docs/content/en/functions/truncate.md
diff --git a/docs/content/functions/union.md b/docs/content/en/functions/union.md
index 5c93e4bc7..5c93e4bc7 100644
--- a/docs/content/functions/union.md
+++ b/docs/content/en/functions/union.md
diff --git a/docs/content/functions/uniq.md b/docs/content/en/functions/uniq.md
index 9692b247e..9692b247e 100644
--- a/docs/content/functions/uniq.md
+++ b/docs/content/en/functions/uniq.md
diff --git a/docs/content/functions/unix.md b/docs/content/en/functions/unix.md
index a373475f6..a373475f6 100644
--- a/docs/content/functions/unix.md
+++ b/docs/content/en/functions/unix.md
diff --git a/docs/content/functions/upper.md b/docs/content/en/functions/upper.md
index 2d75b37bd..2d75b37bd 100644
--- a/docs/content/functions/upper.md
+++ b/docs/content/en/functions/upper.md
diff --git a/docs/content/functions/urlize.md b/docs/content/en/functions/urlize.md
index 0fd7c2295..0fd7c2295 100644
--- a/docs/content/functions/urlize.md
+++ b/docs/content/en/functions/urlize.md
diff --git a/docs/content/functions/urls.Parse.md b/docs/content/en/functions/urls.Parse.md
index 6d0ade0f8..6d0ade0f8 100644
--- a/docs/content/functions/urls.Parse.md
+++ b/docs/content/en/functions/urls.Parse.md
diff --git a/docs/content/functions/where.md b/docs/content/en/functions/where.md
index eb3111215..eb3111215 100644
--- a/docs/content/functions/where.md
+++ b/docs/content/en/functions/where.md
diff --git a/docs/content/functions/with.md b/docs/content/en/functions/with.md
index 3fad8bd9c..3fad8bd9c 100644
--- a/docs/content/functions/with.md
+++ b/docs/content/en/functions/with.md
diff --git a/docs/content/getting-started/_index.md b/docs/content/en/getting-started/_index.md
index 478d1eaa6..478d1eaa6 100644
--- a/docs/content/getting-started/_index.md
+++ b/docs/content/en/getting-started/_index.md
diff --git a/docs/content/getting-started/code-toggle.md b/docs/content/en/getting-started/code-toggle.md
index 3e6b7da0d..3e6b7da0d 100644
--- a/docs/content/getting-started/code-toggle.md
+++ b/docs/content/en/getting-started/code-toggle.md
diff --git a/docs/content/getting-started/configuration.md b/docs/content/en/getting-started/configuration.md
index 23fceb56f..518e4a2cc 100644
--- a/docs/content/getting-started/configuration.md
+++ b/docs/content/en/getting-started/configuration.md
@@ -369,7 +369,7 @@ Hugo typically configures Blackfriday with sane default values that should fit m
 
 However, if you have specific needs with respect to Markdown, Hugo exposes some of its Blackfriday behavior options for you to alter. The following table lists these Hugo options, paired with the corresponding flags from Blackfriday's source code ( [html.go](https://github.com/russross/blackfriday/blob/master/html.go) and [markdown.go](https://github.com/russross/blackfriday/blob/master/markdown.go)).
 
-{{< readfile file="/content/readfiles/bfconfig.md" markdown="true" >}}
+{{< readfile file="/content/en/readfiles/bfconfig.md" markdown="true" >}}
 
 {{% note %}}
 1. Blackfriday flags are *case sensitive* as of Hugo v0.15.
diff --git a/docs/content/getting-started/directory-structure.md b/docs/content/en/getting-started/directory-structure.md
index ebfe6646a..ebfe6646a 100644
--- a/docs/content/getting-started/directory-structure.md
+++ b/docs/content/en/getting-started/directory-structure.md
diff --git a/docs/content/getting-started/installing.md b/docs/content/en/getting-started/installing.md
index bf0bde50d..bf0bde50d 100644
--- a/docs/content/getting-started/installing.md
+++ b/docs/content/en/getting-started/installing.md
diff --git a/docs/content/getting-started/quick-start.md b/docs/content/en/getting-started/quick-start.md
index 59a8513c8..59a8513c8 100644
--- a/docs/content/getting-started/quick-start.md
+++ b/docs/content/en/getting-started/quick-start.md
diff --git a/docs/content/getting-started/usage.md b/docs/content/en/getting-started/usage.md
index 2ad2910f8..2ad2910f8 100644
--- a/docs/content/getting-started/usage.md
+++ b/docs/content/en/getting-started/usage.md
diff --git a/docs/content/hosting-and-deployment/_index.md b/docs/content/en/hosting-and-deployment/_index.md
index ea9f60f17..ea9f60f17 100644
--- a/docs/content/hosting-and-deployment/_index.md
+++ b/docs/content/en/hosting-and-deployment/_index.md
diff --git a/docs/content/hosting-and-deployment/deployment-with-nanobox.md b/docs/content/en/hosting-and-deployment/deployment-with-nanobox.md
index 245e9544a..245e9544a 100644
--- a/docs/content/hosting-and-deployment/deployment-with-nanobox.md
+++ b/docs/content/en/hosting-and-deployment/deployment-with-nanobox.md
diff --git a/docs/content/hosting-and-deployment/deployment-with-rsync.md b/docs/content/en/hosting-and-deployment/deployment-with-rsync.md
index e8222ad54..e8222ad54 100644
--- a/docs/content/hosting-and-deployment/deployment-with-rsync.md
+++ b/docs/content/en/hosting-and-deployment/deployment-with-rsync.md
diff --git a/docs/content/hosting-and-deployment/deployment-with-wercker.md b/docs/content/en/hosting-and-deployment/deployment-with-wercker.md
index ac9d7a3e6..ac9d7a3e6 100644
--- a/docs/content/hosting-and-deployment/deployment-with-wercker.md
+++ b/docs/content/en/hosting-and-deployment/deployment-with-wercker.md
diff --git a/docs/content/hosting-and-deployment/hosting-on-bitbucket.md b/docs/content/en/hosting-and-deployment/hosting-on-bitbucket.md
index f66abed5d..f66abed5d 100644
--- a/docs/content/hosting-and-deployment/hosting-on-bitbucket.md
+++ b/docs/content/en/hosting-and-deployment/hosting-on-bitbucket.md
diff --git a/docs/content/hosting-and-deployment/hosting-on-firebase.md b/docs/content/en/hosting-and-deployment/hosting-on-firebase.md
index ef387cdce..ef387cdce 100644
--- a/docs/content/hosting-and-deployment/hosting-on-firebase.md
+++ b/docs/content/en/hosting-and-deployment/hosting-on-firebase.md
diff --git a/docs/content/hosting-and-deployment/hosting-on-github.md b/docs/content/en/hosting-and-deployment/hosting-on-github.md
index 37b82ab2b..37b82ab2b 100644
--- a/docs/content/hosting-and-deployment/hosting-on-github.md
+++ b/docs/content/en/hosting-and-deployment/hosting-on-github.md
diff --git a/docs/content/hosting-and-deployment/hosting-on-gitlab.md b/docs/content/en/hosting-and-deployment/hosting-on-gitlab.md
index c38908cae..c38908cae 100644
--- a/docs/content/hosting-and-deployment/hosting-on-gitlab.md
+++ b/docs/content/en/hosting-and-deployment/hosting-on-gitlab.md
diff --git a/docs/content/hosting-and-deployment/hosting-on-keycdn.md b/docs/content/en/hosting-and-deployment/hosting-on-keycdn.md
index 05bac2ff4..05bac2ff4 100644
--- a/docs/content/hosting-and-deployment/hosting-on-keycdn.md
+++ b/docs/content/en/hosting-and-deployment/hosting-on-keycdn.md
diff --git a/docs/content/hosting-and-deployment/hosting-on-netlify.md b/docs/content/en/hosting-and-deployment/hosting-on-netlify.md
index fca639fac..fca639fac 100644
--- a/docs/content/hosting-and-deployment/hosting-on-netlify.md
+++ b/docs/content/en/hosting-and-deployment/hosting-on-netlify.md
diff --git a/docs/content/maintenance/_index.md b/docs/content/en/maintenance/_index.md
index 691a5d47c..691a5d47c 100644
--- a/docs/content/maintenance/_index.md
+++ b/docs/content/en/maintenance/_index.md
diff --git a/docs/content/news/0-16.md b/docs/content/en/news/0.16-relnotes/index.md
index e33f8e546..72839eea5 100644
--- a/docs/content/news/0-16.md
+++ b/docs/content/en/news/0.16-relnotes/index.md
@@ -3,6 +3,7 @@ date: 2016-06-06T13:54:06-04:00
 description: "Hugo 0.16 is our best and biggest release ever. The Hugo community has outdone itself with continued performance improvements, beautiful themes and increased stability."
 title: "Hugo 0.16"
 categories: ["Releases"]
+aliases: [/0-16/]
 ---
 
 Hugo 0.16 is our best and biggest release ever. The Hugo community has
diff --git a/docs/content/news/0-17.md b/docs/content/en/news/0.17-relnotes/index.md
index 6c5245592..034e8e891 100644
--- a/docs/content/news/0-17.md
+++ b/docs/content/en/news/0.17-relnotes/index.md
@@ -6,6 +6,7 @@ description: "Hugo now supports multilingual sites with the most simple and eleg
 link: ""
 title: "0.17: Hugo is going global"
 draft: false
+aliases: [/0-17/]
 ---
 Hugo is going global with our 0.17 release.  We put a lot of thought into how we could extend Hugo
 to support multilingual websites with the most simple and elegant experience. Hugo's multilingual
diff --git a/docs/content/news/0-18.md b/docs/content/en/news/0.18-relnotes/index.md
index 085d7fa0f..5aaab9ffe 100644
--- a/docs/content/news/0-18.md
+++ b/docs/content/en/news/0.18-relnotes/index.md
@@ -6,6 +6,7 @@ link: ""
 title: "Hugo 0.18"
 draft: false
 author: bep
+aliases: [/0-18/]
 ---
 
 Hugo 0.18.1 is a bug fix release fixing some issues introduced in Hugo 0.18:
diff --git a/docs/content/news/0-19.md b/docs/content/en/news/0.19-relnotes/index.md
index 5ccc94ca0..5c53b057d 100644
--- a/docs/content/news/0-19.md
+++ b/docs/content/en/news/0.19-relnotes/index.md
@@ -6,6 +6,7 @@ link: ""
 title: "Hugo 0.19"
 draft: false
 author: budparr
+aliases: [/0-19/]
 ---
 
 We're happy to announce the first release of Hugo in 2017.
diff --git a/docs/content/news/0-20.md b/docs/content/en/news/0.20-relnotes/index.md
index 7afd02135..75e944a6c 100644
--- a/docs/content/news/0-20.md
+++ b/docs/content/en/news/0.20-relnotes/index.md
@@ -6,6 +6,7 @@ link: ""
 title: "Hugo 0.20"
 draft: false
 author: bep
+aliases: [/0-20/]
 ---
 
 Hugo `0.20` introduces the powerful and long sought after feature [Custom Output Formats](http://gohugo.io/extras/output-formats/); Hugo isn’t just that “static HTML with an added RSS feed” anymore. _Say hello_ to calendars, e-book formats, Google AMP, and JSON search indexes, to name a few ( [#2828](//github.com/gohugoio/hugo/issues/2828) ).
diff --git a/docs/content/news/0-20-1.md b/docs/content/en/news/0.20.1-relnotes/index.md
index 53350d741..109737bb3 100644
--- a/docs/content/news/0-20-1.md
+++ b/docs/content/en/news/0.20.1-relnotes/index.md
@@ -6,6 +6,7 @@ link: ""
 title: "Hugo 0.20.1"
 draft: false
 author: bep
+aliases: [/0-20-1/]
 ---
 
 *   Fix logic for base template in work dir vs in the theme [#3323](//github.com/gohugoio/hugo/issues/3323)
diff --git a/docs/content/news/0-20-2.md b/docs/content/en/news/0.20.2-relnotes/index.md
index c4aaf9d5b..3ee08411d 100644
--- a/docs/content/news/0-20-2.md
+++ b/docs/content/en/news/0.20.2-relnotes/index.md
@@ -6,6 +6,7 @@ link: ""
 title: "Hugo 0.20.2"
 draft: false
 author: bep
+aliases: [/0-20-2/]
 ---
 
 Hugo `0.20.2` adds support for plain text partials included into `HTML` templates. This was a side-effect of the big new [Custom Output Format](https://gohugo.io/extras/output-formats/) feature in `0.20`, and while the change was intentional and there was an ongoing discussion about fixing it in [#3273](//github.com/gohugoio/hugo/issues/3273), it did break some themes. There were valid workarounds for these themes, but we might as well get it right.
diff --git a/docs/content/news/0-20-3.md b/docs/content/en/news/0.20.3-relnotes/index.md
index 98176f3c4..c79d9b202 100644
--- a/docs/content/news/0-20-3.md
+++ b/docs/content/en/news/0.20.3-relnotes/index.md
@@ -6,6 +6,7 @@ link: ""
 title: "Hugo 0.20.3"
 draft: false
 author: bep
+aliases: [/0-20-3/]
 ---
 
 This is a bug-fix release with one important fix. But it also adds some harness around [GoReleaser](https://github.com/goreleaser/goreleaser) to automate the Hugo release process. Big thanks to [@caarlos0](https://github.com/caarlos0) for great and super-fast support fixing issues along the way.
diff --git a/docs/content/news/0-20-4.md b/docs/content/en/news/0.20.4-relnotes/index.md
index f67939faf..2fde30e14 100644
--- a/docs/content/news/0-20-4.md
+++ b/docs/content/en/news/0.20.4-relnotes/index.md
@@ -6,6 +6,7 @@ link: ""
 title: "Hugo 0.20.4"
 draft: false
 author: bep
+aliases: [/0-20-4/]
 ---
 
 This is the second bug-fix release of the day, fixing a couple of issues related to the new release scripts.
diff --git a/docs/content/news/0-20-5.md b/docs/content/en/news/0.20.5-relnotes/index.md
index dd6863982..eaed27832 100644
--- a/docs/content/news/0-20-5.md
+++ b/docs/content/en/news/0.20.5-relnotes/index.md
@@ -6,6 +6,7 @@ link: ""
 title: "Hugo 0.20.5"
 draft: false
 author: bep
+aliases: [/0-20-5/]
 ---
 
 This is a bug-fix release which fixes the version number of `0.20.4` (which wrongly shows up as `0.21-DEV`) ([#3388](https://github.com/gohugoio/hugo/issues/3388)).
\ No newline at end of file
diff --git a/docs/content/news/0-20-6.md b/docs/content/en/news/0.20.6-relnotes/index.md
index 53e4cd812..52189092a 100644
--- a/docs/content/news/0-20-6.md
+++ b/docs/content/en/news/0.20.6-relnotes/index.md
@@ -6,6 +6,7 @@ link: ""
 title: "Hugo 0.20.6"
 draft: false
 author: bep
+aliases: [/0-20-6/]
 ---
 
 There have been some [shouting on discuss.gohugo.io](https://discuss.gohugo.io/t/index-md-is-generated-in-subfolder-index-index-html-hugo-0-20/6338/15) about some broken sites after the release of Hugo `0.20`. This release reintroduces the old behaviour, making  `/my-blog-post/index.md` work as expected.
diff --git a/docs/content/news/0-20-7.md b/docs/content/en/news/0.20.7-relnotes/index.md
index 5b6675806..50ac365d5 100644
--- a/docs/content/news/0-20-7.md
+++ b/docs/content/en/news/0.20.7-relnotes/index.md
@@ -6,6 +6,7 @@ link: ""
 title: "Hugo 0.20.7"
 draft: false
 author: bep
+aliases: [/0-20-7/]
 ---
 
 This just fixes an issue with the release scripts, no change in the binaries.
diff --git a/docs/content/news/0-21.md b/docs/content/en/news/0.21-relnotes/index.md
index ce4764341..aae1fd0b4 100644
--- a/docs/content/news/0-21.md
+++ b/docs/content/en/news/0.21-relnotes/index.md
@@ -6,6 +6,7 @@ link: ""
 title: "Hugo 0.21"
 draft: false
 author: bep
+aliases: [/0-21/]
 ---
 
 Hugo `0.21` brings full support for shortcodes per [Output Format](https://gohugo.io/extras/output-formats/) ([#3220](https://github.com/gohugoio/hugo/issues/3220)), the last vital piece of that puzzle. This is especially useful for `Google AMP` with its many custom media tags.
diff --git a/docs/content/news/0-22.md b/docs/content/en/news/0.22-relnotes/index.md
index d3af64c35..8a9e8d5f5 100644
--- a/docs/content/news/0-22.md
+++ b/docs/content/en/news/0.22-relnotes/index.md
@@ -6,6 +6,7 @@ link: ""
 title: "Hugo 0.22"
 draft: false
 author: bep
+aliases: [/0-22/]
 ---
 
 
diff --git a/docs/content/news/0-22-1.md b/docs/content/en/news/0.22.1-relnotes/index.md
index 1efbba650..ceb207d70 100644
--- a/docs/content/news/0-22-1.md
+++ b/docs/content/en/news/0.22.1-relnotes/index.md
@@ -6,6 +6,7 @@ link: ""
 title: "Hugo 0.22.1"
 draft: false
 author: bep
+aliases: [/0-22-1/]
 ---
 
 Hugo `0.22.1` fixes a couple of issues reported after the [0.22 release](https://github.com/gohugoio/hugo/releases/tag/v0.22) Monday. Most importantly a fix for detecting regular subfolders below the root-sections.
diff --git a/docs/content/news/0-23.md b/docs/content/en/news/0.23-relnotes/index.md
index 0e14bceed..fdf6e9e73 100644
--- a/docs/content/news/0-23.md
+++ b/docs/content/en/news/0.23-relnotes/index.md
@@ -6,6 +6,7 @@ link: ""
 title: "Hugo 0.23"
 draft: false
 author: bep
+aliases: [/0-23/]
 ---
 
 Hugo `0.23` is mainly a release that handles all the small changes needed to get Hugo moved to a GitHub organisation: [gohugoio](https://github.com/gohugoio), but it also contains a couple of important fixes that makes this an update worth-while for all.
diff --git a/docs/content/news/0-24.md b/docs/content/en/news/0.24-relnotes/index.md
index 2d598b79b..ec71e246f 100644
--- a/docs/content/news/0-24.md
+++ b/docs/content/en/news/0.24-relnotes/index.md
@@ -6,6 +6,7 @@ link: ""
 title: "Hugo 0.24"
 draft: false
 author: bep
+aliases: [/0-24/]
 ---
 
 > "A feature that could be the name of the next Indiana Jones movie deserves its own release," says [@bep](https://github.com/bep).
diff --git a/docs/content/news/0-24-1.md b/docs/content/en/news/0.24.1-relnotes/index.md
index 559e1e252..2ec2cef55 100644
--- a/docs/content/news/0-24-1.md
+++ b/docs/content/en/news/0.24.1-relnotes/index.md
@@ -6,6 +6,7 @@ link: ""
 title: "Hugo 0.24.1"
 draft: false
 author: bep
+aliases: [/0-24-1/]
 ---
 
 This release fixes some important **archetype-related regressions** from the recent Hugo 0.24-release.
diff --git a/docs/content/news/0-25.md b/docs/content/en/news/0.25-relnotes/index.md
index fa0f0a544..9527c911a 100644
--- a/docs/content/news/0-25.md
+++ b/docs/content/en/news/0.25-relnotes/index.md
@@ -6,6 +6,7 @@ link: ""
 title: "Hugo 0.25"
 draft: false
 author: bep
+aliases: [/0-25/]
 ---
 
 Hugo `0.25` is the **Kinder Surprise**: It automatically opens the page you&#39;re working on in the browser, it adds full `AND` and `OR` support in page queries, and you can now have templates per language.
diff --git a/docs/content/news/0-25-1.md b/docs/content/en/news/0.25.1-relnotes/index.md
index 40e2124a3..7d70d87a5 100644
--- a/docs/content/news/0-25-1.md
+++ b/docs/content/en/news/0.25.1-relnotes/index.md
@@ -6,6 +6,7 @@ link: ""
 title: "Hugo 0.25.1"
 draft: false
 author: bep
+aliases: [/0-25-1/]
 ---
 
 This is a bug-fix release with a couple of important fixes.
diff --git a/docs/content/news/0.26-relnotes.md b/docs/content/en/news/0.26-relnotes/index.md
index 92f90de99..92f90de99 100644
--- a/docs/content/news/0.26-relnotes.md
+++ b/docs/content/en/news/0.26-relnotes/index.md
diff --git a/docs/content/news/0.27-relnotes.md b/docs/content/en/news/0.27-relnotes/index.md
index 92fc3a7b0..92fc3a7b0 100644
--- a/docs/content/news/0.27-relnotes.md
+++ b/docs/content/en/news/0.27-relnotes/index.md
diff --git a/docs/content/news/0.27.1-relnotes.md b/docs/content/en/news/0.27.1-relnotes/index.md
index ae15973d4..1184cc175 100644
--- a/docs/content/news/0.27.1-relnotes.md
+++ b/docs/content/en/news/0.27.1-relnotes/index.md
@@ -1,7 +1,7 @@
 
 ---
 date: 2017-09-13
-title: "0.27.1: One bugfix"
+title: "Hugo 0.27.1: One bugfix"
 description: "Hugo 0.27.1 fixes an issue introduced in Go 1.9 with HTML escaping of shortcodes in multi output sites."
 categories: ["Releases"]
 images:
diff --git a/docs/content/news/0.28-relnotes-ready.md b/docs/content/en/news/0.28-relnotes/index.md
index ac4537d8d..91128e48e 100644
--- a/docs/content/news/0.28-relnotes-ready.md
+++ b/docs/content/en/news/0.28-relnotes/index.md
@@ -4,7 +4,6 @@ date: 2017-09-25
 title: "Hugo 0.28: High-speed Syntax Highlighting!"
 description: "Chroma is the new default syntax highlighter in Hugo."
 categories: ["Releases"]
-slug: "0.28-relnotes"
 images:
 - images/blog/hugo-28-poster.png
 ---
diff --git a/docs/content/news/0.29-relnotes-ready.md b/docs/content/en/news/0.29-relnotes/index.md
index 53551886f..810781dda 100644
--- a/docs/content/news/0.29-relnotes-ready.md
+++ b/docs/content/en/news/0.29-relnotes/index.md
@@ -4,7 +4,6 @@ date: 2017-09-26
 title: "Hugo 0.29: Template Metrics"
 description: "Makes it easy to find template bottle necks."
 categories: ["Releases"]
-slug: "0.29-relnotes"
 images:
 - images/blog/hugo-29-poster.png
 ---
diff --git a/docs/content/news/0.30-relnotes-ready.md b/docs/content/en/news/0.30-relnotes/index.md
index 7c2632ae6..db49a1bf3 100644
--- a/docs/content/news/0.30-relnotes-ready.md
+++ b/docs/content/en/news/0.30-relnotes/index.md
@@ -4,7 +4,6 @@ date: 2017-10-16
 title: "Hugo 0.30: Race Car Edition!"
 description: "Fast Render Mode boosts live reloading!"
 categories: ["Releases"]
-slug: "0.30-relnotes"
 images:
 - images/blog/hugo-30-poster.png
 ---
diff --git a/docs/content/news/0.30.1-relnotes-ready.md b/docs/content/en/news/0.30.1-relnotes/index.md
index 208e9f3cd..68165e877 100644
--- a/docs/content/news/0.30.1-relnotes-ready.md
+++ b/docs/content/en/news/0.30.1-relnotes/index.md
@@ -1,10 +1,9 @@
 
 ---
 date: 2017-10-19T00:00:00+02:00
-title: "0.30.1: Two Important Bugfixes!"
+title: "Hugo 0.30.1: Two Important Bugfixes!"
 description: "Fixes `hugo -w` and validator-broken Sitemap."
 categories: ["Releases"]
-slug: 0.30.1-relnotes
 images:
 - images/blog/hugo-bug-poster.png
 ---
diff --git a/docs/content/news/0.30.2-relnotes-ready.md b/docs/content/en/news/0.30.2-relnotes/index.md
index 28fac1aaf..1d4bcd946 100644
--- a/docs/content/news/0.30.2-relnotes-ready.md
+++ b/docs/content/en/news/0.30.2-relnotes/index.md
@@ -1,9 +1,8 @@
 
 ---
 date: 2017-10-19T12:00:00+02:00
-title: "0.30.2: One More Bugfix"
+title: "Hugo 0.30.2: One More Bugfix"
 description: "Fixes Fast Render mode when having sub-path in `baseURL`."
-slug: "0.30.2"
 categories: ["Releases"]
 images:
 - images/blog/hugo-bug-poster.png
diff --git a/docs/content/news/0.31-relnotes-ready.md b/docs/content/en/news/0.31-relnotes/index.md
index 138ecc08c..ba16dfacb 100644
--- a/docs/content/news/0.31-relnotes-ready.md
+++ b/docs/content/en/news/0.31-relnotes/index.md
@@ -3,7 +3,6 @@
 date: 2017-11-20
 title: "Hugo 0.31: Language Multihost Edition!"
 description: "Hugo 0.31: Multihost, smart union static dirs, and more ..."
-slug: "0.31-relnotes"
 categories: ["Releases"]
 images:
 - images/blog/hugo-31-poster.png
diff --git a/docs/content/news/0.31.1-relnotes-ready.md b/docs/content/en/news/0.31.1-relnotes/index.md
index 9c6be6281..a74470d64 100644
--- a/docs/content/news/0.31.1-relnotes-ready.md
+++ b/docs/content/en/news/0.31.1-relnotes/index.md
@@ -3,7 +3,6 @@
 date: 2017-11-27
 title: "Hugo 0.31.1: One Bugfix!"
 description: "Fixes broken `--appendPort=false`."
-slug: "0.31.1"
 categories: ["Releases"]
 images:
 - images/blog/hugo-bug-poster.png
diff --git a/docs/content/news/0.32-relnotes-ready.md b/docs/content/en/news/0.32-relnotes/index.md
index c0a93d8e9..c3f36fe64 100644
--- a/docs/content/news/0.32-relnotes-ready.md
+++ b/docs/content/en/news/0.32-relnotes/index.md
@@ -3,7 +3,6 @@
 date: 2017-12-31
 title: "Hugo 0.32: Page Bundles and Image Processing!"
 description: "Images and other resources with page-relative links, resize, scale and crop images, and much more."
-slug: "0.32-relnotes"
 categories: ["Releases"]
 images:
 - images/blog/hugo-32-poster.png
diff --git a/docs/content/news/0.32.1-relnotes-ready.md b/docs/content/en/news/0.32.1-relnotes/index.md
index 80e90e6ed..867e3413e 100644
--- a/docs/content/news/0.32.1-relnotes-ready.md
+++ b/docs/content/en/news/0.32.1-relnotes/index.md
@@ -1,9 +1,8 @@
 
 ---
 date: 2018-01-02
-title: "0.32.1: Two bugfixes"
+title: "Hugo 0.32.1: Two bugfixes"
 description: "Fixes image processing in shortcodes."
-slug: "0.32.1-relnotes"
 categories: ["Releases"]
 images:
 - images/blog/hugo-bug-poster.png
diff --git a/docs/content/news/0.32.2-relnotes-ready.md b/docs/content/en/news/0.32.2-relnotes/index.md
index 5d33df6ef..7453a2678 100644
--- a/docs/content/news/0.32.2-relnotes-ready.md
+++ b/docs/content/en/news/0.32.2-relnotes/index.md
@@ -1,9 +1,8 @@
 
 ---
 date: 2018-01-03
-title: "0.32.2: One bugfix"
+title: "Hugo 0.32.2: One bugfix"
 description: "Fixes one issue with publishing of processed images when no cache."
-slug: "0.32.2-relnotes"
 categories: ["Releases"]
 images:
 - images/blog/hugo-bug-poster.png
diff --git a/docs/content/news/0.32.3-relnotes-ready.md b/docs/content/en/news/0.32.3-relnotes/index.md
index c22bbc83b..ad795a183 100644
--- a/docs/content/news/0.32.3-relnotes-ready.md
+++ b/docs/content/en/news/0.32.3-relnotes/index.md
@@ -3,7 +3,6 @@
 date: 2018-01-08
 title: "Hugo 0.32.3: Some important bug fixes"
 description: "Fixes multilingual resource (images etc.) handling etc."
-slug: "0.32.3-relnotes"
 categories: ["Releases"]
 images:
 - images/blog/hugo-bug-poster.png
diff --git a/docs/content/news/0.32.4-relnotes-ready.md b/docs/content/en/news/0.32.4-relnotes/index.md
index 2e1fc3757..bd8163e0d 100644
--- a/docs/content/news/0.32.4-relnotes-ready.md
+++ b/docs/content/en/news/0.32.4-relnotes/index.md
@@ -1,9 +1,8 @@
 
 ---
 date: 2018-01-11
-title: "0.32.4: Two bugfixes"
+title: "Hugo 0.32.4: Two bugfixes"
 description: "Fixes non-ASCII path handling for Page resources."
-slug: "0.32.4-relnotes"
 categories: ["Releases"]
 images:
 - images/blog/hugo-bug-poster.png
diff --git a/docs/content/news/0.33-relnotes/featured-hugo-33-poster.png b/docs/content/en/news/0.33-relnotes/featured-hugo-33-poster.png
index c30caafcc..c30caafcc 100644
--- a/docs/content/news/0.33-relnotes/featured-hugo-33-poster.png
+++ b/docs/content/en/news/0.33-relnotes/featured-hugo-33-poster.png
diff --git a/docs/content/news/0.33-relnotes/index.md b/docs/content/en/news/0.33-relnotes/index.md
index 74cd50dc4..74cd50dc4 100644
--- a/docs/content/news/0.33-relnotes/index.md
+++ b/docs/content/en/news/0.33-relnotes/index.md
diff --git a/docs/content/news/0.34-relnotes/featured-34-poster.png b/docs/content/en/news/0.34-relnotes/featured-34-poster.png
index a5c81b8c8..a5c81b8c8 100644
--- a/docs/content/news/0.34-relnotes/featured-34-poster.png
+++ b/docs/content/en/news/0.34-relnotes/featured-34-poster.png
diff --git a/docs/content/news/0.34-relnotes/index.md b/docs/content/en/news/0.34-relnotes/index.md
index dd5418a77..dd5418a77 100644
--- a/docs/content/news/0.34-relnotes/index.md
+++ b/docs/content/en/news/0.34-relnotes/index.md
diff --git a/docs/content/news/0.35-relnotes/featured-hugo-35-poster.png b/docs/content/en/news/0.35-relnotes/featured-hugo-35-poster.png
index a97e3b901..a97e3b901 100644
--- a/docs/content/news/0.35-relnotes/featured-hugo-35-poster.png
+++ b/docs/content/en/news/0.35-relnotes/featured-hugo-35-poster.png
diff --git a/docs/content/news/0.35-relnotes/index.md b/docs/content/en/news/0.35-relnotes/index.md
index 80b4afd7b..80b4afd7b 100644
--- a/docs/content/news/0.35-relnotes/index.md
+++ b/docs/content/en/news/0.35-relnotes/index.md
diff --git a/docs/content/news/0.36-relnotes/featured-hugo-36-poster.png b/docs/content/en/news/0.36-relnotes/featured-hugo-36-poster.png
index 12dec42fc..12dec42fc 100644
--- a/docs/content/news/0.36-relnotes/featured-hugo-36-poster.png
+++ b/docs/content/en/news/0.36-relnotes/featured-hugo-36-poster.png
diff --git a/docs/content/news/0.36-relnotes/index.md b/docs/content/en/news/0.36-relnotes/index.md
index 4e6323287..4e6323287 100644
--- a/docs/content/news/0.36-relnotes/index.md
+++ b/docs/content/en/news/0.36-relnotes/index.md
diff --git a/docs/content/news/0.36.1-relnotes-ready.md b/docs/content/en/news/0.36.1-relnotes/index.md
index 0e94f20e6..59bf56297 100644
--- a/docs/content/news/0.36.1-relnotes-ready.md
+++ b/docs/content/en/news/0.36.1-relnotes/index.md
@@ -3,7 +3,6 @@
 date: 2018-02-15
 title: "Hugo 0.36.1: One Bugfix"
 description: "Fixes a multi-thread image processing issue."
-slug: "0.36.1-relnotes"
 categories: ["Releases"]
 images:
 - images/blog/hugo-bug-poster.png
diff --git a/docs/content/news/0.37-relnotes/featured-hugo-37-poster.png b/docs/content/en/news/0.37-relnotes/featured-hugo-37-poster.png
index 9f369ba25..9f369ba25 100644
--- a/docs/content/news/0.37-relnotes/featured-hugo-37-poster.png
+++ b/docs/content/en/news/0.37-relnotes/featured-hugo-37-poster.png
diff --git a/docs/content/news/0.37-relnotes/index.md b/docs/content/en/news/0.37-relnotes/index.md
index a9b6b4cef..a9b6b4cef 100644
--- a/docs/content/news/0.37-relnotes/index.md
+++ b/docs/content/en/news/0.37-relnotes/index.md
diff --git a/docs/content/news/0.37.1-relnotes/index.md b/docs/content/en/news/0.37.1-relnotes/index.md
index 754ed4240..754ed4240 100644
--- a/docs/content/news/0.37.1-relnotes/index.md
+++ b/docs/content/en/news/0.37.1-relnotes/index.md
diff --git a/docs/content/news/0.38-relnotes/featured-poster.png b/docs/content/en/news/0.38-relnotes/featured-poster.png
index 1e7988c8f..1e7988c8f 100644
--- a/docs/content/news/0.38-relnotes/featured-poster.png
+++ b/docs/content/en/news/0.38-relnotes/featured-poster.png
diff --git a/docs/content/news/0.38-relnotes/index.md b/docs/content/en/news/0.38-relnotes/index.md
index 88ef88872..71d167cd5 100644
--- a/docs/content/news/0.38-relnotes/index.md
+++ b/docs/content/en/news/0.38-relnotes/index.md
@@ -1,7 +1,7 @@
 
 ---
 date: 2018-04-02
-title: "The Easter Egg Edition"
+title: "Hugo 0.38: The Easter Egg Edition"
 description: "Hugo 0.38: Date and slug from filenames, multiple content dirs, config from themes, language merge func …"
 categories: ["Releases"]
 ---
diff --git a/docs/content/news/0.38.1-relnotes/index.md b/docs/content/en/news/0.38.1-relnotes/index.md
index b900b6fb0..a025b5415 100644
--- a/docs/content/news/0.38.1-relnotes/index.md
+++ b/docs/content/en/news/0.38.1-relnotes/index.md
@@ -1,7 +1,7 @@
 
 ---
 date: 2018-04-05
-title: "Some Live Reload Fixes"
+title: "Hugo 0.38.1: Some Live Reload Fixes"
 description: "Hugo 0.38.1 fixes some live reload issues introduced in 0.38."
 categories: ["Releases"]
 images:
diff --git a/docs/content/news/0.38.2-relnotes/index.md b/docs/content/en/news/0.38.2-relnotes/index.md
index d69c5f5b3..0a045eee8 100644
--- a/docs/content/news/0.38.2-relnotes/index.md
+++ b/docs/content/en/news/0.38.2-relnotes/index.md
@@ -2,7 +2,7 @@
 ---
 date: 2018-04-09
 title: "Hugo 0.38.2: Two Bugfixes"
-description: "0.38.2 fixes --contentDir flag handling and \".\" in content filenames."
+description: "0.38.2 fixes `--contentDir` flag handling and \".\" in content filenames."
 categories: ["Releases"]
 images:
 - images/blog/hugo-bug-poster.png
diff --git a/docs/content/news/0.39-relnotes/featured-hugo-39-poster.png b/docs/content/en/news/0.39-relnotes/featured-hugo-39-poster.png
index e3fa6400a..e3fa6400a 100644
--- a/docs/content/news/0.39-relnotes/featured-hugo-39-poster.png
+++ b/docs/content/en/news/0.39-relnotes/featured-hugo-39-poster.png
diff --git a/docs/content/news/0.39-relnotes/index.md b/docs/content/en/news/0.39-relnotes/index.md
index a114e4820..d1c28252a 100644
--- a/docs/content/news/0.39-relnotes/index.md
+++ b/docs/content/en/news/0.39-relnotes/index.md
@@ -1,7 +1,7 @@
 
 ---
 date: 2018-04-16
-title: "The Nat King Cole Stabilizer Edition"
+title: "Hugo 0.39: The Nat King Cole Stabilizer Edition"
 description: "Hugo 0.39: Rewrite of the /commands package, `Resource.Content`, several new template funcs, and more …"
 categories: ["Releases"]
 ---
diff --git a/docs/content/en/news/0.40-relnotes/featured-hugo-40-poster.png b/docs/content/en/news/0.40-relnotes/featured-hugo-40-poster.png
new file mode 100644
index 000000000..9a7f36d1f
--- /dev/null
+++ b/docs/content/en/news/0.40-relnotes/featured-hugo-40-poster.png
diff --git a/docs/content/en/news/0.40-relnotes/index.md b/docs/content/en/news/0.40-relnotes/index.md
new file mode 100644
index 000000000..9a45c1c09
--- /dev/null
+++ b/docs/content/en/news/0.40-relnotes/index.md
@@ -0,0 +1,76 @@
+
+---
+date: 2018-04-23
+title: "Hugo 0.40: The Revival of the Shortcodes"
+description: "Hugo 0.40: Shortcodes with `.Content` (almost) always available, processed in order of appearance, several new template funcs …"
+categories: ["Releases"]
+---
+
+Hugo `0.40` is **The Revival of the Shortcodes**. Shortcodes is one of the prime features in Hugo. Really useful, but it has had some known shortcomings. [@bep](https://github.com/bep) has been really busy the last week to address those.
+
+In summary:
+
+* `.Content` for a page retrieved in a query in a shortcode is now _almost_ always available. Note that shortcodes can include content that can include shortcodes that can include content... It is possible to bite your tail. See more below.
+* Shortcodes are now processed and rendered in their order of appearance.
+* Related to the above, we have now added a zero-based `.Ordinal` to the shortcode.
+
+
+The first bullet above resolves some surprising behaviour when reading other pages' content from shortcodes. Before this release, that behaviour was undefined. Note that this has never been an issue from regular templates.
+
+It will still not be possible to get **the current shortcode's  page's rendered content**. That would have impressed Einstein.
+
+The new and well defined rules are:
+
+* `.Page.Content` from a shortcode will be empty. The related `.Page.Truncated` `.Page.Summary`, `.Page.WordCount`, `.Page.ReadingTime`, `.Page.Plain` and `.Page.PlainWords` will also have empty values.
+* For _other pages_ (retrieved via `.Page.Site.GetPage`, `.Site.Pages` etc.) the `.Content` is there to use as you please as long as you don't have infinite content recursion in your shortcode/content setup. See below.
+* `.Page.TableOfContents` is good to go (but does not support shortcodes in headlines; this is unchanged)
+
+If you get into a situation of infinite recursion, the `.Content` will be empty. Run `hugo -v` for more information.
+
+This release represents **19 contributions by 3 contributors** to the main Hugo code base.
+
+Many have also been busy writing and fixing the documentation in [hugoDocs](https://github.com/gohugoio/hugoDocs), 
+which has received **13 contributions by 6 contributors**. A special thanks to [@kaushalmodi](https://github.com/kaushalmodi), [@anthonyfok](https://github.com/anthonyfok), [@bep](https://github.com/bep), and [@regisphilibert](https://github.com/regisphilibert) for their work on the documentation site.
+
+
+Hugo now has:
+
+* 25071+ [stars](https://github.com/gohugoio/hugo/stargazers)
+* 446+ [contributors](https://github.com/gohugoio/hugo/graphs/contributors)
+* 222+ [themes](http://themes.gohugo.io/)
+
+## Notes
+
+* We have added a `timeout` configuration setting. This is currently only used to time out the `.Content` creation, to bail out of recursive recursions. Run `hugo -v` to see potential warnings about this. The `timeout` is set default to `10000` (10 seconds).
+
+## Enhancements
+
+### Templates
+
+* Add `path.Ext`, `path.Dir` and `path.Base` [47e7788b](https://github.com/gohugoio/hugo/commit/47e7788b3c30de6fb895522096baf2c13598c317) [@bep](https://github.com/bep) 
+* Make `fileExist` use the same filesystem as `readFile` [51af1d2e](https://github.com/gohugoio/hugo/commit/51af1d2eadcad89e8c2906c05549352ef69ab016) [@bep](https://github.com/bep) [#4633](https://github.com/gohugoio/hugo/issues/4633)
+
+### Other
+
+* Add `.Page.BundleType` [402f6788](https://github.com/gohugoio/hugo/commit/402f6788ee955ad2aace84e8fba1625db7b356d9) [@bep](https://github.com/bep) [#4662](https://github.com/gohugoio/hugo/issues/4662)
+* Add zero-based `Ordinal` to shortcode [3decf4a3](https://github.com/gohugoio/hugo/commit/3decf4a327157e98d3da3502b6d777de63437c39) [@bep](https://github.com/bep) [#3359](https://github.com/gohugoio/hugo/issues/3359)
+* Process and render shortcodes in their order of appearance [85535084](https://github.com/gohugoio/hugo/commit/85535084dea4d3e3adf1ebd08ae57b39d76e1904) [@bep](https://github.com/bep) [#3359](https://github.com/gohugoio/hugo/issues/3359)
+* Init the content and shortcodes early [19084eaf](https://github.com/gohugoio/hugo/commit/19084eaf74246feac61d618c55031369520dfa8e) [@bep](https://github.com/bep) [#4632](https://github.com/gohugoio/hugo/issues/4632)
+* Prepare child page resources before the page itself [3238e14f](https://github.com/gohugoio/hugo/commit/3238e14fdfeedf189a5af122e20bff040ac059bd) [@bep](https://github.com/bep) [#4632](https://github.com/gohugoio/hugo/issues/4632)
+* Make .Content (almost) always available in shortcodes [4d26ab33](https://github.com/gohugoio/hugo/commit/4d26ab33dcef704086f43828d1dfb4b8beae2593) [@bep](https://github.com/bep) [#4632](https://github.com/gohugoio/hugo/issues/4632)[#4653](https://github.com/gohugoio/hugo/issues/4653)[#4655](https://github.com/gohugoio/hugo/issues/4655)
+* Add language merge support for Pages in resource.Resources [47c05c47](https://github.com/gohugoio/hugo/commit/47c05c47e0b663632a649ee5d256acc1a32fe9e4) [@bep](https://github.com/bep) [#4644](https://github.com/gohugoio/hugo/issues/4644)
+* Improve .Content vs shortcodes [e590cc26](https://github.com/gohugoio/hugo/commit/e590cc26eb1363a4b84603f051b20bd43fd1f7bd) [@bep](https://github.com/bep) [#4632](https://github.com/gohugoio/hugo/issues/4632)
+* Improve .Get docs [74520d2c](https://github.com/gohugoio/hugo/commit/74520d2cfd39bb4428182e26c57afa9df83ce7b5) [@paulcmal](https://github.com/paulcmal) 
+* Update missing positional parameter test for .Get [e2b277bb](https://github.com/gohugoio/hugo/commit/e2b277bba5935c0686cb83f132eae021ef2dc5e1) [@paulcmal](https://github.com/paulcmal) 
+* Improve error message in metadata parse [d681ea55](https://github.com/gohugoio/hugo/commit/d681ea55a0a59b7096dacd194ee0cb8fe15b0757) [@bep](https://github.com/bep) [#3696](https://github.com/gohugoio/hugo/issues/3696)
+* Add some context to front matter parse error [159bed34](https://github.com/gohugoio/hugo/commit/159bed34c3a850d58d08a36ddc40372ed96af2db) [@bep](https://github.com/bep) [#4638](https://github.com/gohugoio/hugo/issues/4638)
+* Updated GetCSV error message (#4636) [5cc944ff](https://github.com/gohugoio/hugo/commit/5cc944ffd77289ab0b8efd69d628fb11d1280993) [@CubeLuke](https://github.com/CubeLuke) 
+* .Get doesn't crash on missing positional param fixes #4619 [236f0c84](https://github.com/gohugoio/hugo/commit/236f0c840b45e0c41fcbb2fb6ee556c0fb2d4859) [@paulcmal](https://github.com/paulcmal) 
+* fix syntax signature [cd6a2612](https://github.com/gohugoio/hugo/commit/cd6a261242b63555ac2c3ca7a8462b874b490701) [@paulcmal](https://github.com/paulcmal) 
+
+
+
+
+
+
+
diff --git a/docs/content/en/news/0.40.1-relnotes/index.md b/docs/content/en/news/0.40.1-relnotes/index.md
new file mode 100644
index 000000000..3352f164b
--- /dev/null
+++ b/docs/content/en/news/0.40.1-relnotes/index.md
@@ -0,0 +1,19 @@
+
+---
+date: 2018-04-25
+title: "Hugo 0.40.1: One Bug Fix"
+description: "Fixes some shortcode vs .Content corner cases."
+categories: ["Releases"]
+images:
+- images/blog/hugo-bug-poster.png
+
+---
+
+	
+
+This release fixes some shortcode vs `.Content` corner cases introduced in Hugo `0.40` [288c3964](https://github.com/gohugoio/hugo/commit/288c39643906b4194a0a6acfbaf87cb0fbdeb361) [@bep](https://github.com/bep) [#4632](https://github.com/gohugoio/hugo/issues/4632)[#4664](https://github.com/gohugoio/hugo/issues/4664).
+
+
+
+
+
diff --git a/docs/content/en/news/0.40.2-relnotes/index.md b/docs/content/en/news/0.40.2-relnotes/index.md
new file mode 100644
index 000000000..50b9c3842
--- /dev/null
+++ b/docs/content/en/news/0.40.2-relnotes/index.md
@@ -0,0 +1,20 @@
+
+---
+date: 2018-04-30
+title: "Hugo 0.40.2: Two Bug fixes"
+description: "Fixes some regressions introduced in 0.40."
+categories: ["Releases"]
+images:
+- images/blog/hugo-bug-poster.png
+
+---
+
+This release fixes some regressions introduced in Hugo `0.40`. See the [milestone](https://github.com/gohugoio/hugo/milestone/62?closed=1) for an issue list.
+
+* Reset .Page.Scratch on live-reload [655983a2](https://github.com/gohugoio/hugo/commit/655983a22dc35b2ee5119dcc4acb9918498d2d68) [@bep](https://github.com/bep) [#4683](https://github.com/gohugoio/hugo/issues/4683)
+* Fix .WordCount, .FuzzyWordCount, .ReadingTime when summary marker is set [001a28c2](https://github.com/gohugoio/hugo/commit/001a28c2f9ed121b33df18fe792859ab378784c6) [@bep](https://github.com/bep) [#4675](https://github.com/gohugoio/hugo/issues/4675)[#4682](https://github.com/gohugoio/hugo/issues/4682)
+
+
+
+
+
diff --git a/docs/content/news/_index.md b/docs/content/en/news/_index.md
index 353accc3d..353accc3d 100644
--- a/docs/content/news/_index.md
+++ b/docs/content/en/news/_index.md
diff --git a/docs/content/news/http2-server-push-in-hugo.md b/docs/content/en/news/http2-server-push-in-hugo.md
index 5ffb8843f..5ffb8843f 100644
--- a/docs/content/news/http2-server-push-in-hugo.md
+++ b/docs/content/en/news/http2-server-push-in-hugo.md
diff --git a/docs/content/readfiles/README.md b/docs/content/en/readfiles/README.md
index 4b10f0e47..4b10f0e47 100644
--- a/docs/content/readfiles/README.md
+++ b/docs/content/en/readfiles/README.md
diff --git a/docs/content/readfiles/bfconfig.md b/docs/content/en/readfiles/bfconfig.md
index 5388694dc..5388694dc 100644
--- a/docs/content/readfiles/bfconfig.md
+++ b/docs/content/en/readfiles/bfconfig.md
diff --git a/docs/content/readfiles/dateformatting.md b/docs/content/en/readfiles/dateformatting.md
index 42138dd8a..42138dd8a 100644
--- a/docs/content/readfiles/dateformatting.md
+++ b/docs/content/en/readfiles/dateformatting.md
diff --git a/docs/content/readfiles/index.md b/docs/content/en/readfiles/index.md
index 3d65eaa0f..3d65eaa0f 100644
--- a/docs/content/readfiles/index.md
+++ b/docs/content/en/readfiles/index.md
diff --git a/docs/content/readfiles/menuvars.md b/docs/content/en/readfiles/menuvars.md
index 339fc108d..339fc108d 100644
--- a/docs/content/readfiles/menuvars.md
+++ b/docs/content/en/readfiles/menuvars.md
diff --git a/docs/content/readfiles/sectionvars.md b/docs/content/en/readfiles/sectionvars.md
index 1b97a12d6..1b97a12d6 100644
--- a/docs/content/readfiles/sectionvars.md
+++ b/docs/content/en/readfiles/sectionvars.md
diff --git a/docs/content/readfiles/testing.txt b/docs/content/en/readfiles/testing.txt
index 6428710e3..6428710e3 100644
--- a/docs/content/readfiles/testing.txt
+++ b/docs/content/en/readfiles/testing.txt
diff --git a/docs/content/showcase/1password-support/bio.md b/docs/content/en/showcase/1password-support/bio.md
index 9187908d9..9187908d9 100644
--- a/docs/content/showcase/1password-support/bio.md
+++ b/docs/content/en/showcase/1password-support/bio.md
diff --git a/docs/content/showcase/1password-support/featured.png b/docs/content/en/showcase/1password-support/featured.png
index 8e46495e6..8e46495e6 100644
--- a/docs/content/showcase/1password-support/featured.png
+++ b/docs/content/en/showcase/1password-support/featured.png
diff --git a/docs/content/showcase/1password-support/index.md b/docs/content/en/showcase/1password-support/index.md
index 55038bc7e..55038bc7e 100644
--- a/docs/content/showcase/1password-support/index.md
+++ b/docs/content/en/showcase/1password-support/index.md
diff --git a/docs/content/en/showcase/flesland-flis/bio.md b/docs/content/en/showcase/flesland-flis/bio.md
new file mode 100644
index 000000000..c1a4e8187
--- /dev/null
+++ b/docs/content/en/showcase/flesland-flis/bio.md
@@ -0,0 +1,8 @@
+
+A business page for Flesland Flis AS. A Norwegian Tiler located in Bergen.
+
+The page is designed and developed by Sindre Gusdal:
+
+* [Absoluttweb AS](http://www.absoluttweb.no)
+* [Sindre Gusdal](https://www.linkedin.com/in/sindregusdal/)
+
diff --git a/docs/content/en/showcase/flesland-flis/featured.png b/docs/content/en/showcase/flesland-flis/featured.png
new file mode 100644
index 000000000..a6dae684e
--- /dev/null
+++ b/docs/content/en/showcase/flesland-flis/featured.png
diff --git a/docs/content/en/showcase/flesland-flis/index.md b/docs/content/en/showcase/flesland-flis/index.md
new file mode 100644
index 000000000..5e18f040c
--- /dev/null
+++ b/docs/content/en/showcase/flesland-flis/index.md
@@ -0,0 +1,24 @@
+---
+
+title: Flesland Flis AS
+date: 2018-04-24
+description: "showcase: Business Page for a tile shop in Bergen, Norway"
+siteURL: https://www.fleslandflis.no
+byline: "[Sindre Gusdal](http://www.absoluttweb.no), Absoluttweb AS"
+
+---
+
+For **Flesland Flis** I use a combination of **Hugo, Forestry.io and Netlify**. Static Site Generators and Hugo has been on my radar for a long time, and with all the nice features released in Hugo the last years, it's now my preferred solution for new clients. Also a huge thanks to the guys at [Forestry.io](https://forestry.io), for making such a smooth CMS for Hugo.
+
+The #1 reason why I love Hugo is the logic between content and layout, and of course the speed. Compared to solutions like Jekyll, Hugo is just better at all the stuff I value the most - speed, flexibility, theming and more.
+
+### Thanks, Hugo!
+
+Today I use Hugo in a combination with GULP and Foundation 6 + my own Hugo starter theme. This works great for me, and gives me all the flexibility I need. Then I can include FancyBox, Responsive Text and other Node Modules when needed.
+
+In the past I had to do a lot of changes to layout, content and css, if the client f.ex needed an extra PDF or an image-gallery to a certain page. Just small details not fitting in the template, would be a hassle. So updating existing webpages was boring and time consuming.
+
+Today I just copy-paste a new layout file, adds some frontmatter, Pushes to GIT and that special page is done.
+
+**Gotta love it:)**
+
diff --git a/docs/content/showcase/forestry/bio.md b/docs/content/en/showcase/forestry/bio.md
index 767365cc0..767365cc0 100644
--- a/docs/content/showcase/forestry/bio.md
+++ b/docs/content/en/showcase/forestry/bio.md
diff --git a/docs/content/showcase/forestry/featured.png b/docs/content/en/showcase/forestry/featured.png
index 1ee315e78..1ee315e78 100644
--- a/docs/content/showcase/forestry/featured.png
+++ b/docs/content/en/showcase/forestry/featured.png
diff --git a/docs/content/showcase/forestry/index.md b/docs/content/en/showcase/forestry/index.md
index 1a9c0faaa..1a9c0faaa 100644
--- a/docs/content/showcase/forestry/index.md
+++ b/docs/content/en/showcase/forestry/index.md
diff --git a/docs/content/showcase/hartwell-insurance/bio.md b/docs/content/en/showcase/hartwell-insurance/bio.md
index 8bfdad49d..8bfdad49d 100644
--- a/docs/content/showcase/hartwell-insurance/bio.md
+++ b/docs/content/en/showcase/hartwell-insurance/bio.md
diff --git a/docs/content/showcase/hartwell-insurance/featured.png b/docs/content/en/showcase/hartwell-insurance/featured.png
index ced251f98..ced251f98 100644
--- a/docs/content/showcase/hartwell-insurance/featured.png
+++ b/docs/content/en/showcase/hartwell-insurance/featured.png
diff --git a/docs/content/showcase/hartwell-insurance/hartwell-columns.png b/docs/content/en/showcase/hartwell-insurance/hartwell-columns.png
index eb669b5a3..eb669b5a3 100644
--- a/docs/content/showcase/hartwell-insurance/hartwell-columns.png
+++ b/docs/content/en/showcase/hartwell-insurance/hartwell-columns.png
diff --git a/docs/content/showcase/hartwell-insurance/hartwell-lighthouse.png b/docs/content/en/showcase/hartwell-insurance/hartwell-lighthouse.png
index 672a8c1c8..672a8c1c8 100644
--- a/docs/content/showcase/hartwell-insurance/hartwell-lighthouse.png
+++ b/docs/content/en/showcase/hartwell-insurance/hartwell-lighthouse.png
diff --git a/docs/content/showcase/hartwell-insurance/hartwell-webpagetest.png b/docs/content/en/showcase/hartwell-insurance/hartwell-webpagetest.png
index 8dc035f3e..8dc035f3e 100644
--- a/docs/content/showcase/hartwell-insurance/hartwell-webpagetest.png
+++ b/docs/content/en/showcase/hartwell-insurance/hartwell-webpagetest.png
diff --git a/docs/content/showcase/hartwell-insurance/index.md b/docs/content/en/showcase/hartwell-insurance/index.md
index 3e9c224c8..3e9c224c8 100644
--- a/docs/content/showcase/hartwell-insurance/index.md
+++ b/docs/content/en/showcase/hartwell-insurance/index.md
diff --git a/docs/content/showcase/letsencrypt/bio.md b/docs/content/en/showcase/letsencrypt/bio.md
index 24d7b96ee..24d7b96ee 100644
--- a/docs/content/showcase/letsencrypt/bio.md
+++ b/docs/content/en/showcase/letsencrypt/bio.md
diff --git a/docs/content/showcase/letsencrypt/featured.png b/docs/content/en/showcase/letsencrypt/featured.png
index 9535d91bd..9535d91bd 100644
--- a/docs/content/showcase/letsencrypt/featured.png
+++ b/docs/content/en/showcase/letsencrypt/featured.png
diff --git a/docs/content/showcase/letsencrypt/index.md b/docs/content/en/showcase/letsencrypt/index.md
index 8487a3c77..8487a3c77 100644
--- a/docs/content/showcase/letsencrypt/index.md
+++ b/docs/content/en/showcase/letsencrypt/index.md
diff --git a/docs/content/showcase/linode/bio.md b/docs/content/en/showcase/linode/bio.md
index 42fa92229..42fa92229 100644
--- a/docs/content/showcase/linode/bio.md
+++ b/docs/content/en/showcase/linode/bio.md
diff --git a/docs/content/showcase/linode/featured.png b/docs/content/en/showcase/linode/featured.png
index 5d4c3e36b..5d4c3e36b 100644
--- a/docs/content/showcase/linode/featured.png
+++ b/docs/content/en/showcase/linode/featured.png
diff --git a/docs/content/showcase/linode/index.md b/docs/content/en/showcase/linode/index.md
index b0590a8cf..b0590a8cf 100644
--- a/docs/content/showcase/linode/index.md
+++ b/docs/content/en/showcase/linode/index.md
diff --git a/docs/content/showcase/pace-revenue-management/bio.md b/docs/content/en/showcase/pace-revenue-management/bio.md
index 7c7cc9c1c..7c7cc9c1c 100644
--- a/docs/content/showcase/pace-revenue-management/bio.md
+++ b/docs/content/en/showcase/pace-revenue-management/bio.md
diff --git a/docs/content/showcase/pace-revenue-management/featured.png b/docs/content/en/showcase/pace-revenue-management/featured.png
index fa0948e5f..fa0948e5f 100644
--- a/docs/content/showcase/pace-revenue-management/featured.png
+++ b/docs/content/en/showcase/pace-revenue-management/featured.png
diff --git a/docs/content/showcase/pace-revenue-management/index.md b/docs/content/en/showcase/pace-revenue-management/index.md
index cb520acb2..cb520acb2 100644
--- a/docs/content/showcase/pace-revenue-management/index.md
+++ b/docs/content/en/showcase/pace-revenue-management/index.md
diff --git a/docs/content/showcase/quiply-employee-communications-app/bio.md b/docs/content/en/showcase/quiply-employee-communications-app/bio.md
index f72a62554..f72a62554 100644
--- a/docs/content/showcase/quiply-employee-communications-app/bio.md
+++ b/docs/content/en/showcase/quiply-employee-communications-app/bio.md
diff --git a/docs/content/showcase/quiply-employee-communications-app/featured.png b/docs/content/en/showcase/quiply-employee-communications-app/featured.png
index a4e9f046e..a4e9f046e 100644
--- a/docs/content/showcase/quiply-employee-communications-app/featured.png
+++ b/docs/content/en/showcase/quiply-employee-communications-app/featured.png
diff --git a/docs/content/showcase/quiply-employee-communications-app/index.md b/docs/content/en/showcase/quiply-employee-communications-app/index.md
index 9f80850ee..9f80850ee 100644
--- a/docs/content/showcase/quiply-employee-communications-app/index.md
+++ b/docs/content/en/showcase/quiply-employee-communications-app/index.md
diff --git a/docs/content/showcase/small-multiples/bio.md b/docs/content/en/showcase/small-multiples/bio.md
index 3e0c1f14a..3e0c1f14a 100644
--- a/docs/content/showcase/small-multiples/bio.md
+++ b/docs/content/en/showcase/small-multiples/bio.md
diff --git a/docs/content/showcase/small-multiples/featured-small-multiples.png b/docs/content/en/showcase/small-multiples/featured-small-multiples.png
index a278f464d..a278f464d 100644
--- a/docs/content/showcase/small-multiples/featured-small-multiples.png
+++ b/docs/content/en/showcase/small-multiples/featured-small-multiples.png
diff --git a/docs/content/showcase/small-multiples/index.md b/docs/content/en/showcase/small-multiples/index.md
index e2b80ea9a..e2b80ea9a 100644
--- a/docs/content/showcase/small-multiples/index.md
+++ b/docs/content/en/showcase/small-multiples/index.md
diff --git a/docs/content/showcase/stackimpact/bio.md b/docs/content/en/showcase/stackimpact/bio.md
index e6206dd03..e6206dd03 100644
--- a/docs/content/showcase/stackimpact/bio.md
+++ b/docs/content/en/showcase/stackimpact/bio.md
diff --git a/docs/content/showcase/stackimpact/featured.png b/docs/content/en/showcase/stackimpact/featured.png
index 49a3bc500..49a3bc500 100644
--- a/docs/content/showcase/stackimpact/featured.png
+++ b/docs/content/en/showcase/stackimpact/featured.png
diff --git a/docs/content/showcase/stackimpact/index.md b/docs/content/en/showcase/stackimpact/index.md
index bc3d3fd29..bc3d3fd29 100644
--- a/docs/content/showcase/stackimpact/index.md
+++ b/docs/content/en/showcase/stackimpact/index.md
diff --git a/docs/content/showcase/template/bio.md b/docs/content/en/showcase/template/bio.md
index 597163340..597163340 100644
--- a/docs/content/showcase/template/bio.md
+++ b/docs/content/en/showcase/template/bio.md
diff --git a/docs/content/showcase/template/featured-template.png b/docs/content/en/showcase/template/featured-template.png
index 4f390132e..4f390132e 100644
--- a/docs/content/showcase/template/featured-template.png
+++ b/docs/content/en/showcase/template/featured-template.png
diff --git a/docs/content/showcase/template/index.md b/docs/content/en/showcase/template/index.md
index 4210269c8..4210269c8 100644
--- a/docs/content/showcase/template/index.md
+++ b/docs/content/en/showcase/template/index.md
diff --git a/docs/content/templates/404.md b/docs/content/en/templates/404.md
index eaa479d29..eaa479d29 100644
--- a/docs/content/templates/404.md
+++ b/docs/content/en/templates/404.md
diff --git a/docs/content/templates/_index.md b/docs/content/en/templates/_index.md
index 18ae40eac..18ae40eac 100644
--- a/docs/content/templates/_index.md
+++ b/docs/content/en/templates/_index.md
diff --git a/docs/content/templates/alternatives.md b/docs/content/en/templates/alternatives.md
index 91de38488..91de38488 100644
--- a/docs/content/templates/alternatives.md
+++ b/docs/content/en/templates/alternatives.md
diff --git a/docs/content/templates/base.md b/docs/content/en/templates/base.md
index 94d4cb2ef..94d4cb2ef 100644
--- a/docs/content/templates/base.md
+++ b/docs/content/en/templates/base.md
diff --git a/docs/content/templates/data-templates.md b/docs/content/en/templates/data-templates.md
index 460a657ef..460a657ef 100644
--- a/docs/content/templates/data-templates.md
+++ b/docs/content/en/templates/data-templates.md
diff --git a/docs/content/templates/files.md b/docs/content/en/templates/files.md
index b7fbf66a2..6e6f3ec4e 100644
--- a/docs/content/templates/files.md
+++ b/docs/content/en/templates/files.md
@@ -85,24 +85,24 @@ Here is the templating for our new `readfile` shortcode:
 This `readfile` shortcode is [also part of the Hugo docs][readfilesource]. So is [`testing.txt`][testfile], which we will call in this example by passing it into our new `readfile` shortcode as follows:
 
 ```
-{{</* readfile file="/content/readfiles/testing.txt" */>}}
+{{</* readfile file="/content/en/readfiles/testing.txt" */>}}
 ```
 
 The output "string" for this shortcode declaration will be the following:
 
 ```
-{{< readfile file="/content/readfiles/testing.txt" >}}
+{{< readfile file="/content/en/readfiles/testing.txt" >}}
 ```
 
 However, if we want Hugo to pass this string through Blackfriday, we should add the `markdown="true"` optional parameter:
 
 ```
-{{</* readfile file="/content/readfiles/testing.txt" markdown="true" */>}}
+{{</* readfile file="/content/en/readfiles/testing.txt" markdown="true" */>}}
 ```
 
 And here is the result as [called directly in the Hugo docs][] and rendered for display:
 
-{{< readfile file="/content/readfiles/testing.txt" markdown="true">}}
+{{< readfile file="/content/en/readfiles/testing.txt" markdown="true">}}
 
 [called directly in the Hugo docs]: https://github.com/gohugoio/hugo/blob/master/docs/content/templates/files.md
 [dirindex]: https://github.com/gohugoio/hugo/blob/master/docs/layouts/shortcodes/directoryindex.html
diff --git a/docs/content/templates/homepage.md b/docs/content/en/templates/homepage.md
index 833664866..833664866 100644
--- a/docs/content/templates/homepage.md
+++ b/docs/content/en/templates/homepage.md
diff --git a/docs/content/templates/internal.md b/docs/content/en/templates/internal.md
index 7fbfec43c..7fbfec43c 100644
--- a/docs/content/templates/internal.md
+++ b/docs/content/en/templates/internal.md
diff --git a/docs/content/templates/introduction.md b/docs/content/en/templates/introduction.md
index 32df11297..32df11297 100644
--- a/docs/content/templates/introduction.md
+++ b/docs/content/en/templates/introduction.md
diff --git a/docs/content/templates/lists.md b/docs/content/en/templates/lists.md
index a7462317f..a7462317f 100644
--- a/docs/content/templates/lists.md
+++ b/docs/content/en/templates/lists.md
diff --git a/docs/content/templates/lookup-order.md b/docs/content/en/templates/lookup-order.md
index d197b6141..d197b6141 100644
--- a/docs/content/templates/lookup-order.md
+++ b/docs/content/en/templates/lookup-order.md
diff --git a/docs/content/templates/menu-templates.md b/docs/content/en/templates/menu-templates.md
index 5efb080d8..5efb080d8 100644
--- a/docs/content/templates/menu-templates.md
+++ b/docs/content/en/templates/menu-templates.md
diff --git a/docs/content/templates/ordering-and-grouping.md b/docs/content/en/templates/ordering-and-grouping.md
index 37a355877..37a355877 100644
--- a/docs/content/templates/ordering-and-grouping.md
+++ b/docs/content/en/templates/ordering-and-grouping.md
diff --git a/docs/content/templates/output-formats.md b/docs/content/en/templates/output-formats.md
index ff286c9d2..ff286c9d2 100644
--- a/docs/content/templates/output-formats.md
+++ b/docs/content/en/templates/output-formats.md
diff --git a/docs/content/templates/pagination.md b/docs/content/en/templates/pagination.md
index 22acb3079..22acb3079 100644
--- a/docs/content/templates/pagination.md
+++ b/docs/content/en/templates/pagination.md
diff --git a/docs/content/templates/partials.md b/docs/content/en/templates/partials.md
index 4cb7fb3a5..4cb7fb3a5 100644
--- a/docs/content/templates/partials.md
+++ b/docs/content/en/templates/partials.md
diff --git a/docs/content/templates/robots.md b/docs/content/en/templates/robots.md
index 5237fec0b..5237fec0b 100644
--- a/docs/content/templates/robots.md
+++ b/docs/content/en/templates/robots.md
diff --git a/docs/content/templates/rss.md b/docs/content/en/templates/rss.md
index 9acbeea47..7162597aa 100644
--- a/docs/content/templates/rss.md
+++ b/docs/content/en/templates/rss.md
@@ -98,22 +98,30 @@ Hugo will automatically add the following header line to this file on render. Pl
 
 In your `header.html` template, you can specify your RSS feed in your `<head></head>` tag using Hugo's [Output Formats][Output Formats] like this:
 
-```
+```go-html-template
 {{ range .AlternativeOutputFormats -}}
-  <link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" href="{{ .Permalink | safeURL }}" title="{{ $.Site.Title }}">
+    {{ printf `<link rel="%s" type="%s+%s" href="%s" title="%s" />` .Rel .MediaType.Type .MediaType.Suffix .Permalink $.Site.Title | safeHTML }}
 {{ end -}}
 ```
 
-If you only want the RSS link, you can query the formats: 
+If you only want the RSS link, you can query the formats:
 
-```
+```go-html-template
 {{ with .OutputFormats.Get "rss" -}}
-  <link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" href="{{ .Permalink | safeURL }}" title="{{ $.Site.Title }}">
-{{ end -}
+    {{ printf `<link rel="%s" type="%s+%s" href="%s" title="%s" />` .Rel .MediaType.Type .MediaType.Suffix .Permalink $.Site.Title | safeHTML }}
+{{ end -}}
+```
+
+Either of the two snippets above will generate the below `link` tag on the site homepage for RSS output:
+
+```html
+<link rel="alternate" type="application/rss+xml" href="https://example.com/index.xml" title="Site Title">
 ```
- 
+
+_We are assuming `BaseURL` to be `https://example.com/` and `$.Site.Title` to be `"Site Title"` in this example._
+
 [config]: /getting-started/configuration/
 [embedded]: #the-embedded-rss-xml
 [RSS 2.0]: http://cyber.law.harvard.edu/rss/rss.html "RSS 2.0 Specification"
 [section]: /content-management/sections/
-[Output Formats]: /templates/output-formats/#link-to-output-formats
\ No newline at end of file
+[Output Formats]: /templates/output-formats/#link-to-output-formats
diff --git a/docs/content/templates/section-templates.md b/docs/content/en/templates/section-templates.md
index 577529e3f..577529e3f 100644
--- a/docs/content/templates/section-templates.md
+++ b/docs/content/en/templates/section-templates.md
diff --git a/docs/content/templates/shortcode-templates.md b/docs/content/en/templates/shortcode-templates.md
index 67e54089f..67e54089f 100644
--- a/docs/content/templates/shortcode-templates.md
+++ b/docs/content/en/templates/shortcode-templates.md
diff --git a/docs/content/templates/single-page-templates.md b/docs/content/en/templates/single-page-templates.md
index 79e1312b2..79e1312b2 100644
--- a/docs/content/templates/single-page-templates.md
+++ b/docs/content/en/templates/single-page-templates.md
diff --git a/docs/content/templates/sitemap-template.md b/docs/content/en/templates/sitemap-template.md
index 29b59ad12..29b59ad12 100644
--- a/docs/content/templates/sitemap-template.md
+++ b/docs/content/en/templates/sitemap-template.md
diff --git a/docs/content/templates/taxonomy-templates.md b/docs/content/en/templates/taxonomy-templates.md
index f3b349a39..f3b349a39 100644
--- a/docs/content/templates/taxonomy-templates.md
+++ b/docs/content/en/templates/taxonomy-templates.md
diff --git a/docs/content/templates/template-debugging.md b/docs/content/en/templates/template-debugging.md
index e94a073af..e94a073af 100644
--- a/docs/content/templates/template-debugging.md
+++ b/docs/content/en/templates/template-debugging.md
diff --git a/docs/content/templates/views.md b/docs/content/en/templates/views.md
index ac863646b..ac863646b 100644
--- a/docs/content/templates/views.md
+++ b/docs/content/en/templates/views.md
diff --git a/docs/content/themes/_index.md b/docs/content/en/themes/_index.md
index 9e2bc170b..9e2bc170b 100644
--- a/docs/content/themes/_index.md
+++ b/docs/content/en/themes/_index.md
diff --git a/docs/content/themes/creating.md b/docs/content/en/themes/creating.md
index a62f7c71b..a62f7c71b 100644
--- a/docs/content/themes/creating.md
+++ b/docs/content/en/themes/creating.md
diff --git a/docs/content/themes/customizing.md b/docs/content/en/themes/customizing.md
index 3444880f2..3444880f2 100644
--- a/docs/content/themes/customizing.md
+++ b/docs/content/en/themes/customizing.md
diff --git a/docs/content/themes/installing-and-using-themes.md b/docs/content/en/themes/installing-and-using-themes.md
index 93d814231..93d814231 100644
--- a/docs/content/themes/installing-and-using-themes.md
+++ b/docs/content/en/themes/installing-and-using-themes.md
diff --git a/docs/content/tools/_index.md b/docs/content/en/tools/_index.md
index 47cfeb1e3..47cfeb1e3 100644
--- a/docs/content/tools/_index.md
+++ b/docs/content/en/tools/_index.md
diff --git a/docs/content/tools/editors.md b/docs/content/en/tools/editors.md
index 419a2a04c..419a2a04c 100644
--- a/docs/content/tools/editors.md
+++ b/docs/content/en/tools/editors.md
diff --git a/docs/content/tools/frontends.md b/docs/content/en/tools/frontends.md
index f41751b49..f41751b49 100644
--- a/docs/content/tools/frontends.md
+++ b/docs/content/en/tools/frontends.md
diff --git a/docs/content/tools/migrations.md b/docs/content/en/tools/migrations.md
index ef4f169d3..ef4f169d3 100644
--- a/docs/content/tools/migrations.md
+++ b/docs/content/en/tools/migrations.md
diff --git a/docs/content/tools/other.md b/docs/content/en/tools/other.md
index 0502e1cdf..0502e1cdf 100644
--- a/docs/content/tools/other.md
+++ b/docs/content/en/tools/other.md
diff --git a/docs/content/tools/search.md b/docs/content/en/tools/search.md
index 2145c187c..2145c187c 100644
--- a/docs/content/tools/search.md
+++ b/docs/content/en/tools/search.md
diff --git a/docs/content/tools/starter-kits.md b/docs/content/en/tools/starter-kits.md
index 0ce81cc4e..0ce81cc4e 100644
--- a/docs/content/tools/starter-kits.md
+++ b/docs/content/en/tools/starter-kits.md
diff --git a/docs/content/troubleshooting/_index.md b/docs/content/en/troubleshooting/_index.md
index 3b0e93725..3b0e93725 100644
--- a/docs/content/troubleshooting/_index.md
+++ b/docs/content/en/troubleshooting/_index.md
diff --git a/docs/content/troubleshooting/build-performance.md b/docs/content/en/troubleshooting/build-performance.md
index bc4d30d54..bc4d30d54 100644
--- a/docs/content/troubleshooting/build-performance.md
+++ b/docs/content/en/troubleshooting/build-performance.md
diff --git a/docs/content/troubleshooting/faq.md b/docs/content/en/troubleshooting/faq.md
index 392d7a8df..392d7a8df 100644
--- a/docs/content/troubleshooting/faq.md
+++ b/docs/content/en/troubleshooting/faq.md
diff --git a/docs/content/variables/_index.md b/docs/content/en/variables/_index.md
index 382ee25d4..382ee25d4 100644
--- a/docs/content/variables/_index.md
+++ b/docs/content/en/variables/_index.md
diff --git a/docs/content/variables/files.md b/docs/content/en/variables/files.md
index ac5376dbd..ac5376dbd 100644
--- a/docs/content/variables/files.md
+++ b/docs/content/en/variables/files.md
diff --git a/docs/content/variables/git.md b/docs/content/en/variables/git.md
index f9c154764..f9c154764 100644
--- a/docs/content/variables/git.md
+++ b/docs/content/en/variables/git.md
diff --git a/docs/content/variables/hugo.md b/docs/content/en/variables/hugo.md
index c0c5c9601..c0c5c9601 100644
--- a/docs/content/variables/hugo.md
+++ b/docs/content/en/variables/hugo.md
diff --git a/docs/content/variables/menus.md b/docs/content/en/variables/menus.md
index 4216d9763..4216d9763 100644
--- a/docs/content/variables/menus.md
+++ b/docs/content/en/variables/menus.md
diff --git a/docs/content/variables/page.md b/docs/content/en/variables/page.md
index f3a50d21d..4e3673559 100644
--- a/docs/content/variables/page.md
+++ b/docs/content/en/variables/page.md
@@ -183,7 +183,7 @@ http://remarkjs.com)
 
 Also see [Sections](/content-management/sections/).
 
-{{< readfile file="/content/readfiles/sectionvars.md" markdown="true" >}}
+{{< readfile file="/content/en/readfiles/sectionvars.md" markdown="true" >}}
 
 ## Page-level Params
 
diff --git a/docs/content/variables/shortcodes.md b/docs/content/en/variables/shortcodes.md
index b194eb7db..b194eb7db 100644
--- a/docs/content/variables/shortcodes.md
+++ b/docs/content/en/variables/shortcodes.md
diff --git a/docs/content/variables/site.md b/docs/content/en/variables/site.md
index a5909a563..a5909a563 100644
--- a/docs/content/variables/site.md
+++ b/docs/content/en/variables/site.md
diff --git a/docs/content/variables/sitemap.md b/docs/content/en/variables/sitemap.md
index dd926f2b3..dd926f2b3 100644
--- a/docs/content/variables/sitemap.md
+++ b/docs/content/en/variables/sitemap.md
diff --git a/docs/content/variables/taxonomy.md b/docs/content/en/variables/taxonomy.md
index 5bcdffee5..5bcdffee5 100644
--- a/docs/content/variables/taxonomy.md
+++ b/docs/content/en/variables/taxonomy.md
diff --git a/docs/content/news/0.27-relnotes-ready.md b/docs/content/news/0.27-relnotes-ready.md
deleted file mode 100644
index 9251c3768..000000000
--- a/docs/content/news/0.27-relnotes-ready.md
+++ /dev/null
@@ -1,93 +0,0 @@
-
----
-date: 2017-09-11
-title: "0.27"
-description: "0.27"
-categories: ["Releases"]
----
-
-	
-Hugo `0.27`comes with fast and flexible **Related Content** ([3b4f17bb](https://github.com/gohugoio/hugo/commit/3b4f17bbc9ff789faa581ac278ad109d1ac5b816) [@bep](https://github.com/bep) [#98](https://github.com/gohugoio/hugo/issues/98)). To add this to your site, put something like this in your single page template:
-
-```go-html-template
-{{ $related := .Site.RegularPages.Related . | first 5 }}
-{{ with $related }}
-<h3>See Also</h3>
-<ul>
-	{{ range . }}
-	<li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
-	{{ end }}
-</ul>
-{{ end }}
-```
-
-The above translates to _list the five regular pages mostly related to the current page_. See the [Related Content Documentation](https://gohugo.io/content-management/related/) for details and configuration options.
-
-This release represents **37 contributions by 9 contributors** to the main Hugo code base.
-
-[@bep](https://github.com/bep) leads the Hugo development with a significant amount of contributions, but also a big shoutout to [@moorereason](https://github.com/moorereason), [@yihui](https://github.com/yihui), and [@oneleaftea](https://github.com/oneleaftea) for their ongoing contributions.
-
-And as always a big thanks to [@digitalcraftsman](https://github.com/digitalcraftsman) for his relentless work on keeping the documentation and the themes site in pristine condition.
-
-Many have also been busy writing and fixing the documentation in [hugoDocs](https://github.com/gohugoio/hugoDocs), 
-which has received **44 contributions by 30 contributors**. A special thanks to [@bep](https://github.com/bep), [@sdomino](https://github.com/sdomino), [@gotgenes](https://github.com/gotgenes), and [@digitalcraftsman](https://github.com/digitalcraftsman) for their work on the documentation site.
-
-
-Hugo now has:
-
-* 19464+ [stars](https://github.com/gohugoio/hugo/stargazers)
-* 455+ [contributors](https://github.com/gohugoio/hugo/graphs/contributors)
-* 178+ [themes](http://themes.gohugo.io/)
-
-## Notes
-
-* We now only strip p tag in `markdownify` if there is only one paragraph. This allows blocks of paragraphs to be "markdownified" [33ae10b6](https://github.com/gohugoio/hugo/commit/33ae10b6ade67cd9618970121d7de5fd2ce7d781) [@bep](https://github.com/bep) [#3040](https://github.com/gohugoio/hugo/issues/3040)
-
-## Enhancements
-
-### Templates
-
-* Add `time.Duration` and `time.ParseDuration` template funcs [f4bf2141](https://github.com/gohugoio/hugo/commit/f4bf214137ebd24a0d12f16d3a98d9038e6eabd3) [@bep](https://github.com/bep) [#3828](https://github.com/gohugoio/hugo/issues/3828)
-* Add `cond` (ternary) template func [0462c96a](https://github.com/gohugoio/hugo/commit/0462c96a5a9da3e8adc78d96acd39575a8b46c40) [@bep](https://github.com/bep) [#3860](https://github.com/gohugoio/hugo/issues/3860)
-* Prepare for template metrics [d000cf60](https://github.com/gohugoio/hugo/commit/d000cf605091c6999b72d6c632752289bc680223) [@bep](https://github.com/bep) 
-* Add `strings.TrimLeft` and `TrimRight` [7674ad73](https://github.com/gohugoio/hugo/commit/7674ad73825c61eecc4003475fe0577f225fe579) [@moorereason](https://github.com/moorereason) 
-* compare, hugolib, tpl: Add `Eqer` interface [08f48b91](https://github.com/gohugoio/hugo/commit/08f48b91d68d3002b887ddf737456ff0cc4e786d) [@bep](https://github.com/bep) [#3807](https://github.com/gohugoio/hugo/issues/3807)
-* Only strip p tag in `markdownify` if only one paragraph [33ae10b6](https://github.com/gohugoio/hugo/commit/33ae10b6ade67cd9618970121d7de5fd2ce7d781) [@bep](https://github.com/bep) [#3040](https://github.com/gohugoio/hugo/issues/3040)
-* Cleanup `strings.TrimPrefix` and `TrimSuffix` [29a2da05](https://github.com/gohugoio/hugo/commit/29a2da0593b081cdd61b93c6328af2c9ea4eb20f) [@moorereason](https://github.com/moorereason) 
-
-### Output
-
-* Improve the base template (aka `baseof.html`) identification [0019ce00](https://github.com/gohugoio/hugo/commit/0019ce002449d671a20a69406da37b10977f9493) [@bep](https://github.com/bep) 
-
-### Core
-
-* Implement "related content" [3b4f17bb](https://github.com/gohugoio/hugo/commit/3b4f17bbc9ff789faa581ac278ad109d1ac5b816) [@bep](https://github.com/bep) [#98](https://github.com/gohugoio/hugo/issues/98)
-* Add `Page.Equals` [f0f49ed9](https://github.com/gohugoio/hugo/commit/f0f49ed9b0c9b4545a45c95d56340fcbf4aafbef) [@bep](https://github.com/bep) 
-* Rewrite `replaceDivider` to reduce memory allocation [71ae9b45](https://github.com/gohugoio/hugo/commit/71ae9b4533083be185c5314c9c5b273cc3bd07bd) [@bep](https://github.com/bep) 
-
-
-### Other
-
-* Set up Hugo release flow on `CircleCI` [d2249c50](https://github.com/gohugoio/hugo/commit/d2249c50991ba7b00b092aca6e315ca1a4de75a1) [@bep](https://github.com/bep) [#3779](https://github.com/gohugoio/hugo/issues/3779)
-* Maintain the scroll position if possible [7231d5a8](https://github.com/gohugoio/hugo/commit/7231d5a829f8d97336a2120afde1260db6ee6541) [@yihui](https://github.com/yihui) [#3824](https://github.com/gohugoio/hugo/issues/3824)
-* Add an `iFrame` title to the `YouTube` shortcode [919bc921](https://github.com/gohugoio/hugo/commit/919bc9210a69c801c7304c0b529df93d1dca27aa) [@nraboy](https://github.com/nraboy) 
-* Remove the theme submodule from /docs [ea2cc26b](https://github.com/gohugoio/hugo/commit/ea2cc26b390476f1c605405604f8c92afd09b6ee) [@bep](https://github.com/bep) [#3791](https://github.com/gohugoio/hugo/issues/3791)
-* Add support for multiple config files via `--config a.toml,b.toml,c.toml` [0f9f73cc](https://github.com/gohugoio/hugo/commit/0f9f73cce5c3f1f05be20bcf1d23b2332623d7f9) [@jgielstra](https://github.com/jgielstra) 
-* Render task list item inside `label` for correct accessibility [c8257f8b](https://github.com/gohugoio/hugo/commit/c8257f8b726478ca70dc8984cdcc17b31e4bdc0c) [@danieka](https://github.com/danieka) [#3303](https://github.com/gohugoio/hugo/issues/3303)
-* Normalize `UniqueID` between Windows & Linux [0abdeeef](https://github.com/gohugoio/hugo/commit/0abdeeef6740a3cbba0db95374853d040f2022b8) [@Shywim](https://github.com/Shywim) 
-
-
-## Fixes
-
-### Output
-
-* Fix taxonomy term base template lookup [f88fe312](https://github.com/gohugoio/hugo/commit/f88fe312cb35f7de1615c095edd2f898303dd23b) [@bep](https://github.com/bep) [#3856](https://github.com/gohugoio/hugo/issues/3856)
-* Fix `published` front matter handling [202510fd](https://github.com/gohugoio/hugo/commit/202510fdc92d52a20baeaa7edb1091f6882bd95f) [@bep](https://github.com/bep) [#3867](https://github.com/gohugoio/hugo/issues/3867)
-
-
-
-
-
-
-
-
diff --git a/docs/content/news/0.27.1-relnotes-ready.md b/docs/content/news/0.27.1-relnotes-ready.md
deleted file mode 100644
index fa202f495..000000000
--- a/docs/content/news/0.27.1-relnotes-ready.md
+++ /dev/null
@@ -1,19 +0,0 @@
-
----
-date: 2017-09-13
-title: "0.27.1"
-description: "0.27.1"
-categories: ["Releases"]
----
-
-	
-
-This fixes a regression introduced in [Go 1.9](https://github.com/golang/go/issues/21844) which lead to HTML in shortcodes in multi output Hugo sites being wrongly escaped in some cases.
-
-* Fix escaped HTML Go 1.9 multioutput issue (#3880) [2d613dd9](https://github.com/gohugoio/hugo/commit/2d613dd905bb8eeb8af57e30ddd749a0f04fbd3c) [@bep](https://github.com/bep) [#3876](https://github.com/gohugoio/hugo/issues/3876)
-
-* Bump to Go 1.9 in the Snap build [642ba6ca](https://github.com/gohugoio/hugo/commit/642ba6cab24c558b16378178fe829cbc45845424) [@bep](https://github.com/bep) 
-
-
-
-
diff --git a/docs/content/news/0.35-relnotes-ready.md b/docs/content/news/0.35-relnotes-ready.md
deleted file mode 100644
index 3788c0326..000000000
--- a/docs/content/news/0.35-relnotes-ready.md
+++ /dev/null
@@ -1,102 +0,0 @@
-
----
-date: 2018-01-31
-title: "0.35"
-description: "0.35"
-slug: "0.35"
-categories: ["Releases"]
----
-
-	The most notable new feature in Hugo `0.35` is perhaps **Headless Bundles**.
-
-This means that you in your `index.md` front matter can say:
-
-```yaml
-headless: true
-```
-And
-* it will have no `Permalink` and no rendered HTML in `/public`
-* it will not be part of `.Site.RegularPages` etc.
-
-But you can get it by:
-
-* `.Site.GetPage ...`
-
-The use cases are many:
-
-* Shared media libraries
-* Reusable page content "snippets"
-* ...
-
-But this release contains more goodies than possible to sum up in one paragraph, so study the release notes carefully. It represents **42 contributions by 8 contributors** to the main Hugo code base.
-
-[@bep](https://github.com/bep) leads the Hugo development with a significant amount of contributions, but also a big shoutout to [@vassudanagunta](https://github.com/vassudanagunta), [@yanzay](https://github.com/yanzay), and [@robertbasic](https://github.com/robertbasic) for their ongoing contributions.
-
-And as always a big thanks to [@digitalcraftsman](https://github.com/digitalcraftsman) for his relentless work on keeping the documentation and the themes site in pristine condition.
-
-Many have also been busy writing and fixing the documentation in [hugoDocs](https://github.com/gohugoio/hugoDocs), 
-which has received **28 contributions by 5 contributors**. A special thanks to [@bep](https://github.com/bep), [@kaushalmodi](https://github.com/kaushalmodi), [@regisphilibert](https://github.com/regisphilibert), and [@salim-b](https://github.com/salim-b) for their work on the documentation site.
-
-
-Hugo now has:
-
-* 22967+ [stars](https://github.com/gohugoio/hugo/stargazers)
-* 448+ [contributors](https://github.com/gohugoio/hugo/graphs/contributors)
-* 197+ [themes](http://themes.gohugo.io/)
-
-
-## Notes
-
-* Deprecate `useModTimeAsFallback` [adfd4370](https://github.com/gohugoio/hugo/commit/adfd4370b67fd7181178bd6b3b1d07356beaac71) [@bep](https://github.com/bep) [#4351](https://github.com/gohugoio/hugo/issues/4351)
-* Deprecate CLI flags `canonifyURLs`, `pluralizeListTitles`, `preserveTaxonomyNames`, `uglyURLs` [f08ea02d](https://github.com/gohugoio/hugo/commit/f08ea02d24d42929676756950f3affaca7fd8c01) [@bep](https://github.com/bep) [#4347](https://github.com/gohugoio/hugo/issues/4347)
-* Remove undraft command [2fa70c93](https://github.com/gohugoio/hugo/commit/2fa70c9344b231c9d999bbafdfa4acbf27ed9f6e) [@robertbasic](https://github.com/robertbasic) [#4353](https://github.com/gohugoio/hugo/issues/4353)
-
-## Enhancements
-
-### Templates
-
-* Update Twitter card to also consider images in `.Resources` [25d691da](https://github.com/gohugoio/hugo/commit/25d691daff57d7c6d7d0f63af3991d22e3f788fe) [@bep](https://github.com/bep) [#4349](https://github.com/gohugoio/hugo/issues/4349)
-* Seed random on init only [83c761b7](https://github.com/gohugoio/hugo/commit/83c761b71a980aee6331179b271c7e24e999e8eb) [@liguoqinjim](https://github.com/liguoqinjim) 
-* Remove duplicate layout lookup layouts [b2fcbb1f](https://github.com/gohugoio/hugo/commit/b2fcbb1f9774aa1e929b8575c0e1ac366ab2fb73) [@bep](https://github.com/bep) [#4319](https://github.com/gohugoio/hugo/issues/4319)
-* Add "removable-media" interface to `snapcraft.yaml` [f0c0ece4](https://github.com/gohugoio/hugo/commit/f0c0ece44d55b6c2997cbd106d1bc099ea1a2fa7) [@anthonyfok](https://github.com/anthonyfok) [#3837](https://github.com/gohugoio/hugo/issues/3837)
-
-### Other
-
-* Add a way to disable one or more languages [6413559f](https://github.com/gohugoio/hugo/commit/6413559f7575e2653d76227a8037a7edbaae82aa) [@bep](https://github.com/bep) [#4297](https://github.com/gohugoio/hugo/issues/4297)[#4329](https://github.com/gohugoio/hugo/issues/4329)
-* Handle newly created files in Fast Render Mode [1707dae8](https://github.com/gohugoio/hugo/commit/1707dae8d3634006017eb6d040df4dbafc53d92f) [@yanzay](https://github.com/yanzay) [#4339](https://github.com/gohugoio/hugo/issues/4339)
-* Extract the Fast Render Mode logic into a method [94e736c5](https://github.com/gohugoio/hugo/commit/94e736c5e167a0ee70a528e1c19d64a47e7929c2) [@bep](https://github.com/bep) [#4339](https://github.com/gohugoio/hugo/issues/4339)
-* Remove unused code [ae5a45be](https://github.com/gohugoio/hugo/commit/ae5a45be6f0ee4d5c52b38fd28b22b55d9cd7b2d) [@bep](https://github.com/bep) 
-* Add the last lookup variant for the `GetPage` index [3446fe9b](https://github.com/gohugoio/hugo/commit/3446fe9b8937610b8b628b2c212eb25888a7c1bb) [@bep](https://github.com/bep) [#4312](https://github.com/gohugoio/hugo/issues/4312)
-* Simplify bundle lookup via `.Site.GetPage`, `ref`, `relref` [517b6b62](https://github.com/gohugoio/hugo/commit/517b6b62389d23bfe41fe3ae551a691b11bdcaa7) [@bep](https://github.com/bep) [#4312](https://github.com/gohugoio/hugo/issues/4312)
-* Remove some now superflous Fast Render Mode code [feeed073](https://github.com/gohugoio/hugo/commit/feeed073c3320b09fb38168ce272ac88b987f1d2) [@bep](https://github.com/bep) [#4339](https://github.com/gohugoio/hugo/issues/4339)
-* Make resource counters for `name` and `title` independent [df20b054](https://github.com/gohugoio/hugo/commit/df20b05463fef42aba93d5208e410a7ecc56da5d) [@bep](https://github.com/bep) [#4335](https://github.com/gohugoio/hugo/issues/4335)
-* Provide .Name to the archetype templates [863a812e](https://github.com/gohugoio/hugo/commit/863a812e07193541b42732b0e227f3d320433f01) [@bep](https://github.com/bep) [#4348](https://github.com/gohugoio/hugo/issues/4348)
-* Only set `url` if permalink in metadata and remove duplicate confirm msg [3752348e](https://github.com/gohugoio/hugo/commit/3752348ef13ced8f6f528b42ee7d76a12a97ae5c) [@lildude](https://github.com/lildude) [#1887](https://github.com/gohugoio/hugo/issues/1887)
-* Start Resources :counter first time they're used [7b472e46](https://github.com/gohugoio/hugo/commit/7b472e46084b603045b87cea870ffc73ac1cf7e7) [@bep](https://github.com/bep) [#4335](https://github.com/gohugoio/hugo/issues/4335)
-* Update to Go 1.9.3 [a91aba1c](https://github.com/gohugoio/hugo/commit/a91aba1c1562259dffd321a608f38c38dd4d5aeb) [@bep](https://github.com/bep) [#4328](https://github.com/gohugoio/hugo/issues/4328)
-* Support pages without front matter [91bb774a](https://github.com/gohugoio/hugo/commit/91bb774ae4e129f7ed0624754b31479c960ef774) [@vassudanagunta](https://github.com/vassudanagunta) [#4320](https://github.com/gohugoio/hugo/issues/4320)[#4320](https://github.com/gohugoio/hugo/issues/4320)
-* Add page metadata dates tests [3f0379ad](https://github.com/gohugoio/hugo/commit/3f0379adb72389954ca2be6a9f2ebfcd65c6c440) [@vassudanagunta](https://github.com/vassudanagunta) 
-* Re-generate CLI docs [1e27d058](https://github.com/gohugoio/hugo/commit/1e27d0589118a114e49c032e4bd68b4798e44a5b) [@bep](https://github.com/bep) 
-* Remove and update deprecation status [d418c2c2](https://github.com/gohugoio/hugo/commit/d418c2c2eacdc1dc6fffe839e0a90600867878ca) [@bep](https://github.com/bep) 
-* Shorten the stale setup [4a7c2b36](https://github.com/gohugoio/hugo/commit/4a7c2b3695fe7b88861f2155ea7ef635fe425cd4) [@bep](https://github.com/bep) 
-* Add a `GetPage` to the site benchmarks [a1956391](https://github.com/gohugoio/hugo/commit/a19563910eec5fed08f3b02563b9a7b38026183d) [@bep](https://github.com/bep) 
-* Add headless bundle support [0432c64d](https://github.com/gohugoio/hugo/commit/0432c64dd22e4610302162678bb93661ba68d758) [@bep](https://github.com/bep) [#4311](https://github.com/gohugoio/hugo/issues/4311)
-* Merge matching resources params maps [5a0819b9](https://github.com/gohugoio/hugo/commit/5a0819b9b5eb9e79826cfa0a65f235d9821b1ac4) [@bep](https://github.com/bep) [#4315](https://github.com/gohugoio/hugo/issues/4315)
-* Add some general code contribution criterias [78c86330](https://github.com/gohugoio/hugo/commit/78c863305f337ed4faf3cf0a23675f28b0ae5641) [@bep](https://github.com/bep) 
-* Tighten page kind logic, introduce tests [8125b4b0](https://github.com/gohugoio/hugo/commit/8125b4b03d10eb73f8aea3f9ea41172aba8df082) [@vassudanagunta](https://github.com/vassudanagunta) 
-
-## Fixes
-* Fix `robots.txt` in multihost mode [4d912e2a](https://github.com/gohugoio/hugo/commit/4d912e2aad39bfe8d76672cf53b01317792e02c5) [@bep](https://github.com/bep) [#4193](https://github.com/gohugoio/hugo/issues/4193)
-* Fix `--uglyURLs` from comand line regression [016398ff](https://github.com/gohugoio/hugo/commit/016398ffe2e0a073453cf46a9d6bf72d693c11e5) [@bep](https://github.com/bep) [#4343](https://github.com/gohugoio/hugo/issues/4343)
-* Avoid unescape in `highlight` [ebdd8cba](https://github.com/gohugoio/hugo/commit/ebdd8cba3f5965a8ac897833f313d772271de649) [@bep](https://github.com/bep) [#4219](https://github.com/gohugoio/hugo/issues/4219)
-* Fix Docker build [a34213f0](https://github.com/gohugoio/hugo/commit/a34213f0b5624de101272aab469ca9b6fe0c273f) [@skoblenick](https://github.com/skoblenick) [#4076](https://github.com/gohugoio/hugo/issues/4076)[#4077](https://github.com/gohugoio/hugo/issues/4077)
-* Fix language params handling [ae742cb1](https://github.com/gohugoio/hugo/commit/ae742cb1bdf35b81aa0ede5453da6b0c4a4fccf2) [@bep](https://github.com/bep) [#4356](https://github.com/gohugoio/hugo/issues/4356)[#4352](https://github.com/gohugoio/hugo/issues/4352)
-* Fix handling of top-level page bundles [4eb2fec6](https://github.com/gohugoio/hugo/commit/4eb2fec67c3a72a3ac98aa834dc56fd4504626d8) [@bep](https://github.com/bep) [#4332](https://github.com/gohugoio/hugo/issues/4332)
-* Fix `baseURL` server regression for multilingual sites [ed4a00e4](https://github.com/gohugoio/hugo/commit/ed4a00e46f2344320a22f07febe5aec4075cb3fb) [@bep](https://github.com/bep) [#4333](https://github.com/gohugoio/hugo/issues/4333)
-* Fix "date" page param [322c5672](https://github.com/gohugoio/hugo/commit/322c567220aa4123a5d707629c1bebd375599912) [@vassudanagunta](https://github.com/vassudanagunta) [#4323](https://github.com/gohugoio/hugo/issues/4323)
-* Fix typo in comment [912147ab](https://github.com/gohugoio/hugo/commit/912147ab896e69a450b7100c3d6bf81a7bf78b5a) [@yanzay](https://github.com/yanzay) 
-
-
-
-
-
diff --git a/docs/content/release-notes/0.25-relnotes.md b/docs/content/release-notes/0.25-relnotes.md
deleted file mode 100644
index 8f4e47227..000000000
--- a/docs/content/release-notes/0.25-relnotes.md
+++ /dev/null
@@ -1,78 +0,0 @@
-
----
-date: 2017-07-07
-title: 0.25
----
-
-	Hugo `0.25` is the **Kinder Surprise**: It automatically opens the page you're working on in the browser, it adds full `AND` and `OR` support in page queries, and you can now have templates per language.
-
-![Hugo Open on Save](https://cdn-standard5.discourse.org/uploads/gohugo/optimized/2X/6/622088d4a8eacaf62bbbaa27dab19d789e10fe09_1_690x345.gif "Hugo Open on Save")
-
-If you start with `hugo server --navigateToChanged`, Hugo will navigate to the relevant page on save (see animated GIF). This is extremely useful for site-wide edits. Another very useful feature in this version is the added support for `AND` (`intersect`)  and `OR` (`union`)  filters when combined with `where`.
-
-Example:
-
-```go
-{{ $pages := where .Site.RegularPages "Type" "not in" (slice "page" "about") }}
-{{ $pages := $pages | union (where .Site.RegularPages "Params.pinned" true) }}
-{{ $pages := $pages | intersect (where .Site.RegularPages "Params.images" "!=" nil) }}
-```
-
-The above fetches regular pages not of `page` or `about` type unless they are pinned. And finally, we exclude all pages with no `images` set in Page params.
-
-This release represents **36 contributions by 12 contributors** to the main Hugo code base. [@bep](https://github.com/bep) still leads the Hugo development with his witty Norwegian humor, and once again contributed a significant amount of additions. But also a big shoutout to [@yihui](https://github.com/yihui), [@anthonyfok](https://github.com/anthonyfok), and [@kropp](https://github.com/kropp) for their ongoing contributions. And as always a big thanks to [@digitalcraftsman](https://github.com/digitalcraftsman) for his relentless work on keeping the documentation and the themes site in pristine condition.
-
-Hugo now has:
-
-* 18209+ [stars](https://github.com/gohugoio/hugo/stargazers)
-* 455+ [contributors](https://github.com/gohugoio/hugo/graphs/contributors)
-* 168+ [themes](http://themes.gohugo.io/)
-
-## Enhancements
-
-### Templates
-
-* Add `Pages` support to `intersect` (`AND`) and `union`(`ÒR`). This makes the `where` template func even more powerful. [ccdd08d5](https://github.com/gohugoio/hugo/commit/ccdd08d57ab64441e93d6861ae126b5faacdb92f) [@bep](https://github.com/bep) [#3174](https://github.com/gohugoio/hugo/issues/3174)
-* Add `math.Log` function. This is very handy for creating tag clouds. [34c56677](https://github.com/gohugoio/hugo/commit/34c566773a1364077e1397daece85b22948dc721) [@artem-sidorenko](https://github.com/artem-sidorenko) 
-* Add `WebP` images support [8431c8d3](https://github.com/gohugoio/hugo/commit/8431c8d39d878c18c6b5463d9091a953608df10b) [@bep](https://github.com/bep) [#3529](https://github.com/gohugoio/hugo/issues/3529)
-* Only show post's own keywords in schema.org [da72805a](https://github.com/gohugoio/hugo/commit/da72805a4304a57362e8e79a01cc145767b027c5) [@brunoamaral](https://github.com/brunoamaral) [#2635](https://github.com/gohugoio/hugo/issues/2635)[#2646](https://github.com/gohugoio/hugo/issues/2646)
-* Simplify the `Disqus` template a little bit (#3655) [eccb0647](https://github.com/gohugoio/hugo/commit/eccb0647821e9db20ba9800da1b4861807cc5205) [@yihui](https://github.com/yihui) 
-* Improve the built-in Disqus template (#3639) [2e1e4934](https://github.com/gohugoio/hugo/commit/2e1e4934b60ce8081a7f3a79191ed204f3098481) [@yihui](https://github.com/yihui) 
-
-### Output
-
-* Support templates per site/language. This is for both regular templates and shortcode templates. [aa6b1b9b](https://github.com/gohugoio/hugo/commit/aa6b1b9be7c9d7322333893b642aaf8c7a5f2c2e) [@bep](https://github.com/bep) [#3360](https://github.com/gohugoio/hugo/issues/3360)
-
-### Core
-
-* Extend the sections API [a1d260b4](https://github.com/gohugoio/hugo/commit/a1d260b41a6673adef679ec4e262c5f390432cf5) [@bep](https://github.com/bep) [#3591](https://github.com/gohugoio/hugo/issues/3591)
-* Make `.Site.Sections` return the top level sections [dd9b1baa](https://github.com/gohugoio/hugo/commit/dd9b1baab0cb860a3eb32fd9043bac18cab3f9f0) [@bep](https://github.com/bep) [#3591](https://github.com/gohugoio/hugo/issues/3591)
-* Render `404.html` for all languages [41805dca](https://github.com/gohugoio/hugo/commit/41805dca9e40e9b0952e04d06074e6fc91140495) [@mitchchn](https://github.com/mitchchn) [#3598](https://github.com/gohugoio/hugo/issues/3598)
-
-### Other
-
-* Support human-readable `YAML` boolean values in `undraft` [1039356e](https://github.com/gohugoio/hugo/commit/1039356edf747f044c989a5bc0e85d792341ed5d) [@kropp](https://github.com/kropp) 
-* `hugo import jekyll` support nested `_posts` directories [7ee1f25e](https://github.com/gohugoio/hugo/commit/7ee1f25e9ef3be8f99c171e8e7982f4f82c13e16) [@coderzh](https://github.com/coderzh) [#1890](https://github.com/gohugoio/hugo/issues/1890)[#1911](https://github.com/gohugoio/hugo/issues/1911)
-* Update `Dockerfile` and add Docker optimizations [118f8f7c](https://github.com/gohugoio/hugo/commit/118f8f7cf22d756d8a894ff93551974a806f2155) [@ellerbrock](https://github.com/ellerbrock) 
-* Add Blackfriday `joinLines` extension support (#3574) [a5440496](https://github.com/gohugoio/hugo/commit/a54404968a4b36579797f2e7ff7f5eada94866d9) [@choueric](https://github.com/choueric) 
-* add `--initial-header-level=2` to rst2html (#3528) [bfce30d8](https://github.com/gohugoio/hugo/commit/bfce30d85972c27c27e8a2caac9db6315f813298) [@frankbraun](https://github.com/frankbraun) 
-* Support open "current content page" in browser [c825a731](https://github.com/gohugoio/hugo/commit/c825a7312131b4afa67ee90d593640dee3525d98) [@bep](https://github.com/bep) [#3643](https://github.com/gohugoio/hugo/issues/3643)
-* Make `--navigateToChanged` more robust on Windows [30e14cc3](https://github.com/gohugoio/hugo/commit/30e14cc31678ddc204b082ab362f86b6b8063881) [@anthonyfok](https://github.com/anthonyfok) [#3645](https://github.com/gohugoio/hugo/issues/3645)
-* Remove the docs submodule [31393f60](https://github.com/gohugoio/hugo/commit/31393f6024416ea1b2e61d1080dfd7104df36eda) [@bep](https://github.com/bep) [#3647](https://github.com/gohugoio/hugo/issues/3647)
-* Use `example.com` as homepage for new theme [aff1ac32](https://github.com/gohugoio/hugo/commit/aff1ac3235b6c075d01f7237addf44fecdd36d82) [@anthonyfok](https://github.com/anthonyfok) 
-
-## Fixes
-
-### Templates
-
-* Fix `in` function for JSON arrays [d12cf5a2](https://github.com/gohugoio/hugo/commit/d12cf5a25df00fa16c59f0b2ae282187a398214c) [@bep](https://github.com/bep) [#1468](https://github.com/gohugoio/hugo/issues/1468)
-
-### Other
-
-* Fix handling of `JSON` front matter with escaped quotes [e10e51a0](https://github.com/gohugoio/hugo/commit/e10e51a00827b9fdc1bee51439fef05afc529831) [@bep](https://github.com/bep) [#3661](https://github.com/gohugoio/hugo/issues/3661)
-* Fix typo in code comment [56d82aa0](https://github.com/gohugoio/hugo/commit/56d82aa025f4d2edb1dc6315132cd7ab52df649a) [@dvic](https://github.com/dvic) 
-
-
-
-
-
diff --git a/docs/content/release-notes/0.25.1-relnotes.md b/docs/content/release-notes/0.25.1-relnotes.md
deleted file mode 100644
index cf0c6a51b..000000000
--- a/docs/content/release-notes/0.25.1-relnotes.md
+++ /dev/null
@@ -1,28 +0,0 @@
-
----
-date: 2017-07-10
-title: 0.25.1
----
-
-	
-
-This is a bug-fix release with a couple of important fixes.
-
-
-Hugo now has:
-
-* 18277+ [stars](https://github.com/gohugoio/hugo/stargazers)
-* 456+ [contributors](https://github.com/gohugoio/hugo/graphs/contributors)
-* 170+ [themes](http://themes.gohugo.io/)
-
-## Fixes
-
-* Fix union when the first slice is empty [dbbc5c48](https://github.com/gohugoio/hugo/commit/dbbc5c4810a04ac06fad7500d88cf5c3bfe0c7fd) [@bep](https://github.com/bep) [#3686](https://github.com/gohugoio/hugo/issues/3686)
-* Navigate to changed on CREATE When working with content from IntelliJ IDE, like WebStorm, every file save is followed by two events: "RENAME" and then "CREATE". [7bcc1ce6](https://github.com/gohugoio/hugo/commit/7bcc1ce659710f2220b400ce3b76e50d2e48b241) [@miltador](https://github.com/miltador) 
-* Final (!) fix for issue with escaped JSON front matter [7f82b41a](https://github.com/gohugoio/hugo/commit/7f82b41a24af0fd04d28fbfebf9254766a3c6e6f) [@bep](https://github.com/bep) [#3682](https://github.com/gohugoio/hugo/issues/3682)
-* Fix issue with escaped JSON front matter [84db6c74](https://github.com/gohugoio/hugo/commit/84db6c74a084d2b52117b999d4ec343cd3389a68) [@bep](https://github.com/bep) [#3682](https://github.com/gohugoio/hugo/issues/3682)
-
-
-
-
-
diff --git a/docs/content/zh/_index.md b/docs/content/zh/_index.md
new file mode 100644
index 000000000..78f9ef15f
--- /dev/null
+++ b/docs/content/zh/_index.md
@@ -0,0 +1,49 @@
+---
+title: "世界上最快的网站构建框架 The world’s fastest framework for building websites"
+date: 2017-03-02T12:00:00-05:00
+features:
+  - heading: Blistering Speed
+    image_path: /images/icon-fast.svg
+    tagline: What's modern about waiting for your site to build?
+    copy: Hugo is the fastest tool of its kind. At <1 ms per page, the average site builds in less than a second.
+
+  - heading: Robust Content Management
+    image_path: /images/icon-content-management.svg
+    tagline: Flexibility rules. Hugo is a content strategist's dream.
+    copy: Hugo supports unlimited content types, taxonomies, menus, dynamic API-driven content, and more, all without plugins.
+
+  - heading: Shortcodes
+    image_path: /images/icon-shortcodes.svg
+    tagline: Hugo's shortcodes are Markdown's hidden superpower.
+    copy: We love the beautiful simplicity of markdown’s syntax, but there are times when we want more flexibility. Hugo shortcodes allow for both beauty and flexibility.
+
+  - heading: Built-in Templates
+    image_path: /images/icon-built-in-templates.svg
+    tagline: Hugo has common patterns to get your work done quickly.
+    copy: Hugo ships with pre-made templates to make quick work of SEO, commenting, analytics and other functions. One line of code, and you're done.
+
+  - heading: Multilingual and i18n
+    image_path: /images/icon-multilingual2.svg
+    tagline: Polyglot baked in.
+    copy: Hugo provides full i18n support for multi-language sites with the same straightforward development experience Hugo users love in single-language sites.
+
+  - heading: Custom Outputs
+    image_path: /images/icon-custom-outputs.svg
+    tagline: HTML not enough?
+    copy: Hugo allows you to output your content in multiple formats, including JSON or AMP, and makes it easy to create your own.
+sections:
+  - heading: "100s of Themes"
+    cta: Check out the Hugo's themes.
+    link: http://themes.gohugo.io/
+    color_classes: bg-accent-color white
+    image: /images/homepage-screenshot-hugo-themes.jpg
+    copy: "Hugo provides a robust theming system that is easy to implement but capable of producing even the most complicated websites."
+  - heading: "Capable Templating"
+    cta: Get Started.
+    link: templates/
+    color_classes: bg-primary-color-light black
+    image: /images/home-page-templating-example.png
+    copy: "Hugo's Go-based templating provides just the right amount of logic to build anything from the simple to complex. If you prefer Jade/Pug-like syntax, you can also use Amber, Ace, or any combination of the three."
+---
+
+Hugo is one of the most popular open-source static site generators. With its amazing speed and flexibility, Hugo makes building websites fun again.
diff --git a/docs/content/zh/about/_index.md b/docs/content/zh/about/_index.md
new file mode 100644
index 000000000..bf19807d9
--- /dev/null
+++ b/docs/content/zh/about/_index.md
@@ -0,0 +1,20 @@
+---
+title: 关于 Hugo
+linktitle: 概览
+description: Hugo 的特色、规划、许可和动力。
+date: 2018-04-26
+publishdate: 2018-04-26
+lastmod: 2018-04-26
+categories: []
+keywords: []
+menu:
+  docs:
+    parent: "about"
+    weight: 1
+weight: 1
+draft: false
+aliases: [/about-hugo/,/docs/]
+toc: false
+---
+
+Hugo 不是一般的静态网站生成器。
diff --git a/docs/content/zh/content-management/_index.md b/docs/content/zh/content-management/_index.md
new file mode 100644
index 000000000..8c088dc57
--- /dev/null
+++ b/docs/content/zh/content-management/_index.md
@@ -0,0 +1,21 @@
+---
+title: 内容管理
+linktitle: 内容管理概览
+description: Hugo 可以管理大型的静态网站，支持骨架、内容类型、菜单、引用、概要等等。
+date: 2018-04-23
+publishdate: 2018-04-23
+lastmod: 2018-04-23
+menu:
+  docs:
+    parent: "content-management"
+    weight: 1
+keywords: [source, organization]
+categories: [content management]
+weight: 01	#rem
+draft: false
+aliases: [/content/,/content/organization]
+toc: false
+isCJKLanguage: true
+---
+
+一个实用的静态网站生成器，需要超越“文件头” (front matter) 和模板的等基本功能，才能兼备可伸缩性和可管理性，满足用户所需。Hugo 不仅是给开发者设计的，也同样适用于内容管理员和写作人员。
diff --git a/docs/content/zh/documentation.md b/docs/content/zh/documentation.md
new file mode 100644
index 000000000..1639bbcd2
--- /dev/null
+++ b/docs/content/zh/documentation.md
@@ -0,0 +1,21 @@
+---
+title: Hugo 说明文档
+linktitle: Hugo
+description: Hugo is the world's fastest static website engine. It's written in Go (aka Golang) and developed by bep, spf13 and friends.
+date: 2017-02-01
+publishdate: 2017-02-01
+menu:
+  main:
+    parent: "section name"
+    weight: 01
+weight: 01	#rem
+draft: false
+slug:
+aliases: []
+toc: false
+layout: documentation-home
+isCJKLanguage: true
+---
+Hugo 号称**世界上最快的静态网站引擎**。它是以 Go (即 Golang) 编程语言所写成，并由 [bep](https://github.com/bep)、[spf13](https://github.com/spf13) 和[朋友们](https://github.com/gohugoio/hugo/graphs/contributors) 共同开发。
+
+下面是我们说明文档中最常用和实用的章节：
diff --git a/docs/content/zh/news/_index.md b/docs/content/zh/news/_index.md
new file mode 100644
index 000000000..286d32e19
--- /dev/null
+++ b/docs/content/zh/news/_index.md
@@ -0,0 +1,4 @@
+---
+title: "Hugo 新闻"
+aliases: [/release-notes/]
+---
diff --git a/docs/content/zh/templates/_index.md b/docs/content/zh/templates/_index.md
new file mode 100644
index 000000000..3cd8df436
--- /dev/null
+++ b/docs/content/zh/templates/_index.md
@@ -0,0 +1,19 @@
+---
+title: 模板 Templates
+linktitle: 模板概览
+description: Go templating, template types and lookup order, shortcodes, and data.
+date: 2017-02-01
+publishdate: 2017-02-01
+lastmod: 2017-02-01
+menu:
+  docs:
+    parent: "templates"
+    weight: 01
+weight: 01	#rem
+categories: [templates]
+keywords: []
+draft: false
+aliases: [/templates/overview/,/templates/content]
+toc: false
+notesforauthors:
+---
diff --git a/docs/content/zh/templates/base.md b/docs/content/zh/templates/base.md
new file mode 100644
index 000000000..8f98cfdfe
--- /dev/null
+++ b/docs/content/zh/templates/base.md
@@ -0,0 +1,132 @@
+---
+title: Base 模板 and Blocks
+linktitle:
+description: The base and block constructs allow you to define the outer shell of your master templates (i.e., the chrome of the page).
+godocref: https://golang.org/pkg/text/template/#example_Template_block
+date: 2017-02-01
+publishdate: 2017-02-01
+lastmod: 2017-02-01
+categories: [templates,fundamentals]
+keywords: [blocks,base]
+menu:
+  docs:
+    parent: "templates"
+    weight: 20
+weight: 20
+sections_weight: 20
+draft: false
+aliases: [/templates/blocks/,/templates/base-templates-and-blocks/]
+toc: true
+---
+
+The `block` keyword allows you to define the outer shell of your pages' one or more master template(s) and then fill in or override portions as necessary.
+
+{{< youtube QVOMCYitLEc >}}
+
+## Base Template Lookup Order
+
+The [lookup order][lookup] for base templates is as follows:
+
+1. `/layouts/section/<TYPE>-baseof.html`
+2. `/themes/<THEME>/layouts/section/<TYPE>-baseof.html`
+3. `/layouts/<TYPE>/baseof.html`
+4. `/themes/<THEME>/layouts/<TYPE>/baseof.html`
+5. `/layouts/section/baseof.html`
+6. `/themes/<THEME>/layouts/section/baseof.html`
+7. `/layouts/_default/<TYPE>-baseof.html`
+8. `/themes/<THEME>/layouts/_default/<TYPE>-baseof.html`
+9. `/layouts/_default/baseof.html`
+10. `/themes/<THEME>/layouts/_default/baseof.html`
+
+Variables are denoted by capitalized text set within `<>`. Note that Hugo's default behavior is for `type` to inherit from `section` unless otherwise specified.
+
+### Example Base Template Lookup Order
+
+As an example, let's assume your site is using a theme called "mytheme" when rendering the section list for a `post` section. Hugo picks `layout/section/post.html` as the template for [rendering the section][]. The `{{define}}` block in this template tells Hugo that the template is an extension of a base template.
+
+Here is the lookup order for the `post` base template:
+
+1. `/layouts/section/post-baseof.html`
+2. `/themes/mytheme/layouts/section/post-baseof.html`
+3. `/layouts/post/baseof.html`
+4. `/themes/mytheme/layouts/post/baseof.html`
+5. `/layouts/section/baseof.html`
+6. `/themes/mytheme/layouts/section/baseof.html`
+7. `/layouts/_default/post-baseof.html`
+8. `/themes/mytheme/layouts/_default/post-baseof.html`
+9. `/layouts/_default/baseof.html`
+10. `/themes/mytheme/layouts/_default/baseof.html`
+
+## Define the Base Template
+
+The following defines a simple base template at `_default/baseof.html`. As a default template, it is the shell from which all your pages will be rendered unless you specify another `*baseof.html` closer to the beginning of the lookup order.
+
+{{< code file="layouts/_default/baseof.html" download="baseof.html" >}}
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>{{ block "title" . }}
+      <!-- Blocks may include default content. -->
+      {{ .Site.Title }}
+    {{ end }}</title>
+  </head>
+  <body>
+    <!-- Code that all your templates share, like a header -->
+    {{ block "main" . }}
+      <!-- The part of the page that begins to differ between templates -->
+    {{ end }}
+    {{ block "footer" . }}
+    <!-- More shared code, perhaps a footer but that can be overridden if need be in  -->
+    {{ end }}
+  </body>
+</html>
+{{< /code >}}
+
+## Override the Base Template
+
+From the above base template, you can define a [default list template][hugolists]. The default list template will inherit all of the code defined above and can then implement its own `"main"` block from:
+
+{{< code file="layouts/_default/list.html" download="list.html" >}}
+{{ define "main" }}
+  <h1>Posts</h1>
+  {{ range .Data.Pages }}
+    <article>
+      <h2>{{ .Title }}</h2>
+      {{ .Content }}
+    </article>
+  {{ end }}
+{{ end }}
+{{< /code >}}
+
+This replaces the contents of our (basically empty) "main" block with something useful for the list template. In this case, we didn't define a `"title"` block, so the contents from our base template remain unchanged in lists.
+
+{{% warning %}}
+Code that you put outside the block definitions *can* break your layout. This even includes HTML comments. For example:
+
+```
+<!-- Seemingly harmless HTML comment..that will break your layout at build -->
+{{ define "main" }}
+...your code here
+{{ end }}
+```
+[See this thread from the Hugo discussion forums.](https://discourse.gohugo.io/t/baseof-html-block-templates-and-list-types-results-in-empty-pages/5612/6)
+{{% /warning %}}
+
+The following shows how you can override both the `"main"` and `"title"` block areas from the base template with code unique to your [default single page template][singletemplate]:
+
+{{< code file="layouts/_default/single.html" download="single.html" >}}
+{{ define "title" }}
+  <!-- This will override the default value set in baseof.html; i.e., "{{.Site.Title}}" in the original example-->
+  {{ .Title }} &ndash; {{ .Site.Title }}
+{{ end }}
+{{ define "main" }}
+  <h1>{{ .Title }}</h1>
+  {{ .Content }}
+{{ end }}
+{{< /code >}}
+
+[hugolists]: /templates/lists
+[lookup]: /templates/lookup-order/
+[rendering the section]: /templates/section-templates/
+[singletemplate]: /templates/single-page-templates/
diff --git a/docs/netlify.toml b/docs/netlify.toml
index caf6bc3e8..ee649cf62 100644
--- a/docs/netlify.toml
+++ b/docs/netlify.toml
@@ -3,7 +3,7 @@ publish = "public"
 command = "hugo"
 
 [context.production.environment]
-HUGO_VERSION = "0.39"
+HUGO_VERSION = "0.40.2"
 HUGO_ENV = "production"
 HUGO_ENABLEGITINFO = "true"
 
@@ -11,20 +11,20 @@ HUGO_ENABLEGITINFO = "true"
 command = "hugo --enableGitInfo"
 
 [context.split1.environment]
-HUGO_VERSION = "0.39"
+HUGO_VERSION = "0.40.2"
 HUGO_ENV = "production"
 
 [context.deploy-preview]
 command = "hugo -b $DEPLOY_PRIME_URL"
 
 [context.deploy-preview.environment]
-HUGO_VERSION = "0.39"
+HUGO_VERSION = "0.40.2"
 
 [context.branch-deploy]
 command = "hugo -b $DEPLOY_PRIME_URL"
 
 [context.branch-deploy.environment]
-HUGO_VERSION = "0.39"
+HUGO_VERSION = "0.40.2"
 
 [context.next.environment]
 HUGO_ENABLEGITINFO = "true"
diff --git a/docs/resources/_gen/images/news/0.39-relnotes/featured-hugo-39-poster_hu2a1fdf8d3d53aa00bce401a32585d7ec_216872_640x0_resize_catmullrom_2.png b/docs/resources/_gen/images/news/0.39-relnotes/featured-hugo-39-poster_hu2a1fdf8d3d53aa00bce401a32585d7ec_216872_640x0_resize_catmullrom_2.png
deleted file mode 100644
index 18d992dfe..000000000
--- a/docs/resources/_gen/images/news/0.39-relnotes/featured-hugo-39-poster_hu2a1fdf8d3d53aa00bce401a32585d7ec_216872_640x0_resize_catmullrom_2.png
+++ /dev/null
diff --git a/docs/resources/_gen/images/news/0.40-relnotes/featured-hugo-40-poster_hu20c69e2a166f65e329d8fbabe8d2cc58_69238_480x0_resize_catmullrom_2.png b/docs/resources/_gen/images/news/0.40-relnotes/featured-hugo-40-poster_hu20c69e2a166f65e329d8fbabe8d2cc58_69238_480x0_resize_catmullrom_2.png
new file mode 100644
index 000000000..656e02b34
--- /dev/null
+++ b/docs/resources/_gen/images/news/0.40-relnotes/featured-hugo-40-poster_hu20c69e2a166f65e329d8fbabe8d2cc58_69238_480x0_resize_catmullrom_2.png
diff --git a/docs/resources/_gen/images/news/0.40-relnotes/featured-hugo-40-poster_hu20c69e2a166f65e329d8fbabe8d2cc58_69238_640x0_resize_catmullrom_2.png b/docs/resources/_gen/images/news/0.40-relnotes/featured-hugo-40-poster_hu20c69e2a166f65e329d8fbabe8d2cc58_69238_640x0_resize_catmullrom_2.png
new file mode 100644
index 000000000..0939f8d0f
--- /dev/null
+++ b/docs/resources/_gen/images/news/0.40-relnotes/featured-hugo-40-poster_hu20c69e2a166f65e329d8fbabe8d2cc58_69238_640x0_resize_catmullrom_2.png
diff --git a/docs/resources/_gen/images/showcase/flesland-flis/featured_hue4fd3c0e7519777bd75019750a0f5391_309284_1024x512_fill_catmullrom_top_2.png b/docs/resources/_gen/images/showcase/flesland-flis/featured_hue4fd3c0e7519777bd75019750a0f5391_309284_1024x512_fill_catmullrom_top_2.png
new file mode 100644
index 000000000..755f765ac
--- /dev/null
+++ b/docs/resources/_gen/images/showcase/flesland-flis/featured_hue4fd3c0e7519777bd75019750a0f5391_309284_1024x512_fill_catmullrom_top_2.png
diff --git a/docs/resources/_gen/images/showcase/flesland-flis/featured_hue4fd3c0e7519777bd75019750a0f5391_309284_640x0_resize_catmullrom_2.png b/docs/resources/_gen/images/showcase/flesland-flis/featured_hue4fd3c0e7519777bd75019750a0f5391_309284_640x0_resize_catmullrom_2.png
new file mode 100644
index 000000000..950b2e08b
--- /dev/null
+++ b/docs/resources/_gen/images/showcase/flesland-flis/featured_hue4fd3c0e7519777bd75019750a0f5391_309284_640x0_resize_catmullrom_2.png
diff --git a/docs/resources/_gen/images/showcase/flesland-flis/featured_hue4fd3c0e7519777bd75019750a0f5391_309284_f66ed2dc2e475b0cb21d76296890c5a2.png b/docs/resources/_gen/images/showcase/flesland-flis/featured_hue4fd3c0e7519777bd75019750a0f5391_309284_f66ed2dc2e475b0cb21d76296890c5a2.png
new file mode 100644
index 000000000..3056bc376
--- /dev/null
+++ b/docs/resources/_gen/images/showcase/flesland-flis/featured_hue4fd3c0e7519777bd75019750a0f5391_309284_f66ed2dc2e475b0cb21d76296890c5a2.png
diff --git a/docs/static/css/hugofont.css b/docs/static/css/hugofont.css
new file mode 100644
index 000000000..09d6ce070
--- /dev/null
+++ b/docs/static/css/hugofont.css
@@ -0,0 +1,184 @@
+@font-face {
+	font-family: 'hugo';
+	src:url('../fonts/hugo.eot');
+	src:url('../fonts/hugo.eot?#iefix') format('embedded-opentype'),
+		url('../fonts/hugo.woff') format('woff'),
+		url('../fonts/hugo.ttf') format('truetype'),
+		url('../fonts/hugo.svg#hugo') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+
+[class^="icon-"], [class*=" icon-"] {
+	font-family: 'hugo';
+	speak: none;
+	font-style: normal;
+	font-weight: normal;
+	font-variant: normal;
+	text-transform: none;
+	line-height: 1;
+
+	/* Better Font Rendering =========== */
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.icon-home:before {
+	content: "\21";
+}
+.icon-html5:before {
+	content: "\23";
+}
+.icon-css3:before {
+	content: "\24";
+}
+.icon-console:before {
+	content: "\25";
+}
+.icon-link:before {
+	content: "\26";
+}
+.icon-fire:before {
+	content: "\28";
+}
+.icon-check-alt:before {
+	content: "\29";
+}
+.icon-hugo_serif:before {
+	content: "\e600";
+}
+.icon-x-altx-alt:before {
+	content: "\2a";
+}
+.icon-circlestar:before {
+	content: "\2b";
+}
+.icon-file-css:before {
+	content: "\2c";
+}
+.icon-radio-checked:before {
+	content: "\2e";
+}
+.icon-quote:before {
+	content: "\44";
+}
+.icon-airplane2:before {
+	content: "\45";
+}
+.icon-heart:before {
+	content: "\46";
+}
+.icon-rocket:before {
+	content: "\47";
+}
+.icon-house:before {
+	content: "\48";
+}
+.icon-arrow-right:before {
+	content: "\e001";
+}
+.icon-arrow-left:before {
+	content: "\e002";
+}
+.icon-flow-branch:before {
+	content: "\e004";
+}
+.icon-pen:before {
+	content: "\e005";
+}
+.icon-idea:before {
+	content: "\3b";
+}
+.icon-gears:before {
+	content: "\3c";
+}
+.icon-talking:before {
+	content: "\3d";
+}
+.icon-tag:before {
+	content: "\3e";
+}
+.icon-rocket2:before {
+	content: "\3f";
+}
+.icon-octocat:before {
+	content: "\41";
+}
+.icon-announce:before {
+	content: "\42";
+}
+.icon-edit:before {
+	content: "\43";
+}
+.icon-power-cord:before {
+	content: "\50";
+}
+.icon-apple:before {
+	content: "\51";
+}
+.icon-windows8:before {
+	content: "\52";
+}
+.icon-tux:before {
+	content: "\53";
+}
+.icon-file-xml:before {
+	content: "\54";
+}
+.icon-fork:before {
+	content: "\55";
+}
+.icon-arrow-down:before {
+	content: "\56";
+}
+.icon-pacman:before {
+	content: "\e000";
+}
+.icon-embed:before {
+	content: "\2f";
+}
+.icon-code:before {
+	content: "\30";
+}
+.icon-cc:before {
+	content: "\31";
+}
+.icon-cc-by:before {
+	content: "\32";
+}
+.icon-cc-nc:before {
+	content: "\33";
+}
+.icon-beaker-alt:before {
+	content: "\39";
+}
+.icon-w3c:before {
+	content: "\3a";
+}
+.icon-bolt:before {
+	content: "\49";
+}
+.icon-flow-tree:before {
+	content: "\4a";
+}
+.icon-twitter:before {
+	content: "\4b";
+}
+.icon-beaker:before {
+	content: "\4c";
+}
+.icon-images:before {
+	content: "\4d";
+}
+.icon-bubbles:before {
+	content: "\4e";
+}
+.icon-meter2:before {
+	content: "\4f";
+}
+.icon-hugo_sans:before {
+	content: "\68";
+}
+.icon-spf13:before {
+	content: "\27";
+}
diff --git a/docs/static/fonts/hugo.eot b/docs/static/fonts/hugo.eot
new file mode 100644
index 000000000..b92f00f93
--- /dev/null
+++ b/docs/static/fonts/hugo.eot
diff --git a/docs/static/fonts/hugo.svg b/docs/static/fonts/hugo.svg
new file mode 100644
index 000000000..7913f7c1f
--- /dev/null
+++ b/docs/static/fonts/hugo.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="hugo" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" d="" horiz-adv-x="512" />
+<glyph unicode="&#x21;" d="M1024 352l-192 192v288h-128v-160l-192 192-512-512v-32h128v-320h320v192h128v-192h320v320h128z" />
+<glyph unicode="&#x23;" d="M60.538 960l82.144-921.63 368.757-102.37 369.723 102.525 82.301 921.475h-902.925zM784.63 658.573h-432.541l10.302-115.75h411.968l-31.042-347.010-231.843-64.254-231.573 64.254-15.83 177.512h113.494l8.048-90.232 125.862-33.915 0.278 0.078 125.934 33.992 13.070 146.55-391.742-0.002-30.494 341.8h566.214l-10.107-113.024z" />
+<glyph unicode="&#x24;" d="M152.389 911.478l-34.362-171.926h699.749l-21.883-111.054h-700.189l-33.891-171.898h699.683l-39.018-196.064-282.013-93.422-244.4 93.422 16.728 85.042h-171.898l-40.896-206.352 404.226-154.704 466.006 154.704 153.768 772.253z" />
+<glyph unicode="&#x25;" d="M0 896v-896h1024v896h-1024zM960 64h-896v768h896v-768zM896 768h-768v-640h768v640zM448 448h-64v-64h-64v-64h-64v64h64v64h64v64h-64v64h-64v64h64v-64h64v-64h64v-64zM704 320h-192v64h192v-64z" />
+<glyph unicode="&#x26;" d="M953.395 885.358l-4.027 4.042c-94.149 94.134-248.194 94.134-342.326 0l-218.106-218.136c-94.134-94.133-94.134-248.176 0-342.31l4.026-4.026c7.832-7.848 16.146-14.925 24.736-21.458l79.848 79.85c-9.302 5.494-18.126 12.072-26.115 20.059l-4.042 4.042c-51.114 51.098-51.114 134.272 0 185.39l218.126 218.114c51.115 51.118 134.274 51.118 185.386 0l4.042-4.024c51.101-51.115 51.101-134.293 0-185.39l-98.686-98.686c17.133-42.307 25.248-87.4 24.538-132.386l152.605 152.605c94.136 94.134 94.136 248.178-0.003 342.315zM631.042 571.066c-7.832 7.832-16.146 14.922-24.736 21.44l-79.848-79.832c9.304-5.496 18.126-12.074 26.115-20.062l4.042-4.040c51.115-51.115 51.115-134.272 0-185.389l-218.128-218.133c-51.118-51.102-134.277-51.102-185.389 0l-4.042 4.042c-51.098 51.12-51.098 134.277 0 185.389l98.688 98.686c-17.134 42.306-25.246 87.402-24.538 132.386l-152.602-152.598c-94.136-94.133-94.136-248.178 0-342.325l4.026-4.032c94.152-94.128 248.192-94.128 342.328 0l218.11 218.118c94.134 94.133 94.134 248.194 0 342.326l-4.027 4.024z" />
+<glyph unicode="&#x27;" d="M512.604-54.759c-278.645 0-504.532 225.887-504.532 504.534 0 278.645 225.887 504.532 504.532 504.532 278.647 0 504.532-225.887 504.532-504.532 0-278.647-225.886-504.534-504.532-504.534zM512.604-22.58c260.876 0 472.355 211.479 472.355 472.355 0 260.874-211.479 472.355-472.355 472.355-260.874 0-472.355-211.481-472.355-472.355 0-260.876 211.481-472.355 472.355-472.355zM512.604 11.963c-241.796 0-437.81 196.016-437.81 437.812 0 241.795 196.014 437.81 437.81 437.81 241.796 0 437.81-196.016 437.81-437.81 0-241.796-196.014-437.812-437.81-437.812zM818.725 314.428c27.149 0 49.425 8.063 66.824 24.191 17.401 16.128 26.1 37.61 26.1 64.448 0 14.281-3.023 27.884-9.070 40.811-6.047 12.927-14.994 21.976-26.84 27.146 8.885 5.91 15.549 14.159 19.991 24.745 4.442 10.588 6.664 21.668 6.664 33.24 0 23.885-7.344 42.966-22.029 57.247-14.684 14.281-34.122 21.422-58.309 21.422-24.681 0-44.489-7.263-59.42-21.79-14.933-14.528-23.632-33.979-26.1-58.356h51.831c0.494 9.357 3.393 17.544 8.701 24.561 5.306 7.017 12.526 10.526 21.658 10.526 9.872 0 17.647-3.447 23.323-10.34 5.677-6.895 8.515-15.266 8.515-25.115 0-11.82-3.084-21.176-9.254-28.070-6.171-6.894-14.933-10.342-26.286-10.342h-5.923v-38.78l9.996 0.74c11.6 0.984 21.041-3.139 28.322-12.373 7.28-9.233 10.921-19.883 10.921-31.946 0-11.82-3.331-22.222-9.996-31.209-6.664-8.988-15.797-13.481-27.397-13.481-11.6 0-21.041 3.877-28.322 11.634-7.28 7.755-11.167 17.42-11.661 28.993h-54.794c1.481-25.115 10.923-46.045 28.322-62.787 17.401-16.744 38.812-25.115 64.234-25.115zM484.272 321.814h51.832v137.761h41.464v43.582h-41.464v57.431c0 1.355 0.062 3.509 0.184 6.464 0.124 2.955 0.371 5.232 0.741 6.833 0.37 1.6 0.863 3.569 1.481 5.908 0.617 2.339 1.419 4.186 2.406 5.54 0.987 1.355 2.222 2.771 3.703 4.248 1.481 1.477 3.208 2.523 5.184 3.139 1.974 0.616 4.195 0.924 6.663 0.924 5.677 0 12.711-2.093 21.102-6.28v46.167c-7.65 3.94-15.919 5.91-24.804 5.91-23.448 0-40.726-7.755-51.832-23.268-11.107-15.512-16.66-35.457-16.66-59.832v-53.184h-17.4v-43.582h17.4zM641.293 321.814h54.423v278.478h-91.074v-47.275h36.652zM181.097 315.906c19.745 0 36.466 5.848 50.164 17.544 13.699 11.694 20.549 27.268 20.549 46.719 0 14.282-3.395 25.3-10.181 33.056-6.788 7.757-15.859 14.097-27.211 19.021-2.716 1.231-6.356 2.709-10.923 4.432-4.566 1.723-8.083 3.139-10.551 4.247-2.468 1.109-5.122 2.463-7.959 4.063-2.838 1.601-4.874 3.448-6.109 5.54-1.233 2.093-1.851 4.37-1.851 6.833 0 4.186 1.727 7.817 5.184 10.896 3.455 3.077 7.404 4.616 11.846 4.616 9.378 0 18.511-4.186 27.397-12.557l22.213 29.915c-14.316 12.557-33.814 18.837-58.495 18.837-17.032 0-30.914-5.54-41.651-16.62-10.735-11.080-16.105-25.115-16.105-42.104 0-13.049 3.209-23.022 9.626-29.915 6.417-6.895 15.303-12.805 26.656-17.729 1.974-0.738 5.43-2.093 10.367-4.063 4.936-1.969 8.453-3.447 10.551-4.432 2.098-0.984 4.628-2.461 7.59-4.431 2.962-1.971 4.998-4.124 6.109-6.464 1.109-2.339 1.665-4.986 1.665-7.941 0-5.91-1.974-10.65-5.923-14.219-3.949-3.571-8.885-5.356-14.81-5.356-13.081 0-25.915 7.017-38.502 21.052l-23.694-30.655c16.782-20.191 38.132-30.285 64.049-30.285zM273.246 225.049h51.831v113.754h0.741c4.936-7.14 11.846-12.741 20.733-16.804 8.885-4.063 18.141-6.094 27.765-6.094 25.67 0 46.093 9.664 61.273 28.992 15.179 19.329 22.769 42.166 22.769 68.513 0 25.115-7.652 47.335-22.955 66.664-15.301 19.329-35.295 28.993-59.976 28.993-20.979 0-37.763-7.509-50.35-22.53v16.62h-51.831zM362.839 361.703c-12.588 0-22.891 5.232-30.912 15.696-8.023 10.464-12.034 22.222-12.034 35.271 0 13.049 4.011 24.745 12.034 35.087 8.021 10.34 18.325 15.512 30.912 15.512 12.588 0 22.893-5.172 30.914-15.512 8.021-10.342 12.032-22.038 12.032-35.087 0-13.049-4.011-24.807-12.032-35.271-8.021-10.464-18.327-15.696-30.914-15.696z" />
+<glyph unicode="&#x28;" d="M321.008-64c-68.246 142.008-31.902 223.378 20.55 300.043 57.44 83.957 72.243 167.067 72.243 167.067 0 0 45.155-58.701 27.093-150.509 79.771 88.8 94.824 230.28 82.782 284.464 180.314-126.011 257.376-398.856 153.522-601.066 552.371 312.533 137.398 780.171 65.154 832.85 24.082-52.675 28.648-141.85-20-185.126-82.352 312.277-285.971 376.277-285.971 376.277 24.082-161.045-87.296-337.144-194.696-468.73-3.774 64.216-7.782 108.528-41.55 169.979-7.581-116.656-96.733-211.747-120.874-328.627-32.702-158.286 24.494-274.181 241.747-396.622z" />
+<glyph unicode="&#x29;" d="M512 960c-282.752 0-512-229.248-512-512s229.248-512 512-512 512 229.248 512 512-229.248 512-512 512zM432.64 211.744l-235.584 235.616 90.496 90.496 145.056-145.12 307.744 307.744 90.496-90.496-398.208-398.24z" />
+<glyph unicode="&#x2a;" d="M512 960c-282.752 0-512-229.248-512-512s229.248-512 512-512 512 229.248 512 512-229.248 512-512 512zM765.248 285.248l-90.496-90.496-162.752 162.752-162.752-162.752-90.496 90.496 162.752 162.752-162.752 162.752 90.496 90.496 162.752-162.752 162.752 162.752 90.496-90.496-162.752-162.752 162.752-162.752z" />
+<glyph unicode="&#x2b;" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512c282.77 0 512 229.23 512 512 0 282.77-229.23 512-512 512zM515.376 780.874l80.686-251.936 264.438-5.938-214.69-154.501 76.066-253.376-213.315 156.438-217.435-150.688 82.874 251.25-210.499 160.251 264.562-1.186 87.314 249.685z" />
+<glyph unicode="&#x2c;" d="M384 348.554v114.226c0 15.128 6.696 29.437 18.854 40.286 12.16 10.848 28.192 16.826 45.146 16.826v57.11c-70.4 0-128-51.4-128-114.222v-85.666c0-15.771-14.328-28.558-32-28.558h-32v-57.11h32c17.674 0 32-12.79 32-28.558v-85.675c0-62.814 57.6-114.214 128-114.214v57.112c-16.954 0-32.987 5.976-45.146 16.826-12.158 10.853-18.854 25.154-18.854 40.278v114.234c0 15.77-14.328 28.554-32 28.554 17.674 0 32 12.79 32 28.554zM640 291.446v-114.234c0-15.125-6.696-29.426-18.854-40.278-12.158-10.85-28.19-16.826-45.146-16.826v-57.112c70.402 0 128 51.4 128 114.214v85.675c0 15.771 14.328 28.558 32 28.558h32v57.11h-32c-17.672 0-32 12.79-32 28.558v85.666c0 62.824-57.598 114.222-128 114.222v-57.11c16.958 0 32.987-5.978 45.146-16.83 12.16-10.848 18.854-25.157 18.854-40.283v-114.227c0-15.766 14.328-28.552 32-28.552-17.672 0.002-32-12.789-32-28.552zM903.432 760.57l-142.864 142.862c-31.112 31.112-92.568 56.568-136.568 56.568h-480c-44 0-80-36-80-80v-864c0-44 36-80 80-80h736c44 0 80 36 80 80v608c0 44-25.456 105.458-56.568 136.57zM858.178 715.314c3.13-3.13 6.25-6.974 9.28-11.314h-163.458v163.456c4.339-3.030 8.184-6.15 11.314-9.28l142.864-142.862zM896 16c0-8.672-7.328-16-16-16h-736c-8.672 0-16 7.328-16 16v864c0 8.672 7.328 16 16 16h480c4.832 0 10.254-0.61 16-1.704v-254.296h254.296c1.094-5.746 1.704-11.166 1.704-16v-608z" />
+<glyph unicode="&#x2e;" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM512 64c-212.078 0-384 171.922-384 384s171.922 384 384 384c212.078 0 384-171.922 384-384 0-212.078-171.922-384-384-384zM320 448c0-106.039 85.961-192 192-192s192 85.961 192 192c0 106.039-85.961 192-192 192-106.039 0-192-85.961-192-192z" />
+<glyph unicode="&#x2f;" d="M288 704l-256-256 256-256h128l-256 256 256 256h-128zM736 704h-128l256-256-256-256h128l256 256-256 256z" />
+<glyph unicode="&#x30;" d="M128 448l256 256h-128l-256-256 256-256h128zM768 704h-128l256-256-256-256h128l256 256zM544 832l-160-768h96l160 768z" />
+<glyph unicode="&#x31;" d="M505.446 939.469c-271.462-3.635-488.55-226.611-484.915-498.022 3.635-271.411 226.611-488.55 498.074-484.915 271.411 3.584 488.55 226.611 484.915 498.074-3.635 271.411-226.714 488.499-498.074 484.864zM517.171 60.006c-214.323-2.918-390.349 168.499-393.216 382.822-2.867 214.323 168.55 390.349 382.874 393.216 214.272 2.867 390.298-168.55 393.165-382.822s-168.499-390.298-382.822-393.216zM391.731 364.698c-20.736 0-36.454 7.578-47.104 22.733-10.701 15.155-15.974 35.328-15.974 60.57 0 55.501 21.043 83.251 63.078 83.251 8.397 0 17.51-2.816 27.341-8.397 9.779-5.632 18.074-15.462 24.832-29.44l63.027 32.819c-25.19 45.414-67.021 68.147-125.338 68.147-39.834 0-72.704-13.158-98.816-39.526-26.061-26.368-39.117-62.003-39.117-106.854 0-45.978 12.902-81.92 38.707-107.725 25.754-25.805 59.75-38.707 101.786-38.707 26.317 0 50.432 6.605 72.294 19.814s39.014 31.283 51.354 54.323l-58.061 29.44c-11.213-26.931-30.566-40.448-58.010-40.448zM663.398 364.698c-20.787 0-36.506 7.578-47.104 22.733-10.701 15.104-15.974 35.328-15.974 60.57 0 55.501 20.992 83.251 63.078 83.251 9.011 0 18.381-2.816 28.211-8.397 9.779-5.632 18.125-15.462 24.781-29.44l62.208 32.819c-24.678 45.414-66.099 68.147-124.518 68.147-39.782 0-72.704-13.158-98.765-39.526-26.112-26.368-39.117-61.952-39.117-106.803 0-45.978 12.749-81.92 38.246-107.725 25.549-25.805 59.648-38.707 102.246-38.707 25.805 0 49.613 6.605 71.475 19.814 21.811 13.21 39.219 31.283 52.122 54.323l-58.88 29.44c-11.213-26.982-30.515-40.499-58.010-40.499z" />
+<glyph unicode="&#x32;" d="M512 627.968c45.67 0 68.506 22.784 68.506 68.403 0 46.234-22.835 69.325-68.506 69.325s-68.454-23.091-68.454-69.325c0-45.619 22.784-68.403 68.454-68.403zM612.966 601.549h-201.882c-8.806 0-16.23-3.072-22.426-9.216s-9.216-13.619-9.216-22.374v-201.011h56.166v-238.746h152.678v238.746h56.218v201.062c0 8.755-3.226 16.179-9.626 22.374-6.451 6.093-13.722 9.165-21.914 9.165zM512 939.52c-271.462 0-491.52-220.058-491.52-491.52s220.058-491.52 491.52-491.52 491.52 220.058 491.52 491.52-220.058 491.52-491.52 491.52zM512 46.592c-221.696 0-401.408 179.712-401.408 401.408s179.712 401.408 401.408 401.408 401.408-179.712 401.408-401.408-179.712-401.408-401.408-401.408z" />
+<glyph unicode="&#x33;" d="M512 939.52c-271.462 0-491.52-220.058-491.52-491.52s220.058-491.52 491.52-491.52 491.52 220.058 491.52 491.52-220.058 491.52-491.52 491.52zM132.864 579.789l249.344-111.667 78.080-34.202 57.958-26.368 47.411-20.224c8.806-7.578 13.21-17.51 13.21-29.798 0-17.613-6.042-30.157-18.022-37.734-11.981-7.578-26.522-11.418-43.469-11.418-41.011 0-77.568 14.899-109.773 44.749l-67.533-68.454c45.056-38.605 94.822-58.266 149.197-58.778v-75.52h57.037v75.52c33.894 2.918 63.334 14.131 88.218 33.792 24.832 19.61 40.55 44.851 46.95 75.878l182.221-81.152c-68.301-123.853-200.192-207.821-351.693-207.821-221.696 0-401.408 179.712-401.408 401.408 0 46.182 7.885 90.522 22.272 131.789zM650.803 455.014l-79.002 35.123-105.37 47.36c-2.918 4.096-4.352 8.192-4.352 12.288 0 14.029 5.99 24.013 18.022 29.85 11.93 5.837 25.549 8.806 40.806 8.806 28.672 0 56.73-9.677 84.275-28.979l64.102 65.843c-36.915 28.109-77.875 43.315-122.88 45.67v75.418h-57.088v-75.469c-30.464-1.741-57.088-10.445-79.923-25.856-22.784-15.565-38.298-36.147-46.49-61.901l-187.136 83.968c71.629 109.67 195.43 182.272 336.23 182.272 221.696 0 401.408-179.712 401.408-401.408 0-35.994-4.813-70.861-13.722-103.987l-248.883 111.002z" />
+<glyph unicode="&#x39;" d="M256 672c0-17.673 14.327-32 32-32s32 14.327 32 32c0 17.673-14.327 32-32 32-17.673 0-32-14.327-32-32zM448 960h-384c-35.36 0-64-28.64-64-64v-704c0-141.376 114.624-256 256-256s256 114.624 256 256v704c0 35.36-28.64 64-64 64zM160 320c-17.664 0-32 14.304-32 32s14.336 32 32 32c17.696 0 32-14.304 32-32s-14.304-32-32-32zM320 192c-35.36 0-64 28.64-64 64s28.64 64 64 64 64-28.64 64-64-28.64-64-64-64zM384 448h-64c0 35.328-28.672 64-64 64s-64-28.672-64-64h-64v384h256v-384z" horiz-adv-x="512" />
+<glyph unicode="&#x3a;" d="M916.334 422.837c2.474 9.934-0.074 20.15-9.362 23.406l-38.619 17.554c-9.544 3.984-21.693-1.398-23.406-10.531-7.454-15.958-18.022-29.022-35.107-29.258-14.824 0-26.917 7.997-36.278 23.99-9.362 15.994-14.043 36.864-14.043 62.61 0 25.746 4.682 46.813 14.043 63.197 9.362 16.384 21.454 24.576 36.278 24.576 18.701-1.358 27.574-13.168 35.107-28.086 3.994-9.8 14.859-12.102 23.406-9.362l38.619 17.554c8.944 4.707 12.928 16.362 8.192 24.576-22.626 48.373-57.734 72.558-105.326 72.558-39.79 0-71.971-15.214-96.549-45.642-24.576-30.429-36.864-70.218-36.864-119.37 0-49.152 12.288-88.746 36.864-118.784 24.576-30.038 56.758-45.056 96.549-45.056 47.592 0 83.090 25.357 106.496 76.067zM544.182 346.77c62.034 0.96 109.272 43.584 110.006 99.474-1.096 29.514-12.965 52.472-33.938 70.218 18.47 17.44 29.074 41.194 29.258 64.366-1.536 63.242-54.136 93.118-105.326 93.622-44.47 0-78.798-17.554-102.986-52.662-5.462-7.805-4.682-15.606 2.339-23.406l28.086-25.746c9.003-8.026 19.018-6.542 26.917 1.17 11.702 16.384 25.746 24.576 42.13 24.576 13.262 0 21.066-3.315 23.406-9.949 4.512-9.84 3.216-18.816 0-26.917-12.070-12.498-29.712-8.778-46.813-8.778-11.122-0.374-19.725-6.896-19.894-17.554v-42.13c0.97-12.086 9.208-20.070 19.894-17.554 12.901 0.011 45.614 1.472 50.909-9.362 2.73-6.242 4.096-11.314 4.096-15.214 0-17.944-9.752-26.917-29.258-26.917-18.725 0-34.328 8.582-46.813 25.746-7.635 9.24-19.701 9.374-26.917 2.339l-29.258-29.258c-7.022-7.022-7.802-14.434-2.339-22.237 26.522-37.31 65.134-53.506 106.496-53.834zM428.325 648.704c2.138 11.218-6.122 22.038-16.384 22.237h-51.491c-9.362 0-14.824-4.682-16.384-14.043l-24.578-125.221-25.746 125.219c-2.339 9.362-8.192 14.043-17.554 14.043h-37.45c-10.144 0-15.997-4.682-17.554-14.043l-25.747-125.219-24.576 125.219c-1.56 9.362-7.413 14.043-17.554 14.043h-50.322c-12.826-1.010-18.992-11.152-17.554-22.237l64.366-283.21c2.339-9.362 8.192-14.043 17.554-14.043h49.152c9.362 0 15.214 4.682 17.554 14.043l23.406 117.027 23.406-117.027c1.56-9.362 7.413-14.043 17.554-14.043h49.152c9.362 0 15.214 4.682 17.554 14.043zM1024 960v-784l-512-240-512 240v784z" />
+<glyph unicode="&#x3b;" d="M619.733 7.493c4.4 0 8.25-1.65 11.549-4.95 3.301-3.301 4.95-7.15 4.95-11.549v-37.397c0-5.134-1.65-9.35-4.95-12.648-3.301-3.301-7.15-4.95-11.549-4.95h-214.48c-11.731 0-17.598 5.866-17.598 17.598v37.397c0 4.4 1.65 8.25 4.95 11.549 3.301 3.301 7.515 4.95 12.648 4.95zM619.733 114.182c4.4 0 8.25-1.65 11.549-4.95 3.301-3.301 4.95-7.515 4.95-12.648v-37.397c0-4.4-1.65-8.25-4.95-11.549-3.301-3.301-7.15-4.95-11.549-4.95h-214.48c-5.134 0-9.35 1.65-12.648 4.95-3.301 3.301-4.95 7.15-4.95 11.549v37.397c0 11.731 5.866 17.598 17.598 17.598zM840.811 455.149v0l91.293-14.298c9.531-1.466 17.232-5.685 23.098-12.648 5.866-6.966 8.066-14.482 6.6-22.547-1.466-8.8-5.866-15.582-13.198-20.347-7.331-4.766-16.133-6.416-26.398-4.95l-91.293 14.298c-10.266 1.466-18.147 5.866-23.648 13.198-5.501 7.331-7.515 15.032-6.050 23.098 1.466 8.066 5.866 14.482 13.198 19.248 7.331 4.766 16.133 6.416 26.398 4.95zM830.91 663.029v0l84.691 37.397c8.8 4.4 17.414 5.315 25.848 2.75 8.432-2.576 14.482-7.893 18.147-15.949 3.666-8.070 3.666-16.136 0-24.198-3.666-8.066-10.266-13.931-19.798-17.598l-84.691-38.496c-8.8-3.666-17.414-4.216-25.848-1.65-8.432 2.57-14.482 7.886-18.147 15.949-3.666 8.070-3.485 16.136 0.55 24.198 4.034 8.070 10.448 13.936 19.248 17.598zM687.925 803.814v0l50.595 78.091c5.866 8.066 13.016 13.382 21.448 15.949 8.445 2.566 16.328 1.65 23.648-2.75 7.331-5.134 11.549-12.098 12.648-20.898 1.101-8.8-0.917-17.232-6.050-25.298l-50.595-78.091c-5.866-8.077-13.016-13.392-21.448-15.949-8.432-2.566-16.314-1.65-23.648 2.75-7.334 4.4-11.731 11.182-13.198 20.347-1.466 9.166 0.734 17.782 6.6 25.848zM184.174 455.149c9.531 1.466 18.147-0.184 25.848-4.95s12.282-11.182 13.747-19.248c1.466-8.066-0.734-15.763-6.6-23.098-5.866-7.331-13.931-11.731-24.198-13.198l-91.293-14.298c-9.531-1.466-18.147 0.184-25.848 4.95-7.701 4.766-12.282 11.549-13.747 20.347-1.466 8.067 0.734 15.584 6.6 22.547 5.866 6.968 13.931 11.184 24.198 12.648zM194.075 663.029c8.8-3.666 15.214-9.531 19.248-17.598 4.040-8.066 4.224-16.133 0.55-24.198-3.666-8.066-9.901-13.382-18.698-15.949-8.8-2.566-17.598-2.016-26.398 1.65l-84.691 38.496c-8.8 3.67-15.214 9.536-19.248 17.598-4.034 8.066-4.218 16.133-0.55 24.198 3.666 8.066 9.715 13.382 18.147 15.949 8.432 2.566 17.414 1.65 26.949-2.75zM335.962 803.814c5.866-8.072 8.066-16.686 6.6-25.848-1.466-9.166-5.866-15.949-13.198-20.347-6.6-4.4-14.298-5.315-23.098-2.75-8.8 2.566-15.763 7.882-20.898 15.949l-50.595 78.091c-5.866 8.066-8.066 16.498-6.6 25.298 1.466 8.8 5.866 15.763 13.198 20.898 6.6 4.4 14.298 5.315 23.098 2.75 8.8-2.578 15.763-7.896 20.898-15.949zM543.842 832.413c0-10.266-2.934-18.698-8.8-25.298s-13.198-9.901-21.998-9.901c-8.066 0-15.032 3.301-20.898 9.901-5.866 6.6-8.8 15.032-8.8 25.298v92.39c0 10.266 2.934 18.698 8.8 25.298s12.832 9.901 20.898 9.901c8.8 0 16.133-3.301 21.998-9.901 5.866-6.6 8.8-15.032 8.8-25.298zM721.474 396.306c-14.298-29.698-29.88-61.41-46.746-95.139-26.606-43.034-25.262-93.942-41.795-138.037-2.934-7.701-8.432-12.282-16.498-13.747h-208.979c-8.066 1.466-13.563 6.050-16.498 13.747-12.744 48.162-20.482 95.064-41.795 138.037-16.864 33.73-32.446 65.445-46.746 95.139-32.968 72.878-50.19 157.211-16.498 232.627 12.098 26.398 28.963 48.762 50.595 67.094 21.632 18.331 47.296 32.080 76.992 41.246 29.698 9.166 62.144 13.747 97.341 13.747h2.202c35.195 0 67.645-4.584 97.341-13.747 29.698-9.166 55.36-22.914 76.992-41.246 21.632-18.331 38.68-40.696 51.146-67.094 31.584-79.118 18.672-157.61-17.048-232.627z" />
+<glyph unicode="&#x3c;" d="M776.653 882.243l-14.434-69.166c-14.795-2.323-29.048-6.606-42.406-12.582l-49.686 50.198-56.584-45.79 38.702-59.138c-8.622-11.83-15.664-24.834-21.013-38.83l-70.698 0.32-7.6-72.422 69.166-14.434c2.323-14.787 6.61-28.926 12.582-42.278l-50.198-49.814 45.79-56.584 59.138 38.766c11.821-8.616 24.848-15.73 38.83-21.075l-0.32-70.634 72.422-7.6 14.37 69.166c14.8 2.322 29.043 6.542 42.406 12.518l49.75-50.198 56.584 45.854-38.766 59.074c8.622 11.826 15.726 24.84 21.075 38.83l70.634-0.256 7.6 72.422-69.166 14.306c-2.323 14.808-6.536 29.101-12.518 42.47l50.198 49.686-45.854 56.584-59.074-38.702c-11.834 8.629-24.89 15.726-38.894 21.075l0.32 70.634-72.358 7.6zM788.659 714.026c2.275-0.008 4.584-0.077 6.898-0.32 36.998-3.886 63.792-37.022 59.904-74.018-3.886-36.998-37.022-63.856-74.018-59.968-36.998 3.886-63.856 37.022-59.968 74.018 3.643 34.686 33.046 60.406 67.186 60.288zM268.995 708.085l-9.707-96.181c-19.802-5.278-38.558-13.078-55.882-23.118l-74.848 61.182-70.442-70.442 61.182-74.912c-10.042-17.33-17.843-36.074-23.118-55.882l-96.181-9.643v-99.627l96.181-9.707c5.275-19.79 13.086-38.502 23.118-55.818l-61.182-74.912 70.442-70.442 74.912 61.182c17.315-10.034 36.026-17.843 55.818-23.118l9.707-96.181h99.627l9.643 96.181c19.808 5.275 38.552 13.078 55.882 23.118l74.912-61.182 70.442 70.442-61.182 74.848c10.042 17.325 17.84 36.080 23.118 55.882l96.181 9.707v99.627l-96.181 9.643c-5.278 19.818-13.070 38.608-23.118 55.946l61.182 74.848-70.442 70.442-74.848-61.182c-17.338 10.050-36.126 17.84-55.946 23.118l-9.643 96.181h-99.627zM318.81 481.43c50.901 0 92.157-41.256 92.157-92.157s-41.256-92.157-92.157-92.157c-50.901 0-92.157 41.256-92.157 92.157 0 50.901 41.256 92.157 92.157 92.157zM741.784 358.365l-10.154-50.579c-10.4-1.701-20.371-4.824-29.76-9.195l-34.998 36.722-39.723-33.528 27.206-43.235c-6.059-8.654-11.058-18.182-14.816-28.421l-49.622 0.256-5.365-53.008 48.6-10.538c1.632-10.818 4.616-21.206 8.814-30.974l-35.254-36.402 32.187-41.384 41.576 28.357c8.307-6.302 17.442-11.48 27.27-15.392l-0.192-51.73 50.901-5.557 10.090 50.643c10.402 1.698 20.37 4.76 29.76 9.131l34.998-36.722 39.787 33.528-27.27 43.235c6.059 8.651 11.058 18.184 14.816 28.421l49.686-0.192 5.301 52.944-48.6 10.538c-1.634 10.834-4.61 21.258-8.814 31.038l35.254 36.338-32.187 41.448-41.512-28.357c-8.318 6.312-17.493 11.478-27.334 15.392l0.256 51.666-50.901 5.557zM750.214 235.363c1.6-0.006 3.229-0.078 4.854-0.256 26.002-2.843 44.818-27.090 42.086-54.155-2.733-27.066-25.982-46.718-51.986-43.874-26.002 2.843-44.882 27.090-42.15 54.155 2.56 25.376 23.202 44.216 47.195 44.13z" />
+<glyph unicode="&#x3d;" d="M0 908.365v-622.304h180.107v-180.048l280.686 180.048h413.074v622.304h-873.869zM914.979 771.571v-78.309h30.712v-443.786h-151.048v-118.624l-184.88 118.624h-132.085l-122.050-78.309h231.070l286.251-183.534v183.533h151.048v600.402h-109.019z" />
+<glyph unicode="&#x3e;" d="M927.813 960h-288.563c-52.906 0-126.797-30.606-164.203-68.014l-446.99-446.989c-37.408-37.408-37.408-98.624 0-136.032l344.91-344.906c37.408-37.41 98.622-37.41 136.030 0l446.99 446.989c37.406 37.408 68.013 111.301 68.013 164.202v288.563c0 52.904-43.286 96.187-96.187 96.187zM800 640c-53.021 0-96 42.979-96 96s42.979 96 96 96 96-42.979 96-96-42.979-96-96-96z" />
+<glyph unicode="&#x3f;" d="M704 896l-320-320h-192l-192-256c0 0 203.416 56.651 322.066 30.083l-322.066-414.083 421.902 328.144c58.837-134.654-37.902-328.144-37.902-328.144l256 192v192l320 320 64 320-320-64z" />
+<glyph unicode="&#x41;" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512c282.77 0 512 229.23 512 512 0 282.77-229.23 512-512 512zM512 904.25c251.981 0 456.25-204.269 456.25-456.25s-204.269-456.25-456.25-456.25c-251.981 0-456.25 204.269-456.25 456.25 0 251.981 204.269 456.25 456.25 456.25zM285.562 770.624c-12.994-37.768-17.498-78.76-5.874-114.562-14.043-15.584-24.947-33.486-32.75-53.75-20.798-65.73-15.718-149.696 29.813-200.501 15.994-17.533 37.694-31.949 65-43.25 27.306-11.298 62.402-18.506 105.312-21.624-28.8-13.458-49.102-21.682-56.187-51.438-32.125-21.466-71.19-16.344-99.499 7-22.374 16.334-32.509 45.366-57.314 56.125-1.56 1.56-6.432 2.722-14.624 3.499-8.192 0.781-14.632-1.542-19.312-7-2.342-2.334-2.168-4.834 0.562-7.562 18.778-15.272 36.853-31.459 47.438-50.874 10.141-21.042 20.64-36.448 31.562-46.189 30.298-20.474 70.934-31.125 106.501-18.125-4.149-25.027 7.042-64.11-1.189-86.501-3.122-6.234-7.586-11.698-13.438-16.374-5.213-5.086-21.384-11.451-18.123-19.25 1.56-3.506 7.011-5.658 16.373-6.437 20.611 0.525 41.126 8.858 53.251 25.125 4.291 5.845 6.438 13.461 6.438 22.813v95.811c0 10.91 2.317 18.701 7 23.376 4.682 4.677 9.787 7.816 15.25 9.374v-126.25c0-10.91-0.986-20.269-2.939-28.062-1.949-7.792-3.69-13.258-5.25-16.376-3.581-6.006-10.427-11.547-10.562-18.686 0-2.338 1.394-3.674 4.126-4.064 20.496 0.89 44.275 12.915 52.624 29.814 6.632 14.026 9.938 28.789 9.938 44.374v123.938h25.75v-123.938c0-15.586 3.539-30.349 10.562-44.374 7.022-14.027 18.742-23.042 35.126-26.938 8.579-2.338 14.378-3.264 17.499-2.877 3.12 0.39 4.514 1.726 4.125 4.064-1.88 7.080-5.794 13.141-9.939 18.686-5.461 7.014-8.186 21.838-8.186 44.438v126.25c5.461-1.558 10.741-4.698 15.813-9.374 5.069-4.675 7.562-12.466 7.562-23.376v-95.811c0-9.352 2.146-16.968 6.438-22.813 13.042-16.586 32.696-25 53.25-25.125 9.362 0.779 14.814 2.931 16.374 6.437 1.56 3.506 0.402 6.413-3.501 8.75-3.899 2.338-8.773 5.824-14.624 10.499-5.851 4.677-10.315 10.141-13.437 16.374-3.502 40.2-0.091 83.294-2.939 123.938-5.621 44.357-22.693 58.949-56.75 75.939 40.571 3.118 73.928 10.56 100.066 22.25 78.126 37.962 99.731 96.646 100.061 175.312-1.232 50.629-15.848 94.794-49.187 128.626 4.682 17.925 6.075 36.581 4.126 56.062-1.954 19.482-6.074 37.040-12.315 52.624-28.864-1.558-53.054-7.368-72.562-17.501-19.506-10.13-33.544-18.734-42.123-25.749-69.134 15.696-143.142 15.789-209.438-2.312-33.925 27.746-75.968 43.203-115.877 45.562z" />
+<glyph unicode="&#x42;" d="M875.126 875.438c-131.84-130.56-325.63-210.44-512.315-221.688h-277.25c-43.643-0.597-83.099-37.725-85.562-86.688v-125c0.595-43.643 36.598-84.224 85.562-86.688h111.126c-29.704-100.736 2.23-202.723 36.688-302.811 51.118-48.266 168.011-42.256 206.126 20.562-81.158 63.798-120.654 235.477-22.813 277.811 166.766-18.922 331.976-103.642 458.438-217.25 43.474 0.595 83.018 36.302 85.562 85v205c34.824 8.968 61.678 40.907 63.31 80.563-0.419 35.798-25.118 69.982-63.312 81.125v204.501c-0.595 43.645-36.598 83.099-85.562 85.563zM877.315 764.877v-521.189c-122.211 95.242-273.17 159.133-428.939 187.811v145.562c152.851 22.998 302.33 93.491 428.936 187.813z" />
+<glyph unicode="&#x43;" d="M997.688 797.224l-134.418 134.418c-37.064 37.064-99.781 34.64-139.974-5.654-40.194-40.195-42.819-103.011-5.656-140.075l134.418-134.418c37.064-37.064 99.778-34.64 140.074 5.656 40.194 40.296 42.72 102.91 5.554 140.074zM140.779 343.574l268.838-268.838 436.886 436.784-268.835 268.838-436.89-436.784zM0-61.906l354.578 70.998-283.582 283.581-70.995-354.579z" />
+<glyph unicode="&#x44;" d="M445.312 870.374c-181.354-12.744-442.045-41.699-442.186-396.875v-446.875h404.685v478.126h-134.373c-8.515 127.667 96.616 160.632 210.938 185.938l-39.064 179.686zM987.501 870.374c-181.357-12.744-442.045-41.699-442.189-396.875v-446.875h404.688v478.126h-134.374c-8.514 127.667 96.614 160.632 210.936 185.938l-39.061 179.686z" />
+<glyph unicode="&#x45;" d="M273.92-57.856h102.4l229.786 409.651h264.294c0 0 153.6 0 153.6 71.629 0 71.68-153.6 71.68-153.6 71.68h-264.294l-229.786 409.6h-102.4l127.386-409.6h-183.654l-115.251 102.451h-102.4l81.971-174.080-81.971-174.131h102.4l115.251 102.451h183.654l-127.386-409.651z" />
+<glyph unicode="&#x46;" d="M880.077 747.469c-85.606 78.592-224.41 78.592-310.016 0l-58.061-53.35-58.112 53.35c-85.606 78.592-224.358 78.592-309.965 0-96.307-88.371-96.307-231.629 0-320.051l368.077-337.818 368.077 337.818c96.307 88.422 96.307 231.68 0 320.051z" />
+<glyph unicode="&#x47;" d="M627.866 316.518c0 0 361.421 260.762 321.331 559.258-0.922 6.554-3.072 10.854-5.734 13.773-2.816 2.714-7.014 4.966-13.466 5.888-291.686 40.909-546.509-328.909-546.509-328.909-221.082 26.522-205.005-17.613-305.869-259.84-19.302-46.182 11.981-62.106 46.285-49.101 34.304 12.902 110.029 41.523 110.029 41.523l132.557-135.629c0 0-27.955-77.466-40.602-112.538-12.646-35.174 2.867-67.174 48.026-47.462 236.749 103.27 279.859 86.835 253.952 313.037zM679.475 619.418c-30.618 31.334-30.618 82.125 0 113.459 30.618 31.283 80.23 31.283 110.848 0 30.669-31.283 30.669-82.125 0-113.459-30.566-31.386-80.23-31.386-110.848 0z" />
+<glyph unicode="&#x48;" d="M961.024 432.64l-410.829 411.187c-20.992 21.811-55.347 21.811-76.339 0l-410.88-411.187c-21.043-21.76-13.21-39.629 17.408-39.629h85.658v-315.802c0-22.784 0.973-41.421 42.189-41.421h199.424v316.826h208.64v-316.826h209.357c31.437 0 32.307 18.586 32.307 41.421v315.802h85.606c30.566 0 38.451 17.818 17.459 39.629z" />
+<glyph unicode="&#x49;" d="M348.314-12.749c-9.882 6.502 161.485 366.592 155.546 382.413-5.888 15.821-187.597 73.574-196.506 101.376-8.858 27.802 358.81 445.747 368.435 437.658 9.626-8.038-160.205-370.586-155.546-382.362s190.925-71.987 196.506-101.325c5.581-29.44-358.554-444.211-368.435-437.76z" />
+<glyph unicode="&#x4a;" d="M918.989 202.445v117.555c0 71.014-47.002 176.64-176.589 176.64h-102.4c-72.294 0-79.002 35.43-79.36 53.76v143.155c43.674 18.893 74.24 62.31 74.24 112.845 0 67.84-54.989 122.88-122.88 122.88-67.891 0-122.88-55.040-122.88-122.88 0-50.534 30.566-93.952 74.24-112.845v-143.155c0-13.261-3.84-53.76-79.36-53.76h-102.4c-129.587 0-176.64-105.626-176.64-176.64v-117.555c-43.674-18.842-74.24-62.31-74.24-112.845 0-67.84 54.989-122.88 122.88-122.88 67.84 0 122.88 55.040 122.88 122.88 0 50.534-30.566 94.003-74.24 112.845v117.555c0 13.261 3.84 79.36 79.36 79.36h102.4c31.078 0 57.293 4.71 79.36 12.698v-209.613c-43.674-18.842-74.24-62.31-74.24-112.845 0-67.84 54.989-122.88 122.88-122.88 67.891 0 122.88 55.040 122.88 122.88 0 50.534-30.618 94.003-74.291 112.845v209.613c22.067-7.987 48.282-12.698 79.36-12.698h102.4c72.294 0 79.002-61.030 79.411-79.36v-117.555c-43.674-18.842-74.24-62.31-74.24-112.845 0-67.84 54.989-122.88 122.88-122.88s122.88 55.040 122.88 122.88c0 50.534-30.566 94.003-74.291 112.845zM224.512 89.6c0-39.168-31.744-70.912-70.912-70.912s-70.912 31.744-70.912 70.912 31.744 70.912 70.912 70.912 70.912-31.744 70.912-70.912zM441.088 806.4c0 39.168 31.795 70.912 70.912 70.912s70.861-31.744 70.861-70.912-31.744-70.912-70.861-70.912c-39.117 0-70.912 31.744-70.912 70.912zM582.912 89.6c0-39.168-31.795-70.912-70.861-70.912-39.168 0-70.912 31.744-70.912 70.912s31.744 70.912 70.861 70.912c39.117 0 70.912-31.744 70.912-70.912zM870.4 18.688c-39.117 0-70.912 31.744-70.912 70.912s31.795 70.912 70.912 70.912 70.912-31.744 70.912-70.912-31.795-70.912-70.912-70.912z" />
+<glyph unicode="&#x4b;" d="M983.040 740.198c-34.714-15.411-71.936-25.754-111.053-30.464 39.936 23.91 70.605 61.798 84.992 106.906-37.325-22.118-78.694-38.246-122.675-46.899-35.277 37.581-85.504 61.030-141.107 61.030-106.752 0-193.28-86.528-193.28-193.229 0-15.155 1.69-29.901 5.018-44.032-160.614 8.038-303.053 84.992-398.336 201.933-16.691-28.518-26.266-61.747-26.266-97.178 0-67.072 34.15-126.208 86.016-160.87-31.693 1.024-61.491 9.677-87.552 24.166 0-0.819 0-1.587 0-2.406 0-93.645 66.662-171.725 155.034-189.542-16.179-4.403-33.28-6.758-50.944-6.758-12.442 0-24.525 1.178-36.352 3.43 24.576-76.8 96-132.659 180.531-134.195-66.15-51.866-149.453-82.739-240.026-82.739-15.616 0-30.976 0.922-46.080 2.714 85.504-54.835 187.085-86.835 296.294-86.835 355.482 0 549.888 294.502 549.888 549.939 0 8.346-0.154 16.691-0.563 24.986 37.786 27.238 70.502 61.286 96.461 100.045z" />
+<glyph unicode="&#x4c;" d="M872.571 132.571q32-50.858 12.286-87.142t-80.286-36.286h-658.286q-60.571 0-80.286 36.286t12.286 87.142l287.429 453.142v228h-36.571q-14.858 0-25.714 10.858t-10.858 25.714 10.858 25.714 25.714 10.858h292.571q14.858 0 25.714-10.858t10.858-25.714-10.858-25.714-25.714-10.858h-36.571v-228zM427.429 546.858l-155.429-245.142h406.858l-155.429 245.142-11.429 17.714v249.142h-73.142v-249.142z" horiz-adv-x="950" />
+<glyph unicode="&#x4d;" d="M128 704v-640h896v640h-896zM960 170.666l-128 213.334-145.066-120.888-110.934 184.888-384-320v512h768v-469.334zM256 480c0-53.019 42.981-96 96-96s96 42.981 96 96c0 53.019-42.981 96-96 96-53.019 0-96-42.981-96-96zM896 832h-896v-640h64v576h832z" />
+<glyph unicode="&#x4e;" d="M480 960v0c265.096 0 480-173.914 480-388.448s-214.904-388.448-480-388.448c-25.458 0-50.446 1.621-74.834 4.71-103.107-102.694-222.173-121.109-341.166-123.814v25.134c64.251 31.354 116 88.466 116 153.734 0 9.106-0.712 18.048-2.030 26.794-108.557 71.214-177.97 179.987-177.97 301.89 0 214.534 214.904 388.448 480 388.448zM996 89.314c0-55.942 36.314-104.898 92-131.771v-21.542c-103.126 2.318-197.786 18.102-287.142 106.126-21.139-2.65-42.794-4.040-64.858-4.040-95.47 0-183.408 25.758-253.614 69.040 144.674 0.506 281.261 46.854 384.835 130.672 52.208 42.251 93.394 91.826 122.413 147.347 30.766 58.866 46.366 121.582 46.366 186.406 0 10.448-0.45 20.835-1.258 31.168 72.57-59.934 117.258-141.622 117.258-231.677 0-104.486-60.158-197.722-154.24-258.763-1.142-7.496-1.76-15.16-1.76-22.966z" horiz-adv-x="1152" />
+<glyph unicode="&#x4f;" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM302.837 125.848c11.106 30.632 17.163 63.688 17.163 98.152 0 124.35-78.81 230.293-189.208 270.606 10.21 84.925 48.254 163.498 109.678 224.925 72.53 72.525 168.96 112.469 271.53 112.469s199-39.944 271.53-112.47c61.427-61.426 99.469-140 109.682-224.925-110.402-40.312-189.211-146.254-189.211-270.605 0-34.469 6.059-67.52 17.166-98.15-61.706-40.242-133.771-61.85-209.166-61.85-75.394 0-147.458 21.608-209.163 61.848zM551.754 319.003c13.878-3.493 24.246-16.080 24.246-31.003v-64c0-17.6-14.4-32-32-32h-64c-17.6 0-32 14.4-32 32v64c0 14.923 10.368 27.51 24.246 31.003l23.754 448.997h32l23.754-448.997z" />
+<glyph unicode="&#x50;" d="M1024 677.499l-90.506 90.501-178.746-178.752-101.501 101.502 178.75 178.749-90.501 90.501-178.749-178.75-114.749 114.75-86.626-86.624 512.002-512.002 86.624 86.624-114.752 114.752zM274.749 210.746c165.768-165.762 385.194-36.362 519.293 75.464l-443.826 443.824c-111.824-134.096-241.227-353.522-75.467-519.288zM191.998 255.997l127.994-127.997-191.992-191.992-127.995 127.994z" />
+<glyph unicode="&#x51;" d="M791.498 415.907c-1.294 129.682 105.758 191.875 110.542 194.966-60.152 88.019-153.85 100.078-187.242 101.472-79.742 8.074-155.597-46.949-196.066-46.949-40.368 0-102.818 45.754-168.952 44.552-86.915-1.291-167.058-50.538-211.811-128.379-90.304-156.698-23.126-388.84 64.89-515.926 43.008-62.203 94.293-132.075 161.626-129.581 64.842 2.589 89.362 41.958 167.755 41.958 78.394 0 100.427-41.958 169.050-40.67 69.774 1.296 113.982 63.398 156.693 125.797 49.39 72.168 69.726 142.038 70.925 145.626-1.549 0.707-136.061 52.237-137.41 207.134zM662.562 796.478c35.739 43.357 59.861 103.512 53.28 163.522-51.478-2.096-113.878-34.29-150.81-77.55-33.142-38.376-62.149-99.626-54.374-158.437 57.466-4.483 116.128 29.205 151.904 72.466z" />
+<glyph unicode="&#x52;" d="M0.35 448l-0.35 312.074 384 52.144v-364.218zM448 821.518l511.872 74.482v-448h-511.872zM959.998 384l-0.126-448-511.872 72.016v375.984zM384 16.163l-383.688 52.595-0.021 315.242h383.709z" />
+<glyph unicode="&#x53;" d="M567.656 223.083c-81.944-38.118-158.158-37.717-209.341-34.021-61.051 4.41-110.158 21.123-131.742 35.731-13.301 9.006-31.384 5.522-40.39-7.782-9.003-13.302-5.52-31.386 7.782-40.39 34.698-23.486 96.067-40.954 160.162-45.579 10.866-0.784 22.798-1.278 35.646-1.278 55.782 0 126.626 5.315 202.419 40.57 14.563 6.778 20.878 24.074 14.104 38.64-6.774 14.57-24.074 20.875-38.64 14.11zM890.947 266.184c2.786 252.688 28.762 730.206-454.97 691.611-477.6-38.442-350.963-542.968-358.082-711.949-6.309-89.386-35.978-198.648-77.896-309.846h129.101c13.266 47.122 23.024 93.72 27.232 138.15 7.782-5.429 16.109-10.674 24.994-15.701 14.458-8.518 26.885-19.843 40.040-31.834 30.744-28.018 65.59-59.774 133.712-63.752 4.571-0.262 9.174-0.394 13.675-0.394 68.896 0 116.014 30.154 153.878 54.382 18.141 11.613 33.818 21.64 48.563 26.453 41.91 13.12 78.531 34.296 105.904 61.251 4.275 4.208 8.242 8.538 11.962 12.949 15.246-55.878 36.118-118.758 59.288-181.504l275.651-0.002c-66.174 102.224-134.437 202.374-133.053 330.184zM124.11 403.648c0 0.016 0 0.030-0.002 0.046-4.746 82.462 34.71 151.832 88.126 154.936 53.413 3.106 100.56-61.227 105.304-143.693 0-0.014 0.005-0.030 0.005-0.043 0.256-4.446 0.368-8.846 0.37-13.206-16.925-4.256-32.192-10.435-45.872-17.63-0.053 0.613-0.091 1.216-0.152 1.83 0 0.008 0 0.018 0 0.026-4.57 46.81-29.571 82.16-55.851 78.958-26.28-3.203-43.88-43.75-39.312-90.558 0-0.010 0.005-0.018 0.005-0.026 1.992-20.408 7.869-38.637 16.042-52.445-2.034-1.603-7.784-5.813-14.406-10.656-4.97-3.634-11.019-8.058-18.314-13.43-19.885 26.094-33.509 63.581-35.942 105.891zM665.261 199.822c-1.901-43.586-58.909-84.592-111.582-101.043l-0.296-0.096c-21.901-7.102-41.427-19.6-62.104-32.83-34.731-22.224-70.646-45.208-122.522-45.208-3.403 0-6.894 0.104-10.326 0.296-47.515 2.778-69.742 23.032-97.88 48.675-14.842 13.526-30.19 27.514-49.976 39.125l-0.424 0.243c-42.706 24.104-69.213 54.082-70.909 80.194-0.842 12.981 4.938 24.218 17.182 33.4 26.637 19.973 44.478 33.022 56.285 41.658 13.11 9.587 17.069 12.48 20 15.264 2.096 1.986 4.365 4.187 6.805 6.562 24.446 23.774 65.36 63.562 128.15 63.562 38.405 0 80.898-14.8 126.17-43.902 21.325-13.878 39.882-20.286 63.381-28.4 16.157-5.578 34.469-11.902 58.992-22.403l0.395-0.165c22.878-9.402 49.894-26.562 48.659-54.93zM652.646 302.194c-4.4 2.214-8.974 4.32-13.744 6.286-22.106 9.456-39.832 15.874-54.534 20.998 8.115 15.894 13.16 35.72 13.624 57.242 0 0.010 0 0.022 0 0.030 1.126 52.374-25.288 94.896-58.997 94.976-33.71 0.078-61.95-42.314-63.075-94.686 0-0.010 0-0.018 0-0.029-0.038-1.714-0.042-3.416-0.021-5.11-20.762 9.552-41.181 16.49-61.166 20.76-0.091 1.968-0.205 3.933-0.243 5.92 0 0.016 0 0.035 0 0.050-1.938 95.413 56.602 174.39 130.754 176.402 74.15 2.014 135.827-73.701 137.771-169.11 0-0.018 0-0.038 0-0.053 0.875-43.142-10.659-82.862-30.368-113.675z" />
+<glyph unicode="&#x54;" d="M448 384l-64 64-192-192 192-192 64 64-128 128zM576 128l64-64 192 192-192 192-64-64 128-128zM903.432 760.57l-142.864 142.862c-31.112 31.112-92.568 56.568-136.568 56.568h-480c-44 0-80-36-80-80v-864c0-44 36-80 80-80h736c44 0 80 36 80 80v608c0 44-25.456 105.458-56.568 136.57zM858.178 715.314c3.13-3.13 6.25-6.974 9.28-11.314h-163.458v163.456c4.339-3.030 8.184-6.15 11.314-9.28l142.864-142.862zM896 16c0-8.672-7.328-16-16-16h-736c-8.672 0-16 7.328-16 16v864c0 8.672 7.328 16 16 16h480c4.832 0 10.254-0.61 16-1.704v-254.296h254.296c1.094-5.746 1.704-11.166 1.704-16v-608z" />
+<glyph unicode="&#x55;" d="M640 960v-124c0-51.264-20-99.488-56.128-135.616l-362.112-360.128c-57.248-57.12-88.768-132.128-92.256-212.256h-129.504l192-192 192 192h-126.624c3.36 46.016 21.888 88.736 54.752 121.76l362.112 360c60.512 60.48 93.76 140.736 93.76 226.24v124h-128zM766.496 128c-3.488 80.128-35.136 155.136-92.384 212.512l-71.36 70.88-90.752-90.272 71.744-71.36c32.992-32.864 51.488-75.744 54.88-121.76h-126.624l192-192 192 192h-129.504z" horiz-adv-x="896" />
+<glyph unicode="&#x56;" d="M1024 448c0 282.77-229.23 512-512 512s-512-229.23-512-512 229.23-512 512-512 512 229.23 512 512zM96 448c0 229.75 186.25 416 416 416s416-186.25 416-416-186.25-416-416-416-416 186.25-416 416zM557.254 146.744l256 256.002c24.994 24.992 24.994 65.514 0 90.507-24.994 24.994-65.517 24.994-90.51 0l-146.744-146.742v357.49c0 35.346-28.654 64-64 64s-64-28.654-64-64v-357.49l-146.744 146.746c-24.994 24.994-65.518 24.994-90.512 0-12.496-12.498-18.744-28.878-18.744-45.256s6.248-32.758 18.744-45.254l256-256.002c24.994-24.992 65.518-24.992 90.51 0z" />
+<glyph unicode="&#x68;" d="M1024.837 959.163v-1024h-1024v1024zM401.115 875.925h-153.891v-868.578h161.011v251.921c0 25.921 0.365 43.446 1.096 52.574 0.365 14.239 1.461 25.741 3.286 34.503h0.547c1.096 8.761 2.921 15.88 5.476 21.358 2.19 6.206 4.929 11.5 8.215 15.88l0.547 0.549c4.016 6.572 9.674 12.961 16.976 19.168 6.572 5.476 14.239 10.404 23.002 14.786 10.223 4.016 19.717 7.119 28.478 9.31 10.223 2.19 21.542 3.286 33.956 3.286 17.89 0 32.676-2.19 44.36-6.572 9.857-4.016 17.708-9.674 23.549-16.976 5.476-8.033 10.041-21.176 13.692-39.431 4.016-21.907 6.024-48.195 6.024-78.863v-281.493h161.011v328.045c0 17.159-0.366 37.056-1.096 59.693-1.096 17.16-2.739 31.033-4.929 41.621-2.19 10.223-5.112 20.082-8.763 29.574-4.38 9.859-8.945 18.621-13.69 26.288-9.494 14.604-19.715 26.47-30.67 35.597-10.953 9.127-24.461 17.708-40.525 25.739h-0.549c-15.333 6.572-31.582 11.502-48.74 14.788-17.525 3.286-36.329 4.929-56.409 4.929-20.447 0-42.534-2.192-66.266-6.572-20.811-4.382-39.98-10.953-57.505-19.715-16.794-8.398-32.858-19.715-48.193-33.954z" />
+<glyph unicode="&#xe000;" d="M873.984 85.952c-199.872-199.936-524.096-199.936-724.032 0-200 199.936-200 524.16 0 724.096 199.936 199.936 524.16 199.936 724.032 0 200-199.936 200-524.16 0-724.096zM512 768c-176.704 0-320-143.232-320-320s143.296-320 320-320c102.528 0 192.768 49.152 251.392 124.096l-235.392 135.872 285.056 164.544c-43.52 125.184-161.152 215.488-301.056 215.488zM832 448c-35.392 0-64-28.608-64-64s28.608-64 64-64 64 28.608 64 64-28.608 64-64 64zM576 640c35.392 0 64-28.608 64-64 0-35.328-28.608-64-64-64s-64 28.672-64 64c0 35.392 28.608 64 64 64z" />
+<glyph unicode="&#xe001;" d="M848.512 445.013c0.128 0.299 0.171 0.64 0.299 0.939 2.858 7.296 4.522 15.104 4.522 23.381s-1.664 16.085-4.523 23.381c-0.128 0.299-0.171 0.64-0.299 0.939-3.243 7.936-8.021 15.061-13.995 21.035l-213.248 213.248c-25.003 25.003-65.493 25.003-90.496 0-25.003-24.96-25.003-65.536 0-90.496l104.066-104.107h-400.17c-35.328 0-64-28.629-64-64s28.672-64 64-64h400.171l-104.064-104.064c-25.003-24.96-25.003-65.536 0-90.496 12.458-12.544 28.842-18.773 45.226-18.773s32.768 6.229 45.269 18.731l213.248 213.248c5.974 5.973 10.752 13.141 13.995 21.034z" />
+<glyph unicode="&#xe002;" d="M175.488 493.653c-0.128-0.299-0.171-0.64-0.299-0.939-2.858-7.294-4.522-15.102-4.522-23.381s1.664-16.085 4.523-23.381c0.128-0.299 0.171-0.64 0.299-0.939 3.243-7.936 8.021-15.061 13.995-21.035l213.248-213.248c25.003-25.003 65.493-25.003 90.496 0 25.003 24.96 25.003 65.536 0 90.496l-104.066 104.107h400.17c35.328 0 64 28.629 64 64s-28.672 64-64 64h-400.17l104.064 104.064c25.003 24.96 25.003 65.536 0 90.496-12.459 12.544-28.843 18.774-45.227 18.774s-32.768-6.23-45.269-18.731l-213.248-213.248c-5.974-5.973-10.752-13.141-13.995-21.035z" />
+<glyph unicode="&#xe004;" d="M839.68 755.2c0 67.84-54.989 122.88-122.88 122.88s-122.88-55.040-122.88-122.88c0-49.818 29.696-92.621 72.294-111.923-11.622-99.738-75.878-119.859-168.704-148.838-45.056-14.080-97.434-30.464-141.67-62.31v210.227c43.674 18.893 74.24 62.31 74.24 112.845 0 67.84-55.040 122.88-122.88 122.88-67.891 0-122.88-55.040-122.88-122.88 0-50.534 30.566-93.952 74.24-112.845v-388.762c-43.674-18.79-74.24-62.208-74.24-112.794 0-67.84 54.989-122.88 122.88-122.88 67.84 0 122.88 55.040 122.88 122.88 0 49.818-29.696 92.621-72.346 111.923 11.674 99.738 75.981 119.91 168.755 148.838 94.362 29.491 221.491 69.274 237.261 240.077 44.544 18.534 75.93 62.362 75.93 113.562zM236.288 755.2c0 39.168 31.744 70.912 70.912 70.912s70.912-31.744 70.912-70.912-31.744-70.912-70.912-70.912-70.912 31.744-70.912 70.912zM307.2 69.888c-39.168 0-70.912 31.744-70.912 70.912s31.744 70.912 70.912 70.912 70.912-31.744 70.912-70.912-31.744-70.912-70.912-70.912zM716.8 684.288c-39.117 0-70.912 31.744-70.912 70.912s31.795 70.912 70.912 70.912 70.912-31.744 70.912-70.912-31.795-70.912-70.912-70.912z" />
+<glyph unicode="&#xe005;" d="M960.005 671.994l-223.998 223.998 64 64 223.997-223.998zM896 608l-32-352c-288 0-704-320-704-320l-53.13 53.13 273.664 273.664c10.973-4.368 22.934-6.794 35.466-6.794 53.019 0 96 42.981 96 96 0 53.019-42.981 96-96 96-53.019 0-96-42.981-96-96 0-12.533 2.426-24.49 6.794-35.466l-273.664-273.664-53.13 53.13c0 0 320 416 320 704l352 32 224-224z" />
+<glyph unicode="&#xe600;" d="M1024.648 963.326v-1023.809h-1023.811v1023.809zM410.696 865.988h-38.127c-14.952-1.494-32.147-3.551-51.583-6.167-19.438-2.617-38.875-5.607-58.313-8.972-19.438-3.363-37.94-7.288-55.508-11.774-17.569-4.486-31.96-8.97-43.174-13.456v-43.734l85.225-8.972v-679.56c-26.166-5.982-50.835-14.952-74.011-26.913v-43.734h297.167v43.734c-10.466 7.476-20.371 13.083-29.716 16.821s-19.998 7.103-31.96 10.093v311.744c8.97 26.913 23.923 50.65 44.855 71.208 20.932 20.559 46.351 30.839 76.255 30.839 35.884 0 59.994-15.139 72.329-45.416 12.335-30.278 18.502-77.563 18.502-141.856v-226.52c-12.708-3.738-23.922-7.851-33.641-12.335-9.718-4.486-19.063-9.345-28.035-14.579v-43.734h297.167v43.734c-11.214 7.476-23.176 13.083-35.884 16.821-12.71 3.738-25.419 7.103-38.127 10.093v268.010c0 46.351-4.113 84.666-12.337 114.942-8.222 30.278-20.184 54.387-35.884 72.329-15.7 17.943-35.323 30.466-58.873 37.567-23.549 7.103-50.275 10.653-80.178 10.653-20.933 0-40.744-3.363-59.434-10.093-18.69-6.728-36.071-15.885-52.145-27.474-16.073-11.587-30.464-25.043-43.172-40.369-12.71-15.325-22.802-31.585-30.278-48.781h-1.121z" />
+</font></defs></svg>
\ No newline at end of file
diff --git a/docs/static/fonts/hugo.ttf b/docs/static/fonts/hugo.ttf
new file mode 100644
index 000000000..962914d33
--- /dev/null
+++ b/docs/static/fonts/hugo.ttf
diff --git a/docs/static/fonts/hugo.woff b/docs/static/fonts/hugo.woff
new file mode 100644
index 000000000..4693fbe7f
--- /dev/null
+++ b/docs/static/fonts/hugo.woff
diff --git a/docs/static/img/hugo-logo-med.png b/docs/static/img/hugo-logo-med.png
new file mode 100644
index 000000000..dcc141690
--- /dev/null
+++ b/docs/static/img/hugo-logo-med.png
diff --git a/docs/static/img/hugo-logo.png b/docs/static/img/hugo-logo.png
new file mode 100644
index 000000000..a4f1321b0
--- /dev/null
+++ b/docs/static/img/hugo-logo.png
diff --git a/docs/static/img/hugo.png b/docs/static/img/hugo.png
new file mode 100644
index 000000000..48acf346c
--- /dev/null
+++ b/docs/static/img/hugo.png
diff --git a/docs/static/img/hugoSM.png b/docs/static/img/hugoSM.png
new file mode 100644
index 000000000..f64f43088
--- /dev/null
+++ b/docs/static/img/hugoSM.png
diff --git a/docs/themes/gohugoioTheme/layouts/_default/list.html b/docs/themes/gohugoioTheme/layouts/_default/list.html
index a0835342a..3b7a2307e 100755
--- a/docs/themes/gohugoioTheme/layouts/_default/list.html
+++ b/docs/themes/gohugoioTheme/layouts/_default/list.html
@@ -1,4 +1,5 @@
 {{ define "main" }}
-  {{ $section_to_display :=  .Sections | default .Paginator.Pages }}
+  {{ $paginator := .Paginate (.Pages | lang.Merge (where .Sites.First.RegularPages "Section" .Section)) }}
+  {{ $section_to_display :=  .Sections | default $paginator.Pages }}
   {{ partial "pagelayout.html" (dict "context" . "section_to_display" $section_to_display ) }}
 {{ end }}
diff --git a/docs/themes/gohugoioTheme/layouts/news/list.html b/docs/themes/gohugoioTheme/layouts/news/list.html
index 716966e17..5a5284658 100644
--- a/docs/themes/gohugoioTheme/layouts/news/list.html
+++ b/docs/themes/gohugoioTheme/layouts/news/list.html
@@ -28,7 +28,8 @@
 
     {{ $interior_classes := $.Site.Params.flex_box_interior_classes }}
     <section class="flex-ns flex-wrap justify-between w-100 w-80-nsTK v-top">
-      {{ range .Paginator.Pages }}
+      {{ $paginator := .Paginate (.Pages | lang.Merge (where .Sites.First.RegularPages "Section" .Section)) -}}
+      {{ range $paginator.Pages }}
         {{ partial "boxes-section-summaries" (dict "context" . "classes" $interior_classes "fullcontent" false) }}
       {{ end }}
     </section>
diff --git a/docs/themes/gohugoioTheme/layouts/page/documentation-home.html b/docs/themes/gohugoioTheme/layouts/page/documentation-home.html
index 04b57d4ca..91f744c30 100644
--- a/docs/themes/gohugoioTheme/layouts/page/documentation-home.html
+++ b/docs/themes/gohugoioTheme/layouts/page/documentation-home.html
@@ -1,4 +1,4 @@
 {{ define "main" }}
-{{ $section_to_display :=  (.Site.Taxonomies.categories.fundamentals).Pages }}
+{{ $section_to_display := (.Site.Taxonomies.categories.fundamentals).Pages | lang.Merge (.Sites.First.Taxonomies.categories.fundamentals).Pages }}
   {{ partial "pagelayout.html" (dict "context" . "section_to_display" $section_to_display ) }}
 {{ end }}
diff --git a/docs/themes/gohugoioTheme/layouts/partials/home-page-sections/showcase.html b/docs/themes/gohugoioTheme/layouts/partials/home-page-sections/showcase.html
index 774c10e0f..c73cfa5e9 100644
--- a/docs/themes/gohugoioTheme/layouts/partials/home-page-sections/showcase.html
+++ b/docs/themes/gohugoioTheme/layouts/partials/home-page-sections/showcase.html
@@ -5,10 +5,12 @@
     <div class="w-100 overflow-x-scroll">
       <div class="row nowrap mv2 pb1">
         {{ $showcasePages := where .Site.RegularPages "Section" "showcase" }}
+        {{ if $showcasePages }}
         {{ template "home_showcase_item" (index $showcasePages 0) }}
         {{ range $p := first 10 ($showcasePages | after 1 | shuffle) }}
           {{template "home_showcase_item" $p }}
         {{end}}
+        {{end}}
       </div>
     </div>
   </div>
diff --git a/docs/themes/gohugoioTheme/layouts/partials/nav-links-docs.html b/docs/themes/gohugoioTheme/layouts/partials/nav-links-docs.html
index d695008c7..61aa11dde 100644
--- a/docs/themes/gohugoioTheme/layouts/partials/nav-links-docs.html
+++ b/docs/themes/gohugoioTheme/layouts/partials/nav-links-docs.html
@@ -4,20 +4,20 @@
     {{ range .Site.Menus.docs.ByWeight }}
       {{ $post := printf "%s" .Post }}
       <li class="f5 w-100 hover-bg-light-gray hover-accent-color-light fw8{{ if eq $post "break" }} mb1 bb b--moon-gray{{ end }}">
-        <a href="{{ if .HasChildren }}javascript:void(0){{ else }}{{ .URL }}{{ end }}" class="js-toggle dib w-100 link mid-gray hover-accent-color-light pl2 pr2 pv2 {{if or ($currentPage.IsMenuCurrent "docs" .) ($currentPage.HasMenuCurrent "docs" .) }} primary-color{{end}}" data-target=".{{ .Name | urlize }}">{{ .Name }}</a>
+        <a href="{{ if .HasChildren }}javascript:void(0){{ else }}{{ .URL }}{{ end }}" class="js-toggle dib w-100 link mid-gray hover-accent-color-light pl2 pr2 pv2 {{if or ($currentPage.IsMenuCurrent "docs" .) ($currentPage.HasMenuCurrent "docs" .) }} primary-color{{end}}" data-target=".{{ .Identifier }}">{{ .Name }}</a>
 
-          {{ if .HasChildren }}
-            <ul class="{{ .Name | urlize }} desktopmenu animated fadeIn list pl0 bg-light-gray{{if $currentPage.HasMenuCurrent "docs" . }} db{{ else }} dn{{ end }}">
-              {{ range .Children }}
-                <li  class="f6 fw4">
-                  <a href="{{.URL}}" class="db link hover-bg-gray hover-white pl3 pr2 pv2 {{if $currentPage.IsMenuCurrent "docs" . }}primary-color {{ else }}black {{end}}">
-                    {{ .Name }}
-                  </a>
-                </li>
-              {{ end }}
-            </ul>
-          {{end}}
-        </li>
-    {{end}}
+        {{- if .HasChildren }}
+        <ul class="{{ .Identifier }} desktopmenu animated fadeIn list pl0 bg-light-gray{{if $currentPage.HasMenuCurrent "docs" . }} db{{ else }} dn{{ end }}">
+          {{- range .Children }}
+          <li class="f6 fw4">
+            <a href="{{.URL}}" class="db link hover-bg-gray hover-white pl3 pr2 pv2 {{if $currentPage.IsMenuCurrent "docs" . }}primary-color {{ else }}black {{end}}">
+              {{ .Name }}
+            </a>
+          </li>
+          {{- end}}
+        </ul>
+        {{- end}}
+      </li>
+    {{- end}}
   </ul>
 </nav>
diff --git a/docs/themes/gohugoioTheme/theme.toml b/docs/themes/gohugoioTheme/theme.toml
index 7334c0e2e..fe55ec76e 100644
--- a/docs/themes/gohugoioTheme/theme.toml
+++ b/docs/themes/gohugoioTheme/theme.toml
@@ -8,7 +8,7 @@ description = ""
 homepage = "https://github.com/budparr/gohugo.io"
 tags = ["website"]
 features = ["", ""]
-min_version = 0.18
+min_version = 0.38
 
 [author]
   name = "Bud Parr"