Merge pull request plone#1385 from plone/links-and-sitemap-and-more-after-v6-release

Links and sitemap and more after v6 release

Author: stevepiercy

docs/conf.py

@@ -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 = [
@@ -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