[svnbook commit] r3155 - trunk/src/en/book
cmpilato
noreply at red-bean.com
Fri Jun 20 21:34:25 CDT 2008
Author: cmpilato
Date: Fri Jun 20 21:34:25 2008
New Revision: 3155
Log:
* src/en/book/ch03-advanced-topics.xml
(svn.advanced.locking.meanings): Clear up some numbering confusion.
Patch by: Julian Foad
Modified:
trunk/src/en/book/ch03-advanced-topics.xml
Modified: trunk/src/en/book/ch03-advanced-topics.xml
==============================================================================
--- trunk/src/en/book/ch03-advanced-topics.xml (original)
+++ trunk/src/en/book/ch03-advanced-topics.xml Fri Jun 20 21:34:25 2008
@@ -2237,11 +2237,11 @@
<para>In this section, and almost everywhere in this book, the
words <quote>lock</quote> and <quote>locking</quote> describe
a mechanism for mutual exclusion between users to avoid
- clashing commits. Unfortunately, there are two other sorts
+ clashing commits. Unfortunately, there are two other sorts
of <quote>lock</quote> with which Subversion, and therefore
this book, sometimes needs to be concerned.</para>
- <para>The first is <firstterm>working copy locks</firstterm>,
+ <para>The second is <firstterm>working copy locks</firstterm>,
used internally by Subversion to prevent clashes between
multiple Subversion clients operating on the same working
copy. This is the sort of lock indicated by an
@@ -2250,7 +2250,7 @@
<command>svn cleanup</command> command, as described in <xref
linkend="svn.tour.cleanup"/>.</para>
- <para>Secondly, there are <firstterm>database locks</firstterm>,
+ <para>Thirdly, there are <firstterm>database locks</firstterm>,
used internally by the Berkeley DB backend to prevent clashes
between multiple programs trying to access the database. This
is the sort of lock whose unwanted persistence after an error
More information about the svnbook-dev
mailing list