[svnbook] r5077 committed - trunk/en/book/ch02-basic-usage.xml

cmpilato at users.sourceforge.net cmpilato at users.sourceforge.net
Tue Feb 2 11:49:38 CST 2016


Revision: 5077
          http://sourceforge.net/p/svnbook/source/5077
Author:   cmpilato
Date:     2016-02-02 17:49:38 +0000 (Tue, 02 Feb 2016)
Log Message:
-----------
Fix issue #261 - Wrong primary index terms in Basic Work Cycle

* en/book/ch02-basic-usage.xml
  Fix the index terms in the conflict resolution subsections.  (They
  were suffering from a bad case of copyandpastitis.)

Modified Paths:
--------------
    trunk/en/book/ch02-basic-usage.xml

Modified: trunk/en/book/ch02-basic-usage.xml
===================================================================
--- trunk/en/book/ch02-basic-usage.xml	2016-02-01 21:59:09 UTC (rev 5076)
+++ trunk/en/book/ch02-basic-usage.xml	2016-02-02 17:49:38 UTC (rev 5077)
@@ -1546,8 +1546,9 @@
         <title>Resolving conflict differences interactively</title>
 
         <indexterm>
-          <primary>hook scripts</primary>
-          <secondary>interactive</secondary>
+          <primary>conflicts</primary>
+          <secondary>resolution</secondary>
+          <tertiary>interactive</tertiary>
         </indexterm>
 
         <para>There are several different ways to resolve conflicts
@@ -1606,8 +1607,9 @@
         <title>Postponing conflict resolution</title>
 
         <indexterm>
-          <primary>hook scripts</primary>
-          <secondary>postponing</secondary>
+          <primary>conflicts</primary>
+          <secondary>resolution</secondary>
+          <tertiary>postponing</tertiary>
         </indexterm>
 
         <para>This may sound like an appropriate section for avoiding
@@ -1814,8 +1816,9 @@
         <title>Manual conflict resolution</title>
 
         <indexterm>
-          <primary>hook scripts</primary>
-          <secondary>manual</secondary>
+          <primary>conflicts</primary>
+          <secondary>resolution</secondary>
+          <tertiary>manual</tertiary>
         </indexterm>
 
         <para>Manually resolving conflicts can be quite intimidating the





More information about the svnbook-dev mailing list