Replace 6-dev with 6.0

Author: stevepiercy

.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:
@@ -10,7 +10,7 @@ jobs:
       # Checkout
       - uses: actions/checkout@v3
         with: 
-          ref: 6-dev
+          ref: 6.0
           submodules: true
 
       - name: Submodule update

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/contributing/documentation/admins.md

@@ -81,4 +81,4 @@ To make it easier for other contributors to work with your project, update the f
 -   Add the symlink `docs/my_package` to `.gitignore`.
 -   Optionally set a branch to work on in `.gitmodules`.
 
-Commit and push your changes to a remote, and submit a pull request against [`plone/documentation@6-dev`](https://github.com/plone/documentation/compare).
+Commit and push your changes to a remote, and submit a pull request against [`plone/documentation@6.0`](https://github.com/plone/documentation/compare).

docs/contributing/documentation/index.md

@@ -127,7 +127,7 @@ Quick edits for minor issues, such as typographical errors, misspellings, and En
     :alt: GitHub Edit this file
     ```
 1.  Make edits, add a commit message, select {guilabel}`Create a new branch for this commit and start a pull request`, then click {guilabel}`Propose changes`.
-1.  Make your pull request against the branch `6-dev`.
+1.  Make your pull request against the branch `6.0`.
 1.  Members who subscribe to the repository will receive a notification and review your request.
 1.  Request a review from other team members.
 
@@ -148,15 +148,15 @@ This practice differs depending on whether you are making contributions to only
 
 This section describes how to make contributions to files in the `plone/documentation` repository only, and excludes files in `submodules/plone.api/docs`, `submodules/plone.restapi/docs` and `submodules/volto/docs`.
 
-1.  From the project root directory, sync your local `6-dev` branch with its remote.
+1.  From the project root directory, sync your local `6.0` branch with its remote.
     You might need to resolve conflicts.
 
     ```shell
-    git checkout 6-dev
+    git checkout 6.0
     git pull
     ```
 
-1.  Create a new branch from `6-dev`.
+1.  Create a new branch from `6.0`.
 
     ```shell
     git checkout -b <new_branch>
@@ -195,7 +195,7 @@ This section describes how to make contributions to files in the `plone/document
     git push
     ```
 
-1.  Visit the GitHub `documentation` repository, and [create a pull request](https://github.com/plone/documentation/compare) against the branch `6-dev`.
+1.  Visit the GitHub `documentation` repository, and [create a pull request](https://github.com/plone/documentation/compare) against the branch `6.0`.
 1.  Members who subscribe to the repository will receive a notification and review your request.
 1.  Request a review from other team members.
 
@@ -209,15 +209,16 @@ We use `git submodules` to manage multiple repositories.
 We imported the external repositories the `plone/documentation` repository as described in {doc}`setup-build`.
 
 ```{important}
-We currently use the branches `plone/documentation@6-dev`, `plone/plone.api@master`, `plone/plone.restapi@master`, and `plone/volto@master` as the main branches for developing Plone 6 Documentation.
+We currently use the branches `plone/[email protected]`, `plone/plone.api@master`, `plone/plone.restapi@master`, and `plone/volto@master` as the main branches for developing Plone 6 Documentation.
+For Volto, we backport changes to documentation from `plone/volto@master` to `plone/[email protected]`, and deploy documentation from `plone/[email protected]`.
 These branches may change as we get closer to a production release.
 ```
 
-1.  From the project root directory, sync your local `6-dev` branch with its remote.
+1.  From the project root directory, sync your local `6.0` branch with its remote.
     You might need to resolve conflicts.
 
     ```shell
-    git checkout 6-dev
+    git checkout 6.0
     git pull
     ```