1.1 --- a/en/ch07-branch.xml	Thu Apr 09 22:52:16 2009 -0700
     1.2 +++ b/en/ch07-branch.xml	Sun May 03 20:27:28 2009 -0700
     1.3 @@ -128,7 +128,7 @@
     1.4  
     1.5      <para id="x_37c">Mercurial stores tags in a normal revision-controlled file
     1.6        in your repository.  If you've created any tags, you'll find
     1.7 -      them in a file named <filename
     1.8 +      them in a file in the root of your repository named <filename
     1.9  	role="special">.hgtags</filename>.  When you run the <command
    1.10  	role="hg-cmd">hg tag</command> command, Mercurial modifies
    1.11        this file, then automatically commits the change to it.  This
    1.12 @@ -170,8 +170,8 @@
    1.13  	location of the error, which you can then fix and commit.  You
    1.14  	should then run <command role="hg-cmd">hg tags</command>
    1.15  	again, just to be sure that your fix is correct.</para>
    1.16 -
    1.17      </sect2>
    1.18 +
    1.19      <sect2>
    1.20        <title>Tags and cloning</title>
    1.21  
    1.22 @@ -195,8 +195,8 @@
    1.23  	project's history in the new repository, but
    1.24  	<emphasis>not</emphasis> the tag you might have
    1.25  	expected.</para>
    1.26 -
    1.27      </sect2>
    1.28 +
    1.29      <sect2>
    1.30        <title>When permanent tags are too much</title>
    1.31  
    1.32 @@ -221,9 +221,9 @@
    1.33  	controlled.  Any tags you create using <option
    1.34  	  role="hg-opt-tag">-l</option> remain strictly local to the
    1.35  	repository you're currently working in.</para>
    1.36 -
    1.37      </sect2>
    1.38    </sect1>
    1.39 +
    1.40    <sect1>
    1.41      <title>The flow of changes&emdash;big picture vs. little</title>
    1.42  
    1.43 @@ -252,8 +252,8 @@
    1.44  	  merging changes.  They expose the narrative of how the code
    1.45  	  was developed.</para>
    1.46        </listitem></itemizedlist>
    1.47 -
    1.48 -  </sect1>
    1.49 +  </sect1>
    1.50 +
    1.51    <sect1>
    1.52      <title>Managing big-picture branches in repositories</title>
    1.53  
    1.54 @@ -285,8 +285,8 @@
    1.55        the <literal>myproject</literal> repository.</para>
    1.56  
    1.57      &interaction.branch-repo.new;
    1.58 -
    1.59 -  </sect1>
    1.60 +  </sect1>
    1.61 +
    1.62    <sect1>
    1.63      <title>Don't repeat yourself: merging across branches</title>
    1.64  
    1.65 @@ -308,8 +308,8 @@
    1.66        push back to the main branch.</para>
    1.67  
    1.68      &interaction.branch-repo.merge;
    1.69 -
    1.70 -  </sect1>
    1.71 +  </sect1>
    1.72 +
    1.73    <sect1>
    1.74      <title>Naming branches within one repository</title>
    1.75  
    1.76 @@ -408,8 +408,8 @@
    1.77      <para id="x_39d">In practice, this is something you won't do very often, as
    1.78        branch names tend to have fairly long lifetimes.  (This isn't a
    1.79        rule, just an observation.)</para>
    1.80 -
    1.81 -  </sect1>
    1.82 +  </sect1>
    1.83 +
    1.84    <sect1>
    1.85      <title>Dealing with multiple named branches in a
    1.86        repository</title>
    1.87 @@ -454,8 +454,8 @@
    1.88        introduces a new head.</para>
    1.89  
    1.90      &interaction.branch-named.foo-commit;
    1.91 -
    1.92 -  </sect1>
    1.93 +  </sect1>
    1.94 +
    1.95    <sect1>
    1.96      <title>Branch names and merging</title>
    1.97  
    1.98 @@ -496,8 +496,8 @@
    1.99        Mercurial will choose the <quote>right</quote>
   1.100        (<literal>bleeding-edge</literal>) branch name when I pull and
   1.101        merge from <literal>stable</literal>.</para>
   1.102 -
   1.103 -  </sect1>
   1.104 +  </sect1>
   1.105 +
   1.106    <sect1>
   1.107      <title>Branch naming is generally useful</title>
   1.108  
   1.109 @@ -522,7 +522,6 @@
   1.110  	/.hgrc</filename>.</para>
   1.111      <programlisting>[hooks]
   1.112  pretxnchangegroup.branch = hg heads --template '{branches} ' | grep mybranch</programlisting>
   1.113 -
   1.114    </sect1>
   1.115  </chapter>
   1.116