1.1 --- a/en/ch02-tour-merge.xml	Mon May 04 23:52:38 2009 -0700
     1.2 +++ b/en/ch02-tour-merge.xml	Mon May 04 23:53:21 2009 -0700
     1.3 @@ -428,21 +428,21 @@
     1.4    <sect1>
     1.5      <title>Renaming, copying, and merging</title>
     1.6  
     1.7 -    <para>During the life of a project, we will often want to change
     1.8 +    <para id="x_729">During the life of a project, we will often want to change
     1.9        the layout of its files and directories. This can be as simple
    1.10        as renaming a single file, or as complex as restructuring the
    1.11        entire hierarchy of files within the project.</para>
    1.12  
    1.13 -    <para>Mercurial supports these kinds of complex changes fluently,
    1.14 +    <para id="x_72a">Mercurial supports these kinds of complex changes fluently,
    1.15        provided we tell it what we're doing.  If we want to rename a
    1.16        file, we should use the <command>hg rename</command><footnote>
    1.17 -	<para>If you're a Unix user, you'll be glad to know that the
    1.18 +	<para id="x_72b">If you're a Unix user, you'll be glad to know that the
    1.19  	  <command>hg rename</command> command can be abbreviated as
    1.20  	  <command>hg mv</command>.</para>
    1.21        </footnote> command to rename it, so that Mercurial can do the
    1.22        right thing later when we merge.</para>
    1.23  
    1.24 -    <para>We will cover the use of these commands in more detail in
    1.25 +    <para id="x_72c">We will cover the use of these commands in more detail in
    1.26        <xref linkend="chap:daily.copy"/>.</para>
    1.27    </sect1>
    1.28  </chapter>