--- a/docs/evolve-good-practice.rst	Fri Jul 06 18:43:25 2012 +0200
+++ b/docs/evolve-good-practice.rst	Wed Jul 11 13:59:06 2012 -0400
@@ -2,10 +2,10 @@
 Good pratice for (early) user of evolve
 -----------------------------------------
 
-Avoid instability
+Avoid unstability
 --------------------------------
 
-The less instability you have the less you need to resolve.
+The less unstability you have the less you need to resolve.
 
 Evolve is not yet able to detect and solve every situation. And your mind is
 not ready neither.
@@ -13,17 +13,18 @@
 Branch as much as possible
 --------------------------------
 
-This is not MQ you are not constrainted to linear history.
+This is not MQ, you are not constrainted to linear history.
 
-Making a branch per independent branch will help you avoiding instability and conflict.
+Making a branch per independent branch will help you avoid unstability
+and conflict.
 
 Rewrite you change only
 ------------------------------------------------
 
-There is no descent conflict detection and handling right now. rewriting other
-people changeset garantee that you will get conflict. Communicate with you
-fellow developer before trying to touch other people part. (which is a good
-pratice in any case)
+There is no descent conflict detection and handling right now.
+Rewriting other people's changesets guarantees that you will get
+conflicts. Communicate with your fellow developers before trying to
+touch other people's work (which is a good pratice in any case).
 
 Using multiple branch will help you to achieve this goal.
 
@@ -31,13 +32,13 @@
 ------------------------------------------------------------------
 
 
-If you have children changeset from other people that you don't really care
-about, prefer not altering them that risking a conflict by stabilizing them.
+If you have children changesets from other people that you don't really care
+about, prefer not altering them to risking a conflict by stabilizing them.
 
 
 Do not get too confident
 ---------------------------
 
-This is an experimental extension and a complexe concept. This is beautiful,
-powerful and robust on paper. But the tool and your mind may not be prepared to
-all situation yet.
+This is an experimental extension and a complex concept. This is beautiful,
+powerful and robust on paper, but the tool and your mind may not be prepared for
+all situations yet.