"Matt Blais" <mblais1@yummage.com> writes:
> Minor readability changes, plus a couple error corrections.
>
> D:\Collabnet\svn\trunk\doc\book\book>svn diff ch02.xml
> Index: ch02.xml
> ===================================================================
> --- ch02.xml (revision 6740)
> +++ ch02.xml (working copy)
> @@ -74,7 +74,7 @@
> <para>All version control systems have to solve the same
> fundamental problem: how will the system allow users to share
> information, but prevent them from accidentally stepping on
> - each other's feet? It's all too easy for users to
> + each other's toes? It's all too easy for users to
> accidentally overwrite each other's changes in the
> repository.</para>
>
> @@ -143,7 +143,7 @@
> These changes don't overlap at all. They could easily
> edit the file simultaneously, and no great harm would
> come, assuming the changes were properly merged together.
> - There's no need for them to take turns in this
> + There's no reason why they should have to take turns in
> + this
> situation.</para></listitem>
>
> <listitem><para>
Spurious, no-op changes.
> <sect2 id="svn-ch-2-sect-2.3">
> <title>The Copy-Modify-Merge Solution</title>
>
> - <para>Subversion, CVS, and other version control systems use a
> - <firstterm>copy-modify-merge</firstterm> model as an
> - alternative to locking. In this model, each user's client
> + <para>In contrast to the Lock-Modify-Unlock model described
> above,
> + a very different approach known as the
> + <firstterm>copy-modify-merge</firstterm> model is taken by
> + Subversion, CVS, and other version control systems.
> + In this model, each user's client
> reads the repository and creates a personal <firstterm>working
> copy</firstterm> of the file or project. Users then work in
> - parallel, modifying their private copies. Finally, the
> + parallel, each modifying their own private working copy.
> + Finally, these
'Each' is singular; this should be: "each modifying [his|her|his or
her] own..."
> private copies are merged together into a new, final version.
> The version control system often assists with the merging, but
> - ultimately a human being is responsible for making it happen
> + ultimately a human beings is responsible for ensuring that
> + merging happens
> correctly.</para>
"a human beings" ? Wanna talk about singular/plural, again?
>
> - <para>Here's an example. Say that Harry and Sally each create
> - working copies of the same project, copied from the
> - repository. They work concurrently, and make changes to the
> - same file "A" within their copies. Sally saves her changes to
> + <para>Here's an example. Let's say that Harry and Sally each
> create
> + their own working copy of a project from the
> + repository. They work concurrently, and each makes changes to
> their
> + own copy of the same file "A". Sally saves her changes to
"each creates a private working copy"
* * *
Alright, that's it. I'm bailing on this review, and -1 on the patch
until it comes back with all this singular/plural business cleaned up.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Aug 16 18:34:15 2003