Merge branch '6-dev' into issue#1460_1

Author: lord2anil

.github/workflows/test.yml

@@ -1,12 +1,9 @@
 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

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/conf.py

@@ -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",
@@ -100,8 +100,6 @@
     r"^/_static/",
 ]
 linkcheck_anchors = True
-# linkcheck_timeout = 10
-# linkcheck_retries = 2
 linkcheck_timeout = 5
 linkcheck_retries = 1
 
@@ -325,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",
 }