From 87db4be71efed90af21d5760348bcabdbd259403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Fri, 14 Jul 2017 10:43:35 +0200
Subject: [PATCH] Remove the tags config for now

See https://github.com/gohugoio/hugoDocs/issues/32
---
 config.toml                                               | 1 -
 content/about/_index.md                                   | 2 +-
 content/about/benefits.md                                 | 2 +-
 content/about/license.md                                  | 2 +-
 content/about/roadmap.md                                  | 2 +-
 content/commands/_index.md                                | 2 +-
 content/content-management/_index.md                      | 2 +-
 content/content-management/archetypes.md                  | 2 +-
 content/content-management/authors.md                     | 2 +-
 content/content-management/comments.md                    | 4 ++--
 content/content-management/cross-references.md            | 2 +-
 content/content-management/formats.md                     | 2 +-
 content/content-management/front-matter.md                | 4 ++--
 content/content-management/menus.md                       | 2 +-
 content/content-management/multilingual.md                | 2 +-
 content/content-management/organization.md                | 4 ++--
 content/content-management/sections.md                    | 2 +-
 content/content-management/shortcodes.md                  | 2 +-
 content/content-management/summaries.md                   | 2 +-
 content/content-management/taxonomies.md                  | 6 +++---
 content/content-management/toc.md                         | 2 +-
 content/content-management/types.md                       | 2 +-
 content/content-management/urls.md                        | 2 +-
 content/contribute/_index.md                              | 2 +-
 content/contribute/development.md                         | 2 +-
 content/contribute/documentation.md                       | 2 +-
 content/contribute/themes.md                              | 2 +-
 content/functions/GetPage.md                              | 2 +-
 content/functions/NumFmt.md                               | 2 +-
 content/functions/_index.md                               | 2 +-
 content/functions/abslangurl.md                           | 2 +-
 content/functions/absurl.md                               | 2 +-
 content/functions/adddate.md                              | 2 +-
 content/functions/after.md                                | 2 +-
 content/functions/apply.md                                | 2 +-
 content/functions/base64.md                               | 2 +-
 content/functions/chomp.md                                | 2 +-
 content/functions/countrunes.md                           | 2 +-
 content/functions/countwords.md                           | 2 +-
 content/functions/dateformat.md                           | 2 +-
 content/functions/default.md                              | 2 +-
 content/functions/delimit.md                              | 4 ++--
 content/functions/dict.md                                 | 2 +-
 content/functions/echoparam.md                            | 2 +-
 content/functions/emojify.md                              | 2 +-
 content/functions/eq.md                                   | 2 +-
 content/functions/findRe.md                               | 2 +-
 content/functions/first.md                                | 2 +-
 content/functions/format.md                               | 2 +-
 content/functions/get.md                                  | 2 +-
 content/functions/getenv.md                               | 2 +-
 content/functions/hasPrefix.md                            | 2 +-
 content/functions/haschildren.md                          | 2 +-
 content/functions/hasmenucurrent.md                       | 2 +-
 content/functions/highlight.md                            | 2 +-
 content/functions/htmlEscape.md                           | 2 +-
 content/functions/htmlUnescape.md                         | 2 +-
 content/functions/humanize.md                             | 2 +-
 content/functions/i18n.md                                 | 2 +-
 content/functions/imageConfig.md                          | 2 +-
 content/functions/in.md                                   | 2 +-
 content/functions/index-function.md                       | 2 +-
 content/functions/int.md                                  | 2 +-
 content/functions/intersect.md                            | 2 +-
 content/functions/ismenucurrent.md                        | 2 +-
 content/functions/isset.md                                | 2 +-
 content/functions/jsonify.md                              | 2 +-
 content/functions/last.md                                 | 2 +-
 content/functions/len.md                                  | 2 +-
 content/functions/lower.md                                | 2 +-
 content/functions/markdownify.md                          | 2 +-
 content/functions/math.md                                 | 2 +-
 content/functions/md5.md                                  | 2 +-
 content/functions/now.md                                  | 2 +-
 content/functions/param.md                                | 2 +-
 content/functions/partialCached.md                        | 2 +-
 content/functions/plainify.md                             | 2 +-
 content/functions/pluralize.md                            | 2 +-
 content/functions/printf.md                               | 2 +-
 content/functions/querify.md                              | 2 +-
 content/functions/range.md                                | 4 ++--
 content/functions/readdir.md                              | 2 +-
 content/functions/readfile.md                             | 2 +-
 content/functions/ref.md                                  | 2 +-
 content/functions/relLangURL.md                           | 2 +-
 content/functions/relref.md                               | 2 +-
 content/functions/relurl.md                               | 2 +-
 content/functions/render.md                               | 2 +-
 content/functions/replace.md                              | 2 +-
 content/functions/replacere.md                            | 2 +-
 content/functions/safeCSS.md                              | 2 +-
 content/functions/safeHTML.md                             | 2 +-
 content/functions/safeHTMLAttr.md                         | 2 +-
 content/functions/safeJS.md                               | 2 +-
 content/functions/safeURL.md                              | 2 +-
 content/functions/scratch.md                              | 2 +-
 content/functions/seq.md                                  | 2 +-
 content/functions/sha.md                                  | 2 +-
 content/functions/shuffle.md                              | 2 +-
 content/functions/singularize.md                          | 2 +-
 content/functions/slice.md                                | 2 +-
 content/functions/slicestr.md                             | 2 +-
 content/functions/sort.md                                 | 4 ++--
 content/functions/split.md                                | 2 +-
 content/functions/string.md                               | 2 +-
 content/functions/substr.md                               | 2 +-
 content/functions/time.md                                 | 2 +-
 content/functions/title.md                                | 4 ++--
 content/functions/trim.md                                 | 2 +-
 content/functions/truncate.md                             | 2 +-
 content/functions/union.md                                | 2 +-
 content/functions/uniq.md                                 | 2 +-
 content/functions/unix.md                                 | 2 +-
 content/functions/upper.md                                | 2 +-
 content/functions/urlize.md                               | 2 +-
 content/functions/where.md                                | 2 +-
 content/functions/with.md                                 | 4 ++--
 content/getting-started/_index.md                         | 2 +-
 content/getting-started/configuration.md                  | 4 ++--
 content/getting-started/directory-structure.md            | 4 ++--
 content/getting-started/installing.md                     | 4 ++--
 content/getting-started/quick-start.md                    | 2 +-
 content/getting-started/usage.md                          | 2 +-
 content/hosting-and-deployment/_index.md                  | 2 +-
 content/hosting-and-deployment/deployment-with-rsync.md   | 2 +-
 content/hosting-and-deployment/deployment-with-wercker.md | 2 +-
 content/hosting-and-deployment/hosting-on-bitbucket.md    | 2 +-
 content/hosting-and-deployment/hosting-on-firebase.md     | 2 +-
 content/hosting-and-deployment/hosting-on-github.md       | 2 +-
 content/hosting-and-deployment/hosting-on-gitlab.md       | 2 +-
 content/hosting-and-deployment/hosting-on-netlify.md      | 2 +-
 content/mailing-list.md                                   | 2 +-
 content/news/press-and-articles.md                        | 2 +-
 content/templates/404.md                                  | 2 +-
 content/templates/_index.md                               | 2 +-
 content/templates/alternatives.md                         | 2 +-
 content/templates/base.md                                 | 4 ++--
 content/templates/data-templates.md                       | 2 +-
 content/templates/files.md                                | 2 +-
 content/templates/homepage.md                             | 2 +-
 content/templates/internal.md                             | 2 +-
 content/templates/introduction.md                         | 4 ++--
 content/templates/lists.md                                | 2 +-
 content/templates/lookup-order.md                         | 4 ++--
 content/templates/menu-templates.md                       | 2 +-
 content/templates/ordering-and-grouping.md                | 2 +-
 content/templates/output-formats.md                       | 2 +-
 content/templates/pagination.md                           | 2 +-
 content/templates/partials.md                             | 2 +-
 content/templates/robots.md                               | 2 +-
 content/templates/rss.md                                  | 2 +-
 content/templates/section-templates.md                    | 2 +-
 content/templates/shortcode-templates.md                  | 2 +-
 content/templates/single-page-templates.md                | 2 +-
 content/templates/sitemap-template.md                     | 2 +-
 content/templates/taxonomy-templates.md                   | 2 +-
 content/templates/template-debugging.md                   | 2 +-
 content/templates/views.md                                | 2 +-
 content/themes/_index.md                                  | 2 +-
 content/themes/creating.md                                | 2 +-
 content/themes/customizing.md                             | 2 +-
 content/themes/installing-and-using-themes.md             | 2 +-
 content/tools/_index.md                                   | 2 +-
 content/tools/editors.md                                  | 2 +-
 content/tools/frontends.md                                | 2 +-
 content/tools/migrations.md                               | 2 +-
 content/tools/other.md                                    | 2 +-
 content/tools/search.md                                   | 2 +-
 content/tools/starter-kits.md                             | 2 +-
 content/tools/syntax-highlighting.md                      | 2 +-
 content/troubleshooting/accented-characters-in-urls.md    | 2 +-
 content/troubleshooting/build-performance.md              | 2 +-
 content/troubleshooting/eof-error.md                      | 2 +-
 content/variables/_index.md                               | 2 +-
 content/variables/files.md                                | 2 +-
 content/variables/git.md                                  | 2 +-
 content/variables/hugo.md                                 | 2 +-
 content/variables/menus.md                                | 2 +-
 content/variables/page.md                                 | 4 ++--
 content/variables/shortcodes.md                           | 2 +-
 content/variables/site.md                                 | 2 +-
 content/variables/sitemap.md                              | 2 +-
 content/variables/taxonomy.md                             | 2 +-
 themes/gohugoioTheme                                      | 2 +-
 184 files changed, 200 insertions(+), 201 deletions(-)

diff --git a/config.toml b/config.toml
index 5d9372d9a..3c5e0e0a0 100644
--- a/config.toml
+++ b/config.toml
@@ -69,7 +69,6 @@ twitter = "GoHugoIO"
 
 ## As of v0.20, all content files include a default "categories" value that's the same as the section. This was a cheap future-proofing method and should/could be changed accordingly.
 [taxonomies]
-  tag = "tags"
   category = "categories"
 
 # High level items
diff --git a/content/about/_index.md b/content/about/_index.md
index e8bd96b3a..422eb1d05 100644
--- a/content/about/_index.md
+++ b/content/about/_index.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: []
-tags: []
+#tags: []
 menu:
   docs:
     parent: "about"
diff --git a/content/about/benefits.md b/content/about/benefits.md
index 13f78208e..53a7516a3 100644
--- a/content/about/benefits.md
+++ b/content/about/benefits.md
@@ -5,7 +5,7 @@ description: Improved performance, security, ease of use, and exportability of c
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-tags: [ssg,static,performance,security]
+#tags: [ssg,static,performance,security]
 menu:
   docs:
     parent: "about"
diff --git a/content/about/license.md b/content/about/license.md
index c1c854f6b..037e62e9b 100644
--- a/content/about/license.md
+++ b/content/about/license.md
@@ -6,7 +6,7 @@ date: 2016-02-01
 publishdate: 2016-02-01
 lastmod: 2016-03-02
 categories: ["about hugo"]
-tags: ["License","apache"]
+#tags: ["License","apache"]
 menu:
   docs:
     parent: "about"
diff --git a/content/about/roadmap.md b/content/about/roadmap.md
index c54f7fdc5..678013ba4 100644
--- a/content/about/roadmap.md
+++ b/content/about/roadmap.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [about hugo]
-tags: [about,contribute,roadmap]
+#tags: [about,contribute,roadmap]
 menu:
   docs:
     parent: "about"
diff --git a/content/commands/_index.md b/content/commands/_index.md
index 1f21d9d0c..a4ddd54f3 100644
--- a/content/commands/_index.md
+++ b/content/commands/_index.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [commands]
-tags: [cli,command line]
+#tags: [cli,command line]
 menu:
   docs:
     parent: "commands"
diff --git a/content/content-management/_index.md b/content/content-management/_index.md
index c99e5160a..bc011b681 100644
--- a/content/content-management/_index.md
+++ b/content/content-management/_index.md
@@ -9,7 +9,7 @@ menu:
   docs:
     parent: "content-management"
     weight: 1
-tags: [source, organization]
+#tags: [source, organization]
 categories: [content management]
 weight: 01	#rem
 draft: false
diff --git a/content/content-management/archetypes.md b/content/content-management/archetypes.md
index 0f526cfc7..2b004aa5f 100644
--- a/content/content-management/archetypes.md
+++ b/content/content-management/archetypes.md
@@ -5,7 +5,7 @@ description: Archetypes allow you to create new instances of content types and s
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-tags: [archetypes,generators,metadata,front matter]
+#tags: [archetypes,generators,metadata,front matter]
 categories: ["content management"]
 menu:
   docs:
diff --git a/content/content-management/authors.md b/content/content-management/authors.md
index d031ab8d8..741a1e8c3 100644
--- a/content/content-management/authors.md
+++ b/content/content-management/authors.md
@@ -5,7 +5,7 @@ description:
 date: 2016-08-22
 publishdate: 2017-03-12
 lastmod: 2017-03-12
-tags: [authors]
+#tags: [authors]
 categories: ["content management"]
 menu:
   docs:
diff --git a/content/content-management/comments.md b/content/content-management/comments.md
index 324290014..f1fe93a56 100644
--- a/content/content-management/comments.md
+++ b/content/content-management/comments.md
@@ -5,8 +5,8 @@ description: Hugo ships with an internal Disqus template that requires negligibl
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-03-09
-tags: [sections,content,organization, fundamentals]
-categories: [project organization]
+#tags: [sections,content,organization]
+categories: [project organization, fundamentals]
 menu:
   docs:
     parent: "content-management"
diff --git a/content/content-management/cross-references.md b/content/content-management/cross-references.md
index 38ba40102..97f961512 100644
--- a/content/content-management/cross-references.md
+++ b/content/content-management/cross-references.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-03-31
 categories: [content management]
-tags: ["cross references","references", "anchors", "urls"]
+#tags: ["cross references","references", "anchors", "urls"]
 menu:
   docs:
     parent: "content-management"
diff --git a/content/content-management/formats.md b/content/content-management/formats.md
index 679868b54..ff81233e5 100644
--- a/content/content-management/formats.md
+++ b/content/content-management/formats.md
@@ -6,7 +6,7 @@ date: 2017-01-10
 publishdate: 2017-01-10
 lastmod: 2017-04-06
 categories: [content management]
-tags: [markdown,asciidoc,mmark,content format]
+#tags: [markdown,asciidoc,mmark,content format]
 menu:
   docs:
     parent: "content-management"
diff --git a/content/content-management/front-matter.md b/content/content-management/front-matter.md
index e96e95b51..8c71ce780 100644
--- a/content/content-management/front-matter.md
+++ b/content/content-management/front-matter.md
@@ -6,7 +6,7 @@ date: 2017-01-09
 publishdate: 2017-01-09
 lastmod: 2017-02-24
 categories: [content management]
-tags: ["front matter", "yaml", "toml", "json", "metadata", "archetypes"]
+#tags: ["front matter", "yaml", "toml", "json", "metadata", "archetypes"]
 menu:
   docs:
     parent: "content-management"
@@ -54,7 +54,7 @@ slug = "spf13-vim-3-0-release-and-new-website"
 ---
 title: "spf13-vim 3.0 release and new website"
 description: "spf13-vim is a cross platform distribution of vim plugins and resources for Vim."
-tags: [ ".vimrc", "plugins", "spf13-vim", "vim" ]
+#tags: [ ".vimrc", "plugins", "spf13-vim", "vim" ]
 lastmod: 2015-12-23
 date: "2012-04-06"
 categories:
diff --git a/content/content-management/menus.md b/content/content-management/menus.md
index 7dc44a293..98ab8bf56 100644
--- a/content/content-management/menus.md
+++ b/content/content-management/menus.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-03-31
 categories: [content management]
-tags: [menus]
+#tags: [menus]
 draft: false
 menu:
   docs:
diff --git a/content/content-management/multilingual.md b/content/content-management/multilingual.md
index 3870bf947..38013da27 100644
--- a/content/content-management/multilingual.md
+++ b/content/content-management/multilingual.md
@@ -6,7 +6,7 @@ date: 2017-01-10
 publishdate: 2017-01-10
 lastmod: 2017-01-10
 categories: [content management]
-tags: [multilingual,i18n, internationalization]
+#tags: [multilingual,i18n, internationalization]
 menu:
   docs:
     parent: "content-management"
diff --git a/content/content-management/organization.md b/content/content-management/organization.md
index ae9edd37e..9f381ef13 100644
--- a/content/content-management/organization.md
+++ b/content/content-management/organization.md
@@ -5,8 +5,8 @@ description: Hugo assumes that the same structure that works to organize your so
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-categories: [content management]
-tags: [sections,content,organization,fundamentals]
+categories: [content management,fundamentals]
+#tags: [sections,content,organization]
 menu:
   docs:
     parent: "content-management"
diff --git a/content/content-management/sections.md b/content/content-management/sections.md
index 7444c92a0..cf4c75440 100644
--- a/content/content-management/sections.md
+++ b/content/content-management/sections.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [content management]
-tags: [lists,sections,content types,organization]
+#tags: [lists,sections,content types,organization]
 menu:
   docs:
     parent: "content-management"
diff --git a/content/content-management/shortcodes.md b/content/content-management/shortcodes.md
index 21cafe12c..6229fdceb 100644
--- a/content/content-management/shortcodes.md
+++ b/content/content-management/shortcodes.md
@@ -12,7 +12,7 @@ menu:
     weight: 35
 weight: 35	#rem
 categories: [content management]
-tags: [markdown,content,shortcodes]
+#tags: [markdown,content,shortcodes]
 draft: false
 aliases: [/extras/shortcodes/]
 toc: true
diff --git a/content/content-management/summaries.md b/content/content-management/summaries.md
index e128ad581..54efb1378 100644
--- a/content/content-management/summaries.md
+++ b/content/content-management/summaries.md
@@ -6,7 +6,7 @@ date: 2017-01-10
 publishdate: 2017-01-10
 lastmod: 2017-01-10
 categories: [content management]
-tags: [summaries,abstracts,read more]
+#tags: [summaries,abstracts,read more]
 menu:
   docs:
     parent: "content-management"
diff --git a/content/content-management/taxonomies.md b/content/content-management/taxonomies.md
index 731f350e8..1a6344232 100644
--- a/content/content-management/taxonomies.md
+++ b/content/content-management/taxonomies.md
@@ -5,7 +5,7 @@ description: Hugo includes support for user-defined taxonomies to help you  demo
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-tags: [taxonomies,metadata,front matter,terms]
+#tags: [taxonomies,metadata,front matter,terms]
 categories: [content management]
 menu:
   docs:
@@ -163,7 +163,7 @@ project_url = "https://github.com/spf13/hugo"
 ```yaml
 ---
 title: "Hugo: A fast and flexible static site generator"
-tags: ["Development", "Go", "fast", "Blogging"]
+#tags: ["Development", "Go", "fast", "Blogging"]
 categories: ["Development"]
 categories: ["Go Web Dev"]
 slug: "hugo"
@@ -216,7 +216,7 @@ categories_weight = 44
 ```yaml
 ---
 title: foo
-tags: [ "a", "b", "c" ]
+#tags: [ "a", "b", "c" ]
 tags_weight: 22
 categories: ["d"]
 categories_weight: 44
diff --git a/content/content-management/toc.md b/content/content-management/toc.md
index f666926df..d67b925f4 100644
--- a/content/content-management/toc.md
+++ b/content/content-management/toc.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [content management]
-tags: [table of contents, toc]
+#tags: [table of contents, toc]
 menu:
   docs:
     parent: "content-management"
diff --git a/content/content-management/types.md b/content/content-management/types.md
index 2eadd6177..50759f331 100644
--- a/content/content-management/types.md
+++ b/content/content-management/types.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [content management]
-tags: [lists,sections,content types,types,organization]
+#tags: [lists,sections,content types,types,organization]
 menu:
   docs:
     parent: "content-management"
diff --git a/content/content-management/urls.md b/content/content-management/urls.md
index bf5caf249..ac3e63489 100644
--- a/content/content-management/urls.md
+++ b/content/content-management/urls.md
@@ -5,7 +5,7 @@ description: Hugo provides native support for permalinks, aliases, link canonica
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-03-09
-tags: [aliases,redirects,permalinks,urls]
+#tags: [aliases,redirects,permalinks,urls]
 categories: [content management]
 menu:
   docs:
diff --git a/content/contribute/_index.md b/content/contribute/_index.md
index 9c24df9c4..0dd6a60f1 100644
--- a/content/contribute/_index.md
+++ b/content/contribute/_index.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [contribute]
-tags: []
+#tags: []
 menu:
   docs:
     parent: "contribute"
diff --git a/content/contribute/development.md b/content/contribute/development.md
index d9dabed4f..60a056b27 100644
--- a/content/contribute/development.md
+++ b/content/contribute/development.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [contribute]
-tags: [dev,open source]
+#tags: [dev,open source]
 authors: [digitalcraftsman]
 menu:
   docs:
diff --git a/content/contribute/documentation.md b/content/contribute/documentation.md
index 83d1558de..50aa1666c 100644
--- a/content/contribute/documentation.md
+++ b/content/contribute/documentation.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [contribute]
-tags: [docs,documentation,community, contribute]
+#tags: [docs,documentation,community, contribute]
 menu:
   docs:
     parent: "contribute"
diff --git a/content/contribute/themes.md b/content/contribute/themes.md
index 421534d84..1384276b9 100644
--- a/content/contribute/themes.md
+++ b/content/contribute/themes.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-27
 categories: [contribute]
-tags: [contribute,themes,design]
+#tags: [contribute,themes,design]
 authors: [digitalcraftsman]
 menu:
   docs:
diff --git a/content/functions/GetPage.md b/content/functions/GetPage.md
index 7cfedb68e..8505bf2a7 100644
--- a/content/functions/GetPage.md
+++ b/content/functions/GetPage.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [sections,lists,indexes]
+#tags: [sections,lists,indexes]
 ns:
 signature: ["GetPage TYPE PATH"]
 workson: []
diff --git a/content/functions/NumFmt.md b/content/functions/NumFmt.md
index 6d62f3568..f6b8fb52d 100644
--- a/content/functions/NumFmt.md
+++ b/content/functions/NumFmt.md
@@ -8,7 +8,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [functions]
-tags: [numbers]
+#tags: [numbers]
 menu:
   docs:
     parent: "functions"
diff --git a/content/functions/_index.md b/content/functions/_index.md
index 5ac72b8cf..80cfec6b2 100644
--- a/content/functions/_index.md
+++ b/content/functions/_index.md
@@ -6,7 +6,7 @@ godocref:
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-tags: []
+#tags: []
 menu:
   docs:
     parent: "functions"
diff --git a/content/functions/abslangurl.md b/content/functions/abslangurl.md
index 7e5caf038..5e1d11522 100644
--- a/content/functions/abslangurl.md
+++ b/content/functions/abslangurl.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [multilingual,i18n,urls]
+#tags: [multilingual,i18n,urls]
 ns:
 signature: ["absLangURL INPUT"]
 workson: []
diff --git a/content/functions/absurl.md b/content/functions/absurl.md
index bef48e0fa..5af012b14 100644
--- a/content/functions/absurl.md
+++ b/content/functions/absurl.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [urls]
+#tags: [urls]
 ns:
 signature: ["absURL INPUT"]
 workson: []
diff --git a/content/functions/adddate.md b/content/functions/adddate.md
index 31d133ab3..309d75114 100644
--- a/content/functions/adddate.md
+++ b/content/functions/adddate.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [dates,time]
+#tags: [dates,time]
 ns:
 signature: ["AddDate YEARS MONTHS DAYS"]
 workson: [times]
diff --git a/content/functions/after.md b/content/functions/after.md
index 9fd1c0a88..ee664a921 100644
--- a/content/functions/after.md
+++ b/content/functions/after.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [iteration]
+#tags: [iteration]
 ns:
 signature: ["after INDEX COLLECTION"]
 workson: []
diff --git a/content/functions/apply.md b/content/functions/apply.md
index 903ba94e8..7d17f7c35 100644
--- a/content/functions/apply.md
+++ b/content/functions/apply.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [advanced]
+#tags: [advanced]
 ns:
 signature: ["apply COLLETION FUNCTION [PARAM...]"]
 workson: []
diff --git a/content/functions/base64.md b/content/functions/base64.md
index 5cde15626..f0bdc83eb 100644
--- a/content/functions/base64.md
+++ b/content/functions/base64.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: []
+#tags: []
 relatedfuncs: []
 ns:
 signature: ["base64Decode INPUT", "base64Encode INPUT"]
diff --git a/content/functions/chomp.md b/content/functions/chomp.md
index 9c678cb91..a07b3217e 100644
--- a/content/functions/chomp.md
+++ b/content/functions/chomp.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [trim]
+#tags: [trim]
 ns:
 signature: ["chomp INPUT"]
 workson: []
diff --git a/content/functions/countrunes.md b/content/functions/countrunes.md
index a06de318b..303111140 100644
--- a/content/functions/countrunes.md
+++ b/content/functions/countrunes.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [counting, word count]
+#tags: [counting, word count]
 ns:
 signature: ["countrunes INPUT"]
 workson: []
diff --git a/content/functions/countwords.md b/content/functions/countwords.md
index dee72c8b8..c16a186b3 100644
--- a/content/functions/countwords.md
+++ b/content/functions/countwords.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [counting, word count]
+#tags: [counting, word count]
 ns:
 signature: ["countwords INPUT"]
 workson: []
diff --git a/content/functions/dateformat.md b/content/functions/dateformat.md
index ff9fa4c94..2bd243ef6 100644
--- a/content/functions/dateformat.md
+++ b/content/functions/dateformat.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [dates,time,strings]
+#tags: [dates,time,strings]
 ns:
 signature: ["dateFormat LAYOUT INPUT"]
 workson: []
diff --git a/content/functions/default.md b/content/functions/default.md
index ff294088d..6fc6ed5d0 100644
--- a/content/functions/default.md
+++ b/content/functions/default.md
@@ -7,7 +7,7 @@ godocref:
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-tags: [defaults]
+#tags: [defaults]
 categories: [functions]
 menu:
   docs:
diff --git a/content/functions/delimit.md b/content/functions/delimit.md
index ac79f35c1..61928ba23 100644
--- a/content/functions/delimit.md
+++ b/content/functions/delimit.md
@@ -11,7 +11,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [iteration]
+#tags: [iteration]
 toc: false
 ns:
 signature: ["delimit COLLECTION DELIMIT LAST"]
@@ -39,7 +39,7 @@ The examples of `delimit` that follow all use the same front matter:
 ```toml
 +++
 title: I love Delimit
-tags: [ "tag1", "tag2", "tag3" ]
+#tags: [ "tag1", "tag2", "tag3" ]
 +++
 ```
 {{% /code %}}
diff --git a/content/functions/dict.md b/content/functions/dict.md
index d8441964e..f151e3eff 100644
--- a/content/functions/dict.md
+++ b/content/functions/dict.md
@@ -11,7 +11,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [dictionary]
+#tags: [dictionary]
 ns:
 signature: ["dict KEY VALUE [KEY VALUE]..."]
 workson: []
diff --git a/content/functions/echoparam.md b/content/functions/echoparam.md
index 2e841cead..2bec15840 100644
--- a/content/functions/echoparam.md
+++ b/content/functions/echoparam.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: []
+#tags: []
 ns:
 signature: ["echoParam DICTIONARY KEY"]
 workson: []
diff --git a/content/functions/emojify.md b/content/functions/emojify.md
index ab47dde2d..8228d75c1 100644
--- a/content/functions/emojify.md
+++ b/content/functions/emojify.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings,emojis]
+#tags: [strings,emojis]
 ns:
 signature: ["emojify INPUT"]
 workson: []
diff --git a/content/functions/eq.md b/content/functions/eq.md
index aaf8b215e..5dc9a1e51 100644
--- a/content/functions/eq.md
+++ b/content/functions/eq.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [operators,logic]
+#tags: [operators,logic]
 ns:
 signature: ["eq ARG1 ARG2"]
 workson: []
diff --git a/content/functions/findRe.md b/content/functions/findRe.md
index 89a555787..9797a875c 100644
--- a/content/functions/findRe.md
+++ b/content/functions/findRe.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [regex]
+#tags: [regex]
 ns:
 signature: ["findRE PATTERN INPUT [LIMIT]"]
 workson: []
diff --git a/content/functions/first.md b/content/functions/first.md
index 671ecd69a..7882e87bd 100644
--- a/content/functions/first.md
+++ b/content/functions/first.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [iteration]
+#tags: [iteration]
 ns:
 signature: ["first LIMIT COLLECTION"]
 workson: [lists,taxonomies,terms,groups]
diff --git a/content/functions/format.md b/content/functions/format.md
index b6613dee0..f14dd19e3 100644
--- a/content/functions/format.md
+++ b/content/functions/format.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [dates,time]
+#tags: [dates,time]
 ns:
 signature: ["Format FORMAT"]
 workson: [times]
diff --git a/content/functions/get.md b/content/functions/get.md
index 57c4e7a20..0546359fa 100644
--- a/content/functions/get.md
+++ b/content/functions/get.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [shortcodes]
+#tags: [shortcodes]
 ns:
 signature: ["Get INDEX", "Get KEY"]
 workson: []
diff --git a/content/functions/getenv.md b/content/functions/getenv.md
index c43fb0dbf..bfdcf9183 100644
--- a/content/functions/getenv.md
+++ b/content/functions/getenv.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: []
+#tags: []
 ns:
 signature: ["getenv VARIABLE"]
 workson: []
diff --git a/content/functions/hasPrefix.md b/content/functions/hasPrefix.md
index c5ff35c12..a046098c7 100644
--- a/content/functions/hasPrefix.md
+++ b/content/functions/hasPrefix.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: []
+#tags: []
 ns:
 signature: ["hasPrefix STRING PREFIX"]
 workson: []
diff --git a/content/functions/haschildren.md b/content/functions/haschildren.md
index 4b5c12bdc..de6f148f3 100644
--- a/content/functions/haschildren.md
+++ b/content/functions/haschildren.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [menus]
+#tags: [menus]
 toc:
 ns:
 signature: ["HasChildren"]
diff --git a/content/functions/hasmenucurrent.md b/content/functions/hasmenucurrent.md
index 0ec51e90a..cce147031 100644
--- a/content/functions/hasmenucurrent.md
+++ b/content/functions/hasmenucurrent.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [menus]
+#tags: [menus]
 ns:
 signature: ["HasMenuCurrent"]
 workson: [menus]
diff --git a/content/functions/highlight.md b/content/functions/highlight.md
index 8e2f02ad9..7b05069c2 100644
--- a/content/functions/highlight.md
+++ b/content/functions/highlight.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [highlighting,pygments,code blocks,syntax]
+#tags: [highlighting,pygments,code blocks,syntax]
 ns:
 signature: ["highlight INPUT"]
 workson: []
diff --git a/content/functions/htmlEscape.md b/content/functions/htmlEscape.md
index c847fe0b9..995f2c889 100644
--- a/content/functions/htmlEscape.md
+++ b/content/functions/htmlEscape.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings, html]
+#tags: [strings, html]
 ns:
 signature: ["htmlEscape INPUT"]
 workson: []
diff --git a/content/functions/htmlUnescape.md b/content/functions/htmlUnescape.md
index 89f35408c..6ab4dca12 100644
--- a/content/functions/htmlUnescape.md
+++ b/content/functions/htmlUnescape.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: []
+#tags: []
 ns:
 signature: ["htmlUnescape INPUT"]
 workson: []
diff --git a/content/functions/humanize.md b/content/functions/humanize.md
index e62230c91..79b65a22f 100644
--- a/content/functions/humanize.md
+++ b/content/functions/humanize.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings,casing]
+#tags: [strings,casing]
 ns:
 signature: ["humanize INPUT"]
 workson: []
diff --git a/content/functions/i18n.md b/content/functions/i18n.md
index 67daa6aa8..e642daa74 100644
--- a/content/functions/i18n.md
+++ b/content/functions/i18n.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [internationalization,i18n,multilingual]
+#tags: [internationalization,i18n,multilingual]
 ns:
 signature: ["i18n KEY", "T KEY"]
 workson: []
diff --git a/content/functions/imageConfig.md b/content/functions/imageConfig.md
index cc8f56dad..7f88bff87 100644
--- a/content/functions/imageConfig.md
+++ b/content/functions/imageConfig.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [images]
+#tags: [images]
 ns:
 signature: ["imageConfig PATH"]
 workson: []
diff --git a/content/functions/in.md b/content/functions/in.md
index 6960cc385..fcd030c6f 100644
--- a/content/functions/in.md
+++ b/content/functions/in.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings]
+#tags: [strings]
 ns:
 signature: ["in SET ITEM"]
 workson: []
diff --git a/content/functions/index-function.md b/content/functions/index-function.md
index 09a4cfe65..433f5d818 100644
--- a/content/functions/index-function.md
+++ b/content/functions/index-function.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: []
+#tags: []
 ns:
 signature: ["index COLLECTION INDEX", "index COLLECTION KEY"]
 workson: []
diff --git a/content/functions/int.md b/content/functions/int.md
index eb1908ec7..574f24426 100644
--- a/content/functions/int.md
+++ b/content/functions/int.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings,integers]
+#tags: [strings,integers]
 ns:
 signature: ["int INPUT"]
 workson: []
diff --git a/content/functions/intersect.md b/content/functions/intersect.md
index 1f5b7fd04..a2a09cac7 100644
--- a/content/functions/intersect.md
+++ b/content/functions/intersect.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: []
+#tags: []
 ns:
 signature: ["intersect SET1 SET2"]
 workson: []
diff --git a/content/functions/ismenucurrent.md b/content/functions/ismenucurrent.md
index b25e74879..1db910ffb 100644
--- a/content/functions/ismenucurrent.md
+++ b/content/functions/ismenucurrent.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [menus]
+#tags: [menus]
 ns:
 signature: ["IsMenuCurrent"]
 workson: [menus]
diff --git a/content/functions/isset.md b/content/functions/isset.md
index 4f68686e6..d018e5bec 100644
--- a/content/functions/isset.md
+++ b/content/functions/isset.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: []
+#tags: []
 ns:
 signature: ["isset COLLECTION INDEX", "isset COLLECTION KEY"]
 workson: []
diff --git a/content/functions/jsonify.md b/content/functions/jsonify.md
index 7ada00731..0a1e7d8ec 100644
--- a/content/functions/jsonify.md
+++ b/content/functions/jsonify.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings,json]
+#tags: [strings,json]
 ns:
 signature: ["jsonify INPUT"]
 workson: []
diff --git a/content/functions/last.md b/content/functions/last.md
index 04b3d6231..f182de4f2 100644
--- a/content/functions/last.md
+++ b/content/functions/last.md
@@ -6,7 +6,7 @@ godocref:
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-tags: []
+#tags: []
 categories: [functions]
 menu:
   docs:
diff --git a/content/functions/len.md b/content/functions/len.md
index 714dc7b02..4fcfe18b1 100644
--- a/content/functions/len.md
+++ b/content/functions/len.md
@@ -7,7 +7,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-04-18
 categories: [functions]
-tags: []
+#tags: []
 ns:
 signature: ["len INPUT"]
 workson: [lists,taxonomies,terms]
diff --git a/content/functions/lower.md b/content/functions/lower.md
index 08d554c4c..8a51f7344 100644
--- a/content/functions/lower.md
+++ b/content/functions/lower.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings,casing]
+#tags: [strings,casing]
 ns:
 signature: ["lower INPUT"]
 workson: []
diff --git a/content/functions/markdownify.md b/content/functions/markdownify.md
index 76b0db186..3b2f62b12 100644
--- a/content/functions/markdownify.md
+++ b/content/functions/markdownify.md
@@ -6,7 +6,7 @@ godocref:
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-tags: [markdown,content]
+#tags: [markdown,content]
 categories: [functions]
 menu:
   docs:
diff --git a/content/functions/math.md b/content/functions/math.md
index 68f997753..3188e927f 100644
--- a/content/functions/math.md
+++ b/content/functions/math.md
@@ -6,7 +6,7 @@ godocref:
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-tags: [math, operators]
+#tags: [math, operators]
 categories: [functions]
 menu:
   docs:
diff --git a/content/functions/md5.md b/content/functions/md5.md
index d7cd8d99b..feef07d65 100644
--- a/content/functions/md5.md
+++ b/content/functions/md5.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: []
+#tags: []
 ns:
 signature: ["md5 INPUT"]
 workson: []
diff --git a/content/functions/now.md b/content/functions/now.md
index f4dd319ca..91664c70b 100644
--- a/content/functions/now.md
+++ b/content/functions/now.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [dates,time]
+#tags: [dates,time]
 ns:
 signature: ["now"]
 workson: []
diff --git a/content/functions/param.md b/content/functions/param.md
index 7ac2e7201..8be3694d5 100644
--- a/content/functions/param.md
+++ b/content/functions/param.md
@@ -6,7 +6,7 @@ godocref:
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-04-30
-tags: ["front matter"]
+#tags: ["front matter"]
 categories: [functions]
 menu:
   docs:
diff --git a/content/functions/partialCached.md b/content/functions/partialCached.md
index 1fb03dc8b..5f13e9070 100644
--- a/content/functions/partialCached.md
+++ b/content/functions/partialCached.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: []
+#tags: []
 ns:
 signature: ["partialCached LAYOUT INPUT [VARIANT...]"]
 workson: []
diff --git a/content/functions/plainify.md b/content/functions/plainify.md
index 2b0f109fd..482c2430c 100644
--- a/content/functions/plainify.md
+++ b/content/functions/plainify.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings]
+#tags: [strings]
 ns:
 signature: ["plainify INPUT"]
 workson: []
diff --git a/content/functions/pluralize.md b/content/functions/pluralize.md
index 1997ec43b..ce6da31dd 100644
--- a/content/functions/pluralize.md
+++ b/content/functions/pluralize.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings]
+#tags: [strings]
 ns:
 signature: ["pluralize INPUT"]
 workson: []
diff --git a/content/functions/printf.md b/content/functions/printf.md
index 73563ea0a..4b8dcdba9 100644
--- a/content/functions/printf.md
+++ b/content/functions/printf.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings]
+#tags: [strings]
 ns:
 signature: ["printf FORMAT INPUT"]
 workson: []
diff --git a/content/functions/querify.md b/content/functions/querify.md
index b97d327fb..824ab31a9 100644
--- a/content/functions/querify.md
+++ b/content/functions/querify.md
@@ -9,7 +9,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [urls]
+#tags: [urls]
 godocref:
 ns:
 signature: ["querify KEY VALUE [KEY VALUE]..."]
diff --git a/content/functions/range.md b/content/functions/range.md
index dbb1dd9e3..f22c0443c 100644
--- a/content/functions/range.md
+++ b/content/functions/range.md
@@ -6,11 +6,11 @@ godocref:
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-categories: [functions]
+categories: [functions,fundamentals]
 menu:
   docs:
     parent: "functions"
-tags: [iteration,fundamentals]
+#tags: [iteration]
 ns:
 signature: ["range COLLECTION"]
 workson: []
diff --git a/content/functions/readdir.md b/content/functions/readdir.md
index 73371a1a9..ba6872166 100644
--- a/content/functions/readdir.md
+++ b/content/functions/readdir.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [files]
+#tags: [files]
 ns:
 signature: ["readDir PATH"]
 workson: []
diff --git a/content/functions/readfile.md b/content/functions/readfile.md
index 66b2d9755..6fcc4c748 100644
--- a/content/functions/readfile.md
+++ b/content/functions/readfile.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [files]
+#tags: [files]
 ns:
 signature: ["readFile PATH"]
 workson: []
diff --git a/content/functions/ref.md b/content/functions/ref.md
index 771cd2c1f..4df3e734c 100644
--- a/content/functions/ref.md
+++ b/content/functions/ref.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [cross references, anchors]
+#tags: [cross references, anchors]
 ns:
 signature: ["ref PAGE CONTENT"]
 workson: []
diff --git a/content/functions/relLangURL.md b/content/functions/relLangURL.md
index 988c13cb7..8c5e3c252 100644
--- a/content/functions/relLangURL.md
+++ b/content/functions/relLangURL.md
@@ -6,7 +6,7 @@ godocref:
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-tags: [multilingual,i18n,urls]
+#tags: [multilingual,i18n,urls]
 categories: [functions]
 menu:
   docs:
diff --git a/content/functions/relref.md b/content/functions/relref.md
index 9dfba0ecb..2132b57e9 100644
--- a/content/functions/relref.md
+++ b/content/functions/relref.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [cross references, anchors]
+#tags: [cross references, anchors]
 ns:
 signature: ["relref PAGE CONTENT"]
 workson: []
diff --git a/content/functions/relurl.md b/content/functions/relurl.md
index b5424a245..33c5832cf 100644
--- a/content/functions/relurl.md
+++ b/content/functions/relurl.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [urls]
+#tags: [urls]
 ns:
 signature: ["relURL INPUT"]
 workson: []
diff --git a/content/functions/render.md b/content/functions/render.md
index 960b9bb20..bfed1e749 100644
--- a/content/functions/render.md
+++ b/content/functions/render.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [views]
+#tags: [views]
 ns:
 signature: ["render LAYOUT"]
 workson: []
diff --git a/content/functions/replace.md b/content/functions/replace.md
index 89d91f89d..933a508c3 100644
--- a/content/functions/replace.md
+++ b/content/functions/replace.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: []
+#tags: []
 ns:
 signature: ["replace INPUT OLD NEW"]
 workson: []
diff --git a/content/functions/replacere.md b/content/functions/replacere.md
index 1afd94d38..60b9112b5 100644
--- a/content/functions/replacere.md
+++ b/content/functions/replacere.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [regex]
+#tags: [regex]
 ns:
 signature: ["replaceRE PATTERN REPLACEMENT INPUT"]
 workson: []
diff --git a/content/functions/safeCSS.md b/content/functions/safeCSS.md
index 33845f5bb..746b05f54 100644
--- a/content/functions/safeCSS.md
+++ b/content/functions/safeCSS.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [style,css,strings]
+#tags: [style,css,strings]
 ns:
 signature: ["safeCSS INPUT"]
 workson: []
diff --git a/content/functions/safeHTML.md b/content/functions/safeHTML.md
index 8f6ae348a..b15975cb2 100644
--- a/content/functions/safeHTML.md
+++ b/content/functions/safeHTML.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings]
+#tags: [strings]
 ns:
 signature: ["safeHTML INPUT"]
 workson: []
diff --git a/content/functions/safeHTMLAttr.md b/content/functions/safeHTMLAttr.md
index 6fda3e321..eecc2c561 100644
--- a/content/functions/safeHTMLAttr.md
+++ b/content/functions/safeHTMLAttr.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings]
+#tags: [strings]
 ns:
 signature: ["safeHTMLAttr INPUT"]
 workson: []
diff --git a/content/functions/safeJS.md b/content/functions/safeJS.md
index 2d46b7db7..d2bb1a5f8 100644
--- a/content/functions/safeJS.md
+++ b/content/functions/safeJS.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings]
+#tags: [strings]
 ns:
 signature: ["safeJS INPUT"]
 workson: []
diff --git a/content/functions/safeURL.md b/content/functions/safeURL.md
index 7bf81d07a..01cb7f191 100644
--- a/content/functions/safeURL.md
+++ b/content/functions/safeURL.md
@@ -6,7 +6,7 @@ godocref: https://golang.org/pkg/html/template/#HTMLEscape
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-tags: [strings,urls]
+#tags: [strings,urls]
 categories: [functions]
 menu:
   docs:
diff --git a/content/functions/scratch.md b/content/functions/scratch.md
index 55b21cc56..4480cf7cc 100644
--- a/content/functions/scratch.md
+++ b/content/functions/scratch.md
@@ -6,7 +6,7 @@ godocref:
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-tags: [iteration]
+#tags: [iteration]
 categories: [functions]
 menu:
   docs:
diff --git a/content/functions/seq.md b/content/functions/seq.md
index fae119e6b..32ee1e7c9 100644
--- a/content/functions/seq.md
+++ b/content/functions/seq.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: []
+#tags: []
 ns:
 signature: ["seq LAST", "seq FIRST LAST", "seq FIRST INCREMENT LAST"]
 workson: []
diff --git a/content/functions/sha.md b/content/functions/sha.md
index a7ba296f3..a0d3d8d87 100644
--- a/content/functions/sha.md
+++ b/content/functions/sha.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [sha,checksum]
+#tags: [sha,checksum]
 ns:
 signature: ["sha1 INPUT", "sha256 INPUT"]
 workson: []
diff --git a/content/functions/shuffle.md b/content/functions/shuffle.md
index 63b859767..a44a4be96 100644
--- a/content/functions/shuffle.md
+++ b/content/functions/shuffle.md
@@ -6,7 +6,7 @@ godocref:
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-04-30
-tags: [ordering]
+#tags: [ordering]
 categories: [functions]
 menu:
   docs:
diff --git a/content/functions/singularize.md b/content/functions/singularize.md
index 3212764e3..58a3b1cc6 100644
--- a/content/functions/singularize.md
+++ b/content/functions/singularize.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings,singular]
+#tags: [strings,singular]
 ns:
 signature: ["singularize INPUT"]
 workson: []
diff --git a/content/functions/slice.md b/content/functions/slice.md
index 33a0b570d..a9793a4ae 100644
--- a/content/functions/slice.md
+++ b/content/functions/slice.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [slice, array, interface]
+#tags: [slice, array, interface]
 ns:
 signature: ["slice ITEM..."]
 workson: []
diff --git a/content/functions/slicestr.md b/content/functions/slicestr.md
index 0e1048dfc..55b640ef2 100644
--- a/content/functions/slicestr.md
+++ b/content/functions/slicestr.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings]
+#tags: [strings]
 ns:
 signature: ["slicestr STRING START [END]"]
 workson: []
diff --git a/content/functions/sort.md b/content/functions/sort.md
index e36ed56b5..594fa7baa 100644
--- a/content/functions/sort.md
+++ b/content/functions/sort.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [ordering,sorting,lists]
+#tags: [ordering,sorting,lists]
 ns:
 signature: []
 workson: [lists,taxonomies,terms,groups]
@@ -24,7 +24,7 @@ aliases: []
 
 ```toml
 +++
-tags: [ "tag3", "tag1", "tag2" ]
+#tags: [ "tag3", "tag1", "tag2" ]
 +++
 
 // Site config
diff --git a/content/functions/split.md b/content/functions/split.md
index 20a62d6bf..a90683e90 100644
--- a/content/functions/split.md
+++ b/content/functions/split.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings]
+#tags: [strings]
 ns:
 signature: ["split STRING DELIM"]
 workson: []
diff --git a/content/functions/string.md b/content/functions/string.md
index 44cc548dd..5f60731ee 100644
--- a/content/functions/string.md
+++ b/content/functions/string.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings]
+#tags: [strings]
 ns:
 signature: ["string INPUT"]
 workson: []
diff --git a/content/functions/substr.md b/content/functions/substr.md
index 5a67f0002..1c0688483 100644
--- a/content/functions/substr.md
+++ b/content/functions/substr.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings]
+#tags: [strings]
 aliases: []
 ns:
 signature: ["substr STRING START [LENGTH]"]
diff --git a/content/functions/time.md b/content/functions/time.md
index a29805ff9..e34052ee4 100644
--- a/content/functions/time.md
+++ b/content/functions/time.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [dates,time]
+#tags: [dates,time]
 ns:
 signature: ["time INPUT"]
 workson: []
diff --git a/content/functions/title.md b/content/functions/title.md
index e14994c7f..6e77f24d4 100644
--- a/content/functions/title.md
+++ b/content/functions/title.md
@@ -6,11 +6,11 @@ godocref:
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-categories: [functions]
+categories: [functions,fundamentals]
 menu:
   docs:
     parent: "functions"
-tags: [fundamentals,strings]
+#tags: [strings]
 ns:
 signature: ["title INPUT"]
 workson: []
diff --git a/content/functions/trim.md b/content/functions/trim.md
index 96f4dbdc4..453f13ffe 100644
--- a/content/functions/trim.md
+++ b/content/functions/trim.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings]
+#tags: [strings]
 ns:
 signature: ["trim INPUT CUTSET"]
 workson: []
diff --git a/content/functions/truncate.md b/content/functions/truncate.md
index 259649008..b1ff48536 100644
--- a/content/functions/truncate.md
+++ b/content/functions/truncate.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [strings]
+#tags: [strings]
 ns:
 signature: ["truncate SIZE INPUT", "truncate SIZE ELLIPSIS INPUT"]
 workson: []
diff --git a/content/functions/union.md b/content/functions/union.md
index 3a1065fc5..5dae9b851 100644
--- a/content/functions/union.md
+++ b/content/functions/union.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [filtering,lists]
+#tags: [filtering,lists]
 ns:
 signature: ["union SET1 SET2"]
 workson: []
diff --git a/content/functions/uniq.md b/content/functions/uniq.md
index 5d283266f..7e029a2e1 100644
--- a/content/functions/uniq.md
+++ b/content/functions/uniq.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [multilingual,i18n,urls]
+#tags: [multilingual,i18n,urls]
 ns:
 signature: ["uniq SET"]
 workson: []
diff --git a/content/functions/unix.md b/content/functions/unix.md
index 44148325b..11583552d 100644
--- a/content/functions/unix.md
+++ b/content/functions/unix.md
@@ -6,7 +6,7 @@ godocref: https://golang.org/search?q=Unix#Functions
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-tags: [dates,time]
+#tags: [dates,time]
 categories: [functions]
 menu:
   docs:
diff --git a/content/functions/upper.md b/content/functions/upper.md
index 33831acbb..2d30c2e39 100644
--- a/content/functions/upper.md
+++ b/content/functions/upper.md
@@ -6,7 +6,7 @@ godocref:
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-tags: []
+#tags: []
 categories: [functions]
 menu:
   docs:
diff --git a/content/functions/urlize.md b/content/functions/urlize.md
index c26e7627d..ed6fa749f 100644
--- a/content/functions/urlize.md
+++ b/content/functions/urlize.md
@@ -9,7 +9,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [urls,strings]
+#tags: [urls,strings]
 godocref:
 ns:
 signature: ["urlize INPUT"]
diff --git a/content/functions/where.md b/content/functions/where.md
index b9f08ccba..8fe413e62 100644
--- a/content/functions/where.md
+++ b/content/functions/where.md
@@ -10,7 +10,7 @@ categories: [functions]
 menu:
   docs:
     parent: "functions"
-tags: [filtering]
+#tags: [filtering]
 ns:
 signature: ["where COLLECTION KEY [OPERATOR] MATCH"]
 workson: [lists,taxonomies,terms,groups]
diff --git a/content/functions/with.md b/content/functions/with.md
index 4696d5d47..f01d34b0c 100644
--- a/content/functions/with.md
+++ b/content/functions/with.md
@@ -6,11 +6,11 @@ godocref:
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-03-12
-categories: [functions]
+categories: [functions,fundamentals]
 menu:
   docs:
     parent: "functions"
-tags: [conditionals,fundamentals]
+#tags: [conditionals]
 ns:
 signature: ["with INPUT"]
 workson: []
diff --git a/content/getting-started/_index.md b/content/getting-started/_index.md
index 2426b4bad..7946fdb26 100644
--- a/content/getting-started/_index.md
+++ b/content/getting-started/_index.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [getting started]
-tags: [usage,docs]
+#tags: [usage,docs]
 menu:
   docs:
     parent: "getting-started"
diff --git a/content/getting-started/configuration.md b/content/getting-started/configuration.md
index 999c90ac4..7373fee93 100644
--- a/content/getting-started/configuration.md
+++ b/content/getting-started/configuration.md
@@ -5,8 +5,8 @@ description: Hugo's defaults are often enough that no configuration is needed. H
 date: 2013-07-01
 publishdate: 2017-01-02
 lastmod: 2017-03-05
-categories: [getting started]
-tags: [configuration,fundamentals,toml,yaml,json]
+categories: [getting started,fundamentals]
+#tags: [configuration,toml,yaml,json]
 menu:
   docs:
     parent: "getting-started"
diff --git a/content/getting-started/directory-structure.md b/content/getting-started/directory-structure.md
index 1560c4273..bf4864a9b 100644
--- a/content/getting-started/directory-structure.md
+++ b/content/getting-started/directory-structure.md
@@ -5,8 +5,8 @@ description: Hugo's CLI scaffolds a project directory structure and then takes t
 date: 2017-01-02
 publishdate: 2017-02-01
 lastmod: 2017-03-09
-categories: [getting started]
-tags: [source, organization, directories,fundamentals]
+categories: [getting started,fundamentals]
+#tags: [source, organization, directories]
 menu:
   docs:
     parent: "getting-started"
diff --git a/content/getting-started/installing.md b/content/getting-started/installing.md
index 8d9de6621..55e9757dc 100644
--- a/content/getting-started/installing.md
+++ b/content/getting-started/installing.md
@@ -5,9 +5,9 @@ description: Install Hugo on macOS, Windows, Linux, FreeBSD, and on any machine
 date: 2016-11-01
 publishdate: 2016-11-01
 lastmod: 2017-02-20
-categories: [getting started]
+categories: [getting started,fundamentals]
 authors: ["Michael Henderson"]
-tags: [install,fundamentals,pc,windows,linux,macos,binary,tarball]
+#tags: [install,pc,windows,linux,macos,binary,tarball]
 menu:
   docs:
     parent: "getting-started"
diff --git a/content/getting-started/quick-start.md b/content/getting-started/quick-start.md
index befb316ba..07b9b2963 100644
--- a/content/getting-started/quick-start.md
+++ b/content/getting-started/quick-start.md
@@ -6,7 +6,7 @@ date: 2013-07-01
 publishdate: 2013-07-01
 lastmod: 2017-06-22
 categories: [getting started]
-tags: [quick start,usage]
+#tags: [quick start,usage]
 authors: [Shekhar Gulati, Ryan Watters]
 menu:
   docs:
diff --git a/content/getting-started/usage.md b/content/getting-started/usage.md
index f0cb0d145..29c21b305 100644
--- a/content/getting-started/usage.md
+++ b/content/getting-started/usage.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [getting started]
-tags: [usage,livereload,command line,flags]
+#tags: [usage,livereload,command line,flags]
 menu:
   docs:
     parent: "getting-started"
diff --git a/content/hosting-and-deployment/_index.md b/content/hosting-and-deployment/_index.md
index 52488d3d9..c83594197 100644
--- a/content/hosting-and-deployment/_index.md
+++ b/content/hosting-and-deployment/_index.md
@@ -6,7 +6,7 @@ date: 2016-11-01
 publishdate: 2016-11-01
 lastmod: 2016-11-01
 categories: [hosting and deployment]
-tags: []
+#tags: []
 menu:
   docs:
     parent: "hosting-and-deployment"
diff --git a/content/hosting-and-deployment/deployment-with-rsync.md b/content/hosting-and-deployment/deployment-with-rsync.md
index 7bdcc0d7d..42151af83 100644
--- a/content/hosting-and-deployment/deployment-with-rsync.md
+++ b/content/hosting-and-deployment/deployment-with-rsync.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [hosting and deployment]
-tags: [rysnc,deployment]
+#tags: [rysnc,deployment]
 authors: [Adrien Poupin]
 menu:
   docs:
diff --git a/content/hosting-and-deployment/deployment-with-wercker.md b/content/hosting-and-deployment/deployment-with-wercker.md
index e27d98ddb..5fd8ebd8b 100644
--- a/content/hosting-and-deployment/deployment-with-wercker.md
+++ b/content/hosting-and-deployment/deployment-with-wercker.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [hosting and deployment]
-tags: [wercker,deployment,github,git]
+#tags: [wercker,deployment,github,git]
 authors: [Arjen Schwarz, Samuel Debruyn]
 menu:
   docs:
diff --git a/content/hosting-and-deployment/hosting-on-bitbucket.md b/content/hosting-and-deployment/hosting-on-bitbucket.md
index f76fc4868..4b39b63ba 100644
--- a/content/hosting-and-deployment/hosting-on-bitbucket.md
+++ b/content/hosting-and-deployment/hosting-on-bitbucket.md
@@ -6,7 +6,7 @@ date: 2017-02-04
 publishdate: 2017-02-04
 lastmod: 2017-02-04
 categories: [hosting and deployment]
-tags: [hosting,bitbucket,deployment,aerobatic]
+#tags: [hosting,bitbucket,deployment,aerobatic]
 authors: [Jason Gowans]
 menu:
   docs:
diff --git a/content/hosting-and-deployment/hosting-on-firebase.md b/content/hosting-and-deployment/hosting-on-firebase.md
index 7ba8319c5..086b252ad 100644
--- a/content/hosting-and-deployment/hosting-on-firebase.md
+++ b/content/hosting-and-deployment/hosting-on-firebase.md
@@ -6,7 +6,7 @@ date: 2017-03-12
 publishdate: 2017-03-12
 lastmod: 2017-03-15
 categories: [hosting and deployment]
-tags: [hosting,firebase]
+#tags: [hosting,firebase]
 authors: [Michel Racic]
 menu:
   docs:
diff --git a/content/hosting-and-deployment/hosting-on-github.md b/content/hosting-and-deployment/hosting-on-github.md
index 78fccb2ee..68513b4c5 100644
--- a/content/hosting-and-deployment/hosting-on-github.md
+++ b/content/hosting-and-deployment/hosting-on-github.md
@@ -6,7 +6,7 @@ date: 2014-03-21
 publishdate: 2014-03-21
 lastmod: 2017-03-30
 categories: [hosting and deployment]
-tags: [github,git,deployment,hosting]
+#tags: [github,git,deployment,hosting]
 authors: [Spencer Lyon, Gunnar Morling]
 menu:
   docs:
diff --git a/content/hosting-and-deployment/hosting-on-gitlab.md b/content/hosting-and-deployment/hosting-on-gitlab.md
index ddf0190d5..47d552a84 100644
--- a/content/hosting-and-deployment/hosting-on-gitlab.md
+++ b/content/hosting-and-deployment/hosting-on-gitlab.md
@@ -6,7 +6,7 @@ date: 2016-06-23
 publishdate: 2016-06-23
 lastmod: 2016-06-23
 categories: [hosting and deployment]
-tags: [hosting,deployment,git,gitlab]
+#tags: [hosting,deployment,git,gitlab]
 authors: [Riku-Pekka Silvola]
 menu:
   docs:
diff --git a/content/hosting-and-deployment/hosting-on-netlify.md b/content/hosting-and-deployment/hosting-on-netlify.md
index 057176ea1..d4815d3ca 100644
--- a/content/hosting-and-deployment/hosting-on-netlify.md
+++ b/content/hosting-and-deployment/hosting-on-netlify.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-03-11
 categories: [hosting and deployment]
-tags: [netlify,hosting,deployment]
+#tags: [netlify,hosting,deployment]
 authors: [Ryan Watters, Seth MacLeod]
 menu:
   docs:
diff --git a/content/mailing-list.md b/content/mailing-list.md
index b2d715203..086f760d6 100644
--- a/content/mailing-list.md
+++ b/content/mailing-list.md
@@ -7,7 +7,7 @@ publishdate: 2017-02-01
 lastmod: 2017-02-01
 weight: 01	#rem
 categories: []
-tags: [mailing list, community]
+#tags: [mailing list, community]
 draft: true
 aliases: [/community/mailing-list/]
 toc: false
diff --git a/content/news/press-and-articles.md b/content/news/press-and-articles.md
index 5bb995100..9fbbe7e20 100644
--- a/content/news/press-and-articles.md
+++ b/content/news/press-and-articles.md
@@ -5,7 +5,7 @@ description: A list of articles, blog posts, or tutorials where Hugo is featured
 date: 2016-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-tags: [articles, tutorials, press]
+#tags: [articles, tutorials, press]
 categories: [news and articles]
 menu:
   main:
diff --git a/content/templates/404.md b/content/templates/404.md
index 9c6c438bd..7bb2a69fe 100644
--- a/content/templates/404.md
+++ b/content/templates/404.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-03-31
 categories: [templates]
-tags: [404, page not found]
+#tags: [404, page not found]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/_index.md b/content/templates/_index.md
index c611e2c49..ee9386687 100644
--- a/content/templates/_index.md
+++ b/content/templates/_index.md
@@ -11,7 +11,7 @@ menu:
     weight: 01
 weight: 01	#rem
 categories: [templates]
-tags: []
+#tags: []
 draft: false
 aliases: [/templates/overview/]
 toc: false
diff --git a/content/templates/alternatives.md b/content/templates/alternatives.md
index 0ba8a9120..91e5dc647 100644
--- a/content/templates/alternatives.md
+++ b/content/templates/alternatives.md
@@ -7,7 +7,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-20
 categories: [templates]
-tags: [amber,ace,templating languages]
+#tags: [amber,ace,templating languages]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/base.md b/content/templates/base.md
index fa20422e2..09394a800 100644
--- a/content/templates/base.md
+++ b/content/templates/base.md
@@ -6,8 +6,8 @@ godocref: https://golang.org/pkg/text/template/#example_Template_block
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-categories: [templates]
-tags: [blocks,base,fundamentals]
+categories: [templates,fundamentals]
+#tags: [blocks,base]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/data-templates.md b/content/templates/data-templates.md
index 7cec0bc54..a5607b44c 100644
--- a/content/templates/data-templates.md
+++ b/content/templates/data-templates.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-03-12
 categories: [templates]
-tags: [data,dynamic,csv,json,toml,yaml]
+#tags: [data,dynamic,csv,json,toml,yaml]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/files.md b/content/templates/files.md
index dc850df3e..672f3d538 100644
--- a/content/templates/files.md
+++ b/content/templates/files.md
@@ -7,7 +7,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [templates]
-tags: [files,directories]
+#tags: [files,directories]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/homepage.md b/content/templates/homepage.md
index 07974995c..228ab5980 100644
--- a/content/templates/homepage.md
+++ b/content/templates/homepage.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [templates]
-tags: [homepage]
+#tags: [homepage]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/internal.md b/content/templates/internal.md
index dfc49c1dd..2c50798d9 100644
--- a/content/templates/internal.md
+++ b/content/templates/internal.md
@@ -6,7 +6,7 @@ date: 2017-03-06
 publishdate: 2017-03-06
 lastmod: 2017-03-06
 categories: [templates]
-tags: [internal, analytics,]
+#tags: [internal, analytics,]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/introduction.md b/content/templates/introduction.md
index 4f3b80e27..ce3b025eb 100644
--- a/content/templates/introduction.md
+++ b/content/templates/introduction.md
@@ -6,8 +6,8 @@ godocref: https://golang.org/pkg/html/template/
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-25
-categories: [templates]
-tags: [go,fundamentals]
+categories: [templates,fundamentals]
+#tags: [go]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/lists.md b/content/templates/lists.md
index b03e4b1e5..872acd47a 100644
--- a/content/templates/lists.md
+++ b/content/templates/lists.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [templates]
-tags: [lists,sections,rss,taxonomies,terms]
+#tags: [lists,sections,rss,taxonomies,terms]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/lookup-order.md b/content/templates/lookup-order.md
index 198794fcb..37d994eed 100644
--- a/content/templates/lookup-order.md
+++ b/content/templates/lookup-order.md
@@ -6,8 +6,8 @@ godocref:
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-05-25
-categories: [templates]
-tags: [lookup,fundamentals]
+categories: [templates,fundamentals]
+#tags: [lookup]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/menu-templates.md b/content/templates/menu-templates.md
index 2360b7b40..0be6aaef0 100644
--- a/content/templates/menu-templates.md
+++ b/content/templates/menu-templates.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [templates]
-tags: [lists,sections,menus]
+#tags: [lists,sections,menus]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/ordering-and-grouping.md b/content/templates/ordering-and-grouping.md
index d6b88e9f7..6076c98a5 100644
--- a/content/templates/ordering-and-grouping.md
+++ b/content/templates/ordering-and-grouping.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [templates]
-tags: []
+#tags: []
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/output-formats.md b/content/templates/output-formats.md
index 0e6641c91..c1abd7238 100644
--- a/content/templates/output-formats.md
+++ b/content/templates/output-formats.md
@@ -6,7 +6,7 @@ date: 2017-03-22
 publishdate: 2017-03-22
 lastmod: 2017-03-22
 categories: [templates]
-tags: ["amp","outputs","rss"]
+#tags: ["amp","outputs","rss"]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/pagination.md b/content/templates/pagination.md
index 0f55781af..e81ce08f4 100644
--- a/content/templates/pagination.md
+++ b/content/templates/pagination.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [templates]
-tags: [lists,sections,pagination]
+#tags: [lists,sections,pagination]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/partials.md b/content/templates/partials.md
index 491851b09..639864b8a 100644
--- a/content/templates/partials.md
+++ b/content/templates/partials.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [templates]
-tags: [lists,sections,partials]
+#tags: [lists,sections,partials]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/robots.md b/content/templates/robots.md
index 90096b1d0..a131e0d00 100644
--- a/content/templates/robots.md
+++ b/content/templates/robots.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [templates]
-tags: [robots,search engines]
+#tags: [robots,search engines]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/rss.md b/content/templates/rss.md
index 402247183..38aea21ea 100644
--- a/content/templates/rss.md
+++ b/content/templates/rss.md
@@ -5,7 +5,7 @@ description: Hugo ships with its own RSS 2.0 template that requires almost no co
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-tags: [rss, xml]
+#tags: [rss, xml]
 categories: [templates]
 menu:
   docs:
diff --git a/content/templates/section-templates.md b/content/templates/section-templates.md
index deab7068c..6ec19168f 100644
--- a/content/templates/section-templates.md
+++ b/content/templates/section-templates.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [templates]
-tags: [lists,sections]
+#tags: [lists,sections]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/shortcode-templates.md b/content/templates/shortcode-templates.md
index a73f5974d..74d57a688 100644
--- a/content/templates/shortcode-templates.md
+++ b/content/templates/shortcode-templates.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [templates]
-tags: [shortcodes]
+#tags: [shortcodes]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/single-page-templates.md b/content/templates/single-page-templates.md
index 3ecaca755..63f35f4d1 100644
--- a/content/templates/single-page-templates.md
+++ b/content/templates/single-page-templates.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-04-06
 categories: [templates]
-tags: [page]
+#tags: [page]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/sitemap-template.md b/content/templates/sitemap-template.md
index cd992f7f9..b87856b9a 100644
--- a/content/templates/sitemap-template.md
+++ b/content/templates/sitemap-template.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [templates]
-tags: [sitemap, xml]
+#tags: [sitemap, xml]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/taxonomy-templates.md b/content/templates/taxonomy-templates.md
index 1514d63b8..fc71a7198 100644
--- a/content/templates/taxonomy-templates.md
+++ b/content/templates/taxonomy-templates.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [templates]
-tags: [taxonomies,metadata,front matter,terms]
+#tags: [taxonomies,metadata,front matter,terms]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/template-debugging.md b/content/templates/template-debugging.md
index 2379431ae..208259f7f 100644
--- a/content/templates/template-debugging.md
+++ b/content/templates/template-debugging.md
@@ -7,7 +7,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [templates]
-tags: [debugging,troubleshooting]
+#tags: [debugging,troubleshooting]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/views.md b/content/templates/views.md
index a7d1afbbc..d837bee35 100644
--- a/content/templates/views.md
+++ b/content/templates/views.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [templates]
-tags: [views]
+#tags: [views]
 menu:
   docs:
     parent: "templates"
diff --git a/content/themes/_index.md b/content/themes/_index.md
index 806597394..dcc837d35 100644
--- a/content/themes/_index.md
+++ b/content/themes/_index.md
@@ -12,7 +12,7 @@ menu:
 weight: 01
 sections_weight: 01
 categories: [themes]
-tags: [themes,introduction,overview]
+#tags: [themes,introduction,overview]
 draft: false
 aliases: [/themes/overview/]
 toc: false
diff --git a/content/themes/creating.md b/content/themes/creating.md
index 364b6b420..5f921d303 100644
--- a/content/themes/creating.md
+++ b/content/themes/creating.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [themes]
-tags: [themes, source, organization, directories]
+#tags: [themes, source, organization, directories]
 menu:
   docs:
     parent: "themes"
diff --git a/content/themes/customizing.md b/content/themes/customizing.md
index c1e72753a..239310739 100644
--- a/content/themes/customizing.md
+++ b/content/themes/customizing.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [themes]
-tags: [themes, source, organization, directories]
+#tags: [themes, source, organization, directories]
 menu:
   docs:
     parent: "themes"
diff --git a/content/themes/installing-and-using-themes.md b/content/themes/installing-and-using-themes.md
index 3472855fb..05294653e 100644
--- a/content/themes/installing-and-using-themes.md
+++ b/content/themes/installing-and-using-themes.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [themes]
-tags: [install, themes, source, organization, directories,usage]
+#tags: [install, themes, source, organization, directories,usage]
 menu:
   docs:
     parent: "themes"
diff --git a/content/tools/_index.md b/content/tools/_index.md
index dbcbfa13a..7c3e66aa8 100644
--- a/content/tools/_index.md
+++ b/content/tools/_index.md
@@ -6,7 +6,7 @@ date: 2016-12-05
 publishdate: 2016-12-05
 lastmod: 2017-02-26
 categories: [developer tools]
-tags: []
+#tags: []
 menu:
   docs:
     parent: "tools"
diff --git a/content/tools/editors.md b/content/tools/editors.md
index 282dc4ef6..f98a7d36c 100644
--- a/content/tools/editors.md
+++ b/content/tools/editors.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [developer tools]
-tags: [editor, plug-ins]
+#tags: [editor, plug-ins]
 menu:
   docs:
     parent: "tools"
diff --git a/content/tools/frontends.md b/content/tools/frontends.md
index 6ca4d6e0f..848fa468f 100644
--- a/content/tools/frontends.md
+++ b/content/tools/frontends.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [developer tools]
-tags: [frontend,gui]
+#tags: [frontend,gui]
 menu:
   docs:
     parent: "tools"
diff --git a/content/tools/migrations.md b/content/tools/migrations.md
index ee889b29c..489fbd5b4 100644
--- a/content/tools/migrations.md
+++ b/content/tools/migrations.md
@@ -5,7 +5,7 @@ description: A list of community-developed tools for migrating from your existin
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-tags: [migrations,jekyll,wordpress,drupal,ghost,contentful]
+#tags: [migrations,jekyll,wordpress,drupal,ghost,contentful]
 menu:
   docs:
     parent: "tools"
diff --git a/content/tools/other.md b/content/tools/other.md
index 0533e8808..5f3036a9c 100644
--- a/content/tools/other.md
+++ b/content/tools/other.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [developer tools]
-tags: [frontend,gui]
+#tags: [frontend,gui]
 menu:
   docs:
     parent: "tools"
diff --git a/content/tools/search.md b/content/tools/search.md
index d93a61f2b..dac345a13 100644
--- a/content/tools/search.md
+++ b/content/tools/search.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-26
 categories: [developer tools]
-tags: [search,tools]
+#tags: [search,tools]
 menu:
   docs:
     parent: "tools"
diff --git a/content/tools/starter-kits.md b/content/tools/starter-kits.md
index 30b5c55c2..1f30bf873 100644
--- a/content/tools/starter-kits.md
+++ b/content/tools/starter-kits.md
@@ -5,7 +5,7 @@ description: A list of community-developed projects designed to help you get up
 date: 2017-02-22
 publishdate: 2017-02-01
 lastmod: 2017-02-22
-tags: [starters,assets,pipeline]
+#tags: [starters,assets,pipeline]
 menu:
   docs:
     parent: "tools"
diff --git a/content/tools/syntax-highlighting.md b/content/tools/syntax-highlighting.md
index 556618169..6d97665a5 100644
--- a/content/tools/syntax-highlighting.md
+++ b/content/tools/syntax-highlighting.md
@@ -5,7 +5,7 @@ description: Hugo provides server-side syntax highlighting via Pygments and, lik
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-tags: [highlighting,pygments,code blocks,syntax]
+#tags: [highlighting,pygments,code blocks,syntax]
 categories: [developer tools]
 menu:
   docs:
diff --git a/content/troubleshooting/accented-characters-in-urls.md b/content/troubleshooting/accented-characters-in-urls.md
index 68d370877..1b2340ee2 100644
--- a/content/troubleshooting/accented-characters-in-urls.md
+++ b/content/troubleshooting/accented-characters-in-urls.md
@@ -5,7 +5,7 @@ description: If you're having trouble with special characters in your taxonomies
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-tags: [urls,multilingual,special characters]
+#tags: [urls,multilingual,special characters]
 categories: [troubleshooting]
 menu:
   docs:
diff --git a/content/troubleshooting/build-performance.md b/content/troubleshooting/build-performance.md
index 23cc759b0..89225cbc5 100644
--- a/content/troubleshooting/build-performance.md
+++ b/content/troubleshooting/build-performance.md
@@ -5,7 +5,7 @@ description:
 date: 2017-03-12
 publishdate: 2017-03-12
 lastmod: 2017-03-12
-tags: [performance, build]
+#tags: [performance, build]
 categories: [troubleshooting]
 menu:
   docs:
diff --git a/content/troubleshooting/eof-error.md b/content/troubleshooting/eof-error.md
index 3403ed30a..1d372fa16 100644
--- a/content/troubleshooting/eof-error.md
+++ b/content/troubleshooting/eof-error.md
@@ -9,7 +9,7 @@ categories: [troubleshooting]
 menu:
   docs:
     parent: "troubleshooting"
-tags: [eof, end of file, error, faqs]
+#tags: [eof, end of file, error, faqs]
 draft: false
 weight:
 aliases: [/troubleshooting/strange-eof-error/]
diff --git a/content/variables/_index.md b/content/variables/_index.md
index 747bf9ea8..8e53af553 100644
--- a/content/variables/_index.md
+++ b/content/variables/_index.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [variables and params]
-tags: [variables,params,values,globals]
+#tags: [variables,params,values,globals]
 draft: false
 menu:
   docs:
diff --git a/content/variables/files.md b/content/variables/files.md
index 7aa197c43..a3bae7d04 100644
--- a/content/variables/files.md
+++ b/content/variables/files.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [variables and params]
-tags: [files]
+#tags: [files]
 draft: false
 menu:
   docs:
diff --git a/content/variables/git.md b/content/variables/git.md
index 967af8c2b..d0af56ded 100644
--- a/content/variables/git.md
+++ b/content/variables/git.md
@@ -6,7 +6,7 @@ date: 2017-03-12
 publishdate: 2017-03-12
 lastmod: 2017-03-12
 categories: [variables and params]
-tags: [git]
+#tags: [git]
 draft: false
 menu:
   docs:
diff --git a/content/variables/hugo.md b/content/variables/hugo.md
index e508d7d06..142b00920 100644
--- a/content/variables/hugo.md
+++ b/content/variables/hugo.md
@@ -6,7 +6,7 @@ date: 2017-03-12
 publishdate: 2017-03-12
 lastmod: 2017-03-12
 categories: [variables and params]
-tags: [hugo,generator]
+#tags: [hugo,generator]
 draft: false
 menu:
   docs:
diff --git a/content/variables/menus.md b/content/variables/menus.md
index 7845654e0..d497eddac 100644
--- a/content/variables/menus.md
+++ b/content/variables/menus.md
@@ -6,7 +6,7 @@ date: 2017-03-12
 publishdate: 2017-03-12
 lastmod: 2017-03-12
 categories: [variables and params]
-tags: [menus]
+#tags: [menus]
 draft: false
 menu:
   docs:
diff --git a/content/variables/page.md b/content/variables/page.md
index 7a074c664..166053ec3 100644
--- a/content/variables/page.md
+++ b/content/variables/page.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [variables and params]
-tags: [pages]
+#tags: [pages]
 draft: false
 menu:
   docs:
@@ -179,7 +179,7 @@ Any other value defined in the front matter in a content file, including taxonom
 title: My First Post
 date: date: 2017-02-20T15:26:23-06:00
 categories: [one]
-tags: [two,three,four]
+#tags: [two,three,four]
 ```
 
 With the above front matter, the `tags` and `categories` taxonomies are accessible via the following:
diff --git a/content/variables/shortcodes.md b/content/variables/shortcodes.md
index 867ab8888..c3a3f920b 100644
--- a/content/variables/shortcodes.md
+++ b/content/variables/shortcodes.md
@@ -6,7 +6,7 @@ date: 2017-03-12
 publishdate: 2017-03-12
 lastmod: 2017-03-12
 categories: [variables and params]
-tags: [shortcodes]
+#tags: [shortcodes]
 draft: false
 menu:
   docs:
diff --git a/content/variables/site.md b/content/variables/site.md
index 47358e26f..d037cb065 100644
--- a/content/variables/site.md
+++ b/content/variables/site.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [variables and params]
-tags: [global,site]
+#tags: [global,site]
 draft: false
 menu:
   docs:
diff --git a/content/variables/sitemap.md b/content/variables/sitemap.md
index 5155c931d..da4c12e74 100644
--- a/content/variables/sitemap.md
+++ b/content/variables/sitemap.md
@@ -6,7 +6,7 @@ date: 2017-03-12
 publishdate: 2017-03-12
 lastmod: 2017-03-12
 categories: [variables and params]
-tags: [sitemap]
+#tags: [sitemap]
 draft: false
 menu:
   docs:
diff --git a/content/variables/taxonomy.md b/content/variables/taxonomy.md
index 4e30f2220..e2cd82284 100644
--- a/content/variables/taxonomy.md
+++ b/content/variables/taxonomy.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [variables and params]
-tags: [taxonomies,terms]
+#tags: [taxonomies,terms]
 draft: false
 menu:
   docs:
diff --git a/themes/gohugoioTheme b/themes/gohugoioTheme
index 09edd3733..c4e54034d 160000
--- a/themes/gohugoioTheme
+++ b/themes/gohugoioTheme
@@ -1 +1 @@
-Subproject commit 09edd373302f24e38f4a18aa61375155f2aa328a
+Subproject commit c4e54034d92c9b7a888739c420e3130552966c0c