Merge branch '6.0' into 6-dev--tinymce-upgrade

Author: stevepiercy

.github/workflows/build_deploy.yml

@@ -3,11 +3,14 @@ name: Build and deploy Plone 6 documentation to 6.docs.plone.org
 on:
   push:
     branches:
-      - "6-dev"
+      - "6.0"
 
 jobs:
   build_deploy:
     runs-on: ubuntu-latest
+    environment:
+      name: docs.plone.org
+      url: https://docs.plone.org
     steps:
       - uses: actions/checkout@v3
       - name: Setup Graphviz
@@ -66,9 +69,9 @@ jobs:
         with:
           flags: '-avzr --delete'
           options: ''
-          ssh_options: '-p ${{secrets.DEPLOY_PORT}}'
+          ssh_options: '-p ${{vars.DEPLOY_PORT}}'
           src: '_build/html/'
-          dest: '${{secrets.DEPLOY_USER_DOCS}}@${{secrets.DEPLOY_SERVER_DOCS}}:${{secrets.DEPLOY_PATH_DOCS}}'
+          dest: '${{vars.DEPLOY_USER_DOCS}}@${{vars.DEPLOY_SERVER_DOCS}}:${{vars.DEPLOY_PATH_DOCS}}'
 
       - name: Display status from deploy
         run: echo "${{ steps.deploy.outputs.status }}"

.github/workflows/update_submodule.yml

@@ -1,4 +1,4 @@
-name: Get latest version of submodules and push back to 6-dev branch
+name: Get latest version of submodules and push back to 6.0 branch
 
 on:
   workflow_dispatch:
@@ -9,8 +9,8 @@ jobs:
     steps:
       # Checkout
       - uses: actions/checkout@v3
-        with: 
-          ref: 6-dev
+        with:
+          ref: 6.0
           submodules: true
 
       - name: Submodule update
@@ -26,5 +26,5 @@ jobs:
           git status
           git config user.name github-actions
           git config user.email [email protected]
-          git commit -m "Update submo0dules tip" || echo "No changes to commit"
+          git commit -m "Update submodules tip" || echo "No changes to commit"
           git push

.gitignore

@@ -8,8 +8,12 @@
 pyvenv.cfg
 /_build
 /styles/Microsoft
+/share
 
 # symlinked from submodule
 docs/volto
 docs/plone.restapi
 docs/plone.api
+
+# editor files
+.vscode

.gitmodules

@@ -1,11 +1,11 @@
 [submodule "submodules/volto"]
 	path = submodules/volto
 	url = https://github.com/plone/volto.git
-	branch = master
+	branch = main
 [submodule "submodules/plone.restapi"]
 	path = submodules/plone.restapi
 	url = https://github.com/plone/plone.restapi.git
-	branch = master
+	branch = main
 [submodule "submodules/plone.api"]
 	path = submodules/plone.api
 	url = https://github.com/plone/plone.api.git

README.md

@@ -1,4 +1,4 @@
-[![Testing Status](https://github.com/plone/documentation/actions/workflows/test.yml/badge.svg?branch=6-dev "Testing Status")](https://github.com/plone/documentation/actions/workflows/test.yml)
+[![Testing Status](https://github.com/plone/documentation/actions/workflows/test.yml/badge.svg?branch=6.0 "Testing Status")](https://github.com/plone/documentation/actions/workflows/test.yml)
 
 # Plone Documentation
 
@@ -9,7 +9,7 @@ This is the repository for Plone Documentation.
 
 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).
+Active development on the Plone 6 Documentation takes place on the branch [`6.0`](https://github.com/plone/documentation/tree/6.0).
 
 
 ## Plone 5.2
@@ -24,7 +24,7 @@ Development on the Plone 5.2 Documentation takes place on the branch [`5.2`](htt
 - [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)
+- [Source Code](https://github.com/plone/documentation/tree/6.0)
 
 
 ### Contributing to frontend (Volto), `plone.api`, and `plone.restapi` documentation

docs/_templates/404.html

@@ -7,7 +7,19 @@
 {% block body %}
 <div>
     <h1>Page not found</h1>
-    <p>Unfortunately we couldn't find the content you were looking for.</p>
+    <p>We could not find the page you requested in Plone 6 documentation.</p>
+    <p>You can <a href="/search.html">search</a> Plone 6 documentation.</p>
+    <p>Previous versions of Plone documentation:</p>
+    <ul>
+        <li><a href="https://5.docs.plone.org/">Plone 5</a></li>
+        <li><a href="https://4.docs.plone.org/">Plone 4</a></li>
+        <li><a href="https://3.docs.plone.org/">Plone 3</a></li>
+    </ul>
+    <h2>Why is this happening?</h2>
+    <p>
+        The Plone Documentation team has restructured documentation to redirect visitors to the most current and accurate information, archive previous versions, and identify outdated pages.
+        If you would like to report an issue or request a redirect be set up, you can <a href="https://github.com/plone/documentation/issues/new?assignees=&labels=&projects=&template=new-issue-form.yml" rel="external">create a new issue in the GitHub issue tracker</a>.
+    </p>
 </div>
 
 <style>