Merge branch '6.0' into volto-5730-reorg-roadmap

Author: stevepiercy

docs/conf.py

@@ -341,9 +341,9 @@ def source_replace(app, docname, source):
 # Dict of replacements.
 source_replacements = {
     "{PLONE_BACKEND_MINOR_VERSION}": "6.0",
-    "{PLONE_BACKEND_PATCH_VERSION}": "6.0.9",
+    "{PLONE_BACKEND_PATCH_VERSION}": "6.0.10.1",
     "{NVM_VERSION}": "0.39.5",
-    "{SUPPORTED_PYTHON_VERSIONS}": "3.8, 3.9, 3.10, or 3.11",
+    "{SUPPORTED_PYTHON_VERSIONS}": "3.8, 3.9, 3.10, 3.11, or 3.12",
 }
 
 

docs/install/manage-add-ons-packages.md

@@ -173,14 +173,9 @@ collective.easyform
 
 Add it to {file}`instance.yaml` to let Zope know that this add-on should be loaded:
 
-```{code-block} yaml
-:emphasize-lines: 3-6
+```yaml
 default_context:
-    load_zcml:
-        package_includes: [
-            'project_title',
-            'collective.easyform',
-        ]
+    zcml_package_includes: project_title, collective.easyform
 ```
 
 Stop the backend with {kbd}`ctrl-c`.
@@ -221,11 +216,7 @@ Add it to {file}`instance.yaml` to let Zope know that this add-on should be load
 
 ```yaml
 default_context:
-    load_zcml:
-        package_includes: [
-            'project_title',
-            'collective.easyform',
-        ]
+    zcml_package_includes: project_title, collective.easyform
 ```
 
 Stop the backend with {kbd}`ctrl-c`.
@@ -265,11 +256,7 @@ Add it to {file}`instance.yaml` to let Zope know that this add-on should be load
 
 ```yaml
 default_context:
-    load_zcml:
-        package_includes: [
-            'project_title',
-            'collective.easyform',
-        ]
+    zcml_package_includes: project_title, collective.easyform
 ```
 
 Stop the backend with {kbd}`ctrl-c`.