Skip to content

Commit 48a02db

Browse files
committed
Clean up intro.md
1 parent 0526d31 commit 48a02db

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

docs/backend/upgrading/intro.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,16 @@ It just fixed a bug.
8181
A post on the Community forum, [Rules for Plone 6 development during the beta stage](https://community.plone.org/t/rules-for-plone-6-development-during-the-beta-stage/15432), discusses alpha and beta versioning.
8282
```
8383

84-
In addition to the general procedure there are {ref}`version-specific-upgrade-guide-label`.
8584

8685
(introduction-version-specific-upgrade-guides-label)=
8786

8887
## Version-specific upgrade guides
8988

9089
In addition to the general upgrade procedure, there are {doc}`version-specific migration guides <version-specific-migration/index>`.
91-
9290
These guides contain specific instructions and valuable information that has been collected from real-life migration cases.
9391

94-
This approach is recommended for all upgrades of minor version and can work fine for most mayor upgrades.
95-
When dealing with mayor changes in Plone or with very large or complex installations a export-import based migration (see below) is often the better solution.
92+
This approach is recommended for all upgrades of minor versions, and can work fine for most major upgrades.
93+
When dealing with major changes in Plone, or with very large or complex installations, an {ref}`export-import based migration <introduction-upgrade-strategies-export-import-migrations-label>` is often the better solution.
9694

9795
(introduction-upgrade-strategies-label)=
9896

@@ -104,7 +102,7 @@ When dealing with mayor changes in Plone or with very large or complex installat
104102
### In-place migrations
105103

106104
An in-place migration means the content and settings of a Plone installation are being updated while Plone is running.
107-
These upgrades use a built-in tool
105+
These upgrades use a built-in tool.
108106
They run upgrade steps that are collected in [plone.app.upgrade](https://github.com/plone/plone.app.upgrade/).
109107

110108
This approach is recommended for all upgrades of feature (minor) versions.
@@ -150,7 +148,7 @@ The following major changes in the history of Plone require special attention wh
150148

151149
With Plone 5.0 the default framework for content types switched from Archetypes to Dexterity.
152150

153-
Until Plone 5.2.x there is a built-in migration from Archetypes to Dexterity, but it only supports Python 2.
151+
Up through Plone 5.2.x, there is a built-in migration from Archetypes to Dexterity, but it only supports Python 2.
154152
See [Migration](https://pypi.org/project/plone.app.contenttypes/2.2.3/#migration) in the latest stable release of `plone.app.contenttypes` for details on the migration of custom and default content types to Dexterity.
155153

156154
Using [collective.exportimport](https://pypi.org/project/collective.exportimport/) you can export Archetypes content and import it as Dexterity content.
@@ -160,15 +158,15 @@ Using [collective.exportimport](https://pypi.org/project/collective.exportimport
160158

161159
### Plone 5.2: Support for Python 3
162160

163-
Plone 5.2 added support for Python 3 while Plone 6.0 dropped support for Python 2.
161+
Plone 5.2 added support for Python 3, while Plone 6.0 dropped support for Python 2.
164162
This means that you can use Plone 5.2 to upgrade to Python 3.
165163

166164
This requires that you run Plone in Python 3 and only use code that supports Python 3.
167165
It also requires that you migrate the database in a separate step from Python 2 to 3 while Plone is not running.
168166

169-
See the chapters {ref}`migrating-52-to-python3-label` and {ref}`migrate-zodb-to-python3-label` for detailed information on these steps.
167+
See the chapters {doc}`version-specific-migration/upgrade-to-python3` and {doc}`version-specific-migration/upgrade-zodb-to-python3` for detailed information on these steps.
170168

171-
Using [collective.exportimport](https://pypi.org/project/collective.exportimport/) you can export content in Python 2 and import it in Python 3.
169+
Using [collective.exportimport](https://pypi.org/project/collective.exportimport/), you can export content from Python 2 and import it in Python 3.
172170

173171

174172
(introduction-plone-6.0-volto-as-new-frontend-label)=

0 commit comments

Comments
 (0)