From 835dac9718ca131b9f31387638435e20ee247dd6 Mon Sep 17 00:00:00 2001
From: Volker Grabsch <v@njh.eu>
Date: Thu, 18 Jul 2013 12:18:25 +0200
Subject: [PATCH] Clarify branch concept

---
 index.html | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 8e1ec4ed..d9e2ee16 100644
--- a/index.html
+++ b/index.html
@@ -590,9 +590,21 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
         <li>
             When in doubt, "master" is used rather than "stable".
         </li>
+    </ul>
+
+    <p>
+    And this is how the branches relete to each other:
+    </p>
+
+    <ul class="compact-list">
         <li>
-            After a successful testing phase, the whole "master"
-            branch will be merged into "stable" (fast-forward).
+            Every change to the "stable" branch
+            will be merged into "master".
+        </li>
+        <li>
+            After a successful testing phase,
+            the "stable" branch
+            will be fast-forwarded to "master".
         </li>
     </ul>
 </div>