diff en/ch02-tour-basic.xml @ 665:27043f385f3f

Get autogeneration of examples more or less working.

--- a/en/ch02-tour-basic.xml	Mon Mar 09 21:40:12 2009 -0700
+++ b/en/ch02-tour-basic.xml	Mon Mar 09 22:55:38 2009 -0700
@@ -104,7 +104,7 @@
       that it prints isn't so important; it's whether it prints
       anything at all that we care about.</para>
 
-      <!-- &interaction.tour.version; -->
+    &interaction.tour.version;
 
     <sect2>
       <title>Built-in help</title>
@@ -118,7 +118,7 @@
 	  help on a specific command (as below), it prints more
 	  detailed information.</para>
 
-	<!-- &interaction.tour.help; -->
+	&interaction.tour.help;
 
 	<para>For a more impressive level of detail (which you won't
 	  usually need) run <command role="hg-cmd">hg help <option
@@ -155,13 +155,13 @@
 	called <command role="hg-cmd">hg clone</command>, because it
 	creates an identical copy of an existing repository.</para>
 
-      <!-- &interaction.tour.clone; -->
+      &interaction.tour.clone;
 
       <para>If our clone succeeded, we should now have a local
 	directory called <filename class="directory">hello</filename>.
 	This directory will contain some files.</para>
 
-      <!-- &interaction.tour.ls; -->
+      &interaction.tour.ls;
 
       <para>These files have the same contents and history in our
 	repository as they do in the repository we cloned.</para>
@@ -186,7 +186,7 @@
 	  class="directory">.hg</filename>.  This is where Mercurial
 	keeps all of its metadata for the repository.</para>
 
-      <!-- &interaction.tour.ls-a; -->
+      &interaction.tour.ls-a;
 
       <para>The contents of the <filename
 	  class="directory">.hg</filename> directory and its
@@ -216,7 +216,7 @@
 	role="hg-cmd">hg log</command> command gives us a view of
       history.</para>
 
-    <!-- &interaction.tour.log; -->
+    &interaction.tour.log;
 
     <para>By default, this command prints a brief paragraph of output
       for each change to the project that was recorded.  In Mercurial
@@ -324,7 +324,7 @@
 	either a revision number or a long-form changeset identifier,
 	and you can provide as many revisions as you want.</para>
 
-      <!-- &interaction.tour.log-r; -->
+      &interaction.tour.log-r;
 
       <para>If you want to see the history of several revisions
 	without having to list each one, you can use <emphasis>range
@@ -332,7 +332,7 @@
 	  want all revisions between <literal>abc</literal> and
 	  <literal>def</literal>, inclusive</quote>.</para>
       
-	<!-- &interaction.tour.log.range; -->
+	&interaction.tour.log.range;
 
       <para>Mercurial also honours the order in which you specify
 	revisions, so <command role="hg-cmd">hg log -r 2:4</command>
@@ -353,7 +353,7 @@
 	  role="hg-opt-global">--verbose</option>) option gives you
 	this extra detail.</para>
 
-      <!-- &interaction.tour.log-v; -->
+      &interaction.tour.log-v;
 
       <para>If you want to see both the description and content of a
 	change, add the <option role="hg-opt-log">-p</option> (or
@@ -363,7 +363,7 @@
 	see section <xref linkend="sec:mq:patch"/> for an
 	overview).</para>
 
-      <!-- &interaction.tour.log-vp; -->
+      &interaction.tour.log-vp;
 
     </sect2>
   </sect1>
@@ -424,7 +424,7 @@
       than cloning over the network, and cloning a local repository
       uses less disk space in most cases, too.</para>
 
-    <!-- &interaction.tour.reclone; -->
+    &interaction.tour.reclone;
 
     <para>As an aside, it's often good practice to keep a
       <quote>pristine</quote> copy of a remote repository around,
@@ -446,13 +446,13 @@
       <command>sed</command>; simply use your preferred text editor to
       do the same thing.)</para>
 
-    <!-- &interaction.tour.sed; -->
+    &interaction.tour.sed;
 
     <para>Mercurial's <command role="hg-cmd">hg status</command>
       command will tell us what Mercurial knows about the files in the
       repository.</para>
 
-    <!-- &interaction.tour.status; -->
+    &interaction.tour.status;
 
     <para>The <command role="hg-cmd">hg status</command> command
       prints no output for some files, but a line starting with
@@ -475,7 +475,7 @@
       do this, we use the <command role="hg-cmd">hg diff</command>
       command.</para>
 
-    <!-- &interaction.tour.diff; -->
+    &interaction.tour.diff;
 
   </sect1>
   <sect1>
@@ -598,7 +598,7 @@
 	  printed by <command role="hg-cmd">hg log</command> after
 	  we've finished committing.</para>
 
-       <!-- &interaction.tour.commit; -->
+       &interaction.tour.commit;
 
       <para>The editor that the <command role="hg-cmd">hg
 	    commit</command> command drops us into will contain an
@@ -665,7 +665,7 @@
 	    log</command>, but it only displays the newest revision in
 	  the repository.</para>
 
-      <!-- &interaction.tour.tip; -->
+      &interaction.tour.tip;
 
       <para>We refer to
 	  the newest revision in the repository as the tip revision,
@@ -691,7 +691,7 @@
 	  call our temporary repository <filename
 	    class="directory">hello-pull</filename>.</para>
 
-      <!-- &interaction.tour.clone-pull; -->
+      &interaction.tour.clone-pull;
 
       <para>We'll use the <command role="hg-cmd">hg
 	    pull</command> command to bring changes from <filename
@@ -704,7 +704,7 @@
 	  command <emphasis>would</emphasis> pull into the repository,
 	  without actually pulling the changes in.</para>
 
-      <!-- &interaction.tour.incoming; -->
+      &interaction.tour.incoming;
 
       <para>(Of course, someone could
 	  cause more changesets to appear in the repository that we
@@ -718,7 +718,7 @@
 	    pull</command> command, and telling it which repository to
 	  pull from.</para>
 
-      <!-- &interaction.tour.pull; -->
+      &interaction.tour.pull;
 
       <para>As you can see
 	  from the before-and-after output of <command
@@ -740,7 +740,7 @@
 	the working directory.  Instead, we use the <command
 	  role="hg-cmd">hg update</command> command to do this.</para>
 
-      <!-- &interaction.tour.update; -->
+      &interaction.tour.update;
 
       <para>It might seem a bit strange that <command role="hg-cmd">hg
 	  pull</command> doesn't update the working directory
@@ -771,7 +771,7 @@
 	the <command role="hg-cmd">hg parents</command>
 	command.</para>
 
-      <!-- &interaction.tour.parents; -->
+      &interaction.tour.parents;
 
       <para>If you look back at figure <xref
 	  linkend="fig:tour-basic:history"/>,
@@ -787,7 +787,7 @@
 	give a revision number or changeset ID to the <command
 	  role="hg-cmd">hg update</command> command.</para>
 
-      <!-- &interaction.tour.older; -->
+      &interaction.tour.older;
 
       <para>If you omit an explicit revision, <command
 	  role="hg-cmd">hg update</command> will update to the tip
@@ -805,19 +805,19 @@
 	    pull</command> above, we'll create a temporary repository
 	  to push our changes into.</para>
 
-      <!-- &interaction.tour.clone-push; -->
+      &interaction.tour.clone-push;
 
       <para>The <command role="hg-cmd">hg outgoing</command> command
 	  tells us what changes would be pushed into another
 	  repository.</para>
 
-      <!-- &interaction.tour.outgoing; -->
+      &interaction.tour.outgoing;
 
       <para>And the
 	  <command role="hg-cmd">hg push</command> command does the
 	  actual push.</para>
 
-      <!-- &interaction.tour.push; -->
+      &interaction.tour.push;
 
       <para>As with
 	  <command role="hg-cmd">hg pull</command>, the <command
@@ -832,7 +832,7 @@
 	  and the receiving repository already has those changes?
 	  Nothing too exciting.</para>
 
-      <!-- &interaction.tour.push.nothing; -->
+      &interaction.tour.push.nothing;
     </sect2>
     <sect2>
       <title>Sharing changes over a network</title>
@@ -843,14 +843,14 @@
 	  connection; simply pass in a URL instead of a local
 	  path.</para>
 	
-      <!-- &interaction.tour.outgoing.net; -->
+      &interaction.tour.outgoing.net;
 
       <para>In this example, we
 	  can see what changes we could push to the remote repository,
 	  but the repository is understandably not set up to let
 	  anonymous users push to it.</para>
 
-      <!-- &interaction.tour.push.net; -->
+      &interaction.tour.push.net;
     </sect2>
   </sect1>
 </chapter>