Merge commit '2e711a28c71e8667258e5ab824f9b9a71c261b0a'

docs/content/en/content-management/image-processing/index.md

@@ -98,11 +98,12 @@ Tags:
 {{ range $k, $v := .Tags }}
 TAG: {{ $k }}: {{ $v }}
 {{ end }}
+{{ end }}
 ```
 
 #### Exif fields
 
-Data
+Date
 : "photo taken" date/time
 
 Lat

docs/content/en/content-management/syntax-highlighting.md

@@ -74,11 +74,9 @@ func GetTitleFunc(style string) func(s string) string {
   case "go":
     return strings.Title
   case "chicago":
-    tc := transform.NewTitleConverter(transform.ChicagoStyle)
-    return tc.Title
+    return transform.NewTitleConverter(transform.ChicagoStyle)
   default:
-    tc := transform.NewTitleConverter(transform.APStyle)
-    return tc.Title
+    return transform.NewTitleConverter(transform.APStyle)
   }
 }
 {{< / highlight >}}
@@ -93,14 +91,10 @@ See [Highlight](/functions/highlight/).
 
 Highlighting in code fences is enabled by default.{{< new-in "0.60.0" >}}
 
-````
-```go-html-template{hl_lines=[3,"5-6"],linenos=true}
-```
-````
-
 ````
 ```go {linenos=table,hl_lines=[8,"15-17"],linenostart=199}
 // ... code
+```
 ````
 
 
@@ -122,11 +116,9 @@ func GetTitleFunc(style string) func(s string) string {
   case "go":
     return strings.Title
   case "chicago":
-    tc := transform.NewTitleConverter(transform.ChicagoStyle)
-    return tc.Title
+    return transform.NewTitleConverter(transform.ChicagoStyle)
   default:
-    tc := transform.NewTitleConverter(transform.APStyle)
-    return tc.Title
+    return transform.NewTitleConverter(transform.APStyle)
   }
 }
 ```

docs/content/en/content-management/toc.md

@@ -18,7 +18,11 @@ toc: true
 ---
 
 {{% note "TOC Heading Levels are Fixed" %}}
-Currently, the `{{.TableOfContents}}` [page variable](/variables/page/) does not allow you to specify which heading levels you want the TOC to render. [See the related GitHub discussion (#1778)](https://github.com/gohugoio/hugo/issues/1778). As such, the resulting `<nav id="TableOfContents"><ul></ul></nav>` is going to start at `<h1>` when pulling from `{{.Content}}`.
+
+Previously, there was no out-of-the-box way to specify which heading levels you want the TOC to render. [See the related GitHub discussion (#1778)](https://github.com/gohugoio/hugo/issues/1778). As such, the resulting `<nav id="TableOfContents"><ul></ul></nav>` was going to start at `<h1>` when pulling from `{{.Content}}`.
+
+Hugo [v0.60.0](https://github.com/gohugoio/hugo/releases/tag/v0.60.0) made a switch to [Goldmark](https://github.com/yuin/goldmark/) as the default library for Markdown which has improved and configurable implementation of TOC. Take a look at [how to configure TOC](/getting-started/configuration-markup/#table-of-contents) for Goldmark renderer.
+
 {{% /note %}}
 
 ## Usage
@@ -43,7 +47,7 @@ A collection of textile samples lay spread out on the table - Samsa was a travel
 
 Hugo will take this Markdown and create a table of contents from `## Introduction`, `## My Heading`, and `### My Subheading` and then store it in the [page variable][pagevars]`.TableOfContents`.
 
-The built-in `.TableOfContents` variables outputs a `<nav id="TableOfContents">` element with a child `<ul>`, whose child `<li>` elements begin with any `<h1>`'s (i.e., `#` in markdown) inside your content.'
+The built-in `.TableOfContents` variables outputs a `<nav id="TableOfContents">` element with a child `<ul>`, whose child `<li>` elements begin with appropriate HTML headings. See [the available settings](/getting-started/configuration-markup/#table-of-contents) to configure what heading levels you want to include in TOC.
 
 {{% note "Table of contents not available for MMark" %}}
 Hugo documents created in the [MMark](/content-management/formats/#mmark) Markdown dialect do not currently display TOCs. TOCs are, however, compatible with all other supported Markdown formats.