Merge branch '6-dev' into plone.app.dexterity-init

Author: stevepiercy

.github/workflows/test.yml

@@ -1,18 +1,15 @@
 name: Test Plone 6 documentation
 
-on:
-  push:
-    branches-ignore:
-      - "master"
-
+on: [push, pull_request]
 jobs:
   test:
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: "3.10"
 

Makefile

@@ -10,7 +10,7 @@ PAPER           ?=
 SPHINXBUILD     = $(realpath bin/sphinx-build)
 SPHINXAUTOBUILD = $(realpath bin/sphinx-autobuild)
 DOCS_DIR        = ./docs/
-BUILDDIR        = ../_build/
+BUILDDIR        = ../_build
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
 ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .

README.md

@@ -51,7 +51,7 @@ For technical support for **Plone in general**, please ask a question on our [Co
 
 [Training](https://github.com/plone/training) is a collection of different trainings, developed and created by the Plone Community.
 
-For an HTML version, please browse to our [Training Website](https://training.plone.org/5/).
+For an HTML version, please browse to our [Training Website](https://training.plone.org/).
 
 
 ## License

coredev/agreement.md

@@ -53,12 +53,11 @@ A common way to start contributing is to participate in a [Plone sprint](https:/
 
 ## Dealing with pull requests on GitHub
 
-Before we can merge a pull request, we have to check that the author has signed the contributor's agreement.
+Before we can merge a pull request, we must ensure that the author has signed the Plone Contributor Agreement.
 
-If they're listed in <https://github.com/orgs/plone/teams/developers/members>, the author has signed so we can go ahead and merge.
+If they're listed in either the [Developers](https://github.com/orgs/plone/teams/developers/members) or [Contributors](https://github.com/orgs/plone/teams/contributors/members) team, the author has signed the Plone Contributor Agreement, so we can go ahead and merge.
 
-If they aren't listed there, there's still a chance they have signed the contributor's agreement.
+If they aren't listed there, they may have signed and returned the Plone Contributor Agreement, but they were not yet added to a team.
+You can ask [email protected] to verify.
 
-If they have signed before the move to GitHub, you can ask <[email protected]> to check.
-
-Pull requests without contributor's agreement can only be merged in trivial cases, and only by the release manager.
+Pull requests without a signed Plone Contributor Agreement can only be merged in trivial cases, and only by the release manager.

docs/_static/custom.css

@@ -461,4 +461,8 @@ div.viewcode-block:target {
 #main-content ol > li > p:nth-child(n+2),
 #main-content ul > li > p:nth-child(n+2) {
   margin-top: 1em;
-}
+}
+
+video {
+  width: 100%;
+}

docs/backend/relations.md

@@ -597,7 +597,7 @@ The logic for this is provided by the package [z3c.relationfield](https://pypi.o
 This package contains the `RelationValue` object and everything needed to define a relation schema, and all the code that is necessary to automatically update the catalog.
 
 A `RelationValue` object does not reference all objects directly.
-For the target, it uses an ID that it gets from the `IntId` utility.
+For the target, it uses an ID that it gets from the {term}`IntId` utility.
 This ID allows direct recovery of the object.
 The source object stores it directly.
 
@@ -608,7 +608,7 @@ Because of this, the following happens when saving a relation via a form:
 1.  The HTML shows some nice representation of selectable objects.
 2.  When the user submits the form, selected items are submitted by their UUIDs.
 3.  The widget retrieves the original object with the UUID.
-4.  Some data manager gets another unique ID from the `IntID` utility.
+4.  Some data manager gets another unique ID from the {term}`IntId` utility.
 5.  The same data manager creates a `RelationValue` from this ID, and stores this relation value on the source object.
 6.  Some event handlers update the catalogs.
 

docs/backend/security.md

@@ -7,6 +7,13 @@ myst:
     "keywords": "Security"
 ---
 
+% TODO ### Create emergency user
+% Add Zope user with administrator permissions via console:
+% 
+% ```shell
+% venv/bin/addzopeuser masterofdesaster VXT+zif -c ./instance/etc/zope.conf
+% ```
+
 (backend-security-label)=
 
 # Security

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

@@ -448,7 +448,7 @@ The value you use for this CSS rule should identify one of the fontello icons in
 
 It is not possible at this time to set an icon for your add-on package control panels without including CSS in your package.
 
-For documentation on how to use it in your own add-ons see https://training.plone.org/5/mastering-plone-5/registry.html.
+For documentation on how to use it in your own add-ons see {doc}`training:mastering-plone-5/registry`.
 
 
 ### Properties

docs/classic-ui/images.md

@@ -66,7 +66,7 @@ To get the original image, you can leave out the scale:
 
 (classic-ui-images-by-cacheable-scale-uid-name-label)=
 
-### By cacheable scale UID name
+### By cacheable scale {term}`UID` name
 
 When an image scale is created, it will be cached under the name `UID.EXT` (i.e. `f4c34254b44ba351af7393bfe0296664.jpeg`) in the object annotations.
 Scaling keeps the uploaded formats, except for TIFF which ends up as JPEG.
@@ -213,7 +213,7 @@ You can also provide the following keyword arguments to set `title`, `alt`, or `
 
 (classic-ui-images-get-image_scale-by-cached-uid-name-label)=
 
-### Get `image_scale` by cached UID name
+### Get `image_scale` by cached {term}`UID` name
 
 If you only have the cached image name from an URL and need to get the image scale, unfortunately you can't use `restrictedTraverse()`, as this will not be able to resolve the scale.
 But you can use this workaround, by calling the `publishTraverse` method in `ImageScaling` directly:

docs/conf.py

@@ -79,7 +79,8 @@
     r"http://127.0.0.1",
     r"http://yoursite",
     r"https://www.linode.com",
-    r"https://github.com/orgs/plone/teams/developers",  # requires auth
+    r"https://vhs-ehrenamtsportal.de", # SSLError(SSLCertVerificationError
+    r"https://github.com/orgs/plone/teams/",  # requires auth
     r"https://github.com/plone/documentation/issues/new/choose",  # requires auth
     # Ignore specific anchors
     r"https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS/Errors#Identifying_the_issue",
@@ -99,8 +100,8 @@
     r"^/_static/",
 ]
 linkcheck_anchors = True
-linkcheck_timeout = 10
-linkcheck_retries = 2
+linkcheck_timeout = 5
+linkcheck_retries = 1
 
 # The suffix of source filenames.
 source_suffix = {
@@ -129,7 +130,7 @@
     "plone.restapi/news",
     "plone.restapi/performance",
     "plone.restapi/src",
-    "volto/developer-guidelines/branch-policy.md",
+    "volto/contributing/branch-policy.md",
 ]
 
 html_js_files = ["patch_scrollToActive.js", "search_shortcut.js"]
@@ -186,7 +187,7 @@
 intersphinx_mapping = {
     "plone": ("https://6.docs.plone.org/", None),  # for imported packages
     "python": ("https://docs.python.org/3/", None),
-    "training": ("https://training.plone.org/5/", None),
+    "training": ("https://training.plone.org/", None),
 }
 
 
@@ -322,7 +323,7 @@ def source_replace(app, docname, source):
 # Dict of replacements.
 source_replacements = {
     "{PLONE_BACKEND_MINOR_VERSION}": "6.0",
-    "{PLONE_BACKEND_PATCH_VERSION}": "6.0.2",
+    "{PLONE_BACKEND_PATCH_VERSION}": "6.0.3",
     "{NVM_VERSION}": "0.39.3",
 }