Index: www/build-farm.html
===================================================================
--- www/build-farm.html (revision 17762)
+++ www/build-farm.html (working copy)
@@ -56,11 +56,11 @@
href="https://sourceforge.net/projects/buildbot/">BuildBot</a> for
build management software, in part because of its <a
href="http://buildbot.sourceforge.net/manual-0.7.0.html#try">TryScheduler</a>
-feature, which lets a developer to ask the question "What would happen
+feature, which lets a developer ask the question "What would happen
if I committed this patch right now?". It runs the unit test suite
(across multiple build platforms) on the developer's current code,
-allowing her to make sure they will not break the tree when she
-finally commits her changes. The default setup, however, is to build
+allowing her to make sure her changes will not break the tree when she
+finally commits them. The default setup, however, is to build
a repository tree, usually trunk, or a release branch or tag.</p>
<p>BuildBot uses two terms, <b>buildmaster</b> and <b>buildslave</b>,
Index: www/variance-adjusted-patching.html
===================================================================
--- www/variance-adjusted-patching.html (revision 17762)
+++ www/variance-adjusted-patching.html (working copy)
@@ -51,7 +51,7 @@
was generated, so that the new patch will be applicable to the new
target text and yet still have the "same" effect as the old patch. It
is, in essence, patching a patch. For example, suppose a branch B
-diverges from a trunk T, and in an engineer wants to merge the change
+diverges from a trunk T, and an engineer wants to merge the change
from revision T:18 to T:19 into B:10, creating B:11. If B:10 is too
dissimilar to T:18, the merge may fail due to textual conflicts, even
though there is no logical conflict. Variance adjustment is about
@@ -157,7 +157,7 @@
<dl>
<dt><i>insertion</i></dt>
- <dd>A new line, one that has been added in either source or
+ <dd>A new line that has been added in either source or
target since the common ancestor.</dd>
<dt><i>deletion</i></dt>
<dd>A line that has been deleted from either source or target
--
Michael Wood <mwood@icts.uct.ac.za>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Dec 13 11:57:00 2005