Merge branch 'master' into fix_add

plone · Mar 14, 2023 · 22333c4 · 22333c4
2 parents 69a8169 + 7e8ac32
commit 22333c4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,7 @@
 <!-- You should *NOT* be adding new change log entries to this file.
      You should create a file in the news directory instead.
      For helpful instructions, please see:
-     https://6.dev-docs.plone.org/volto/developer-guidelines/contributing.html#create-a-pull-request
+     https://6.docs.plone.org/volto/developer-guidelines/contributing.html#create-a-pull-request
 -->
 
 <!-- towncrier release notes start -->

diff --git a/README.md b/README.md
@@ -190,14 +190,14 @@ On the [Plone Trainings Website](https://training.plone.org) you'll find
 Volto-dedicated open training materials, plus React and other
 JavaScript-centered trainings.
 
-- [Mastering Plone 6 Development](https://training.plone.org/5/mastering-plone/)
+- [Mastering Plone 6 Development](https://training.plone.org/mastering-plone/)
   The comprehensive training on Plone 6 with best practice tips for developers and integrators.
 - [Volto](https://training.plone.org/5/volto/index.html)
   A detailed training on how to create your own website using Volto frontend.
-- [Volto Hands-On](https://training.plone.org/5/voltohandson/index.html)
-- [Volto Add-ons Development](https://training.plone.org/5/voltoaddons/index.html)
+- [Volto Hands-On](https://training.plone.org/voltohandson/index.html)
+- [Volto Add-ons Development](https://training.plone.org/voltoaddons/index.html)
 - [Plone Deployment](https://training.plone.org/5/plone-deployment/index.html)
-- [React](https://training.plone.org/5/react/index.html)
+- [React](https://training.plone.org/react/index.html)
 - [JavaScript For Plone Developers](https://training.plone.org/5/javascript/index.html)
 
 ## Talks

diff --git a/api/README.rst b/api/README.rst
@@ -45,7 +45,7 @@ are required for cryptography, image handling/scaling support and compression.
 You can find more up to date details on installing these necessary libraries for linux
 systems in the 'Mastering Plone' training at
 
--> https://training.plone.org/5/mastering-plone/installation.html#installing-plone-backend
+-> https://training.plone.org/mastering-plone/installation.html#installing-plone-backend
 
 For Windows you could try WSL (Windows subsystem for Linux) and for Mac OS X for example
 Homebrew to install these necessary support libraries.

diff --git a/docs/source/getting-started/others.md b/docs/source/getting-started/others.md
@@ -15,14 +15,14 @@ On the [Plone Trainings Website](https://training.plone.org) you'll find
 Volto-dedicated open training materials plus React and other
 Javascript-centered trainings.
 
-- [Mastering Plone 6 Development](https://training.plone.org/5/mastering-plone/)
+- [Mastering Plone 6 Development](https://training.plone.org/mastering-plone/)
   The comprehensive training on Plone 6 with best practice tips for developers and integrators.
 - [Volto](https://training.plone.org/5/volto/index.html)
   A detailed training on how to create your own website using Volto frontend.
-- [Volto Hands-On](https://training.plone.org/5/voltohandson/index.html)
-- [Volto Add-ons Development](https://training.plone.org/5/voltoaddons/index.html)
+- [Volto Hands-On](https://training.plone.org/voltohandson/index.html)
+- [Volto Add-ons Development](https://training.plone.org/voltoaddons/index.html)
 - [Plone Deployment](https://training.plone.org/5/plone-deployment/index.html)
-- [React](https://training.plone.org/5/react/index.html)
+- [React](https://training.plone.org/react/index.html)
 - [JavaScript For Plone Developers](https://training.plone.org/5/javascript/index.html)
 
 ## How does it work under the hood

diff --git a/news/4502.documentation b/news/4502.documentation
@@ -0,0 +1 @@
+Fix training urls @ksuess