Skip to content

Commit 8b85995

Browse files
authored
Merge branch '6.0' into container-recipes-zodb-pack-follow-up
2 parents f0f91bb + aee2cf6 commit 8b85995

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

docs/backend/zodb.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ myst:
44
"description": "Zope Object Database (ZODB)"
55
"property=og:description": "Zope Object Database (ZODB)"
66
"property=og:title": "Zope Object Database (ZODB)"
7-
"keywords": "Plone, ZODB, Zope Object Database, RelStorage, ZEO, ZODB Extension Objects"
7+
"keywords": "Plone, ZODB, Zope Object Database, RelStorage, ZEO, ZODB Enterprise Objects"
88
---
99

1010
% TODO: Diátaxis conceptual guide
@@ -37,7 +37,7 @@ Built-in versioning and undo
3737
: The database allows versioning, enabling rollback to previous states if needed.
3838

3939
Scalability
40-
: ZODB can be used in standalone applications or scaled with {term}`ZODB Extension Objects` (ZEO) for distributed storage.
40+
: ZODB can be used in standalone applications or scaled with {term}`ZODB Enterprise Objects` (ZEO) for distributed storage.
4141
Additionally, ZODB supports the {term}`RelStorage` adapter, which allows it to use relational databases, including PostgreSQL, MySQL, or Oracle, as a backend, providing flexibility for integration with existing database infrastructures.
4242

4343

docs/glossary.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ react-intl
554554
WSGI
555555
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.
556556
557-
ZODB Extension Objects
557+
ZODB Enterprise Objects
558558
ZEO
559559
[ZEO](https://zeo.readthedocs.io/en/latest/) is a client-server storage for ZODB for sharing a single storage among many clients.
560560

docs/install/create-project-cookieplone.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ Plone 6 has both hardware requirements and software prerequisites.
7070
```{include} /_inc/_install-python-plone61.md
7171
```
7272

73-
Plone 6.1 requires Python version {{SUPPORTED_PYTHON_VERSIONS_PLONE61}}.
74-
7573
```{warning}
7674
Python 3.9 will reach [end of life in October 2025](https://devguide.python.org/versions/).
7775
Do not create a new Plone project with Python 3.9.

0 commit comments

Comments
 (0)