Merge commit 'b9bd35d72e14932fb6588ff62b90cddef0a060fc' as 'docs'

docs/content/en/functions/trim.md

@@ -0,0 +1,42 @@
+---
+title: trim
+# linktitle:
+description: Returns a slice of a passed string with all leading and trailing characters from cutset removed.
+godocref:
+date: 2017-02-01
+publishdate: 2017-02-01
+lastmod: 2017-02-01
+categories: [functions]
+menu:
+  docs:
+    parent: "functions"
+keywords: [strings]
+signature: ["trim INPUT CUTSET"]
+workson: []
+hugoversion:
+relatedfuncs: []
+deprecated: false
+---
+
+```
+{{ trim "++Batman--" "+-" }} → "Batman"
+```
+
+`trim` *requires* the second argument, which tells the function specifically what to remove from the first argument. There is no default value for the second argument, so **the following usage will not work**:
+
+```
+{{ trim .Inner}}
+```
+
+Instead, the following example tells `trim` to remove extra new lines from the content contained in the [shortcode `.Inner` variable][shortcodevars]:
+
+```
+{{ trim .Inner "\n" }}
+```
+
+{{% note %}}
+Go templates also provide a simple [method for trimming whitespace](/templates/introduction/#whitespace) from either side of a Go tag by including a hyphen (`-`).
+{{% /note %}}
+
+
+[shortcodevars]: /variables/shortcodes/