[svnbook commit] r2348 - trunk/src/en/book
sunny256
noreply at red-bean.com
Mon Jul 24 12:40:40 CDT 2006
Author: sunny256
Date: Mon Jul 24 12:40:39 2006
New Revision: 2348
Modified:
trunk/src/en/book/ch02.xml
trunk/src/en/book/ch04.xml
trunk/src/en/book/ch06.xml
Log:
Use <xref linkend> instead of "chapter *" and "table *".
* src/en/book/ch02.xml
(svn.basic.in-action.mixedrevs): Here...
* src/en/book/ch04.xml
(svn.branchmerge.using, svn.branchmerge.tags.mkcomplex): ...here...
* src/en/book/ch06.xml
(svn.serverconfig.overview): ...and here.
Modified: trunk/src/en/book/ch02.xml
==============================================================================
--- trunk/src/en/book/ch02.xml (original)
+++ trunk/src/en/book/ch02.xml Mon Jul 24 12:40:39 2006
@@ -782,14 +782,15 @@
<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
- Chapter 3. 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>
+ 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>
@@ -810,11 +811,12 @@
<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 Chapter 6. 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>
+ <quote>properties</quote> to items in <xref
+ linkend="svn.serverconfig"/>. 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>
Modified: trunk/src/en/book/ch04.xml
==============================================================================
--- trunk/src/en/book/ch04.xml (original)
+++ trunk/src/en/book/ch04.xml Mon Jul 24 12:40:39 2006
@@ -77,11 +77,12 @@
<xref linkend="svn.basic.in-action.revs"/>.</para>
<para>For this chapter, we'll go back to the same example from
- Chapter 2. Remember that you and your collaborator, Sally, are
- sharing a repository that contains two projects,
- <filename>paint</filename> and <filename>calc</filename>.
- Notice that in <xref linkend="svn.branchmerge.using.dia-1"/>, however, each
- project directory now contains subdirectories named
+ <xref linkend="svn.basic"/>. Remember that you and your
+ collaborator, Sally, are sharing a repository that contains two
+ projects, <filename>paint</filename> and
+ <filename>calc</filename>. Notice that in <xref
+ linkend="svn.branchmerge.using.dia-1"/>, however, each project
+ directory now contains subdirectories named
<filename>trunk</filename> and <filename>branches</filename>.
The reason for this will soon become clear.</para>
@@ -507,10 +508,11 @@
<para>It's time to use the <command>svn merge</command> command.
This command, it turns out, is a very close cousin to the
<command>svn diff</command> command (which you read about in
- Chapter 3). Both commands are able to compare any two objects
- in the repository and describe the differences. For example,
- you can ask <command>svn diff</command> to show you the exact
- change made by Sally in revision 344:</para>
+ <xref linkend="svn.tour"/>). Both commands are able to
+ compare any two objects in the repository and describe the
+ differences. For example, you can ask <command>svn
+ diff</command> to show you the exact change made by Sally in
+ revision 344:</para>
<screen>
$ svn diff -r 343:344 http://svn.example.com/repos/calc/trunk
@@ -581,9 +583,10 @@
<para>In another scenario, it's possible that things may not have
gone so well, and that <filename>integer.c</filename> may have
entered a conflicted state. You might need to resolve the
- conflict using standard procedures (see Chapter 3), or if you
- decide that the merge was a bad idea altogether, simply give up
- and <command>svn revert</command> the local change.</para>
+ conflict using standard procedures (see <xref
+ linkend="svn.tour"/>), or if you decide that the merge was a
+ bad idea altogether, simply give up and <command>svn
+ revert</command> the local change.</para>
<para>But assuming that you've reviewed the merged change, you can
<command>svn commit</command> the change as usual. At that
@@ -652,12 +655,12 @@
<para>A word of warning: while <command>svn diff</command> and
<command>svn merge</command> are very similar in concept, they
do have different syntax in many cases. Be sure to read about
- them in Chapter 9 for details, or ask <command>svn
- help</command>. For example, <command>svn merge</command>
- requires a working-copy path as a target, i.e. a place where
- it should apply the tree-changes. If the target isn't
- specified, it assumes you are trying to perform one of the
- following common operations:</para>
+ them in <xref linkend="svn.ref"/> for details, or ask
+ <command>svn help</command>. For example, <command>svn
+ merge</command> requires a working-copy path as a target, i.e.
+ a place where it should apply the tree-changes. If the target
+ isn't specified, it assumes you are trying to perform one of
+ the following common operations:</para>
<orderedlist>
<listitem>
@@ -1893,9 +1896,9 @@
work here. In this case, you want to make a snapshot of your
exact working copy arrangement and store it in the repository.
Luckily, <command>svn copy</command> actually has four
- different uses (which you can read about in Chapter 9),
- including the ability to copy a working-copy tree to the
- repository:</para>
+ different uses (which you can read about in <xref
+ linkend="svn.ref"/>), including the ability to copy a
+ working-copy tree to the repository:</para>
<screen>
$ ls
Modified: trunk/src/en/book/ch06.xml
==============================================================================
--- trunk/src/en/book/ch06.xml (original)
+++ trunk/src/en/book/ch06.xml Mon Jul 24 12:40:39 2006
@@ -38,11 +38,12 @@
<para>Apache is an extremely popular webserver; using the
<command>mod_dav_svn</command> module, Apache can access a
- repository and make it available to clients via the WebDAV/DeltaV
- protocol, which is an extension of HTTP. In the other corner is
- <command>svnserve</command>: a small, standalone server
- program that speaks a custom protocol with clients. Table 6-1
- presents a comparison of the two servers.</para>
+ repository and make it available to clients via the
+ WebDAV/DeltaV protocol, which is an extension of HTTP. In the
+ other corner is <command>svnserve</command>: a small, standalone
+ server program that speaks a custom protocol with clients.
+ <xref linkend="svn.serverconfig.overview.tbl-1"/> presents a
+ comparison of the two servers.</para>
<para>Note that Subversion, as an open-source project, does not
officially endorse any server as <quote>primary</quote> or
More information about the svnbook-dev
mailing list