Merge branch '6.0' into maurits-upgrade-61-distributions

Author: davisagli

docs/conf.py

@@ -88,6 +88,7 @@
     r"https://github.com/orgs/plone/teams/",  # requires auth
     r"https://github.com/plone/documentation/issues/new/choose",  # requires auth
     r"https://github.com/plone/volto/issues/new/choose",  # requires auth
+    r"https://opensource.org/",  # requires auth
     # Ignore github.com pages with anchors
     r"https://github.com/.*#.*",
     # Ignore other specific anchors

docs/glossary.md

@@ -523,7 +523,7 @@ manual `.po` entries
     Entries which cannot be detected by an automatic code scan.
 
 react-intl
-    A library that is part of [Format.JS](https://formatjs.io/docs/getting-started/installation) which helps developers set up their applications for internationalization.
+    [`react-intl`](https://formatjs.github.io/docs/react-intl) is a library that is part of [Format.JS](https://formatjs.github.io/) which helps developers set up their applications for internationalization.
 
 WSGI
     The Web Server Gateway Interface (WSGI, pronounced _WIZ-ghee_) is a simple calling convention for web servers to forward requests to web applications or frameworks written in the Python programming language.
@@ -706,12 +706,6 @@ Windows Subsystem for Linux
 pnpm
     [pnpm](https://pnpm.io/) is a fast, disk space efficient package manager.
 
-Guillotina
-    [Guillotina](https://guillotina.io/) is a full-stack data framework built on [AsyncIO](https://docs.python.org/3/library/asyncio.html).
-
-Nick
-    [Nick](https://nickcms.org/) is a headless content management system {term}`CMS` built with {term}`Node.js`.
-
 predicate
 predicates
     In programming, a predicate is a test which returns `true` or `false`.
@@ -745,6 +739,10 @@ Jest
     [Jest](https://jestjs.io/) is a JavaScript testing framework.
     Volto uses Jest for unit tests.
 
+Cypress
+    [Cypress](https://www.cypress.io/) is a JavaScript testing framework that runs your app in the browser for visually debugging it.
+    Volto uses Cypress for acceptance tests.
+
 Plone
     Plone is an open-source content management system (CMS) with over 20 years of stability and security wrapped in a modern, powerful, user-centric package.
     It continues to set the standard for content management systems by offering the most functionality and customization out of the box.

docs/index.md

@@ -36,9 +36,9 @@ manage/index
 upgrade/index
 deployment/index
 volto/index
+classic-ui/index
 plone.restapi/docs/source/index
 backend/index
-classic-ui/index
 i18n-l10n/index
 conceptual-guides/index
 contributing/index

docs/install/create-project-cookieplone.md

@@ -23,6 +23,8 @@ For other installation options, see {doc}`/install/index`.
 ```
 
 
+(create-project-cookieplone-system-requirements)=
+
 ## System requirements
 
 Plone 6 has both hardware requirements and software prerequisites.