changed branches

contributing-branches.rst

@@ -6,28 +6,34 @@ The Zammad main repo @ https://github.com/zammad/zammad has several branches
 Master
 ======
 
-* default GitHub branch
-* current unreleased development state of current minor release with all bugfixes
-* is the the branch where features work correctly
-* could be used for experienced users for production
+* Default GitHub branch
+* Current unreleased development state of next stable minor release
+* Bug fixes of current stable version are added here
+* Is the the branch where features work correctly
+* Could be used for experienced users for production
+* If current stable is 1.1.0 this would be next 1.1.1
 
 
 Develop
 =======
 
-* current unreleased development state of next major release
-* unstable
-* is the first instance where all feature and bugfix branches are merged
-* this branch will have some issues all the time - no use for production
+* Current unreleased development state of next major release
+* Is the first instance where all features are developed
+* This branch will have some issues all the time 
+* If current stable ist 1.1.0 this would be 1.2.0
+* Unstable!
+* No use for production!
 
 Stable
 ======
 
-* current stable release with bugfixes e. g. 1.0.1, 1.0.2, 1.1.0 if available 
+* Current stable release
+* Stable bugfixes merged from master when new stable minor version is released
+
 
 Stable-X.x
 ==========
 
 * There will be several more Stable branches because we'll support the last 3 major versions of Zammad
-* In the moment this would be 1.0.x, 1.1.x, and 1.2.x
+* If current stable is 1.2.0 then name of the branch is stable-1.2 and there also would be stable-1.1 and stable-1.0