More copy edits

content/about/features.md

@@ -52,7 +52,7 @@ toc: true
 * Integrated [Disqus][] comment support
 * Integrated [Google Analytics][] support
 * Automatic [RSS][] creation
-* Support for [Golang][], [Amber], and [Ace][] HTML templates
+* Support for [Go][], [Amber], and [Ace][] HTML templates
 * [Syntax highlighting][] powered by [Pygments][]
 
 See what's coming next in the [Hugo roadmap][].
@@ -67,7 +67,7 @@ See what's coming next in the [Hugo roadmap][].
 [Extremely fast]: https://github.com/bep/hugo-benchmark
 [front matter]: /content-management/front-matter/
 [functions]: /functions/
-[Golang]: http://golang.org/pkg/html/template/
+[Go]: http://golang.org/pkg/html/template/
 [Google Analytics]: https://google-analytics.com/
 [homepage]: /templates/homepage/
 [hostanywhere]: /hosting-and-deployment/

content/content-management/archetypes.md

@@ -21,6 +21,9 @@ toc: true
 {{% note %}}
 This section is outdated, see https://github.com/gohugoio/hugoDocs/issues/11
 {{% /note %}}
+{{% todo %}}
+See above
+{{% /todo %}}
 
 ## What are Archetypes?
 
@@ -63,7 +66,7 @@ In this example, if you do not already have a `content/posts` directory, Hugo wi
 The  auto-populated fields are worth examining:
 
 * `title` is generated from the new content's filename (i.e. in this case, `my-first-post` becomes `"my first post"`)
-* `date` and `title` are the variables that ship with Hugo and are therefore included in *all* content files created with the Hugo CLI. `date` is generated in [RFC 3339 format][] by way of Golang's [`now()`][] function, which returns the current time.
+* `date` and `title` are the variables that ship with Hugo and are therefore included in *all* content files created with the Hugo CLI. `date` is generated in [RFC 3339 format][] by way of Go's [`now()`][] function, which returns the current time.
 * The third variable, `draft = true`, is *not* inherited by your default or custom archetypes but is included in Hugo's automatically scaffolded `default.md` archetype for convenience.
 
 Three variables per content file are often not enough for effective content management of larger websites. Luckily, Hugo provides a simple mechanism for extending the number of variables through custom archetypes, as well as default archetypes to keep content creation DRY.

content/content-management/formats.md

@@ -203,14 +203,14 @@ With this setup, everything is in place for a natural usage of MathJax on pages
 
 ## Additional Formats Through External Helpers
 
-Since 0.14, Hugo has defined a new concept called _external helpers_. It means that you can write your content using [Asciidoc][ascii], [reStructuredText][rest], or Emacs org-mode. If you have files with associated extensions, Hugo will call external commands to generate the content. ([See the Hugo source code for external helpers][helperssource].)
+Hugo has new concept called _external helpers_. It means that you can write your content using [Asciidoc][ascii], [reStructuredText][rest]. If you have files with associated extensions, Hugo will call external commands to generate the content. ([See the Hugo source code for external helpers][helperssource].)
 
 For example, for Asciidoc files, Hugo will try to call the `asciidoctor` or `asciidoc` command. This means that you will have to install the associated tool on your machine to be able to use these formats. ([See the Asciidoctor docs for installation instructions](http://asciidoctor.org/docs/install-toolchain/)).
 
 To use these formats, just use the standard extension and the front matter exactly as you would do with natively supported `.md` files.
 
 {{% warning "Performance of External Helpers" %}}
-Because additional formats are external commands---with the exception of Org-mode---generation performance will rely heavily on the performance of the external tool you are using. As this feature is still in its infancy, feedback is welcome.
+Because additional formats are external commands generation performance will rely heavily on the performance of the external tool you are using. As this feature is still in its infancy, feedback is welcome.
 {{% /warning %}}
 
 ## Learn Markdown

content/content-management/multilingual.md

@@ -59,7 +59,7 @@ When working with front matter `Params` in [single page templates][singles], omi
 
 If you want all of the languages to be put below their respective language code, enable `defaultContentLanguageInSubdir: true`.
 
-Only the obvious non-global options can be overridden per language. Examples of global options are `BaseURL`, `BuildDrafts`, etc.
+Only the obvious non-global options can be overridden per language. Examples of global options are `baseURL`, `buildDrafts`, etc.
 
 ## Taxonomies and Blackfriday
 

content/content-management/organization.md

@@ -20,6 +20,9 @@ toc: true
 {{% note %}}
 This section is not updated with the new nested sections support in Hugo 0.24, see https://github.com/gohugoio/hugoDocs/issues/36
 {{% /note %}}
+{{% todo %}}
+See above
+{{% /todo %}}
 
 ## Organization of Content Source
 

content/content-management/sections.md

@@ -1,7 +1,7 @@
 ---
 title: Content Sections
 linktitle: Sections
-description: Hugo provides full support for content sections, which according to Hugo's default behavior, will reflect the architecture of the rendered website.
+description: Hugo supports content sections, which according to Hugo's default behavior, will reflect the structure of the rendered website.
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
@@ -17,7 +17,12 @@ aliases: [/content/sections/]
 toc: true
 ---
 
-## What are Sections in Hugo
+{{% note %}}
+This section is not updated with the new nested sections support in Hugo 0.24, see https://github.com/gohugoio/hugoDocs/issues/36
+{{% /note %}}
+{{% todo %}}
+See above
+{{% /todo %}}
 
 Hugo believes that you organize your content with a purpose. The same structure that works to organize your source content is used to organize the rendered site (see [directory structure][]).
 

content/content-management/shortcodes.md

@@ -1,7 +1,7 @@
 ---
 title: Shortcodes
 linktitle:
-description: Shortcodes are simple snippets inside your content files that Hugo renders renders so as not to mess with the clean and simple syntax of your preferred content format.
+description: Shortcodes are simple snippets inside your content files calling built-in or custom templates.
 godocref:
 date: 2017-02-01
 publishdate: 2017-02-01
@@ -18,7 +18,7 @@ aliases: [/extras/shortcodes/]
 toc: true
 ---
 
-## What is a Shortcode
+## What a Shortcode is
 
 Hugo loves Markdown because of its simple content format, but there are times when Markdown falls short. Often, content authors are forced to add raw HTML (e.g., video `<iframes>`) to Markdown content. We think this contradicts the beautiful simplicity of Markdown's syntax.
 
@@ -30,7 +30,7 @@ In addition to cleaner Markdown, shortcodes can be updated any time to reflect n
 
 ## Using Shortcodes
 
-In your content files, a shortcode can be called by calling `{{%/* shortcodename parameters*/%}}`. Shortcode parameters are space delimited, and parameters with internal spaces can be quoted.
+In your content files, a shortcode can be called by calling `{{%/* shortcodename parameters */%}}`. Shortcode parameters are space delimited, and parameters with internal spaces can be quoted.
 
 The first word in the shortcode declaration is always the name of the shortcode. Parameters follow the name. Depending upon how the shortcode is defined, the parameters may be named, positional, or both, although you can't mix parameter types in a single call. The format for named parameters models that of HTML with the format `name="value"`.
 

content/content-management/summaries.md

@@ -1,7 +1,7 @@
 ---
 title: Content Summaries
 linktitle: Summaries
-description: Hugo can generate summaries of your content to show snippets in summary views. You have the option to split these summaries yourself or let Hugo automatically generate them for you.
+description: Hugo generates summaries of your content. 
 date: 2017-01-10
 publishdate: 2017-01-10
 lastmod: 2017-01-10
@@ -17,26 +17,24 @@ aliases: [/content/summaries/,/content-management/content-summaries/]
 toc: true
 ---
 
-With the use of the `.Summary` [page variable][pagevariables], Hugo can generate summaries of content to show snippets in summary views. The summary view snippets are automatically generated by Hugo and offer two splitting options.
+With the use of the `.Summary` [page variable][pagevariables], Hugo generates summaries of content to use as a short version in summary views.
 
 ## Summary Splitting Options
 
-You have two options for where the content is split:
-
 * Hugo-defined Summary Split
 * User-defined Summary Split
 
-Content summaries may also provide links to the original content. A common design pattern is to see this link in the form of a "Read More..." button. To make this easier, you can leverage the `.RelPermalink`, `.Permalink`, and `.Truncated` [page variables][pagevariables].
+It is natural to accompany the summary with links to the original content, and a common design pattern is to see this link in the form of a "Read More ..." button. See the `.RelPermalink`, `.Permalink`, and `.Truncated` [page variables][pagevariables].
 
 ### Hugo-defined: Automatic Summary Splitting
 
 By default, Hugo automatically takes the first 70 words of your content as its summary and stores it into the `.Summary` page variable for use in your templates. Taking the Hugo-defined approach to summaries may save time, but it has pros and cons:
 
 * **Pros:** Automatic, no additional work on your part.
-* **Cons:** All HTML tags are stripped from the summary, and the first 70 words, whether they belong to a heading or to different paragraphs, are all lumped into one paragraph.
+* **Cons:** All HTML tags are stripped from the summary, and the first 70 words, whether they belong to a heading or to different paragraphs, are all put into one paragraph.
 
 {{% note %}}
-The Hugo-defined summaries are set to use word count by default. However, "word count" is relatively defined. If you are creating content in a CJK language and want to use Hugo's automatic summary splitting, set `hasCJKLanguage` to `true` in you [site configuration](/getting-started/configuration/).
+The Hugo-defined summaries are set to use word count calculated by splitting the text by one or more consecutive white space characters. If you are creating content in a `CJK` language and want to use Hugo's automatic summary splitting, set `hasCJKLanguage` to `true` in you [site configuration](/getting-started/configuration/).
 {{% /note %}}
 
 ### User-defined: Manual Summary Splitting
@@ -51,7 +49,7 @@ The concept of a *summary divider* is not unique to Hugo. It is also called the
 * Cons: Extra work for content authors, since they need to remember to type <code>&#60;&#33;&#45;&#45;more&#45;&#45;&#62;</code> (or `# more` for [org content][org]) in each content file. This can be automated by adding the summary divider below the front matter of an [archetype](/content-management/archetypes/).
 
 {{% warning "Be Precise with the Summary Divider" %}}
-Be careful to enter <code>&#60;&#33;&#45;&#45;more&#45;&#45;&#62;</code> exactly; i.e., all lowercase and with no whitespace. Any mistakes in the divider will tell Hugo to treat the divider as a regular comment and will fail to store your desired content in the `.Summary` variable.
+Be careful to enter <code>&#60;&#33;&#45;&#45;more&#45;&#45;&#62;</code> exactly; i.e., all lowercase and with no whitespace.
 {{% /warning %}}
 
 ## Example: First 10 Articles with Summaries

content/content-management/taxonomies.md

@@ -19,12 +19,10 @@ toc: true
 
 ## What is a Taxonomy?
 
-Hugo includes support for user-defined groupings of content called **taxonomies**. Taxonomies are classifications that demonstrate logical relationships between content.
+Hugo includes support for user-defined groupings of content called **taxonomies**. Taxonomies are classifications of logical relationships between content.
 
 ### Definitions
 
-In order to effectively work with taxonomies in Hugo, it's important to first understand the language used to described the concept.
-
 Taxonomy
 : a categorization that can be used to classify content
 
@@ -84,9 +82,9 @@ Moonrise Kingdom            <- Content
 
 ## Hugo Taxonomy Defaults
 
-Hugo natively supports taxonomies, which means there are architectural patterns for rendering your project's taxonomies baked into Hugo's core. 
+Hugo natively supports taxonomies. 
 
-Without adding a single line to your site's configuration file, Hugo will automatically create taxonomies for `tags` and `categories`. If you do not want Hugo to create these taxonomies---even though the values may be added to your content files' front matter---set `disableKinds` in your site's configuration to the following:
+Without adding a single line to your site's configuration file, Hugo will automatically create taxonomies for `tags` and `categories`. If you do not want Hugo to create any taxonomies, set `disableKinds` in your site's configuration to the following:
 
 ```toml
 disableKinds = ["taxonomy","taxonomyTerm"]
@@ -123,7 +121,7 @@ taxonomies:
 
 ### Preserving Taxonomy Values
 
-By default, taxonomy names are hyphenated, lower-cased, normalized, and then fixed and title-ized within.
+By default, taxonomy names are normalized.
 
 Therefore, if you want to have a taxonomy term with special characters such as `Gérard Depardieu` instead of `Gerard Depardieu`, set the value for `preserveTaxonomyNames` to `true` in your [site configuration][config]. Hugo will then preserve special characters in taxonomy values but will still title-ize the values for titles and normalize them in URLs.
 

content/content-management/toc.md

@@ -1,7 +1,7 @@
 ---
 title: Table of Contents
 linktitle:
-description: Hugo can automatically parse Markdown content and create a Table of Contents you can leverage in your templates to guide readers to sections of longer pages.
+description: Hugo can automatically parse Markdown content and create a Table of Contents you can use in your templates.
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
@@ -17,8 +17,6 @@ aliases: [/extras/toc/,/content-management/toc/]
 toc: true
 ---
 
-Hugo can automatically parse Markdown content and create a Table of Contents you can leverage in your templates to guide readers to sections of longer pages.
-
 {{% note "TOC Heading Levels are Fixed" %}}
 Currently, the `{{.TableOfContents}}` [page variable](/variables/page/) does not allow you to specify which heading levels you want the TOC to render. [See the related GitHub discussion (#1778)](https://github.com/spf13/hugo/issues/1778). As such, the resulting `<nav id="TableOfContents"><ul></ul></nav>` is going to start at `<h1>` when pulling from `{{.Content}}`.
 {{% /note %}}

content/content-management/types.md

@@ -1,7 +1,7 @@
 ---
 title: Content Types
 linktitle: Types
-description: Hugo provides support for sites with multiple content types and assumes your site will be organized into sections, where each section will use the corresponding type.
+description: Hugo supports sites with multiple content types and assumes your site will be organized into sections, where each section represents the corresponding type.
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
@@ -17,7 +17,7 @@ aliases: [/content/types]
 toc: true
 ---
 
-Hugo provides full support for sites with multiple content types. A **content type** can have a unique set of metadata (i.e., [front matter][]) or customized [template][] and can be created by the `hugo new` command via [archetypes][].
+A **content type** can have a unique set of metadata (i.e., [front matter][]) or customized [template][] and can be created by the `hugo new` command via [archetypes][].
 
 ## What is a Content Type
 
@@ -25,17 +25,18 @@ Hugo provides full support for sites with multiple content types. A **content ty
 
 ## Assigning a Content Type
 
-Hugo assumes that your site will be organized into [sections][] and each section will use a corresponding type. This is to reduce the amount of configuration necessary for new Hugo projects.
+Hugo assumes that your site will be organized into [sections][] and each section represents a corresponding type. This is to reduce the amount of configuration necessary for new Hugo projects.
 
 If you are taking advantage of this default behavior, each new piece of content you place into a section will automatically inherit the type. Therefore a new file created at `content/posts/new-post.md` will automatically be assigned the type `posts`. Alternatively, you can set the content type in a content file's [front matter][] in the field "`type`".
 
 ## Creating New Content of a Specific Type
 
-You can manually add files to your content directories, but Hugo has the ability to create and populate a new content file with preconfigured front matter via [archetypes][].
+You can manually add files to your content directories, but Hugo can create and populate a new content file with preconfigured front matter via [archetypes][].
 
 ## Defining a Content Type
 
-Creating a new content type is easy in Hugo. You simply define and provide the templates and archetype unique to your new content type. Hugo will fall back to using the general templates and default archetype whenever a specific file is not present.
+Creating a new content type is easy. You simply define the templates and archetype unique to your new content type, or Hugo will use defaults.
+
 
 {{% note "Declaring Content Types" %}}
 Remember, all of the following are *optional*. If you do not specifically declare content types in your front matter or develop specific layouts for content types, Hugo is smart enough to assume the content type from the file path and section. (See [Content Sections](/content-management/sections/) for more information.)

content/content-management/urls.md

@@ -1,7 +1,7 @@
 ---
 title: URL Management
 linktitle: URL Management
-description: Hugo provides native support for permalinks, aliases, link canonicalization, and multiple options for handling relative vs absolute URLs.
+description: Hugo supports permalinks, aliases, link canonicalization, and multiple options for handling relative vs absolute URLs.
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-03-09
@@ -19,7 +19,7 @@ toc: true
 
 ## Permalinks
 
-The default Hugo target directory for your built website is `public/`. However, you can change this value by specifying a different `publishdir` in your [site configuration][config]. The directories created at build time for a section reflect the position of the content's directory within the `content` folder and namespace matching its layout within the `contentdir` hierarchy.
+The default Hugo target directory for your built website is `public/`. However, you can change this value by specifying a different `publishDir` in your [site configuration][config]. The directories created at build time for a section reflect the position of the content's directory within the `content` folder and namespace matching its layout within the `contentdir` hierarchy.
 
 The `permalinks` option in your [site configuration][config] allows you to adjust the directory paths (i.e., the URLs) on a per-section basis. This will change where the files are written to and will change the page's internal "canonical" location, such that template references to `.RelPermalink` will honor the adjustments made as a result of the mappings in this option.
 

content/contribute/development.md

@@ -1,7 +1,7 @@
 ---
 title: Contribute to Hugo Development
 linktitle: Development
-description: Hugo relies heavily on contributions from the open source community. You don't need to be a Golang guru to contribute to the project's development.
+description: Hugo relies heavily on contributions from the open source community.
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
@@ -21,7 +21,7 @@ toc: true
 
 ## Introduction
 
-Hugo is an open-source project and lives by the work of its [contributors][]. There are plenty of [open issues][issues], and we need your help to make Hugo even more awesome.
+Hugo is an open-source project and lives by the work of its [contributors][]. There are plenty of [open issues][issues], and we need your help to make Hugo even more awesome. You don't need to be a Go guru to contribute to the project's development.
 
 ## Assumptions
 
@@ -34,7 +34,7 @@ This contribution guide takes a step-by-step approach in hopes of helping newcom
 If you're struggling at any point in this contribution guide, reach out to the Hugo community in [Hugo's Discussion forum](https://discourse.gohugo.io).
 {{% /note %}}
 
-## Installing Golang
+## Installing Go
 
 The installation of Go should take only a few minutes. You have more than one option to get Go up and running on your machine.
 
@@ -47,7 +47,7 @@ If you are having trouble following the installation guides for go, check out [G
 Once you're finished installing Go, let's confirm everything is working correctly. Open a terminal---or command line under Windows--and type the following:
 
 ```bash
-`go version`
+go version
 ```
 
 You should see something similar to the following written to the console. Note that the version here reflects the most recent version of Go as of the last update for this page:

content/contribute/documentation.md

@@ -1,7 +1,7 @@
 ---
 title: Contribute to the Hugo Docs
 linktitle: Documentation
-description: Documentation is an integral part of any open source project. The Hugo docs are as much a work in progress as the source it attempts to teach its users.
+description: Documentation is an integral part of any open source project. The Hugo docs are as much a work in progress as the source it attempts to cover.
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
@@ -18,11 +18,9 @@ aliases: [/contribute/docs/]
 toc: true
 ---
 
-Documentation is a critical component of any open-source project. The Hugo docs were completely reworked for the release of v0.20, but there is always room for improvement.
-
 ## Create Your Fork
 
-It's best to make changes to the Hugo docs on your local machine to check for consistent visual styling. Make sure you've created a fork of Hugo on GitHub and cloned the repository locally on your machine. For more information, you can see [GitHub's documentation on "forking"][ghforking] or follow along with [Hugo's development contribution guide][hugodev].
+It's best to make changes to the Hugo docs on your local machine to check for consistent visual styling. Make sure you've created a fork of [hugoDocs](https://github.com/gohugoio/hugoDocs) on GitHub and cloned the repository locally on your machine. For more information, you can see [GitHub's documentation on "forking"][ghforking] or follow along with [Hugo's development contribution guide][hugodev].
 
 You can then create a separate branch for your additions. Be sure to choose a descriptive branch name that best fits the type of content. The following is an example of a branch name you might use for adding a new website to the showcase: