diff --git a/content/about-hugo/_index.md b/content/about-hugo/_index.md
index b2d48cd5d..74b7ec273 100644
--- a/content/about-hugo/_index.md
+++ b/content/about-hugo/_index.md
@@ -16,7 +16,7 @@ notes:
## What is Hugo?
-Hugo is a general-purpose website framework. Technically speaking, Hugo is a [static site generator][]. Unlike systems that dynamically build a page with each visitor request, Hugo builds pages when you create your content. Since websites are viewed far more often than they are edited, Hugo is designed to provide an optimal viewing experience for your website's end users and an ideal writing experience for authors.
+Hugo is a general-purpose website framework. Technically speaking, Hugo is a [static site generator][]. Unlike systems that dynamically build a page with each visitor request, Hugo builds pages when you create or update your content. Since websites are viewed far more often than they are edited, Hugo is designed to provide an optimal viewing experience for your website's end users and an ideal writing experience for website authors.
Websites built with Hugo are extremely fast and secure. Hugo sites can be hosted anywhere, including [Heroku][], [GoDaddy][], [DreamHost][], [GitHub Pages][], [Surge][], [Aerobatic][], [Firebase][], [Google Cloud Storage][], [Amazon S3][], [rackspace][], [Azure][], and [CloudFront][] and work well with CDNs. Hugo sites run without the need for a database or dependencies on expensive runtimes like Ruby, Python, or PHP.
diff --git a/content/about-hugo/benefits-of-static.md b/content/about-hugo/benefits-of-static.md
index 7a0fbe725..3c0bb67a2 100644
--- a/content/about-hugo/benefits-of-static.md
+++ b/content/about-hugo/benefits-of-static.md
@@ -1,7 +1,7 @@
---
title: The Benefits of Static
linktitle: The Benefits of Static
-description:
+description: Learn why static site generators have become so popular. Benefits include performance, security, ease of use, and exportability of content.
date: 2017-02-01
publishdate: 2017-02-01
lastmod: 2017-02-01
diff --git a/content/about-hugo/hugo-features.md b/content/about-hugo/hugo-features.md
index dd782931c..66b72501f 100644
--- a/content/about-hugo/hugo-features.md
+++ b/content/about-hugo/hugo-features.md
@@ -1,7 +1,7 @@
---
title: Hugo Features
linktitle:
-description: Hugo is the fastest static site generator and includes a powerful templating language, making it the appropriate choice for websites of all sizes and types.
+description: Hugo is the world's fastest static site generator, includes a powerful templating language, and works for websites of all sizes and types.
date: 2017-02-01
publishdate: 2017-02-01
lastmod: 2017-02-01
diff --git a/content/about-hugo/license.md b/content/about-hugo/license.md
index d6c85a7d8..d0bb69bfb 100644
--- a/content/about-hugo/license.md
+++ b/content/about-hugo/license.md
@@ -1,7 +1,7 @@
---
title: Apache License
linktitle:
-description: Information on the Hugo license.
+description: Hugo v0.15 and later are released under the Apache 2.0 license. Earlier version of Hugo were released under the Simple Public License.
date: 2016-02-01
publishdate: 2016-02-01
lastmod: 2016-02-01
diff --git a/content/about-hugo/roadmap.md b/content/about-hugo/roadmap.md
index e4792577a..172d4fb3e 100644
--- a/content/about-hugo/roadmap.md
+++ b/content/about-hugo/roadmap.md
@@ -1,7 +1,7 @@
---
title: Roadmap
linktitle:
-description: Information on the Hugo license.
+description: Take a look at what's in the pipeline for future versions of the Hugo project, as well related GitHub issues and Hugo Forum discussions for new features.
date: 2017-02-01
publishdate: 2017-02-01
lastmod: 2017-02-01
diff --git a/content/about-hugo/why-i-built-hugo.md b/content/about-hugo/why-i-built-hugo.md
index b8be348fd..97bc227ec 100644
--- a/content/about-hugo/why-i-built-hugo.md
+++ b/content/about-hugo/why-i-built-hugo.md
@@ -1,7 +1,7 @@
---
title: Why I Built Hugo
linktitle:
-description: Hugo is the fastest of all static site generators and includes features
+description: Learn why Steve Francia (@spf13) decided to ditch his previous content publishing workflow and develop Hugo in Golang.
date: 2017-02-01
publishdate: 2017-02-01
lastmod: 2017-02-01
@@ -13,19 +13,13 @@ toc: false
notes:
---
-I wrote Hugo ultimately for a few reasons. First, I was disappointed with
-WordPress, my then website solution. With it, I couldn't create
-content as efficiently as I wanted to.
+I wrote Hugo ultimately for a few reasons. First, I was disappointed with WordPress, my then website solution. With it, I couldn't create content as efficiently as I wanted to.
WordPress sites rendered slowly and required I be online to write posts. WordPress is known for its constant security updates and horror stories of hacked blogs. I hated writing content in HTML instead of the much simpler Markdown. Overall, I felt like WordPress hindered more than helped. It kept me from writing great content.
I looked at existing static site generators like [Jekyll][], [Middleman][], and [Nanoc][]. All had complicated installation dependencies and an unacceptably long time to render my blog with hundreds of posts. I wanted a framework that would give me rapid feedback while making changes to the templates, and the 5-minute-plus render times were just too slow. In general, the static site generators were very blog-minded and didn't provide for other content types and flexible URLs.
-I wanted to develop a fast and full-featured website framework without any
-dependencies. The [Go language][] seemed to have all the features I needed
-in a language. I began developing Hugo in Go and fell in love with the
-language. I hope you will enjoy using Hugo (and [contributing to it][]) as much
-as I have writing it.
+I wanted to develop a fast and full-featured website framework without any dependencies. The [Go language][] seemed to have all the features I needed in a language. I began developing Hugo in Go and fell in love with the language. I hope you will enjoy using Hugo (and [contributing to it][]) as much as I have writing it.
―Steve Francia ([@spf13][])
diff --git a/content/content-management/_index.md b/content/content-management/_index.md
index 9a051eba0..a1fb2e209 100644
--- a/content/content-management/_index.md
+++ b/content/content-management/_index.md
@@ -1,7 +1,7 @@
---
title: "Content Management"
linktitle: "Content Management"
-description: An introduction to how Hugo helps you manage content.
+description: Hugo makes managing large static sites easy with support for archetypes, content types, menus, cross references, summaries, and more.
date: 2017-02-01
publishdate: 2017-02-01
lastmod: 2017-02-01
diff --git a/content/functions/context.md b/content/functions/context.md
index 166f1e988..dbfd34c90 100644
--- a/content/functions/context.md
+++ b/content/functions/context.md
@@ -6,11 +6,11 @@ godocref: https://golang.org/pkg/text/template/#hdr-Variables
date: 2017-02-01
publishdate: 2017-02-01
lastmod: 2017-02-01
-tags: [fundamentals]
+tags: [fundamentals,iteration]
categories: [functions]
weight: 02
toc: false
draft: false
-aliases: []
+aliases: [/functions/dot/,/functions/the-dot/]
notes:
---
\ No newline at end of file
diff --git a/content/project-organization/configuration.md b/content/project-organization/configuration.md
index cb5b10f55..8db26c2c0 100644
--- a/content/project-organization/configuration.md
+++ b/content/project-organization/configuration.md
@@ -1,7 +1,7 @@
---
title: Configuration
linktitle:
-description: Scaffolding new projects, configuration, and source organization.
+description: Your configuration can include precise directions to Hugo regarding how it should render your website.
date: 2017-01-02
publishdate: 2017-01-02
lastmod: 2017-01-02
diff --git a/content/templates/partial-templates.md b/content/templates/partial-templates.md
index ca18bb6b3..c550877b7 100644
--- a/content/templates/partial-templates.md
+++ b/content/templates/partial-templates.md
@@ -11,6 +11,13 @@ tags: [lists,sections,partials]
draft: false
slug:
aliases: [/templates/partials/]
-toc: false
+toc: true
notes:
---
+
+## Partials vs Templates
+
+## Built-in Partials
+
+* Google Analytics
+* Disqus Comments
diff --git a/content/variables-and-params/page-variables.md b/content/variables-and-params/page-variables.md
index e844f98d7..7d8149df9 100644
--- a/content/variables-and-params/page-variables.md
+++ b/content/variables-and-params/page-variables.md
@@ -17,3 +17,5 @@ notes:
`.IsNamedParams` (reference to shortcodes)
`.TableOfContents` (reference to content/table-of-contents)
+
+
diff --git a/dev-and-design-resources/tutorials-2.afdesign b/dev-and-design-resources/tutorials-2.afdesign
new file mode 100644
index 000000000..e71cc5747
Binary files /dev/null and b/dev-and-design-resources/tutorials-2.afdesign differ
diff --git a/themes/hugodocs/layouts/_default/terms.html b/themes/hugodocs/layouts/_default/terms.html
index 81a568851..2ea362f2f 100644
--- a/themes/hugodocs/layouts/_default/terms.html
+++ b/themes/hugodocs/layouts/_default/terms.html
@@ -5,12 +5,24 @@
