Merge commit '45e6fdb315d113ba13e20a633ed0c67e3f25170d'

1 files changed, 40 insertions, 21 deletions

diff --git a/docs/content/en/hugo-pipes/introduction.md b/docs/content/en/hugo-pipes/introduction.md
index d097dec6b..7cace938a 100755
--- a/docs/content/en/hugo-pipes/introduction.md
+++ b/docs/content/en/hugo-pipes/introduction.md
@@ -1,5 +1,6 @@
 ---
 title: Hugo Pipes Introduction
+linkTitle: Hugo Pipes
 description: Hugo Pipes is Hugo's asset processing set of functions.
 date: 2018-07-14
 publishdate: 2018-07-14
@@ -13,39 +14,56 @@ menu:
 weight: 01
 sections_weight: 01
 draft: false
+toc: true
 aliases: [/assets/]
 ---
 
-### Asset directory
+## Get Resource with resources.Get
 
-Asset files must be stored in the asset directory. This is `/assets` by default, but can be configured via the configuration file's `assetDir` key.
+In order to process an asset with Hugo Pipes, it must be retrieved as a `Resource` using `resources.Get`. The first argument can be either a local the path to file relative to the `asset` directory/directories or a remote URL.
+
+```go-html-template
+{{ $local := resources.Get "sass/main.scss" }}
+{{ $remote := resources.Get "https://www.example.com/styles.scss" }}
+```
 
-### From file or URL to resource
+`resources.Get` will always return `nil` if the resource could not be found.
 
-In order to process an asset with Hugo Pipes, it must be retrieved as a resource using `resources.Get`. The first argument can be the filepath of the file relative to the asset directory or the URL of the file.
+### Error Handling
+
+{{< new-in "0.90.1" >}}
+
+The return value from `resources.Get` includes an `.Err` method that will return an error if the call failed. If you want to just log any error as a `WARNING` you can use a construct similar to the one below.
 
 ```go-html-template
-{{ $style := resources.Get "sass/main.scss" }}
-{{ $remoteStyle := resources.Get "https://www.example.com/styles.scss" }}
+{{ with resources.Get "https://gohugo.io/images/gohugoio-card-1.png" }}
+  {{ with .Err }}
+    {{ warnf "%s" . }}
+  {{ else }}
+    <img src="{{ .RelPermalink }}" width="{{ .Width }}" height="{{ .Height }}" alt="">
+  {{ end }}
+{{ end }}
 ```
 
-#### Request options
+Note that if you do not handle `.Err` yourself, Hugo will fail the build the first time you start using the `Resource` object.
 
-When using an URL, the `resources.Get` function takes an optional options map as the last argument, e.g.:
+### Remote Options
 
-```
+When fetching a remote `Resource`, `resources.Get` takes an optional options map as the last argument, e.g.:
+
+```go-html-template
 {{ $resource := resources.Get "https://example.org/api" (dict "headers" (dict "Authorization" "Bearer abcd"))  }}
 ```
 
 If you need multiple values for the same header key, use a slice:
 
-```
+```go-html-template
 {{ $resource := resources.Get "https://example.org/api"  (dict "headers" (dict "X-List" (slice "a" "b" "c")))  }}
 ```
 
 You can also change the request method and set the request body:
 
-```
+```go-html-template
 {{ $postResponse := resources.Get "https://example.org/api"  (dict 
     "method" "post"
     "body" `{"complete": true}` 
@@ -55,40 +73,41 @@ You can also change the request method and set the request body:
 )}}
 ```
 
-#### Cache of remote resources
+### Caching of Remote Resources
 
-Each downloaded URL will be cached in the default folder `$TMPDIR/hugo_cache/`. The variable `$TMPDIR` will be resolved to your system-dependent temporary directory.
+Remote resources fetched with `resources.Get` will be cached on disk. See [Configure File Caches](/getting-started/configuration/#configure-file-caches) for details.
 
-With the command-line flag `--cacheDir`, you can specify any folder on your system as a caching directory.
+## Asset directory
 
-You can also set `cacheDir` or `caches.getresource` in the [main configuration file][config].
+Asset files must be stored in the asset directory. This is `/assets` by default, but can be configured via the configuration file's `assetDir` key.
 
-If you don't like caching at all, you can fully disable caching with the command line flag `--ignoreCache`.
 
-### Asset publishing
+### Asset Publishing
 
-Assets will only be published (to `/public`) if `.Permalink` or `.RelPermalink` is used.
+Assets will only be published (to `/public`) if `.Permalink` or `.RelPermalink` is used. You can use `.Content` to inline the asset.
 
-### Go Pipes
+## Go Pipes
 
 For improved readability, the Hugo Pipes examples of this documentation will be written using [Go Pipes](/templates/introduction/#pipes):
+
 ```go-html-template
 {{ $style := resources.Get "sass/main.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint }}
 <link rel="stylesheet" href="{{ $style.Permalink }}">
 ```
 
-### Method aliases
+## Method aliases
 
 Each Hugo Pipes `resources` transformation method uses a __camelCased__ alias (`toCSS` for `resources.ToCSS`).
 Non-transformation methods deprived of such aliases are `resources.Get`, `resources.FromString`, `resources.ExecuteAsTemplate` and `resources.Concat`.
 
 The example above can therefore also be written as follows:
+
 ```go-html-template
 {{ $style := resources.Get "sass/main.scss" | toCSS | minify | fingerprint }}
 <link rel="stylesheet" href="{{ $style.Permalink }}">
 ```
 
-### Caching
+## Caching
 
 Hugo Pipes invocations are cached based on the entire _pipe chain_.