From 49ca1a14853c3f626b550b42676bd5b93f7a6670 Mon Sep 17 00:00:00 2001
From: Alex Zeeman <alex.e.zeeman@gmail.com>
Date: Fri, 17 Jan 2025 15:34:26 +0200
Subject: [PATCH 1/2] Changed plone instances to zope instances

---
 docs/_inc/_create-classic-ui-instance.md                      | 2 +-
 docs/backend/upgrading/intro.md                               | 2 +-
 docs/backend/upgrading/troubleshooting.md                     | 2 +-
 .../upgrading/version-specific-migration/migrate-to-volto.md  | 2 +-
 .../version-specific-migration/p4x-to-p5x-upgrade.md          | 2 +-
 .../version-specific-migration/plone5-minor-upgrade.md        | 4 ++--
 .../upgrading/version-specific-migration/upgrade-to-61.md     | 2 +-
 docs/classic-ui/csrf.md                                       | 2 +-
 docs/classic-ui/images.md                                     | 2 +-
 docs/classic-ui/layers.md                                     | 2 +-
 docs/deployment/caching/enable.md                             | 2 +-
 docs/install/containers/examples/haproxy-plone-zeo.md         | 2 +-
 docs/install/containers/images/zeo.md                         | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/_inc/_create-classic-ui-instance.md b/docs/_inc/_create-classic-ui-instance.md
index 2c768d90e..b4a4b8817 100644
--- a/docs/_inc/_create-classic-ui-instance.md
+++ b/docs/_inc/_create-classic-ui-instance.md
@@ -11,5 +11,5 @@ Enter values in the form, and click the button {guilabel}`Create Plone Site`.
 
 You will be redirected to your new Classic UI Plone site.
 
-To stop the Plone instance in foreground mode, type {kbd}`ctrl-c`.
+To stop the Zope instance in foreground mode, type {kbd}`ctrl-c`.
 
diff --git a/docs/backend/upgrading/intro.md b/docs/backend/upgrading/intro.md
index 8d2a1669a..677495fb1 100644
--- a/docs/backend/upgrading/intro.md
+++ b/docs/backend/upgrading/intro.md
@@ -20,7 +20,7 @@ Upgrading Plone includes the Plone application and its add-ons, as well as migra
 
 A *migration* is the process of taking a component in your Plone site, and moving it from its current version to a newer one.
 Migration is necessary because the internals of Plone sometimes change to support new functionality.
-When that's the case, the content that is stored in your Plone instance may not align with the requirements of the new version.
+When that's the case, the content that is stored in your Zope instance may not align with the requirements of the new version.
 To handle this situation, Plone has a built-in tool that migrates existing content to the new structure.
 
 Before migrating you should read this entire document, as well as {ref}`introduction-version-specific-upgrade-guides-label`, to understand the potential impact migrating will have on your Plone site.
diff --git a/docs/backend/upgrading/troubleshooting.md b/docs/backend/upgrading/troubleshooting.md
index 38f289c88..4cd6b2c14 100644
--- a/docs/backend/upgrading/troubleshooting.md
+++ b/docs/backend/upgrading/troubleshooting.md
@@ -86,7 +86,7 @@ If the problem disappears, you will need to double-check the offending product.
 
 (upgrading-troubleshooting-test-with-a-fresh-plone-instance-label)=
 
-## Test with a fresh Plone instance
+## Test with a fresh Zope instance
 
 Create a new Plone site with your new version of Plone.
 You do not need a new Zope instance, because you can add another Plone site in the root of Zope.
diff --git a/docs/backend/upgrading/version-specific-migration/migrate-to-volto.md b/docs/backend/upgrading/version-specific-migration/migrate-to-volto.md
index eb8aa0896..f100fa571 100644
--- a/docs/backend/upgrading/version-specific-migration/migrate-to-volto.md
+++ b/docs/backend/upgrading/version-specific-migration/migrate-to-volto.md
@@ -36,7 +36,7 @@ As a pre-requisite, your Plone site must be {doc}`upgraded to Plone 6 <upgrade-t
 Plone provides a form `/@@migrate_to_volto` that allows you to run all the required changes to your existing site to make it compatible with Volto.
 
 You can access this form in the browser when you are logged in as an Administrator.
-Open `http://localhost:8080/Plone/@@migrate_to_volto`, where `localhost` is your hostname, `8080` is the port on which Plone runs, and `Plone` is the name of the Plone instance.
+Open `http://localhost:8080/Plone/@@migrate_to_volto`, where `localhost` is your hostname, `8080` is the port on which Plone runs, and `Plone` is the name of the Zope instance.
 
 Additionally, after upgrading an existing site to Plone 6 (see {doc}`upgrade-to-60`), a message will appear, **You can prepare your site for Volto, the default frontend of Plone 6!**, with a link to that form.
 
diff --git a/docs/backend/upgrading/version-specific-migration/p4x-to-p5x-upgrade.md b/docs/backend/upgrading/version-specific-migration/p4x-to-p5x-upgrade.md
index 31ae71cc8..a91ba51e8 100644
--- a/docs/backend/upgrading/version-specific-migration/p4x-to-p5x-upgrade.md
+++ b/docs/backend/upgrading/version-specific-migration/p4x-to-p5x-upgrade.md
@@ -74,7 +74,7 @@ When the email addresses are not unique, for example you have both `joe@example.
 It is best is to fix this in your site in Plone 4
 Change email addresses or remove no longer needed users.
 When there are only a few users, you can do this manually.
-To assist you in sites with many users, in Plone 4.1 and higher, you can add the [collective.emaillogin4](https://pypi.org/project/collective.emaillogin4) package to the eggs of your Plone instance.
+To assist you in sites with many users, in Plone 4.1 and higher, you can add the [collective.emaillogin4](https://pypi.org/project/collective.emaillogin4) package to the eggs of your Zope instance.
 
 With that package, even without installing it in the add-ons control panel, you can call the `@@migrate-to-emaillogin` page to look for duplicate email addresses.
 
diff --git a/docs/backend/upgrading/version-specific-migration/plone5-minor-upgrade.md b/docs/backend/upgrading/version-specific-migration/plone5-minor-upgrade.md
index 148ee898c..7f87935f9 100644
--- a/docs/backend/upgrading/version-specific-migration/plone5-minor-upgrade.md
+++ b/docs/backend/upgrading/version-specific-migration/plone5-minor-upgrade.md
@@ -51,7 +51,7 @@ Save your changes.
 
 ### Upgrading
 
-Stop your Plone instance:
+Stop your Zope instance:
 
 ```console
 bin/plonectl stop
@@ -65,7 +65,7 @@ bin/buildout
 
 This may take a some time, as Plone downloads new releases.
 
-When buildout finishes running, restart your Plone instance:
+When buildout finishes running, restart your Zope instance:
 
 ```console
 bin/plonectl start
diff --git a/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md b/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md
index 862dd50ca..cb6026234 100644
--- a/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md
+++ b/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md
@@ -54,7 +54,7 @@ To upgrade your plugin implementation to TinyMCE 7, see the [upgrade guides](htt
         bin/buildout
         ```
     
-1.  Start your Plone instance.
+1.  Start your Zope instance.
 
     ```shell
     bin/instance fg
diff --git a/docs/classic-ui/csrf.md b/docs/classic-ui/csrf.md
index 512baa0e3..201a13918 100644
--- a/docs/classic-ui/csrf.md
+++ b/docs/classic-ui/csrf.md
@@ -171,7 +171,7 @@ def some_function(request):
     # modify the database here
 ```
 
-Disabling all CSRF protection for the whole Plone instance is possible by starting Plone with the environment variable `PLONE_CSRF_DISABLED=true` set.
+Disabling all CSRF protection for the whole Zope instance is possible by starting Plone with the environment variable `PLONE_CSRF_DISABLED=true` set.
 This is not recommended but can be handy temporarily in special situations.
 
 
diff --git a/docs/classic-ui/images.md b/docs/classic-ui/images.md
index 5e5dbdb1e..69a378789 100644
--- a/docs/classic-ui/images.md
+++ b/docs/classic-ui/images.md
@@ -78,7 +78,7 @@ This is useful for caching URLs in Varnish or the browser.
 In case the uploaded image or scale definitions have changed, they will be saved again under a different UID.
 This changes the URL and forces either the browser, or a cache proxy such as Varnish, to fetch it again.
 When a scale has changed, the old stored entry in the annotation will be deleted after 24 hours.
-If one changes an image which is used in multiple pages, the updated versions will only be shown after a restart of the Plone instance, saving the pages again, or after 24 hours.
+If one changes an image which is used in multiple pages, the updated versions will only be shown after a restart of the Zope instance, saving the pages again, or after 24 hours.
 
 
 (classic-ui-images-image-tag-label)=
diff --git a/docs/classic-ui/layers.md b/docs/classic-ui/layers.md
index 9f3aca88c..b6378f038 100644
--- a/docs/classic-ui/layers.md
+++ b/docs/classic-ui/layers.md
@@ -20,7 +20,7 @@ Layers are useful in the following scenarios.
 Layers are marker interfaces applied to the {term}`HTTPRequest` object.
 They are usually used in conjunction with Zope Configuration Mark-up Language ({term}`ZCML`) directives to dynamically activate various parts of the configuration, such as theme files or add-on product functionality.
 
-Layers ensure that only one add-on product can override the specific Plone instance functionality in your site at a time, while still allowing you to have possibly conflicting add-on products in your buildout and ZCML.
+Layers ensure that only one add-on product can override the specific Zope instance functionality in your site at a time, while still allowing you to have possibly conflicting add-on products in your buildout and ZCML.
 Multiple Plone site instances can share the same ZCML and code files.
 
 Many ZCML directives take the optional `layer` parameter.
diff --git a/docs/deployment/caching/enable.md b/docs/deployment/caching/enable.md
index 34e404856..10bdd8ad7 100644
--- a/docs/deployment/caching/enable.md
+++ b/docs/deployment/caching/enable.md
@@ -125,7 +125,7 @@ When the caching control panel is not there, there can be various reasons for th
 
 If you want to install it in an existing Plone Site:
 
-1.  Make sure the package is available in the Plone instance by adding `plone.app.caching` or `Plone` to your installation.
+1.  Make sure the package is available in the Zope instance by adding `plone.app.caching` or `Plone` to your installation.
 2.  From the Plone Site Setup, under the {guilabel}`Advanced` heading or navigation item, select the <img alt="Management Interface" src="/_static/caching/icon-management-interface.svg" class="inline"> {guilabel}`Management Interface` control panel.
 3.  Click {guilabel}`portal_setup`, and then click the {guilabel}`Import` tab.
 4.  Select the profile by title {guilabel}`HTTP caching support`, or by id {guilabel}`profile-plone.app.caching:default`.
diff --git a/docs/install/containers/examples/haproxy-plone-zeo.md b/docs/install/containers/examples/haproxy-plone-zeo.md
index 134777aea..8d4c1cefb 100644
--- a/docs/install/containers/examples/haproxy-plone-zeo.md
+++ b/docs/install/containers/examples/haproxy-plone-zeo.md
@@ -17,7 +17,7 @@ We will use the image [`plone/plone-haproxy`](https://github.com/plone/plone-hap
 
 ## Setup
 
-Create a directory for your project, and inside it create a `docker-compose.yml` file that starts your Plone instance and the ZEO instance with volume mounts for data persistence.
+Create a directory for your project, and inside it create a `docker-compose.yml` file that starts your Zope instance and the ZEO instance with volume mounts for data persistence.
 
 ```yaml
 version: "3"
diff --git a/docs/install/containers/images/zeo.md b/docs/install/containers/images/zeo.md
index 27538ce26..bf192284b 100644
--- a/docs/install/containers/images/zeo.md
+++ b/docs/install/containers/images/zeo.md
@@ -26,7 +26,7 @@ docker run -p 8100:8100 plone/plone-zeo:latest
 
 ### Service configuration with Docker Compose
 
-Create a directory for your project, and inside it create a `docker-compose.yml` file that starts your Plone instance and the ZEO instance with volume mounts for data persistence:
+Create a directory for your project, and inside it create a `docker-compose.yml` file that starts your Zope instance and the ZEO instance with volume mounts for data persistence:
 
 ```yaml
 version: "3"

From 228be2115c96b46e3cb4c6199cdf0ff39ac18e09 Mon Sep 17 00:00:00 2001
From: Alex Zeeman <alex.e.zeeman@gmail.com>
Date: Fri, 21 Feb 2025 12:06:19 +0200
Subject: [PATCH 2/2] requested changes

---
 docs/backend/upgrading/intro.md                               | 2 +-
 docs/backend/upgrading/troubleshooting.md                     | 4 ++--
 .../upgrading/version-specific-migration/migrate-to-volto.md  | 2 +-
 docs/classic-ui/layers.md                                     | 4 ++--
 submodules/plone.api                                          | 2 +-
 submodules/plone.restapi                                      | 2 +-
 submodules/volto                                              | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/backend/upgrading/intro.md b/docs/backend/upgrading/intro.md
index 677495fb1..5dd565019 100644
--- a/docs/backend/upgrading/intro.md
+++ b/docs/backend/upgrading/intro.md
@@ -20,7 +20,7 @@ Upgrading Plone includes the Plone application and its add-ons, as well as migra
 
 A *migration* is the process of taking a component in your Plone site, and moving it from its current version to a newer one.
 Migration is necessary because the internals of Plone sometimes change to support new functionality.
-When that's the case, the content that is stored in your Zope instance may not align with the requirements of the new version.
+When that's the case, the content that is stored in your Plone site may not align with the requirements of the new version.
 To handle this situation, Plone has a built-in tool that migrates existing content to the new structure.
 
 Before migrating you should read this entire document, as well as {ref}`introduction-version-specific-upgrade-guides-label`, to understand the potential impact migrating will have on your Plone site.
diff --git a/docs/backend/upgrading/troubleshooting.md b/docs/backend/upgrading/troubleshooting.md
index 4cd6b2c14..18b0973ba 100644
--- a/docs/backend/upgrading/troubleshooting.md
+++ b/docs/backend/upgrading/troubleshooting.md
@@ -84,9 +84,9 @@ If the problem disappears, you will need to double-check the offending product.
     Re-install it and check the installation log.
 
 
-(upgrading-troubleshooting-test-with-a-fresh-plone-instance-label)=
+(upgrading-troubleshooting-test-with-a-fresh-plone-site-label)=
 
-## Test with a fresh Zope instance
+## Test with a fresh Plone site
 
 Create a new Plone site with your new version of Plone.
 You do not need a new Zope instance, because you can add another Plone site in the root of Zope.
diff --git a/docs/backend/upgrading/version-specific-migration/migrate-to-volto.md b/docs/backend/upgrading/version-specific-migration/migrate-to-volto.md
index f100fa571..e84b12a1f 100644
--- a/docs/backend/upgrading/version-specific-migration/migrate-to-volto.md
+++ b/docs/backend/upgrading/version-specific-migration/migrate-to-volto.md
@@ -36,7 +36,7 @@ As a pre-requisite, your Plone site must be {doc}`upgraded to Plone 6 <upgrade-t
 Plone provides a form `/@@migrate_to_volto` that allows you to run all the required changes to your existing site to make it compatible with Volto.
 
 You can access this form in the browser when you are logged in as an Administrator.
-Open `http://localhost:8080/Plone/@@migrate_to_volto`, where `localhost` is your hostname, `8080` is the port on which Plone runs, and `Plone` is the name of the Zope instance.
+Open `http://localhost:8080/Plone/@@migrate_to_volto`, where `localhost` is your hostname, `8080` is the port on which Plone runs, and `Plone` is the name of the Plone site.
 
 Additionally, after upgrading an existing site to Plone 6 (see {doc}`upgrade-to-60`), a message will appear, **You can prepare your site for Volto, the default frontend of Plone 6!**, with a link to that form.
 
diff --git a/docs/classic-ui/layers.md b/docs/classic-ui/layers.md
index b6378f038..68f516cf0 100644
--- a/docs/classic-ui/layers.md
+++ b/docs/classic-ui/layers.md
@@ -20,8 +20,8 @@ Layers are useful in the following scenarios.
 Layers are marker interfaces applied to the {term}`HTTPRequest` object.
 They are usually used in conjunction with Zope Configuration Mark-up Language ({term}`ZCML`) directives to dynamically activate various parts of the configuration, such as theme files or add-on product functionality.
 
-Layers ensure that only one add-on product can override the specific Zope instance functionality in your site at a time, while still allowing you to have possibly conflicting add-on products in your buildout and ZCML.
-Multiple Plone site instances can share the same ZCML and code files.
+Layers ensure that only one add-on product can override the specific Zope view in your site at a time, while still allowing you to have possibly conflicting add-on products in your buildout and ZCML.
+Multiple Plone sites can share the same ZCML and code files.
 
 Many ZCML directives take the optional `layer` parameter.
 Layers are activated when an add-on product is installed or a certain theme is activated.
diff --git a/submodules/plone.api b/submodules/plone.api
index a876d7064..dbb559593 160000
--- a/submodules/plone.api
+++ b/submodules/plone.api
@@ -1 +1 @@
-Subproject commit a876d70649458e6eecb6786156cc53eae4add5e9
+Subproject commit dbb559593ea89f86603dadb41822d99bb24894d0
diff --git a/submodules/plone.restapi b/submodules/plone.restapi
index 6e2ab6b23..7af964916 160000
--- a/submodules/plone.restapi
+++ b/submodules/plone.restapi
@@ -1 +1 @@
-Subproject commit 6e2ab6b2315a0b942ba6e1943eec9bed6a3f1a9d
+Subproject commit 7af964916aa59cb38b33700198829b8372c1b4ea
diff --git a/submodules/volto b/submodules/volto
index a121c2b54..9de7ba45c 160000
--- a/submodules/volto
+++ b/submodules/volto
@@ -1 +1 @@
-Subproject commit a121c2b5451d407cbfe8c681b3657fc5edbc3136
+Subproject commit 9de7ba45c8784ff5b14ce7032d20d04bcdd9970b