Merge commit 'bdf935d66c1f02dfc942a30e9fc00519bba3aacb'

8 files changed, 21 insertions, 15 deletions

diff --git a/docs/.github/workflows/spellcheck.yml b/docs/.github/workflows/spellcheck.yml
index 0129bbb27..6f68fee18 100644
--- a/docs/.github/workflows/spellcheck.yml
+++ b/docs/.github/workflows/spellcheck.yml
@@ -5,12 +5,15 @@ on: # rebuild any PRs and main branch changes
       - "dependabot/**"
   pull_request:
 
+permissions:
+  contents: read
+
 jobs:
   spellcheck:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: streetsidesoftware/cspell-action@3bc52c39528d0214a947ff7f8b5c23ad3273435b
+      - uses: actions/checkout@v3
+      - uses: streetsidesoftware/cspell-action@v2
         with:
           inline: warning
           strict: false
diff --git a/docs/content/en/about/what-is-hugo.md b/docs/content/en/about/what-is-hugo.md
index b84f61f10..69ca1fddb 100644
--- a/docs/content/en/about/what-is-hugo.md
+++ b/docs/content/en/about/what-is-hugo.md
@@ -19,7 +19,7 @@ toc: true
 
 Hugo is a general-purpose website framework. Technically speaking, Hugo is a [static site generator][]. Unlike systems that dynamically build a page with each visitor request, Hugo builds pages when you create or update your content. Since websites are viewed far more often than they are edited, Hugo is designed to provide an optimal viewing experience for your website's end users and an ideal writing experience for website authors.
 
-Websites built with Hugo are extremely fast and secure. Hugo sites can be hosted anywhere, including [Netlify][], [Heroku][], [GoDaddy][], [DreamHost][], [GitHub Pages][], [GitLab Pages][], [Surge][], [Aerobatic][], [Firebase][], [Google Cloud Storage][], [Amazon S3][], [Rackspace][], [Azure][], and [CloudFront][] and work well with CDNs. Hugo sites run without the need for a database or dependencies on expensive runtimes like Ruby, Python, or PHP.
+Websites built with Hugo are extremely fast and secure. Hugo sites can be hosted anywhere, including [Netlify][], [Heroku][], [GoDaddy][], [DreamHost][], [GitHub Pages][], [GitLab Pages][], [Surge][], [Firebase][], [Google Cloud Storage][], [Amazon S3][], [Rackspace][], [Azure][], and [CloudFront][] and work well with CDNs. Hugo sites run without the need for a database or dependencies on expensive runtimes like Ruby, Python, or PHP.
 
 We think of Hugo as the ideal website creation tool with nearly instant build times, able to rebuild whenever a change is made.
 
@@ -40,7 +40,6 @@ Hugo is for people who want to hand code their own website without worrying abou
 Hugo is for people building a blog, a company site, a portfolio site, documentation, a single landing page, or a website with thousands of pages.
 
 [@spf13]: https://twitter.com/spf13
-[Aerobatic]: https://www.aerobatic.com/
 [Amazon S3]: https://aws.amazon.com/s3/
 [Azure]: https://docs.microsoft.com/en-us/azure/storage/blobs/storage-blob-static-website
 [CloudFront]: https://aws.amazon.com/cloudfront/ "Amazon CloudFront"
diff --git a/docs/content/en/content-management/syntax-highlighting.md b/docs/content/en/content-management/syntax-highlighting.md
index 31f12f7d3..8ff270c54 100644
--- a/docs/content/en/content-management/syntax-highlighting.md
+++ b/docs/content/en/content-management/syntax-highlighting.md
@@ -45,6 +45,7 @@ Options:
 * `linenostart=199`: starts the line number count from 199.
 * `anchorlinenos`: Configure anchors on line numbers. Valid values are `true` or `false`;
 * `lineanchors`: Configure a prefix for the anchors on line numbers. Will be suffixed with `-`, so linking to the line number 1 with the option `lineanchors=prefix` adds the anchor `prefix-1` to the page.  
+* `hl_inline`  Highlight inside a `<code>` (inline HTML element) tag. Valid values are `true` or `false`. The `code` tag will get a class with name `code-inline`. {{< new-in "0.101.0" >}}
 
 ### Example: Highlight Shortcode
 
diff --git a/docs/content/en/documentation.md b/docs/content/en/documentation.md
index 8364a42bb..77cf283fa 100644
--- a/docs/content/en/documentation.md
+++ b/docs/content/en/documentation.md
@@ -19,4 +19,3 @@ layout: documentation-home
 Hugo is the **world's fastest static website engine.** It's written in Go (aka Golang) and developed by [bep](https://github.com/bep), [spf13](https://github.com/spf13) and [friends](https://github.com/gohugoio/hugo/graphs/contributors).
 
 Below you will find some of the most common and helpful pages from our documentation.
-foo
diff --git a/docs/content/en/functions/highlight.md b/docs/content/en/functions/highlight.md
index 1643fe075..40f3a78de 100644
--- a/docs/content/en/functions/highlight.md
+++ b/docs/content/en/functions/highlight.md
@@ -54,6 +54,10 @@ hl_Lines
 : String. Default is `""`.\
 A space-separated list of lines to emphasize within the highlighted code. To emphasize lines 2, 3, 4, and 7, set this value to `2-4 7`. This option is independent of the `lineNoStart` option.
 
+hl_inline
+: Boolean. Default is `false`.\
+Render the highlighted code without a wrapping container.
+
 style
 : String. Default is `monokai`.\
 The CSS styles to apply to the highlighted code. See the [style gallery] for examples. Case-sensitive.
diff --git a/docs/content/en/templates/404.md b/docs/content/en/templates/404.md
index c638d89fa..87bbe1d36 100644
--- a/docs/content/en/templates/404.md
+++ b/docs/content/en/templates/404.md
@@ -17,7 +17,7 @@ aliases: []
 toc: false
 ---
 
-When using Hugo with [GitHub Pages](https://pages.github.com/), you can provide your own template for a [custom 404 error page](https://help.github.com/articles/custom-404-pages/) by creating a 404.html template file in your `/layouts` folder. When Hugo generates your site, the `404.html` file will be placed in the root.
+When using Hugo with [GitHub Pages](https://pages.github.com/), you can provide your own template for a [custom 404 error page](https://docs.github.com/en/pages/getting-started-with-github-pages/creating-a-custom-404-page-for-your-github-pages-site) by creating a 404.html template file in your `/layouts` folder. When Hugo generates your site, the `404.html` file will be placed in the root.
 
 404 pages will have all the regular [page variables][pagevars] available to use in the templates.
 
diff --git a/docs/layouts/shortcodes/chroma-lexers.html b/docs/layouts/shortcodes/chroma-lexers.html
index 0df2b868f..2e10c3dee 100644
--- a/docs/layouts/shortcodes/chroma-lexers.html
+++ b/docs/layouts/shortcodes/chroma-lexers.html
@@ -1,6 +1,6 @@
 <dl>
-{{  range .Site.Data.docs.chroma.lexers }}
-<dt>{{ .Name }}</dt>
-<dd>{{ delimit .Aliases ", " }}</dd>
-{{ end }}
-</dl>
\ No newline at end of file
+  {{ range .Site.Data.docs.chroma.lexers }}
+    <dt>{{ .Name }}</dt>
+    <dd>{{ with .Aliases }}{{ delimit . ", " }}{{ end }}</dd>
+  {{ end }}
+</dl>
diff --git a/docs/netlify.toml b/docs/netlify.toml
index 38a178d4c..ade4b9a86 100644
--- a/docs/netlify.toml
+++ b/docs/netlify.toml
@@ -3,7 +3,7 @@ publish = "public"
 command = "hugo --gc --minify"
 
 [context.production.environment]
-HUGO_VERSION = "0.100.2"
+HUGO_VERSION = "0.101.0"
 HUGO_ENV = "production"
 HUGO_ENABLEGITINFO = "true"
 
@@ -11,20 +11,20 @@ HUGO_ENABLEGITINFO = "true"
 command = "hugo --gc --minify --enableGitInfo"
 
 [context.split1.environment]
-HUGO_VERSION = "0.100.2"
+HUGO_VERSION = "0.101.0"
 HUGO_ENV = "production"
 
 [context.deploy-preview]
 command = "hugo --gc --minify --buildFuture -b $DEPLOY_PRIME_URL"
 
 [context.deploy-preview.environment]
-HUGO_VERSION = "0.100.2"
+HUGO_VERSION = "0.101.0"
 
 [context.branch-deploy]
 command = "hugo --gc --minify -b $DEPLOY_PRIME_URL"
 
 [context.branch-deploy.environment]
-HUGO_VERSION = "0.100.2"
+HUGO_VERSION = "0.101.0"
 
 [context.next.environment]
 HUGO_ENABLEGITINFO = "true"