[svnbook commit] r3331 - trunk/src/en/book
cmpilato
noreply at red-bean.com
Tue Oct 14 17:34:35 CDT 2008
Author: cmpilato
Date: Tue Oct 14 17:34:35 2008
New Revision: 3331
Log:
* src/en/book/ch04-branching-and-merging.xml,
* src/en/book/ch07-customizing-svn.xml
Typo fixes from typo fix king Jens Seidel <jensseidel -at- users.sf.net>.
Modified:
trunk/src/en/book/ch04-branching-and-merging.xml
trunk/src/en/book/ch07-customizing-svn.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 Tue Oct 14 17:34:35 2008
@@ -1616,7 +1616,7 @@
revert, and rerun <command>svn merge</command> with
different arguments.</para>
- <para>Also notice that the preceeding example shows a conflict
+ <para>Also notice that the preceding example shows a conflict
happening on <filename>glorb.h</filename>. We already
stated that the working copy has no local edits: how can a
conflict possibly happen? Again, because the user can use
Modified: trunk/src/en/book/ch07-customizing-svn.xml
==============================================================================
--- trunk/src/en/book/ch07-customizing-svn.xml (original)
+++ trunk/src/en/book/ch07-customizing-svn.xml Tue Oct 14 17:34:35 2008
@@ -892,7 +892,7 @@
installed somewhere on your system. On Unix, they typically
live in <filename>/usr/share/locale/</filename>, while
on Windows they're often found in the
- <filename>\share\locale\</filename> folder in Subversion's
+ <filename>share\locale\</filename> folder in Subversion's
installation area. Once installed, a module is named after
the program for which it provides translations. For example, the
<filename>de.mo</filename> file may ultimately end up
More information about the svnbook-dev
mailing list