Merge branch '6.0' into pull-request-preview

Author: stevepiercy

coredev/packages-dependencies.md

@@ -23,7 +23,7 @@ This document shows the current state as an orientation.
 
 There are multiple level of dependencies:
 
--   package level (`setup.py`/`setup.cfg`)
+-   package level (`setup.py`/`setup.cfg`/`pyproject.toml`)
 -   Python level (imports)
 -   ZCML level (includes)
 -   testing (need for layers, such as functional testing)
@@ -41,22 +41,35 @@ A base mental model for how Plone is organized in Plone 6 since alpha 4 is shown
 
 ```
 ┌────────────────────────────┐
-│                            │
-│ On top of Products.CMFPlone│
-│ like:                      │
-│ - Plone                    │
-│ - plone.api                │
-│ - plone.volto              │
+│ "Plone"                    |
+| The Integration of both    |
+| distributions in one       |
+| Release                    |
+├────────────────────────────┤
+| Distributions:             |
+| - plone.volto              |
+| - plone.classicui          |
+├────────────────────────────┤
+│ Core-Addons                │
+│ - plone.distribution       │
+│ - plone.app.exportimport   │
+│ - plone.app.discussion     │
+│ - plone.app.multilingual   │
+│ - plone.app.caching        │
 │ - plone.app.iterate        │
 │ - plone.app.update         │
 │                            │
 ├────────────────────────────┤
+│ Core-APIs                  │
+│ - plone.restapi            │
+│ - plone.api                │
+├────────────────────────────┤
 │                            │
 │     Products.CMFPlone      │
 │                            │
 ├────────────────────────────┤
 │                            │
-│ The space between          │
+│ The space between (core )  │
 │                            │
 │ - most of plone.app.*      │
 │ - but also some other      │
@@ -75,6 +88,7 @@ A base mental model for how Plone is organized in Plone 6 since alpha 4 is shown
 │ - plone.registry           │
 │ - plone.dexterity          │
 │ - plone.behavior           │
+│ - plone.rest               │
 │ - ....                     │
 │                            │
 └────────────────────────────┘

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

@@ -86,3 +86,21 @@ If your project or your add-on needs this package, and you only depend on `Produ
 Then your project or add-on will keep working in both Plone 6.0 and 6.1.
 
 The goal of turning more of the current core packages into core add-ons is to make the core smaller, and in some cases solve circular dependencies.
+
+
+(backend-upgrade-plone-v61-discussion-label)=
+
+## Discussion is disabled by default
+
+Discussion is a feature that allows your site visitors to comment on web pages for any content object.
+Discussion is disabled by default in Plone 6.1 and later.
+To enable discussion, you need to perform the following tasks.
+
+% Please add sufficient details for how to do this task, then delete this comment.
+% Also consider that there might be different approaches between Classic UI and Volto that need to be mentioned.
+
+1.  In your Python {file}`requirements.txt` or {file}`pyproject.toml` file, add the core add-on `plone.app.discussion` to your dependencies.
+1.  Run pip to install `plone.app.discussion`.
+1.  Restart the Plone backend to load `plone.app.discussion`.
+1.  Enable the {guilabel}`Discussion` add-on in the Plone control panel under {menuselection}`Site Setup --> General`.
+1.  🍻

docs/i18n-l10n/index.md

@@ -27,6 +27,17 @@ Wikipedia article [Internationalization and localization](https://en.wikipedia.o
 ```
 
 
+(i18n-l10n-supported-languages)=
+
+## Supported languages
+
+Plone supports many language translations in its two frontends.
+For Volto, see [`plone/volto`](https://github.com/plone/volto/tree/main/packages/volto/locales).
+For Classic UI, see [`collective/plone.app.locales`](https://github.com/collective/plone.app.locales/tree/master/plone/app/locales/locales).
+
+You can contribute new languages to both frontends.
+
+
 (i18n-l10n-code-versus-content-label)=
 
 ## Code versus content