Merge branch '6.0' into clarify-unclaimed-issues

Author: stevepiercy

docs/conf.py

@@ -385,7 +385,7 @@
 # -- sphinx-reredirects configuration ----------------------------------
 # https://documatt.com/sphinx-reredirects/usage.html
 redirects = {
-    "contributing/plone-api": "/plone.api/contribute/index.html",
+    "contributing/plone-api": "/plone.api/contribute.html",
     "contributing/plone-restapi": "/plone.restapi/docs/source/contributing/index.html",
     "contributing/volto": "/volto/contributing/index.html",
     "install/install-from-packages": "/install/create-project.html",

docs/glossary.md

@@ -120,7 +120,7 @@ TTW
     Through-The-Web allows editing or customizing a Plone site through a web browser.
 
 Ansible
-    [Ansible](https://www.ansible.com/) is an open source automation platform.
+    [Ansible](https://www.redhat.com/en/ansible-collaborative) is an open source automation platform.
     Ansible can help you with configuration management, application deployment, task automation.
 
 Archetypes