diff --git a/content/content-management/_index.md b/content/content-management/_index.md
index 330168dba..08d1ff961 100644
--- a/content/content-management/_index.md
+++ b/content/content-management/_index.md
@@ -1,6 +1,6 @@
---
-title: "Content Management: Introduction"
-linktitle: "Content Management: Introduction"
+title: "Content Management"
+linktitle: "Content Management"
description: An introduction to how Hugo expects you to organize your content.
date: 2017-02-01
publishdate: 2017-02-01
diff --git a/content/content-management/content-types.md b/content/content-management/content-types.md
index 4d7eca723..01b133ff5 100644
--- a/content/content-management/content-types.md
+++ b/content/content-management/content-types.md
@@ -20,10 +20,7 @@ A good example of when multiple types are needed is to look at [Tumblr][]. A pie
## Assigning a content type
-Hugo assumes that your site will be organized into [sections](/content/sections/)
-and each section will use the corresponding type. If you are taking advantage of
-this, then each new piece of content you place into a section will automatically
-inherit the type.
+Hugo assumes that your site will be organized into [sections][] and each section will use the corresponding type. If you are taking advantage of this, then each new piece of content you place into a section will automatically inherit the type.
Alternatively, you can set the type in the meta data under the key "`type`".
@@ -65,6 +62,7 @@ Create a file called type.md in the `/archetypes` director
More details about archetypes can be found at the [archetypes docs](/content/archetypes/).
[archetypes]: /content-management/archetypes/
+[sections]: /content-sections/
[front matter]: /content-management/front-matter/
[list of contents on a single page]: /templates/list-and-section-templates/
[template]: /templates/
diff --git a/content/functions/_index.md b/content/functions/_index.md
index e8ad3ca74..bf1ded966 100644
--- a/content/functions/_index.md
+++ b/content/functions/_index.md
@@ -1,6 +1,6 @@
---
-title: Overview
-linktitle: Overview
+title: Functions
+linktitle: Functions
description: Comprehensive list of Hugo templating functions, including basic and advanced usage examples.
date: 2017-02-01
publishdate: 2017-02-01
diff --git a/content/getting-started/_index.md b/content/getting-started/_index.md
index 9cf486d9b..31492ebf4 100644
--- a/content/getting-started/_index.md
+++ b/content/getting-started/_index.md
@@ -1,6 +1,6 @@
---
-title: "Getting Started: Using the Docs"
-linktitle: "Getting Started: Using the Docs"
+title: "Getting Started"
+linktitle: "Getting Started"
description: Quick start and guides for installing Hugo on your preferred operating system.
date: 2017-02-01
publishdate: 2017-02-01
diff --git a/content/hosting-and-deployment/_index.md b/content/hosting-and-deployment/_index.md
index 777cb8371..6a0f12c00 100644
--- a/content/hosting-and-deployment/_index.md
+++ b/content/hosting-and-deployment/_index.md
@@ -1,5 +1,5 @@
---
-title: Overview
+title: Hosting and Deployment
linktitle:
description: Site builds, automated deployments, and popular hosting solutions.
date: 2016-11-01
diff --git a/content/news-and-articles/_index.md b/content/news-and-articles/_index.md
index d78415283..defbea016 100644
--- a/content/news-and-articles/_index.md
+++ b/content/news-and-articles/_index.md
@@ -1,5 +1,5 @@
---
-title: Overview
+title: News and Articles
linktitle:
description: Articles where Hugo is featured, as well as news and updates on the project itself.
date: 2017-02-01
@@ -7,6 +7,7 @@ publishdate: 2017-02-01
lastmod: 2017-02-01
tags: []
categories: []
+hidesectioncontents: false
weight: 01
draft: false
slug:
diff --git a/content/project-organization/_index.md b/content/project-organization/_index.md
index 016987d95..b56f10b35 100644
--- a/content/project-organization/_index.md
+++ b/content/project-organization/_index.md
@@ -1,6 +1,6 @@
---
-title: "Project Organization: New Sites"
-linktitle: "Project Organization: New Sites"
+title: "Project Organization"
+linktitle: "Project Organization"
description: Scaffolding new projects, configuration, and source organization.
date: 2016-11-01
publishdate: 2016-11-01
@@ -9,6 +9,7 @@ weight: 01
tags: []
categories: []
draft: false
+hidesectioncontents: false
slug:
aliases:
notes:
diff --git a/content/site-showcase/_index.md b/content/site-showcase/_index.md
index 036b43ef2..9c8b3c961 100644
--- a/content/site-showcase/_index.md
+++ b/content/site-showcase/_index.md
@@ -9,6 +9,7 @@ tags: []
categories: []
weight: 01
draft: false
+hidesectioncontents: false
slug:
aliases: []
notes:
diff --git a/content/templates/_index.md b/content/templates/_index.md
index 29d2e0730..20c1aae72 100644
--- a/content/templates/_index.md
+++ b/content/templates/_index.md
@@ -7,6 +7,7 @@ publishdate: 2017-02-01
lastmod: 2017-02-01
weight: 01
tags: []
+hidesectioncontents: false
draft: false
slug:
aliases:
diff --git a/content/troubleshooting/_index.md b/content/troubleshooting/_index.md
index b80920183..d59682951 100644
--- a/content/troubleshooting/_index.md
+++ b/content/troubleshooting/_index.md
@@ -7,6 +7,7 @@ publishdate: 2017-02-01
lastmod: 2017-02-01
weight:
draft: false
+hidesectioncontents: false
slug:
aliases: [/troubleshooting/faqs/,/faqs/]
notes:
diff --git a/content/tutorials/_index.md b/content/tutorials/_index.md
index 9b3b44853..e1d0fd32a 100644
--- a/content/tutorials/_index.md
+++ b/content/tutorials/_index.md
@@ -8,6 +8,7 @@ lastmod: 2017-02-01
tags: [tutorials,learning]
weight:
draft: false
+hidesectioncontents: false
slug:
aliases:
notes:
diff --git a/content/variables-and-params/_index.md b/content/variables-and-params/_index.md
index 6d2bb95f0..751850a23 100644
--- a/content/variables-and-params/_index.md
+++ b/content/variables-and-params/_index.md
@@ -9,6 +9,7 @@ weight: 01
draft: false
slug:
aliases: []
+hidesectioncontents: false
notes:
---
diff --git a/themes/hugodocs/layouts/partials/content-footer.html b/themes/hugodocs/layouts/partials/content-footer.html
index dd15c4014..65d284d11 100644
--- a/themes/hugodocs/layouts/partials/content-footer.html
+++ b/themes/hugodocs/layouts/partials/content-footer.html
@@ -1,14 +1,14 @@