docs: Merge docs commit '37c69054e294bf554be03cf7e4c01e1f586e6943'

39 files changed, 117 insertions, 72 deletions

diff --git a/docs/README.md b/docs/README.md
index 9e89a0383..60a554e54 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,3 +1,13 @@
 # Hugo Docs
 
 Documentation site for [Hugo](https://github.com/gohugoio/hugo), the very fast and flexible static site generator built with love in GoLang.
+
+## Branches
+
+* The `master` branch is the **current Hugo version** and will be auto-deployed to [gohugo.io/](https://gohugo.io/).
+* Anything not relevant to the current Hugo version goes into the `dev` branch.
+* Changes in [hugo/docs](https://github.com/gohugoio/hugo/tree/master/docs) will, in general, be merged once every release, but can be manually merged/cherry picked if needed. This goes both ways.
+* All contributions that is not tightly coupled with code changes, should be made directly to `hugoDocs`.
+* But we also merge PRs into  [hugo/docs](https://github.com/gohugoio/hugo/tree/master/docs), but preferably changes that is related to the code in the PR itself
+
+To summarize, we have two branches in this repository: `master` (current Hugo) and `dev` (next Hugo).
diff --git a/docs/config.toml b/docs/config.toml
index 31f5e0099..a36734186 100644
--- a/docs/config.toml
+++ b/docs/config.toml
@@ -26,7 +26,7 @@ notAlternative = true
 [params]
   description = "Documentation of Hugo, a fast and flexible static site generator built with love by spf13, bep and friends in Go"
   author = "Steve Francia (spf13) and friends"
-  release = "0.25-DEV"
+  release = "0.24.1"
 
 [taxonomies]
   tag = "tags"
diff --git a/docs/content/commands/hugo.md b/docs/content/commands/hugo.md
index 90862cf21..0e02a8a9b 100644
--- a/docs/content/commands/hugo.md
+++ b/docs/content/commands/hugo.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo"
 slug: hugo
 url: /commands/hugo/
@@ -77,4 +77,4 @@ hugo [flags]
 * [hugo undraft](/commands/hugo_undraft/)	 - Undraft changes the content's draft status from 'True' to 'False'
 * [hugo version](/commands/hugo_version/)	 - Print the version number of Hugo
 
-###### Auto generated by spf13/cobra on 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_benchmark.md b/docs/content/commands/hugo_benchmark.md
index 2bfb1c8d3..acef140a3 100644
--- a/docs/content/commands/hugo_benchmark.md
+++ b/docs/content/commands/hugo_benchmark.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo benchmark"
 slug: hugo_benchmark
 url: /commands/hugo_benchmark/
@@ -69,4 +69,4 @@ hugo benchmark [flags]
 ### SEE ALSO
 * [hugo](/commands/hugo/)	 - hugo builds your site
 
-###### Auto generated by spf13/cobra on 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_check.md b/docs/content/commands/hugo_check.md
index ae686559a..1cab62f3e 100644
--- a/docs/content/commands/hugo_check.md
+++ b/docs/content/commands/hugo_check.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo check"
 slug: hugo_check
 url: /commands/hugo_check/
@@ -34,4 +34,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 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_check_ulimit.md b/docs/content/commands/hugo_check_ulimit.md
index 90ef8b030..33dae348f 100644
--- a/docs/content/commands/hugo_check_ulimit.md
+++ b/docs/content/commands/hugo_check_ulimit.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo check ulimit"
 slug: hugo_check_ulimit
 url: /commands/hugo_check_ulimit/
@@ -38,4 +38,4 @@ hugo check ulimit [flags]
 ### SEE ALSO
 * [hugo check](/commands/hugo_check/)	 - Contains some verification checks
 
-###### Auto generated by spf13/cobra on 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_config.md b/docs/content/commands/hugo_config.md
index 1504c0788..f15d28f04 100644
--- a/docs/content/commands/hugo_config.md
+++ b/docs/content/commands/hugo_config.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo config"
 slug: hugo_config
 url: /commands/hugo_config/
@@ -37,4 +37,4 @@ hugo config [flags]
 ### SEE ALSO
 * [hugo](/commands/hugo/)	 - hugo builds your site
 
-###### Auto generated by spf13/cobra on 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_convert.md b/docs/content/commands/hugo_convert.md
index 67b9f870b..62005e6f9 100644
--- a/docs/content/commands/hugo_convert.md
+++ b/docs/content/commands/hugo_convert.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo convert"
 slug: hugo_convert
 url: /commands/hugo_convert/
@@ -41,4 +41,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 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_convert_toJSON.md b/docs/content/commands/hugo_convert_toJSON.md
index a2da44ec4..f6136ad4a 100644
--- a/docs/content/commands/hugo_convert_toJSON.md
+++ b/docs/content/commands/hugo_convert_toJSON.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo convert toJSON"
 slug: hugo_convert_toJSON
 url: /commands/hugo_convert_tojson/
@@ -41,4 +41,4 @@ hugo convert toJSON [flags]
 ### SEE ALSO
 * [hugo convert](/commands/hugo_convert/)	 - Convert your content to different formats
 
-###### Auto generated by spf13/cobra on 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_convert_toTOML.md b/docs/content/commands/hugo_convert_toTOML.md
index 8a48f52f7..229004e78 100644
--- a/docs/content/commands/hugo_convert_toTOML.md
+++ b/docs/content/commands/hugo_convert_toTOML.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo convert toTOML"
 slug: hugo_convert_toTOML
 url: /commands/hugo_convert_totoml/
@@ -41,4 +41,4 @@ hugo convert toTOML [flags]
 ### SEE ALSO
 * [hugo convert](/commands/hugo_convert/)	 - Convert your content to different formats
 
-###### Auto generated by spf13/cobra on 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_convert_toYAML.md b/docs/content/commands/hugo_convert_toYAML.md
index 5d85825fe..3c0cafe46 100644
--- a/docs/content/commands/hugo_convert_toYAML.md
+++ b/docs/content/commands/hugo_convert_toYAML.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo convert toYAML"
 slug: hugo_convert_toYAML
 url: /commands/hugo_convert_toyaml/
@@ -41,4 +41,4 @@ hugo convert toYAML [flags]
 ### SEE ALSO
 * [hugo convert](/commands/hugo_convert/)	 - Convert your content to different formats
 
-###### Auto generated by spf13/cobra on 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_env.md b/docs/content/commands/hugo_env.md
index 7e268546f..857f03701 100644
--- a/docs/content/commands/hugo_env.md
+++ b/docs/content/commands/hugo_env.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo env"
 slug: hugo_env
 url: /commands/hugo_env/
@@ -37,4 +37,4 @@ hugo env [flags]
 ### SEE ALSO
 * [hugo](/commands/hugo/)	 - hugo builds your site
 
-###### Auto generated by spf13/cobra on 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_gen.md b/docs/content/commands/hugo_gen.md
index 7e753c4e1..c2521aeba 100644
--- a/docs/content/commands/hugo_gen.md
+++ b/docs/content/commands/hugo_gen.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo gen"
 slug: hugo_gen
 url: /commands/hugo_gen/
@@ -36,4 +36,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 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_gen_autocomplete.md b/docs/content/commands/hugo_gen_autocomplete.md
index 455322def..df89faab6 100644
--- a/docs/content/commands/hugo_gen_autocomplete.md
+++ b/docs/content/commands/hugo_gen_autocomplete.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo gen autocomplete"
 slug: hugo_gen_autocomplete
 url: /commands/hugo_gen_autocomplete/
@@ -55,4 +55,4 @@ hugo gen autocomplete [flags]
 ### SEE ALSO
 * [hugo gen](/commands/hugo_gen/)	 - A collection of several useful generators.
 
-###### Auto generated by spf13/cobra on 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_gen_doc.md b/docs/content/commands/hugo_gen_doc.md
index d7b2f719b..48402d12c 100644
--- a/docs/content/commands/hugo_gen_doc.md
+++ b/docs/content/commands/hugo_gen_doc.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo gen doc"
 slug: hugo_gen_doc
 url: /commands/hugo_gen_doc/
@@ -44,4 +44,4 @@ hugo gen doc [flags]
 ### SEE ALSO
 * [hugo gen](/commands/hugo_gen/)	 - A collection of several useful generators.
 
-###### Auto generated by spf13/cobra on 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_gen_man.md b/docs/content/commands/hugo_gen_man.md
index 14c403d9a..efec000ee 100644
--- a/docs/content/commands/hugo_gen_man.md
+++ b/docs/content/commands/hugo_gen_man.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo gen man"
 slug: hugo_gen_man
 url: /commands/hugo_gen_man/
@@ -40,4 +40,4 @@ hugo gen man [flags]
 ### SEE ALSO
 * [hugo gen](/commands/hugo_gen/)	 - A collection of several useful generators.
 
-###### Auto generated by spf13/cobra on 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_import.md b/docs/content/commands/hugo_import.md
index ce58bb3af..aafe8e4f7 100644
--- a/docs/content/commands/hugo_import.md
+++ b/docs/content/commands/hugo_import.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo import"
 slug: hugo_import
 url: /commands/hugo_import/
@@ -36,4 +36,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 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_import_jekyll.md b/docs/content/commands/hugo_import_jekyll.md
index 89c4c47c5..f3427d04d 100644
--- a/docs/content/commands/hugo_import_jekyll.md
+++ b/docs/content/commands/hugo_import_jekyll.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo import jekyll"
 slug: hugo_import_jekyll
 url: /commands/hugo_import_jekyll/
@@ -40,4 +40,4 @@ hugo import jekyll [flags]
 ### SEE ALSO
 * [hugo import](/commands/hugo_import/)	 - Import your site from others.
 
-###### Auto generated by spf13/cobra on 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_list.md b/docs/content/commands/hugo_list.md
index d9c609596..818c1520e 100644
--- a/docs/content/commands/hugo_list.md
+++ b/docs/content/commands/hugo_list.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo list"
 slug: hugo_list
 url: /commands/hugo_list/
@@ -39,4 +39,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 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_list_drafts.md b/docs/content/commands/hugo_list_drafts.md
index d84dd56f5..4ca7319b1 100644
--- a/docs/content/commands/hugo_list_drafts.md
+++ b/docs/content/commands/hugo_list_drafts.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo list drafts"
 slug: hugo_list_drafts
 url: /commands/hugo_list_drafts/
@@ -38,4 +38,4 @@ hugo list drafts [flags]
 ### SEE ALSO
 * [hugo list](/commands/hugo_list/)	 - Listing out various types of content
 
-###### Auto generated by spf13/cobra on 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_list_expired.md b/docs/content/commands/hugo_list_expired.md
index e4304a40c..fcc48085d 100644
--- a/docs/content/commands/hugo_list_expired.md
+++ b/docs/content/commands/hugo_list_expired.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo list expired"
 slug: hugo_list_expired
 url: /commands/hugo_list_expired/
@@ -39,4 +39,4 @@ hugo list expired [flags]
 ### SEE ALSO
 * [hugo list](/commands/hugo_list/)	 - Listing out various types of content
 
-###### Auto generated by spf13/cobra on 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_list_future.md b/docs/content/commands/hugo_list_future.md
index 530b4a68f..46e472534 100644
--- a/docs/content/commands/hugo_list_future.md
+++ b/docs/content/commands/hugo_list_future.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo list future"
 slug: hugo_list_future
 url: /commands/hugo_list_future/
@@ -39,4 +39,4 @@ hugo list future [flags]
 ### SEE ALSO
 * [hugo list](/commands/hugo_list/)	 - Listing out various types of content
 
-###### Auto generated by spf13/cobra on 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_new.md b/docs/content/commands/hugo_new.md
index bf230a25b..25eb3d803 100644
--- a/docs/content/commands/hugo_new.md
+++ b/docs/content/commands/hugo_new.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo new"
 slug: hugo_new
 url: /commands/hugo_new/
@@ -47,4 +47,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 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_new_site.md b/docs/content/commands/hugo_new_site.md
index 8c097e727..586d4db12 100644
--- a/docs/content/commands/hugo_new_site.md
+++ b/docs/content/commands/hugo_new_site.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo new site"
 slug: hugo_new_site
 url: /commands/hugo_new_site/
@@ -42,4 +42,4 @@ hugo new site [path] [flags]
 ### SEE ALSO
 * [hugo new](/commands/hugo_new/)	 - Create new content for your site
 
-###### Auto generated by spf13/cobra on 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_new_theme.md b/docs/content/commands/hugo_new_theme.md
index 317de98b7..355978fc1 100644
--- a/docs/content/commands/hugo_new_theme.md
+++ b/docs/content/commands/hugo_new_theme.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo new theme"
 slug: hugo_new_theme
 url: /commands/hugo_new_theme/
@@ -41,4 +41,4 @@ hugo new theme [name] [flags]
 ### SEE ALSO
 * [hugo new](/commands/hugo_new/)	 - Create new content for your site
 
-###### Auto generated by spf13/cobra on 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_server.md b/docs/content/commands/hugo_server.md
index 4c23c93fc..3171a8556 100644
--- a/docs/content/commands/hugo_server.md
+++ b/docs/content/commands/hugo_server.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo server"
 slug: hugo_server
 url: /commands/hugo_server/
@@ -83,4 +83,4 @@ hugo server [flags]
 ### SEE ALSO
 * [hugo](/commands/hugo/)	 - hugo builds your site
 
-###### Auto generated by spf13/cobra on 22-Jun-2017
+###### Auto generated by spf13/cobra on 29-Jun-2017
diff --git a/docs/content/commands/hugo_undraft.md b/docs/content/commands/hugo_undraft.md
index e082d0a15..5cac7b401 100644
--- a/docs/content/commands/hugo_undraft.md
+++ b/docs/content/commands/hugo_undraft.md
@@ -1,5 +1,5 @@
 ---
-date: 2017-06-22T21:51:29+02:00
+date: 2017-06-29T08:42:09+02:00
 title: "hugo undraft"
 slug: hugo_undraft
 url: /commands/hugo_undraft/
@@ -39,4 +39,4 @@ hugo undraft path/to/content [flags]
 ### SEE ALSO
 * [hugo](/commands/hugo/)	 - hugo builds your site
 
-