diff en/ch14-hgext.xml @ 666:8fcd44708f41

Uncomment all the mangled interaction examples.

--- a/en/ch14-hgext.xml	Mon Mar 09 22:55:38 2009 -0700
+++ b/en/ch14-hgext.xml	Mon Mar 09 23:22:09 2009 -0700
@@ -267,11 +267,14 @@
 	role="hg-ext">extdiff</literal> extension</title>
 
     <para>Mercurial's built-in <command role="hg-cmd">hg
-	diff</command> command outputs plaintext unified diffs. <!--
-      &interaction.extdiff.diff; --> If you would like to use an
-      external tool to display modifications, you'll want to use the
-      <literal role="hg-ext">extdiff</literal> extension.  This will
-      let you use, for example, a graphical diff tool.</para>
+	diff</command> command outputs plaintext unified diffs.</para>
+
+    &interaction.extdiff.diff;
+
+    <para>If you would like to use an external tool to display
+      modifications, you'll want to use the <literal
+	role="hg-ext">extdiff</literal> extension.  This will let you
+      use, for example, a graphical diff tool.</para>
 
     <para>The <literal role="hg-ext">extdiff</literal> extension is
       bundled with Mercurial, so it's easy to set up.  In the <literal
@@ -283,12 +286,14 @@
 	role="hg-ext-extdiff">extdiff</command>, which by default uses
       your system's <command>diff</command> command to generate a
       unified diff in the same form as the built-in <command
-	role="hg-cmd">hg diff</command> command. <!--
-      &interaction.extdiff.extdiff; --> The result won't be exactly
-      the same as with the built-in <command role="hg-cmd">hg
-	diff</command> variations, because the output of
-      <command>diff</command> varies from one system to another, even
-      when passed the same options.</para>
+	role="hg-cmd">hg diff</command> command.</para>
+    
+    &interaction.extdiff.extdiff;
+
+    <para>The result won't be exactly the same as with the built-in
+      <command role="hg-cmd">hg diff</command> variations, because the
+      output of <command>diff</command> varies from one system to
+      another, even when passed the same options.</para>
 
     <para>As the <quote><literal>making snapshot</literal></quote>
       lines of output above imply, the <command
@@ -341,8 +346,9 @@
       diffs (using the <option role="cmd-opt-diff">-c</option> option)
       instead of unified diffs, and five lines of context instead of
       the default three (passing <literal>5</literal> as the argument
-      to the <option role="cmd-opt-diff">-C</option> option). <!--
-      &interaction.extdiff.extdiff-ctx; --></para>
+      to the <option role="cmd-opt-diff">-C</option> option).</para>
+
+      &interaction.extdiff.extdiff-ctx;
 
     <para>Launching a visual diff tool is just as easy.  Here's how to
       launch the <command>kdiff3</command> viewer.</para>