doc: update the documentation

- mention `stable-6.0` requirements.
- update some patterns.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/docs/source/dev/index.rst b/docs/source/dev/index.rst
index e445a16005c5f4ae724c1bfdcc093f9442f5149b..0ce3305ae61e5ed0f3bf62691d9aa779a6a2124f 100644 (file)
--- a/docs/source/dev/index.rst
+++ b/docs/source/dev/index.rst
@@ -69,7 +69,7 @@ For example:
 
 .. code-block:: none
 
-   jenkins test luminous-ansible2.3-journal_collocation
+   jenkins test centos-non_container-all_daemons
 
 Backporting changes
 -------------------
@@ -81,9 +81,9 @@ If a change should be backported to a ``stable-*`` Git branch:
 - Determine the latest available stable branch:
   ``git branch -r --list "origin/stable-[0-9].[0-9]" | sort -r | sed 1q``
 - Create a new local branch for your pull request, based on the stable branch:
-  ``git checkout --no-track -b my-backported-change origin/stable-3.0``
+  ``git checkout --no-track -b my-backported-change origin/stable-5.0``
 - Cherry-pick your change: ``git cherry-pick -x (your-sha1)``
-- Create a new pull request against the ``stable-3.0`` branch.
+- Create a new pull request against the ``stable-5.0`` branch.
 - Ensure that your pull requests's title has the prefix "backport:", so it's clear
   to reviewers what this is about.
 - Add a comment in your backport pull request linking to the original (master) pull request.
@@ -96,7 +96,7 @@ stable branch with your change. For example:
 
 .. code-block:: console
 
-   $ git checkout stable-3.0
+   $ git checkout stable-5.0
    $ git pull --ff-only
-   $ git tag v3.0.12
-   $ git push origin v3.0.12
+   $ git tag v5.0.12
+   $ git push origin v5.0.12

diff --git a/docs/source/index.rst b/docs/source/index.rst
index b6f0fe9ec437a754c84cc6b87a7439f954165627..6e49224ced3441e95ac1a6885a5a95852340ac79 100644 (file)
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -81,6 +81,8 @@ The ``master`` branch should be considered experimental and used with caution.
 
 - ``stable-5.0`` Supports Ceph version ``octopus``. This branch requires Ansible version ``2.9``.
 
+- ``stable-6.0`` Supports Ceph version ``pacific``. This branch requires Ansible version ``2.9``.
+
 - ``master`` Supports the master branch of Ceph. This branch requires Ansible version ``2.9``.
 
 .. NOTE:: ``stable-3.0`` and ``stable-3.1`` branches of ceph-ansible are deprecated and no longer maintained.