Merge commit 'c9403cbceaaeff53ff4833561f4eefe1dc1a405e'

13 files changed, 35 insertions, 11 deletions

diff --git a/docs/content/en/content-management/image-processing/index.md b/docs/content/en/content-management/image-processing/index.md
index e865b0846..e0e0c77cb 100644
--- a/docs/content/en/content-management/image-processing/index.md
+++ b/docs/content/en/content-management/image-processing/index.md
@@ -18,14 +18,23 @@ menu:
 
 The `image` is a [Page Resource]({{< relref "/content-management/page-resources" >}}), and the processing methods listed below do not work on images inside your `/static` folder.
 
-To get all images in a [Page Bundle]({{< relref "/content-management/organization#page-bundles" >}}):
+To print all images paths in a [Page Bundle]({{< relref "/content-management/organization#page-bundles" >}}):
 
 ```go-html-template
 {{ with .Resources.ByType "image" }}
+{{ range . }}
+{{ .RelPermalink }}
+{{ end }}
 {{ end }}
 
 ```
 
+## The Image Resource
+
+The `image` resource can also be retrieved from a [global resource]({{< relref "/hugo-pipes/introduction#from-file-to-resource" >}})
+
+{{- $image := resources.Get "images/logo.jpg" -}}
+
 ## Image Processing Methods
 
 The `image` resource implements the methods `Resize`, `Fit` and `Fill`, each returning the transformed image using the specified dimensions and processing options. The `image` resource also, since Hugo 0.58, implements the method `Exif` and `Filter`.
diff --git a/docs/content/en/content-management/page-bundles.md b/docs/content/en/content-management/page-bundles.md
index 0d665759c..dc866445b 100644
--- a/docs/content/en/content-management/page-bundles.md
+++ b/docs/content/en/content-management/page-bundles.md
@@ -73,6 +73,14 @@ my-post
 : This leaf bundle has the `index.md`, two other content
     Markdown files and two image files.
 
+image1
+: This image is a page resource of `my-post`
+    and only available in `my-post/index.md` resources.
+
+image2
+: This image is a page resource of `my-post`
+    and only available in `my-post/index.md` resources.
+
 my-other-post
 : This leaf bundle has only the `index.md`.
 
diff --git a/docs/content/en/content-management/page-resources.md b/docs/content/en/content-management/page-resources.md
index d064d6bdc..83afb133b 100644
--- a/docs/content/en/content-management/page-resources.md
+++ b/docs/content/en/content-management/page-resources.md
@@ -14,6 +14,10 @@ menu:
     weight: 31
 ---
 
+Page resources are available for [page bundles]({{< relref "/content-management/page-bundles" >}}) only,
+i.e. a directory with either a `index.md`, or `_index.md` file at its root. Resources are only attached to
+the lowest page they are bundled with, and simple which names does not contain `index.md` are not attached any resource.
+
 ## Properties
 
 ResourceType
diff --git a/docs/content/en/functions/len.md b/docs/content/en/functions/len.md
index e95d49c4a..662b24c16 100644
--- a/docs/content/en/functions/len.md
+++ b/docs/content/en/functions/len.md
@@ -7,6 +7,9 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-04-18
 categories: [functions]
+menu:
+  docs:
+    parent: "functions"
 keywords: []
 signature: ["len INPUT"]
 workson: [lists,taxonomies,terms]
diff --git a/docs/content/en/functions/where.md b/docs/content/en/functions/where.md
index be95c127b..405d4ccfd 100644
--- a/docs/content/en/functions/where.md
+++ b/docs/content/en/functions/where.md
@@ -138,7 +138,7 @@ You can also nest `where` clauses to drill down on lists of content by more than
 
 Filtering only works for set fields. To check whether a field is set or exists, you can use the operand `nil`.
 
-This can be useful to filter a small amount of pages from a large pool. Instead of set field on all pages, you can set field on required pages only.
+This can be useful to filter a small amount of pages from a large pool. Instead of setting a field on all pages, you can set that field on required pages only.
 
 Only the following operators are available for `nil`
 
diff --git a/docs/content/en/getting-started/configuration-markup.md b/docs/content/en/getting-started/configuration-markup.md
index 09816676a..337fe00ef 100644
--- a/docs/content/en/getting-started/configuration-markup.md
+++ b/docs/content/en/getting-started/configuration-markup.md
@@ -134,7 +134,7 @@ PlainText
 Here is a code example for how the render-link.html template could look:
 
 {{< code file="layouts/_default/_markup/render-link.html" >}}
-<a href="{{ .Destination | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .Destination "http" }} target="_blank"{{ end }}>{{ .Text | safeHTML }}</a>
+<a href="{{ .Destination | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .Destination "http" }} target="_blank" rel="noopener"{{ end }}>{{ .Text | safeHTML }}</a>
 {{< /code >}}
 
 #### Image Markdown example:
diff --git a/docs/content/en/news/0.70.0-relnotes/hugo-70-featured.png b/docs/content/en/news/0.70.0-relnotes/hugo-70-featured.png
new file mode 100644
index 000000000..3b9c67d5f
--- /dev/null
+++ b/docs/content/en/news/0.70.0-relnotes/hugo-70-featured.png
diff --git a/docs/content/en/news/0.70.0-relnotes/index.md b/docs/content/en/news/0.70.0-relnotes/index.md
index 522b53cf6..8a6c25b00 100644
--- a/docs/content/en/news/0.70.0-relnotes/index.md
+++ b/docs/content/en/news/0.70.0-relnotes/index.md
@@ -1,12 +1,12 @@
 
 ---
 date: 2020-05-06
-title: "0.70.0"
-description: "0.70.0"
+title: "JavaScript Transpiler"
+description: "Hugo 0.70.0 adds a new pipe function that uses Babel to transpile JavaScript."
 categories: ["Releases"]
 ---
 
-	This is a small release, and the main new feature is that you can now use [Babel](https://gohugo.io/hugo-pipes/babel/) to transpile JavaScript.
+This is a small release, and the main new feature is that you can now use [Babel](https://gohugo.io/hugo-pipes/babel/) to transpile JavaScript.
 
 This release represents **22 contributions by 12 contributors** to the main Hugo code base.[@bep](https://github.com/bep) leads the Hugo development with a significant amount of contributions, but also a big shoutout to [@BurtonQin](https://github.com/BurtonQin), [@tekezo](https://github.com/tekezo), and [@sensimevanidus](https://github.com/sensimevanidus) for their ongoing contributions.
 And a big thanks to [@digitalcraftsman](https://github.com/digitalcraftsman) and [@onedrawingperday](https://github.com/onedrawingperday) for their relentless work on keeping the themes site in pristine condition and to [@davidsneighbour](https://github.com/davidsneighbour) and [@kaushalmodi](https://github.com/kaushalmodi) for all the great work on the documentation site.
diff --git a/docs/content/en/showcase/digitalgov/featured.png b/docs/content/en/showcase/digitalgov/featured.png
index b20a53320..5663180f9 100644
--- a/docs/content/en/showcase/digitalgov/featured.png
+++ b/docs/content/en/showcase/digitalgov/featured.png
diff --git a/docs/content/en/templates/base.md b/docs/content/en/templates/base.md
index a407325fe..990e6fc22 100644
--- a/docs/content/en/templates/base.md
+++ b/docs/content/en/templates/base.md
@@ -25,7 +25,7 @@ The `block` keyword allows you to define the outer shell of your pages' one or m
 
 ## Base Template Lookup Order
 
-{{< new-in "0.63.0" >}} Since Hugo v0.63, the base template lookup order closely follows that of the template is applies to (e.g. `_default/list.html`).
+{{< new-in "0.63.0" >}} Since Hugo v0.63, the base template lookup order closely follows that of the template it applies to (e.g. `_default/list.html`).
 
 See [Template Lookup Order](/templates/lookup-order/) for details and examples.
 
diff --git a/docs/netlify.toml b/docs/netlify.toml
index 596fbb1b3..2535cebd7 100644
--- a/docs/netlify.toml
+++ b/docs/netlify.toml
@@ -3,7 +3,7 @@ publish = "public"
 command = "hugo --gc --minify"
 
 [context.production.environment]
-HUGO_VERSION = "0.69.2"
+HUGO_VERSION = "0.70.0"
 HUGO_ENV = "production"
 HUGO_ENABLEGITINFO = "true"
 
@@ -11,20 +11,20 @@ HUGO_ENABLEGITINFO = "true"
 command = "hugo --gc --minify --enableGitInfo"
 
 [context.split1.environment]
-HUGO_VERSION = "0.69.2"
+HUGO_VERSION = "0.70.0"
 HUGO_ENV = "production"
 
 [context.deploy-preview]
 command = "hugo --gc --minify --buildFuture -b $DEPLOY_PRIME_URL"
 
 [context.deploy-preview.environment]
-HUGO_VERSION = "0.69.2"
+HUGO_VERSION = "0.70.0"
 
 [context.branch-deploy]
 command = "hugo --gc --minify -b $DEPLOY_PRIME_URL"
 
 [context.branch-deploy.environment]
-HUGO_VERSION = "0.69.2"
+HUGO_VERSION = "0.70.0"
 
 [context.next.environment]
 HUGO_ENABLEGITINFO = "true"
diff --git a/docs/resources/_gen/images/news/0.70.0-relnotes/hugo-70-featured_hu7e53232ad438751d3345bfcf581a92c2_65533_480x0_resize_catmullrom_2.png b/docs/resources/_gen/images/news/0.70.0-relnotes/hugo-70-featured_hu7e53232ad438751d3345bfcf581a92c2_65533_480x0_resize_catmullrom_2.png
new file mode 100644
index 000000000..5dd268c9f
--- /dev/null
+++ b/docs/resources/_gen/images/news/0.70.0-relnotes/hugo-70-featured_hu7e53232ad438751d3345bfcf581a92c2_65533_480x0_resize_catmullrom_2.png
diff --git a/docs/resources/_gen/images/news/0.70.0-relnotes/hugo-70-featured_hu7e53232ad438751d3345bfcf581a92c2_65533_640x0_resize_catmullrom_2.png b/docs/resources/_gen/images/news/0.70.0-relnotes/hugo-70-featured_hu7e53232ad438751d3345bfcf581a92c2_65533_640x0_resize_catmullrom_2.png
new file mode 100644
index 000000000..d74203e0e
--- /dev/null
+++ b/docs/resources/_gen/images/news/0.70.0-relnotes/hugo-70-featured_hu7e53232ad438751d3345bfcf581a92c2_65533_640x0_resize_catmullrom_2.png