Merge branch '6.0' into make_i18n_command

Author: stevepiercy

docs/backend/upgrading/version-specific-migration/upgrade-to-51.md

@@ -432,7 +432,7 @@ Your folderish content types should either use the templates from `plone.app.con
 
 ### Rejected And Postponed PLIPs
 
-For details about rejected or postponed PLIPs see the [github PLIP project](https://github.com/plone/Products.CMFPlone/projects/1) and the [Framework Team PLIP status sheet](https://docs.google.com/spreadsheets/d/15Cut73TS5l_x8djkxNre5k8fd7haGC5OOSGigtL2drQ/edit).
+For details about rejected or postponed PLIPs see the [github PLIP project](https://github.com/orgs/plone/projects/47) and the [Framework Team PLIP status sheet](https://docs.google.com/spreadsheets/d/15Cut73TS5l_x8djkxNre5k8fd7haGC5OOSGigtL2drQ/edit).
 
 
 ## Known Issues

docs/i18n-l10n/contributing-translations.md

@@ -111,7 +111,7 @@ See the Weblate documentation, [Translating using Weblate](https://docs.weblate.
 
 When you save a translation, then it is committed on a branch used only for translations in the respective GitHub repository.
 
-[Compare recent commits to the branch `translations-plone` on the package `plone.app.locales`](https://github.com/collective/plone.app.locales/compare/master...translations-plone).
+[See recent commits to the package `plone.app.locales`](https://github.com/collective/plone.app.locales/commits/master/).
 
 Maintainers will periodically create a pull request from the changes, and merge it.