Merge commit 'd2ec1a06df8ab6b17ad05cb008d5701b40327d47'

38 files changed, 210 insertions, 128 deletions

diff --git a/docs/.gitmodules b/docs/.gitmodules
deleted file mode 100644
index e69de29bb..000000000
--- a/docs/.gitmodules
+++ /dev/null
diff --git a/docs/content/commands/hugo.md b/docs/content/commands/hugo.md
index 9e2097585..18aed3b75 100644
--- a/docs/content/commands/hugo.md
+++ b/docs/content/commands/hugo.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo"
 slug: hugo
 url: /commands/hugo/
@@ -77,4 +77,4 @@ hugo [flags]
 * [hugo server](/commands/hugo_server/)	 - A high performance webserver
 * [hugo version](/commands/hugo_version/)	 - Print the version number of Hugo
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_benchmark.md b/docs/content/commands/hugo_benchmark.md
index c76ab271d..63348c36d 100644
--- a/docs/content/commands/hugo_benchmark.md
+++ b/docs/content/commands/hugo_benchmark.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo benchmark"
 slug: hugo_benchmark
 url: /commands/hugo_benchmark/
@@ -70,4 +70,4 @@ hugo benchmark [flags]
 
 * [hugo](/commands/hugo/)	 - hugo builds your site
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_check.md b/docs/content/commands/hugo_check.md
index 27bde257a..239934dc2 100644
--- a/docs/content/commands/hugo_check.md
+++ b/docs/content/commands/hugo_check.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo check"
 slug: hugo_check
 url: /commands/hugo_check/
@@ -35,4 +35,4 @@ Contains some verification checks
 * [hugo](/commands/hugo/)	 - hugo builds your site
 * [hugo check ulimit](/commands/hugo_check_ulimit/)	 - Check system ulimit settings
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_check_ulimit.md b/docs/content/commands/hugo_check_ulimit.md
index 73183c085..340a51259 100644
--- a/docs/content/commands/hugo_check_ulimit.md
+++ b/docs/content/commands/hugo_check_ulimit.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo check ulimit"
 slug: hugo_check_ulimit
 url: /commands/hugo_check_ulimit/
@@ -39,4 +39,4 @@ hugo check ulimit [flags]
 
 * [hugo check](/commands/hugo_check/)	 - Contains some verification checks
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_config.md b/docs/content/commands/hugo_config.md
index 031e3cbc7..66f3372ac 100644
--- a/docs/content/commands/hugo_config.md
+++ b/docs/content/commands/hugo_config.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo config"
 slug: hugo_config
 url: /commands/hugo_config/
@@ -19,7 +19,8 @@ hugo config [flags]
 ### Options
 
 ```
-  -h, --help   help for config
+  -h, --help            help for config
+  -s, --source string   filesystem path to read files relative from
 ```
 
 ### Options inherited from parent commands
@@ -38,4 +39,4 @@ hugo config [flags]
 
 * [hugo](/commands/hugo/)	 - hugo builds your site
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_convert.md b/docs/content/commands/hugo_convert.md
index 180669103..7ed15d309 100644
--- a/docs/content/commands/hugo_convert.md
+++ b/docs/content/commands/hugo_convert.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo convert"
 slug: hugo_convert
 url: /commands/hugo_convert/
@@ -42,4 +42,4 @@ See convert's subcommands toJSON, toTOML and toYAML for more information.
 * [hugo convert toTOML](/commands/hugo_convert_totoml/)	 - Convert front matter to TOML
 * [hugo convert toYAML](/commands/hugo_convert_toyaml/)	 - Convert front matter to YAML
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_convert_toJSON.md b/docs/content/commands/hugo_convert_toJSON.md
index 2142cb194..03e2f692e 100644
--- a/docs/content/commands/hugo_convert_toJSON.md
+++ b/docs/content/commands/hugo_convert_toJSON.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo convert toJSON"
 slug: hugo_convert_toJSON
 url: /commands/hugo_convert_tojson/
@@ -42,4 +42,4 @@ hugo convert toJSON [flags]
 
 * [hugo convert](/commands/hugo_convert/)	 - Convert your content to different formats
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_convert_toTOML.md b/docs/content/commands/hugo_convert_toTOML.md
index 8d821d497..9abb418bb 100644
--- a/docs/content/commands/hugo_convert_toTOML.md
+++ b/docs/content/commands/hugo_convert_toTOML.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo convert toTOML"
 slug: hugo_convert_toTOML
 url: /commands/hugo_convert_totoml/
@@ -42,4 +42,4 @@ hugo convert toTOML [flags]
 
 * [hugo convert](/commands/hugo_convert/)	 - Convert your content to different formats
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_convert_toYAML.md b/docs/content/commands/hugo_convert_toYAML.md
index 79b777e46..8d87896eb 100644
--- a/docs/content/commands/hugo_convert_toYAML.md
+++ b/docs/content/commands/hugo_convert_toYAML.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo convert toYAML"
 slug: hugo_convert_toYAML
 url: /commands/hugo_convert_toyaml/
@@ -42,4 +42,4 @@ hugo convert toYAML [flags]
 
 * [hugo convert](/commands/hugo_convert/)	 - Convert your content to different formats
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_env.md b/docs/content/commands/hugo_env.md
index 09811c844..b6062724e 100644
--- a/docs/content/commands/hugo_env.md
+++ b/docs/content/commands/hugo_env.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo env"
 slug: hugo_env
 url: /commands/hugo_env/
@@ -38,4 +38,4 @@ hugo env [flags]
 
 * [hugo](/commands/hugo/)	 - hugo builds your site
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_gen.md b/docs/content/commands/hugo_gen.md
index f28700f63..025fe5875 100644
--- a/docs/content/commands/hugo_gen.md
+++ b/docs/content/commands/hugo_gen.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo gen"
 slug: hugo_gen
 url: /commands/hugo_gen/
@@ -38,4 +38,4 @@ A collection of several useful generators.
 * [hugo gen doc](/commands/hugo_gen_doc/)	 - Generate Markdown documentation for the Hugo CLI.
 * [hugo gen man](/commands/hugo_gen_man/)	 - Generate man pages for the Hugo CLI
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_gen_autocomplete.md b/docs/content/commands/hugo_gen_autocomplete.md
index 1f9819b48..2d327f64d 100644
--- a/docs/content/commands/hugo_gen_autocomplete.md
+++ b/docs/content/commands/hugo_gen_autocomplete.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo gen autocomplete"
 slug: hugo_gen_autocomplete
 url: /commands/hugo_gen_autocomplete/
@@ -56,4 +56,4 @@ hugo gen autocomplete [flags]
 
 * [hugo gen](/commands/hugo_gen/)	 - A collection of several useful generators.
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_gen_chromastyles.md b/docs/content/commands/hugo_gen_chromastyles.md
index 353e2381b..4db33e88e 100644
--- a/docs/content/commands/hugo_gen_chromastyles.md
+++ b/docs/content/commands/hugo_gen_chromastyles.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo gen chromastyles"
 slug: hugo_gen_chromastyles
 url: /commands/hugo_gen_chromastyles/
@@ -43,4 +43,4 @@ hugo gen chromastyles [flags]
 
 * [hugo gen](/commands/hugo_gen/)	 - A collection of several useful generators.
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_gen_doc.md b/docs/content/commands/hugo_gen_doc.md
index 321c2387e..2abf0c5a3 100644
--- a/docs/content/commands/hugo_gen_doc.md
+++ b/docs/content/commands/hugo_gen_doc.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo gen doc"
 slug: hugo_gen_doc
 url: /commands/hugo_gen_doc/
@@ -45,4 +45,4 @@ hugo gen doc [flags]
 
 * [hugo gen](/commands/hugo_gen/)	 - A collection of several useful generators.
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_gen_man.md b/docs/content/commands/hugo_gen_man.md
index ae55cdd81..50b72d892 100644
--- a/docs/content/commands/hugo_gen_man.md
+++ b/docs/content/commands/hugo_gen_man.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo gen man"
 slug: hugo_gen_man
 url: /commands/hugo_gen_man/
@@ -41,4 +41,4 @@ hugo gen man [flags]
 
 * [hugo gen](/commands/hugo_gen/)	 - A collection of several useful generators.
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_import.md b/docs/content/commands/hugo_import.md
index f6d42da4c..5dae58bea 100644
--- a/docs/content/commands/hugo_import.md
+++ b/docs/content/commands/hugo_import.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo import"
 slug: hugo_import
 url: /commands/hugo_import/
@@ -37,4 +37,4 @@ Import requires a subcommand, e.g. `hugo import jekyll jekyll_root_path target_p
 * [hugo](/commands/hugo/)	 - hugo builds your site
 * [hugo import jekyll](/commands/hugo_import_jekyll/)	 - hugo import from Jekyll
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_import_jekyll.md b/docs/content/commands/hugo_import_jekyll.md
index 6442aa6cf..c61116c6f 100644
--- a/docs/content/commands/hugo_import_jekyll.md
+++ b/docs/content/commands/hugo_import_jekyll.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo import jekyll"
 slug: hugo_import_jekyll
 url: /commands/hugo_import_jekyll/
@@ -41,4 +41,4 @@ hugo import jekyll [flags]
 
 * [hugo import](/commands/hugo_import/)	 - Import your site from others.
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_list.md b/docs/content/commands/hugo_list.md
index 3d68a1859..69c3f8aa8 100644
--- a/docs/content/commands/hugo_list.md
+++ b/docs/content/commands/hugo_list.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo list"
 slug: hugo_list
 url: /commands/hugo_list/
@@ -40,4 +40,4 @@ List requires a subcommand, e.g. `hugo list drafts`.
 * [hugo list expired](/commands/hugo_list_expired/)	 - List all posts already expired
 * [hugo list future](/commands/hugo_list_future/)	 - List all posts dated in the future
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_list_drafts.md b/docs/content/commands/hugo_list_drafts.md
index d9b1d7228..c5f6251fa 100644
--- a/docs/content/commands/hugo_list_drafts.md
+++ b/docs/content/commands/hugo_list_drafts.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo list drafts"
 slug: hugo_list_drafts
 url: /commands/hugo_list_drafts/
@@ -39,4 +39,4 @@ hugo list drafts [flags]
 
 * [hugo list](/commands/hugo_list/)	 - Listing out various types of content
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_list_expired.md b/docs/content/commands/hugo_list_expired.md
index cf7cd64e4..6e5bc37b0 100644
--- a/docs/content/commands/hugo_list_expired.md
+++ b/docs/content/commands/hugo_list_expired.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo list expired"
 slug: hugo_list_expired
 url: /commands/hugo_list_expired/
@@ -40,4 +40,4 @@ hugo list expired [flags]
 
 * [hugo list](/commands/hugo_list/)	 - Listing out various types of content
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_list_future.md b/docs/content/commands/hugo_list_future.md
index 4d9c1494f..4fc138442 100644
--- a/docs/content/commands/hugo_list_future.md
+++ b/docs/content/commands/hugo_list_future.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo list future"
 slug: hugo_list_future
 url: /commands/hugo_list_future/
@@ -40,4 +40,4 @@ hugo list future [flags]
 
 * [hugo list](/commands/hugo_list/)	 - Listing out various types of content
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_new.md b/docs/content/commands/hugo_new.md
index 6d2986f85..448951c94 100644
--- a/docs/content/commands/hugo_new.md
+++ b/docs/content/commands/hugo_new.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo new"
 slug: hugo_new
 url: /commands/hugo_new/
@@ -48,4 +48,4 @@ hugo new [path] [flags]
 * [hugo new site](/commands/hugo_new_site/)	 - Create a new site (skeleton)
 * [hugo new theme](/commands/hugo_new_theme/)	 - Create a new theme
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_new_site.md b/docs/content/commands/hugo_new_site.md
index d71e29788..65316f7cb 100644
--- a/docs/content/commands/hugo_new_site.md
+++ b/docs/content/commands/hugo_new_site.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo new site"
 slug: hugo_new_site
 url: /commands/hugo_new_site/
@@ -43,4 +43,4 @@ hugo new site [path] [flags]
 
 * [hugo new](/commands/hugo_new/)	 - Create new content for your site
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_new_theme.md b/docs/content/commands/hugo_new_theme.md
index 4a21ceab7..a7def203d 100644
--- a/docs/content/commands/hugo_new_theme.md
+++ b/docs/content/commands/hugo_new_theme.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo new theme"
 slug: hugo_new_theme
 url: /commands/hugo_new_theme/
@@ -42,4 +42,4 @@ hugo new theme [name] [flags]
 
 * [hugo new](/commands/hugo_new/)	 - Create new content for your site
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_server.md b/docs/content/commands/hugo_server.md
index 8f524452b..c3ed93bc9 100644
--- a/docs/content/commands/hugo_server.md
+++ b/docs/content/commands/hugo_server.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo server"
 slug: hugo_server
 url: /commands/hugo_server/
@@ -88,4 +88,4 @@ hugo server [flags]
 
 * [hugo](/commands/hugo/)	 - hugo builds your site
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/commands/hugo_version.md b/docs/content/commands/hugo_version.md
index ab9441458..308013a4f 100644
--- a/docs/content/commands/hugo_version.md
+++ b/docs/content/commands/hugo_version.md
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo version"
 slug: hugo_version
 url: /commands/hugo_version/
@@ -38,4 +38,4 @@ hugo version [flags]
 
 * [hugo](/commands/hugo/)	 - hugo builds your site
 
-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
diff --git a/docs/content/content-management/front-matter.md b/docs/content/content-management/front-matter.md
index 2fc18ee31..bf067797c 100644
--- a/docs/content/content-management/front-matter.md
+++ b/docs/content/content-management/front-matter.md
@@ -56,70 +56,70 @@ slug = "spf13-vim-3-0-release-and-new-website"
 
 There are a few predefined variables that Hugo is aware of. See [Page Variables][pagevars] for how to call many of these predefined variables in your templates.
 
-`aliases`
+aliases
 : an array of one or more aliases (e.g., old published paths of renamed content) that will be created in the output directory structure . See [Aliases][aliases] for details.
 
-`date`
+date
 : the datetime at which the content was created; note this value is auto-populated according to Hugo's built-in [archetype][].