summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/index.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/index.html b/doc/index.html
index adeabfb..17d38a6 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -506,7 +506,7 @@ USE_OSGPLUGIN(<plugin2>)
</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>