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