Merge branch '6-dev' into version-switcher

Author: stevepiercy

.github/workflows/build_deploy.yml

@@ -22,8 +22,8 @@ jobs:
           pip install -q -r requirements.txt
           pip freeze
 
-      # - name: Run spellcheck
-      #   run: make spellcheck
+      # - name: Run Vale
+      #   run: make vale
 
       # - name: Run linkcheck
       #   run: make linkcheck

.github/workflows/test.yml

@@ -20,6 +20,14 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -q -r requirements.txt
+          sudo snap install --edge vale
 
       - name: Run tests with make test
         run: make test
+
+      - name: Run vale
+        run: |
+          git clone https://github.com/errata-ai/Microsoft.git
+          cp -r ./Microsoft/Microsoft ./styles
+          VALEFILES=$(find -L ./docs/ -type d \( -path "./docs/plone.restapi/lib/*" -o -path "./docs/plone.restapi/performance/*" \) -prune -false -o -type f -name "*.md" -print)
+          vale --no-exit $VALEFILES

.gitignore

@@ -7,6 +7,7 @@
 # Generated files
 pyvenv.cfg
 /_build
+/styles/Microsoft
 
 # symlinked from submodule
 docs/volto

.vale.ini

@@ -0,0 +1,10 @@
+StylesPath = styles
+
+MinAlertLevel = suggestion
+
+Vocab = Base,Plone
+
+Packages = Microsoft
+
+[*]
+BasedOnStyles = Vale, Microsoft

Makefile

@@ -16,7 +16,7 @@ PAPEROPT_letter = -D latex_paper_size=letter
 ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
+VALEFILES       := $(shell find -L $(DOCS_DIR) -type d \( -path $(DOCS_DIR)/plone.restapi/lib/* -o  -path $(DOCS_DIR)"/plone.restapi/performance/*" \) -prune -false -o -type f -name "*.md" -print)
 
 # Add the following 'help' target to your Makefile
 # And add help text after each target name starting with '\#\#'
@@ -189,17 +189,17 @@ 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/ ."
 
-.PHONY: spellcheck
-spellcheck: deps  ## Run spellcheck
-	cd $(DOCS_DIR) && LANGUAGE=$* $(SPHINXBUILD) -b spelling -j 4 $(ALLSPHINXOPTS) $(BUILDDIR)/spellcheck/$*
+.PHONY: vale
+vale: deps  ## Run Vale style, grammar, and spell checks
+	vale sync
+	vale --no-wrap $(VALEFILES)
 	@echo
-	@echo "Spellcheck is finished; look for any errors in the above output " \
-		" or in $(BUILDDIR)/spellcheck/ ."
+	@echo "Vale is finished; look for any errors in the above output."
 
 .PHONY: html_meta
 html_meta: deps  ## Add meta data headers to all Markdown pages
@@ -212,7 +212,7 @@ doctest: deps
 	      "results in $(BUILDDIR)/doctest/output.txt."
 
 .PHONY: test
-test: clean linkcheckbroken spellcheck  ## Clean docs build, then run linkcheckbroken, spellcheck
+test: clean linkcheckbroken  ## Clean docs build, then run linkcheckbroken
 
 .PHONY: deploy
 deploy: clean html
@@ -241,4 +241,4 @@ storybook:
 	cd submodules/volto && yarn && yarn build-storybook -o ../../_build/html/storybook
 
 .PHONY: all
-all: clean spellcheck linkcheck html  ## Clean docs build, then run linkcheck and spellcheck, and build html
+all: clean vale linkcheck html  ## Clean docs build, then run vale and linkcheck, and build html

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
 

docs/conf.py

@@ -52,7 +52,6 @@
     "sphinx_sitemap",
     "sphinxcontrib.httpdomain",  # plone.restapi
     "sphinxcontrib.httpexample",  # plone.restapi
-    "sphinxcontrib.spelling",
     "sphinxext.opengraph",
     "sphinx.ext.viewcode",  # plone.api
     "sphinx.ext.autosummary",  # plone.api
@@ -97,10 +96,6 @@
 linkcheck_timeout = 10
 linkcheck_retries = 2
 
-# This is our wordlist with known words, like Github or Plone ...
-spelling_word_list_filename = "spelling_wordlist.txt"
-spelling_ignore_pypi_package_names = True
-
 # The suffix of source filenames.
 source_suffix = {
     ".md": "markdown",
@@ -128,6 +123,7 @@
     "plone.restapi/news",
     "plone.restapi/performance",
     "plone.restapi/src",
+    "volto/developer-guidelines/branch-policy.md",
 ]
 
 html_js_files = [
@@ -312,7 +308,8 @@ def source_replace(app, docname, source):
 
 # Dict of replacements.
 source_replacements = {
-    "{PLONE_BACKEND_VERSION}": "6.0.0b3",
+    "{PLONE_BACKEND_MINOR_VERSION}": "6.0",
+    "{PLONE_BACKEND_PATCH_VERSION}": "6.0.0.1",
 }
 
 

docs/contributing/authors.md

@@ -4,7 +4,7 @@ myst:
     "description": "Authors' guide to writing Plone Documentation. It covers configuring quality checks and syntax for writing markup that is of particular interest to authors."
     "property=og:description": "Authors' guide to writing Plone Documentation. It covers configuring quality checks and syntax for writing markup that is of particular interest to authors."
     "property=og:title": "Authors Guide"
-    "keywords": "Plone, Documentation, SEO, meta, exercises, solutions, spellcheck, linkcheck, lexer"
+    "keywords": "Plone, Documentation, SEO, meta, Vale, spell, grammar, style, check, linkcheck, lexer"
 ---
 
 (authors-guide-label)=
@@ -34,7 +34,7 @@ myst:
     "description": "Authors' guide to writing Plone Documentation. It covers configuring quality checks and syntax for writing markup that is of particular interest to authors."
     "property=og:description": "Authors' guide to writing Plone Documentation. It covers configuring quality checks and syntax for writing markup that is of particular interest to authors."
     "property=og:title": "Authors Guide"
-    "keywords": "Plone, Documentation, SEO, meta, spellcheck, linkcheck, lexer"
+    "keywords": "Plone, Documentation, SEO, meta, Vale, spell, grammar, style, check, linkcheck, lexer"
 ---
 ```
 
@@ -44,7 +44,7 @@ This renders in the HTML `<head>` section as follows.
 <meta content="Authors' guide to writing Plone Documentation. It covers configuring quality checks and syntax for writing markup that is of particular interest to authors." name="description" />
 <meta content="Authors' guide to writing Plone Documentation. It covers configuring quality checks and syntax for writing markup that is of particular interest to authors." property="og:description" />
 <meta content="Authors Guide" property="og:title" />
-<meta content="Plone, Documentation, SEO, meta, spellcheck, linkcheck, lexer" name="keywords" />
+<meta content="Plone, Documentation, SEO, meta, Vale, spell, grammar, style, check, linkcheck, lexer" name="keywords" />
 ```
 
 Additional {term}`Open Graph` metadata is implemented through the Sphinx extension [`sphinxext-opengraph`](https://github.com/wpilibsuite/sphinxext-opengraph) and the [MyST `html_meta` directive](https://myst-parser.readthedocs.io/en/latest/syntax/syntax.html#setting-html-metadata), which resolves to the [Docutils `meta` directive](https://docutils.sourceforge.io/docs/ref/rst/directives.html#metadata).
@@ -75,25 +75,23 @@ Open `/_build/html/index.html` in a web browser.
 
 (authors-english-label)=
 
-### American English Spelling, Grammar, and Syntax
+### American English Spelling, Grammar, and Syntax, and Style Guide
 
-Spellings are enforced through [`spellcheck`](https://sphinxcontrib-spelling.readthedocs.io/en/latest/index.html).
-We use the locale `en_US`.
+Spellings are enforced through [`Vale`](https://vale.sh/).
+Plone uses American English.
 
-Spelling is configured in {file}`Makefile`, {file}`docs/conf.py`, and {file}`docs/spelling_wordlist.txt`.
+Spelling is configured in {file}`Makefile`, {file}`.vale.ini`, and in files in `styles/Vocab/Plone/`.
 
-Authors should add new words and proper names using correct casing to {file}`docs/spelling_wordlist.txt`, sorted alphabetically.
+Authors should add new words and proper names using correct casing to {file}`styles/Vocab/Plone/accept.txt`, sorted alphabetically and case-insensitive.
 
-See [default settings and configuration options](https://sphinxcontrib-spelling.readthedocs.io/en/latest/customize.html).
+Vale also provides English grammar and syntax checking, as well as a Style Guide.
 
-To validate spelling, run the following command.
+To perform all these checks, run the following command.
 
 ```shell
-make spellcheck
+make vale
 ```
 
-Open `/_build/spellcheck/` for misspellings.
-
 Because it is difficult to automate good English grammar and syntax, we do not strictly enforce it.
 We also understand that contributors might not be fluent in English.
 We encourage contributors to make a reasonable effort, and to seek help from community members who are fluent in English.

docs/contributing/index.md

@@ -153,7 +153,7 @@ This section describes how to make contributions to files in the `plone/document
     ```
 
     ```{note}
-    Eventually the `spellcheck` build will be required, but not at this time.
+    Eventually the `vale` build will be required, but not at this time.
     We welcome improvements to the dictionary.
     ```
 

docs/contributing/setup-build.md

@@ -4,7 +4,7 @@ myst:
     "description": "How to set up the Plone Documentation locally"
     "property=og:description": "How to set up the Plone Documentation locally"
     "property=og:title": "Building and Checking the Quality of Documentation"
-    "keywords": "setup, build, documentation, quality, development, spellcheck, linkcheck"
+    "keywords": "setup, build, documentation, quality, development, Vale, spell, grammar, style, check, linkcheck"
 ---
 
 (setup-build-label)=
@@ -18,20 +18,40 @@ This document covers how to build the Plone Documentation and check it for quali
 
 ## Installation
 
-Install [Enchant](https://abiword.github.io/enchant/) to check spelling.
+Installation of Plone 6 Documentation includes pre-requisites and the repository itself.
 
-**macOS**
 
-```shell
-brew install enchant
-```
+(setup-build-installation-vale-label)=
 
-**Ubuntu**
+### Vale
 
-```shell
-sudo apt-get install enchant
+Vale is a linter for narrative text.
+It checks spelling, English grammar, and style guides.
+Plone documentation uses a custom spelling dictionary, with accepted and rejected spellings in `styles/Vocab/Plone`.
+
+Use your operating system's package manager to [install Vale](https://vale.sh/docs/vale-cli/installation/).
+
+Vale also has [integrations](https://vale.sh/docs/integrations/guide/) with various IDEs.
+
+-   [JetBrains](https://vale.sh/docs/integrations/jetbrains/)
+-   [Vim](https://github.com/dense-analysis/ale)
+-   [VS Code](https://github.com/errata-ai/vale-vscode)
+
+Plone documentation uses a file located at the root of the repository, `.vale.ini`, to configure Vale.
+This file allows overriding rules or changing their severity.
+
+The Plone Documentation Team selected the [Microsoft Writing Style Guide](https://docs.microsoft.com/en-us/style-guide/welcome/) for its ease of use—especially for non-native English readers and writers—and attention to non-technical audiences. 
+
+```{note}
+More corrections to spellings and Vale's configuration are welcome by submitting a pull request.
+This is an easy way to become a contributor to Plone.
 ```
 
+
+(setup-build-installation-clone-plone-documentation-label)=
+
+### Clone `plone/documentation`
+
 Clone the Plone Documentation repository, and change your working directory into the cloned project.
 Then with a single command using `Makefile`, create a Python virtual environment, install project dependencies, pull in Volto documentation as a git submodule, build the docs, and view the results in a web browser by opening `/_build/html/index.html`.
 
@@ -41,11 +61,6 @@ cd documentation
 make html
 ```
 
-```{note}
-If you are using an M1 Mac to build the documentation, there is currently [an issue with pyenchant](https://github.com/pyenchant/pyenchant/issues/265) that throws an error that the enchant library can't be found.
-This happens for example if you install Python 3 with `pyenv` in the default M1 architecture (aarch64), so without following instructions to use Rosetta2 x86 emulation.
-A workaround until pyenchant is fixed is to run `export PYENCHANT_LIBRARY_PATH=/opt/homebrew/lib/libenchant-2.dylib` in the terminal session before you execute `make html`.
-```
 
 (setup-build-available-documentation-builds-label)=
 
@@ -96,16 +111,16 @@ make linkcheck
 Open `/_build/linkcheck/output.txt` for a list of broken links.
 
 
-### `spellcheck`
+### `vale`
 
-`spellcheck` checks the spelling of words.
+`vale` checks for American English spelling, grammar, syntax, and the Microsoft Developer Style Guide.
 See {ref}`authors-english-label` for configuration.
 
 ```shell
-make spellcheck
+make vale
 ```
 
-Open `/_build/spellcheck/` for misspellings.
+See the output on the console for suggestions.
 
 
 ### `html_meta`