Merge branch '6-dev' into behaviors

Author: jensens

docs/conf.py

@@ -182,7 +182,7 @@
 # We use Intersphinx to resolve targets when either the individual project's or
 # the entire Plone Documentation is built.
 intersphinx_mapping = {
-    "plone": ("https://6.dev-docs.plone.org/", None),  # for imported packages
+    "plone": ("https://6.docs.plone.org/", None),  # for imported packages
     "python": ("https://docs.python.org/3/", None),
     "training": ("https://training.plone.org/5/", None),
 }
@@ -195,9 +195,9 @@
 
 # -- OpenGraph configuration ----------------------------------
 
-ogp_site_url = "https://6.dev-docs.plone.org/"
+ogp_site_url = "https://6.docs.plone.org/"
 ogp_description_length = 200
-ogp_image = "https://6.dev-docs.plone.org/_static/Plone_logo_square.png"
+ogp_image = "https://6.docs.plone.org/_static/Plone_logo_square.png"
 ogp_site_name = "Plone Documentation"
 ogp_type = "website"
 ogp_custom_meta_tags = [
@@ -227,7 +227,7 @@
 
 # Announce that we have an opensearch plugin
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#confval-html_use_opensearch
-html_use_opensearch = "https://docs.plone.org"
+html_use_opensearch = "https://6.docs.plone.org"
 
 html_theme_options = {
     "path_to_docs": "docs",
@@ -255,7 +255,7 @@
 html_use_index = True
 
 # Used by sphinx_sitemap to generate a sitemap
-html_baseurl = "https://6.dev-docs.plone.org"
+html_baseurl = "https://6.docs.plone.org"
 
 # -- Options for HTML help output -------------------------------------------------
 
@@ -285,7 +285,7 @@
 # suggest edit link
 # remark: {{ file_name }} is mandatory in "edit_page_url_template"
 html_context = {
-    "edit_page_url_template": "https://6.dev-docs.plone.org/contributing/index.html?{{ file_name }}#making-contributions-on-github",
+    "edit_page_url_template": "https://6.docs.plone.org/contributing/index.html?{{ file_name }}#making-contributions-on-github",
 }
 
 # An extension that allows replacements for code blocks that