Merge branch '6.0' into erral-language-redirect-documentation

plone-ve · Oct 5, 2023 · a31cdec · a31cdec
2 parents e6e5c1d + 17967e5
commit a31cdec
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/docs/backend/content-types/index.md b/docs/backend/content-types/index.md
@@ -52,7 +52,8 @@ See the chapter {ref}`training:dexterity1-label` from the Mastering Plone 6 Trai
 
 ```{toctree}
 :maxdepth: 2
-
+```
+% Uncomment each of the following and move into the toctree above when migrated from Plone 5 documentation
 % designing
 % prerequisite
 % schema-driven-types
@@ -61,7 +62,6 @@ See the chapter {ref}`training:dexterity1-label` from the Mastering Plone 6 Trai
 % advanced/index
 % testing/index
 % reference/index
-```
 
 
 ## Factory Type Information

diff --git a/docs/classic-ui/views.md b/docs/classic-ui/views.md
@@ -637,11 +637,11 @@ This way you also have a test for the generated view.
 
 ## Guided information
 
-The Mastering Plone Training has several chapters on views.
+The Mastering Plone 5 Training has several chapters on views.
 
-- {ref}`training:views1-label`
-- {ref}`training:views2-label`
-- {ref}`training:views3-label`
+-   {doc}`training:mastering-plone-5/views_1`
+-   {doc}`training:mastering-plone-5/views_2`
+-   {doc}`training:mastering-plone-5/views_3`
 
 
 (classic-ui-anatomy-of-a-view-label)=

diff --git a/docs/conf.py b/docs/conf.py
@@ -91,6 +91,8 @@
     r"https://coveralls.io/repos/github/plone/plone.restapi/badge.svg\?branch=main",  # plone.restapi
     r"https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS/Errors#Identifying_the_issue",
     r"https://docs.cypress.io/guides/references/migration-guide#Migrating-to-Cypress-version-10-0",  # volto
+    # Ignore unreliable sites
+    r"https://web.archive.org/",  # volto
 ]
 linkcheck_anchors = True
 linkcheck_timeout = 5