From 85fda2dbf15b443d97655b8871055cf8d17ccc0d Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Wed, 2 Oct 2024 01:26:06 -0700 Subject: [PATCH 1/2] Fix spelling of prerequisites --- docs/classic-ui/theming/barceloneta.md | 8 ++++---- docs/contributing/core/index.md | 6 +++--- docs/contributing/documentation/setup-build.md | 2 +- docs/i18n-l10n/contributing-translations.md | 4 ++-- docs/install/containers/index.md | 2 +- docs/install/create-project-classic-ui.md | 6 +++--- docs/install/create-project-cookieplone.md | 6 +++--- docs/install/create-project.md | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/classic-ui/theming/barceloneta.md b/docs/classic-ui/theming/barceloneta.md index ea26643c3..0080106f1 100644 --- a/docs/classic-ui/theming/barceloneta.md +++ b/docs/classic-ui/theming/barceloneta.md @@ -15,17 +15,17 @@ This chapter describes how to create a custom theme for Plone Classic UI based o Barceloneta is the default enabled theme for Plone Classic UI. -(classic-ui-theming-barceloneta-pre-requisites-label)= +(classic-ui-theming-barceloneta-prerequisites-label)= -## Pre-requisites +## Prerequisites -To create an add-on package with a Plone Classic UI theme, you need to install the following pre-requisites. +To create an add-on package with a Plone Classic UI theme, you need to install the following prerequisites. - [Node.js (16/18)](https://nodejs.org/en) - [Python (>=3.8)](https://www.python.org/) - [plonecli](https://pypi.org/project/plonecli/) -Read more about how to install pre-requisites in {doc}`/install/create-project`. +Read more about how to install prerequisites in {doc}`/install/create-project`. (classic-ui-theming-barceloneta-create-a-classic-ui-theme-add-on-package-label)= diff --git a/docs/contributing/core/index.md b/docs/contributing/core/index.md index 888d16f16..a8fea1426 100644 --- a/docs/contributing/core/index.md +++ b/docs/contributing/core/index.md @@ -30,11 +30,11 @@ You must {ref}`contributing-sign-and-return-the-plone-contributor-agreement-labe Before you contribute to Plone core, check the [version support policy](https://plone.org/download/release-schedule) to see which versions of Plone are currently supported. -(plone-pre-requisites-label)= +(plone-prerequisites-label)= -## Pre-requisites +## Prerequisites -It is beyond the scope of this documentation to provide installation instructions for all pre-requisites for your operating system. +It is beyond the scope of this documentation to provide installation instructions for all prerequisites for your operating system. However, the following links and sections below may be helpful. ```{include} ../../volto/contributing/install-operating-system.md diff --git a/docs/contributing/documentation/setup-build.md b/docs/contributing/documentation/setup-build.md index e39d3e728..db25b73fe 100644 --- a/docs/contributing/documentation/setup-build.md +++ b/docs/contributing/documentation/setup-build.md @@ -18,7 +18,7 @@ This document covers how to set up and build the Plone Documentation and check i ## Installation -Installation of Plone 6 Documentation includes pre-requisites and the repository itself. +Installation of Plone 6 Documentation includes prerequisites and the repository itself. ```{include} ../../volto/contributing/install-operating-system.md ``` diff --git a/docs/i18n-l10n/contributing-translations.md b/docs/i18n-l10n/contributing-translations.md index 7b9ca1ad8..d93c1c1ef 100644 --- a/docs/i18n-l10n/contributing-translations.md +++ b/docs/i18n-l10n/contributing-translations.md @@ -23,9 +23,9 @@ Translations can be added or updated as needed by the citizens of Earth. You will need to work in one repository for Plone core, and optionally another one for Volto. -(contributing-plone-core-translations-pre-requisites-label)= +(contributing-plone-core-translations-prerequisites-label)= -## Pre-requisites +## Prerequisites Request write access to https://github.com/collective/plone.app.locales to be able to commit your translation directly. diff --git a/docs/install/containers/index.md b/docs/install/containers/index.md index e6167c21f..5aef61ee6 100644 --- a/docs/install/containers/index.md +++ b/docs/install/containers/index.md @@ -11,7 +11,7 @@ myst: # Containers -The Plone 6 images have all the system requirements, pre-requisites, and Plone 6 already installed, except those requirements needed for running the container engine itself. +The Plone 6 images have all the system requirements, prerequisites, and Plone 6 already installed, except those requirements needed for running the container engine itself. Using containers is the easiest way to deploy Plone 6. Containers may also be used when {doc}`creating a Plone project <../create-project>` and {doc}`contributing to Plone `. diff --git a/docs/install/create-project-classic-ui.md b/docs/install/create-project-classic-ui.md index c04189f92..1826a1056 100644 --- a/docs/install/create-project-classic-ui.md +++ b/docs/install/create-project-classic-ui.md @@ -21,7 +21,7 @@ For other installation options, see {doc}`/install/index`. ## System requirements -Plone 6 has both hardware requirements and software pre-requisites. +Plone 6 has both hardware requirements and software prerequisites. ### Hardware requirements @@ -29,7 +29,7 @@ Plone 6 has both hardware requirements and software pre-requisites. ```{include} /_inc/_hardware-requirements.md ``` -### Pre-requisites for installation +### Prerequisites for installation ```{include} ../volto/contributing/install-operating-system.md ``` @@ -69,7 +69,7 @@ pip install pipx ## Generate the project -After satisfying the pre-requisites, generate the project. +After satisfying the prerequisites, generate the project. ```shell pipx run cookieplone backend_addon diff --git a/docs/install/create-project-cookieplone.md b/docs/install/create-project-cookieplone.md index 2fcf7da48..5f2122aff 100644 --- a/docs/install/create-project-cookieplone.md +++ b/docs/install/create-project-cookieplone.md @@ -25,7 +25,7 @@ For other installation options, see {doc}`/install/index`. ## System requirements -Plone 6 has both hardware requirements and software pre-requisites. +Plone 6 has both hardware requirements and software prerequisites. ### Hardware requirements @@ -33,7 +33,7 @@ Plone 6 has both hardware requirements and software pre-requisites. ```{include} /_inc/_hardware-requirements.md ``` -### Pre-requisites for installation +### Prerequisites for installation ```{include} ../volto/contributing/install-operating-system.md ``` @@ -93,7 +93,7 @@ pip install pipx ## Generate the project -After satisfying the pre-requisites and having activated an LTS version of Node, +After satisfying the prerequisites and having activated an LTS version of Node, generate the project. ```shell diff --git a/docs/install/create-project.md b/docs/install/create-project.md index db008515f..7e7ab358f 100644 --- a/docs/install/create-project.md +++ b/docs/install/create-project.md @@ -23,7 +23,7 @@ For other installation options, see {doc}`/install/index`. ## System requirements -Plone 6 has both hardware requirements and software pre-requisites. +Plone 6 has both hardware requirements and software prerequisites. (install-packages-hardware-requirements-label)= @@ -36,7 +36,7 @@ Plone 6 has both hardware requirements and software pre-requisites. (install-packages-prerequisites-label)= -### Pre-requisites for installation +### Prerequisites for installation ```{include} ../volto/contributing/install-operating-system.md ``` From 27c22c0b979d28f974ebb8d4341a80a82a5f9e39 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Wed, 2 Oct 2024 01:29:04 -0700 Subject: [PATCH 2/2] Reject hyphenated `pre-requisite` and sort accept.txt items --- styles/Vocab/Plone/accept.txt | 6 +++--- styles/Vocab/Plone/reject.txt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/styles/Vocab/Plone/accept.txt b/styles/Vocab/Plone/accept.txt index 45c67d02c..ee6ce6d9d 100644 --- a/styles/Vocab/Plone/accept.txt +++ b/styles/Vocab/Plone/accept.txt @@ -30,9 +30,9 @@ Pastanaga PLIP(s) Plone pluggab(le|ility) -programatically [Pp]ortlet prerendered +programatically [Qq]uerystring Razzle [Rr]enderer @@ -42,10 +42,10 @@ Schuko subfolder [Tt]owncrier transpile[dr]{0,1} -unregister -UUID [Uu]ncomment [Uu]nhide +unregister +UUID validator [Vv]iewlet Volto diff --git a/styles/Vocab/Plone/reject.txt b/styles/Vocab/Plone/reject.txt index 1cefa812f..81510d55a 100644 --- a/styles/Vocab/Plone/reject.txt +++ b/styles/Vocab/Plone/reject.txt @@ -1,2 +1,3 @@ [^.]js NodeJS +[Pp]re-requisite