Index: src/en/book/appb.xml
===================================================================
--- src/en/book/appb.xml	(revision 2579)
+++ src/en/book/appb.xml	(working copy)
@@ -417,7 +417,7 @@
       repository via autoversioning.  The module looks at the file's
       named extension and possibly the contents as well; if the file
       matches some common patterns, then the the
-      file's <literal>svn;mime-type</literal> property will be set
+      file's <literal>svn:mime-type</literal> property will be set
       automatically.</para>
 
   </sect1>
@@ -600,7 +600,7 @@
           in Java.  It's under a free Apache-like license and is
           available at <ulink url="http://www.ics.uci.edu/~webdav/"/>.
           DAV Explorer does everything cadaver does, but has the
-          advantages of being portable and being more user-friendly GUI
+          advantages of being portable and being a more user-friendly GUI
           application.  It's also one of the first clients to support
           the new WebDAV Access Control Protocol (RFC 3744).</para>
   
@@ -699,7 +699,7 @@
           algorithm seems to work consistently on every system.  The
           general consensus of the WebDAV community is that you should
           avoid the new Web Folders implementation and use the old one
-          instead, and that if you need real a real filesystem-level
+          instead, and that if you need a real filesystem-level
           client for Windows XP, then use a third-party program like
           WebDrive or NetDrive.</para>
 
@@ -719,7 +719,7 @@
   
         <para>Nautilus is the official file manager/browser for the
           GNOME desktop (<ulink url="http://www.gnome.org"/>), and
-          Konqueror is the manager/browser for KDE desktop (<ulink
+          Konqueror is the manager/browser for the KDE desktop (<ulink
           url="http://www.kde.org"/>).  Both of these applications have
           an explorer-level WebDAV client built-in, and operate just
           fine against an autoversioning repository.</para>
@@ -761,7 +761,7 @@
         <title>WebDrive, NetDrive</title> 
   
         <para>Both WebDrive and NetDrive are excellent commercial
-          products which allows a WebDAV share to be attached as drive
+          products which allow a WebDAV share to be attached as drive
           letters in Windows.  We've had nothing but success with
           these products.  At the time of writing, WebDrive can be
           purchased from South River Technologies (<ulink
@@ -785,11 +785,11 @@
           appears as a disk on the desktop, just like any other mounted
           volume.<footnote><para>From the Darwin terminal, one can also
           run <literal>mount -t webdav URL
-          /mountpoint</literal></para></footnote>.</para>
+          /mountpoint</literal>.</para></footnote></para>
   
         <para>Note that if your mod_dav_svn is older than version 1.2,
           OS X will refuse to mount the share as read-write; it will
-          appear as read-only.  This is because the OS X insists on
+          appear as read-only.  This is because OS X insists on
           locking support for read-write shares, and the ability to lock
           files first appeared in Subversion 1.2.</para>
   
Index: src/en/book/ch03.xml
===================================================================
--- src/en/book/ch03.xml	(revision 2579)
+++ src/en/book/ch03.xml	(working copy)
@@ -1024,7 +1024,11 @@
           linkend="svn.advanced.props"/> for more information on
           properties).  If an <computeroutput>M</computeroutput>
           appears in the second column, then the properties have been
-          modified, otherwise a whitespace will be printed.</para>
+          modified.  If a <computeroutput>C</computeroutput> appears in
+	  the second column, then the properties for the file are in a
+	  state of conflict, which must be resolved before committing the
+	  changes to the repository.  Otherwise a whitespace will
+	  be printed.</para>
         
         <para>The third column will only show whitespace or an
           <computeroutput>L</computeroutput> which means that
@@ -2065,13 +2069,13 @@
         the older revision.  There are a few reasons why we might
         prefer to use <command>svn cat</command>.</para>
 
-      <para>First, you may want to see the differences between two
-        revisions of a file using an external diff program (perhaps a
-        graphical one, or perhaps your file is in such a format that
-        the output of unified diff is nonsensical).  In this case,
-        you'll need to grab a copy of the old revision, redirect it to
-        a file, and pass both that and the file in your working copy
-        to your external diff program.</para>
+      <para>For example, you may want to see the differences
+        between two revisions of a file using an external diff program
+	(perhaps a graphical one, or perhaps your file is in such a
+	format that the output of unified diff is nonsensical). In this
+	case, you'll need to grab a copy of the old revision, redirect
+	it to a file, and pass both that and the file in your working
+        copy to your external diff program.</para>
 
       <para>Sometimes it's easier to look at an older version of a
         file in its entirety as opposed to just the differences
Index: src/en/book/ch06.xml
===================================================================
--- src/en/book/ch06.xml	(revision 2579)
+++ src/en/book/ch06.xml	(working copy)
@@ -600,8 +600,8 @@
 
       <para>At the time of writing, the server only knows how to send
         a CRAM-MD5 <footnote><para>See RFC 2195.</para></footnote>
-        authentication challenge.  In essence, the server sends a bit
-        of data to the client.  The client uses the MD5 hash algorithm
+        authentication challenge.  In essence, the server sends a small
+	amount of data to the client.  The client uses the MD5 hash algorithm
         to create a fingerprint of the data and password combined,
         then sends the fingerprint as a response.  The server performs
         the same computation with the stored password to verify that
@@ -1221,7 +1221,8 @@
       <para>Be sure that when you define your new
         <literal>Location</literal>, it doesn't overlap with other
         exported Locations.  For example, if your main
-        <literal>DocumentRoot</literal> is <filename>/www</filename>,
+        <literal>DocumentRoot</literal> is exported to
+	<filename>/www</filename>,
         do not export a Subversion repository in <literal>&lt;Location
         /www/repos&gt;</literal>.  If a request comes in for the URI
         <filename>/www/repos/foo.c</filename>, Apache won't know
@@ -1975,7 +1976,7 @@
 
         <para>All of this path-checking can sometimes be quite
           expensive, especially in the case of <command>svn
-          log</command>.  When retrieving a list revisions, the server
+          log</command>.  When retrieving a list of revisions, the server
           looks at every changed path in each revision and checks it
           for readability.  If an unreadable path is discovered, then
           it's omitted from the list of the revision's changed paths
Index: src/en/book/ch07.xml
===================================================================
--- src/en/book/ch07.xml	(revision 2579)
+++ src/en/book/ch07.xml	(working copy)
@@ -3409,7 +3409,7 @@
         from the native locale into UTF-8.</para>
 
       <para>For example, suppose you create a file
-        named<filename>caffè.txt</filename>, and then when committing
+        named <filename>caffè.txt</filename>, and then when committing
         the file, you write the log message as <quote>Adesso il caffè
         è più forte</quote>.  Both the filename and log message
         contain non-ASCII characters, but because your locale is set
Index: src/en/book/ch08.xml
===================================================================
--- src/en/book/ch08.xml	(revision 2579)
+++ src/en/book/ch08.xml	(working copy)
@@ -351,8 +351,8 @@
       <para>For example, here is a code segment that illustrates the
         use of both the repository and filesystem interfaces to create
         a new revision of the filesystem in which a directory is
-        added.  Note that in this example (and all others throughout
-        this book), the <function>SVN_ERR()</function> macro simply
+        added.  Note that in this example, the
+	<function>SVN_ERR()</function> macro simply
         checks for a non-successful error return from the function it
         wraps, and returns that error if it exists.</para>
 
Index: src/en/book/ch09.xml
===================================================================
--- src/en/book/ch09.xml	(revision 2579)
+++ src/en/book/ch09.xml	(working copy)
@@ -4356,8 +4356,8 @@
           <title>Description</title>
 
           <para><command>svnadmin deltify</command> only exists in
-            1.0.x due to historical reasons.  This command is
-            deprecated and no longer needed.</para>
+	    current versions of Subversion due to historical reasons.
+	    This command is deprecated and no longer needed.</para>
 
           <para>It dates from a time when Subversion offered
             administrators greater control over compression strategies

