Skip to content

Commit e74851f

Browse files
authored
Merge branch '6.0' into admin-guide
2 parents 4b688a7 + 61d76ce commit e74851f

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

docs/glossary.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ manual `.po` entries
527527
Entries which cannot be detected by an automatic code scan.
528528
529529
react-intl
530-
A library that is part of [Format.JS](https://formatjs.github.io/) which helps developers set up their applications for internationalization.
530+
[`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.
531531
532532
WSGI
533533
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.
@@ -710,12 +710,6 @@ Windows Subsystem for Linux
710710
pnpm
711711
[pnpm](https://pnpm.io/) is a fast, disk space efficient package manager.
712712
713-
Guillotina
714-
[Guillotina](https://guillotina.io/) is a full-stack data framework built on [AsyncIO](https://docs.python.org/3/library/asyncio.html).
715-
716-
Nick
717-
[Nick](https://nickcms.org/) is a headless content management system {term}`CMS` built with {term}`Node.js`.
718-
719713
predicate
720714
predicates
721715
In programming, a predicate is a test which returns `true` or `false`.
@@ -749,6 +743,10 @@ Jest
749743
[Jest](https://jestjs.io/) is a JavaScript testing framework.
750744
Volto uses Jest for unit tests.
751745
746+
Cypress
747+
[Cypress](https://www.cypress.io/) is a JavaScript testing framework that runs your app in the browser for visually debugging it.
748+
Volto uses Cypress for acceptance tests.
749+
752750
Plone
753751
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.
754752
It continues to set the standard for content management systems by offering the most functionality and customization out of the box.

docs/install/create-project-cookieplone.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ For other installation options, see {ref}`get-started-install-label`.
2626
```
2727

2828

29+
(create-project-cookieplone-system-requirements)=
30+
2931
## System requirements
3032

3133
Plone 6 has both hardware requirements and software prerequisites.

0 commit comments

Comments
 (0)