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

[svnbook at googlecode.com]

Revision: 4142
Author:   ptburba at gmail.com
Date:     Thu Nov  3 10:47:23 2011
Log:      * en/book/ch04-branching-and-merging.xml
   (svn.branchmerge.basicmerging.mergeinfo.inheritance): Add an index
    entry for 'subtree mergeinfo' referencing the sidebar on that very
    topic.


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

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

=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml	Thu Nov  3 10:35:48 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml	Thu Nov  3 10:47:23 2011
@@ -1131,6 +1131,10 @@
        <sidebar id="svn.branchmerge.basicmerging.mergeinfo.inheritance">
          <title>Mergeinfo Inheritance</title>

+        <indexterm  
zone="svn.branchmerge.basicmerging.mergeinfo.inheritance">
+          <primary>mergeinfo inheritance</primary>
+        </indexterm>
+
          <para>
            When a path has the <literal>svn:mergeinfo</literal>
            property set on it we say it has <quote>explicit</quote>