hgbook

diff en/ch10-template.xml @ 690:2c266a253b44

Merge with myself
author Bryan O'Sullivan <bos@serpentine.com>
date Sun Apr 26 23:23:06 2009 -0700 (2009-04-26)
parents 1c13ed2130a7
children 9e33729cafae
line diff
     1.1 --- a/en/ch10-template.xml	Mon Mar 30 16:23:33 2009 +0800
     1.2 +++ b/en/ch10-template.xml	Sun Apr 26 23:23:06 2009 -0700
     1.3 @@ -56,9 +56,9 @@
     1.4  	file into a location where Mercurial can find it (typically
     1.5  	the <literal>templates</literal> subdirectory of your
     1.6  	Mercurial install directory).</para>
     1.7 -
     1.8      </sect2>
     1.9    </sect1>
    1.10 +
    1.11    <sect1>
    1.12      <title>Commands that support styles and templates</title>
    1.13  
    1.14 @@ -125,8 +125,8 @@
    1.15        braces and text with the expansion of whatever is inside.  To
    1.16        print a literal curly brace, you must escape it, as described in
    1.17        <xref linkend="sec:template:escape"/>.</para>
    1.18 -
    1.19 -  </sect1>
    1.20 +  </sect1>
    1.21 +
    1.22    <sect1 id="sec:template:keyword">
    1.23      <title>Common template keywords</title>
    1.24  
    1.25 @@ -199,8 +199,8 @@
    1.26        in <xref linkend="sec:template:filter"/>.</para>
    1.27  
    1.28      &interaction.template.simple.datekeyword;
    1.29 -
    1.30 -  </sect1>
    1.31 +  </sect1>
    1.32 +
    1.33    <sect1 id="sec:template:escape">
    1.34      <title>Escape sequences</title>
    1.35  
    1.36 @@ -241,8 +241,8 @@
    1.37        <quote><literal>{</literal></quote>, or
    1.38        <quote><literal>{</literal></quote> character, you must escape
    1.39        it.</para>
    1.40 -
    1.41 -  </sect1>
    1.42 +  </sect1>
    1.43 +
    1.44    <sect1 id="sec:template:filter">
    1.45      <title>Filtering keywords to change their results</title>
    1.46  
    1.47 @@ -410,7 +410,7 @@
    1.48  	  <quote><literal>bos</literal></quote>.</para>
    1.49        </listitem></itemizedlist>
    1.50  
    1.51 -&interaction.template.simple.manyfilters;
    1.52 +    &interaction.template.simple.manyfilters;
    1.53  
    1.54      <note>
    1.55        <para id="x_5b7">  If you try to apply a filter to a piece of data that it
    1.56 @@ -445,10 +445,9 @@
    1.57  	on.  For example, using <literal>fill68|tabindent</literal>
    1.58  	gives very different results from
    1.59  	<literal>tabindent|fill68</literal>.</para>
    1.60 -
    1.61 -
    1.62      </sect2>
    1.63    </sect1>
    1.64 +
    1.65    <sect1>
    1.66      <title>From templates to styles</title>
    1.67  
    1.68 @@ -513,9 +512,9 @@
    1.69  	    treated as the name of a file; the contents of this file
    1.70  	    will be read and used as a template body.</para>
    1.71  	</listitem></itemizedlist>
    1.72 -
    1.73      </sect2>
    1.74    </sect1>
    1.75 +
    1.76    <sect1>
    1.77      <title>Style files by example</title>
    1.78  
    1.79 @@ -566,8 +565,8 @@
    1.80  	    is almost always trivial to visually inspect the offending
    1.81  	    line in the style file and see what is wrong.</para>
    1.82  	</listitem></itemizedlist>
    1.83 -
    1.84      </sect2>
    1.85 +
    1.86      <sect2>
    1.87        <title>Uniquely identifying a repository</title>
    1.88  
    1.89 @@ -602,8 +601,8 @@
    1.90  	    or other activity, so that you can <quote>replay</quote>
    1.91  	    the build later if necessary.</para>
    1.92  	</listitem></itemizedlist>
    1.93 -
    1.94      </sect2>
    1.95 +
    1.96      <sect2>
    1.97        <title>Mimicking Subversion's output</title>
    1.98  
    1.99 @@ -661,7 +660,6 @@
   1.100  	file points to.  If the style file will look too big or
   1.101  	cluttered if you insert a literal piece of text, drop it into
   1.102  	a template instead.</para>
   1.103 -
   1.104      </sect2>
   1.105    </sect1>
   1.106  </chapter>