Merge branch '6-dev' into 6-dev--tinymce-upgrade

Author: MrTango

.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) .

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/behaviors.md

@@ -34,6 +34,8 @@ A key feature of behaviors is that they allow encapsulating functionality so tha
 Overall, behaviors are an important part of the Plone content management system and allow for powerful customization and extensibility of content objects.
 
 
+(backend-built-in-behaviors-label)=
+
 ## Built-in behaviors
 
 To view a complete list of built-in behaviors, browse to {guilabel}`Content Types` control panel, then click {guilabel}`Page` (or any other content type), then {guilabel}`Behaviors`.

docs/backend/content-types.md docs/backend/content-types/index.mddocs/backend/content-types.md renamed to docs/backend/content-types/index.md

@@ -19,7 +19,7 @@ Insert introduction here.
 :maxdepth: 2
 configuration-registry
 control-panels
-content-types
+content-types/index
 behaviors
 annotations
 vocabularies

docs/backend/index.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/relations.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/classic-ui/images.md

@@ -80,7 +80,7 @@
     r"http://yoursite",
     r"https://www.linode.com",
     r"https://vhs-ehrenamtsportal.de", # SSLError(SSLCertVerificationError
-    r"https://github.com/orgs/plone/teams/developers",  # requires auth
+    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",
@@ -130,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"]
@@ -323,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.4",
     "{NVM_VERSION}": "0.39.3",
 }