1.1 --- a/en/ch02-tour-basic.xml	Wed Feb 18 00:22:09 2009 -0800
     1.2 +++ b/en/ch02-tour-basic.xml	Mon Mar 09 22:55:38 2009 -0700
     1.3 @@ -104,7 +104,7 @@
     1.4        that it prints isn't so important; it's whether it prints
     1.5        anything at all that we care about.</para>
     1.6  
     1.7 -      <!-- &interaction.tour.version; -->
     1.8 +    &interaction.tour.version;
     1.9  
    1.10      <sect2>
    1.11        <title>Built-in help</title>
    1.12 @@ -118,7 +118,7 @@
    1.13  	  help on a specific command (as below), it prints more
    1.14  	  detailed information.</para>
    1.15  
    1.16 -	<!-- &interaction.tour.help; -->
    1.17 +	&interaction.tour.help;
    1.18  
    1.19  	<para>For a more impressive level of detail (which you won't
    1.20  	  usually need) run <command role="hg-cmd">hg help <option
    1.21 @@ -155,13 +155,13 @@
    1.22  	called <command role="hg-cmd">hg clone</command>, because it
    1.23  	creates an identical copy of an existing repository.</para>
    1.24  
    1.25 -      <!-- &interaction.tour.clone; -->
    1.26 +      &interaction.tour.clone;
    1.27  
    1.28        <para>If our clone succeeded, we should now have a local
    1.29  	directory called <filename class="directory">hello</filename>.
    1.30  	This directory will contain some files.</para>
    1.31  
    1.32 -      <!-- &interaction.tour.ls; -->
    1.33 +      &interaction.tour.ls;
    1.34  
    1.35        <para>These files have the same contents and history in our
    1.36  	repository as they do in the repository we cloned.</para>
    1.37 @@ -186,7 +186,7 @@
    1.38  	  class="directory">.hg</filename>.  This is where Mercurial
    1.39  	keeps all of its metadata for the repository.</para>
    1.40  
    1.41 -      <!-- &interaction.tour.ls-a; -->
    1.42 +      &interaction.tour.ls-a;
    1.43  
    1.44        <para>The contents of the <filename
    1.45  	  class="directory">.hg</filename> directory and its
    1.46 @@ -216,7 +216,7 @@
    1.47  	role="hg-cmd">hg log</command> command gives us a view of
    1.48        history.</para>
    1.49  
    1.50 -    <!-- &interaction.tour.log; -->
    1.51 +    &interaction.tour.log;
    1.52  
    1.53      <para>By default, this command prints a brief paragraph of output
    1.54        for each change to the project that was recorded.  In Mercurial
    1.55 @@ -324,7 +324,7 @@
    1.56  	either a revision number or a long-form changeset identifier,
    1.57  	and you can provide as many revisions as you want.</para>
    1.58  
    1.59 -      <!-- &interaction.tour.log-r; -->
    1.60 +      &interaction.tour.log-r;
    1.61  
    1.62        <para>If you want to see the history of several revisions
    1.63  	without having to list each one, you can use <emphasis>range
    1.64 @@ -332,7 +332,7 @@
    1.65  	  want all revisions between <literal>abc</literal> and
    1.66  	  <literal>def</literal>, inclusive</quote>.</para>
    1.67        
    1.68 -	<!-- &interaction.tour.log.range; -->
    1.69 +	&interaction.tour.log.range;
    1.70  
    1.71        <para>Mercurial also honours the order in which you specify
    1.72  	revisions, so <command role="hg-cmd">hg log -r 2:4</command>
    1.73 @@ -353,7 +353,7 @@
    1.74  	  role="hg-opt-global">--verbose</option>) option gives you
    1.75  	this extra detail.</para>
    1.76  
    1.77 -      <!-- &interaction.tour.log-v; -->
    1.78 +      &interaction.tour.log-v;
    1.79  
    1.80        <para>If you want to see both the description and content of a
    1.81  	change, add the <option role="hg-opt-log">-p</option> (or
    1.82 @@ -363,7 +363,7 @@
    1.83  	see section <xref linkend="sec:mq:patch"/> for an
    1.84  	overview).</para>
    1.85  
    1.86 -      <!-- &interaction.tour.log-vp; -->
    1.87 +      &interaction.tour.log-vp;
    1.88  
    1.89      </sect2>
    1.90    </sect1>
    1.91 @@ -424,7 +424,7 @@
    1.92        than cloning over the network, and cloning a local repository
    1.93        uses less disk space in most cases, too.</para>
    1.94  
    1.95 -    <!-- &interaction.tour.reclone; -->
    1.96 +    &interaction.tour.reclone;
    1.97  
    1.98      <para>As an aside, it's often good practice to keep a
    1.99        <quote>pristine</quote> copy of a remote repository around,
   1.100 @@ -446,13 +446,13 @@
   1.101        <command>sed</command>; simply use your preferred text editor to
   1.102        do the same thing.)</para>
   1.103  
   1.104 -    <!-- &interaction.tour.sed; -->
   1.105 +    &interaction.tour.sed;
   1.106  
   1.107      <para>Mercurial's <command role="hg-cmd">hg status</command>
   1.108        command will tell us what Mercurial knows about the files in the
   1.109        repository.</para>
   1.110  
   1.111 -    <!-- &interaction.tour.status; -->
   1.112 +    &interaction.tour.status;
   1.113  
   1.114      <para>The <command role="hg-cmd">hg status</command> command
   1.115        prints no output for some files, but a line starting with
   1.116 @@ -475,7 +475,7 @@
   1.117        do this, we use the <command role="hg-cmd">hg diff</command>
   1.118        command.</para>
   1.119  
   1.120 -    <!-- &interaction.tour.diff; -->
   1.121 +    &interaction.tour.diff;
   1.122  
   1.123    </sect1>
   1.124    <sect1>
   1.125 @@ -598,7 +598,7 @@
   1.126  	  printed by <command role="hg-cmd">hg log</command> after
   1.127  	  we've finished committing.</para>
   1.128  
   1.129 -       <!-- &interaction.tour.commit; -->
   1.130 +       &interaction.tour.commit;
   1.131  
   1.132        <para>The editor that the <command role="hg-cmd">hg
   1.133  	    commit</command> command drops us into will contain an
   1.134 @@ -665,7 +665,7 @@
   1.135  	    log</command>, but it only displays the newest revision in
   1.136  	  the repository.</para>
   1.137  
   1.138 -      <!-- &interaction.tour.tip; -->
   1.139 +      &interaction.tour.tip;
   1.140  
   1.141        <para>We refer to
   1.142  	  the newest revision in the repository as the tip revision,
   1.143 @@ -691,7 +691,7 @@
   1.144  	  call our temporary repository <filename
   1.145  	    class="directory">hello-pull</filename>.</para>
   1.146  
   1.147 -      <!-- &interaction.tour.clone-pull; -->
   1.148 +      &interaction.tour.clone-pull;
   1.149  
   1.150        <para>We'll use the <command role="hg-cmd">hg
   1.151  	    pull</command> command to bring changes from <filename
   1.152 @@ -704,7 +704,7 @@
   1.153  	  command <emphasis>would</emphasis> pull into the repository,
   1.154  	  without actually pulling the changes in.</para>
   1.155  
   1.156 -      <!-- &interaction.tour.incoming; -->
   1.157 +      &interaction.tour.incoming;
   1.158  
   1.159        <para>(Of course, someone could
   1.160  	  cause more changesets to appear in the repository that we
   1.161 @@ -718,7 +718,7 @@
   1.162  	    pull</command> command, and telling it which repository to
   1.163  	  pull from.</para>
   1.164  
   1.165 -      <!-- &interaction.tour.pull; -->
   1.166 +      &interaction.tour.pull;
   1.167  
   1.168        <para>As you can see
   1.169  	  from the before-and-after output of <command
   1.170 @@ -740,7 +740,7 @@
   1.171  	the working directory.  Instead, we use the <command
   1.172  	  role="hg-cmd">hg update</command> command to do this.</para>
   1.173  
   1.174 -      <!-- &interaction.tour.update; -->
   1.175 +      &interaction.tour.update;
   1.176  
   1.177        <para>It might seem a bit strange that <command role="hg-cmd">hg
   1.178  	  pull</command> doesn't update the working directory
   1.179 @@ -771,7 +771,7 @@
   1.180  	the <command role="hg-cmd">hg parents</command>
   1.181  	command.</para>
   1.182  
   1.183 -      <!-- &interaction.tour.parents; -->
   1.184 +      &interaction.tour.parents;
   1.185  
   1.186        <para>If you look back at figure <xref
   1.187  	  linkend="fig:tour-basic:history"/>,
   1.188 @@ -787,7 +787,7 @@
   1.189  	give a revision number or changeset ID to the <command
   1.190  	  role="hg-cmd">hg update</command> command.</para>
   1.191  
   1.192 -      <!-- &interaction.tour.older; -->
   1.193 +      &interaction.tour.older;
   1.194  
   1.195        <para>If you omit an explicit revision, <command
   1.196  	  role="hg-cmd">hg update</command> will update to the tip
   1.197 @@ -805,19 +805,19 @@
   1.198  	    pull</command> above, we'll create a temporary repository
   1.199  	  to push our changes into.</para>
   1.200  
   1.201 -      <!-- &interaction.tour.clone-push; -->
   1.202 +      &interaction.tour.clone-push;
   1.203  
   1.204        <para>The <command role="hg-cmd">hg outgoing</command> command
   1.205  	  tells us what changes would be pushed into another
   1.206  	  repository.</para>
   1.207  
   1.208 -      <!-- &interaction.tour.outgoing; -->
   1.209 +      &interaction.tour.outgoing;
   1.210  
   1.211        <para>And the
   1.212  	  <command role="hg-cmd">hg push</command> command does the
   1.213  	  actual push.</para>
   1.214  
   1.215 -      <!-- &interaction.tour.push; -->
   1.216 +      &interaction.tour.push;
   1.217  
   1.218        <para>As with
   1.219  	  <command role="hg-cmd">hg pull</command>, the <command
   1.220 @@ -832,7 +832,7 @@
   1.221  	  and the receiving repository already has those changes?
   1.222  	  Nothing too exciting.</para>
   1.223  
   1.224 -      <!-- &interaction.tour.push.nothing; -->
   1.225 +      &interaction.tour.push.nothing;
   1.226      </sect2>
   1.227      <sect2>
   1.228        <title>Sharing changes over a network</title>
   1.229 @@ -843,14 +843,14 @@
   1.230  	  connection; simply pass in a URL instead of a local
   1.231  	  path.</para>
   1.232  	
   1.233 -      <!-- &interaction.tour.outgoing.net; -->
   1.234 +      &interaction.tour.outgoing.net;
   1.235  
   1.236        <para>In this example, we
   1.237  	  can see what changes we could push to the remote repository,
   1.238  	  but the repository is understandably not set up to let
   1.239  	  anonymous users push to it.</para>
   1.240  
   1.241 -      <!-- &interaction.tour.push.net; -->
   1.242 +      &interaction.tour.push.net;
   1.243      </sect2>
   1.244    </sect1>
   1.245  </chapter>