Merge commit '9e1dcefc5f559944b70d2fa520f6acd5c56a69f2'

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_header-link.css

@@ -1,4 +1,3 @@
-
 .header-link:after {
   position: relative;
   left: 0.5em;

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/main.css

@@ -2,7 +2,7 @@
 @import '_tachyons';
 
 /* purgecss start ignore */
-@import '_anchorforid';
+@import '_header-link';
 @import '_animation';
 @import '_documentation-styles';
 
@@ -36,4 +36,4 @@
 .mw-90 {
   max-width:90%;
 }
-/* purgecss end ignore */
+/* purgecss end ignore */

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/index.js

@@ -1,6 +1,5 @@
 require("typeface-muli")
 import styles from './css/main.css';
-import './js/anchorforid.js'
 import './js/clipboardjs.js'
 import './js/codeblocks.js'
 import './js/docsearch.js'
@@ -11,6 +10,3 @@ import './js/scrolldir.js'
 import './js/smoothscroll.js'
 import './js/tabs.js'
 import './js/nojs.js'
-
-
-

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/js/anchorforid.js

@@ -1,34 +0,0 @@
-/**
-* Anchor for ID BPNY
-**/
-var anchorForId = function (id) {
-  var anchor = document.createElement("a");
-  anchor.className = "header-link";
-  anchor.href      = "#" + id;
-  anchor.innerHTML = '  <svg class="fill-current o-60 hover-accent-color-light" height="22px" viewBox="0 0 24 24" width="22px" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z" fill="none"/><path d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"/></svg>';
-  return anchor;
-};
-
-var linkifyAnchors = function (level, containingElement) {
-  var headers = containingElement.getElementsByTagName("h" + level);
-  for (var h = 0; h < headers.length; h++) {
-    var header = headers[h];
-
-    if (typeof header.id !== "undefined" && header.id !== "") {
-      header.appendChild(anchorForId(header.id));
-    }
-  }
-};
-
-
-document.onreadystatechange = function () {
-  if (this.readyState === "complete") {
-    var contentBlock = document.getElementsByClassName("prose")[0]
-    if (!contentBlock) {
-      return;
-    }
-    for (var level = 2; level <= 4; level++) {
-      linkifyAnchors(level, contentBlock);
-    }
-  }
-};

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/js/main.js

@@ -1,5 +1,4 @@
 import styles from './../css/main.css';
-import './anchorforid.js'
 import './clipboardjs.js'
 import './codeblocks.js'
 import './docsearch.js'
@@ -10,9 +9,7 @@ import './smoothscroll.js'
 import './tabs.js'
 import './nojs.js'
 
-
-
-// TO use Jquery, just call the modules you want
+// TO use jQuery, just call the modules you want
 // var $ = require('jquery/src/core');
 // require('jquery/src/core/init');
 // require('jquery/src/manipulation');

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/output/css/app.css

@@ -5280,3 +5280,4 @@ code, .code, pre code, .highlight pre  {
   max-width:90%;
 }
 /* purgecss end ignore */
+

docs/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/_markup/render-heading.html

@@ -0,0 +1,5 @@
+<h{{ .Level }} id="{{ .Anchor | safeURL }}">{{ .Text | safeHTML }}
+{{- if and (ge .Level 2) (le .Level 4) }}{{" " -}}
+<a class="header-link" href="#{{ .Anchor | safeURL }}"><svg class="fill-current o-60 hover-accent-color-light" height="22px" viewBox="0 0 24 24" width="22px" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z" fill="none"/><path d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"/></svg></a>
+{{- end -}}
+</h{{ .Level }}>

docs/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/baseof.html

@@ -67,7 +67,6 @@
 
   {{ block "footer" . }}{{ partialCached "site-footer.html" . }}{{ end }}
 
-
 </body>
 
 </html>

docs/_vendor/modules.txt

@@ -1 +1 @@
-# github.com/gohugoio/gohugoioTheme v0.0.0-20200128164921-1d0bc5482051
+# github.com/gohugoio/gohugoioTheme v0.0.0-20200518165806-0095b7b902a7

docs/config.toml

@@ -58,14 +58,6 @@ pattern = "2006"
 [social]
 twitter = "GoHugoIO"
 
-# MARKDOWN
-## Configuration for BlackFriday markdown parser: https://github.com/russross/blackfriday
-[blackfriday]
-	plainIDAnchors = true
-  # See https://github.com/gohugoio/hugo/issues/2424
-	hrefTargetBlank = false
-  angledQuotes = false
-  latexDashes = true
 
 [imaging]
 # See https://github.com/disintegration/imaging

docs/config/_default/config.toml

@@ -14,12 +14,6 @@ pluralizeListTitles = false
 # We do redirects via Netlify's _redirects file, generated by Hugo (see "outputs" below).
 disableAliases = true
 
-[markup]
-[markup.highlight]
-style = "trac"
-lineNumbersInTable = true
-noClasses = false
-
 [outputs]
 home = [ "HTML", "RSS", "REDIR", "HEADERS" ]
 section = [ "HTML", "RSS"]

docs/config/_default/markup.toml

@@ -0,0 +1,7 @@
+defaultMarkdownHandler = "goldmark"
+
+[highlight]
+style = "trac"
+lineNumbersInTable = true
+noClasses = false
+

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

@@ -61,7 +61,7 @@ There are a few alternatives to commenting on static sites for those who do not
 * [Utterances](https://utteranc.es/) (Open source, GitHub comments widget built on GitHub issues)
 * [Remark](https://github.com/umputun/remark) (Open source, Golang, Easy to run docker)
 * [Commento](https://commento.io/) (Open Source, available as a service, local install, or docker image)
-* [JustComments](https://just-comments.com) (Open Source, available as a service, can be self-hosted)
+* [Hyvor Talk](https://talk.hyvor.com/) (Available as a service)
 
 
 [configuration]: /getting-started/configuration/

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

@@ -180,7 +180,10 @@ Rotates an image by the given angle counter-clockwise. The rotation will be perf
 ### Anchor
 
 Only relevant for the `Fill` method. This is useful for thumbnail generation where the main motive is located in, say, the left corner.
-Valid are `Center`, `TopLeft`, `Top`, `TopRight`, `Left`, `Right`, `BottomLeft`, `Bottom`, `BottomRight`.
+
+Valid values are `Smart`, `Center`, `TopLeft`, `Top`, `TopRight`, `Left`, `Right`, `BottomLeft`, `Bottom`, `BottomRight`.
+
+Default value is `Smart`, which uses [Smartcrop](https://github.com/muesli/smartcrop) to determine the best crop.
 
 ```go
 {{ $image.Fill "300x200 BottomLeft" }}

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

@@ -43,10 +43,9 @@ Highlighting is carried out via the [built-in shortcode](/content-management/sho
 
 Options:
 
-* `linenos`: Valid values are `true`, `false`, `table`, `inline`. `table` will give copy-and-paste friendly code blocks) turns on line numbers.
-* Setting `linenos` to `false` will turn off linenumbers if it's configured to be on in site config.{{< new-in "0.60.0" >}}
-* `hl_lines` lists a set of line numbers or line number ranges to be highlighted.
-* `linenostart=199` starts the line number count from 199.
+* `linenos`: configure line numbers. Valid values are `true`, `false`, `table`, or `inline`. `false` will turn off line numbers if it's configured to be on in site config. {{< new-in "0.60.0" >}} `table` will give copy-and-paste friendly code blocks.
+* `hl_lines`: lists a set of line numbers or line number ranges to be highlighted.
+* `linenostart=199`: starts the line number count from 199.
 
 ### Example: Highlight Shortcode
 

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

@@ -38,6 +38,13 @@ permalinks:
 
 Only the content under `posts/` will have the new URL structure. For example, the file `content/posts/sample-entry.md` with `date: 2017-02-27T19:20:00-05:00` in its front matter will render to `public/2017/02/sample-entry/index.html` at build time and therefore be reachable at `https://example.com/2017/02/sample-entry/`.
 
+To configure the `permalinks` option for pages in the "root" section, use **/** as the key:
+
+{{< code-toggle file="config" copy="false" >}}
+permalinks:
+  /: /:year/:month/:filename/
+{{< /code-toggle >}}
+
 If the standard date-based permalink configuration does not meet your needs, you can also format URL segments using [Go time formatting directives](https://golang.org/pkg/time/#Time.Format). For example, a URL structure with two digit years and month and day digits without zero padding can be accomplished with:
 
 {{< code-toggle file="config" copy="false" >}}

docs/content/en/getting-started/configuration-markup.md

@@ -85,9 +85,13 @@ ordered
 
 Note that this is only supported with the [Goldmark](#goldmark) renderer.
 
-These Render Hooks allow custom templates to render links and images from markdown.
+Render Hooks allow custom templates to override markdown rendering functionality. You can do this by creating templates with base names `render-{feature}` in `layouts/_default/_markup`.
 
-You can do this by creating templates with base names `render-link` and/or `render-image` inside `layouts/_default/_markup`.
+The features currently supported are:
+
+* `image`
+* `link`
+* `heading` {{< new-in "0.71.0" >}}
 
 You can define [Output-Format-](/templates/output-formats) and [language-](/content-management/multilingual/)specific templates if needed.[^hooktemplate] Your `layouts` folder may look like this:
 
@@ -105,10 +109,11 @@ Some use cases for the above:
 * Resolve link references using `.GetPage`. This would make links portable as you could translate `./my-post.md` (and similar constructs that would work on GitHub) into `/blog/2019/01/01/my-post/` etc.
 * Add `target=_blank` to external links.
 * Resolve and [process](/content-management/image-processing/) images.
+* Add [header links](https://remysharp.com/2014/08/08/automatic-permalinks-for-blog-posts).
 
 ### Render Hook Templates
 
-Both `render-link` and `render-image` templates will receive this context:
+The `render-link` and `render-image` templates will receive this context:
 
 Page
 : The [Page](/variables/page/) being rendered.
@@ -125,7 +130,24 @@ Text
 PlainText
 : The plain variant of the above.
 
-#### Link with title Markdown example :
+The `render-heading` template will receive this context:
+
+Page
+: The [Page](/variables/page/) being rendered.
+
+Level
+: The header level (1--6)
+
+Anchor
+: An auto-generated html id unique to the header within the page
+
+Text
+: The rendered (HTML) text.
+
+PlainText
+: The plain variant of the above.
+
+#### Link with title Markdown example:
 
 ```md
 [Text](https://www.gohugo.io "Title")
@@ -151,5 +173,24 @@ Here is a code example for how the render-image.html template could look:
 </p>
 {{< /code >}}
 
-[^hooktemplate]: It's currently only possible to have one set of render hook templates, e.g. not per `Type` or `Section`. We may consider that in a future version.
+#### Heading link example
 
+Given this template file
+
+{{< code file="layouts/_default/_markup/render-heading.html" >}}
+<h{{ .Level }} id="{{ .Anchor | safeURL }}">{{ .Text | safeHTML }} <a href="#{{ .Anchor | safeURL }}">¶</a></h{{ .Level }}>
+{{< /code >}}
+
+And this markdown
+
+```md
+### Section A
+```
+
+The rendered html will be
+
+```html
+<h3 id="section-a">Section A <a href="#section-a">¶</a></h3>
+```
+
+[^hooktemplate]: It's currently only possible to have one set of render hook templates, e.g. not per `Type` or `Section`. We may consider that in a future version.

docs/content/en/hugo-modules/use-modules.md

@@ -30,9 +30,20 @@ Use `hugo mod init` to initialize a new Hugo Module. If it fails to guess the mo
 hugo mod init github.com/gohugoio/myShortcodes
 ```
 
-
 Also see the [CLI Doc](/commands/hugo_mod_init/).
 
+## Use a Module for a Theme
+The easiest way to use a for a theme is to import it in the config. 
+
+1. Initialize the hugo module system: `hugo mod init github.com/<your_user>/<your_project>`
+2. Import the theme in your `config.toml`: 
+
+```toml
+[module]
+  [[module.imports]]
+    path = "github.com/spf13/hyde/"
+```
+
 ## Update Modules
 
 Modules will be downloaded and added when you add them as imports to your configuration, see [Module Imports](/hugo-modules/configuration/#module-config-imports).

docs/content/en/news/0.71.0-relnotes/index.md

@@ -1,14 +1,15 @@
 
 ---
 date: 2020-05-18
-title: "0.71.0"
-description: "0.71.0"
+title: "Markdown Render Hooks for Headings"
+description: "Render hooks for headings, update to Go 1.14.3, several bug fixes etc."
 categories: ["Releases"]
 ---
 
-	Hugo 0.71 brings Markdown render hooks for headings, but the main reason why this release comes sooner rather than later is to get out a release built on Go 1.14.3 which comes with a fix for [this bug](https://github.com/golang/go/issues/37833) that caused Hugo to sometimes spin up with 100% CPU on MacOS.
+Hugo 0.71 brings [Markdown render hooks for headings](https://gohugo.io/getting-started/configuration-markup#markdown-render-hooks), a set of bug fixes and more.
+
+This release represents **12 contributions by 7 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 [@anthonyfok](https://github.com/anthonyfok), [@apexskier](https://github.com/apexskier), and [@johnweldon](https://github.com/johnweldon) for their ongoing contributions.
 
-This release represents **12 contributions by 7 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 [@anthonyfok](https://github.com/anthonyfok), [@apexskier](https://github.com/apexskier), and [@johnweldon](https://github.com/johnweldon) 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.
 
 Many have also been busy writing and fixing the documentation in [hugoDocs](https://github.com/gohugoio/hugoDocs), 

docs/content/en/news/0.71.1-relnotes/index.md

@@ -2,7 +2,7 @@
 ---
 date: 2020-05-25
 title: "Hugo 0.71.1: A couple of Bug Fixes"
-description: "This version fixes a couple of bugs introduced in 0.71.0."
+description: "This version fixes a couple of bugs."
 categories: ["Releases"]
 images:
 - images/blog/hugo-bug-poster.png

docs/content/en/readfiles/pages-vs-site-pages.md

@@ -24,8 +24,12 @@ the current _list_ page:
 
 `.RegularPages`
 : Collection of only _regular_ pages under the
-    current _list_ page.
+    current _list_ page. This **excludes** regular pages in nested sections/_list_ pages (those are subdirectories with an `_index.md` file.
 
+`.RegularPagesRecursive`
+: Collection of **all** _regular_ pages under a _list_ page. This **includes** regular pages in nested sections/_list_ pages.
+
+This feature was added in Hugo version 0.68.0
 
 Note
 : From the scope of _regular_ pages, `.Pages` and

docs/content/en/templates/rss.md

@@ -29,7 +29,7 @@ RSS pages are of the type `Page` and have all the [page variables](/variables/pa
 
 ### Section RSS
 
-A [section’s][section] RSS will be rendered at `/<SECTION>/index.xml` (e.g., https://spf13.com/project/index.xml).
+A [section’s][section] RSS will be rendered at `/<SECTION>/index.xml` (e.g., [https://spf13.com/project/index.xml](https://spf13.com/project/index.xml)).
 
 Hugo provides the ability for you to define any RSS type you wish and can have different RSS files for each section and taxonomy.
 

docs/content/en/tools/migrations.md

@@ -20,7 +20,7 @@ toc: true
 This section highlights some projects around Hugo that are independently developed. These tools try to extend the functionality of our static site generator or help you to get started.
 
 {{% note %}}
-Do you know or maintain a similar project around Hugo? Feel free to open a [pull request](https://github.com/gohugoio/hugo/pulls) on GitHub if you think it should be added.
+Do you know or maintain a similar project around Hugo? Feel free to open a [pull request](https://github.com/gohugoio/hugoDocs/pulls) on GitHub if you think it should be added.
 {{% /note %}}
 
 Take a look at this list of migration tools if you currently use other blogging tools like Jekyll or WordPress but intend to switch to Hugo instead. They'll take care to export your content into Hugo-friendly formats.

docs/content/en/tools/search.md

@@ -26,6 +26,7 @@ A static website with a dynamic search function? Yes, Hugo provides an alternati
 * [hugo-lunr-zh](https://www.npmjs.com/package/hugo-lunr-zh). A bit like Hugo-lunr, but Hugo-lunr-zh can help you separate the Chinese keywords.
 * [Github Gist for Fuse.js integration](https://gist.github.com/eddiewebb/735feb48f50f0ddd65ae5606a1cb41ae). This gist demonstrates how to leverage Hugo's existing build time processing to generate a searchable JSON index used by [Fuse.js](https://fusejs.io/) on the client side. Although this gist uses Fuse.js for fuzzy matching, any client side search tool capable of reading JSON indexes will work. Does not require npm, grunt or other build-time tools except Hugo!
 * [hugo-search-index](https://www.npmjs.com/package/hugo-search-index). A library containing Gulp tasks and a prebuilt browser script that implements search. Gulp generates a search index from project markdown files.
+* [hugofastsearch](https://gist.github.com/cmod/5410eae147e4318164258742dd053993). A usability and speed update to "Github Gist for Fuse.js integration" — global, keyboard-optimized search. 
 
 ## Commercial Search Services
 

docs/content/en/variables/site.md

@@ -20,6 +20,10 @@ toc: true
 
 The following is a list of site-level (aka "global") variables. Many of these variables are defined in your site's [configuration file][config], whereas others are built into Hugo's core for convenient usage in your templates.
 
+## Get the Site object from a partial
+
+All the methods below, e.g. `.Site.RegularPages` can also be reached via the global `site` function, e.g. `site.RegularPages`, which can be handy in partials where the `Page` object isn't easily available. {{< new-in "0.53.0" >}}.
+
 ## Site Variables List
 
 .Site.AllPages

docs/go.mod

@@ -2,4 +2,4 @@ module github.com/gohugoio/hugoDocs
 
 go 1.12
 
-require github.com/gohugoio/gohugoioTheme v0.0.0-20200328100657-2bfd5f8c6aee // indirect
+require github.com/gohugoio/gohugoioTheme v0.0.0-20200518165806-0095b7b902a7 // indirect

docs/go.sum

@@ -17,3 +17,7 @@ github.com/gohugoio/gohugoioTheme v0.0.0-20200327231942-7f80b3d02bfa h1:kG+O/wT9
 github.com/gohugoio/gohugoioTheme v0.0.0-20200327231942-7f80b3d02bfa/go.mod h1:kpw3SS48xZvLQGEXKu8u5XHgXkPvL8DX3oGa07+z8Bs=
 github.com/gohugoio/gohugoioTheme v0.0.0-20200328100657-2bfd5f8c6aee h1:PJZhCwnuVLyafDWNPSHk9iJvk6gEIvPRnycy7Pq3peA=
 github.com/gohugoio/gohugoioTheme v0.0.0-20200328100657-2bfd5f8c6aee/go.mod h1:kpw3SS48xZvLQGEXKu8u5XHgXkPvL8DX3oGa07+z8Bs=
+github.com/gohugoio/gohugoioTheme v0.0.0-20200518164958-62cbad03c40f h1:Ge3JACszSUyJW2Az9cJzWdo4PUqdijJA1RxoQSVMBSI=
+github.com/gohugoio/gohugoioTheme v0.0.0-20200518164958-62cbad03c40f/go.mod h1:kpw3SS48xZvLQGEXKu8u5XHgXkPvL8DX3oGa07+z8Bs=
+github.com/gohugoio/gohugoioTheme v0.0.0-20200518165806-0095b7b902a7 h1:Sy0hlWyZmFtdSY0Cobvw1ZYm3G1aR5+4DuFNRbMkh48=
+github.com/gohugoio/gohugoioTheme v0.0.0-20200518165806-0095b7b902a7/go.mod h1:kpw3SS48xZvLQGEXKu8u5XHgXkPvL8DX3oGa07+z8Bs=

docs/netlify.toml

@@ -3,7 +3,7 @@ publish = "public"
 command = "hugo --gc --minify"
 
 [context.production.environment]
-HUGO_VERSION = "0.70.0"
+HUGO_VERSION = "0.71.1"
 HUGO_ENV = "production"
 HUGO_ENABLEGITINFO = "true"
 
@@ -11,20 +11,20 @@ HUGO_ENABLEGITINFO = "true"
 command = "hugo --gc --minify --enableGitInfo"
 
 [context.split1.environment]
-HUGO_VERSION = "0.70.0"
+HUGO_VERSION = "0.71.1"
 HUGO_ENV = "production"
 
 [context.deploy-preview]
 command = "hugo --gc --minify --buildFuture -b $DEPLOY_PRIME_URL"
 
 [context.deploy-preview.environment]
-HUGO_VERSION = "0.70.0"
+HUGO_VERSION = "0.71.1"
 
 [context.branch-deploy]
 command = "hugo --gc --minify -b $DEPLOY_PRIME_URL"
 
 [context.branch-deploy.environment]
-HUGO_VERSION = "0.70.0"
+HUGO_VERSION = "0.71.1"
 
 [context.next.environment]
 HUGO_ENABLEGITINFO = "true"