Merge branch '6-dev' into exclude-included-file

Author: stevepiercy

docs/conf.py

@@ -296,7 +296,8 @@ def source_replace(app, docname, source):
 
 # Dict of replacements.
 source_replacements = {
-    "{PLONE_BACKEND_VERSION}": "6.0.0",
+    "{PLONE_BACKEND_MINOR_VERSION}": "6.0",
+    "{PLONE_BACKEND_PATCH_VERSION}": "6.0.0.1",
 }
 
 

docs/install/containers/examples/haproxy-plone-zeo.md

@@ -40,7 +40,7 @@ services:
       LOG_LEVEL: "info"
 
   backend:
-    image: plone/plone-backend:{PLONE_BACKEND_VERSION}
+    image: plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
     restart: always
     environment:
       ZEO_ADDRESS: zeo:8100

docs/install/containers/examples/nginx-plone.md

@@ -76,7 +76,7 @@ services:
     - "80:80"
 
   backend:
-    image: plone/plone-backend:{PLONE_BACKEND_VERSION}
+    image: plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
     environment:
       SITE: Plone
       TYPE: classic

docs/install/containers/examples/nginx-volto-plone-postgresql.md

@@ -106,7 +106,7 @@ services:
       - backend
 
   backend:
-    image: plone/plone-backend:{PLONE_BACKEND_VERSION}
+    image: plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
     environment:
       SITE: Plone
       RELSTORAGE_DSN: "dbname='plone' user='plone' host='db' password='plone'"

docs/install/containers/examples/nginx-volto-plone-zeo.md

@@ -106,7 +106,7 @@ services:
       - backend
 
   backend:
-    image: plone/plone-backend:{PLONE_BACKEND_VERSION}
+    image: plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
     environment:
       SITE: Plone
       ZEO_ADDRESS: db:8100

docs/install/containers/examples/nginx-volto-plone.md

@@ -104,7 +104,7 @@ services:
       - backend
 
   backend:
-    image: plone/plone-backend:{PLONE_BACKEND_VERSION}
+    image: plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
     environment:
       SITE: Plone
     volumes:

docs/install/containers/images/backend.md

@@ -18,7 +18,7 @@ This chapter covers Plone backend [Docker](https://www.docker.com/) images using
 ### Simple usage
 
 ```shell
-docker run -p 8080:8080 plone/plone-backend:{PLONE_BACKEND_VERSION} start
+docker run -p 8080:8080 plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION} start
 ```
 
 Then point your browser at `http://localhost:8080`.
@@ -62,7 +62,7 @@ Plone 6 example:
 
 ```shell
 # Makes Zope listen to port 8081 instead of the default 8080.
-docker run -p 8081:8081 -e LISTEN_PORT=8081 plone/plone-backend:{PLONE_BACKEND_VERSION}
+docker run -p 8081:8081 -e LISTEN_PORT=8081 plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
 ```
 
 ### Site creation variables
@@ -84,13 +84,13 @@ To recreate the Plone site when restarting the container, you can pass the `DELE
 Plone 6 example:
 
 ```shell
-docker run -p 8080:8080 -e ADDONS="eea.api.layout" -e SITE="Plone" -e PROFILES="eea.api.layout:default" plone/plone-backend:{PLONE_BACKEND_VERSION}
+docker run -p 8080:8080 -e ADDONS="eea.api.layout" -e SITE="Plone" -e PROFILES="eea.api.layout:default" plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
 ```
 
 Plone 6 Classic example:
 
 ```shell
-docker run -p 8080:8080 -e ADDONS="eea.facetednavigation" -e SITE="Plone" -e TYPE="classic" -e PROFILES="eea.facetednavigation:default" plone/plone-backend:{PLONE_BACKEND_VERSION}
+docker run -p 8080:8080 -e ADDONS="eea.facetednavigation" -e SITE="Plone" -e TYPE="classic" -e PROFILES="eea.facetednavigation:default" plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
 ```
 
 ```{warning}
@@ -124,7 +124,7 @@ version: "3"
 services:
 
   backend:
-    image: plone/plone-backend:{PLONE_BACKEND_VERSION}
+    image: plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
     restart: always
     environment:
       ZEO_ADDRESS: zeo:8100
@@ -192,7 +192,7 @@ version: "3"
 services:
 
   backend:
-    image: plone/plone-backend:{PLONE_BACKEND_VERSION}
+    image: plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
     environment:
       RELSTORAGE_DSN: "dbname='plone' user='plone' host='db' password='plone'"
     ports:
@@ -241,7 +241,7 @@ To do so, pass the `ADDONS` environment variable with a space separated list of
 (see below for documentation of the supported variables):
 
 ```shell
-docker run -p 8080:8080 -e ADDONS="pas.plugins.authomatic" plone/plone-backend:{PLONE_BACKEND_VERSION} start
+docker run -p 8080:8080 -e ADDONS="pas.plugins.authomatic" plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION} start
 ```
 
 After Plone has started, you can add your Plone site (if none exists yet) and install the added
@@ -250,7 +250,7 @@ add-ons to your site.
 This approach also allows you to test Plone with a specific version of one of its core components
 
 ```shell
-docker run -p 8080:8080 -e ADDONS="plone.volto==3.1.0a3" plone/plone-backend:{PLONE_BACKEND_VERSION} start
+docker run -p 8080:8080 -e ADDONS="plone.volto==3.1.0a3" plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION} start
 ```
 
 #### Add-on variables
@@ -286,13 +286,13 @@ extend the official container images to include your desired add-ons in your own
 ```
 
 ```shell
-docker run -p 8080:8080 -e DEVELOP="/app/src/mysite.policy" plone/plone-backend:{PLONE_BACKEND_VERSION} start
+docker run -p 8080:8080 -e DEVELOP="/app/src/mysite.policy" plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION} start
 ```
 
 This approach also allows you to develop local packages by using a volume.
 
 ```shell
-docker run -p 8080:8080 -e DEVELOP="/app/src/mysite.policy" -v /path/to/mysite.policy:/app/src/mysite.policy plone/plone-backend:{PLONE_BACKEND_VERSION} start
+docker run -p 8080:8080 -e DEVELOP="/app/src/mysite.policy" -v /path/to/mysite.policy:/app/src/mysite.policy plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION} start
 ```
 
 (backend-extending-from-this-image-label)=
@@ -302,7 +302,7 @@ docker run -p 8080:8080 -e DEVELOP="/app/src/mysite.policy" -v /path/to/mysite.p
 In a directory create a  `Dockerfile` file:
 
 ```Dockerfile
-FROM plone/plone-backend:{PLONE_BACKEND_VERSION}
+FROM plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends gcc \

docs/install/containers/images/frontend.md

@@ -100,7 +100,7 @@ version: "3"
 services:
 
   backend:
-    image: plone/plone-backend:{PLONE_BACKEND_VERSION}
+    image: plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
     # Plone 5.2 series can be used too
     # image: plone/plone-backend:5.2.7
     ports:

docs/install/containers/index.md

@@ -59,7 +59,7 @@ Consult [Get Docker](https://docs.docker.com/get-docker/) for details.
 First start the Plone Backend, naming it `plone6-backend` and creating a site with its default configuration, using the following command.
 
 ```shell
-docker run --name plone6-backend -e SITE=Plone -e CORS_ALLOW_ORIGIN='*' -d -p 8080:8080 plone/plone-backend:{PLONE_BACKEND_VERSION}
+docker run --name plone6-backend -e SITE=Plone -e CORS_ALLOW_ORIGIN='*' -d -p 8080:8080 plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
 ```
 
 Now start the Plone Frontend, linking it to the `plone6-backend`:

docs/install/install-from-packages.md

@@ -95,16 +95,16 @@ You can accept the default values in square brackets (`[default-option]`) by hit
 For ease of documentation, we will use the default values.
 
 ```console
-You've downloaded /<path-to-cookiecutter>/cookiecutter-plone-starter before.
-  Is it okay to delete and re-download it? [yes]: 
+You've downloaded <path-to-cookiecutter>/cookiecutter-plone-starter before. Is it okay to delete and re-download it? [yes]: 
 project_title [Project Title]: 
 project_slug [project-title]: 
 description [A new project using Plone 6.]: 
 author [Plone Foundation]: 
 email [[email protected]]: 
 python_package_name [project_title]: 
-plone_version [6.0.0b2]: 
-volto_version [16.0.0-alpha.35]: 
+plone_version [6.0.0]: 
+volto_version [16.5.0]: 
+volto_generator_version [6.2.0]: 
 Select language_code:
 1 - en
 2 - de
@@ -127,13 +127,14 @@ Running sanity checks
   - git: ✓
 
 Summary:
-  - Plone version: 6.0.0b2
-  - Volto version: 16.0.0-alpha.35
-  - Output folder: /<path-to-project>/my_project/project-title
+  - Plone version: 6.0.0
+  - Volto version: 16.5.0
+  - Volto Generator version: 6.2.0
+  - Output folder: <path-to-project>/project-title
 
 Frontend codebase:
- - Install latest @plone/generator-volto
- - Generate frontend application with @plone/volto 16.0.0-alpha.35
+ - Installing @plone/generator-volto@6.2.0
+ - Generate frontend application with @plone/volto 16.5.0
 
 Backend codebase
  - Format generated code in the backend