Merge pull request Sylius#9192 from CoderMaggie/docs/1.1-branch

[Documentation] Add 1.1 branch to Contribution guides
ezecosystem · Feb 15, 2018 · 17052a0 · 17052a0
2 parents 363303b + aee86ef
commit 17052a0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/docs/contributing/code/patches.rst b/docs/contributing/code/patches.rst
@@ -100,12 +100,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.0``, if you are fixing a bug for an existing feature or want to make a change that falls into the list of acceptable changes in patch versions
+* ``1.0`` or ``1.1``, if you are fixing a bug for an existing feature or want to make a change that falls into the list of acceptable changes in patch versions
 * ``master``, if you are adding a new feature.
 
 .. note::
 
-    All bug fixes merged into the ``1.0`` maintenance branch are also merged into ``master`` on a regular basis.
+    All bug fixes merged into the ``1.0`` and ``1.1`` maintenance branches are also merged into ``master`` on a regular basis.
 
 Create a Topic Branch
 ~~~~~~~~~~~~~~~~~~~~~
@@ -244,7 +244,7 @@ possible:
 
     | Q               | A
     | --------------- | -----
-    | Branch?         | 1.0 or master
+    | Branch?         | 1.0, 1.1 or master
     | Bug fix?        | no/yes
     | New feature?    | no/yes
     | BC breaks?      | no/yes

diff --git a/docs/contributing/documentation/overview.rst b/docs/contributing/documentation/overview.rst
@@ -39,12 +39,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.0``, if you are fixing or adding docs for an existing feature
-* ``master``, if you are documenting a new feature, that was not in ``1.0``
+* ``1.0`` or ``1.1``, 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.0`` nor in ``1.1``
 
 .. note::
 
-    All bug fixes merged into the ``1.0`` maintenance branch are also merged into ``master`` on a regular basis.
+    All bug fixes merged into the ``1.0`` and ``1.1`` maintenance branches are also merged into ``master`` on a regular basis.
 
 Create a dedicated branch for your changes (for organization):