[svnbook commit] r2587 - branches/ora-2e-reorg/src/en/book
cmpilato
noreply at red-bean.com
Tue Jan 2 10:59:15 CST 2007
Author: cmpilato
Date: Tue Jan 2 10:59:14 2007
New Revision: 2587
Modified:
branches/ora-2e-reorg/src/en/book/app-webdav.xml
branches/ora-2e-reorg/src/en/book/ch-basic-usage.xml
branches/ora-2e-reorg/src/en/book/ch-customizing-svn.xml
branches/ora-2e-reorg/src/en/book/ch-developer-info.xml
branches/ora-2e-reorg/src/en/book/ch-reference.xml
branches/ora-2e-reorg/src/en/book/ch-server-configuration.xml
Log:
* src/en/book/app-webdav.xml
* src/en/book/ch-reference.xml
* src/en/book/ch-server-configuration.xml
* src/en/book/ch-developer-info.xml
* src/en/book/ch-customizing-svn.xml
* src/en/book/ch-basic-usage.xml
Minor grammar fixes, wording tweaks, and additions. Patch mostly by
Malte Helmert <helmert at informatik.uni-freiburg.de>.
Modified: branches/ora-2e-reorg/src/en/book/app-webdav.xml
==============================================================================
--- branches/ora-2e-reorg/src/en/book/app-webdav.xml (original)
+++ branches/ora-2e-reorg/src/en/book/app-webdav.xml Tue Jan 2 10:59:14 2007
@@ -414,7 +414,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>
@@ -597,7 +597,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>
@@ -696,7 +696,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>
@@ -716,7 +716,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>
@@ -758,7 +758,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
@@ -779,14 +779,19 @@
filesystem-level WebDAV client. From the Finder, select the
<guimenuitem>Connect to Server</guimenuitem> item from the
<guimenu>Go menu</guimenu>. Enter a WebDAV URL, and it
- 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>
+ appears as a disk on the desktop, just like any other
+ mounted volume. You can also mount a WebDAV share from the
+ Darwin terminal by using the <literal>webdav</literal>
+ filesystem type with the <command>mount</command> command:</para>
+
+ <screen>
+$ mount -t webdav http://svn.example.com/repos/project /some/mountpoint
+$
+</screen>
<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>
Modified: branches/ora-2e-reorg/src/en/book/ch-basic-usage.xml
==============================================================================
--- branches/ora-2e-reorg/src/en/book/ch-basic-usage.xml (original)
+++ branches/ora-2e-reorg/src/en/book/ch-basic-usage.xml Tue Jan 2 10:59:14 2007
@@ -1079,7 +1079,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 that 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
@@ -2097,9 +2101,9 @@
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
- between it and another revision.</para>
+ <para>Secondly, it's sometimes just easier to look at an older
+ version of a file in its entirety than to look only at the
+ differences between it and another revision.</para>
</sect2>
Modified: branches/ora-2e-reorg/src/en/book/ch-customizing-svn.xml
==============================================================================
--- branches/ora-2e-reorg/src/en/book/ch-customizing-svn.xml (original)
+++ branches/ora-2e-reorg/src/en/book/ch-customizing-svn.xml Tue Jan 2 10:59:14 2007
@@ -777,12 +777,12 @@
repository. In order to do this, it must convert the data
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
- 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
- to <literal>it_IT</literal>, the Subversion client knows to
+ <para>For example, suppose you create a file 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 to
+ <literal>it_IT</literal>, the Subversion client knows to
interpret them as Italian. It uses an Italian character set
to convert the data to UTF-8 before sending them off to the
repository.</para>
Modified: branches/ora-2e-reorg/src/en/book/ch-developer-info.xml
==============================================================================
--- branches/ora-2e-reorg/src/en/book/ch-developer-info.xml (original)
+++ branches/ora-2e-reorg/src/en/book/ch-developer-info.xml Tue Jan 2 10:59:14 2007
@@ -347,10 +347,10 @@
<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
- checks for a non-successful error return from the function it
- wraps, and returns that error if it exists.</para>
+ 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>
<example id="svn.developer.layerlib.repos.ex-1">
<title>Using the Repository Layer</title>
Modified: branches/ora-2e-reorg/src/en/book/ch-reference.xml
==============================================================================
--- branches/ora-2e-reorg/src/en/book/ch-reference.xml (original)
+++ branches/ora-2e-reorg/src/en/book/ch-reference.xml Tue Jan 2 10:59:14 2007
@@ -4355,8 +4355,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
Modified: branches/ora-2e-reorg/src/en/book/ch-server-configuration.xml
==============================================================================
--- branches/ora-2e-reorg/src/en/book/ch-server-configuration.xml (original)
+++ branches/ora-2e-reorg/src/en/book/ch-server-configuration.xml Tue Jan 2 10:59:14 2007
@@ -595,13 +595,14 @@
<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
- 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
- the result is identical. <emphasis>At no point does the
- actual password travel over the network.</emphasis></para>
+ 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 the result is identical. <emphasis>At
+ no point does the actual password travel over the
+ network.</emphasis></para>
<para>It's also possible, of course, for the client to be
externally authenticated via a tunnel agent, such as
@@ -1214,9 +1215,10 @@
<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>,
- do not export a Subversion repository in <literal><Location
- /www/repos></literal>. If a request comes in for the URI
+ <literal>DocumentRoot</literal> is exported to
+ <filename>/www</filename>, do not export a Subversion
+ repository in <literal><Location /www/repos></literal>.
+ If a request comes in for the URI
<filename>/www/repos/foo.c</filename>, Apache won't know
whether to look for a file <filename>repos/foo.c</filename> in
the <literal>DocumentRoot</literal>, or whether to delegate
@@ -1968,7 +1970,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
More information about the svnbook-dev
mailing list