Merge branch '6.0' into plone.app.dexterity-index

Author: stevepiercy

docs/classic-ui/layers.md

@@ -58,12 +58,8 @@ Then views and viewlets from your product can be enabled on the site instance us
 ### Unconditional overrides
 
 If you want to override a view or a viewlet unconditionally for all sites without the add-on product installer support, you need to use `overrides.zcml`.
-
-```{todo}
-Explain how to use an `overrides.zcml`.
-
-See https://github.com/plone/documentation/issues/1426
-```
+You can override classes and templates in this file.
+To do this, you put the ZCML registration in a file called `overrides.zcml` in the package root, next to the top-most `configure.zcml`.
 
 
 (classic-ui-creating-a-layer-label)=

docs/classic-ui/views.md

@@ -173,7 +173,7 @@ You need to declare the `browser` namespace in your `configure.zcml` to use `bro
 ```
 
 The view in question is registered against a {ref}`layer <classic-ui-layers-label>`.
-It will be available after restart, after running the {ref}`GenericSetup profile <backend-configuration-registry-generic-setup-label>`.
+It will be available after restart and running the {ref}`GenericSetup profile <backend-configuration-registry-generic-setup-label>`, or enabling the add-on.
 
 
 (classic-ui-page-template-label)=
@@ -432,7 +432,7 @@ Since one Zope application server can contain multiple Plone sites, layers are u
 A layer is in use when either:
 
 -   a theme which defines that layer is active, or
--   if a specific add-on product which defines that layer is installed.
+-   if a specific add-on product which defines that layer is installed in the Plone site.
 
 You should register your views against a certain layer in your own code.