Merge branch '6-dev' into linkcheckbroken-proper-exit-code

Author: stevepiercy

README.md

@@ -7,21 +7,21 @@ This is the repository for Plone Documentation.
 
 ## Plone 6
 
-Browse the Plone 6 Documentation at https://6.dev-docs.plone.org/.
+Browse the Plone 6 Documentation at https://6.docs.plone.org/.
 
 Active development on the Plone 6 Documentation takes place on the branch [`6-dev`](https://github.com/plone/documentation/tree/6-dev).
 
 
 ## Plone 5.2
 
-Browse the Plone 5.2 Documentation at https://docs.plone.org/.
+Browse the Plone 5.2 Documentation at https://5.docs.plone.org/.
 
 Development on the Plone 5.2 Documentation takes place on the branch [`5.2`](https://github.com/plone/documentation/tree/5.2).
 
 
 ## Contribute
 
-- [Contributing to Plone 6 Documentation](https://6.dev-docs.plone.org/contributing/index.html)
+- [Contributing to Plone 6 Documentation](https://6.docs.plone.org/contributing/index.html)
 - [Release Plone 6 docs Project Board](https://github.com/orgs/plone/projects/12)
 - [Issue Tracker](https://github.com/plone/documentation/issues)
 - [Source Code](https://github.com/plone/documentation/tree/6-dev)
@@ -37,7 +37,7 @@ Those packages include:
 - [`plone.restapi`](https://github.com/plone/plone.restapi)
 
 To contribute documentation, please open a pull request in the appropriate repository.
-For details, see [Editing external package documentation](https://6.dev-docs.plone.org/contributing/index.html#contributing-editing-external-package-documentation-label).
+For details, see [Editing external package documentation](https://6.docs.plone.org/contributing/index.html#contributing-editing-external-package-documentation-label).
 
 
 ## Support

docs/_templates/404.html

@@ -0,0 +1,19 @@
+{% extends "!page.html" %}
+
+{%- block htmltitle %}
+<title>{{ title|striptags|e }}{%- for parent in parents %} – {{ parent.title }}{%- endfor %}{{ titlesuffix }}</title>
+{%- endblock %}
+
+{% block body %}
+<div>
+    <h1>Page not found</h1>
+    <p>Unfortunately we couldn't find the content you were looking for.</p>
+</div>
+
+<style>
+    /* Hide empty sub menu. */
+    .sticky-top .bd-toc {
+        visibility: hidden;
+    }
+</style>
+{% endblock %}

docs/conf.py

@@ -55,6 +55,7 @@
     "sphinxext.opengraph",
     "sphinx.ext.viewcode",  # plone.api
     "sphinx.ext.autosummary",  # plone.api
+    "notfound.extension",
 ]
 
 
@@ -206,6 +207,12 @@
 copybutton_prompt_is_regexp = True
 
 
+# -- sphinx-notfound-page configuration ----------------------------------
+
+notfound_urls_prefix = None
+notfound_template = "404.html"
+
+
 # -- Options for HTML output -------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
@@ -309,7 +316,7 @@ def source_replace(app, docname, source):
 # Dict of replacements.
 source_replacements = {
     "{PLONE_BACKEND_MINOR_VERSION}": "6.0",
-    "{PLONE_BACKEND_PATCH_VERSION}": "6.0.0.1",
+    "{PLONE_BACKEND_PATCH_VERSION}": "6.0.0.2",
 }
 
 

requirements.txt

@@ -9,6 +9,7 @@ sphinx-autobuild
 sphinx-book-theme==0.3.3  # Temporary pin until we can sort out HTML refactoring.
 sphinx-copybutton
 sphinx-design
+sphinx-notfound-page
 sphinx-sitemap
 sphinx-togglebutton
 sphinxcontrib.httpdomain  # plone.restapi