Autogenerated HTML docs for v1.3.3-g16a4

1 files changed, 3 insertions, 3 deletions

diff --git a/git-read-tree.html b/git-read-tree.html
index fa551cf2c..d159a4cc8 100644
--- a/git-read-tree.html
+++ b/git-read-tree.html
@@ -520,7 +520,7 @@ stage 1 and stage 3 are the same and stage 2 is different take
 <p>The <tt>git-write-tree</tt> command refuses to write a nonsensical tree, and it

 will complain about unmerged entries if it sees a single entry that is not

 stage 0.</p>

-<p>Ok, this all sounds like a collection of totally nonsensical rules,

+<p>OK, this all sounds like a collection of totally nonsensical rules,

 but it's actually exactly what you want in order to do a fast

 merge. The different stages represent the "result tree" (stage 0, aka

 "merged"), the original tree (stage 1, aka "orig"), and the two trees

@@ -548,7 +548,7 @@ a file that has _any_ difference what-so-ever in the three trees
 <p>

 the index file saves and restores with all this information, so you

   can merge things incrementally, but as long as it has entries in

-  stages 1/2/3 (ie "unmerged entries") you can't write the result. So

+  stages 1/2/3 (i.e., "unmerged entries") you can't write the result. So

   now the merge algorithm ends up being really simple:

 </p>

 <ul>

@@ -649,7 +649,7 @@ have finished your work-in-progress), attempt the merge again.</p>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 02-Mar-2006 09:14:48 UTC

+Last updated 04-Jun-2006 07:24:29 UTC

 </div>

 </div>

 </body>