Merge pull request plone#1191 from plone/fix-sphinx-warnings

stevepiercy · web-flow · commit 83a35d043289 · 2022-02-21T13:23:39.000-08:00
Make links be compatible between both Volto and Plone documentation
diff --git a/docs/conf.py b/docs/conf.py
@@ -131,9 +131,14 @@
 #
 # https://www.sphinx-doc.org/en/master/usage/extensions/intersphinx.html
 #
+# Note that Plone Documentation imports documentation from several remote repositories.
+# These projects need to build their docs as part of their CI/CD and testing.
+# We use Intersphinx to resolve targets when either the individual project's or
+# the entire Plone Documentation is built.
 intersphinx_mapping = {
-    "training": ("https://training.plone.org/5/", None),
+    "plone": ("https://6.dev-docs.plone.org/", None),  # for imported packages
     "python": ("https://docs.python.org/3/", None),
+    "training": ("https://training.plone.org/5/", None),
 }
 
 
diff --git a/submodules/volto b/submodules/volto
@@ -1 +1 @@
-Subproject commit 9af6582408ea5f76449d449958c7d898febaf64a
+Subproject commit 25b07747911d893aeb48ac644fa9878827592363

Original file line number	Diff line number	Diff line change
`@@ -131,9 +131,14 @@`
`131`	`131`	`#`
`132`	`132`	`# https://www.sphinx-doc.org/en/master/usage/extensions/intersphinx.html`
`133`	`133`	`#`
	`134`	`+# Note that Plone Documentation imports documentation from several remote repositories.`
	`135`	`+# These projects need to build their docs as part of their CI/CD and testing.`
	`136`	`+# We use Intersphinx to resolve targets when either the individual project's or`
	`137`	`+# the entire Plone Documentation is built.`
`134`	`138`	`intersphinx_mapping = {`
`135`		`- "training": ("https://training.plone.org/5/", None),`
	`139`	`+ "plone": ("https://6.dev-docs.plone.org/", None), # for imported packages`
`136`	`140`	`"python": ("https://docs.python.org/3/", None),`
	`141`	`+ "training": ("https://training.plone.org/5/", None),`
`137`	`142`	`}`
`138`	`143`
`139`	`144`