Merge branch '6-dev' into gha-vale

stevepiercy · web-flow · commit 8179c14d5777 · 2022-12-21T02:35:42.000-08:00
diff --git a/Makefile b/Makefile
@@ -189,7 +189,7 @@ linkcheck: deps  ## Run linkcheck
 
 .PHONY: linkcheckbroken
 linkcheckbroken: deps  ## Run linkcheck and show only broken links
-	cd $(DOCS_DIR) && $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck | GREP_COLORS='0;31' grep -wi "broken\|redirect" --color=auto || test $$? = 1
+	cd $(DOCS_DIR) && $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck | grep -wi "broken\|redirect" | GREP_COLORS='0;31' grep -vi "https://github.com/plone/volto/issues/" --color=auto || test $$? = 1
 	@echo
 	@echo "Link check complete; look for any errors in the above output " \
 		"or in $(BUILDDIR)/linkcheck/ ."
diff --git a/docs/backend/upgrading/version-specific-migration/upgrade-to-python3.md b/docs/backend/upgrading/version-specific-migration/upgrade-to-python3.md
@@ -305,16 +305,6 @@ These should be changed so that Python 3 is the default.
 For example, string types (or text) should be represented as `'foo'`, not `u'foo'`, and bytes types (or data) should be represented as `b'bar'`, not `'bar'`.
 Search for examples of `Py23DocChecker` in Plone's packages to find a pattern which allows updated doctests to pass in Python 2.
 
--   To test your code against `buildout.coredev`, start by browsing to [Add-ons \[Jenkins\]](https://jenkins.plone.org/view/Add-ons/).
--   Note there are jobs set up for Plone 4.3, 5.0, 5.1, and 5.2 on Python 2, and three jobs that run tests for Plone 5.2 on Python 3.6, Python 3.7, Python 3.8, and Python 3.9.
--   Click the link {guilabel}`log in` on Jenkins website (top right).
-    For the first login, you must authorize Jenkins to have access to your GitHub account to authenticate.
--   Click the link for the job you want to run.
-    For example, {guilabel}`Test add-on against Plone 5.2 on Python3.8`.
--   Choose the link {guilabel}`Build with parameters` in the menu on the left-hand side.
--   Fill the fields {guilabel}`ADDON_URL` and {guilabel}`ADDON_BRANCH` with your repository's URL and the branch name ("python3" if you followed these instructions).
--   Start the build with the {guilabel}`Build` button.
-
 
 ## 7. Update add-on information
 
diff --git a/docs/conf.py b/docs/conf.py
@@ -295,7 +295,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",
 }
 
 
diff --git a/docs/install/containers/examples/haproxy-plone-zeo.md b/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
diff --git a/docs/install/containers/examples/nginx-plone.md b/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
diff --git a/docs/install/containers/examples/nginx-volto-plone-postgresql.md b/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'"
diff --git a/docs/install/containers/examples/nginx-volto-plone-zeo.md b/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
diff --git a/docs/install/containers/examples/nginx-volto-plone.md b/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:
diff --git a/docs/install/containers/images/backend.md b/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 \
diff --git a/docs/install/containers/images/frontend.md b/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:
diff --git a/docs/install/containers/index.md b/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`:
diff --git a/docs/install/install-from-packages.md b/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 [collective@plone.org]: 
 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
diff --git a/docs/install/manage-add-ons-packages.md b/docs/install/manage-add-ons-packages.md
@@ -61,7 +61,7 @@ If you want to check out a Plone core package for development, or want to overri
 
 ```
 # constraints.txt with unresolvable version conflict
--c https://dist.plone.org/release/{PLONE_BACKEND_VERSION}/constraints.txt
+-c https://dist.plone.org/release/{PLONE_BACKEND_PATCH_VERSION}/constraints.txt
 plone.api>=2.0.0a3
 ```
 
@@ -106,7 +106,7 @@ zope.testrunner
 {file}`constraints.txt`
 
 ```ini
--c https://dist.plone.org/release/{PLONE_BACKEND_VERSION}/constraints.txt
+-c https://dist.plone.org/release/{PLONE_BACKEND_PATCH_VERSION}/constraints.txt
 ```
 
 {file}`mx.ini`
diff --git a/submodules/volto b/submodules/volto
@@ -1 +1 @@
-Subproject commit 59230d7ec15e493fae8117766269e2508fce2a0b
+Subproject commit 23f8e289ac52a7ca1bb98906d63c5c89f4020ccd

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,8 @@ def source_replace(app, docname, source):`
`295`	`295`
`296`	`296`	`# Dict of replacements.`
`297`	`297`	`source_replacements = {`
`298`		`- "{PLONE_BACKEND_VERSION}": "6.0.0",`
	`298`	`+ "{PLONE_BACKEND_MINOR_VERSION}": "6.0",`
	`299`	`+ "{PLONE_BACKEND_PATCH_VERSION}": "6.0.0.1",`
`299`	`300`	`}`
`300`	`301`
`301`	`302`