Merge commit 'a95896878f4b4a79448b39ce93a4e0d3258b4a43'

12 files changed, 61 insertions, 249 deletions

diff --git a/docs/alias.txt b/docs/alias.txt
deleted file mode 100644
index 11733beea..000000000
--- a/docs/alias.txt
+++ /dev/null
@@ -1,239 +0,0 @@
-content/en/tools/frontends.md:aliases: []
-content/en/tools/search.md:aliases: []
-content/en/tools/migrations.md:aliases: [/developer-tools/migrations/,/developer-tools/migrated/]
-content/en/tools/editors.md:aliases: []
-content/en/tools/starter-kits.md:aliases: [/developer-tools/migrations/,/developer-tools/migrated/]
-content/en/tools/other.md:aliases: []
-content/en/tools/_index.md:aliases: [/tools/]
-content/en/about/license.md:aliases: [/meta/license]
-content/en/about/benefits.md:aliases: []
-content/en/about/hugo-and-gdpr.md:aliases: [/privacy/,/gdpr/]
-content/en/about/features.md:* Redirects via [aliases][]
-content/en/about/features.md:[aliases]: /content-management/urls/#aliases
-content/en/about/what-is-hugo.md:aliases: [/overview/introduction/,/about/why-i-built-hugo/]
-content/en/about/new-in-032/index.md:aliases: []
-content/en/about/_index.md:aliases: [/about-hugo/,/docs/]
-content/en/troubleshooting/build-performance.md:aliases: []
-content/en/troubleshooting/faq.md:aliases: [/faq/]
-content/en/troubleshooting/_index.md:aliases: [/troubleshooting/faqs/,/faqs/]
-content/en/hosting-and-deployment/hosting-on-firebase.md:aliases: []
-content/en/hosting-and-deployment/hosting-on-github.md:aliases: [/tutorials/github-pages-blog/]
-content/en/hosting-and-deployment/hosting-on-netlify.md:aliases: []
-content/en/hosting-and-deployment/deployment-with-nanobox.md:aliases: [/tutorials/deployment-with-nanobox/]
-content/en/hosting-and-deployment/deployment-with-wercker.md:aliases: [/tutorials/automated-deployments/]
-content/en/hosting-and-deployment/deployment-with-rsync.md:aliases: [/tutorials/deployment-with-rsync/]
-content/en/hosting-and-deployment/hosting-on-keycdn.md:aliases: []
-content/en/hosting-and-deployment/hosting-on-gitlab.md:aliases: [/tutorials/hosting-on-gitlab/]
-content/en/hosting-and-deployment/_index.md:aliases: []
-content/en/hosting-and-deployment/hosting-on-bitbucket.md:aliases: [/tutorials/hosting-on-bitbucket/]
-content/en/hugo-pipes/introduction.md:aliases: [/assets/]
-content/en/hugo-pipes/introduction.md:### Method aliases
-content/en/hugo-pipes/introduction.md:Non-transformation methods deprived of such aliases are `resources.Get`, `resources.FromString`, `resources.ExecuteAsTemplate` and `resources.Concat`.
-content/en/getting-started/directory-structure.md:aliases: [/overview/source-directory/]
-content/en/getting-started/usage.md:aliases: [/overview/usage/,/extras/livereload/,/doc/usage/,/usage/]
-content/en/getting-started/quick-start.md:aliases: [/quickstart/,/overview/quickstart/]
-content/en/getting-started/installing.md:aliases: [/tutorials/installing-on-windows/,/tutorials/installing-on-mac/,/overview/installing/,/getting-started/install,/install/]
-content/en/getting-started/configuration.md:aliases: [/overview/source-directory/,/overview/configuration/]
-content/en/getting-started/configuration.md:In the list to the right, values starting with ":" are date handlers with a special meaning (see below). The others are just names of date parameters (case insensitive) in your front matter configuration.  Also note that Hugo have some built-in aliases to the above: `lastmod` => `modified`, `publishDate` => `pubdate`, `published` and `expiryDate` => `unpublishdate`. With that, as an example, using `pubDate` as a date in front matter, will, by default, be assigned to `.PublishDate`.
-content/en/getting-started/_index.md:aliases: [/overview/introduction/]
-content/en/news/0.18-relnotes/index.md:aliases: [/0-18/]
-content/en/news/0.19-relnotes/index.md:aliases: [/0-19/]
-content/en/news/0.20.3-relnotes/index.md:aliases: [/0-20-3/]
-content/en/news/0.20.2-relnotes/index.md:aliases: [/0-20-2/]
-content/en/news/0.24.1-relnotes/index.md:aliases: [/0-24-1/]
-content/en/news/0.20.4-relnotes/index.md:aliases: [/0-20-4/]
-content/en/news/0.20.5-relnotes/index.md:aliases: [/0-20-5/]
-content/en/news/0.21-relnotes/index.md:aliases: [/0-21/]
-content/en/news/0.20-relnotes/index.md:aliases: [/0-20/]
-content/en/news/0.25.1-relnotes/index.md:aliases: [/0-25-1/]
-content/en/news/0.10-relnotes/index.md:- Support for unicode URLs, aliases and indexes
-content/en/news/http2-server-push-in-hugo.md:aliases: []
-content/en/news/http2-server-push-in-hugo.md:The template above creates 301 redirects for your [aliases](/content-management/urls/#aliases), so you will probably want to turn off aliases in your `config.toml`: `disableAliases = true`.
-content/en/news/0.20.1-relnotes/index.md:aliases: [/0-20-1/]
-content/en/news/0.25-relnotes/index.md:aliases: [/0-25/]
-content/en/news/0.24-relnotes/index.md:aliases: [/0-24/]
-content/en/news/0.16-relnotes/index.md:aliases: [/0-16/]
-content/en/news/0.17-relnotes/index.md:aliases: [/0-17/]
-content/en/news/0.20.7-relnotes/index.md:aliases: [/0-20-7/]
-content/en/news/0.20.6-relnotes/index.md:aliases: [/0-20-6/]
-content/en/news/0.22-relnotes/index.md:aliases: [/0-22/]
-content/en/news/0.22-relnotes/index.md:* Add `noindex` tag to HTML generated by Hugo aliases [d5ab7f08](https://github.com/gohugoio/hugo/commit/d5ab7f087d967b30e7de7d789e6ad3091b42f1f7) [@onedrawingperday](https://github.com/onedrawingperday) 
-content/en/news/0.23-relnotes/index.md:aliases: [/0-23/]
-content/en/news/0.22.1-relnotes/index.md:aliases: [/0-22-1/]
-content/en/news/_index.md:aliases: [/release-notes/]
-content/en/variables/taxonomy.md:aliases: []
-content/en/variables/site.md:aliases: [/variables/site-variables/]
-content/en/variables/menus.md:aliases: [/variables/menu/]
-content/en/variables/git.md:aliases: [/extras/gitinfo/]
-content/en/variables/files.md:aliases: [/variables/file-variables/]
-content/en/variables/page.md:aliases: []
-content/en/variables/shortcodes.md:aliases: []
-content/en/variables/sitemap.md:aliases: []
-content/en/variables/_index.md:aliases: [/templates/variables/]
-content/en/variables/hugo.md:aliases: []
-content/en/contribute/themes.md:aliases: [/contribute/theme/]
-content/en/contribute/documentation.md:aliases: [/contribute/docs/]
-content/en/contribute/development.md:aliases: [/contribute/development/]
-content/en/contribute/development.md:Now we'll create an [alias in Bash](http://tldp.org/LDP/abs/html/aliases.html) so that typing `git` actually runs `Hub`:
-content/en/contribute/_index.md:aliases: [/tutorials/how-to-contribute-to-hugo/,/community/contributing/]
-content/en/documentation.md:aliases: []
-content/en/functions/countrunes.md:aliases: [/functions/countrunes/]
-content/en/functions/ref.md:aliases: []
-content/en/functions/safeHTMLAttr.md:aliases: []
-content/en/functions/echoparam.md:aliases: []
-content/en/functions/urls.Parse.md:aliases: []
-content/en/functions/ismenucurrent.md:aliases: []
-content/en/functions/last.md:aliases: []
-content/en/functions/countwords.md:aliases: [/functions/countwords/]
-content/en/functions/i18n.md:aliases: []
-content/en/functions/pluralize.md:aliases: []
-content/en/functions/htmlEscape.md:aliases: []
-content/en/functions/default.md:aliases: []
-content/en/functions/lower.md:aliases: []
-content/en/functions/lang.Merge.md:aliases: []
-content/en/functions/intersect.md:aliases: []
-content/en/functions/jsonify.md:aliases: []
-content/en/functions/lt.md:aliases: []
-content/en/functions/shuffle.md:aliases: []
-content/en/functions/replacere.md:aliases: []
-content/en/functions/uniq.md:aliases: []
-content/en/functions/sha.md:aliases: []
-content/en/functions/split.md:aliases: []
-content/en/functions/getenv.md:aliases: []
-content/en/functions/first.md:aliases: []
-content/en/functions/strings.TrimRight.md:aliases: []
-content/en/functions/hasmenucurrent.md:aliases: []
-content/en/functions/querify.md:aliases: []
-content/en/functions/strings.TrimSuffix.md:aliases: []
-content/en/functions/get.md:aliases: []
-content/en/functions/int.md:aliases: []
-content/en/functions/slicestr.md:aliases: []
-content/en/functions/singularize.md:aliases: []
-content/en/functions/strings.RuneCount.md:aliases: []
-content/en/functions/replace.md:aliases: []
-content/en/functions/haschildren.md:aliases: []
-content/en/functions/title.md:aliases: []
-content/en/functions/seq.md:aliases: []
-content/en/functions/union.md:aliases: []
-content/en/functions/md5.md:aliases: []
-content/en/functions/apply.md:aliases: []
-content/en/functions/GetPage.md:aliases: []
-content/en/functions/ge.md:aliases: []
-content/en/functions/readfile.md:aliases: []
-content/en/functions/index-function.md:aliases: [/functions/index/]
-content/en/functions/string.md:aliases: []
-content/en/functions/dict.md:aliases: []
-content/en/functions/math.md:aliases: []
-content/en/functions/NumFmt.md:aliases: []
-content/en/functions/readdir.md:aliases: []
-content/en/functions/hasPrefix.md:aliases: []
-content/en/functions/le.md:aliases: []
-content/en/functions/safeURL.md:aliases: []
-content/en/functions/absurl.md:aliases: []
-content/en/functions/base64.md:aliases: []
-content/en/functions/unix.md:aliases: []
-content/en/functions/safeCSS.md:aliases: []
-content/en/functions/render.md:aliases: []
-content/en/functions/abslangurl.md:aliases: []
-content/en/functions/partialCached.md:aliases: []
-content/en/functions/strings.TrimPrefix.md:aliases: []
-content/en/functions/slice.md:aliases: []
-content/en/functions/ne.md:aliases: []
-content/en/functions/time.md:aliases: []
-content/en/functions/strings.TrimLeft.md:aliases: []
-content/en/functions/delimit.md:aliases: []
-content/en/functions/relLangURL.md:aliases: []
-content/en/functions/in.md:aliases: []
-content/en/functions/format.md:aliases: []
-content/en/functions/param.md:aliases: []
-content/en/functions/now.md:aliases: []
-content/en/functions/findRe.md:aliases: []
-content/en/functions/eq.md:aliases: []
-content/en/functions/errorf.md:aliases: []
-content/en/functions/relurl.md:aliases: []
-content/en/functions/after.md:aliases: []
-content/en/functions/scratch.md:aliases: [/extras/scratch/,/doc/scratch/]
-content/en/functions/substr.md:aliases: []
-content/en/functions/plainify.md:aliases: []
-content/en/functions/humanize.md:aliases: []
-content/en/functions/adddate.md:aliases: []
-content/en/functions/fileExists.md:aliases: []
-content/en/functions/upper.md:aliases: []
-content/en/functions/sort.md:aliases: []
-content/en/functions/len.md:aliases: []
-content/en/functions/safeJS.md:aliases: []
-content/en/functions/htmlUnescape.md:aliases: []
-content/en/functions/float.md:aliases: []
-content/en/functions/markdownify.md:aliases: []
-content/en/functions/_index.md:aliases: [/layout/functions/,/templates/functions]
-content/en/functions/gt.md:aliases: []
-content/en/functions/range.md:aliases: []
-content/en/functions/relref.md:aliases: []
-content/en/functions/isset.md:aliases: []
-content/en/content-management/organization/index.md:aliases: [/content/sections/]
-content/en/content-management/formats.md:aliases: [/content/markdown-extras/,/content/supported-formats/,/doc/supported-formats/,/tutorials/mathjax/]
-content/en/content-management/authors.md:aliases: [/content/archetypes/]
-content/en/content-management/front-matter.md:aliases: [/content/front-matter/]
-content/en/content-management/front-matter.md:aliases
-content/en/content-management/front-matter.md:: 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.
-content/en/content-management/front-matter.md:[aliases]: /content-management/urls/#aliases/
-content/en/content-management/taxonomies.md:aliases: [/taxonomies/overview/,/taxonomies/usage/,/indexes/overview/,/doc/indexes/,/extras/indexes]
-content/en/content-management/static-files.md:aliases: [/static-files]
-content/en/content-management/summaries.md:aliases: [/content/summaries/,/content-management/content-summaries/]
-content/en/content-management/comments.md:aliases: [/extras/comments/]
-content/en/content-management/menus.md:aliases: [/extras/menus/]
-content/en/content-management/urls.md:description: Hugo supports permalinks, aliases, link canonicalization, and multiple options for handling relative vs absolute URLs.
-content/en/content-management/urls.md:keywords: [aliases,redirects,permalinks,urls]
-content/en/content-management/urls.md:aliases: [/extras/permalinks/,/extras/aliases/,/extras/urls/,/doc/redirects/,/doc/alias/,/doc/aliases/]
-content/en/content-management/urls.md:Luckily, redirects can be handled easily with **aliases** in Hugo.
-content/en/content-management/urls.md:Let's assume you create a new piece of content at `content/posts/my-awesome-blog-post.md`. The content is a revision of your previous post at `content/posts/my-original-url.md`. You can create an `aliases` field in the front matter of your new `my-awesome-blog-post.md` where you can add previous paths. The following examples show how to create this field in TOML and YAML front matter, respectively.
-content/en/content-management/urls.md:aliases = [
-content/en/content-management/urls.md:aliases:
-content/en/content-management/urls.md:Now when you visit any of the locations specified in aliases---i.e., *assuming the same site domain*---you'll be redirected to the page they are specified on. For example, a visitor to `example.com/posts/my-original-url/` will be immediately redirected to `example.com/posts/my-awesome-post/`.
-content/en/content-management/urls.md:On [multilingual sites][multilingual], each translation of a post can have unique aliases. To use the same alias across multiple languages, prefix it with the language code.
-content/en/content-management/urls.md:aliases:
-content/en/content-management/urls.md:When aliases are specified, Hugo creates a directory to match the alias entry. Inside the directory, Hugo creates an `.html` file specifying the canonical URL for the page and the new redirect target.
-content/en/content-management/urls.md:aliases: [/posts/my-old-url/]
-content/en/content-management/urls.md:1. Hugo makes no assumptions about aliases. They also do not change based
-content/en/content-management/sections.md:aliases: [/content/sections/]
-content/en/content-management/related.md:aliases: [/content/related/,/related/]
-content/en/content-management/archetypes.md:aliases: [/content/archetypes/]
-content/en/content-management/toc.md:aliases: [/extras/toc/]
-content/en/content-management/cross-references.md:aliases: [/extras/crossreferences/]
-content/en/content-management/multilingual.md:aliases: [/content/multilingual/,/tutorials/create-a-multilingual-site/]
-content/en/content-management/shortcodes.md:aliases: [/extras/shortcodes/]
-content/en/content-management/types.md:aliases: [/content/types]
-content/en/content-management/syntax-highlighting.md:aliases: [/extras/highlighting/,/extras/highlight/,/tools/syntax-highlighting/]
-content/en/content-management/syntax-highlighting.md:The full list of Chroma lexers and their aliases (which is the identifier used in the `hightlight` template func or when doing highlighting in code fences):
-content/en/content-management/_index.md:aliases: [/content/,/content/organization]
-content/en/templates/taxonomy-templates.md:aliases: [/taxonomies/displaying/,/templates/terms/,/indexes/displaying/,/taxonomies/templates/,/indexes/ordering/, /templates/taxonomies/, /templates/taxonomy/]
-content/en/templates/sitemap-template.md:aliases: [/layout/sitemap/,/templates/sitemap/]
-content/en/templates/lookup-order.md:aliases: [/templates/lookup/]
-content/en/templates/base.md:aliases: [/templates/blocks/,/templates/base-templates-and-blocks/]
-content/en/templates/alternatives.md:aliases: [/templates/ace/,/templates/amber/]
-content/en/templates/views.md:aliases: []
-content/en/templates/shortcode-templates.md:aliases: []
-content/en/templates/robots.md:aliases: [/extras/robots-txt/]
-content/en/templates/section-templates.md:aliases: [/templates/sections/]
-content/en/templates/pagination.md:aliases: [/extras/pagination,/doc/pagination/]
-content/en/templates/homepage.md:aliases: [/layout/homepage/,/templates/homepage-template/]
-content/en/templates/introduction.md:aliases: [/layouts/introduction/,/layout/introduction/, /templates/go-templates/]
-content/en/templates/template-debugging.md:aliases: []
-content/en/templates/menu-templates.md:aliases: [/templates/menus/]
-content/en/templates/lists.md:aliases: [/templates/list/,/layout/indexes/]
-content/en/templates/ordering-and-grouping.md:aliases: [/templates/ordering/,/templates/grouping/]
-content/en/templates/partials.md:aliases: [/templates/partial/,/layout/chrome/,/extras/analytics/]
-content/en/templates/data-templates.md:aliases: [/extras/datafiles/,/extras/datadrivencontent/,/doc/datafiles/]
-content/en/templates/single-page-templates.md:aliases: [/layout/content/]
-content/en/templates/404.md:aliases: []
-content/en/templates/files.md:aliases: [/extras/localfiles/,/templates/local-files/]
-content/en/templates/internal.md:aliases: []
-content/en/templates/output-formats.md:aliases: [/templates/outputs/,/extras/output-formats/,/content-management/custom-outputs/]
-content/en/templates/output-formats.md:: used in situations only relevant for `HTML`-type formats; e.g., page aliases.
-content/en/templates/_index.md:aliases: [/templates/overview/,/templates/content]
-content/en/maintenance/_index.md:aliases: []
-content/en/showcase/1password-support/index.md:aliases: [/showcase/1password/]
-content/en/themes/creating.md:aliases: [/themes/creation/,/tutorials/creating-a-new-theme/]
-content/en/themes/theme-components.md:aliases: [/themes/customize/,/themes/customizing/]
-content/en/themes/installing-and-using-themes.md:aliases: [/themes/usage/,/themes/installing/]
-content/en/themes/_index.md:aliases: [/themes/overview/]
diff --git a/docs/content/en/content-management/multilingual.md b/docs/content/en/content-management/multilingual.md
index fab9c17bf..45b614351 100644
--- a/docs/content/en/content-management/multilingual.md
+++ b/docs/content/en/content-management/multilingual.md
@@ -19,6 +19,8 @@ toc: true
 
 You should define the available languages in a `languages` section in your site configuration.
 
+> Also See [Hugo Multilingual Part 1: Content translation](https://regisphilibert.com/blog/2018/08/hugo-multilingual-part-1-managing-content-translation/)
+
 ## Configure Languages
 
 The following is an example of a site configuration for a multilingual Hugo project:
diff --git a/docs/content/en/getting-started/configuration.md b/docs/content/en/getting-started/configuration.md
index 18f9e7025..3f36eb28c 100644
--- a/docs/content/en/getting-started/configuration.md
+++ b/docs/content/en/getting-started/configuration.md
@@ -44,6 +44,9 @@ config file(s).
 archetypeDir ("archetypes")
 : The directory where Hugo finds archetype files (content templates).
 
+assetDir ("assets")
+: The directory where Hugo finds asset files used in [Hugo Pipes](/hugo-pipes/).
+
 baseURL
 : Hostname (and path) to the root, e.g. http://bep.is/
 
@@ -320,8 +323,8 @@ The default configuration is:
 
 ```toml
 [frontmatter]
-date = ["date","publishDate", "lastmod"]
-lastmod = [":git" "lastmod", "date","publishDate"]
+date = ["date", "publishDate", "lastmod"]
+lastmod = [":git", "lastmod", "date", "publishDate"]
 publishDate = ["publishDate", "date"]
 expiryDate = ["expiryDate"]
 ```
@@ -330,7 +333,7 @@ If you, as an example, have a non-standard date parameter in some of your conten
 
  ```toml
 [frontmatter]
-date = [ "myDate", ":default"]
+date = ["myDate", ":default"]
 ```
 
 The `:default` is a shortcut to the default settings. The above will set `.Date` to the date value in `myDate` if present, if not we will look in `date`,`publishDate`, `lastmod` and pick the first valid date.
@@ -347,7 +350,7 @@ An example:
 
  ```toml
 [frontmatter]
-lastmod = ["lastmod" ,":fileModTime", ":default"]
+lastmod = ["lastmod", ":fileModTime", ":default"]
 ```
 
 
diff --git a/docs/content/en/getting-started/directory-structure.md b/docs/content/en/getting-started/directory-structure.md
index ebfe6646a..bf06dc538 100644
--- a/docs/content/en/getting-started/directory-structure.md
+++ b/docs/content/en/getting-started/directory-structure.md
@@ -27,6 +27,7 @@ Running the `hugo new site` generator from the command line will create a direct
 ```
 .
 ├── archetypes
+├── assets
 ├── config.toml
 ├── content
 ├── data
@@ -44,6 +45,9 @@ The following is a high-level overview of each of the directories with links to
 : You can create new content files in Hugo using the `hugo new` command.
 By default, Hugo will create new content files with at least `date`, `title` (inferred from the file name), and `draft = true`. This saves time and promotes consistency for sites using multiple content types. You can create your own [archetypes][] with custom preconfigured front matter fields as well.
 
+[`assets`][]
+: Stores all the files which need be processed by [Hugo Pipes]({{< ref "/hugo-pipes" >}}). Only the files whose `.Permalink` or `.RelPermalink` are used will be published to the `public` directory.
+
 [`config.toml`](/getting-started/configuration/)
 : Every Hugo project should have a configuration file in TOML, YAML, or JSON format at the root. Many sites may need little to no configuration, but Hugo ships with a large number of [configuration directives][] for more granular directions on how you want Hugo to build your website.
 
@@ -58,16 +62,12 @@ used by Hugo when generating your website. You can write these files in YAML, JS
 : Stores templates in the form of `.html` files that specify how views of your content will be rendered into a static website. Templates include [list pages][lists], your [homepage][], [taxonomy templates][], [partials][], [single page templates][singles], and more.
 
 [`static`][]
-: Stores all the static content for your future website: images, CSS, JavaScript, etc. When Hugo builds your site, all assets inside your static directory are copied over as-is. A good example of using the `static` folder is for [verifying site ownership on Google Search Console][searchconsole], where you want Hugo to copy over a complete HTML file without modifying its content.
+: Stores all the static content: images, CSS, JavaScript, etc. When Hugo builds your site, all assets inside your static directory are copied over as-is. A good example of using the `static` folder is for [verifying site ownership on Google Search Console][searchconsole], where you want Hugo to copy over a complete HTML file without modifying its content.
 
 {{% note %}}
 From **Hugo 0.31** you can have multiple static directories.
 {{% /note %}}
 
-{{% note %}}
-Hugo does not currently ship with an asset pipeline ([#3207](https://github.com/gohugoio/hugo/issues/3207)). You can solicit support from the community in the [Hugo forums](https://discourse.gohugo.io) or check out a few of the [Hugo starter kits](/tools/starter-kits/) for examples of how Hugo developers are managing static assets.
-{{% /note %}}
-
 
 [archetypes]: /content-management/archetypes/
 [configuration directives]: /getting-started/configuration/#all-variables-yaml
@@ -87,3 +87,4 @@ Hugo does not currently ship with an asset pipeline ([#3207](https://github.com/
 [taxonomies]: /content-management/taxonomies/
 [taxonomy templates]: /templates/taxonomy-templates/
 [types]: /content-management/types/
+[`assets`]: {{< ref "/hugo-pipes/introduction#asset-directory" >}}
diff --git a/docs/content/en/getting-started/installing.md b/docs/content/en/getting-started/installing.md
index c08a22835..deb2605b1 100644
--- a/docs/content/en/getting-started/installing.md
+++ b/docs/content/en/getting-started/installing.md
@@ -62,6 +62,14 @@ If you are on a Windows machine and use [Chocolatey][] for package management, y
 choco install hugo -confirm
 {{< /code >}}
 
+### Scoop (Windows)
+
+If you are on a Windows machine and use [Scoop][] for package management, you can install Hugo with the following one-liner:
+
+```bash
+scoop install hugo
+```
+
 ### Source
 
 #### Prerequisite Tools
@@ -500,6 +508,7 @@ Now that you've installed Hugo, read the [Quick Start guide][quickstart] and exp
 [quickstart]: /getting-started/quick-start/
 [redhatforum]: https://discourse.gohugo.io/t/solved-fedora-copr-repository-out-of-service/2491
 [releases]: https://github.com/gohugoio/hugo/releases
+[Scoop]: https://scoop.sh/
 [snaps]: http://snapcraft.io/docs/core/install
 [windowsarch]: https://esupport.trendmicro.com/en-us/home/pages/technical-support/1038680.aspx
 [Windows Environment Variables Editor]: http://eveditor.com/
diff --git a/docs/content/en/showcase/arolla-cocoon/bio.md b/docs/content/en/showcase/arolla-cocoon/bio.md
new file mode 100644
index 000000000..f01228828
--- /dev/null
+++ b/docs/content/en/showcase/arolla-cocoon/bio.md
@@ -0,0 +1,6 @@
+
+[Camping Arolla](http://www.camping-arolla.com/) is located in the heart of the Swiss Alps, at an altitude of 1.950 meters.
+
+The site is built by:
+
+* [Didier Divinerites](https://github.com/divinerites)
diff --git a/docs/content/en/showcase/arolla-cocoon/featured-template.png b/docs/content/en/showcase/arolla-cocoon/featured-template.png
new file mode 100644
index 000000000..d95bc5c83
--- /dev/null
+++ b/docs/content/en/showcase/arolla-cocoon/featured-template.png
diff --git a/docs/content/en/showcase/arolla-cocoon/index.md b/docs/content/en/showcase/arolla-cocoon/index.md
new file mode 100644
index 000000000..730b9fda2
--- /dev/null
+++ b/docs/content/en/showcase/arolla-cocoon/index.md
@@ -0,0 +1,30 @@
+---
+
+title: Cocoon & Cosy
+date: 2018-08-10
+description: "Showcase: \"Emergency setup a dedicated site in an afternoon.\""
+siteURL: https://www.cocoon-arolla.com
+siteSource: https://github.com/divinerites/cocoon
+byline: "[Didier Divinerites](https://github.com/divinerites)"
+
+---
+
+Swiss [Arolla campsite](http://www.camping-arolla.com/) runs the highest campsite in Europe and I'm completely re-doing their actuel Website with Hugo.
+
+But they just launch a brand new offer (luxury tents with bed and fire oven), and we couldn't wait for the proper new website for having this promoted: we needed the website up and running within 24h!
+
+So we decided to quickly launch a dedicated [independant web site](https://www.cocoon-arolla.com) using all the powefull tools included with [gohugo.io](http://gohugo.io) and some things we already knew & used:
+
+- Choose a spectacular landing theme in the rich [Hugo Themes](http://themes.gohugo.io/) collection : [Airspace Theme](https://themes.gohugo.io/airspace-hugo/) by Themefisher.
+- Replace the main images.
+- Add a [hugo-easy-gallery / photoswipe](https://github.com/liwenyip/hugo-easy-gallery) on the main page with attractive images.
+- Add the promo video with a simple *vimeo* shortcode.
+- Replace the Google Maps widget by the [OpenStreetMap](http://www.openstreetmap.org/) equivalent
+- Use a [Zotabox](http://www.zotabox.com) contact form.
+- Write the content in French & in English directly on the content pages, describe their services, add fun facts and true testimonies.
+- Setup a GPRD compliant site with the new Hugo options.
+- Use [Netlify](https://www.netlify.com) for publishing it in a breeze.
+
+The first version was up in 4 hours, and the polished 2 languages version was published on Netlify the next day.
+
+This would have been impossible to do it in such a short time without all the powerfull Hugo tools and Netlify simplicity.
diff --git a/docs/content/zh/templates/base.md b/docs/content/zh/templates/base.md
index 68f245662..4845f608f 100644
--- a/docs/content/zh/templates/base.md
+++ b/docs/content/zh/templates/base.md
@@ -4,7 +4,7 @@ linktitle:
 description: The base and block constructs allow you to define the outer shell of your master templates (i.e., the chrome of the page).
 godocref: https://golang.org/pkg/text/template/#example_Template_block
 date: 2017-02-01
-publishdate: 2017-02-01
+publishdate: 2018-08-11
 lastmod: 2017-02-01
 categories: [templates,fundamentals]
 keywords: [blocks,base]
diff --git a/docs/resources/_gen/images/showcase/arolla-cocoon/featured-template_hu22aab819ab27e4f878d1ff0b7cf78050_451984_1024x512_fill_catmullrom_top_2.png b/docs/resources/_gen/images/showcase/arolla-cocoon/featured-template_hu22aab819ab27e4f878d1ff0b7cf78050_451984_1024x512_fill_catmullrom_top_2.png
new file mode 100644
index 000000000..750a1100b
--- /dev/null
+++ b/docs/resources/_gen/images/showcase/arolla-cocoon/featured-template_hu22aab819ab27e4f878d1ff0b7cf78050_451984_1024x512_fill_catmullrom_top_2.png
diff --git a/docs/resources/_gen/images/showcase/arolla-cocoon/featured-template_hu22aab819ab27e4f878d1ff0b7cf78050_451984_640x0_resize_catmullrom_2.png b/docs/resources/_gen/images/showcase/arolla-cocoon/featured-template_hu22aab819ab27e4f878d1ff0b7cf78050_451984_640x0_resize_catmullrom_2.png
new file mode 100644
index 000000000..b653310b1
--- /dev/null
+++ b/docs/resources/_gen/images/showcase/arolla-cocoon/featured-template_hu22aab819ab27e4f878d1ff0b7cf78050_451984_640x0_resize_catmullrom_2.png
diff --git a/docs/resources/_gen/images/showcase/arolla-cocoon/featured-template_hu22aab819ab27e4f878d1ff0b7cf78050_451984_ea485187288cde4b679b149346aca832.png b/docs/resources/_gen/images/showcase/arolla-cocoon/featured-template_hu22aab819ab27e4f878d1ff0b7cf78050_451984_ea485187288cde4b679b149346aca832.png
new file mode 100644
index 000000000..e36362747
--- /dev/null
+++ b/docs/resources/_gen/images/showcase/arolla-cocoon/featured-template_hu22aab819ab27e4f878d1ff0b7cf78050_451984_ea485187288cde4b679b149346aca832.png