1.1 --- a/en/examples/results/tour.merge.parents.out	Mon Mar 09 21:37:47 2009 -0700
     1.2 +++ b/en/examples/results/tour.merge.parents.out	Mon Mar 09 21:39:23 2009 -0700
     1.3 @@ -1,28 +1,29 @@
     1.4 -$ \textbf{hg parents}
     1.5 +<screen><prompt>$</prompt> <userinput>hg parents</userinput>
     1.6  changeset:   
     1.7 -user:        Bryan O'Sullivan <bos@serpentine.com>
     1.8 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
     1.9  
    1.10  summary:     A new hello for a new day.
    1.11  
    1.12  changeset:   
    1.13  tag:         tip
    1.14  parent:      
    1.15 -user:        Bryan O'Sullivan <bos@serpentine.com>
    1.16 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
    1.17  
    1.18  summary:     Added an extra line of output
    1.19  
    1.20 -$ \textbf{cat hello.c}
    1.21 +<prompt>$</prompt> <userinput>cat hello.c</userinput>
    1.22  /*
    1.23   * Placed in the public domain by Bryan O'Sullivan.  This program is
    1.24   * not covered by patents in the United States or other countries.
    1.25   */
    1.26  
    1.27 -#include <stdio.h>
    1.28 +#include &lt;stdio.h&gt;
    1.29  
    1.30  int main(int argc, char **argv)
    1.31 -\{
    1.32 -	printf("once more, hello.\textbackslash{}n");
    1.33 -	printf("hello, world!\textbackslash{}");
    1.34 -	printf("hello again!\textbackslash{}n");
    1.35 +{
    1.36 +	printf("once more, hello.\n");
    1.37 +	printf("hello, world!\");
    1.38 +	printf("hello again!\n");
    1.39  	return 0;
    1.40 -\}
    1.41 +}
    1.42 +</screen>