hugo

Unnamed repository; edit this file 'description' to name the repository.

git clone git://git.shimmy1996.com/hugo.git
commit 6f069e549b869c976cb6576a64812df5e7b7c809
parent 0483299bc06a742d40528e0d675e42e149910853
Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date:   Fri, 21 Dec 2018 09:45:41 +0100

Merge commit '5a83bf314f4c0ce1d61341e0a1df21c9998e8154'

Diffstat:
Mdocs/content/en/content-management/syntax-highlighting.md | 2+-
Mdocs/content/en/functions/strings.TrimLeft.md | 5++---
Mdocs/content/en/functions/strings.TrimRight.md | 4++--
Mdocs/content/en/templates/shortcode-templates.md | 2+-
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/docs/content/en/content-management/syntax-highlighting.md b/docs/content/en/content-management/syntax-highlighting.md
@@ -167,7 +167,7 @@ It is also possible to add syntax highlighting with GitHub flavored code fences.
 
 ## List of Chroma Highlighting Languages
 
-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):
+The full list of Chroma lexers and their aliases (which is the identifier used in the `highlight` template func or when doing highlighting in code fences):
 
 {{< chroma-lexers >}}
 
diff --git a/docs/content/en/functions/strings.TrimLeft.md b/docs/content/en/functions/strings.TrimLeft.md
@@ -20,9 +20,8 @@ aliases: []
 
 Given the string `"abba"`, leading `"a"`'s can be removed a follows:
 
-    {{ strings.TrimLeft "abba" "a" }} → "bba"
+    {{ strings.TrimLeft "a" "abba" }} → "bba"
 
 Numbers can be handled as well:
 
-    {{ strings.TrimLeft 1221 "12" }} → ""
-
+    {{ strings.TrimLeft 12 1221341221 }} → "341221"
diff --git a/docs/content/en/functions/strings.TrimRight.md b/docs/content/en/functions/strings.TrimRight.md
@@ -20,9 +20,9 @@ aliases: []
 
 Given the string `"abba"`, trailing `"a"`'s can be removed a follows:
 
-    {{ strings.TrimRight "abba" "a" }} → "abb"
+    {{ strings.TrimRight "a" "abba" }} → "abb"
 
 Numbers can be handled as well:
 
-    {{ strings.TrimRight 1221 "12" }} → ""
+    {{ strings.TrimRight 12 1221341221 }} → "122134"
 
diff --git a/docs/content/en/templates/shortcode-templates.md b/docs/content/en/templates/shortcode-templates.md
@@ -37,7 +37,7 @@ To create a shortcode, place an HTML template in the `layouts/shortcodes` direct
 You can organize your shortcodes in subfolders, e.g. in `layouts/shortcodes/boxes`. These shortcodes would then be accessible with their relative path, e.g:
 
 ```
-{{/*< boxes/square >*/}}
+{{</* boxes/square */>}}
 ```
 
 Note the forward slash.