[svnbook commit] r2880 - trunk/src/en/book
cmpilato
noreply at red-bean.com
Fri Sep 28 10:40:42 CDT 2007
Author: cmpilato
Date: Fri Sep 28 10:40:41 2007
New Revision: 2880
Log:
* src/en/book/ch04-branching-and-merging.xml
Fix a couple of typos. Patch by David Alber <David_Alber at nrel.gov>.
Modified:
trunk/src/en/book/ch04-branching-and-merging.xml
Modified: trunk/src/en/book/ch04-branching-and-merging.xml
==============================================================================
--- trunk/src/en/book/ch04-branching-and-merging.xml (original)
+++ trunk/src/en/book/ch04-branching-and-merging.xml Fri Sep 28 10:40:41 2007
@@ -104,7 +104,7 @@
<quote>main line</quote> of development is going to take
place.</para>
- <para>Let's say that you've been given the task of implementing
+ <para>Let's say that you've been given the task of implementing a
radical new project feature. It will take a long time to write,
and will affect all the files in the project. The problem here
is that you don't want to interfere with Sally, who is in the
@@ -304,7 +304,7 @@
<para>There's nothing special about this working copy; it simply
mirrors a different directory in the repository. When you
- commit changes, however, Sally won'tsee them when she
+ commit changes, however, Sally won't see them when she
updates, because her working copy is of
<filename>/calc/trunk</filename>. (Be sure to read <xref
linkend="svn.branchmerge.switchwc"/> later in this chapter: the
More information about the svnbook-dev
mailing list