Complete Mercurial Branching Strategy

(Arne Babenhauserheide)
2013-01-26: text polishing. 0.1

text polishing.

diff --git a/workflow.txt b/workflow.txt
--- a/workflow.txt
+++ b/workflow.txt
@@ -469,9 +469,9 @@ Commands:
 
 *Note: To make the final merge of your feature into default easier, you can regularly merge the default branch into the feature branch.*
 
-*Note: We use feature branches to ensure that new clones start at a revision which other developers can directly use. With bookmarks you could get trapped on a feature-head which might not be merged to `default` for quite some time. For more reasons, see the relevant [footnote](#fn:bookmarks).*
+*Note: We use feature branches to ensure that new clones start at a revision which other developers can directly use. With bookmarks you could get trapped on a feature-head which might not be merged to `default` for quite some time. For more reasons, see the [bookmarks footnote](#fn:bookmarks).*
 
-The final action is a regular release. Since we already showed that, we are finished here.
+The final action is a regular merge to stable to get into a state from which we could safely do a release. Since we already showed how to do that, we are finished here.
 
 <a name="extensions"></a>
 
@@ -494,7 +494,7 @@ This realizes the [successful Git branch
 
     > “If you use feature branches, don’t call them `default` or `stable`. And don’t touch `stable`”.
 
-If you have special needs, this model can easily be extended fullfill your requirements. Useful extensions include:
+If you have special needs, this model can easily be extended to fullfill your requirements. Useful extensions include:
 
 * [multiple releases](#multiple-releases) - if you need to provide maintenance for multiple releases side-by-side.
 * [grafted micro-releases](#graft-releases) - if you need to segment the next big changes into smaller releases while leaving out some potentially risky changes.
@@ -640,7 +640,7 @@ In the [Diagram](#diagram) this just add
 
 We now have nice graphs, examples, potential extensions and so on. But since this strategy uses Mercurial instead of git, we don’t actually need all the graphics, descriptions and branch categories in the git version - or in this post. 
 
-Instead we can boil all of this down to the **3 simple rules** from the starting summary:
+Instead we can boil all of this down to **3 simple rules**:
 
 > (1) you do all the work on `default` - except for hotfixes.
 
@@ -648,4 +648,6 @@ Instead we can boil all of this down to 
 
 > (3) you can use arbitrary feature-branches, as long as you don’t call them `default` or `stable`. They always start at default (since you do all the work on default).
 
+They are the rules you already know from the starting summary.
+
 That’s it. Happy hacking!