[svnbook commit] r3119 - trunk/src/en/book
sussman
noreply at red-bean.com
Wed Jun 11 15:53:33 CDT 2008
Author: sussman
Date: Wed Jun 11 15:53:33 2008
New Revision: 3119
Log:
* ch02-basic-usage.xml: some fixes from Bhuvaneswaran A <bhuvan at collab.net>.
Modified:
trunk/src/en/book/ch02-basic-usage.xml
Modified: trunk/src/en/book/ch02-basic-usage.xml
==============================================================================
--- trunk/src/en/book/ch02-basic-usage.xml (original)
+++ trunk/src/en/book/ch02-basic-usage.xml Wed Jun 11 15:53:33 2008
@@ -211,7 +211,7 @@
encodings in use today).</para>
<para>In addition, path names are used as XML attribute values
- in WebDAV exchanges, as well in as some of Subversion's
+ in WebDAV exchanges, as well as in some of Subversion's
housekeeping files. This means that path names can contain
only legal XML (1.0) characters. Subversion also prohibits
TAB, CR, and LF characters in path names to prevent paths from
@@ -1067,8 +1067,8 @@
changes coming from the repository didn't overlap with the local
changes.</para>
- <para>But the next line is part of a feature new in Subversion
- 1.5 called <firstterm>interactive conflict
+ <para>But the next two lines are part of a feature (new in
+ Subversion 1.5) called <firstterm>interactive conflict
resolution</firstterm>. This means that the changes from the
server overlapped with your own, and you have the opportunity
to resolve this conflict. The most commonly used options are
@@ -1661,7 +1661,7 @@
Waiting for Emacs...Done
Log message unchanged or not specified
-a)bort, c)ontinue, e)dit
+(a)bort, (c)ontinue, (e)dit
a
$
</screen>
@@ -1678,7 +1678,7 @@
$ svn commit -m "Add another rule"
Sending rules.txt
svn: Commit failed (details follow):
-svn: Your file or directory 'sandwich.txt' is probably out of date
+svn: File '/sandwich.txt' is out of date
…
</screen>
More information about the svnbook-dev
mailing list