Add overrides & zope config, remove old manage section

Author: davisagli

docs/admin-guide/add-ons.md

@@ -159,6 +159,8 @@ To actually download and install the new add-on, run:
 bin/buildout
 ```
 
+Then restart your instance.
+
 ### Install an add-on from source
 
 An add-on can be installed from a source control system such as GitHub.
@@ -195,6 +197,8 @@ To actually download and install the new add-on, run:
 bin/buildout
 ```
 
+Then restart your instance.
+
 ```{seealso}
 This approach uses the [`mr.developer`](https://pypi.org/project/mr.developer/) Buildout extension.
 ```

docs/admin-guide/configure-zope.md

@@ -0,0 +1,33 @@
+---
+myst:
+  html_meta:
+    "description": "Configure Zope options"
+    "property=og:description": "Configure Zope options"
+    "property=og:title": "Configure Zope"
+    "keywords": "Plone 6, Zope, instance, app server, config, cookiecutter-zope-instance"
+---
+
+(configure-zope-label)=
+
+# Configure Zope
+
+Plone runs in an application server called {term}`Zope`.
+
+You can configure your Zope instance's options, including the following.
+
+* persistent storage: blobs, direct filestorage, relation database, ZEO, and so on
+* ports
+* threads
+* cache
+* logging
+* debugging and profiling for development
+
+## with Cookieplone
+
+If you installed Plone using Cookieplone, `cookiecutter-plone-starter`, or pip, then Zope is configured using {term}`cookiecutter-zope-instance`.
+For a complete list of features, usage, and options, read [`cookiecutter-zope-instance`'s README](https://github.com/plone/cookiecutter-zope-instance#readme).
+
+## with Buildout
+
+If you installed Plone using Buildout, then Zope is configured using `plone.recipe.zope2instance`.
+For a complete list of features, usage, and options, read [`plone.recipe.zope2instance`'s README](https://pypi.org/project/plone.recipe.zope2instance/).

docs/admin-guide/index.md

@@ -29,7 +29,9 @@ install-plonestarter
 :maxdepth: 1
 
 run-plone
+configure-zope
 add-ons
+override-core
 upgrade
 ```
 
@@ -39,7 +41,3 @@ upgrade
 
 containers/index
 ```
-
-
-To do:
-- move and update Manage section

docs/admin-guide/override-core.md

@@ -0,0 +1,167 @@
+---
+myst:
+  html_meta:
+    "description": "Override core Plone packages"
+    "property=og:description": "Override core Plone packages"
+    "property=og:title": "Override core Plone packages"
+    "keywords": "Plone 6, core, package, version, override"
+---
+
+(override-core-plone-packages-label)=
+
+# Override core Plone packages
+
+Plone includes a lot of Python packages.
+Sometimes it is necessary to override one or more package versions in order to fix a bug.
+
+
+## with Cookieplone
+
+Use the following instructions if you installed Plone with Cookieplone or `cookiecutter-plone-starter`.
+
+### Override a core Plone package
+
+Add a version override to {file}`mx.ini`.
+This example uses `plone.api`.
+
+```
+[settings]
+version-overrides =
+    plone.api==2.0.0a3
+```
+
+```{seealso}
+The {file}`mx.ini` file configures a tool called {term}`mxdev`.
+For an explanation of why Plone uses `mxdev`, see {ref}`manage-backend-python-packages-label`.
+```
+
+Stop the backend with {kbd}`ctrl-c`.
+
+To actually download and install the new package version, run:
+
+```shell
+make backend-build
+```
+
+```{note}
+If you installed Plone using `cookiecutter-plone-starter`, run `make build-backend` instead.`
+```
+
+Now restart the backend.
+
+
+### Install a core Plone package from source
+
+`mxdev` can also be used to install core Plone packages from a source control system such as GitHub.
+
+Add the Plone package you want to check out in {file}`mx.ini`.
+This example uses `plone.restapi`.
+
+```cfg
+[plone.restapi]
+url = git@github.com:plone/plone.restapi.git
+branch = main
+extras = test
+```
+
+Stop the backend with {kbd}`ctrl-c`.
+
+To actually download and install the new package version, run:
+
+```shell
+make backend-build
+```
+
+```{note}
+If you installed Plone using `cookiecutter-plone-starter`, run `make build-backend` instead.`
+```
+
+Now restart the backend.
+
+
+## with Buildout
+
+Use the following instructions if you installed Plone with Buildout.
+
+### Override a core Plone package
+
+Update {file}`buildout.cfg`.
+This example uses `plone.api`.
+
+```cfg
+[buildout]
+extends =
+    https://dist.plone.org/release/6-latest/versions.cfg
+
+parts =
+    instance
+
+[instance]
+recipe = plone.recipe.zope2instance
+user = admin:admin
+http-address = 8080
+eggs =
+    Plone
+
+[versions]
+plone.api = 2.0.0a3
+```
+
+```{note}
+The version pins specified in the `[versions]` section will take precedence over the pins inherited from `https://dist.plone.org/release/6-latest/versions.cfg`.
+```
+
+To actually download and install the new package version, run:
+
+```shell
+bin/buildout
+```
+
+Then restart your instance.
+
+
+### Install a core Plone package from source
+
+A core Plone package can be installed from a source control system such as GitHub.
+
+Update {file}`buildout.cfg`.
+This example uses `plone.restapi`.
+
+```cfg
+[buildout]
+extends =
+    https://dist.plone.org/release/6-latest/versions.cfg
+extensions = mr.developer
+auto-checkout =
+    plone.restapi
+
+parts =
+    instance
+
+[instance]
+recipe = plone.recipe.zope2instance
+user = admin:admin
+http-address = 8080
+eggs =
+    Plone
+
+[sources]
+plone.restapi = git https://github.com/plone/plone.restapi.git
+
+[versions]
+plone.restapi =
+```
+
+```{tip}
+Setting an empty version ensures that the copy of `plone.restapi` from source control will be used, instead of the version pin inherited from https://dist.plone.org/release/6-latest/versions.cfg.
+```
+
+To actually download and install the new add-on, run:
+
+```shell
+bin/buildout
+```
+
+```{seealso}
+This approach uses the [`mr.developer`](https://pypi.org/project/mr.developer/) Buildout extension.
+```

docs/index.md

@@ -33,7 +33,6 @@ Read the [documentation for the previous version, Plone 5](https://5.docs.plone.
 overview/index
 install/index
 admin-guide/index
-manage/index
 deployment/index
 volto/index
 classic-ui/index