From 30428c021d1927106bcc1bf1280ca92e56a5620b Mon Sep 17 00:00:00 2001 From: Mikel Larreategi Date: Tue, 5 May 2026 08:42:48 +0200 Subject: [PATCH 1/7] add paragraph about p.a.layout being installable --- .../version-specific-migration/upgrade-to-62.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md b/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md index c148be8c4..b9c64f07e 100644 --- a/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md +++ b/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md @@ -88,6 +88,15 @@ Templates from the following packages are now in a new location: * `plone.locking` * `plone.protect` +Starting with Plone 6.2, you can choose to activate plone.app.layout in the Add-ons control panel. + +If you use the Classic UI, you should do this. If you use Volto as your (main) UI, you should not do this. + +The automatic upgrade tries to do the right thing, but you should check the Add-ons control panel. + +The setting currently has little influence, so if you are not sure: don't worry about it. + + ```{note} If you use the `z3c.jbot` add-on to override a template that has been moved, your override will still work. This is because we keep a mapping from the old to the new location. From fbe58698eb99074666062b114056338e9a2bb449 Mon Sep 17 00:00:00 2001 From: Mikel Larreategi Date: Tue, 5 May 2026 09:50:46 +0200 Subject: [PATCH 2/7] Update docs/backend/upgrading/version-specific-migration/upgrade-to-62.md Co-authored-by: Steve Piercy --- .../upgrading/version-specific-migration/upgrade-to-62.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md b/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md index b9c64f07e..10413577b 100644 --- a/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md +++ b/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md @@ -88,7 +88,7 @@ Templates from the following packages are now in a new location: * `plone.locking` * `plone.protect` -Starting with Plone 6.2, you can choose to activate plone.app.layout in the Add-ons control panel. +Starting with Plone 6.2, you can activate plone.app.layout in the {guilabel}`Add-ons` control panel. If you use the Classic UI, you should do this. If you use Volto as your (main) UI, you should not do this. From c10108cb47270655ea197d4ceb5a214b68c809d0 Mon Sep 17 00:00:00 2001 From: Mikel Larreategi Date: Tue, 5 May 2026 09:50:54 +0200 Subject: [PATCH 3/7] Update docs/backend/upgrading/version-specific-migration/upgrade-to-62.md Co-authored-by: Steve Piercy --- .../upgrading/version-specific-migration/upgrade-to-62.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md b/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md index 10413577b..c82a206c1 100644 --- a/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md +++ b/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md @@ -90,7 +90,8 @@ Templates from the following packages are now in a new location: Starting with Plone 6.2, you can activate plone.app.layout in the {guilabel}`Add-ons` control panel. -If you use the Classic UI, you should do this. If you use Volto as your (main) UI, you should not do this. +If you use Classic UI, you should activate it. +If you use Volto, you should not activate it. The automatic upgrade tries to do the right thing, but you should check the Add-ons control panel. From fc37c0314960734e5d367bd04489ad3e44c46156 Mon Sep 17 00:00:00 2001 From: Mikel Larreategi Date: Tue, 5 May 2026 09:51:15 +0200 Subject: [PATCH 4/7] Update docs/backend/upgrading/version-specific-migration/upgrade-to-62.md Co-authored-by: Steve Piercy --- .../upgrading/version-specific-migration/upgrade-to-62.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md b/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md index c82a206c1..ee5aac10d 100644 --- a/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md +++ b/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md @@ -93,7 +93,7 @@ Starting with Plone 6.2, you can activate plone.app.layout in the {guilabel}`Add If you use Classic UI, you should activate it. If you use Volto, you should not activate it. -The automatic upgrade tries to do the right thing, but you should check the Add-ons control panel. +The automatic upgrade attempts to activate plone.app.layout according to your original configuration, but you should check the {guilabel}`Add-ons` control panel to make sure. The setting currently has little influence, so if you are not sure: don't worry about it. From 302af342278d4ca00c2c71c396cb2d66160d3765 Mon Sep 17 00:00:00 2001 From: Mikel Larreategi Date: Tue, 5 May 2026 09:51:29 +0200 Subject: [PATCH 5/7] Update docs/backend/upgrading/version-specific-migration/upgrade-to-62.md Co-authored-by: Steve Piercy --- .../upgrading/version-specific-migration/upgrade-to-62.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md b/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md index ee5aac10d..b6d507ddb 100644 --- a/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md +++ b/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md @@ -95,7 +95,7 @@ If you use Volto, you should not activate it. The automatic upgrade attempts to activate plone.app.layout according to your original configuration, but you should check the {guilabel}`Add-ons` control panel to make sure. -The setting currently has little influence, so if you are not sure: don't worry about it. +The setting currently has little influence, so if you're not sure, then don't worry about it. ```{note} From f3c03f12b3eec9d1edef0400c98a9998e1bcef6a Mon Sep 17 00:00:00 2001 From: Mikel Larreategi Date: Tue, 5 May 2026 12:19:08 +0200 Subject: [PATCH 6/7] Update docs/backend/upgrading/version-specific-migration/upgrade-to-62.md --- .../upgrading/version-specific-migration/upgrade-to-62.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md b/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md index b6d507ddb..932be6bc8 100644 --- a/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md +++ b/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md @@ -95,7 +95,7 @@ If you use Volto, you should not activate it. The automatic upgrade attempts to activate plone.app.layout according to your original configuration, but you should check the {guilabel}`Add-ons` control panel to make sure. -The setting currently has little influence, so if you're not sure, then don't worry about it. + ```{note} From 5842b5742e65636c906eb46825ee5fed0529930d Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 5 May 2026 03:49:02 -0700 Subject: [PATCH 7/7] Remove extra blank lines --- .../upgrading/version-specific-migration/upgrade-to-62.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md b/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md index 932be6bc8..3781efc2f 100644 --- a/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md +++ b/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md @@ -95,9 +95,6 @@ If you use Volto, you should not activate it. The automatic upgrade attempts to activate plone.app.layout according to your original configuration, but you should check the {guilabel}`Add-ons` control panel to make sure. - - - ```{note} If you use the `z3c.jbot` add-on to override a template that has been moved, your override will still work. This is because we keep a mapping from the old to the new location.