Merge commit 'aa5ac36a3eb68b86c803caec703869efefc8447e'

10 files changed, 6 insertions, 9 deletions

diff --git a/docs/content/en/templates/404.md b/docs/content/en/templates/404.md
index b7d62ec8f..1b82e9ebf 100644
--- a/docs/content/en/templates/404.md
+++ b/docs/content/en/templates/404.md
@@ -48,7 +48,7 @@ Your 404.html file can be set to load automatically when a visitor enters a mist
 
 * [GitHub Pages](/hosting-and-deployment/hosting-on-github/) and [GitLab Pages](/hosting-and-deployment/hosting-on-gitlab/). The 404 page is automatic.
 * Apache. You can specify `ErrorDocument 404 /404.html` in an `.htaccess` file in the root of your site.
-* Nginx. You might specify `error_page 404 /404.html;` in your `nginx.conf` file.
+* Nginx. You might specify `error_page 404 /404.html;` in your `nginx.conf` file. [Details here](https://nginx.org/en/docs/http/ngx_http_core_module.html#error_page).
 * Amazon AWS S3. When setting a bucket up for static web serving, you can specify the error file from within the S3 GUI.
 * Amazon CloudFront. You can specify the page in the Error Pages section in the CloudFront Console. [Details here](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/custom-error-pages.html)
 * Caddy Server. Using `errors { 404 /404.html }`. [Details here](https://caddyserver.com/docs/errors)
diff --git a/docs/content/en/templates/alternatives.md b/docs/content/en/templates/alternatives.md
index 8c57962e7..c5fde5b51 100644
--- a/docs/content/en/templates/alternatives.md
+++ b/docs/content/en/templates/alternatives.md
@@ -2,7 +2,6 @@
 title: DEPRECATED - Alternative Templating Languages
 linktitle: Alternative Templating
 description: DEPRECATED - Support for Ace & Amber templating has been removed in version 0.62
-godocref:
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-20
diff --git a/docs/content/en/templates/base.md b/docs/content/en/templates/base.md
index 990e6fc22..f2648bd52 100644
--- a/docs/content/en/templates/base.md
+++ b/docs/content/en/templates/base.md
@@ -2,7 +2,6 @@
 title: Base Templates and Blocks
 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
 lastmod: 2017-02-01
diff --git a/docs/content/en/templates/data-templates.md b/docs/content/en/templates/data-templates.md
index b3edf8f44..c36344776 100644
--- a/docs/content/en/templates/data-templates.md
+++ b/docs/content/en/templates/data-templates.md
@@ -106,7 +106,7 @@ Achievements:
   - "Reads documentation"
 {{</ code-toggle >}}
 
-You can use the following code to render the `Short Description` in your layout::
+You can use the following code to render the `Short Description` in your layout:
 
 ```
 <div>Short Description of {{.Site.Data.User0123.Name}}: <p>{{ index .Site.Data.User0123 "Short Description" | markdownify }}</p></div>
diff --git a/docs/content/en/templates/files.md b/docs/content/en/templates/files.md
index 28926441b..a448d7908 100644
--- a/docs/content/en/templates/files.md
+++ b/docs/content/en/templates/files.md
@@ -2,7 +2,6 @@
 title: Local File Templates
 linktitle: Local File Templates
 description: Hugo's `readDir` and `readFile` functions make it easy to traverse your project's directory structure and write file contents to your templates.
-godocref: https://golang.org/pkg/os/#FileInfo
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
diff --git a/docs/content/en/templates/introduction.md b/docs/content/en/templates/introduction.md
index fd34842d4..68f043403 100644
--- a/docs/content/en/templates/introduction.md
+++ b/docs/content/en/templates/introduction.md
@@ -2,7 +2,6 @@
 title: Introduction to Hugo Templating
 linktitle: Introduction
 description: Hugo uses Go's `html/template` and `text/template` libraries as the basis for the templating.
-godocref: https://golang.org/pkg/html/template/
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-25
diff --git a/docs/content/en/templates/lookup-order.md b/docs/content/en/templates/lookup-order.md
index 45e4e82e5..e021c8112 100644
--- a/docs/content/en/templates/lookup-order.md
+++ b/docs/content/en/templates/lookup-order.md
@@ -2,7 +2,6 @@
 title: Hugo's Lookup Order
 linktitle: Template Lookup Order
 description: Hugo searches for the layout to use for a given page in a well defined order, starting from the most specific.
-godocref:
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-07-05
diff --git a/docs/content/en/templates/output-formats.md b/docs/content/en/templates/output-formats.md
index 619ac449e..ca51523de 100644
--- a/docs/content/en/templates/output-formats.md
+++ b/docs/content/en/templates/output-formats.md
@@ -123,6 +123,9 @@ The following is the full list of configuration options for output formats and t
 `permalinkable`
 : make `.Permalink` and `.RelPermalink` return the rendering Output Format rather than main ([see below](#link-to-output-formats)). This is enabled by default for `HTML` and `AMP`. **Default:** `false`.
 
+`weight`
+: Setting this to a non-zero value will be used as the first sort criteria.
+
 ## Output Formats for Pages
 
 A `Page` in Hugo can be rendered to multiple *output formats* on the file
diff --git a/docs/content/en/templates/shortcode-templates.md b/docs/content/en/templates/shortcode-templates.md
index 888b7ca42..487037bf0 100644
--- a/docs/content/en/templates/shortcode-templates.md
+++ b/docs/content/en/templates/shortcode-templates.md
@@ -369,7 +369,7 @@ More shortcode examples can be found in the [shortcodes directory for spf13.com]
 
 ## Inline Shortcodes
 
-{{< new-in "0.52.0" >}}
+{{< new-in "0.52" >}}
 
 Since Hugo 0.52, you can implement your shortcodes inline -- e.g. where you use them in the content file. This can be useful for scripting that you only need in one place.
 
diff --git a/docs/content/en/templates/template-debugging.md b/docs/content/en/templates/template-debugging.md
index 419581b90..fbe873827 100644
--- a/docs/content/en/templates/template-debugging.md
+++ b/docs/content/en/templates/template-debugging.md
@@ -2,7 +2,6 @@
 title: Template Debugging
 # linktitle: Template Debugging
 description: You can use Go templates' `printf` function to debug your Hugo  templates. These snippets provide a quick and easy visualization of the variables available to you in different contexts.
-godocref: https://golang.org/pkg/fmt/
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01