[svnbook] r4395 committed - * en/book/ch04-branching-and-merging.xml...

[svnbook at googlecode.com]

Revision: 4395
Author:   cmpilato at gmail.com
Date:     Tue Feb  5 08:18:19 2013
Log:      * en/book/ch04-branching-and-merging.xml
* en/book/ch09-reference.xml
   Rename some busted section id's (s/branchemerge/branchmerge/).

http://code.google.com/p/svnbook/source/detail?r=4395

Modified:
  /trunk/en/book/ch04-branching-and-merging.xml
  /trunk/en/book/ch09-reference.xml

=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml	Mon Feb  4 12:36:46 2013
+++ /trunk/en/book/ch04-branching-and-merging.xml	Tue Feb  5 08:18:19 2013
@@ -544,7 +544,7 @@
      </sect2>

      <!-- ===============================================================  
-->
-    <sect2 id="svn.branchemerge.basicmerging.stayinsync">
+    <sect2 id="svn.branchmerge.basicmerging.stayinsync">
        <title>Keeping a Branch in Sync</title>

        <para>Continuing with our running example, let's suppose that a
@@ -872,7 +872,7 @@
          test, and <command>svn commit</command> the local modifications
          to your branch.</para>

-      <sidebar id="svn.branchemerge.basicmerging.stayinsync.subtree">
+      <sidebar id="svn.branchmerge.basicmerging.stayinsync.subtree">
          <title>Subtree Merges and Subtree Mergeinfo</title>
          <para>
            <indexterm>
@@ -991,7 +991,7 @@
      </sect2>

      <!-- ===============================================================  
-->
-    <sect2 id="svn.branchemerge.basicmerging.reintegrate">
+    <sect2 id="svn.branchmerge.basicmerging.reintegrate">
        <title>Reintegrating a Branch</title>

        <para>What happens when you finally finish your work, though?
@@ -1211,7 +1211,7 @@
            <command>svn propget --recursive</command> or
            <command>svn proplist --recursive</command> when dealing with
            large amounts of subtree mergeinfo. See
-          <xref  
linkend="svn.branchemerge.basicmerging.stayinsync.subtree"/>
+          <xref linkend="svn.branchmerge.basicmerging.stayinsync.subtree"/>
            . The formatted output produced by the
            <option>--verbose</option> option with either of these
            subcommands is often very helpful in these cases.</para>
@@ -2480,7 +2480,7 @@
        <para>This merge uses the cherry-picking merge syntax, which was
          introduced in <xref linkend="svn.branchmerge.cherrypicking"/>.
          Continuing with the running example from
-        <xref linkend="svn.branchemerge.basicmerging.reintegrate"/>,
+        <xref linkend="svn.branchmerge.basicmerging.reintegrate"/>,
          where revision <emphasis>X</emphasis> was revision 391:</para>

        <informalexample>
@@ -2923,7 +2923,7 @@
            <para>Avoid subtree merges and subtree mergeinfo. Perform
              merges only on the root of your branches, not on
              subdirectories or files (see <xref
-            linkend="svn.branchemerge.basicmerging.stayinsync.subtree"/>)
+            linkend="svn.branchmerge.basicmerging.stayinsync.subtree"/>)
              .</para>
          </listitem>
          <listitem>
@@ -4384,7 +4384,7 @@
        here is handy reference table you can consult as
        you begin to make use of branches.</para>

-    <table id="svn.branchemerge.summary.tbl-1">
+    <table id="svn.branchmerge.summary.tbl-1">
        <title>Branching and merging commands</title>
        <tgroup cols="2">
          <thead>
=======================================
--- /trunk/en/book/ch09-reference.xml	Tue Jan 29 13:40:51 2013
+++ /trunk/en/book/ch09-reference.xml	Tue Feb  5 08:18:19 2013
@@ -792,7 +792,7 @@
                the <command>svn merge</command> subcommand automatically
                detects this scenario and performs the appropriate merge.
                See
-              <xref linkend="svn.branchemerge.basicmerging.reintegrate"/>
+              <xref linkend="svn.branchmerge.basicmerging.reintegrate"/>
                for details.</para>
            </listitem>
          </varlistentry>
@@ -3688,12 +3688,12 @@
                  were not previously merged from
                  (<replaceable>SOURCE</replaceable>) to
                  (<replaceable>TARGET_WCPATH</replaceable>).  See
-                <xref linkend="svn.branchemerge.basicmerging.stayinsync"/>.
+                <xref linkend="svn.branchmerge.basicmerging.stayinsync"/>.
                  <quote>Reintegrate</quote> merges merge changes from a
                  feature branch (<replaceable>SOURCE</replaceable>)
                  back into the feature branch's ancestor branch
                  (<replaceable>TARGET_WCPATH</replaceable>), see
-                <xref linkend="svn.branchemerge.basicmerging.reintegrate"/>
+                <xref linkend="svn.branchmerge.basicmerging.reintegrate"/>
                  and
                  <xref linkend="svn.branchmerge.commonpatterns.feature"/>.
                  </para>