Skip to content

Commit 20d6ad4

Browse files
authored
Apply suggestions from code review
1 parent 9c0275f commit 20d6ad4

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

docs/backend/upgrading/version-specific-migration/upgrade-to-62.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ The third style is `pkgutil`, but Plone has never used it.
3030
Native namespaces exist since Python 3.3.
3131
Because Plone started in the days of Python 2, it has always used `pkg_resources`.
3232
`pkg_resources` is part of the `setuptools` package.
33-
This part is deprecated: it's scheduled to be removed around the end of 2025, in `setuptools` 81.
33+
This part is deprecated.
34+
It's scheduled to be removed around the end of 2025, in `setuptools` 81.
3435
This means Plone needs to move to native namespaces.
3536

3637
In general, this move shouldn't cause problems for integrators.
@@ -48,7 +49,7 @@ In a normal install:
4849
* `zc.buildout` 5 works fine.
4950

5051
If for one or both of these packages you don't use a final release from https://pypi.org, but an editable install, it may not work.
51-
You can solve this by installing an extra package with `pip`: `horse-with-no-namespace`.
52+
You can solve this by installing an extra package with `pip`, `horse-with-no-namespace`.
5253

5354
```{note}
5455
If you let `zc.buildout` install `horse-with-no-namespace`, it won't work.
@@ -67,7 +68,8 @@ If you use the Volto frontend, this means that you get lots of code that you nev
6768

6869
Plone 6.2 starts separating Classic UI code from the core of Plone.
6970
This is ongoing work, described in {term}`PLIP` [3953](https://github.com/plone/Products.CMFPlone/issues/3953).
70-
You won't yet get less code: this is preparation for a more complete separation in Plone 7.
71+
You won't yet get less code yet.
72+
This PLIP is preparation for a more complete separation in Plone 7.
7173

7274
The focus currently is on moving page templates into the `plone.app.layout` package.
7375
Templates from the following packages are now in a new location:
@@ -78,7 +80,7 @@ Templates from the following packages are now in a new location:
7880
```{note}
7981
If you use the `z3c.jbot` add-on to override a template that has been moved, your override will still work.
8082
This is because we keep a mapping from the old to the new location.
81-
For example, `plone.locking` registers that `plone.locking.browser.info.pt` has a new location: `plone.app.layout.viewlets.locking.pt`.
83+
For example, `plone.locking` registers that `plone.locking.browser.info.pt` has a new location, `plone.app.layout.viewlets.locking.pt`.
8284
You should rename your override to the new location if you no longer need compatibility with Plone 6.1 or earlier.
8385
```
8486

styles/config/vocabularies/Plone/accept.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ jQuery
2828
libxslt
2929
middleware
3030
Mockup
31-
namespace
32-
namespaces
31+
namespaces?
3332
npm
3433
nvm
3534
Pastanaga

0 commit comments

Comments
 (0)