diff --git a/.gitignore b/.gitignore
index 3cb9c3f4c..f7877f45c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
themes/hugodocs/pipeline/node_modules
my-notes.md
-notes-for-reviewers.md
\ No newline at end of file
+notes-for-reviewers.md
+features-log.md
\ No newline at end of file
diff --git a/content/about-hugo/benefits-of-static.md b/content/about-hugo/benefits-of-static.md
index 87d36c91e..905aa868e 100644
--- a/content/about-hugo/benefits-of-static.md
+++ b/content/about-hugo/benefits-of-static.md
@@ -5,7 +5,7 @@ description: Learn why static site generators have become such a popular option
date: 2017-02-01
publishdate: 2017-02-01
lastmod: 2017-02-01
-tags: [ssg,static site generator]
+tags: [ssg,static,performance, security]
weight: 20
draft: false
slug:
@@ -26,7 +26,7 @@ Not running a website generator on your HTTP server has many benefits. The most
sending files. So good that you can effectively serve the same number
of pages with a fraction of the memory and CPU needed for a dynamic site.
-## Additional Resources
+## Resources on Static Site Generators
* ["An Introduction to Static Site Generators", David Walsh][]
* ["Static Site Generators", O-Reilly][]
diff --git a/content/about-hugo/hugo-features.md b/content/about-hugo/hugo-features.md
index e649bac32..2b1d50de2 100644
--- a/content/about-hugo/hugo-features.md
+++ b/content/about-hugo/hugo-features.md
@@ -36,7 +36,7 @@ notesforauthors:
## Content
* Native Markdown support, as well as other languages through *external helpers* (see [supported formats][])
-* Support for TOML, YAML and JSON metadata in [front matter][]
+* Support for TOML, YAML, and JSON metadata in [front matter][]
* Customizable [homepage][]
* Multiple [content types][]
* Automatic and user defined [content summaries][]
@@ -54,7 +54,6 @@ notesforauthors:
See what's coming next in the [Hugo roadmap][].
-[pagevars]: /variables-and-params/page-variables/
[Ace]: /templates/ace-templating/
[aliases]: /content-management/url-management/#aliases
[Amber]: https://github.com/eknkc/amber
@@ -74,6 +73,7 @@ See what's coming next in the [Hugo roadmap][].
[LiveReload]: /getting-started/using-hugo/
[Mac OSX]: /getting-started/install-of-pc/
[organization for your projects]: /getting-started/directory-structure/
+[pagevars]: /variables-and-params/page-variables/
[Permalink]: /content-management/url-management/#permalinks
[Powerful theming]: /themes/
[Pretty URLs]: /content-management/url-management/
diff --git a/content/about-hugo/why-i-built-hugo.md b/content/about-hugo/why-i-built-hugo.md
index 0051b0b23..1227c6540 100644
--- a/content/about-hugo/why-i-built-hugo.md
+++ b/content/about-hugo/why-i-built-hugo.md
@@ -19,7 +19,7 @@ WordPress sites rendered slowly and required I be online to write posts. WordPre
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. 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/menus.md b/content/content-management/menus.md
index cc6fdcfec..e1377d7f6 100644
--- a/content/content-management/menus.md
+++ b/content/content-management/menus.md
@@ -13,15 +13,14 @@ slug:
aliases: [/extras/menus/]
toc: false
needsreview: true
-notesforauthors:
---
-
Hugo has a simple yet powerful menu system that permits content to be
placed in menus with a good degree of control without a lot of work.
-
-*TIP:* If all you want is a simple menu for your sections, see [Section Menu for "the Lazy Blogger"](#section-menu-for-the-lazy-blogger).
+{{% note "Lazy Blogger"%}}
+If all you want is a simple menu for your sections, see [Section Menu for "the Lazy Blogger"](#section-menu-for-the-lazy-blogger).
+{{% /note %}}
Some of the features of Hugo Menus:
@@ -154,87 +153,6 @@ In this example, the top level of the menu is defined in the config file
and all content entries are attached to one of these entries via the
`parent` field.
-## Rendering menus
+## Rendering Menus
-Hugo makes no assumptions about how your rendered HTML will be
-structured. Instead, it provides all of the functions you will need to be
-able to build your menu however you want.
-
-
-The following is an example:
-
-
-
-
-
-> **Note**: use the `absLangURL` or `relLangURL` if your theme makes use of the [multilingual feature](/content-management/multilingual-mode/). In contrast to `absURL` and `relURL` it adds the correct language prefix to the url. [Read more](/functions/).
-
-## Section Menu for "the Lazy Blogger"
-
-To enable this menu, add this to your site config, i.e. `config.toml`:
-
-```
-SectionPagesMenu = "main"
-```
-
-The menu name can be anything, but take a note of what it is.
-
-This will create a menu with all the sections as menu items and all the sections' pages as "shadow-members". The _shadow_ implies that the pages isn't represented by a menu-item themselves, but this enables you to create a top-level menu like this:
-
-```
-
-
-```
-
-In the above, the menu item is marked as active if on the current section's list page or on a page in that section.
-
-The above is all that's needed. But if you want custom menu items, e.g. changing weight or name, you can define them manually in the site config, i.e. `config.toml`:
-
-```
- [[menu.main]]
- name = "This is the blog section"
- weight = -110
- identifier = "blog"
- url = "/blog/"
-
-```
-
-**Note** that the `identifier` must match the section name.
\ No newline at end of file
+See [Menu Templates](/templates/menu-templates/).
diff --git a/content/developer-tools/syntax-highlighting.md b/content/developer-tools/syntax-highlighting.md
index 5f67a2b4d..cf80e93ed 100644
--- a/content/developer-tools/syntax-highlighting.md
+++ b/content/developer-tools/syntax-highlighting.md
@@ -10,8 +10,9 @@ categories: [developer tools]
weight:
draft: false
slug:
-aliases: [/extras/highlighting/]
+aliases: [/extras/highlighting/,/extras/highlight/]
toc: true
+needsreview: true
notesforauthors:
---
diff --git a/content/functions/_index.md b/content/functions/_index.md
index 29ff1c0f5..dbe9a210f 100644
--- a/content/functions/_index.md
+++ b/content/functions/_index.md
@@ -1,5 +1,5 @@
---
-title: Functions
+title: Functions Quick Reference
linktitle: Overview
description: Comprehensive list of Hugo templating functions, including basic and advanced usage examples.
date: 2017-02-01
diff --git a/content/functions/index-function.md b/content/functions/index-function.md
index bfcc3daf9..85c6c16bb 100644
--- a/content/functions/index-function.md
+++ b/content/functions/index-function.md
@@ -2,7 +2,7 @@
title: index
linktitle: index
description:
-godocref:
+godocref: https://golang.org/pkg/text/template/#hdr-Functions
date: 2017-02-01
publishdate: 2017-02-01
lastmod: 2017-02-01
@@ -14,6 +14,10 @@ aliases: []
notesforauthors:
---
+From the godocs:
+
+> Returns the result of indexing its first argument by the following arguments. Thus "index x 1 2 3" is, in Go syntax, x[1][2][3]. Each indexed item must be a map, slice, or array.
+
## Example
## Advanced Example
diff --git a/content/getting-started/_index.md b/content/getting-started/_index.md
index 722dff87e..e5103f7fd 100644
--- a/content/getting-started/_index.md
+++ b/content/getting-started/_index.md
@@ -15,7 +15,7 @@ toc: false
notesforauthors:
---
-The Hugo docs were completely reworked from the ground up in anticipation of v0.19. Included in the reboot was the concept of using a [single example site][] for code blocks and demo content in the documentation. Once you finish the [quick start][], be sure to read up on how [the Hugo docs have been optimized for rapid learning][].
+The Hugo docs were completely reworked from the ground up in anticipation of v0.19. Included in the reboot was the concept of leveraging a [single example site][] from which to pull code blocks and demo content in the documentation. Once you finish the [quick start][], be sure to look into how [the Hugo docs have been optimized for rapid learning][].
[quick start]: /getting-started/quick-start/
[single example site]: /getting-started/using-the-hugo-docs/
diff --git a/content/getting-started/basic-usage.md b/content/getting-started/basic-usage.md
index 8efc179f1..34949078c 100644
--- a/content/getting-started/basic-usage.md
+++ b/content/getting-started/basic-usage.md
@@ -1,7 +1,7 @@
---
title: Basic Usage
linktitle: Basic Usage
-description:
+description: Hugo's CLI is fully featured but simple. You do not need a high level of expertise on the command line to get up and running.
date: 2017-02-01
publishdate: 2017-02-01
lastmod: 2017-02-01
@@ -9,10 +9,254 @@ categories: [getting started]
tags: [usage,livereload,command line]
weight: 40
draft: false
-slug:
-aliases: [/overview/usage/,/extras/livereload/,/getting-started/using-hugo/]
-toc: false
+aliases: [/overview/usage/,/extras/livereload/,/getting-started/using-hugo/,/doc/usage/]
+toc: true
+needsreview: true
notesforauthors:
---
-## LiveReload
\ No newline at end of file
+Once you have [installed Hugo][install] is in your `PATH` (or provide a path to it). Test this by:
+
+```bash
+hugo help
+hugo is the main command, used to build your Hugo site.
+
+Hugo is a Fast and Flexible Static Site Generator built with love by spf13 and friends in Go.
+
+Complete documentation is available at http://gohugo.io/.
+
+Usage:
+ hugo [flags]
+ hugo [command]
+
+Available Commands:
+ benchmark Benchmark Hugo by building a site a number of times.
+ config Print the site configuration
+ convert Convert your content to different formats
+ env Print Hugo version and environment info
+ gen A collection of several useful generators.
+ import Import your site from others.
+ list Listing out various types of content
+ new Create new content for your site
+ server A high performance webserver
+ undraft Undraft changes the content's draft status from 'True' to 'False'
+ version Print the version number of Hugo
+
+Flags:
+ -b, --baseURL string hostname (and path) to the root, e.g. http://spf13.com/
+ -D, --buildDrafts include content marked as draft
+ -E, --buildExpired include expired content
+ -F, --buildFuture include content with publishdate in the future
+ --cacheDir string filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
+ --canonifyURLs if true, all relative URLs will be canonicalized using baseURL
+ --cleanDestinationDir Remove files from destination not found in static directories
+ --config string config file (default is path/config.yaml|json|toml)
+ -c, --contentDir string filesystem path to content directory
+ -d, --destination string filesystem path to write files to
+ --disable404 Do not render 404 page
+ --disableRSS Do not build RSS files
+ --disableSitemap Do not build Sitemap file
+ --enableGitInfo Add Git revision, date and author info to the pages
+ --forceSyncStatic Copy all files when static is changed.
+ --i18n-warnings Print missing translations
+ --ignoreCache Ignores the cache directory
+ -l, --layoutDir string filesystem path to layout directory
+ --log Enable Logging
+ --logFile string Log File path (if set, logging enabled automatically)
+ --noChmod Don't sync permission mode of files
+ --noTimes Don't sync modification time of files
+ --pluralizeListTitles Pluralize titles in lists using inflect (default true)
+ --preserveTaxonomyNames Preserve taxonomy names as written ("Gérard Depardieu" vs "gerard-depardieu")
+ --quiet build in quiet mode
+ --renderToMemory render to memory (only useful for benchmark testing)
+ -s, --source string filesystem path to read files relative from
+ --stepAnalysis display memory and timing of different steps of the program
+ -t, --theme string theme to use (located in /themes/THEMENAME/)
+ --uglyURLs if true, use /filename.html instead of /filename/
+ -v, --verbose verbose output
+ --verboseLog verbose logging
+ -w, --watch watch filesystem for changes and recreate as needed
+
+Additional help topics:
+ hugo check Contains some verification checks
+
+Use "hugo [command] --help" for more information about a command.
+```
+
+## Common Usage Example
+
+The most common use is probably to run `hugo` with your current directory being the input directory:
+
+```bash
+hugo
+0 draft content
+0 future content
+99 pages created
+0 paginator pages created
+16 tags created
+0 groups created
+in 120 ms
+```
+
+This generates your web site to the `public/` directory, ready to be deployed to your web server.
+
+## Instant feedback as you develop your web site
+
+If you are working on things and want to see the changes immediately, by default Hugo will watch the filesystem for changes, and rebuild your site as soon as a file is saved:
+
+```bash
+hugo -s ~/Code/hugo/docs
+0 draft content
+0 future content
+99 pages created
+0 paginator pages created
+16 tags created
+0 groups created
+in 120 ms
+Watching for changes in /Users/spf13/Code/hugo/docs/content
+Press Ctrl+C to stop
+```
+
+Hugo can even run a server and create a site preview at the same time! Hugo implements [LiveReload](#LiveReload) technology to automatically reload any open pages in all JavaScript-enabled browsers, including mobile. This is the easiest and most common way to develop a Hugo web site:
+
+```bash
+hugo server -ws ~/Code/hugo/docs
+0 draft content
+0 future content
+99 pages created
+0 paginator pages created
+16 tags created
+0 groups created
+in 120 ms
+Watching for changes in /Users/spf13/Code/hugo/docs/content
+Serving pages from /Users/spf13/Code/hugo/docs/public
+Web Server is available at http://localhost:1313/
+Press Ctrl+C to stop
+```
+Hugo may not be the first static site generator to utilize LiveReload
+technology, but it’s the first to do it right.
+
+The combination of Hugo’s insane build speed and LiveReload make
+crafting your content pure joy. Virtually instantly after you hit save
+your rebuilt content will appear in your browser.
+
+## LiveReload
+
+Hugo comes with [LiveReload](https://github.com/livereload/livereload-js) built in. There are no additional packages to install. A common way to use Hugo while developing a site is to have Hugo run a server and watch for changes:
+
+```bash
+hugo server
+```
+
+This will run a full functioning web server while simultaneously watching your file system for additions, deletions, or changes within the following
+
+* `/static/*`
+* `/content/*`
+* `/data/*`
+* `/layouts/*`
+* `/themes//*`
+* `config`
+
+Whenever you make changes, Hugo will simultaneously rebuild the site and continue to serve content. As soon as the build is finished, LiveReload tells the browser to silently reload the page.
+
+Most Hugo builds are so fast that you may not notice the change unless looking directly at the site in your browser. This means that keeping the site open on a second monitor (or another half of your current monitor) allows you to see the most up-to-date version of your website without the need to leave your text editor.
+
+{{% note "Closing `