Patch by Daniel L. Rall. Available at http://www.contactor.se/~dast/svn/archive-2003-09/1495.shtml, pasted here for easy reviewing. Index: doc/book/book/ch01.xml =================================================================== --- doc/book/book/ch01.xml (revision 7212) +++ doc/book/book/ch01.xml (working copy) @@ -147,7 +147,7 @@ access, making it easy for people to implement new network mechanisms. Subversion's <quote>advanced</quote> network server is a module for the Apache web server, which speaks - a variant of HTTP called WebDAV/DeltaV. This gives + a dialect of HTTP called WebDAV/DeltaV. This gives Subversion a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and Index: doc/book/book/ch03.xml =================================================================== --- doc/book/book/ch03.xml (revision 7212) +++ doc/book/book/ch03.xml (working copy) @@ -541,6 +541,7 @@ <para>File <filename>foo</filename> received new changes from the repository, but your local copy of the file had your modifications. The changes did not intersect, + <!-- HELP: What if WC already contains repository changes? --> however, so Subversion has mer<computeroutput>G</computeroutput>ed the repository's changes into the file without a problem.</para> Ben Collins-Sussman commented on the second part of the patch: Hey Fitz... you should fix this. Basically, the text should be something like, "Either the changes did not intersect at all, or the changes were exactly the same."
Original issue reported by sander