Merge branch '1.9' into 1.10

* 1.9:
  [Docs] Choosing the right branch - fix
This commit is contained in:
Grzegorz Sadowski 2021-08-31 06:56:55 +02:00
commit 39da74024e
No known key found for this signature in database
GPG key ID: EF87FF4E6E3BD364

View file

@ -38,12 +38,12 @@ Choose the right Base Branch
Before starting to work on a patch, you must determine on which branch you need to work. It will be:
* ``1.7``, if you are fixing or adding docs for features that exist in one of those versions,
* ``master``, if you are documenting a new feature, that was not in ``1.7``
* ``1.x``, if you are fixing or adding docs for features that exist in one of those versions,
* ``master``, if you are documenting a new feature, that was not in ``1.x``
.. note::
All bug fixes merged into the ``1.7`` maintenance branches are also merged into ``master`` on a regular basis.
All bug fixes merged into the ``1.x`` maintenance branches are also merged into ``master`` on a regular basis.
Create a dedicated branch for your changes (for organization):