[svnbook commit] r2680 - trunk/src/en/book
cmpilato
noreply at red-bean.com
Sun Feb 11 21:01:51 CST 2007
Author: cmpilato
Date: Sun Feb 11 21:01:51 2007
New Revision: 2680
Modified:
trunk/src/en/book/app-webdav.xml
trunk/src/en/book/ch-basic-usage.xml
trunk/src/en/book/ch-branching-and-merging.xml
trunk/src/en/book/ch-customizing-svn.xml
trunk/src/en/book/ch-fundamental-concepts.xml
trunk/src/en/book/ch-server-configuration.xml
Log:
* src/en/book/app-webdav.xml
* src/en/book/ch-fundamental-concepts.xml
* src/en/book/ch-server-configuration.xml
* src/en/book/ch-customizing-svn.xml
* src/en/book/ch-branching-and-merging.xml
* src/en/book/ch-basic-usage.xml
Add some sect3 visual divider line cues, and fix some indentation issues
I noticed along the way.
Modified: trunk/src/en/book/app-webdav.xml
==============================================================================
--- trunk/src/en/book/app-webdav.xml (original)
+++ trunk/src/en/book/app-webdav.xml Sun Feb 11 21:01:51 2007
@@ -533,6 +533,7 @@
server. We'll cover some of the most popular programs with
this kind of WebDAV support.</para>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.webdav.clients.standalone.windows">
<title>Microsoft Office, Dreamweaver, Photoshop</title>
@@ -559,6 +560,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.webdav.clients.standalone.free">
<title>Cadaver, DAV Explorer</title>
@@ -628,6 +630,7 @@
applications. All DAV interaction must happen through the
explorer interface.</para>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.webdav.clients.file-explorer-extensions.windows">
<title>Microsoft Web Folders</title>
@@ -711,6 +714,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.webdav.clients.file-explorer-extensions.linux-de">
<title>Nautilus, Konqueror</title>
@@ -754,6 +758,7 @@
Applications aren't even aware that WebDAV requests are
happening.</para>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.webdav.clients.fs-impl.windows">
<title>WebDrive, NetDrive</title>
@@ -772,6 +777,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.webdav.clients.fs-impl.macosx">
<title>Mac OS X</title>
@@ -807,6 +813,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.webdav.clients.fs-impl.linux">
<title>Linux davfs2</title>
Modified: trunk/src/en/book/ch-basic-usage.xml
==============================================================================
--- trunk/src/en/book/ch-basic-usage.xml (original)
+++ trunk/src/en/book/ch-basic-usage.xml Sun Feb 11 21:01:51 2007
@@ -779,6 +779,7 @@
working files have changed, or even allow you to undo your
changes without contacting the repository.</para>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.tour.cycle.examine.status">
<title>See an overview of your changes</title>
@@ -1094,6 +1095,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.tour.cycle.examine.diff">
<title>Examine the details of your local modifications</title>
@@ -1425,6 +1427,7 @@
Resolved conflicted state of 'sandwich.txt'
</screen>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.tour.cycle.resolve.byhand">
<title>Merging Conflicts by Hand</title>
@@ -1534,6 +1537,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.tour.cycle.resolve.copyover">
<title>Copying a File Onto Your Working File</title>
@@ -1554,6 +1558,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.tour.cycle.resolve.revert">
<title>Punting: Using <command>svn revert</command></title>
@@ -1872,6 +1877,7 @@
</itemizedlist>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.tour.history.diff.local">
<title>Examining Local Changes</title>
@@ -1898,6 +1904,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.tour.history.diff.wcrepos">
<title>Comparing Working Copy to Repository</title>
@@ -1924,6 +1931,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.tour.history.diff.reposrepos">
<title>Comparing Repository to Repository</title>
@@ -1975,6 +1983,7 @@
working copy. In fact, you don't even need a working copy to
use either one.</para>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.tour.history.browsing.cat">
<title><command>svn cat</command></title>
@@ -2017,8 +2026,9 @@
version of a file in its entirety than to look only at the
differences between it and another revision.</para>
- </sect3>
+ </sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.tour.history.browsing.list">
<title><command>svn list</command></title>
Modified: trunk/src/en/book/ch-branching-and-merging.xml
==============================================================================
--- trunk/src/en/book/ch-branching-and-merging.xml (original)
+++ trunk/src/en/book/ch-branching-and-merging.xml Sun Feb 11 21:01:51 2007
@@ -773,6 +773,7 @@
<sect2 id="svn.branchmerge.copychanges.bestprac">
<title>Best Practices for Merging</title>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.branchmerge.copychanges.bestprac.track">
<title>Tracking Merges Manually</title>
@@ -819,6 +820,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.branchmerge.copychanges.bestprac.preview">
<title>Previewing Merges</title>
@@ -860,6 +862,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.branchmerge.copychanges.bestprac.merge">
<title>Merge Conflicts</title>
@@ -949,6 +952,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.branchmerge.copychanges.bestprac.ancestry">
<title>Noticing or Ignoring Ancestry</title>
@@ -1014,6 +1018,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.branchmerge.copychanges.bestprac.moves">
<title>Merges and Moves</title>
@@ -1515,6 +1520,7 @@
Still, it may help to see them described in Subversion
terms.</para>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.branchmerge.commonuses.patterns.release">
<title>Release Branches</title>
@@ -1600,6 +1606,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.branchmerge.commonuses.patterns.feature">
<title>Feature Branches</title>
Modified: trunk/src/en/book/ch-customizing-svn.xml
==============================================================================
--- trunk/src/en/book/ch-customizing-svn.xml (original)
+++ trunk/src/en/book/ch-customizing-svn.xml Sun Feb 11 21:01:51 2007
@@ -237,6 +237,7 @@
run-time configuration options that are currently supported
by Subversion.</para>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.advanced.confarea.opts.servers">
<title>Servers</title>
@@ -396,6 +397,8 @@
</variablelist>
</sect3>
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.advanced.confarea.opts.config">
<title>Config</title>
Modified: trunk/src/en/book/ch-fundamental-concepts.xml
==============================================================================
--- trunk/src/en/book/ch-fundamental-concepts.xml (original)
+++ trunk/src/en/book/ch-fundamental-concepts.xml Sun Feb 11 21:01:51 2007
@@ -799,6 +799,7 @@
here's a primer on both why the feature exists and how to make
use of it.</para>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.basic.in-action.mixedrevs.update-commit">
<title>Updates and Commits are Separate</title>
@@ -843,84 +844,81 @@
can the latest changes be downloaded, and the whole working
copy be marked as revision 15.</para>
- </sect3>
+ </sect3>
- <sect3 id="svn.basic.in-action.mixedrevs.normal">
- <title>Mixed revisions are normal</title>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <sect3 id="svn.basic.in-action.mixedrevs.normal">
+ <title>Mixed revisions are normal</title>
- <para>The fact is, <emphasis>every time</emphasis> you
- run <command>svn commit</command>, your working copy ends
- up with some mixture of revisions. The things you just
- committed are marked as having larger working revisions
- than everything else. After several commits (with no
- updates in-between) your working copy will contain a whole
- mixture of revisions. Even if you're the only person
- using the repository, you will still see this phenomenon.
- To examine your mixture of working revisions, use
- the <command>svn status --verbose</command> command (see
- <xref linkend="svn.tour.cycle.examine.status"/> for more
- information.)</para>
-
- <para>Often, new users are completely unaware that their
- working copy contains mixed revisions. This can be
- confusing, because many client commands are sensitive to
- the working revision of the item they're examining. For
- example, the <command>svn log</command> command is used to
- display the history of changes to a file or directory (see
- <xref linkend="svn.tour.history.log"/>). When the user
- invokes this command on a working copy object, they expect
- to see the entire history of the object. But if the
- object's working revision is quite old (often
- because <command>svn update</command> hasn't been run in a
- long time), then the history of
- the <emphasis>older</emphasis> version of the object is
- shown.</para>
- </sect3>
-
- <sect3 id="svn.basic.in-action.mixedrevs.useful">
- <title>Mixed revisions are useful</title>
-
- <para>If your project is sufficiently complex, you'll
- discover that it's sometimes nice to forcibly
- <quote>backdate</quote> portions of your working copy to
- an earlier revision; you'll learn how to do that in <xref
- linkend="svn.tour"/>. Perhaps you'd like to test an
- earlier version of a sub-module contained in a
- subdirectory, or perhaps you'd like to figure out when a
- bug first came into existence in a specific file. This is
- the <quote>time machine</quote> aspect of a version
- control system — the feature which allows you to
- move any portion of your working copy forward and backward
- in history.</para>
-
- </sect3>
-
- <sect3 id="svn.basic.in-action.mixedrevs.limits">
- <title>Mixed revisions have limitations</title>
-
- <para>However you make use of mixed revisions in your
- working copy, there are limitations to this
- flexibility.</para>
-
- <para>First, you cannot commit the deletion of a file or
- directory which isn't fully up-to-date. If a newer
- version of the item exists in the repository, your attempt
- to delete will be rejected, to prevent you from
- accidentally destroying changes you've not yet
- seen.</para>
-
- <para>Second, you cannot commit a metadata change to a
- directory unless it's fully up-to-date. You'll learn
- about attaching
- <quote>properties</quote> to items in <xref
- linkend="svn.advanced"/>. A directory's working
- revision defines a specific set of entries and properties,
- and thus committing a property change to an out-of-date
- directory may destroy properties you've not yet
- seen.</para>
+ <para>The fact is, <emphasis>every time</emphasis> you run
+ <command>svn commit</command>, your working copy ends up
+ with some mixture of revisions. The things you just
+ committed are marked as having larger working revisions than
+ everything else. After several commits (with no updates
+ in-between) your working copy will contain a whole mixture
+ of revisions. Even if you're the only person using the
+ repository, you will still see this phenomenon. To examine
+ your mixture of working revisions, use the <command>svn
+ status --verbose</command> command (see <xref
+ linkend="svn.tour.cycle.examine.status"/> for more
+ information.)</para>
+
+ <para>Often, new users are completely unaware that their
+ working copy contains mixed revisions. This can be
+ confusing, because many client commands are sensitive to the
+ working revision of the item they're examining. For
+ example, the <command>svn log</command> command is used to
+ display the history of changes to a file or directory (see
+ <xref linkend="svn.tour.history.log"/>). When the user
+ invokes this command on a working copy object, they expect
+ to see the entire history of the object. But if the
+ object's working revision is quite old (often because
+ <command>svn update</command> hasn't been run in a long
+ time), then the history of the <emphasis>older</emphasis>
+ version of the object is shown.</para>
+
+ </sect3>
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <sect3 id="svn.basic.in-action.mixedrevs.useful">
+ <title>Mixed revisions are useful</title>
+
+ <para>If your project is sufficiently complex, you'll discover
+ that it's sometimes nice to forcibly <quote>backdate</quote>
+ portions of your working copy to an earlier revision; you'll
+ learn how to do that in <xref linkend="svn.tour"/>. Perhaps
+ you'd like to test an earlier version of a sub-module
+ contained in a subdirectory, or perhaps you'd like to figure
+ out when a bug first came into existence in a specific file.
+ This is the <quote>time machine</quote> aspect of a version
+ control system — the feature which allows you to move
+ any portion of your working copy forward and backward in
+ history.</para>
+
+ </sect3>
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <sect3 id="svn.basic.in-action.mixedrevs.limits">
+ <title>Mixed revisions have limitations</title>
- </sect3>
+ <para>However you make use of mixed revisions in your working
+ copy, there are limitations to this flexibility.</para>
+
+ <para>First, you cannot commit the deletion of a file or
+ directory which isn't fully up-to-date. If a newer version
+ of the item exists in the repository, your attempt to delete
+ will be rejected, to prevent you from accidentally
+ destroying changes you've not yet seen.</para>
+
+ <para>Second, you cannot commit a metadata change to a
+ directory unless it's fully up-to-date. You'll learn about
+ attaching <quote>properties</quote> to items in <xref
+ linkend="svn.advanced"/>. A directory's working revision
+ defines a specific set of entries and properties, and thus
+ committing a property change to an out-of-date directory may
+ destroy properties you've not yet seen.</para>
+ </sect3>
</sect2>
Modified: trunk/src/en/book/ch-server-configuration.xml
==============================================================================
--- trunk/src/en/book/ch-server-configuration.xml (original)
+++ trunk/src/en/book/ch-server-configuration.xml Sun Feb 11 21:01:51 2007
@@ -448,6 +448,8 @@
<listitem><para>Run <command>svnserve</command> as a Windows
service.</para></listitem>
</itemizedlist>
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.serverconfig.svnserve.invoking.daemon">
<title><command>svnserve</command> as Daemon</title>
@@ -495,7 +497,7 @@
</sect3>
-
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.serverconfig.svnserve.invoking.inetd">
<title><command>svnserve</command> via <command>inetd</command></title>
@@ -542,32 +544,33 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.serverconfig.svnserve.invoking.tunnel">
<title><command>svnserve</command> over a Tunnel</title>
- <para>A third way to invoke
- <command>svnserve</command> is in <quote>tunnel mode</quote>,
- with the <option>-t</option> option. This mode assumes that a
- remote-service program such as
- <command>RSH</command> or <command>SSH</command> has
- successfully authenticated a user and is now invoking a
- private <command>svnserve</command> process <emphasis>as that
- user</emphasis>. The <command>svnserve</command> program
- behaves normally (communicating via <emphasis>stdin</emphasis>
- and <emphasis>stdout</emphasis>), and assumes that the traffic
- is being automatically redirected over some sort of tunnel
- back to the client. When <command>svnserve</command> is
- invoked by a tunnel agent like this, be sure that the
- authenticated user has full read and write access to the
- repository database files. It's essentially the same as
- a local user accessing the repository via
- <literal>file:///</literal> URLs.</para>
+ <para>A third way to invoke <command>svnserve</command> is in
+ <quote>tunnel mode</quote>, with the <option>-t</option>
+ option. This mode assumes that a remote-service program
+ such as <command>RSH</command> or <command>SSH</command> has
+ successfully authenticated a user and is now invoking a
+ private <command>svnserve</command> process <emphasis>as
+ that user</emphasis>. The <command>svnserve</command>
+ program behaves normally (communicating via
+ <emphasis>stdin</emphasis> and <emphasis>stdout</emphasis>),
+ and assumes that the traffic is being automatically
+ redirected over some sort of tunnel back to the client.
+ When <command>svnserve</command> is invoked by a tunnel
+ agent like this, be sure that the authenticated user has
+ full read and write access to the repository database files.
+ It's essentially the same as a local user accessing the
+ repository via <literal>file:///</literal> URLs.</para>
- <para>This option is described in much more detail in
- <xref linkend="svn.serverconfig.svnserve.sshauth"/>.</para>
+ <para>This option is described in much more detail in
+ <xref linkend="svn.serverconfig.svnserve.sshauth"/>.</para>
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.serverconfig.svnserve.invoking.winservice">
<title><command>svnserve</command> as Windows Service</title>
@@ -707,6 +710,7 @@
value</literal>). Let's walk through this file and learn how
to use them.</para>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.serverconfig.svnserve.auth.users">
<title>Create a 'users' file and realm</title>
@@ -755,6 +759,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.serverconfig.svnserve.auth.general">
<title>Set access controls</title>
@@ -986,6 +991,7 @@
by <command>sshd</command>, as well as how to have multiple
users share a single system account.</para>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.serverconfig.svnserve.sshtricks.setup">
<title>Initial setup</title>
@@ -1031,6 +1037,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.serverconfig.svnserve.sshtricks.fixedcmd">
<title>Controlling the invoked command</title>
@@ -1417,6 +1424,7 @@
</listitem>
</itemizedlist>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.serverconfig.httpd.authn.basic">
<title>Basic HTTP Authentication</title>
@@ -1523,6 +1531,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.serverconfig.httpd.authn.sslcerts">
<title>SSL Certificate Management</title>
@@ -1684,6 +1693,7 @@
section describes two strategies for controlling access to
your repositories.</para>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.serverconfig.httpd.authz.blanket">
<title>Blanket Access Control</title>
@@ -1770,6 +1780,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.serverconfig.httpd.authz.perdir">
<title>Per-Directory Access Control</title>
@@ -1900,6 +1911,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.serverconfig.httpd.authz.pathauthzoff">
<title>Disabling Path-based Checks</title>
@@ -1976,6 +1988,7 @@
options for Apache and mod_dav_svn. But there are a few other
nice features that Apache provides.</para>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.serverconfig.httpd.extra.browsing">
<title>Repository Browsing</title>
@@ -2149,6 +2162,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.serverconfig.httpd.extra.logging">
<title>Apache Logging</title>
@@ -2246,6 +2260,7 @@
</sect3>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.serverconfig.httpd.extra.other">
<title>Other Features</title>
More information about the svnbook-dev
mailing list