Merge branch '6.0' into search

Author: ksuess

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/build_deploy.yml

@@ -54,7 +54,7 @@ jobs:
         run: |
           echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         name: Setup pnpm cache
         with:
           path: ${{ env.STORE_PATH }}

.github/workflows/update_submodule.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Checkout
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: 6.0
           submodules: true

.readthedocs.yaml

@@ -18,7 +18,7 @@ build:
     # If there are no changes (git diff exits with 0) we force the command to return with 183.
     # This is a special exit code on Read the Docs that will cancel the build immediately.
     - |
-      if [ "$READTHEDOCS_VERSION_TYPE" = "external" ] && git diff --quiet origin/6.0 -- docs/ .readthedocs.yaml requirements-initial.txt requirements.txt;
+      if [ "$READTHEDOCS_VERSION_TYPE" = "external" ] && git diff --quiet origin/6.0 -- docs/ Makefile .readthedocs.yaml requirements-initial.txt requirements.txt;
       then
         exit 183;
       fi

Makefile

@@ -35,157 +35,166 @@ distclean: clean ## Clean docs build directory, Python virtual environment, and
 	rm docs/plone.api
 	rm docs/plone.restapi
 	rm docs/volto
-	@echo
 	@echo "Cleaned docs build directory, Python virtual environment, and symlinks."
+	@echo
 
 venv/bin/python:  ## Setup up Python virtual environment and install requirements
 	python3 -m venv venv
 	venv/bin/pip install -r requirements-initial.txt
 	venv/bin/pip install -r requirements.txt
-	@echo
 	@echo "Installation of requirements completed."
+	@echo
 
 docs/plone.api:  ## Setup plone.api docs
 	git submodule init
 	git submodule update
-	venv/bin/pip install -e submodules/plone.api/"[test]"
 	ln -s ../submodules/plone.api/docs ./docs/plone.api
-	@echo
 	@echo "Documentation of plone.api initialized."
+	@echo
+
+venv/plone.api-install: docs/plone.api
+	touch venv/plone.api-install
+	venv/bin/pip install plone.api -c submodules/plone.api/constraints.txt
+	venv/bin/pip install --no-deps -e submodules/plone.api/"[test]"
+	@echo "plone.api installed."
+	@echo
 
 docs/plone.restapi:  ## Setup plone.restapi docs
 	git submodule init
 	git submodule update
 	ln -s ../submodules/plone.restapi ./docs/plone.restapi
-	@echo
 	@echo "Documentation of plone.restapi initialized."
+	@echo
 
 docs/volto:  ## Setup Volto docs
 	git submodule init
 	git submodule update
 	ln -s ../submodules/volto/docs/source ./docs/volto
-	@echo
 	@echo "Documentation of volto initialized."
+	@echo
 
 .PHONY: deps
-deps: venv/bin/python docs/volto docs/plone.restapi docs/plone.api  ## Create Python virtual environment, install requirements, initialize or update the volto, plone.restapi, and plone.api submodules, and finally create symlinks to the source files.
-
+deps: venv/bin/python docs/volto docs/plone.restapi venv/plone.api-install  ## Create Python virtual environment, install requirements, initialize or update the volto, plone.restapi, and plone.api submodules, create symlinks to the source files, and finally install plone.api.
 
 .PHONY: html
 html: deps  ## Build html
 	cd $(DOCS_DIR) && $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+	@echo
 
 .PHONY: manual
 manual: deps
 	cd $(DOCS_DIR) && $(SPHINXBUILD) -b html -t manual . $(BUILDDIR)/manual
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/manual."
+	@echo
 
 .PHONY: dirhtml
 dirhtml: deps
 	cd $(DOCS_DIR) && $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+	@echo
 
 .PHONY: singlehtml
 singlehtml: deps
 	cd $(DOCS_DIR) && $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
 	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+	@echo
 
 .PHONY: pickle
 pickle: deps
 	cd $(DOCS_DIR) && $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
 	@echo "Build finished; now you can process the pickle files."
+	@echo
 
 .PHONY: json
 json: deps
 	cd $(DOCS_DIR) && $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
 	@echo "Build finished; now you can process the JSON files."
+	@echo
 
 .PHONY: htmlhelp
 htmlhelp: deps
 	cd $(DOCS_DIR) && $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
 	@echo "Build finished; now you can run HTML Help Workshop with the" \
 	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+	@echo
 
 .PHONY: epub
 epub: deps
 	cd $(DOCS_DIR) && $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
 	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+	@echo
 
 .PHONY: latex
 latex: deps
 	cd $(DOCS_DIR) && $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
 	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
 	@echo "Run \`make' in that directory to run these through (pdf)latex" \
 	      "(use \`make latexpdf' here to do that automatically)."
+	@echo
 
 .PHONY: latexpdf
 latexpdf: deps
 	cd $(DOCS_DIR) && $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
 	@echo "Running LaTeX files through pdflatex..."
 	$(MAKE) -C $(BUILDDIR)/latex all-pdf
 	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+	@echo
 
 .PHONY: text
 text: deps
 	cd $(DOCS_DIR) && $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
 	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+	@echo
 
 .PHONY: man
 man: deps
 	cd $(DOCS_DIR) && $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
 	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+	@echo
 
 .PHONY: texinfo
 texinfo: deps
 	cd $(DOCS_DIR) && $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
 	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
 	@echo "Run \`make' in that directory to run these through makeinfo" \
 	      "(use \`make info' here to do that automatically)."
+	@echo
 
 .PHONY: info
 info: deps
 	cd $(DOCS_DIR) && $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
 	@echo "Running Texinfo files through makeinfo..."
 	make -C $(BUILDDIR)/texinfo info
 	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+	@echo
 
 .PHONY: changes
 changes: deps
 	cd $(DOCS_DIR) && $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
 	@echo "The overview file is in $(BUILDDIR)/changes."
+	@echo
 
 .PHONY: linkcheck
 linkcheck: deps  ## Run linkcheck
 	cd $(DOCS_DIR) && $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
 	@echo "Link check complete; look for any errors in the above output " \
 		"or in $(BUILDDIR)/linkcheck/ ."
+	@echo
 
 .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=always | GREP_COLORS='0;31' grep -vi "https://github.com/plone/volto/issues/" --color=always && if test $$? = 0; then exit 1; fi || test $$? = 1
-	@echo
 	@echo "Link check complete; look for any errors in the above output " \
 		"or in $(BUILDDIR)/linkcheck/ ."
+	@echo
 
 .PHONY: vale
 vale: deps  ## Run Vale style, grammar, and spell checks
 	venv/bin/vale sync
 	venv/bin/vale --no-wrap $(VALEOPTS) $(VALEFILES)
-	@echo
 	@echo "Vale is finished; look for any errors in the above output."
+	@echo
 
 .PHONY: html_meta
 html_meta: deps  ## Add meta data headers to all Markdown pages
@@ -196,6 +205,7 @@ doctest: deps
 	cd $(DOCS_DIR) && $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
 	@echo "Testing of doctests in the sources finished, look at the " \
 	      "results in $(BUILDDIR)/doctest/output.txt."
+	@echo
 
 .PHONY: test
 test: clean linkcheckbroken  ## Clean docs build, then run linkcheckbroken
@@ -208,6 +218,9 @@ livehtml: deps  ## Rebuild Sphinx documentation on changes, with live-reload in
 	cd "$(DOCS_DIR)" && ${SPHINXAUTOBUILD} \
 		--ignore "*.swp" \
 		--port 8050 \
+		--watch volto \
+		--watch plone.api \
+		--watch plone.restapi \
 		-b html . "$(BUILDDIR)/html" $(SPHINXOPTS) $(O)
 
 .PHONY: rtd-pr-preview
@@ -216,7 +229,8 @@ rtd-pr-preview:  ## Build pull request preview on Read the Docs
 	pip install -r requirements.txt
 	git submodule init
 	git submodule update
-	pip install -e submodules/plone.api[test]
+	pip install plone.api -c submodules/plone.api/constraints.txt
+	pip install --no-deps -e submodules/plone.api[test]
 	ln -s ../submodules/volto/docs/source ./docs/volto
 	ln -s ../submodules/plone.restapi ./docs/plone.restapi
 	ln -s ../submodules/plone.api/docs ./docs/plone.api

docs/_inc/_install-browser-reqs-volto.md

@@ -0,0 +1,5 @@
+{
+  "[markdown]": {
+    "editor.formatOnSave": false
+  }
+}

docs/_inc/_install-python-plone60.md

@@ -21,7 +21,7 @@ See {doc}`/volto/development/add-ons/index`.
 
 ## Cookieplone
 
-Use the following instructions if you installed Plone with either Cookieplone or `cookiecutter-plone-starter`.
+Use the following instructions if you installed Plone with Cookieplone.
 
 
 ### Install an add-on
@@ -52,10 +52,6 @@ To actually download and install the new add-on, run the following command.
 make backend-build
 ```
 
-```{note}
-If you installed Plone using `cookiecutter-plone-starter`, run `make build-backend` instead.
-```
-
 Now restart the backend.
 
 ```{seealso}
@@ -116,10 +112,6 @@ To actually download and install the new add-on, run the following command.
 make backend-build
 ```
 
-```{note}
-If you installed Plone using `cookiecutter-plone-starter`, run `make build-backend` instead.
-```
-
 Now restart the backend.
 
 ```{seealso}

docs/_static/contributing/git-commit-submodule.jpg

@@ -4,7 +4,7 @@ myst:
     "description": "Configure Zope options"
     "property=og:description": "Configure Zope options"
     "property=og:title": "Configure Zope"
-    "keywords": "Plone 6, Zope, instance, app server, config, Cookieplone, Buildout, pip, cookiecutter-plone-starter, cookiecutter-zope-instance, plone.recipe.zope2instance"
+    "keywords": "Plone 6, Zope, instance, app server, config, Cookieplone, Buildout, pip, cookiecutter-zope-instance, plone.recipe.zope2instance"
 ---
 
 (configure-zope-label)=
@@ -25,7 +25,7 @@ You can configure your Zope instance's options, including the following.
 
 ## Cookieplone
 
-If you installed Plone using Cookieplone, `cookiecutter-plone-starter`, or pip, then Zope is configured using {term}`cookiecutter-zope-instance`.
+If you installed Plone using Cookieplone or pip, then Zope is configured using {term}`cookiecutter-zope-instance`.
 For a complete list of features, usage, and options, read [`cookiecutter-zope-instance`'s README](https://github.com/plone/cookiecutter-zope-instance#readme).
 
 

docs/_static/settings.json

@@ -21,7 +21,6 @@ In this part of the documentation, you can find how to install, operate, and con
 /install/create-project-cookieplone
 install-buildout
 install-pip
-/install/create-project
 ```
 
 ```{toctree}
@@ -30,6 +29,7 @@ install-pip
 
 run-plone
 add-site
+zope-manager-users
 configure-zope
 add-ons
 export-import