changeset 2340:e56341d7a2df

Use Git terminology in docs to avoid confusion
author Volker Grabsch <vog@notjusthosting.com>
date Wed, 28 Mar 2012 16:22:47 +0200
parents fe146de226fe
children 937b7a9726ab
files doc/index.html
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/doc/index.html	Wed Mar 28 16:20:17 2012 +0200
+++ b/doc/index.html	Wed Mar 28 16:22:47 2012 +0200
@@ -506,7 +506,7 @@
         </li>
         <li>
             After a successful testing phase, the whole "master"
-            branch will be merged (moved) into "stable".
+            branch will be merged into "stable" (fast-forward).
         </li>
     </ul>
 </div>