Merge commit 'aa5ac36a3eb68b86c803caec703869efefc8447e'

3 files changed, 11 insertions, 14 deletions

diff --git a/docs/content/en/content-management/comments.md b/docs/content/en/content-management/comments.md
index b5357cba4..bbeb21ada 100644
--- a/docs/content/en/content-management/comments.md
+++ b/docs/content/en/content-management/comments.md
@@ -47,29 +47,27 @@ Disqus has its own [internal template](https://gohugo.io/templates/internal/#dis
 {{ template "_internal/disqus.html" . }}
 ```
 
-## Comments Alternatives
+## Alternatives
 
-There are a few alternatives to commenting on static sites for those who do not want to use Disqus:
+These are some alternatives to Disqus:
 
-* [Staticman](https://staticman.net/)
-* [Talkyard](https://www.talkyard.io/blog-comments) (Open source, & serverless hosting)
+* [Cactus Comments](https://cactus.chat/docs/integrations/hugo/) (Open Source, Matrix appservice, Docker install)
+* [Commento](https://commento.io/) (Open Source, available as a service, local install, or docker image)
+* [Graph Comment](https://graphcomment.com/)
+* [Hyvor Talk](https://talk.hyvor.com/) (Available as a service)
 * [IntenseDebate](https://intensedebate.com/)
-* [Graph Comment][]
+* [Isso](https://posativ.org/isso/) (Self-hosted, Python) ([tutorial][issotutorial])
 * [Muut](https://muut.com/)
-* [Isso](https://posativ.org/isso/) (Self-hosted, Python)
-    * [Tutorial on Implementing Isso with Hugo][issotutorial]
+* [Remark42](https://remark42.com/) (Open source, Golang, Easy to run docker)
+* [Staticman](https://staticman.net/)
+* [Talkyard](https://www.talkyard.io/blog-comments) (Open source, & serverless hosting)
 * [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)
-* [Hyvor Talk](https://talk.hyvor.com/) (Available as a service)
-
 
 [configuration]: /getting-started/configuration/
 [disquspartial]: /templates/partials/#disqus
 [disqussetup]: https://disqus.com/profile/signup/
 [forum]: https://discourse.gohugo.io
 [front matter]: /content-management/front-matter/
-[Graph Comment]: https://graphcomment.com/
 [kaijuissue]: https://github.com/spf13/kaiju/issues/new
 [issotutorial]: https://stiobhart.net/2017-02-24-isso-comments/
 [partials]: /templates/partials/
diff --git a/docs/content/en/content-management/front-matter.md b/docs/content/en/content-management/front-matter.md
index d1b1f20ba..0353fb1fe 100644
--- a/docs/content/en/content-management/front-matter.md
+++ b/docs/content/en/content-management/front-matter.md
@@ -185,7 +185,7 @@ path
 : A [Glob](https://github.com/gobwas/glob) pattern matching the content path below /content. Expects Unix-styled slashes. Note that this is the virtual path, so it starts at the mount root. The matching support double-asterisks so you can match for patterns like `/blog/*/**` to match anything from the third level and down.
 
 kind
-: A Glob pattern matching the Page's Kind(s), e.g. "{home,section}".
+: The Page's Kind, e.g. "section".
 
 lang
 : A Glob pattern matching the Page's language, e.g. "{en,sv}".
diff --git a/docs/content/en/content-management/shortcodes.md b/docs/content/en/content-management/shortcodes.md
index d65b9d3b5..7d271041b 100644
--- a/docs/content/en/content-management/shortcodes.md
+++ b/docs/content/en/content-management/shortcodes.md
@@ -2,7 +2,6 @@
 title: Shortcodes
 linktitle:
 description: Shortcodes are simple snippets inside your content files calling built-in or custom templates.
-godocref:
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2019-11-07