Skip to content

Commit 99772b5

Browse files
authored
Merge branch '6-dev' into behaviors
2 parents df818a6 + 5a5dd84 commit 99772b5

File tree

5 files changed

+5
-19
lines changed

5 files changed

+5
-19
lines changed

docs/backend/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ search
3434
indexing
3535
zodb
3636
../plone.api/index
37-
plone-restapi
3837
sending-email
3938
upgrading/index
4039
```

docs/backend/plone-restapi.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

docs/backend/upgrading/version-specific-migration/upgrade-to-60.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ The training documentation lists {doc}`three possible theming strategies <themin
184184
## Python
185185

186186
You may need to use a newer Python version.
187-
Supported Python versions are 3.8, 3.9, and 3.10.
187+
Supported Python versions are 3.8, 3.9, 3.10, and 3.11.
188188
We recommend the most recent version.
189189
See https://www.python.org/downloads/ for which Python version is still supported by the Python community.
190190

docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This documentation is for:
2222
- Developers who customize a site’s capabilities, create add-ons, and contribute to Plone itself
2323

2424
```{seealso}
25-
Read the [documentation for the previous version, Plone 5](https://docs.plone.org/).
25+
Read the [documentation for the previous version, Plone 5](https://5.docs.plone.org/).
2626
```
2727

2828

docs/install/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ In this part of the documentation, you can find how to try Plone and how to choo
2525

2626
Choose a version.
2727

28-
- [Plone 6 with Volto frontend](https://6.demo.plone.org/)
29-
- [Plone 6 Classic UI (nightly build)](https://6-classic.demo.plone.org/en)
30-
- [Plone 5.2.x (stable) with Barceloneta frontend](https://demo.plone.org/)
28+
- [Plone 6 with Volto frontend](https://demo.plone.org/)
29+
- [Plone 6 Classic UI (nightly build)](https://classic.demo.plone.org/en)
30+
- [Plone 5.2.x (stable) with Barceloneta frontend](https://52.demo.plone.org/)
3131
:::
3232

3333
:::{grid-item-card} {octicon}`download;1.5em;sd-mr-1` Install

0 commit comments

Comments
 (0)