Skip to content

Commit a13641e

Browse files
authored
Merge branch '6.0' into cookieplone-make-commands-guide
2 parents 3a0f638 + d7c6348 commit a13641e

File tree

6 files changed

+10
-22
lines changed

6 files changed

+10
-22
lines changed

docs/backend/workflows.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ myst:
1212
# Workflows
1313

1414
```{seealso}
15-
See the training {ref}`training:workflow-label`.
15+
See the training {ref}`training-2024:workflow-label`.
1616
```
1717

1818
```{todo}

docs/conf.py

+4-12
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
# Ignore localhost
8080
linkcheck_ignore = [
8181
# Ignore local and example URLs
82-
r"http://0.0.0.0",
8382
r"http://127.0.0.1",
8483
r"http://localhost",
8584
r"http://yoursite",
@@ -89,26 +88,19 @@
8988
# Ignore pages that require authentication
9089
r"https://github.com/orgs/plone/teams/", # requires auth
9190
r"https://github.com/plone/documentation/issues/new", # requires auth
92-
r"https://github.com/plone/volto/issues/new/choose", # requires auth
93-
r"https://opensource.org/", # requires auth
9491
# Ignore github.com pages with anchors
9592
r"https://github.com/.*#.*",
96-
# Ignore github.com searches
97-
r"https://github.com/search",
98-
# Ignore GitHub 429 Client Error: Too Many Requests for url
99-
r"https://github.com/collective/plone.app.locales/commits/master/",
10093
# Ignore rate limiting by github.com
10194
r"https://github.com/plone/volto/issues",
10295
r"https://github.com/plone/volto/pull",
10396
# Ignore other specific anchors
10497
r"https://coveralls.io/repos/github/plone/plone.restapi/badge.svg\?branch=main", # plone.restapi
105-
r"https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS/Errors#Identifying_the_issue", # volto
106-
r"https://docs.cypress.io/guides/references/migration-guide#Migrating-to-Cypress-version-10-0", # volto
98+
r"https://hosted.weblate.org/accounts/profile/#notifications",
10799
r"https://browsersl.ist/#", # volto
108100
# Ignore unreliable sites
109-
r"https://web.archive.org/",
110-
r"https://www.gnu.org/", # Consider removal when upgrading Sphinx
111-
r"http://z3c.pt", # fluke where Sphinx interprets this as a URL
101+
r"https://.*.gnu.org/",
102+
# fluke where Sphinx interprets this as a URL
103+
r"http://z3c.pt",
112104
]
113105
linkcheck_allowed_redirects = {
114106
# All HTTP redirections from the source URI to the canonical URI will be treated as "working".

docs/contributing/core/release.md

-4
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ All files mentioned in this list may be written in Markdown or reStructuredText
3535
The `.mo` files can be created with the `zest.pocompile` add-on, which should be installed together with `zest.releaser`.
3636
- `.gitignore` and `MANIFEST.in` must reflect the files going in to the package (must include page template and `.po` files).
3737

38-
```{seealso}
39-
[High quality automated package releases for Python with `zest.releaser`](https://opensourcehacker.com/2012/08/14/high-quality-automated-package-releases-for-python-with-zest-releaser/).
40-
```
41-
4238

4339
## Special packages
4440

docs/contributing/documentation/authors.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ This renders in the HTML `<head>` section as follows.
315315
<meta content="Plone, Documentation, SEO, meta, Vale, spell, grammar, style, check, linkcheck, lexer" name="keywords" />
316316
```
317317

318-
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/configuration.html#setting-html-metadata), which resolves to the [Docutils `meta` directive](https://docutils.sourceforge.io/docs/ref/rst/directives.html#metadata).
318+
Additional {term}`Open Graph` metadata is implemented through the Sphinx extension [`sphinxext-opengraph`](https://github.com/sphinx-doc/sphinxext-opengraph) and the [MyST `html_meta` directive](https://myst-parser.readthedocs.io/en/latest/configuration.html#setting-html-metadata), which resolves to the [Docutils `meta` directive](https://docutils.sourceforge.io/docs/ref/rst/directives.html#metadata).
319319
See the site-wide configuration in {file}`conf.py`.
320320

321321

docs/contributing/first-time.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ As a first-time contributor to Plone on GitHub, we expect that you have:
4242
- read and followed the guidance on the pages under {doc}`/contributing/index` both for Plone in general and for the specific project to which you want to contribute, as well as all the guidance on this page
4343
- worked through some trainings, such as the recommended:
4444
- {doc}`training:mastering-plone/index`
45-
- {doc}`training:volto-customization/index`
4645
- {doc}`training:customizing-volto-light-theme/index`
47-
- {doc}`training:voltohandson/index`
48-
- {doc}`training:voltoaddons/index`
46+
- {doc}`training:volto-customization/index`
4947
- {doc}`training:plone-deployment/index`
48+
- {doc}`training-2024:voltohandson/index` (archived)
49+
- {doc}`training-2024:voltoaddons/index` (archived)
5050
- a sincere interest to contribute to Plone and become an ongoing contributing member of our organization
5151
- a GitHub account
5252
- basic knowledge of using git and GitHub

0 commit comments

Comments
 (0)