hgbook

diff en/ch11-template.xml @ 647:d0160b0b1a9e

Merge with http://hg.serpentine.com/mercurial/book
author Dongsheng Song <dongsheng.song@gmail.com>
date Wed Mar 18 20:32:37 2009 +0800 (2009-03-18)
parents cfdb601a3c8b 8366882f67f2
children
line diff
     1.1 --- a/en/ch11-template.xml	Thu Mar 12 15:51:39 2009 +0800
     1.2 +++ b/en/ch11-template.xml	Wed Mar 18 20:32:37 2009 +0800
     1.3 @@ -44,11 +44,12 @@
     1.4        <title>Setting a default style</title>
     1.5  
     1.6        <para>You can modify the output style that Mercurial will use
     1.7 -	for every command by editing your <filename role="special">
     1.8 -	  /.hgrc</filename>\ file, naming the style you would prefer
     1.9 -	to use.</para>
    1.10 -
    1.11 -      <programlisting>[ui] style = compact</programlisting>
    1.12 +	for every command by editing your <filename
    1.13 +	  role="special">~/.hgrc</filename> file, naming the style
    1.14 +	you would prefer to use.</para>
    1.15 +
    1.16 +      <programlisting>[ui]
    1.17 +style = compact</programlisting>
    1.18  
    1.19        <para>If you write a style of your own, you can use it by either
    1.20  	providing the path to your style file, or copying your style
    1.21 @@ -212,27 +213,27 @@
    1.22        single replacement, as described below.</para>
    1.23  
    1.24      <itemizedlist>
    1.25 -      <listitem><para><literal>\textbackslash\textbackslash</literal>:
    1.26 +      <listitem><para><literal>\</literal>:
    1.27  	  Backslash, <quote><literal>\</literal></quote>, ASCII
    1.28  	  134.</para>
    1.29        </listitem>
    1.30 -      <listitem><para><literal>\textbackslash n</literal>: Newline,
    1.31 +      <listitem><para><literal>\n</literal>: Newline,
    1.32  	  ASCII 12.</para>
    1.33        </listitem>
    1.34 -      <listitem><para><literal>\textbackslash r</literal>: Carriage
    1.35 +      <listitem><para><literal>\r</literal>: Carriage
    1.36  	  return, ASCII 15.</para>
    1.37        </listitem>
    1.38 -      <listitem><para><literal>\textbackslash t</literal>: Tab, ASCII
    1.39 +      <listitem><para><literal>\t</literal>: Tab, ASCII
    1.40  	  11.</para>
    1.41        </listitem>
    1.42 -      <listitem><para><literal>\textbackslash v</literal>: Vertical
    1.43 +      <listitem><para><literal>\v</literal>: Vertical
    1.44  	  tab, ASCII 13.</para>
    1.45        </listitem>
    1.46 -      <listitem><para><literal>\textbackslash {</literal>: Open curly
    1.47 +      <listitem><para><literal>{</literal>: Open curly
    1.48  	  brace, <quote><literal>{</literal></quote>, ASCII
    1.49  	  173.</para>
    1.50        </listitem>
    1.51 -      <listitem><para><literal>\textbackslash }</literal>: Close curly
    1.52 +      <listitem><para><literal>}</literal>: Close curly
    1.53  	  brace, <quote><literal>}</literal></quote>, ASCII
    1.54  	  175.</para>
    1.55        </listitem></itemizedlist>
    1.56 @@ -548,24 +549,19 @@
    1.57        <itemizedlist>
    1.58  	<listitem><para>The first component is simply Mercurial's way
    1.59  	    of saying <quote>I am giving up</quote>.</para>
    1.60 -	  <programlisting>___abort___: broken.style:1: parse
    1.61 -	    error</programlisting>
    1.62 +	  <programlisting>___abort___: broken.style:1: parse error</programlisting>
    1.63  	</listitem>
    1.64  	<listitem><para>Next comes the name of the style file that
    1.65  	    contains the error.</para>
    1.66 -	  <programlisting>
    1.67 -	    abort: ___broken.style___:1: parse error
    1.68 -	  </programlisting>
    1.69 +	  <programlisting>abort: ___broken.style___:1: parse error</programlisting>
    1.70  	</listitem>
    1.71  	<listitem><para>Following the file name is the line number
    1.72  	    where the error was encountered.</para>
    1.73 -	  <programlisting>abort: broken.style:___1___: parse
    1.74 -	    error</programlisting>
    1.75 +	  <programlisting>abort: broken.style:___1___: parse error</programlisting>
    1.76  	</listitem>
    1.77  	<listitem><para>Finally, a description of what went
    1.78  	    wrong.</para>
    1.79 -	  <programlisting>abort: broken.style:1: ___parse
    1.80 -	    error___</programlisting>
    1.81 +	  <programlisting>abort: broken.style:1: ___parse error___</programlisting>
    1.82  	</listitem>
    1.83  	<listitem><para>The description of the problem is not always
    1.84  	    clear (as in this case), but even when it is cryptic, it