You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "Daniel L. Rall" <dl...@finemaltcoding.com> on 2003/09/27 22:06:10 UTC
two minor book comments
A couple things I noticed while perusing the book today..
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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: two minor book comments
Posted by Ben Collins-Sussman <su...@collab.net>.
"Daniel L. Rall" <dl...@finemaltcoding.com> writes:
> 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>
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."
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org