summaryrefslogtreecommitdiffstats
path: root/doc/index.html
diff options
context:
space:
mode:
authorVolker Grabsch <vog@notjusthosting.com>2012-03-28 14:22:47 (GMT)
committerVolker Grabsch <vog@notjusthosting.com>2012-03-28 14:22:47 (GMT)
commitad2c21779d0b0fe25d68f1ce0d3140ea109e8949 (patch)
tree83abd400d6bfe750500f0861c569e10dd76f7ef0 /doc/index.html
parent244bd7b987866808da93e43c831bfbfad5d153a9 (diff)
downloadmxe-ad2c21779d0b0fe25d68f1ce0d3140ea109e8949.zip
mxe-ad2c21779d0b0fe25d68f1ce0d3140ea109e8949.tar.gz
mxe-ad2c21779d0b0fe25d68f1ce0d3140ea109e8949.tar.bz2
Use Git terminology in docs to avoid confusion
Diffstat (limited to 'doc/index.html')
-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(&lt;plugin2&gt;)
</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>