1.1 --- a/en/ch14-hgext.xml	Thu Mar 05 21:52:23 2009 +0200
     1.2 +++ b/en/ch14-hgext.xml	Mon Mar 09 23:22:09 2009 -0700
     1.3 @@ -267,11 +267,14 @@
     1.4  	role="hg-ext">extdiff</literal> extension</title>
     1.5  
     1.6      <para>Mercurial's built-in <command role="hg-cmd">hg
     1.7 -	diff</command> command outputs plaintext unified diffs. <!--
     1.8 -      &interaction.extdiff.diff; --> If you would like to use an
     1.9 -      external tool to display modifications, you'll want to use the
    1.10 -      <literal role="hg-ext">extdiff</literal> extension.  This will
    1.11 -      let you use, for example, a graphical diff tool.</para>
    1.12 +	diff</command> command outputs plaintext unified diffs.</para>
    1.13 +
    1.14 +    &interaction.extdiff.diff;
    1.15 +
    1.16 +    <para>If you would like to use an external tool to display
    1.17 +      modifications, you'll want to use the <literal
    1.18 +	role="hg-ext">extdiff</literal> extension.  This will let you
    1.19 +      use, for example, a graphical diff tool.</para>
    1.20  
    1.21      <para>The <literal role="hg-ext">extdiff</literal> extension is
    1.22        bundled with Mercurial, so it's easy to set up.  In the <literal
    1.23 @@ -283,12 +286,14 @@
    1.24  	role="hg-ext-extdiff">extdiff</command>, which by default uses
    1.25        your system's <command>diff</command> command to generate a
    1.26        unified diff in the same form as the built-in <command
    1.27 -	role="hg-cmd">hg diff</command> command. <!--
    1.28 -      &interaction.extdiff.extdiff; --> The result won't be exactly
    1.29 -      the same as with the built-in <command role="hg-cmd">hg
    1.30 -	diff</command> variations, because the output of
    1.31 -      <command>diff</command> varies from one system to another, even
    1.32 -      when passed the same options.</para>
    1.33 +	role="hg-cmd">hg diff</command> command.</para>
    1.34 +    
    1.35 +    &interaction.extdiff.extdiff;
    1.36 +
    1.37 +    <para>The result won't be exactly the same as with the built-in
    1.38 +      <command role="hg-cmd">hg diff</command> variations, because the
    1.39 +      output of <command>diff</command> varies from one system to
    1.40 +      another, even when passed the same options.</para>
    1.41  
    1.42      <para>As the <quote><literal>making snapshot</literal></quote>
    1.43        lines of output above imply, the <command
    1.44 @@ -341,8 +346,9 @@
    1.45        diffs (using the <option role="cmd-opt-diff">-c</option> option)
    1.46        instead of unified diffs, and five lines of context instead of
    1.47        the default three (passing <literal>5</literal> as the argument
    1.48 -      to the <option role="cmd-opt-diff">-C</option> option). <!--
    1.49 -      &interaction.extdiff.extdiff-ctx; --></para>
    1.50 +      to the <option role="cmd-opt-diff">-C</option> option).</para>
    1.51 +
    1.52 +      &interaction.extdiff.extdiff-ctx;
    1.53  
    1.54      <para>Launching a visual diff tool is just as easy.  Here's how to
    1.55        launch the <command>kdiff3</command> viewer.</para>