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

[svnbook at googlecode.com]

Revision: 4131
Author:   ptburba at gmail.com
Date:     Tue Nov  1 08:21:55 2011
Log:      * en/book/ch04-branching-and-merging.xml
   (svn.branchmerge.basicmerging.mergeinfo): Add a tip explaining
    that "mergeinfo" is just shorthand for the svn:mergeinfo
    property.  We use this shorthand a bit in the book, but more
    importantly it is used extensively everywhere else.  Also
    add "mergeinfo" to the index.

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

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

=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml	Tue Nov  1 07:27:08 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml	Tue Nov  1 08:21:55 2011
@@ -925,6 +925,18 @@
          Subversion properties, see <xref linkend="svn.advanced.props"
          />.)</para>

+      <tip>
+        <para>
+          <indexterm>
+            <primary>mergeinfo</primary>
+          </indexterm>
+          In this book and elsewhere (Subversion mailing lists, articles
+          on merge tracking, etc.) you will frequently come across the
+          term <quote>mergeinfo</quote>. This is simply shorthand for the
+          <literal>svn:mergeinfo</literal> property.
+        </para>
+      </tip>
+
        <para>You can examine the property, just like any other:</para>

        <informalexample>