Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed plone instances to zope instances #1836

Open
wants to merge 1 commit into
base: 6.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/_inc/_create-classic-ui-instance.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

2 changes: 1 addition & 1 deletion docs/backend/upgrading/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
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.
Expand Down
2 changes: 1 addition & 1 deletion docs/backend/upgrading/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)=
Copy link
Contributor

@stevepiercy stevepiercy Jan 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
(upgrading-troubleshooting-test-with-a-fresh-plone-instance-label)=
(upgrading-troubleshooting-test-with-a-fresh-plone-site-label)=


## Test with a fresh Plone instance
## Test with a fresh Zope instance
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
## Test with a fresh Zope instance
## Test with a fresh Plone site

The context below makes it clear that this is about a new Plone site, not a new 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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Save your changes.

### Upgrading

Stop your Plone instance:
Stop your Zope instance:

```console
bin/plonectl stop
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/classic-ui/csrf.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.


Expand Down
2 changes: 1 addition & 1 deletion docs/classic-ui/images.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)=
Expand Down
2 changes: 1 addition & 1 deletion docs/classic-ui/layers.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
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.
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 site instances can share the same ZCML and code files.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Multiple Plone site instances can share the same ZCML and code files.
Multiple Plone sites can share the same ZCML and code files.


Many ZCML directives take the optional `layer` parameter.
Expand Down
2 changes: 1 addition & 1 deletion docs/deployment/caching/enable.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
2 changes: 1 addition & 1 deletion docs/install/containers/examples/haproxy-plone-zeo.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docs/install/containers/images/zeo.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading