Skip to content

Commit 228be21

Browse files
committed
requested changes
1 parent a83ac53 commit 228be21

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

docs/backend/upgrading/intro.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Upgrading Plone includes the Plone application and its add-ons, as well as migra
2020

2121
A *migration* is the process of taking a component in your Plone site, and moving it from its current version to a newer one.
2222
Migration is necessary because the internals of Plone sometimes change to support new functionality.
23-
When that's the case, the content that is stored in your Zope instance may not align with the requirements of the new version.
23+
When that's the case, the content that is stored in your Plone site may not align with the requirements of the new version.
2424
To handle this situation, Plone has a built-in tool that migrates existing content to the new structure.
2525

2626
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.

docs/backend/upgrading/troubleshooting.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ If the problem disappears, you will need to double-check the offending product.
8484
Re-install it and check the installation log.
8585

8686

87-
(upgrading-troubleshooting-test-with-a-fresh-plone-instance-label)=
87+
(upgrading-troubleshooting-test-with-a-fresh-plone-site-label)=
8888

89-
## Test with a fresh Zope instance
89+
## Test with a fresh Plone site
9090

9191
Create a new Plone site with your new version of Plone.
9292
You do not need a new Zope instance, because you can add another Plone site in the root of Zope.

docs/backend/upgrading/version-specific-migration/migrate-to-volto.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ As a pre-requisite, your Plone site must be {doc}`upgraded to Plone 6 <upgrade-t
3636
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.
3737

3838
You can access this form in the browser when you are logged in as an Administrator.
39-
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.
39+
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.
4040

4141
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.
4242

docs/classic-ui/layers.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ Layers are useful in the following scenarios.
2020
Layers are marker interfaces applied to the {term}`HTTPRequest` object.
2121
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.
2222

23-
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.
24-
Multiple Plone site instances can share the same ZCML and code files.
23+
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.
24+
Multiple Plone sites can share the same ZCML and code files.
2525

2626
Many ZCML directives take the optional `layer` parameter.
2727
Layers are activated when an add-on product is installed or a certain theme is activated.

submodules/plone.restapi

Submodule plone.restapi updated 83 files

submodules/volto

Submodule volto updated from a121c2b to 9de7ba4

0 commit comments

Comments
 (0)