Merge branch '6.0' into chapter-deprecation

plone · Feb 12, 2025 · cd5e77e · cd5e77e
2 parents 5db3027 + 2b144c8
commit cd5e77e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -208,6 +208,9 @@ livehtml: deps  ## Rebuild Sphinx documentation on changes, with live-reload in
 	cd "$(DOCS_DIR)" && ${SPHINXAUTOBUILD} \
 		--ignore "*.swp" \
 		--port 8050 \
+		--watch volto \
+		--watch plone.api \
+		--watch plone.restapi \
 		-b html . "$(BUILDDIR)/html" $(SPHINXOPTS) $(O)
 
 .PHONY: rtd-pr-preview

diff --git a/submodules/volto b/submodules/volto
+3 −2		.github/boring-cyborg.yml
+5 −3		README.md
+1 −0		packages/volto/news/6602.feature
+1 −0		packages/volto/news/6741.internal
+1 −0		packages/volto/news/6745.internal
+5 −1		packages/volto/src/components/theme/AlternateHrefLangs/AlternateHrefLangs.jsx
+6 −5		packages/volto/src/components/theme/AlternateHrefLangs/AlternateHrefLangs.test.jsx