1.1 --- a/en/examples/results/backout.init.out	Mon Mar 09 21:37:47 2009 -0700
     1.2 +++ b/en/examples/results/backout.init.out	Mon Mar 09 21:39:23 2009 -0700
     1.3 @@ -1,7 +1,8 @@
     1.4 -$ \textbf{hg init myrepo}
     1.5 -$ \textbf{cd myrepo}
     1.6 -$ \textbf{echo first change >> myfile}
     1.7 -$ \textbf{hg add myfile}
     1.8 -$ \textbf{hg commit -m 'first change'}
     1.9 -$ \textbf{echo second change >> myfile}
    1.10 -$ \textbf{hg commit -m 'second change'}
    1.11 +<screen><prompt>$</prompt> <userinput>hg init myrepo</userinput>
    1.12 +<prompt>$</prompt> <userinput>cd myrepo</userinput>
    1.13 +<prompt>$</prompt> <userinput>echo first change &gt;&gt; myfile</userinput>
    1.14 +<prompt>$</prompt> <userinput>hg add myfile</userinput>
    1.15 +<prompt>$</prompt> <userinput>hg commit -m 'first change'</userinput>
    1.16 +<prompt>$</prompt> <userinput>echo second change &gt;&gt; myfile</userinput>
    1.17 +<prompt>$</prompt> <userinput>hg commit -m 'second change'</userinput>
    1.18 +</screen>

     2.1 --- a/en/examples/results/backout.manual.backout.out	Mon Mar 09 21:37:47 2009 -0700
     2.2 +++ b/en/examples/results/backout.manual.backout.out	Mon Mar 09 21:39:23 2009 -0700
     2.3 @@ -1,8 +1,9 @@
     2.4 -$ \textbf{echo third change >> myfile}
     2.5 -$ \textbf{hg commit -m 'third change'}
     2.6 -$ \textbf{hg backout -m 'back out second change' 1}
     2.7 +<screen><prompt>$</prompt> <userinput>echo third change &gt;&gt; myfile</userinput>
     2.8 +<prompt>$</prompt> <userinput>hg commit -m 'third change'</userinput>
     2.9 +<prompt>$</prompt> <userinput>hg backout -m 'back out second change' 1</userinput>
    2.10  reverting myfile
    2.11  created new head
    2.12  changeset  backs out changeset 
    2.13  the backout changeset is a new head - do not forget to merge
    2.14  (use "backout --merge" if you want to auto-merge)
    2.15 +</screen>

     3.1 --- a/en/examples/results/backout.manual.cat.out	Mon Mar 09 21:37:47 2009 -0700
     3.2 +++ b/en/examples/results/backout.manual.cat.out	Mon Mar 09 21:39:23 2009 -0700
     3.3 @@ -1,4 +1,5 @@
     3.4 -$ \textbf{cat myfile}
     3.5 +<screen><prompt>$</prompt> <userinput>cat myfile</userinput>
     3.6  first change
     3.7  second change
     3.8  third change
     3.9 +</screen>

     4.1 --- a/en/examples/results/backout.manual.clone.out	Mon Mar 09 21:37:47 2009 -0700
     4.2 +++ b/en/examples/results/backout.manual.clone.out	Mon Mar 09 21:39:23 2009 -0700
     4.3 @@ -1,5 +1,5 @@
     4.4 -$ \textbf{cd ..}
     4.5 -$ \textbf{hg clone -r1 myrepo newrepo}
     4.6 +<screen><prompt>$</prompt> <userinput>cd ..</userinput>
     4.7 +<prompt>$</prompt> <userinput>hg clone -r1 myrepo newrepo</userinput>
     4.8  requesting all changes
     4.9  adding changesets
    4.10  adding manifests
    4.11 @@ -7,4 +7,5 @@
    4.12  added 2 changesets with 2 changes to 1 files
    4.13  updating working directory
    4.14  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    4.15 -$ \textbf{cd newrepo}
    4.16 +<prompt>$</prompt> <userinput>cd newrepo</userinput>
    4.17 +</screen>

     5.1 --- a/en/examples/results/backout.manual.heads.out	Mon Mar 09 21:37:47 2009 -0700
     5.2 +++ b/en/examples/results/backout.manual.heads.out	Mon Mar 09 21:39:23 2009 -0700
     5.3 @@ -1,13 +1,14 @@
     5.4 -$ \textbf{hg heads}
     5.5 +<screen><prompt>$</prompt> <userinput>hg heads</userinput>
     5.6  changeset:   
     5.7  tag:         tip
     5.8  parent:      
     5.9 -user:        Bryan O'Sullivan <bos@serpentine.com>
    5.10 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
    5.11  
    5.12  summary:     back out second change
    5.13  
    5.14  changeset:   
    5.15 -user:        Bryan O'Sullivan <bos@serpentine.com>
    5.16 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
    5.17  
    5.18  summary:     third change
    5.19  
    5.20 +</screen>

     6.1 --- a/en/examples/results/backout.manual.log.out	Mon Mar 09 21:37:47 2009 -0700
     6.2 +++ b/en/examples/results/backout.manual.log.out	Mon Mar 09 21:39:23 2009 -0700
     6.3 @@ -1,13 +1,14 @@
     6.4 -$ \textbf{hg log --style compact}
     6.5 -3[tip]:1      2009-01-30 06:32 +0000   bos
     6.6 +<screen><prompt>$</prompt> <userinput>hg log --style compact</userinput>
     6.7 +3[tip]:1      2009-03-10 04:37 +0000   bos
     6.8    back out second change
     6.9  
    6.10 -2      2009-01-30 06:32 +0000   bos
    6.11 +2      2009-03-10 04:37 +0000   bos
    6.12    third change
    6.13  
    6.14 -1      2009-01-30 06:32 +0000   bos
    6.15 +1      2009-03-10 04:37 +0000   bos
    6.16    second change
    6.17  
    6.18 -0      2009-01-30 06:32 +0000   bos
    6.19 +0      2009-03-10 04:37 +0000   bos
    6.20    first change
    6.21  
    6.22 +</screen>

     7.1 --- a/en/examples/results/backout.manual.merge.out	Mon Mar 09 21:37:47 2009 -0700
     7.2 +++ b/en/examples/results/backout.manual.merge.out	Mon Mar 09 21:39:23 2009 -0700
     7.3 @@ -1,8 +1,9 @@
     7.4 -$ \textbf{hg merge}
     7.5 +<screen><prompt>$</prompt> <userinput>hg merge</userinput>
     7.6  merging myfile
     7.7  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
     7.8  (branch merge, don't forget to commit)
     7.9 -$ \textbf{hg commit -m 'merged backout with previous tip'}
    7.10 -$ \textbf{cat myfile}
    7.11 +<prompt>$</prompt> <userinput>hg commit -m 'merged backout with previous tip'</userinput>
    7.12 +<prompt>$</prompt> <userinput>cat myfile</userinput>
    7.13  first change
    7.14  third change
    7.15 +</screen>

     8.1 --- a/en/examples/results/backout.manual.parents.out	Mon Mar 09 21:37:47 2009 -0700
     8.2 +++ b/en/examples/results/backout.manual.parents.out	Mon Mar 09 21:39:23 2009 -0700
     8.3 @@ -1,6 +1,7 @@
     8.4 -$ \textbf{hg parents}
     8.5 +<screen><prompt>$</prompt> <userinput>hg parents</userinput>
     8.6  changeset:   
     8.7 -user:        Bryan O'Sullivan <bos@serpentine.com>
     8.8 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
     8.9  
    8.10  summary:     third change
    8.11  
    8.12 +</screen>

     9.1 --- a/en/examples/results/backout.non-tip.backout.out	Mon Mar 09 21:37:47 2009 -0700
     9.2 +++ b/en/examples/results/backout.non-tip.backout.out	Mon Mar 09 21:39:23 2009 -0700
     9.3 @@ -1,6 +1,6 @@
     9.4 -$ \textbf{echo third change >> myfile}
     9.5 -$ \textbf{hg commit -m 'third change'}
     9.6 -$ \textbf{hg backout --merge -m 'back out second change' 1}
     9.7 +<screen><prompt>$</prompt> <userinput>echo third change &gt;&gt; myfile</userinput>
     9.8 +<prompt>$</prompt> <userinput>hg commit -m 'third change'</userinput>
     9.9 +<prompt>$</prompt> <userinput>hg backout --merge -m 'back out second change' 1</userinput>
    9.10  reverting myfile
    9.11  created new head
    9.12  changeset  backs out changeset 
    9.13 @@ -8,3 +8,4 @@
    9.14  merging myfile
    9.15  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
    9.16  (branch merge, don't forget to commit)
    9.17 +</screen>

    10.1 --- a/en/examples/results/backout.non-tip.cat.out	Mon Mar 09 21:37:47 2009 -0700
    10.2 +++ b/en/examples/results/backout.non-tip.cat.out	Mon Mar 09 21:39:23 2009 -0700
    10.3 @@ -1,3 +1,4 @@
    10.4 -$ \textbf{cat myfile}
    10.5 +<screen><prompt>$</prompt> <userinput>cat myfile</userinput>
    10.6  first change
    10.7  third change
    10.8 +</screen>

    11.1 --- a/en/examples/results/backout.non-tip.clone.out	Mon Mar 09 21:37:47 2009 -0700
    11.2 +++ b/en/examples/results/backout.non-tip.clone.out	Mon Mar 09 21:39:23 2009 -0700
    11.3 @@ -1,5 +1,5 @@
    11.4 -$ \textbf{cd ..}
    11.5 -$ \textbf{hg clone -r1 myrepo non-tip-repo}
    11.6 +<screen><prompt>$</prompt> <userinput>cd ..</userinput>
    11.7 +<prompt>$</prompt> <userinput>hg clone -r1 myrepo non-tip-repo</userinput>
    11.8  requesting all changes
    11.9  adding changesets
   11.10  adding manifests
   11.11 @@ -7,4 +7,5 @@
   11.12  added 2 changesets with 2 changes to 1 files
   11.13  updating working directory
   11.14  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   11.15 -$ \textbf{cd non-tip-repo}
   11.16 +<prompt>$</prompt> <userinput>cd non-tip-repo</userinput>
   11.17 +</screen>

    12.1 --- a/en/examples/results/backout.simple.log.out	Mon Mar 09 21:37:47 2009 -0700
    12.2 +++ b/en/examples/results/backout.simple.log.out	Mon Mar 09 21:39:23 2009 -0700
    12.3 @@ -1,10 +1,11 @@
    12.4 -$ \textbf{hg log --style compact}
    12.5 -2[tip]      2009-01-30 06:32 +0000   bos
    12.6 +<screen><prompt>$</prompt> <userinput>hg log --style compact</userinput>
    12.7 +2[tip]      2009-03-10 04:37 +0000   bos
    12.8    back out second change
    12.9  
   12.10 -1      2009-01-30 06:32 +0000   bos
   12.11 +1      2009-03-10 04:37 +0000   bos
   12.12    second change
   12.13  
   12.14 -0      2009-01-30 06:32 +0000   bos
   12.15 +0      2009-03-10 04:37 +0000   bos
   12.16    first change
   12.17  
   12.18 +</screen>

    13.1 --- a/en/examples/results/backout.simple.out	Mon Mar 09 21:37:47 2009 -0700
    13.2 +++ b/en/examples/results/backout.simple.out	Mon Mar 09 21:39:23 2009 -0700
    13.3 @@ -1,5 +1,6 @@
    13.4 -$ \textbf{hg backout -m 'back out second change' tip}
    13.5 +<screen><prompt>$</prompt> <userinput>hg backout -m 'back out second change' tip</userinput>
    13.6  reverting myfile
    13.7  changeset  backs out changeset 
    13.8 -$ \textbf{cat myfile}
    13.9 +<prompt>$</prompt> <userinput>cat myfile</userinput>
   13.10  first change
   13.11 +</screen>

    14.1 --- a/en/examples/results/bisect.commits.out	Mon Mar 09 21:37:47 2009 -0700
    14.2 +++ b/en/examples/results/bisect.commits.out	Mon Mar 09 21:39:23 2009 -0700
    14.3 @@ -8,3 +8,4 @@
    14.4  
    14.5  
    14.6  
    14.7 +

    15.1 --- a/en/examples/results/bisect.help.out	Mon Mar 09 21:37:47 2009 -0700
    15.2 +++ b/en/examples/results/bisect.help.out	Mon Mar 09 21:39:23 2009 -0700
    15.3 @@ -31,3 +31,4 @@
    15.4  
    15.5  
    15.6  
    15.7 +

    16.1 --- a/en/examples/results/bisect.init.out	Mon Mar 09 21:37:47 2009 -0700
    16.2 +++ b/en/examples/results/bisect.init.out	Mon Mar 09 21:39:23 2009 -0700
    16.3 @@ -1,2 +1,3 @@
    16.4  
    16.5  
    16.6 +

    17.1 --- a/en/examples/results/bisect.search.bad-init.out	Mon Mar 09 21:37:47 2009 -0700
    17.2 +++ b/en/examples/results/bisect.search.bad-init.out	Mon Mar 09 21:39:23 2009 -0700
    17.3 @@ -1,2 +1,3 @@
    17.4  
    17.5  
    17.6 +

    18.1 --- a/en/examples/results/bisect.search.good-init.out	Mon Mar 09 21:37:47 2009 -0700
    18.2 +++ b/en/examples/results/bisect.search.good-init.out	Mon Mar 09 21:39:23 2009 -0700
    18.3 @@ -2,3 +2,4 @@
    18.4  
    18.5  
    18.6  
    18.7 +

    19.1 --- a/en/examples/results/bisect.search.init.out	Mon Mar 09 21:37:47 2009 -0700
    19.2 +++ b/en/examples/results/bisect.search.init.out	Mon Mar 09 21:39:23 2009 -0700
    19.3 @@ -1,2 +1,3 @@
    19.4  
    19.5  
    19.6 +

    20.1 --- a/en/examples/results/bisect.search.mytest.out	Mon Mar 09 21:37:47 2009 -0700
    20.2 +++ b/en/examples/results/bisect.search.mytest.out	Mon Mar 09 21:39:23 2009 -0700
    20.3 @@ -8,3 +8,4 @@
    20.4  
    20.5  
    20.6  
    20.7 +

    21.1 --- a/en/examples/results/bisect.search.reset.out	Mon Mar 09 21:37:47 2009 -0700
    21.2 +++ b/en/examples/results/bisect.search.reset.out	Mon Mar 09 21:39:23 2009 -0700
    21.3 @@ -1,2 +1,3 @@
    21.4  
    21.5  
    21.6 +

    22.1 --- a/en/examples/results/bisect.search.rest.out	Mon Mar 09 21:37:47 2009 -0700
    22.2 +++ b/en/examples/results/bisect.search.rest.out	Mon Mar 09 21:39:23 2009 -0700
    22.3 @@ -17,3 +17,4 @@
    22.4  
    22.5  
    22.6  
    22.7 +

    23.1 --- a/en/examples/results/bisect.search.step1.out	Mon Mar 09 21:37:47 2009 -0700
    23.2 +++ b/en/examples/results/bisect.search.step1.out	Mon Mar 09 21:39:23 2009 -0700
    23.3 @@ -9,3 +9,4 @@
    23.4  
    23.5  
    23.6  
    23.7 +

    24.1 --- a/en/examples/results/bisect.search.step2.out	Mon Mar 09 21:37:47 2009 -0700
    24.2 +++ b/en/examples/results/bisect.search.step2.out	Mon Mar 09 21:39:23 2009 -0700
    24.3 @@ -3,3 +3,4 @@
    24.4  
    24.5  
    24.6  
    24.7 +

    25.1 --- a/en/examples/results/branch-named.branch.out	Mon Mar 09 21:37:47 2009 -0700
    25.2 +++ b/en/examples/results/branch-named.branch.out	Mon Mar 09 21:39:23 2009 -0700
    25.3 @@ -1,2 +1,3 @@
    25.4 -$ \textbf{hg branch}
    25.5 +<screen><prompt>$</prompt> <userinput>hg branch</userinput>
    25.6  default
    25.7 +</screen>

    26.1 --- a/en/examples/results/branch-named.branches.out	Mon Mar 09 21:37:47 2009 -0700
    26.2 +++ b/en/examples/results/branch-named.branches.out	Mon Mar 09 21:39:23 2009 -0700
    26.3 @@ -1,9 +1,10 @@
    26.4 -$ \textbf{hg tip}
    26.5 +<screen><prompt>$</prompt> <userinput>hg tip</userinput>
    26.6  changeset:   
    26.7  tag:         tip
    26.8 -user:        Bryan O'Sullivan <bos@serpentine.com>
    26.9 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   26.10  
   26.11  summary:     Initial commit
   26.12  
   26.13 -$ \textbf{hg branches}
   26.14 +<prompt>$</prompt> <userinput>hg branches</userinput>
   26.15  default                        
   26.16 +</screen>

    27.1 --- a/en/examples/results/branch-named.commit.out	Mon Mar 09 21:37:47 2009 -0700
    27.2 +++ b/en/examples/results/branch-named.commit.out	Mon Mar 09 21:39:23 2009 -0700
    27.3 @@ -1,10 +1,11 @@
    27.4 -$ \textbf{echo 'hello again' >> myfile}
    27.5 -$ \textbf{hg commit -m 'Second commit'}
    27.6 -$ \textbf{hg tip}
    27.7 +<screen><prompt>$</prompt> <userinput>echo 'hello again' &gt;&gt; myfile</userinput>
    27.8 +<prompt>$</prompt> <userinput>hg commit -m 'Second commit'</userinput>
    27.9 +<prompt>$</prompt> <userinput>hg tip</userinput>
   27.10  changeset:   
   27.11  branch:      foo
   27.12  tag:         tip
   27.13 -user:        Bryan O'Sullivan <bos@serpentine.com>
   27.14 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   27.15  
   27.16  summary:     Second commit
   27.17  
   27.18 +</screen>

    28.1 --- a/en/examples/results/branch-named.create.out	Mon Mar 09 21:37:47 2009 -0700
    28.2 +++ b/en/examples/results/branch-named.create.out	Mon Mar 09 21:39:23 2009 -0700
    28.3 @@ -1,4 +1,5 @@
    28.4 -$ \textbf{hg branch foo}
    28.5 +<screen><prompt>$</prompt> <userinput>hg branch foo</userinput>
    28.6  marked working directory as branch foo
    28.7 -$ \textbf{hg branch}
    28.8 +<prompt>$</prompt> <userinput>hg branch</userinput>
    28.9  foo
   28.10 +</screen>

    29.1 --- a/en/examples/results/branch-named.foo-commit.out	Mon Mar 09 21:37:47 2009 -0700
    29.2 +++ b/en/examples/results/branch-named.foo-commit.out	Mon Mar 09 21:39:23 2009 -0700
    29.3 @@ -1,19 +1,20 @@
    29.4 -$ \textbf{echo something > somefile}
    29.5 -$ \textbf{hg commit -A -m 'New file'}
    29.6 +<screen><prompt>$</prompt> <userinput>echo something &gt; somefile</userinput>
    29.7 +<prompt>$</prompt> <userinput>hg commit -A -m 'New file'</userinput>
    29.8  adding somefile
    29.9  created new head
   29.10 -$ \textbf{hg heads}
   29.11 +<prompt>$</prompt> <userinput>hg heads</userinput>
   29.12  changeset:   
   29.13  branch:      foo
   29.14  tag:         tip
   29.15  parent:      
   29.16 -user:        Bryan O'Sullivan <bos@serpentine.com>
   29.17 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   29.18  
   29.19  summary:     New file
   29.20  
   29.21  changeset:   
   29.22  branch:      bar
   29.23 -user:        Bryan O'Sullivan <bos@serpentine.com>
   29.24 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   29.25  
   29.26  summary:     Third commit
   29.27  
   29.28 +</screen>

    30.1 --- a/en/examples/results/branch-named.merge.out	Mon Mar 09 21:37:47 2009 -0700
    30.2 +++ b/en/examples/results/branch-named.merge.out	Mon Mar 09 21:39:23 2009 -0700
    30.3 @@ -1,16 +1,17 @@
    30.4 -$ \textbf{hg branch}
    30.5 +<screen><prompt>$</prompt> <userinput>hg branch</userinput>
    30.6  bar
    30.7 -$ \textbf{hg merge foo}
    30.8 +<prompt>$</prompt> <userinput>hg merge foo</userinput>
    30.9  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   30.10  (branch merge, don't forget to commit)
   30.11 -$ \textbf{hg commit -m 'Merge'}
   30.12 -$ \textbf{hg tip}
   30.13 +<prompt>$</prompt> <userinput>hg commit -m 'Merge'</userinput>
   30.14 +<prompt>$</prompt> <userinput>hg tip</userinput>
   30.15  changeset:   
   30.16  branch:      bar
   30.17  tag:         tip
   30.18  parent:      
   30.19  parent:      
   30.20 -user:        Bryan O'Sullivan <bos@serpentine.com>
   30.21 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   30.22  
   30.23  summary:     Merge
   30.24  
   30.25 +</screen>

    31.1 --- a/en/examples/results/branch-named.parents.out	Mon Mar 09 21:37:47 2009 -0700
    31.2 +++ b/en/examples/results/branch-named.parents.out	Mon Mar 09 21:39:23 2009 -0700
    31.3 @@ -1,12 +1,13 @@
    31.4 -$ \textbf{hg parents}
    31.5 +<screen><prompt>$</prompt> <userinput>hg parents</userinput>
    31.6  changeset:   
    31.7  branch:      bar
    31.8  tag:         tip
    31.9 -user:        Bryan O'Sullivan <bos@serpentine.com>
   31.10 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   31.11  
   31.12  summary:     Third commit
   31.13  
   31.14 -$ \textbf{hg branches}
   31.15 +<prompt>$</prompt> <userinput>hg branches</userinput>
   31.16  bar                            
   31.17  foo                             (inactive)
   31.18  default                         (inactive)
   31.19 +</screen>

    32.1 --- a/en/examples/results/branch-named.rebranch.out	Mon Mar 09 21:37:47 2009 -0700
    32.2 +++ b/en/examples/results/branch-named.rebranch.out	Mon Mar 09 21:39:23 2009 -0700
    32.3 @@ -1,15 +1,16 @@
    32.4 -$ \textbf{hg branch}
    32.5 +<screen><prompt>$</prompt> <userinput>hg branch</userinput>
    32.6  foo
    32.7 -$ \textbf{hg branch bar}
    32.8 +<prompt>$</prompt> <userinput>hg branch bar</userinput>
    32.9  marked working directory as branch bar
   32.10 -$ \textbf{echo new file > newfile}
   32.11 -$ \textbf{hg commit -A -m 'Third commit'}
   32.12 +<prompt>$</prompt> <userinput>echo new file &gt; newfile</userinput>
   32.13 +<prompt>$</prompt> <userinput>hg commit -A -m 'Third commit'</userinput>
   32.14  adding newfile
   32.15 -$ \textbf{hg tip}
   32.16 +<prompt>$</prompt> <userinput>hg tip</userinput>
   32.17  changeset:   
   32.18  branch:      bar
   32.19  tag:         tip
   32.20 -user:        Bryan O'Sullivan <bos@serpentine.com>
   32.21 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   32.22  
   32.23  summary:     Third commit
   32.24  
   32.25 +</screen>

    33.1 --- a/en/examples/results/branch-named.status.out	Mon Mar 09 21:37:47 2009 -0700
    33.2 +++ b/en/examples/results/branch-named.status.out	Mon Mar 09 21:39:23 2009 -0700
    33.3 @@ -1,8 +1,9 @@
    33.4 -$ \textbf{hg status}
    33.5 -$ \textbf{hg tip}
    33.6 +<screen><prompt>$</prompt> <userinput>hg status</userinput>
    33.7 +<prompt>$</prompt> <userinput>hg tip</userinput>
    33.8  changeset:   
    33.9  tag:         tip
   33.10 -user:        Bryan O'Sullivan <bos@serpentine.com>
   33.11 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   33.12  
   33.13  summary:     Initial commit
   33.14  
   33.15 +</screen>

    34.1 --- a/en/examples/results/branch-named.update-bar.out	Mon Mar 09 21:37:47 2009 -0700
    34.2 +++ b/en/examples/results/branch-named.update-bar.out	Mon Mar 09 21:39:23 2009 -0700
    34.3 @@ -1,2 +1,3 @@
    34.4 -$ \textbf{hg update bar}
    34.5 +<screen><prompt>$</prompt> <userinput>hg update bar</userinput>
    34.6  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
    34.7 +</screen>

    35.1 --- a/en/examples/results/branch-named.update-nothing.out	Mon Mar 09 21:37:47 2009 -0700
    35.2 +++ b/en/examples/results/branch-named.update-nothing.out	Mon Mar 09 21:39:23 2009 -0700
    35.3 @@ -1,4 +1,5 @@
    35.4 -$ \textbf{hg update foo}
    35.5 +<screen><prompt>$</prompt> <userinput>hg update foo</userinput>
    35.6  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    35.7 -$ \textbf{hg update}
    35.8 +<prompt>$</prompt> <userinput>hg update</userinput>
    35.9  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   35.10 +</screen>

    36.1 --- a/en/examples/results/branch-named.update-switchy.out	Mon Mar 09 21:37:47 2009 -0700
    36.2 +++ b/en/examples/results/branch-named.update-switchy.out	Mon Mar 09 21:39:23 2009 -0700
    36.3 @@ -1,19 +1,20 @@
    36.4 -$ \textbf{hg update foo}
    36.5 +<screen><prompt>$</prompt> <userinput>hg update foo</userinput>
    36.6  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    36.7 -$ \textbf{hg parents}
    36.8 +<prompt>$</prompt> <userinput>hg parents</userinput>
    36.9  changeset:   
   36.10  branch:      foo
   36.11 -user:        Bryan O'Sullivan <bos@serpentine.com>
   36.12 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   36.13  
   36.14  summary:     Second commit
   36.15  
   36.16 -$ \textbf{hg update bar}
   36.17 +<prompt>$</prompt> <userinput>hg update bar</userinput>
   36.18  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   36.19 -$ \textbf{hg parents}
   36.20 +<prompt>$</prompt> <userinput>hg parents</userinput>
   36.21  changeset:   
   36.22  branch:      bar
   36.23  tag:         tip
   36.24 -user:        Bryan O'Sullivan <bos@serpentine.com>
   36.25 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   36.26  
   36.27  summary:     Third commit
   36.28  
   36.29 +</screen>

    37.1 --- a/en/examples/results/branch-repo.bugfix.out	Mon Mar 09 21:37:47 2009 -0700
    37.2 +++ b/en/examples/results/branch-repo.bugfix.out	Mon Mar 09 21:39:23 2009 -0700
    37.3 @@ -1,13 +1,14 @@
    37.4 -$ \textbf{hg clone myproject-1.0.1 my-1.0.1-bugfix}
    37.5 +<screen><prompt>$</prompt> <userinput>hg clone myproject-1.0.1 my-1.0.1-bugfix</userinput>
    37.6  updating working directory
    37.7  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
    37.8 -$ \textbf{cd my-1.0.1-bugfix}
    37.9 -$ \textbf{echo 'I fixed a bug using only echo!' >> myfile}
   37.10 -$ \textbf{hg commit -m 'Important fix for 1.0.1'}
   37.11 -$ \textbf{hg push}
   37.12 +<prompt>$</prompt> <userinput>cd my-1.0.1-bugfix</userinput>
   37.13 +<prompt>$</prompt> <userinput>echo 'I fixed a bug using only echo!' &gt;&gt; myfile</userinput>
   37.14 +<prompt>$</prompt> <userinput>hg commit -m 'Important fix for 1.0.1'</userinput>
   37.15 +<prompt>$</prompt> <userinput>hg push</userinput>
   37.16  pushing to 
   37.17  searching for changes
   37.18  adding changesets
   37.19  adding manifests
   37.20  adding file changes
   37.21  added 1 changesets with 1 changes to 1 files
   37.22 +</screen>

    38.1 --- a/en/examples/results/branch-repo.clone.out	Mon Mar 09 21:37:47 2009 -0700
    38.2 +++ b/en/examples/results/branch-repo.clone.out	Mon Mar 09 21:39:23 2009 -0700
    38.3 @@ -1,4 +1,5 @@
    38.4 -$ \textbf{cd ..}
    38.5 -$ \textbf{hg clone myproject myproject-1.0.1}
    38.6 +<screen><prompt>$</prompt> <userinput>cd ..</userinput>
    38.7 +<prompt>$</prompt> <userinput>hg clone myproject myproject-1.0.1</userinput>
    38.8  updating working directory
    38.9  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   38.10 +</screen>

    39.1 --- a/en/examples/results/branch-repo.merge.out	Mon Mar 09 21:37:47 2009 -0700
    39.2 +++ b/en/examples/results/branch-repo.merge.out	Mon Mar 09 21:39:23 2009 -0700
    39.3 @@ -1,11 +1,12 @@
    39.4 -$ \textbf{hg merge}
    39.5 +<screen><prompt>$</prompt> <userinput>hg merge</userinput>
    39.6  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    39.7  (branch merge, don't forget to commit)
    39.8 -$ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'}
    39.9 -$ \textbf{hg push}
   39.10 +<prompt>$</prompt> <userinput>hg commit -m 'Merge bugfix from 1.0.1 branch'</userinput>
   39.11 +<prompt>$</prompt> <userinput>hg push</userinput>
   39.12  pushing to 
   39.13  searching for changes
   39.14  adding changesets
   39.15  adding manifests
   39.16  adding file changes
   39.17  added 2 changesets with 1 changes to 1 files
   39.18 +</screen>

    40.1 --- a/en/examples/results/branch-repo.new.out	Mon Mar 09 21:37:47 2009 -0700
    40.2 +++ b/en/examples/results/branch-repo.new.out	Mon Mar 09 21:39:23 2009 -0700
    40.3 @@ -1,15 +1,16 @@
    40.4 -$ \textbf{cd ..}
    40.5 -$ \textbf{hg clone myproject my-feature}
    40.6 +<screen><prompt>$</prompt> <userinput>cd ..</userinput>
    40.7 +<prompt>$</prompt> <userinput>hg clone myproject my-feature</userinput>
    40.8  updating working directory
    40.9  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   40.10 -$ \textbf{cd my-feature}
   40.11 -$ \textbf{echo 'This sure is an exciting new feature!' > mynewfile}
   40.12 -$ \textbf{hg commit -A -m 'New feature'}
   40.13 +<prompt>$</prompt> <userinput>cd my-feature</userinput>
   40.14 +<prompt>$</prompt> <userinput>echo 'This sure is an exciting new feature!' &gt; mynewfile</userinput>
   40.15 +<prompt>$</prompt> <userinput>hg commit -A -m 'New feature'</userinput>
   40.16  adding mynewfile
   40.17 -$ \textbf{hg push}
   40.18 +<prompt>$</prompt> <userinput>hg push</userinput>
   40.19  pushing to 
   40.20  searching for changes
   40.21  adding changesets
   40.22  adding manifests
   40.23  adding file changes
   40.24  added 1 changesets with 1 changes to 1 files
   40.25 +</screen>

    41.1 --- a/en/examples/results/branch-repo.pull.out	Mon Mar 09 21:37:47 2009 -0700
    41.2 +++ b/en/examples/results/branch-repo.pull.out	Mon Mar 09 21:39:23 2009 -0700
    41.3 @@ -1,9 +1,9 @@
    41.4 -$ \textbf{cd ..}
    41.5 -$ \textbf{hg clone myproject myproject-merge}
    41.6 +<screen><prompt>$</prompt> <userinput>cd ..</userinput>
    41.7 +<prompt>$</prompt> <userinput>hg clone myproject myproject-merge</userinput>
    41.8  updating working directory
    41.9  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   41.10 -$ \textbf{cd myproject-merge}
   41.11 -$ \textbf{hg pull ../myproject-1.0.1}
   41.12 +<prompt>$</prompt> <userinput>cd myproject-merge</userinput>
   41.13 +<prompt>$</prompt> <userinput>hg pull ../myproject-1.0.1</userinput>
   41.14  pulling from ../myproject-1.0.1
   41.15  searching for changes
   41.16  adding changesets
   41.17 @@ -11,3 +11,4 @@
   41.18  adding file changes
   41.19  added 1 changesets with 1 changes to 1 files (+1 heads)
   41.20  (run 'hg heads' to see heads, 'hg merge' to merge)
   41.21 +</screen>

    42.1 --- a/en/examples/results/branch-repo.tag.out	Mon Mar 09 21:37:47 2009 -0700
    42.2 +++ b/en/examples/results/branch-repo.tag.out	Mon Mar 09 21:39:23 2009 -0700
    42.3 @@ -1,2 +1,3 @@
    42.4 -$ \textbf{cd myproject}
    42.5 -$ \textbf{hg tag v1.0}
    42.6 +<screen><prompt>$</prompt> <userinput>cd myproject</userinput>
    42.7 +<prompt>$</prompt> <userinput>hg tag v1.0</userinput>
    42.8 +</screen>

    43.1 --- a/en/examples/results/branching.clone.out	Mon Mar 09 21:37:47 2009 -0700
    43.2 +++ b/en/examples/results/branching.clone.out	Mon Mar 09 21:39:23 2009 -0700
    43.3 @@ -1,5 +1,5 @@
    43.4 -$ \textbf{cd ..}
    43.5 -$ \textbf{hg clone -rv1.0 main stable}
    43.6 +<screen><prompt>$</prompt> <userinput>cd ..</userinput>
    43.7 +<prompt>$</prompt> <userinput>hg clone -rv1.0 main stable</userinput>
    43.8  requesting all changes
    43.9  adding changesets
   43.10  adding manifests
   43.11 @@ -7,3 +7,4 @@
   43.12  added 1 changesets with 1 changes to 1 files
   43.13  updating working directory
   43.14  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   43.15 +</screen>

    44.1 --- a/en/examples/results/branching.init.out	Mon Mar 09 21:37:47 2009 -0700
    44.2 +++ b/en/examples/results/branching.init.out	Mon Mar 09 21:39:23 2009 -0700
    44.3 @@ -1,5 +1,6 @@
    44.4 -$ \textbf{hg init main}
    44.5 -$ \textbf{cd main}
    44.6 -$ \textbf{echo 'This is a boring feature.' > myfile}
    44.7 -$ \textbf{hg commit -A -m 'We have reached an important milestone!'}
    44.8 +<screen><prompt>$</prompt> <userinput>hg init main</userinput>
    44.9 +<prompt>$</prompt> <userinput>cd main</userinput>
   44.10 +<prompt>$</prompt> <userinput>echo 'This is a boring feature.' &gt; myfile</userinput>
   44.11 +<prompt>$</prompt> <userinput>hg commit -A -m 'We have reached an important milestone!'</userinput>
   44.12  adding myfile
   44.13 +</screen>

    45.1 --- a/en/examples/results/branching.main.out	Mon Mar 09 21:37:47 2009 -0700
    45.2 +++ b/en/examples/results/branching.main.out	Mon Mar 09 21:39:23 2009 -0700
    45.3 @@ -1,6 +1,7 @@
    45.4 -$ \textbf{cd ../main}
    45.5 -$ \textbf{echo 'This is exciting and new!' >> myfile}
    45.6 -$ \textbf{hg commit -m 'Add a new feature'}
    45.7 -$ \textbf{cat myfile}
    45.8 +<screen><prompt>$</prompt> <userinput>cd ../main</userinput>
    45.9 +<prompt>$</prompt> <userinput>echo 'This is exciting and new!' &gt;&gt; myfile</userinput>
   45.10 +<prompt>$</prompt> <userinput>hg commit -m 'Add a new feature'</userinput>
   45.11 +<prompt>$</prompt> <userinput>cat myfile</userinput>
   45.12  This is a boring feature.
   45.13  This is exciting and new!
   45.14 +</screen>

    46.1 --- a/en/examples/results/branching.merge.out	Mon Mar 09 21:37:47 2009 -0700
    46.2 +++ b/en/examples/results/branching.merge.out	Mon Mar 09 21:39:23 2009 -0700
    46.3 @@ -1,5 +1,5 @@
    46.4 -$ \textbf{cd ../main}
    46.5 -$ \textbf{hg pull ../stable}
    46.6 +<screen><prompt>$</prompt> <userinput>cd ../main</userinput>
    46.7 +<prompt>$</prompt> <userinput>hg pull ../stable</userinput>
    46.8  pulling from ../stable
    46.9  searching for changes
   46.10  adding changesets
   46.11 @@ -7,11 +7,12 @@
   46.12  adding file changes
   46.13  added 1 changesets with 1 changes to 1 files (+1 heads)
   46.14  (run 'hg heads' to see heads, 'hg merge' to merge)
   46.15 -$ \textbf{hg merge}
   46.16 +<prompt>$</prompt> <userinput>hg merge</userinput>
   46.17  merging myfile
   46.18  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   46.19  (branch merge, don't forget to commit)
   46.20 -$ \textbf{hg commit -m 'Bring in bugfix from stable branch'}
   46.21 -$ \textbf{cat myfile}
   46.22 +<prompt>$</prompt> <userinput>hg commit -m 'Bring in bugfix from stable branch'</userinput>
   46.23 +<prompt>$</prompt> <userinput>cat myfile</userinput>
   46.24  This is a fix to a boring feature.
   46.25  This is exciting and new!
   46.26 +</screen>

    47.1 --- a/en/examples/results/branching.stable.out	Mon Mar 09 21:37:47 2009 -0700
    47.2 +++ b/en/examples/results/branching.stable.out	Mon Mar 09 21:39:23 2009 -0700
    47.3 @@ -1,13 +1,14 @@
    47.4 -$ \textbf{hg clone stable stable-fix}
    47.5 +<screen><prompt>$</prompt> <userinput>hg clone stable stable-fix</userinput>
    47.6  updating working directory
    47.7  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    47.8 -$ \textbf{cd stable-fix}
    47.9 -$ \textbf{echo 'This is a fix to a boring feature.' > myfile}
   47.10 -$ \textbf{hg commit -m 'Fix a bug'}
   47.11 -$ \textbf{hg push}
   47.12 +<prompt>$</prompt> <userinput>cd stable-fix</userinput>
   47.13 +<prompt>$</prompt> <userinput>echo 'This is a fix to a boring feature.' &gt; myfile</userinput>
   47.14 +<prompt>$</prompt> <userinput>hg commit -m 'Fix a bug'</userinput>
   47.15 +<prompt>$</prompt> <userinput>hg push</userinput>
   47.16  pushing to 
   47.17  searching for changes
   47.18  adding changesets
   47.19  adding manifests
   47.20  adding file changes
   47.21  added 1 changesets with 1 changes to 1 files
   47.22 +</screen>

    48.1 --- a/en/examples/results/branching.tag.out	Mon Mar 09 21:37:47 2009 -0700
    48.2 +++ b/en/examples/results/branching.tag.out	Mon Mar 09 21:39:23 2009 -0700
    48.3 @@ -1,11 +1,12 @@
    48.4 -$ \textbf{hg tag v1.0}
    48.5 -$ \textbf{hg tip}
    48.6 +<screen><prompt>$</prompt> <userinput>hg tag v1.0</userinput>
    48.7 +<prompt>$</prompt> <userinput>hg tip</userinput>
    48.8  changeset:   
    48.9  tag:         tip
   48.10 -user:        Bryan O'Sullivan <bos@serpentine.com>
   48.11 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   48.12  
   48.13  summary:     Added tag v1.0 for changeset 
   48.14  
   48.15 -$ \textbf{hg tags}
   48.16 +<prompt>$</prompt> <userinput>hg tags</userinput>
   48.17  tip                                
   48.18  v1.0                               
   48.19 +</screen>

    49.1 --- a/en/examples/results/branching.update.out	Mon Mar 09 21:37:47 2009 -0700
    49.2 +++ b/en/examples/results/branching.update.out	Mon Mar 09 21:39:23 2009 -0700
    49.3 @@ -1,7 +1,8 @@
    49.4 -$ \textbf{cd ..}
    49.5 -$ \textbf{hg clone -U main main-old}
    49.6 -$ \textbf{cd main-old}
    49.7 -$ \textbf{hg update v1.0}
    49.8 +<screen><prompt>$</prompt> <userinput>cd ..</userinput>
    49.9 +<prompt>$</prompt> <userinput>hg clone -U main main-old</userinput>
   49.10 +<prompt>$</prompt> <userinput>cd main-old</userinput>
   49.11 +<prompt>$</prompt> <userinput>hg update v1.0</userinput>
   49.12  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   49.13 -$ \textbf{cat myfile}
   49.14 +<prompt>$</prompt> <userinput>cat myfile</userinput>
   49.15  This is a boring feature.
   49.16 +</screen>

    50.1 --- a/en/examples/results/cmdref.diff-p.out	Mon Mar 09 21:37:47 2009 -0700
    50.2 +++ b/en/examples/results/cmdref.diff-p.out	Mon Mar 09 21:39:23 2009 -0700
    50.3 @@ -1,22 +1,23 @@
    50.4 -$ \textbf{echo '[diff]' >> $HGRC}
    50.5 -$ \textbf{echo 'showfunc = False' >> $HGRC}
    50.6 -$ \textbf{hg diff}
    50.7 +<screen><prompt>$</prompt> <userinput>echo '[diff]' &gt;&gt; $HGRC</userinput>
    50.8 +<prompt>$</prompt> <userinput>echo 'showfunc = False' &gt;&gt; $HGRC</userinput>
    50.9 +<prompt>$</prompt> <userinput>hg diff</userinput>
   50.10  diff -r  myfile.c
   50.11  
   50.12  
   50.13  @@ -1,4 +1,4 @@
   50.14   int myfunc()
   50.15 - \{
   50.16 + {
   50.17  -    return 1;
   50.18  +    return 10;
   50.19 - \}
   50.20 -$ \textbf{hg diff -p}
   50.21 + }
   50.22 +<prompt>$</prompt> <userinput>hg diff -p</userinput>
   50.23  diff -r  myfile.c
   50.24  
   50.25  
   50.26  @@ -1,4 +1,4 @@
   50.27   int myfunc()
   50.28 - \{
   50.29 + {
   50.30  -    return 1;
   50.31  +    return 10;
   50.32 - \}
   50.33 + }
   50.34 +</screen>

    51.1 --- a/en/examples/results/daily.copy.after.out	Mon Mar 09 21:37:47 2009 -0700
    51.2 +++ b/en/examples/results/daily.copy.after.out	Mon Mar 09 21:39:23 2009 -0700
    51.3 @@ -1,2 +1,3 @@
    51.4 -$ \textbf{cp a z}
    51.5 -$ \textbf{hg copy --after a z}
    51.6 +<screen><prompt>$</prompt> <userinput>cp a z</userinput>
    51.7 +<prompt>$</prompt> <userinput>hg copy --after a z</userinput>
    51.8 +</screen>

    52.1 --- a/en/examples/results/daily.copy.cat.out	Mon Mar 09 21:37:47 2009 -0700
    52.2 +++ b/en/examples/results/daily.copy.cat.out	Mon Mar 09 21:39:23 2009 -0700
    52.3 @@ -1,5 +1,6 @@
    52.4 -$ \textbf{cat file}
    52.5 +<screen><prompt>$</prompt> <userinput>cat file</userinput>
    52.6  line
    52.7  new contents
    52.8 -$ \textbf{cat ../my-copy/new-file}
    52.9 +<prompt>$</prompt> <userinput>cat ../my-copy/new-file</userinput>
   52.10  line
   52.11 +</screen>

    53.1 --- a/en/examples/results/daily.copy.clone.out	Mon Mar 09 21:37:47 2009 -0700
    53.2 +++ b/en/examples/results/daily.copy.clone.out	Mon Mar 09 21:39:23 2009 -0700
    53.3 @@ -1,4 +1,5 @@
    53.4 -$ \textbf{cd ..}
    53.5 -$ \textbf{hg clone my-copy your-copy}
    53.6 +<screen><prompt>$</prompt> <userinput>cd ..</userinput>
    53.7 +<prompt>$</prompt> <userinput>hg clone my-copy your-copy</userinput>
    53.8  updating working directory
    53.9  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   53.10 +</screen>

    54.1 --- a/en/examples/results/daily.copy.copy.out	Mon Mar 09 21:37:47 2009 -0700
    54.2 +++ b/en/examples/results/daily.copy.copy.out	Mon Mar 09 21:39:23 2009 -0700
    54.3 @@ -1,2 +1,3 @@
    54.4 -$ \textbf{cd my-copy}
    54.5 -$ \textbf{hg copy file new-file}
    54.6 +<screen><prompt>$</prompt> <userinput>cd my-copy</userinput>
    54.7 +<prompt>$</prompt> <userinput>hg copy file new-file</userinput>
    54.8 +</screen>

    55.1 --- a/en/examples/results/daily.copy.dir-dest.out	Mon Mar 09 21:37:47 2009 -0700
    55.2 +++ b/en/examples/results/daily.copy.dir-dest.out	Mon Mar 09 21:39:23 2009 -0700
    55.3 @@ -1,4 +1,5 @@
    55.4 -$ \textbf{mkdir d}
    55.5 -$ \textbf{hg copy a b d}
    55.6 -$ \textbf{ls d}
    55.7 +<screen><prompt>$</prompt> <userinput>mkdir d</userinput>
    55.8 +<prompt>$</prompt> <userinput>hg copy a b d</userinput>
    55.9 +<prompt>$</prompt> <userinput>ls d</userinput>
   55.10  a  b
   55.11 +</screen>

    56.1 --- a/en/examples/results/daily.copy.dir-src-dest.out	Mon Mar 09 21:37:47 2009 -0700
    56.2 +++ b/en/examples/results/daily.copy.dir-src-dest.out	Mon Mar 09 21:39:23 2009 -0700
    56.3 @@ -1,2 +1,3 @@
    56.4 -$ \textbf{hg copy c d}
    56.5 +<screen><prompt>$</prompt> <userinput>hg copy c d</userinput>
    56.6  copying c/a/c to d/c/a/c
    56.7 +</screen>

    57.1 --- a/en/examples/results/daily.copy.dir-src.out	Mon Mar 09 21:37:47 2009 -0700
    57.2 +++ b/en/examples/results/daily.copy.dir-src.out	Mon Mar 09 21:39:23 2009 -0700
    57.3 @@ -1,2 +1,3 @@
    57.4 -$ \textbf{hg copy c e}
    57.5 +<screen><prompt>$</prompt> <userinput>hg copy c e</userinput>
    57.6  copying c/a/c to e/a/c
    57.7 +</screen>

    58.1 --- a/en/examples/results/daily.copy.init.out	Mon Mar 09 21:37:47 2009 -0700
    58.2 +++ b/en/examples/results/daily.copy.init.out	Mon Mar 09 21:39:23 2009 -0700
    58.3 @@ -1,5 +1,6 @@
    58.4 -$ \textbf{hg init my-copy}
    58.5 -$ \textbf{cd my-copy}
    58.6 -$ \textbf{echo line > file}
    58.7 -$ \textbf{hg add file}
    58.8 -$ \textbf{hg commit -m 'Added a file'}
    58.9 +<screen><prompt>$</prompt> <userinput>hg init my-copy</userinput>
   58.10 +<prompt>$</prompt> <userinput>cd my-copy</userinput>
   58.11 +<prompt>$</prompt> <userinput>echo line &gt; file</userinput>
   58.12 +<prompt>$</prompt> <userinput>hg add file</userinput>
   58.13 +<prompt>$</prompt> <userinput>hg commit -m 'Added a file'</userinput>
   58.14 +</screen>

    59.1 --- a/en/examples/results/daily.copy.merge.out	Mon Mar 09 21:37:47 2009 -0700
    59.2 +++ b/en/examples/results/daily.copy.merge.out	Mon Mar 09 21:39:23 2009 -0700
    59.3 @@ -1,4 +1,4 @@
    59.4 -$ \textbf{hg pull ../my-copy}
    59.5 +<screen><prompt>$</prompt> <userinput>hg pull ../my-copy</userinput>
    59.6  pulling from ../my-copy
    59.7  searching for changes
    59.8  adding changesets
    59.9 @@ -6,10 +6,11 @@
   59.10  adding file changes
   59.11  added 1 changesets with 1 changes to 1 files (+1 heads)
   59.12  (run 'hg heads' to see heads, 'hg merge' to merge)
   59.13 -$ \textbf{hg merge}
   59.14 +<prompt>$</prompt> <userinput>hg merge</userinput>
   59.15  merging file and new-file to new-file
   59.16  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   59.17  (branch merge, don't forget to commit)
   59.18 -$ \textbf{cat new-file}
   59.19 +<prompt>$</prompt> <userinput>cat new-file</userinput>
   59.20  line
   59.21  new contents
   59.22 +</screen>

    60.1 --- a/en/examples/results/daily.copy.other.out	Mon Mar 09 21:37:47 2009 -0700
    60.2 +++ b/en/examples/results/daily.copy.other.out	Mon Mar 09 21:39:23 2009 -0700
    60.3 @@ -1,3 +1,4 @@
    60.4 -$ \textbf{cd ../your-copy}
    60.5 -$ \textbf{echo 'new contents' >> file}
    60.6 -$ \textbf{hg commit -m 'Changed file'}
    60.7 +<screen><prompt>$</prompt> <userinput>cd ../your-copy</userinput>
    60.8 +<prompt>$</prompt> <userinput>echo 'new contents' &gt;&gt; file</userinput>
    60.9 +<prompt>$</prompt> <userinput>hg commit -m 'Changed file'</userinput>
   60.10 +</screen>

    61.1 --- a/en/examples/results/daily.copy.simple.out	Mon Mar 09 21:37:47 2009 -0700
    61.2 +++ b/en/examples/results/daily.copy.simple.out	Mon Mar 09 21:39:23 2009 -0700
    61.3 @@ -1,4 +1,5 @@
    61.4 -$ \textbf{mkdir k}
    61.5 -$ \textbf{hg copy a k}
    61.6 -$ \textbf{ls k}
    61.7 +<screen><prompt>$</prompt> <userinput>mkdir k</userinput>
    61.8 +<prompt>$</prompt> <userinput>hg copy a k</userinput>
    61.9 +<prompt>$</prompt> <userinput>ls k</userinput>
   61.10  a
   61.11 +</screen>

    62.1 --- a/en/examples/results/daily.copy.status-copy.out	Mon Mar 09 21:37:47 2009 -0700
    62.2 +++ b/en/examples/results/daily.copy.status-copy.out	Mon Mar 09 21:39:23 2009 -0700
    62.3 @@ -1,4 +1,5 @@
    62.4 -$ \textbf{hg status -C}
    62.5 +<screen><prompt>$</prompt> <userinput>hg status -C</userinput>
    62.6  A new-file
    62.7    file
    62.8 -$ \textbf{hg commit -m 'Copied file'}
    62.9 +<prompt>$</prompt> <userinput>hg commit -m 'Copied file'</userinput>
   62.10 +</screen>

    63.1 --- a/en/examples/results/daily.copy.status.out	Mon Mar 09 21:37:47 2009 -0700
    63.2 +++ b/en/examples/results/daily.copy.status.out	Mon Mar 09 21:39:23 2009 -0700
    63.3 @@ -1,2 +1,3 @@
    63.4 -$ \textbf{hg status}
    63.5 +<screen><prompt>$</prompt> <userinput>hg status</userinput>
    63.6  A new-file
    63.7 +</screen>

    64.1 --- a/en/examples/results/daily.files.add-dir.out	Mon Mar 09 21:37:47 2009 -0700
    64.2 +++ b/en/examples/results/daily.files.add-dir.out	Mon Mar 09 21:39:23 2009 -0700
    64.3 @@ -1,10 +1,11 @@
    64.4 -$ \textbf{mkdir b}
    64.5 -$ \textbf{echo b > b/b}
    64.6 -$ \textbf{echo c > b/c}
    64.7 -$ \textbf{mkdir b/d}
    64.8 -$ \textbf{echo d > b/d/d}
    64.9 -$ \textbf{hg add b}
   64.10 +<screen><prompt>$</prompt> <userinput>mkdir b</userinput>
   64.11 +<prompt>$</prompt> <userinput>echo b &gt; b/b</userinput>
   64.12 +<prompt>$</prompt> <userinput>echo c &gt; b/c</userinput>
   64.13 +<prompt>$</prompt> <userinput>mkdir b/d</userinput>
   64.14 +<prompt>$</prompt> <userinput>echo d &gt; b/d/d</userinput>
   64.15 +<prompt>$</prompt> <userinput>hg add b</userinput>
   64.16  adding b/b
   64.17  adding b/c
   64.18  adding b/d/d
   64.19 -$ \textbf{hg commit -m 'Added all files in subdirectory'}
   64.20 +<prompt>$</prompt> <userinput>hg commit -m 'Added all files in subdirectory'</userinput>
   64.21 +</screen>

    65.1 --- a/en/examples/results/daily.files.add.out	Mon Mar 09 21:37:47 2009 -0700
    65.2 +++ b/en/examples/results/daily.files.add.out	Mon Mar 09 21:39:23 2009 -0700
    65.3 @@ -1,10 +1,11 @@
    65.4 -$ \textbf{hg init add-example}
    65.5 -$ \textbf{cd add-example}
    65.6 -$ \textbf{echo a > a}
    65.7 -$ \textbf{hg status}
    65.8 +<screen><prompt>$</prompt> <userinput>hg init add-example</userinput>
    65.9 +<prompt>$</prompt> <userinput>cd add-example</userinput>
   65.10 +<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
   65.11 +<prompt>$</prompt> <userinput>hg status</userinput>
   65.12  ? a
   65.13 -$ \textbf{hg add a}
   65.14 -$ \textbf{hg status}
   65.15 +<prompt>$</prompt> <userinput>hg add a</userinput>
   65.16 +<prompt>$</prompt> <userinput>hg status</userinput>
   65.17  A a
   65.18 -$ \textbf{hg commit -m 'Added one file'}
   65.19 -$ \textbf{hg status}
   65.20 +<prompt>$</prompt> <userinput>hg commit -m 'Added one file'</userinput>
   65.21 +<prompt>$</prompt> <userinput>hg status</userinput>
   65.22 +</screen>

    66.1 --- a/en/examples/results/daily.files.addremove.out	Mon Mar 09 21:37:47 2009 -0700
    66.2 +++ b/en/examples/results/daily.files.addremove.out	Mon Mar 09 21:39:23 2009 -0700
    66.3 @@ -1,7 +1,8 @@
    66.4 -$ \textbf{hg init addremove-example}
    66.5 -$ \textbf{cd addremove-example}
    66.6 -$ \textbf{echo a > a}
    66.7 -$ \textbf{echo b > b}
    66.8 -$ \textbf{hg addremove}
    66.9 +<screen><prompt>$</prompt> <userinput>hg init addremove-example</userinput>
   66.10 +<prompt>$</prompt> <userinput>cd addremove-example</userinput>
   66.11 +<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
   66.12 +<prompt>$</prompt> <userinput>echo b &gt; b</userinput>
   66.13 +<prompt>$</prompt> <userinput>hg addremove</userinput>
   66.14  adding a
   66.15  adding b
   66.16 +</screen>

    67.1 --- a/en/examples/results/daily.files.commit-addremove.out	Mon Mar 09 21:37:47 2009 -0700
    67.2 +++ b/en/examples/results/daily.files.commit-addremove.out	Mon Mar 09 21:39:23 2009 -0700
    67.3 @@ -1,3 +1,4 @@
    67.4 -$ \textbf{echo c > c}
    67.5 -$ \textbf{hg commit -A -m 'Commit with addremove'}
    67.6 +<screen><prompt>$</prompt> <userinput>echo c &gt; c</userinput>
    67.7 +<prompt>$</prompt> <userinput>hg commit -A -m 'Commit with addremove'</userinput>
    67.8  adding c
    67.9 +</screen>

    68.1 --- a/en/examples/results/daily.files.hidden.out	Mon Mar 09 21:37:47 2009 -0700
    68.2 +++ b/en/examples/results/daily.files.hidden.out	Mon Mar 09 21:39:23 2009 -0700
    68.3 @@ -1,14 +1,15 @@
    68.4 -$ \textbf{hg init hidden-example}
    68.5 -$ \textbf{cd hidden-example}
    68.6 -$ \textbf{mkdir empty}
    68.7 -$ \textbf{touch empty/.hidden}
    68.8 -$ \textbf{hg add empty/.hidden}
    68.9 -$ \textbf{hg commit -m 'Manage an empty-looking directory'}
   68.10 -$ \textbf{ls empty}
   68.11 -$ \textbf{cd ..}
   68.12 -$ \textbf{hg clone hidden-example tmp}
   68.13 +<screen><prompt>$</prompt> <userinput>hg init hidden-example</userinput>
   68.14 +<prompt>$</prompt> <userinput>cd hidden-example</userinput>
   68.15 +<prompt>$</prompt> <userinput>mkdir empty</userinput>
   68.16 +<prompt>$</prompt> <userinput>touch empty/.hidden</userinput>
   68.17 +<prompt>$</prompt> <userinput>hg add empty/.hidden</userinput>
   68.18 +<prompt>$</prompt> <userinput>hg commit -m 'Manage an empty-looking directory'</userinput>
   68.19 +<prompt>$</prompt> <userinput>ls empty</userinput>
   68.20 +<prompt>$</prompt> <userinput>cd ..</userinput>
   68.21 +<prompt>$</prompt> <userinput>hg clone hidden-example tmp</userinput>
   68.22  updating working directory
   68.23  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   68.24 -$ \textbf{ls tmp}
   68.25 +<prompt>$</prompt> <userinput>ls tmp</userinput>
   68.26  empty
   68.27 -$ \textbf{ls tmp/empty}
   68.28 +<prompt>$</prompt> <userinput>ls tmp/empty</userinput>
   68.29 +</screen>

    69.1 --- a/en/examples/results/daily.files.missing.out	Mon Mar 09 21:37:47 2009 -0700
    69.2 +++ b/en/examples/results/daily.files.missing.out	Mon Mar 09 21:39:23 2009 -0700
    69.3 @@ -1,8 +1,9 @@
    69.4 -$ \textbf{hg init missing-example}
    69.5 -$ \textbf{cd missing-example}
    69.6 -$ \textbf{echo a > a}
    69.7 -$ \textbf{hg add a}
    69.8 -$ \textbf{hg commit -m 'File about to be missing'}
    69.9 -$ \textbf{rm a}
   69.10 -$ \textbf{hg status}
   69.11 +<screen><prompt>$</prompt> <userinput>hg init missing-example</userinput>
   69.12 +<prompt>$</prompt> <userinput>cd missing-example</userinput>
   69.13 +<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
   69.14 +<prompt>$</prompt> <userinput>hg add a</userinput>
   69.15 +<prompt>$</prompt> <userinput>hg commit -m 'File about to be missing'</userinput>
   69.16 +<prompt>$</prompt> <userinput>rm a</userinput>
   69.17 +<prompt>$</prompt> <userinput>hg status</userinput>
   69.18  ! a
   69.19 +</screen>

    70.1 --- a/en/examples/results/daily.files.recover-missing.out	Mon Mar 09 21:37:47 2009 -0700
    70.2 +++ b/en/examples/results/daily.files.recover-missing.out	Mon Mar 09 21:39:23 2009 -0700
    70.3 @@ -1,4 +1,5 @@
    70.4 -$ \textbf{hg revert a}
    70.5 -$ \textbf{cat a}
    70.6 +<screen><prompt>$</prompt> <userinput>hg revert a</userinput>
    70.7 +<prompt>$</prompt> <userinput>cat a</userinput>
    70.8  a
    70.9 -$ \textbf{hg status}
   70.10 +<prompt>$</prompt> <userinput>hg status</userinput>
   70.11 +</screen>

    71.1 --- a/en/examples/results/daily.files.remove-after.out	Mon Mar 09 21:37:47 2009 -0700
    71.2 +++ b/en/examples/results/daily.files.remove-after.out	Mon Mar 09 21:39:23 2009 -0700
    71.3 @@ -1,3 +1,4 @@
    71.4 -$ \textbf{hg remove --after a}
    71.5 -$ \textbf{hg status}
    71.6 +<screen><prompt>$</prompt> <userinput>hg remove --after a</userinput>
    71.7 +<prompt>$</prompt> <userinput>hg status</userinput>
    71.8  R a
    71.9 +</screen>

    72.1 --- a/en/examples/results/daily.files.remove.out	Mon Mar 09 21:37:47 2009 -0700
    72.2 +++ b/en/examples/results/daily.files.remove.out	Mon Mar 09 21:39:23 2009 -0700
    72.3 @@ -1,13 +1,14 @@
    72.4 -$ \textbf{hg init remove-example}
    72.5 -$ \textbf{cd remove-example}
    72.6 -$ \textbf{echo a > a}
    72.7 -$ \textbf{mkdir b}
    72.8 -$ \textbf{echo b > b/b}
    72.9 -$ \textbf{hg add a b}
   72.10 +<screen><prompt>$</prompt> <userinput>hg init remove-example</userinput>
   72.11 +<prompt>$</prompt> <userinput>cd remove-example</userinput>
   72.12 +<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
   72.13 +<prompt>$</prompt> <userinput>mkdir b</userinput>
   72.14 +<prompt>$</prompt> <userinput>echo b &gt; b/b</userinput>
   72.15 +<prompt>$</prompt> <userinput>hg add a b</userinput>
   72.16  adding b/b
   72.17 -$ \textbf{hg commit -m 'Small example for file removal'}
   72.18 -$ \textbf{hg remove a}
   72.19 -$ \textbf{hg status}
   72.20 +<prompt>$</prompt> <userinput>hg commit -m 'Small example for file removal'</userinput>
   72.21 +<prompt>$</prompt> <userinput>hg remove a</userinput>
   72.22 +<prompt>$</prompt> <userinput>hg status</userinput>
   72.23  R a
   72.24 -$ \textbf{hg remove b}
   72.25 +<prompt>$</prompt> <userinput>hg remove b</userinput>
   72.26  removing b/b
   72.27 +</screen>

    73.1 --- a/en/examples/results/daily.rename.rename.out	Mon Mar 09 21:37:47 2009 -0700
    73.2 +++ b/en/examples/results/daily.rename.rename.out	Mon Mar 09 21:39:23 2009 -0700
    73.3 @@ -1,1 +1,2 @@
    73.4 -$ \textbf{hg rename a b}
    73.5 +<screen><prompt>$</prompt> <userinput>hg rename a b</userinput>
    73.6 +</screen>

    74.1 --- a/en/examples/results/daily.rename.status-copy.out	Mon Mar 09 21:37:47 2009 -0700
    74.2 +++ b/en/examples/results/daily.rename.status-copy.out	Mon Mar 09 21:39:23 2009 -0700
    74.3 @@ -1,4 +1,5 @@
    74.4 -$ \textbf{hg status -C}
    74.5 +<screen><prompt>$</prompt> <userinput>hg status -C</userinput>
    74.6  A b
    74.7    a
    74.8  R a
    74.9 +</screen>

    75.1 --- a/en/examples/results/daily.rename.status.out	Mon Mar 09 21:37:47 2009 -0700
    75.2 +++ b/en/examples/results/daily.rename.status.out	Mon Mar 09 21:39:23 2009 -0700
    75.3 @@ -1,3 +1,4 @@
    75.4 -$ \textbf{hg status}
    75.5 +<screen><prompt>$</prompt> <userinput>hg status</userinput>
    75.6  A b
    75.7  R a
    75.8 +</screen>

    76.1 --- a/en/examples/results/daily.revert.add.out	Mon Mar 09 21:37:47 2009 -0700
    76.2 +++ b/en/examples/results/daily.revert.add.out	Mon Mar 09 21:39:23 2009 -0700
    76.3 @@ -1,7 +1,8 @@
    76.4 -$ \textbf{echo oops > oops}
    76.5 -$ \textbf{hg add oops}
    76.6 -$ \textbf{hg status oops}
    76.7 +<screen><prompt>$</prompt> <userinput>echo oops &gt; oops</userinput>
    76.8 +<prompt>$</prompt> <userinput>hg add oops</userinput>
    76.9 +<prompt>$</prompt> <userinput>hg status oops</userinput>
   76.10  A oops
   76.11 -$ \textbf{hg revert oops}
   76.12 -$ \textbf{hg status}
   76.13 +<prompt>$</prompt> <userinput>hg revert oops</userinput>
   76.14 +<prompt>$</prompt> <userinput>hg status</userinput>
   76.15  ? oops
   76.16 +</screen>

    77.1 --- a/en/examples/results/daily.revert.copy.out	Mon Mar 09 21:37:47 2009 -0700
    77.2 +++ b/en/examples/results/daily.revert.copy.out	Mon Mar 09 21:39:23 2009 -0700
    77.3 @@ -1,4 +1,5 @@
    77.4 -$ \textbf{hg copy file new-file}
    77.5 -$ \textbf{hg revert new-file}
    77.6 -$ \textbf{hg status}
    77.7 +<screen><prompt>$</prompt> <userinput>hg copy file new-file</userinput>
    77.8 +<prompt>$</prompt> <userinput>hg revert new-file</userinput>
    77.9 +<prompt>$</prompt> <userinput>hg status</userinput>
   77.10  ? new-file
   77.11 +</screen>

    78.1 --- a/en/examples/results/daily.revert.missing.out	Mon Mar 09 21:37:47 2009 -0700
    78.2 +++ b/en/examples/results/daily.revert.missing.out	Mon Mar 09 21:39:23 2009 -0700
    78.3 @@ -1,6 +1,7 @@
    78.4 -$ \textbf{rm file}
    78.5 -$ \textbf{hg status}
    78.6 +<screen><prompt>$</prompt> <userinput>rm file</userinput>
    78.7 +<prompt>$</prompt> <userinput>hg status</userinput>
    78.8  ! file
    78.9 -$ \textbf{hg revert file}
   78.10 -$ \textbf{ls file}
   78.11 +<prompt>$</prompt> <userinput>hg revert file</userinput>
   78.12 +<prompt>$</prompt> <userinput>ls file</userinput>
   78.13  file
   78.14 +</screen>

    79.1 --- a/en/examples/results/daily.revert.modify.out	Mon Mar 09 21:37:47 2009 -0700
    79.2 +++ b/en/examples/results/daily.revert.modify.out	Mon Mar 09 21:39:23 2009 -0700
    79.3 @@ -1,10 +1,11 @@
    79.4 -$ \textbf{cat file}
    79.5 +<screen><prompt>$</prompt> <userinput>cat file</userinput>
    79.6  original content
    79.7 -$ \textbf{echo unwanted change >> file}
    79.8 -$ \textbf{hg diff file}
    79.9 +<prompt>$</prompt> <userinput>echo unwanted change &gt;&gt; file</userinput>
   79.10 +<prompt>$</prompt> <userinput>hg diff file</userinput>
   79.11  diff -r  file
   79.12  
   79.13  
   79.14  @@ -1,1 +1,2 @@
   79.15   original content
   79.16  +unwanted change
   79.17 +</screen>

    80.1 --- a/en/examples/results/daily.revert.remove.out	Mon Mar 09 21:37:47 2009 -0700
    80.2 +++ b/en/examples/results/daily.revert.remove.out	Mon Mar 09 21:39:23 2009 -0700
    80.3 @@ -1,7 +1,8 @@
    80.4 -$ \textbf{hg remove file}
    80.5 -$ \textbf{hg status}
    80.6 +<screen><prompt>$</prompt> <userinput>hg remove file</userinput>
    80.7 +<prompt>$</prompt> <userinput>hg status</userinput>
    80.8  R file
    80.9 -$ \textbf{hg revert file}
   80.10 -$ \textbf{hg status}
   80.11 -$ \textbf{ls file}
   80.12 +<prompt>$</prompt> <userinput>hg revert file</userinput>
   80.13 +<prompt>$</prompt> <userinput>hg status</userinput>
   80.14 +<prompt>$</prompt> <userinput>ls file</userinput>
   80.15  file
   80.16 +</screen>

    81.1 --- a/en/examples/results/daily.revert.rename-orig.out	Mon Mar 09 21:37:47 2009 -0700
    81.2 +++ b/en/examples/results/daily.revert.rename-orig.out	Mon Mar 09 21:39:23 2009 -0700
    81.3 @@ -1,4 +1,5 @@
    81.4 -$ \textbf{hg revert file}
    81.5 +<screen><prompt>$</prompt> <userinput>hg revert file</userinput>
    81.6  no changes needed to file
    81.7 -$ \textbf{hg status}
    81.8 +<prompt>$</prompt> <userinput>hg status</userinput>
    81.9  ? new-file
   81.10 +</screen>

    82.1 --- a/en/examples/results/daily.revert.rename.out	Mon Mar 09 21:37:47 2009 -0700
    82.2 +++ b/en/examples/results/daily.revert.rename.out	Mon Mar 09 21:39:23 2009 -0700
    82.3 @@ -1,4 +1,5 @@
    82.4 -$ \textbf{hg rename file new-file}
    82.5 -$ \textbf{hg revert new-file}
    82.6 -$ \textbf{hg status}
    82.7 +<screen><prompt>$</prompt> <userinput>hg rename file new-file</userinput>
    82.8 +<prompt>$</prompt> <userinput>hg revert new-file</userinput>
    82.9 +<prompt>$</prompt> <userinput>hg status</userinput>
   82.10  ? new-file
   82.11 +</screen>

    83.1 --- a/en/examples/results/daily.revert.status.out	Mon Mar 09 21:37:47 2009 -0700
    83.2 +++ b/en/examples/results/daily.revert.status.out	Mon Mar 09 21:39:23 2009 -0700
    83.3 @@ -1,5 +1,6 @@
    83.4 -$ \textbf{hg status}
    83.5 +<screen><prompt>$</prompt> <userinput>hg status</userinput>
    83.6  ? file.orig
    83.7 -$ \textbf{cat file.orig}
    83.8 +<prompt>$</prompt> <userinput>cat file.orig</userinput>
    83.9  original content
   83.10  unwanted change
   83.11 +</screen>

    84.1 --- a/en/examples/results/daily.revert.unmodify.out	Mon Mar 09 21:37:47 2009 -0700
    84.2 +++ b/en/examples/results/daily.revert.unmodify.out	Mon Mar 09 21:39:23 2009 -0700
    84.3 @@ -1,5 +1,6 @@
    84.4 -$ \textbf{hg status}
    84.5 +<screen><prompt>$</prompt> <userinput>hg status</userinput>
    84.6  M file
    84.7 -$ \textbf{hg revert file}
    84.8 -$ \textbf{cat file}
    84.9 +<prompt>$</prompt> <userinput>hg revert file</userinput>
   84.10 +<prompt>$</prompt> <userinput>cat file</userinput>
   84.11  original content
   84.12 +</screen>

    85.1 --- a/en/examples/results/extdiff.diff.out	Mon Mar 09 21:37:47 2009 -0700
    85.2 +++ b/en/examples/results/extdiff.diff.out	Mon Mar 09 21:39:23 2009 -0700
    85.3 @@ -1,7 +1,8 @@
    85.4 -$ \textbf{hg diff}
    85.5 +<screen><prompt>$</prompt> <userinput>hg diff</userinput>
    85.6  diff -r  myfile
    85.7  
    85.8  
    85.9  @@ -1,1 +1,2 @@
   85.10   The first line.
   85.11  +The second line.
   85.12 +</screen>

    86.1 --- a/en/examples/results/extdiff.extdiff-ctx.out	Mon Mar 09 21:37:47 2009 -0700
    86.2 +++ b/en/examples/results/extdiff.extdiff-ctx.out	Mon Mar 09 21:39:23 2009 -0700
    86.3 @@ -1,4 +1,4 @@
    86.4 -$ \textbf{hg extdiff -o -NprcC5}
    86.5 +<screen><prompt>$</prompt> <userinput>hg extdiff -o -NprcC5</userinput>
    86.6  
    86.7  
    86.8  ***************
    86.9 @@ -6,3 +6,4 @@
   86.10  
   86.11    The first line.
   86.12  + The second line.
   86.13 +</screen>

    87.1 --- a/en/examples/results/extdiff.extdiff.out	Mon Mar 09 21:37:47 2009 -0700
    87.2 +++ b/en/examples/results/extdiff.extdiff.out	Mon Mar 09 21:39:23 2009 -0700
    87.3 @@ -1,6 +1,7 @@
    87.4 -$ \textbf{hg extdiff}
    87.5 +<screen><prompt>$</prompt> <userinput>hg extdiff</userinput>
    87.6  
    87.7  
    87.8  @@ -1 +1,2 @@
    87.9   The first line.
   87.10  +The second line.
   87.11 +</screen>

    88.1 --- a/en/examples/results/filenames.dirs.out	Mon Mar 09 21:37:47 2009 -0700
    88.2 +++ b/en/examples/results/filenames.dirs.out	Mon Mar 09 21:39:23 2009 -0700
    88.3 @@ -1,5 +1,6 @@
    88.4 -$ \textbf{hg status src}
    88.5 +<screen><prompt>$</prompt> <userinput>hg status src</userinput>
    88.6  ? src/main.py
    88.7  ? src/watcher/_watcher.c
    88.8  ? src/watcher/watcher.py
    88.9  ? src/xyzzy.txt
   88.10 +</screen>

    89.1 --- a/en/examples/results/filenames.files.out	Mon Mar 09 21:37:47 2009 -0700
    89.2 +++ b/en/examples/results/filenames.files.out	Mon Mar 09 21:39:23 2009 -0700
    89.3 @@ -1,1 +1,2 @@
    89.4 -$ \textbf{hg add COPYING README examples/simple.py}
    89.5 +<screen><prompt>$</prompt> <userinput>hg add COPYING README examples/simple.py</userinput>
    89.6 +</screen>

    90.1 --- a/en/examples/results/filenames.filter.exclude.out	Mon Mar 09 21:37:47 2009 -0700
    90.2 +++ b/en/examples/results/filenames.filter.exclude.out	Mon Mar 09 21:39:23 2009 -0700
    90.3 @@ -1,3 +1,4 @@
    90.4 -$ \textbf{hg status -X '**.py' src}
    90.5 +<screen><prompt>$</prompt> <userinput>hg status -X '**.py' src</userinput>
    90.6  ? src/watcher/_watcher.c
    90.7  ? src/xyzzy.txt
    90.8 +</screen>

    91.1 --- a/en/examples/results/filenames.filter.include.out	Mon Mar 09 21:37:47 2009 -0700
    91.2 +++ b/en/examples/results/filenames.filter.include.out	Mon Mar 09 21:39:23 2009 -0700
    91.3 @@ -1,2 +1,3 @@
    91.4 -$ \textbf{hg status -I '*.in'}
    91.5 +<screen><prompt>$</prompt> <userinput>hg status -I '*.in'</userinput>
    91.6  ? MANIFEST.in
    91.7 +</screen>

    92.1 --- a/en/examples/results/filenames.glob.group.out	Mon Mar 09 21:37:47 2009 -0700
    92.2 +++ b/en/examples/results/filenames.glob.group.out	Mon Mar 09 21:39:23 2009 -0700
    92.3 @@ -1,3 +1,4 @@
    92.4 -$ \textbf{hg status 'glob:*.\{in,py\}'}
    92.5 +<screen><prompt>$</prompt> <userinput>hg status 'glob:*.{in,py}'</userinput>
    92.6  ? MANIFEST.in
    92.7  ? setup.py
    92.8 +</screen>

    93.1 --- a/en/examples/results/filenames.glob.question.out	Mon Mar 09 21:37:47 2009 -0700
    93.2 +++ b/en/examples/results/filenames.glob.question.out	Mon Mar 09 21:39:23 2009 -0700
    93.3 @@ -1,2 +1,3 @@
    93.4 -$ \textbf{hg status 'glob:**.?'}
    93.5 +<screen><prompt>$</prompt> <userinput>hg status 'glob:**.?'</userinput>
    93.6  ? src/watcher/_watcher.c
    93.7 +</screen>

    94.1 --- a/en/examples/results/filenames.glob.range.out	Mon Mar 09 21:37:47 2009 -0700
    94.2 +++ b/en/examples/results/filenames.glob.range.out	Mon Mar 09 21:39:23 2009 -0700
    94.3 @@ -1,3 +1,4 @@
    94.4 -$ \textbf{hg status 'glob:**[nr-t]'}
    94.5 +<screen><prompt>$</prompt> <userinput>hg status 'glob:**[nr-t]'</userinput>
    94.6  ? MANIFEST.in
    94.7  ? src/xyzzy.txt
    94.8 +</screen>

    95.1 --- a/en/examples/results/filenames.glob.star-starstar.out	Mon Mar 09 21:37:47 2009 -0700
    95.2 +++ b/en/examples/results/filenames.glob.star-starstar.out	Mon Mar 09 21:39:23 2009 -0700
    95.3 @@ -1,8 +1,9 @@
    95.4 -$ \textbf{hg status 'glob:*.py'}
    95.5 +<screen><prompt>$</prompt> <userinput>hg status 'glob:*.py'</userinput>
    95.6  ? setup.py
    95.7 -$ \textbf{hg status 'glob:**.py'}
    95.8 +<prompt>$</prompt> <userinput>hg status 'glob:**.py'</userinput>
    95.9  A examples/simple.py
   95.10  A src/main.py
   95.11  ? examples/performant.py
   95.12  ? setup.py
   95.13  ? src/watcher/watcher.py
   95.14 +</screen>

    96.1 --- a/en/examples/results/filenames.glob.star.out	Mon Mar 09 21:37:47 2009 -0700
    96.2 +++ b/en/examples/results/filenames.glob.star.out	Mon Mar 09 21:39:23 2009 -0700
    96.3 @@ -1,2 +1,3 @@
    96.4 -$ \textbf{hg add 'glob:*.py'}
    96.5 +<screen><prompt>$</prompt> <userinput>hg add 'glob:*.py'</userinput>
    96.6  adding main.py
    96.7 +</screen>

    97.1 --- a/en/examples/results/filenames.glob.starstar.out	Mon Mar 09 21:37:47 2009 -0700
    97.2 +++ b/en/examples/results/filenames.glob.starstar.out	Mon Mar 09 21:39:23 2009 -0700
    97.3 @@ -1,7 +1,8 @@
    97.4 -$ \textbf{cd ..}
    97.5 -$ \textbf{hg status 'glob:**.py'}
    97.6 +<screen><prompt>$</prompt> <userinput>cd ..</userinput>
    97.7 +<prompt>$</prompt> <userinput>hg status 'glob:**.py'</userinput>
    97.8  A examples/simple.py
    97.9  A src/main.py
   97.10  ? examples/performant.py
   97.11  ? setup.py
   97.12  ? src/watcher/watcher.py
   97.13 +</screen>

    98.1 --- a/en/examples/results/filenames.wdir-relname.out	Mon Mar 09 21:37:47 2009 -0700
    98.2 +++ b/en/examples/results/filenames.wdir-relname.out	Mon Mar 09 21:39:23 2009 -0700
    98.3 @@ -1,4 +1,4 @@
    98.4 -$ \textbf{hg status}
    98.5 +<screen><prompt>$</prompt> <userinput>hg status</userinput>
    98.6  A COPYING
    98.7  A README
    98.8  A examples/simple.py
    98.9 @@ -9,7 +9,7 @@
   98.10  ? src/watcher/_watcher.c
   98.11  ? src/watcher/watcher.py
   98.12  ? src/xyzzy.txt
   98.13 -$ \textbf{hg status `hg root`}
   98.14 +<prompt>$</prompt> <userinput>hg status `hg root`</userinput>
   98.15  A ../COPYING
   98.16  A ../README
   98.17  A ../examples/simple.py
   98.18 @@ -20,3 +20,4 @@
   98.19  ? watcher/_watcher.c
   98.20  ? watcher/watcher.py
   98.21  ? xyzzy.txt
   98.22 +</screen>

    99.1 --- a/en/examples/results/filenames.wdir-subdir.out	Mon Mar 09 21:37:47 2009 -0700
    99.2 +++ b/en/examples/results/filenames.wdir-subdir.out	Mon Mar 09 21:39:23 2009 -0700
    99.3 @@ -1,5 +1,5 @@
    99.4 -$ \textbf{cd src}
    99.5 -$ \textbf{hg add -n}
    99.6 +<screen><prompt>$</prompt> <userinput>cd src</userinput>
    99.7 +<prompt>$</prompt> <userinput>hg add -n</userinput>
    99.8  adding ../MANIFEST.in
    99.9  adding ../examples/performant.py
   99.10  adding ../setup.py
   99.11 @@ -7,8 +7,9 @@
   99.12  adding watcher/_watcher.c
   99.13  adding watcher/watcher.py
   99.14  adding xyzzy.txt
   99.15 -$ \textbf{hg add -n .}
   99.16 +<prompt>$</prompt> <userinput>hg add -n .</userinput>
   99.17  adding main.py
   99.18  adding watcher/_watcher.c
   99.19  adding watcher/watcher.py
   99.20  adding xyzzy.txt
   99.21 +</screen>

   100.1 --- a/en/examples/results/hook.msglen.go.out	Mon Mar 09 21:37:47 2009 -0700
   100.2 +++ b/en/examples/results/hook.msglen.go.out	Mon Mar 09 21:39:23 2009 -0700
   100.3 @@ -1,10 +1,11 @@
   100.4 -$ \textbf{cat .hg/hgrc}
   100.5 +<screen><prompt>$</prompt> <userinput>cat .hg/hgrc</userinput>
   100.6  [hooks]
   100.7 -pretxncommit.msglen = test `hg tip --template \{desc\} | wc -c` -ge 10
   100.8 -$ \textbf{echo a > a}
   100.9 -$ \textbf{hg add a}
  100.10 -$ \textbf{hg commit -A -m 'too short'}
  100.11 +pretxncommit.msglen = test `hg tip --template {desc} | wc -c` -ge 10
  100.12 +<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
  100.13 +<prompt>$</prompt> <userinput>hg add a</userinput>
  100.14 +<prompt>$</prompt> <userinput>hg commit -A -m 'too short'</userinput>
  100.15  transaction abort!
  100.16  rollback completed
  100.17  abort: pretxncommit.msglen hook exited with status 1
  100.18 -$ \textbf{hg commit -A -m 'long enough'}
  100.19 +<prompt>$</prompt> <userinput>hg commit -A -m 'long enough'</userinput>
  100.20 +</screen>

   101.1 --- a/en/examples/results/hook.simple.ext.out	Mon Mar 09 21:37:47 2009 -0700
   101.2 +++ b/en/examples/results/hook.simple.ext.out	Mon Mar 09 21:39:23 2009 -0700
   101.3 @@ -1,5 +1,6 @@
   101.4 -$ \textbf{echo 'commit.when = echo -n "date of commit: "; date' >> .hg/hgrc}
   101.5 -$ \textbf{echo a >> a}
   101.6 -$ \textbf{hg commit -m 'i have two hooks'}
   101.7 +<screen><prompt>$</prompt> <userinput>echo 'commit.when = echo -n "date of commit: "; date' &gt;&gt; .hg/hgrc</userinput>
   101.8 +<prompt>$</prompt> <userinput>echo a &gt;&gt; a</userinput>
   101.9 +<prompt>$</prompt> <userinput>hg commit -m 'i have two hooks'</userinput>
  101.10  committed 
  101.11  
  101.12 +</screen>

   102.1 --- a/en/examples/results/hook.simple.init.out	Mon Mar 09 21:37:47 2009 -0700
   102.2 +++ b/en/examples/results/hook.simple.init.out	Mon Mar 09 21:39:23 2009 -0700
   102.3 @@ -1,11 +1,12 @@
   102.4 -$ \textbf{hg init hook-test}
   102.5 -$ \textbf{cd hook-test}
   102.6 -$ \textbf{echo '[hooks]' >> .hg/hgrc}
   102.7 -$ \textbf{echo 'commit = echo committed $HG_NODE' >> .hg/hgrc}
   102.8 -$ \textbf{cat .hg/hgrc}
   102.9 +<screen><prompt>$</prompt> <userinput>hg init hook-test</userinput>
  102.10 +<prompt>$</prompt> <userinput>cd hook-test</userinput>
  102.11 +<prompt>$</prompt> <userinput>echo '[hooks]' &gt;&gt; .hg/hgrc</userinput>
  102.12 +<prompt>$</prompt> <userinput>echo 'commit = echo committed $HG_NODE' &gt;&gt; .hg/hgrc</userinput>
  102.13 +<prompt>$</prompt> <userinput>cat .hg/hgrc</userinput>
  102.14  [hooks]
  102.15  commit = echo committed $HG_NODE
  102.16 -$ \textbf{echo a > a}
  102.17 -$ \textbf{hg add a}
  102.18 -$ \textbf{hg commit -m 'testing commit hook'}
  102.19 +<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
  102.20 +<prompt>$</prompt> <userinput>hg add a</userinput>
  102.21 +<prompt>$</prompt> <userinput>hg commit -m 'testing commit hook'</userinput>
  102.22  committed 
  102.23 +</screen>

   103.1 --- a/en/examples/results/hook.simple.pretxncommit.out	Mon Mar 09 21:37:47 2009 -0700
   103.2 +++ b/en/examples/results/hook.simple.pretxncommit.out	Mon Mar 09 21:39:23 2009 -0700
   103.3 @@ -1,13 +1,14 @@
   103.4 -$ \textbf{cat check_bug_id}
   103.5 +<screen><prompt>$</prompt> <userinput>cat check_bug_id</userinput>
   103.6  #!/bin/sh
   103.7  # check that a commit comment mentions a numeric bug id
   103.8 -hg log -r $1 --template \{desc\} | grep -q "\textbackslash{}<bug *[0-9]"
   103.9 -$ \textbf{echo 'pretxncommit.bug_id_required = ./check_bug_id $HG_NODE' >> .hg/hgrc}
  103.10 -$ \textbf{echo a >> a}
  103.11 -$ \textbf{hg commit -m 'i am not mentioning a bug id'}
  103.12 +hg log -r $1 --template {desc} | grep -q "\&lt;bug *[0-9]"
  103.13 +<prompt>$</prompt> <userinput>echo 'pretxncommit.bug_id_required = ./check_bug_id $HG_NODE' &gt;&gt; .hg/hgrc</userinput>
  103.14 +<prompt>$</prompt> <userinput>echo a &gt;&gt; a</userinput>
  103.15 +<prompt>$</prompt> <userinput>hg commit -m 'i am not mentioning a bug id'</userinput>
  103.16  transaction abort!
  103.17  rollback completed
  103.18  abort: pretxncommit.bug_id_required hook exited with status 1
  103.19 -$ \textbf{hg commit -m 'i refer you to bug 666'}
  103.20 +<prompt>$</prompt> <userinput>hg commit -m 'i refer you to bug 666'</userinput>
  103.21  committed 
  103.22  
  103.23 +</screen>

   104.1 --- a/en/examples/results/hook.ws.better.out	Mon Mar 09 21:37:47 2009 -0700
   104.2 +++ b/en/examples/results/hook.ws.better.out	Mon Mar 09 21:39:23 2009 -0700
   104.3 @@ -1,17 +1,18 @@
   104.4 -$ \textbf{cat .hg/hgrc}
   104.5 +<screen><prompt>$</prompt> <userinput>cat .hg/hgrc</userinput>
   104.6  [hooks]
   104.7  pretxncommit.whitespace = .hg/check_whitespace.py
   104.8 -$ \textbf{echo 'a ' >> a}
   104.9 -$ \textbf{hg commit -A -m 'add new line with trailing whitespace'}
  104.10 +<prompt>$</prompt> <userinput>echo 'a ' &gt;&gt; a</userinput>
  104.11 +<prompt>$</prompt> <userinput>hg commit -A -m 'add new line with trailing whitespace'</userinput>
  104.12  a, line 2: trailing whitespace added
  104.13  commit message saved to .hg/commit.save
  104.14  transaction abort!
  104.15  rollback completed
  104.16  abort: pretxncommit.whitespace hook exited with status 1
  104.17 -$ \textbf{sed -i 's, *$,,' a}
  104.18 -$ \textbf{hg commit -A -m 'trimmed trailing whitespace'}
  104.19 +<prompt>$</prompt> <userinput>sed -i 's, *$,,' a</userinput>
  104.20 +<prompt>$</prompt> <userinput>hg commit -A -m 'trimmed trailing whitespace'</userinput>
  104.21  a, line 2: trailing whitespace added
  104.22  commit message saved to .hg/commit.save
  104.23  transaction abort!
  104.24  rollback completed
  104.25  abort: pretxncommit.whitespace hook exited with status 1
  104.26 +</screen>

   105.1 --- a/en/examples/results/hook.ws.simple.out	Mon Mar 09 21:37:47 2009 -0700
   105.2 +++ b/en/examples/results/hook.ws.simple.out	Mon Mar 09 21:39:23 2009 -0700
   105.3 @@ -1,11 +1,12 @@
   105.4 -$ \textbf{cat .hg/hgrc}
   105.5 +<screen><prompt>$</prompt> <userinput>cat .hg/hgrc</userinput>
   105.6  [hooks]
   105.7 -pretxncommit.whitespace = hg export tip | (! egrep -q '^\textbackslash{}+.*[ \textbackslash{}t]$')
   105.8 -$ \textbf{echo 'a ' > a}
   105.9 -$ \textbf{hg commit -A -m 'test with trailing whitespace'}
  105.10 +pretxncommit.whitespace = hg export tip | (! egrep -q '^\+.*[ \t]$')
  105.11 +<prompt>$</prompt> <userinput>echo 'a ' &gt; a</userinput>
  105.12 +<prompt>$</prompt> <userinput>hg commit -A -m 'test with trailing whitespace'</userinput>
  105.13  adding a
  105.14  transaction abort!
  105.15  rollback completed
  105.16  abort: pretxncommit.whitespace hook exited with status 1
  105.17 -$ \textbf{echo 'a' > a}
  105.18 -$ \textbf{hg commit -A -m 'drop trailing whitespace and try again'}
  105.19 +<prompt>$</prompt> <userinput>echo 'a' &gt; a</userinput>
  105.20 +<prompt>$</prompt> <userinput>hg commit -A -m 'drop trailing whitespace and try again'</userinput>
  105.21 +</screen>

   106.1 --- a/en/examples/results/issue29.go.out	Mon Mar 09 21:37:47 2009 -0700
   106.2 +++ b/en/examples/results/issue29.go.out	Mon Mar 09 21:39:23 2009 -0700
   106.3 @@ -1,17 +1,18 @@
   106.4 -$ \textbf{hg init issue29}
   106.5 -$ \textbf{cd issue29}
   106.6 -$ \textbf{echo a > a}
   106.7 -$ \textbf{hg ci -Ama}
   106.8 +<screen><prompt>$</prompt> <userinput>hg init issue29</userinput>
   106.9 +<prompt>$</prompt> <userinput>cd issue29</userinput>
  106.10 +<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
  106.11 +<prompt>$</prompt> <userinput>hg ci -Ama</userinput>
  106.12  adding a
  106.13 -$ \textbf{echo b > b}
  106.14 -$ \textbf{hg ci -Amb}
  106.15 +<prompt>$</prompt> <userinput>echo b &gt; b</userinput>
  106.16 +<prompt>$</prompt> <userinput>hg ci -Amb</userinput>
  106.17  adding b
  106.18 -$ \textbf{hg up 0}
  106.19 +<prompt>$</prompt> <userinput>hg up 0</userinput>
  106.20  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  106.21 -$ \textbf{mkdir b}
  106.22 -$ \textbf{echo b > b/b}
  106.23 -$ \textbf{hg ci -Amc}
  106.24 +<prompt>$</prompt> <userinput>mkdir b</userinput>
  106.25 +<prompt>$</prompt> <userinput>echo b &gt; b/b</userinput>
  106.26 +<prompt>$</prompt> <userinput>hg ci -Amc</userinput>
  106.27  adding b/b
  106.28  created new head
  106.29 -$ \textbf{hg merge}
  106.30 +<prompt>$</prompt> <userinput>hg merge</userinput>
  106.31  
  106.32 +</screen>

   107.1 --- a/en/examples/results/mq.dodiff.diff.out	Mon Mar 09 21:37:47 2009 -0700
   107.2 +++ b/en/examples/results/mq.dodiff.diff.out	Mon Mar 09 21:39:23 2009 -0700
   107.3 @@ -1,13 +1,14 @@
   107.4 -$ \textbf{echo 'this is my original thought' > oldfile}
   107.5 -$ \textbf{echo 'i have changed my mind' > newfile}
   107.6 -$ \textbf{diff -u oldfile newfile > tiny.patch}
   107.7 -$ \textbf{cat tiny.patch}
   107.8 +<screen><prompt>$</prompt> <userinput>echo 'this is my original thought' &gt; oldfile</userinput>
   107.9 +<prompt>$</prompt> <userinput>echo 'i have changed my mind' &gt; newfile</userinput>
  107.10 +<prompt>$</prompt> <userinput>diff -u oldfile newfile &gt; tiny.patch</userinput>
  107.11 +<prompt>$</prompt> <userinput>cat tiny.patch</userinput>
  107.12  
  107.13  
  107.14  @@ -1 +1 @@
  107.15  -this is my original thought
  107.16  +i have changed my mind
  107.17 -$ \textbf{patch < tiny.patch}
  107.18 +<prompt>$</prompt> <userinput>patch &lt; tiny.patch</userinput>
  107.19  patching file oldfile
  107.20 -$ \textbf{cat oldfile}
  107.21 +<prompt>$</prompt> <userinput>cat oldfile</userinput>
  107.22  i have changed my mind
  107.23 +</screen>

   108.1 --- a/en/examples/results/mq.guards.init.out	Mon Mar 09 21:37:47 2009 -0700
   108.2 +++ b/en/examples/results/mq.guards.init.out	Mon Mar 09 21:39:23 2009 -0700
   108.3 @@ -1,9 +1,10 @@
   108.4 -$ \textbf{hg qinit}
   108.5 -$ \textbf{hg qnew hello.patch}
   108.6 -$ \textbf{echo hello > hello}
   108.7 -$ \textbf{hg add hello}
   108.8 -$ \textbf{hg qrefresh}
   108.9 -$ \textbf{hg qnew goodbye.patch}
  108.10 -$ \textbf{echo goodbye > goodbye}
  108.11 -$ \textbf{hg add goodbye}
  108.12 -$ \textbf{hg qrefresh}
  108.13 +<screen><prompt>$</prompt> <userinput>hg qinit</userinput>
  108.14 +<prompt>$</prompt> <userinput>hg qnew hello.patch</userinput>
  108.15 +<prompt>$</prompt> <userinput>echo hello &gt; hello</userinput>
  108.16 +<prompt>$</prompt> <userinput>hg add hello</userinput>
  108.17 +<prompt>$</prompt> <userinput>hg qrefresh</userinput>
  108.18 +<prompt>$</prompt> <userinput>hg qnew goodbye.patch</userinput>
  108.19 +<prompt>$</prompt> <userinput>echo goodbye &gt; goodbye</userinput>
  108.20 +<prompt>$</prompt> <userinput>hg add goodbye</userinput>
  108.21 +<prompt>$</prompt> <userinput>hg qrefresh</userinput>
  108.22 +</screen>

   109.1 --- a/en/examples/results/mq.guards.qguard.neg.out	Mon Mar 09 21:37:47 2009 -0700
   109.2 +++ b/en/examples/results/mq.guards.qguard.neg.out	Mon Mar 09 21:39:23 2009 -0700
   109.3 @@ -1,3 +1,4 @@
   109.4 -$ \textbf{hg qguard hello.patch -quux}
   109.5 -$ \textbf{hg qguard hello.patch}
   109.6 +<screen><prompt>$</prompt> <userinput>hg qguard hello.patch -quux</userinput>
   109.7 +<prompt>$</prompt> <userinput>hg qguard hello.patch</userinput>
   109.8  hello.patch: -quux
   109.9 +</screen>

   110.1 --- a/en/examples/results/mq.guards.qguard.out	Mon Mar 09 21:37:47 2009 -0700
   110.2 +++ b/en/examples/results/mq.guards.qguard.out	Mon Mar 09 21:39:23 2009 -0700
   110.3 @@ -1,2 +1,3 @@
   110.4 -$ \textbf{hg qguard}
   110.5 +<screen><prompt>$</prompt> <userinput>hg qguard</userinput>
   110.6  goodbye.patch: unguarded
   110.7 +</screen>

   111.1 --- a/en/examples/results/mq.guards.qguard.pos.out	Mon Mar 09 21:37:47 2009 -0700
   111.2 +++ b/en/examples/results/mq.guards.qguard.pos.out	Mon Mar 09 21:39:23 2009 -0700
   111.3 @@ -1,3 +1,4 @@
   111.4 -$ \textbf{hg qguard +foo}
   111.5 -$ \textbf{hg qguard}
   111.6 +<screen><prompt>$</prompt> <userinput>hg qguard +foo</userinput>
   111.7 +<prompt>$</prompt> <userinput>hg qguard</userinput>
   111.8  goodbye.patch: +foo
   111.9 +</screen>

   112.1 --- a/en/examples/results/mq.guards.qselect.cat.out	Mon Mar 09 21:37:47 2009 -0700
   112.2 +++ b/en/examples/results/mq.guards.qselect.cat.out	Mon Mar 09 21:39:23 2009 -0700
   112.3 @@ -1,2 +1,3 @@
   112.4 -$ \textbf{cat .hg/patches/guards}
   112.5 +<screen><prompt>$</prompt> <userinput>cat .hg/patches/guards</userinput>
   112.6  foo
   112.7 +</screen>

   113.1 --- a/en/examples/results/mq.guards.qselect.error.out	Mon Mar 09 21:37:47 2009 -0700
   113.2 +++ b/en/examples/results/mq.guards.qselect.error.out	Mon Mar 09 21:39:23 2009 -0700
   113.3 @@ -1,2 +1,3 @@
   113.4 -$ \textbf{hg qselect +foo}
   113.5 +<screen><prompt>$</prompt> <userinput>hg qselect +foo</userinput>
   113.6  abort: guard '+foo' starts with invalid character: '+'
   113.7 +</screen>

   114.1 --- a/en/examples/results/mq.guards.qselect.foo.out	Mon Mar 09 21:37:47 2009 -0700
   114.2 +++ b/en/examples/results/mq.guards.qselect.foo.out	Mon Mar 09 21:39:23 2009 -0700
   114.3 @@ -1,8 +1,9 @@
   114.4 -$ \textbf{hg qpop -a}
   114.5 +<screen><prompt>$</prompt> <userinput>hg qpop -a</userinput>
   114.6  patch queue now empty
   114.7 -$ \textbf{hg qselect}
   114.8 +<prompt>$</prompt> <userinput>hg qselect</userinput>
   114.9  no active guards
  114.10 -$ \textbf{hg qselect foo}
  114.11 +<prompt>$</prompt> <userinput>hg qselect foo</userinput>
  114.12  number of unguarded, unapplied patches has changed from 1 to 2
  114.13 -$ \textbf{hg qselect}
  114.14 +<prompt>$</prompt> <userinput>hg qselect</userinput>
  114.15  foo
  114.16 +</screen>

   115.1 --- a/en/examples/results/mq.guards.qselect.foobar.out	Mon Mar 09 21:37:47 2009 -0700
   115.2 +++ b/en/examples/results/mq.guards.qselect.foobar.out	Mon Mar 09 21:39:23 2009 -0700
   115.3 @@ -1,8 +1,9 @@
   115.4 -$ \textbf{hg qselect foo bar}
   115.5 +<screen><prompt>$</prompt> <userinput>hg qselect foo bar</userinput>
   115.6  number of unguarded, unapplied patches has changed from 0 to 2
   115.7 -$ \textbf{hg qpop -a}
   115.8 +<prompt>$</prompt> <userinput>hg qpop -a</userinput>
   115.9  no patches applied
  115.10 -$ \textbf{hg qpush -a}
  115.11 +<prompt>$</prompt> <userinput>hg qpush -a</userinput>
  115.12  applying hello.patch
  115.13  applying goodbye.patch
  115.14  now at: goodbye.patch
  115.15 +</screen>

   116.1 --- a/en/examples/results/mq.guards.qselect.qpush.out	Mon Mar 09 21:37:47 2009 -0700
   116.2 +++ b/en/examples/results/mq.guards.qselect.qpush.out	Mon Mar 09 21:39:23 2009 -0700
   116.3 @@ -1,4 +1,5 @@
   116.4 -$ \textbf{hg qpush -a}
   116.5 +<screen><prompt>$</prompt> <userinput>hg qpush -a</userinput>
   116.6  applying hello.patch
   116.7  applying goodbye.patch
   116.8  now at: goodbye.patch
   116.9 +</screen>

   117.1 --- a/en/examples/results/mq.guards.qselect.quux.out	Mon Mar 09 21:37:47 2009 -0700
   117.2 +++ b/en/examples/results/mq.guards.qselect.quux.out	Mon Mar 09 21:39:23 2009 -0700
   117.3 @@ -1,6 +1,7 @@
   117.4 -$ \textbf{hg qselect quux}
   117.5 +<screen><prompt>$</prompt> <userinput>hg qselect quux</userinput>
   117.6  number of guarded, applied patches has changed from 0 to 2
   117.7 -$ \textbf{hg qpop -a}
   117.8 +<prompt>$</prompt> <userinput>hg qpop -a</userinput>
   117.9  patch queue now empty
  117.10 -$ \textbf{hg qpush -a}
  117.11 +<prompt>$</prompt> <userinput>hg qpush -a</userinput>
  117.12  patch series already fully applied
  117.13 +</screen>

   118.1 --- a/en/examples/results/mq.guards.series.out	Mon Mar 09 21:37:47 2009 -0700
   118.2 +++ b/en/examples/results/mq.guards.series.out	Mon Mar 09 21:39:23 2009 -0700
   118.3 @@ -1,3 +1,4 @@
   118.4 -$ \textbf{cat .hg/patches/series}
   118.5 +<screen><prompt>$</prompt> <userinput>cat .hg/patches/series</userinput>
   118.6  hello.patch #-quux
   118.7  goodbye.patch #+foo
   118.8 +</screen>

   119.1 --- a/en/examples/results/mq.id.output.out	Mon Mar 09 21:37:47 2009 -0700
   119.2 +++ b/en/examples/results/mq.id.output.out	Mon Mar 09 21:39:23 2009 -0700
   119.3 @@ -1,11 +1,11 @@
   119.4 -$ \textbf{hg qapplied}
   119.5 +<screen><prompt>$</prompt> <userinput>hg qapplied</userinput>
   119.6  first.patch
   119.7  second.patch
   119.8 -$ \textbf{hg log -r qbase:qtip}
   119.9 +<prompt>$</prompt> <userinput>hg log -r qbase:qtip</userinput>
  119.10  changeset:   
  119.11  tag:         first.patch
  119.12  tag:         qbase
  119.13 -user:        Bryan O'Sullivan <bos@serpentine.com>
  119.14 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  119.15  
  119.16  summary:     [mq]: first.patch
  119.17  
  119.18 @@ -13,13 +13,13 @@
  119.19  tag:         qtip
  119.20  tag:         second.patch
  119.21  tag:         tip
  119.22 -user:        Bryan O'Sullivan <bos@serpentine.com>
  119.23 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  119.24  
  119.25  summary:     [mq]: second.patch
  119.26  
  119.27 -$ \textbf{hg export second.patch}
  119.28 +<prompt>$</prompt> <userinput>hg export second.patch</userinput>
  119.29  # HG changeset patch
  119.30 -# User Bryan O'Sullivan <bos@serpentine.com>
  119.31 +# User Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  119.32  
  119.33  # Node ID 
  119.34  # Parent  
  119.35 @@ -30,3 +30,4 @@
  119.36  
  119.37  @@ -0,0 +1,1 @@
  119.38  +double u;
  119.39 +</screen>

   120.1 --- a/en/examples/results/mq.qinit-help.help.out	Mon Mar 09 21:37:47 2009 -0700
   120.2 +++ b/en/examples/results/mq.qinit-help.help.out	Mon Mar 09 21:39:23 2009 -0700
   120.3 @@ -1,4 +1,4 @@
   120.4 -$ \textbf{hg help qinit}
   120.5 +<screen><prompt>$</prompt> <userinput>hg help qinit</userinput>
   120.6  hg qinit [-c]
   120.7  
   120.8  init a new queue repository
   120.9 @@ -14,3 +14,4 @@
  120.10   -c --create-repo  create queue repository
  120.11  
  120.12  use "hg -v help qinit" to show global options
  120.13 +</screen>

   121.1 --- a/en/examples/results/mq.tarball.download.out	Mon Mar 09 21:37:47 2009 -0700
   121.2 +++ b/en/examples/results/mq.tarball.download.out	Mon Mar 09 21:39:23 2009 -0700
   121.3 @@ -1,9 +1,10 @@
   121.4 -$ \textbf{download netplug-1.2.5.tar.bz2}
   121.5 -$ \textbf{tar jxf netplug-1.2.5.tar.bz2}
   121.6 -$ \textbf{cd netplug-1.2.5}
   121.7 -$ \textbf{hg init}
   121.8 -$ \textbf{hg commit -q --addremove --message netplug-1.2.5}
   121.9 -$ \textbf{cd ..}
  121.10 -$ \textbf{hg clone netplug-1.2.5 netplug}
  121.11 +<screen><prompt>$</prompt> <userinput>download netplug-1.2.5.tar.bz2</userinput>
  121.12 +<prompt>$</prompt> <userinput>tar jxf netplug-1.2.5.tar.bz2</userinput>
  121.13 +<prompt>$</prompt> <userinput>cd netplug-1.2.5</userinput>
  121.14 +<prompt>$</prompt> <userinput>hg init</userinput>
  121.15 +<prompt>$</prompt> <userinput>hg commit -q --addremove --message netplug-1.2.5</userinput>
  121.16 +<prompt>$</prompt> <userinput>cd ..</userinput>
  121.17 +<prompt>$</prompt> <userinput>hg clone netplug-1.2.5 netplug</userinput>
  121.18  updating working directory
  121.19  18 files updated, 0 files merged, 0 files removed, 0 files unresolved
  121.20 +</screen>

   122.1 --- a/en/examples/results/mq.tarball.newsource.out	Mon Mar 09 21:37:47 2009 -0700
   122.2 +++ b/en/examples/results/mq.tarball.newsource.out	Mon Mar 09 21:39:23 2009 -0700
   122.3 @@ -1,13 +1,14 @@
   122.4 -$ \textbf{hg qpop -a}
   122.5 +<screen><prompt>$</prompt> <userinput>hg qpop -a</userinput>
   122.6  patch queue now empty
   122.7 -$ \textbf{cd ..}
   122.8 -$ \textbf{download netplug-1.2.8.tar.bz2}
   122.9 -$ \textbf{hg clone netplug-1.2.5 netplug-1.2.8}
  122.10 +<prompt>$</prompt> <userinput>cd ..</userinput>
  122.11 +<prompt>$</prompt> <userinput>download netplug-1.2.8.tar.bz2</userinput>
  122.12 +<prompt>$</prompt> <userinput>hg clone netplug-1.2.5 netplug-1.2.8</userinput>
  122.13  updating working directory
  122.14  18 files updated, 0 files merged, 0 files removed, 0 files unresolved
  122.15 -$ \textbf{cd netplug-1.2.8}
  122.16 -$ \textbf{hg locate -0 | xargs -0 rm}
  122.17 -$ \textbf{cd ..}
  122.18 -$ \textbf{tar jxf netplug-1.2.8.tar.bz2}
  122.19 -$ \textbf{cd netplug-1.2.8}
  122.20 -$ \textbf{hg commit --addremove --message netplug-1.2.8}
  122.21 +<prompt>$</prompt> <userinput>cd netplug-1.2.8</userinput>
  122.22 +<prompt>$</prompt> <userinput>hg locate -0 | xargs -0 rm</userinput>
  122.23 +<prompt>$</prompt> <userinput>cd ..</userinput>
  122.24 +<prompt>$</prompt> <userinput>tar jxf netplug-1.2.8.tar.bz2</userinput>
  122.25 +<prompt>$</prompt> <userinput>cd netplug-1.2.8</userinput>
  122.26 +<prompt>$</prompt> <userinput>hg commit --addremove --message netplug-1.2.8</userinput>
  122.27 +</screen>

   123.1 --- a/en/examples/results/mq.tarball.qinit.out	Mon Mar 09 21:37:47 2009 -0700
   123.2 +++ b/en/examples/results/mq.tarball.qinit.out	Mon Mar 09 21:39:23 2009 -0700
   123.3 @@ -1,15 +1,15 @@
   123.4 -$ \textbf{cd netplug}
   123.5 -$ \textbf{hg qinit}
   123.6 -$ \textbf{hg qnew -m 'fix build problem with gcc 4' build-fix.patch}
   123.7 -$ \textbf{perl -pi -e 's/int addr_len/socklen_t addr_len/' netlink.c}
   123.8 -$ \textbf{hg qrefresh}
   123.9 -$ \textbf{hg tip -p}
  123.10 +<screen><prompt>$</prompt> <userinput>cd netplug</userinput>
  123.11 +<prompt>$</prompt> <userinput>hg qinit</userinput>
  123.12 +<prompt>$</prompt> <userinput>hg qnew -m 'fix build problem with gcc 4' build-fix.patch</userinput>
  123.13 +<prompt>$</prompt> <userinput>perl -pi -e 's/int addr_len/socklen_t addr_len/' netlink.c</userinput>
  123.14 +<prompt>$</prompt> <userinput>hg qrefresh</userinput>
  123.15 +<prompt>$</prompt> <userinput>hg tip -p</userinput>
  123.16  changeset:   
  123.17  tag:         qtip
  123.18  tag:         build-fix.patch
  123.19  tag:         tip
  123.20  tag:         qbase
  123.21 -user:        Bryan O'Sullivan <bos@serpentine.com>
  123.22 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  123.23  
  123.24  summary:     fix build problem with gcc 4
  123.25  
  123.26 @@ -18,11 +18,12 @@
  123.27  
  123.28  @@ -275,7 +275,7 @@
  123.29           exit(1);
  123.30 -     \}
  123.31 +     }
  123.32   
  123.33  -    int addr_len = sizeof(addr);
  123.34  +    socklen_t addr_len = sizeof(addr);
  123.35   
  123.36 -     if (getsockname(fd, (struct sockaddr *) &addr, &addr_len) == -1) \{
  123.37 +     if (getsockname(fd, (struct sockaddr *) &amp;addr, &amp;addr_len) == -1) {
  123.38           do_log(LOG_ERR, "Could not get socket details: %m");
  123.39  
  123.40 +</screen>

   124.1 --- a/en/examples/results/mq.tarball.repush.out	Mon Mar 09 21:37:47 2009 -0700
   124.2 +++ b/en/examples/results/mq.tarball.repush.out	Mon Mar 09 21:39:23 2009 -0700
   124.3 @@ -1,5 +1,5 @@
   124.4 -$ \textbf{cd ../netplug}
   124.5 -$ \textbf{hg pull ../netplug-1.2.8}
   124.6 +<screen><prompt>$</prompt> <userinput>cd ../netplug</userinput>
   124.7 +<prompt>$</prompt> <userinput>hg pull ../netplug-1.2.8</userinput>
   124.8  pulling from ../netplug-1.2.8
   124.9  searching for changes
  124.10  adding changesets
  124.11 @@ -7,7 +7,8 @@
  124.12  adding file changes
  124.13  added 1 changesets with 12 changes to 12 files
  124.14  (run 'hg update' to get a working copy)
  124.15 -$ \textbf{hg qpush -a}
  124.16 +<prompt>$</prompt> <userinput>hg qpush -a</userinput>
  124.17  (working directory not at tip)
  124.18  applying build-fix.patch
  124.19  now at: build-fix.patch
  124.20 +</screen>

   125.1 --- a/en/examples/results/mq.tools.lsdiff.out	Mon Mar 09 21:37:47 2009 -0700
   125.2 +++ b/en/examples/results/mq.tools.lsdiff.out	Mon Mar 09 21:39:23 2009 -0700
   125.3 @@ -1,4 +1,4 @@
   125.4 -$ \textbf{lsdiff -nvv remove-redundant-null-checks.patch}
   125.5 +<screen><prompt>$</prompt> <userinput>lsdiff -nvv remove-redundant-null-checks.patch</userinput>
   125.6  22	File #1  	a/drivers/char/agp/sgi-agp.c
   125.7  	24	Hunk #1	static int __devinit agp_sgi_init(void)
   125.8  37	File #2  	a/drivers/char/hvcs.c
   125.9 @@ -19,3 +19,4 @@
  125.10  	166	Hunk #1	int ata_cmd_ioctl(struct scsi_device *sc
  125.11  178	File #8  	a/drivers/video/au1100fb.c
  125.12  	180	Hunk #1	void __exit au1100fb_cleanup(void)
  125.13 +</screen>

   126.1 --- a/en/examples/results/mq.tools.tools.out	Mon Mar 09 21:37:47 2009 -0700
   126.2 +++ b/en/examples/results/mq.tools.tools.out	Mon Mar 09 21:39:23 2009 -0700
   126.3 @@ -1,4 +1,4 @@
   126.4 -$ \textbf{diffstat -p1 remove-redundant-null-checks.patch}
   126.5 +<screen><prompt>$</prompt> <userinput>diffstat -p1 remove-redundant-null-checks.patch</userinput>
   126.6   drivers/char/agp/sgi-agp.c        |    5 ++---
   126.7   drivers/char/hvcs.c               |   11 +++++------
   126.8   drivers/message/fusion/mptfc.c    |    6 ++----
   126.9 @@ -8,16 +8,17 @@
  126.10   drivers/scsi/libata-scsi.c        |    4 +---
  126.11   drivers/video/au1100fb.c          |    3 +--
  126.12   8 files changed, 19 insertions(+), 38 deletions(-)
  126.13 -$ \textbf{filterdiff -i '*/video/*' remove-redundant-null-checks.patch}
  126.14 +<prompt>$</prompt> <userinput>filterdiff -i '*/video/*' remove-redundant-null-checks.patch</userinput>
  126.15  
  126.16  
  126.17  @@ -743,8 +743,7 @@ void __exit au1100fb_cleanup(void)
  126.18 - \{
  126.19 - 	driver_unregister(&au1100fb_driver);
  126.20 + {
  126.21 + 	driver_unregister(&amp;au1100fb_driver);
  126.22   
  126.23  -	if (drv_info.opt_mode)
  126.24  -		kfree(drv_info.opt_mode);
  126.25  +	kfree(drv_info.opt_mode);
  126.26 - \}
  126.27 + }
  126.28   
  126.29   module_init(au1100fb_init);
  126.30 +</screen>

   127.1 --- a/en/examples/results/mq.tutorial.add.out	Mon Mar 09 21:37:47 2009 -0700
   127.2 +++ b/en/examples/results/mq.tutorial.add.out	Mon Mar 09 21:39:23 2009 -0700
   127.3 @@ -1,4 +1,5 @@
   127.4 -$ \textbf{echo 'file 3, line 1' >> file3}
   127.5 -$ \textbf{hg qnew add-file3.patch}
   127.6 -$ \textbf{hg qnew -f add-file3.patch}
   127.7 +<screen><prompt>$</prompt> <userinput>echo 'file 3, line 1' &gt;&gt; file3</userinput>
   127.8 +<prompt>$</prompt> <userinput>hg qnew add-file3.patch</userinput>
   127.9 +<prompt>$</prompt> <userinput>hg qnew -f add-file3.patch</userinput>
  127.10  abort: patch "add-file3.patch" already exists
  127.11 +</screen>

   128.1 --- a/en/examples/results/mq.tutorial.qinit.out	Mon Mar 09 21:37:47 2009 -0700
   128.2 +++ b/en/examples/results/mq.tutorial.qinit.out	Mon Mar 09 21:39:23 2009 -0700
   128.3 @@ -1,7 +1,8 @@
   128.4 -$ \textbf{hg init mq-sandbox}
   128.5 -$ \textbf{cd mq-sandbox}
   128.6 -$ \textbf{echo 'line 1' > file1}
   128.7 -$ \textbf{echo 'another line 1' > file2}
   128.8 -$ \textbf{hg add file1 file2}
   128.9 -$ \textbf{hg commit -m'first change'}
  128.10 -$ \textbf{hg qinit}
  128.11 +<screen><prompt>$</prompt> <userinput>hg init mq-sandbox</userinput>
  128.12 +<prompt>$</prompt> <userinput>cd mq-sandbox</userinput>
  128.13 +<prompt>$</prompt> <userinput>echo 'line 1' &gt; file1</userinput>
  128.14 +<prompt>$</prompt> <userinput>echo 'another line 1' &gt; file2</userinput>
  128.15 +<prompt>$</prompt> <userinput>hg add file1 file2</userinput>
  128.16 +<prompt>$</prompt> <userinput>hg commit -m'first change'</userinput>
  128.17 +<prompt>$</prompt> <userinput>hg qinit</userinput>
  128.18 +</screen>

   129.1 --- a/en/examples/results/mq.tutorial.qnew.out	Mon Mar 09 21:37:47 2009 -0700
   129.2 +++ b/en/examples/results/mq.tutorial.qnew.out	Mon Mar 09 21:39:23 2009 -0700
   129.3 @@ -1,20 +1,21 @@
   129.4 -$ \textbf{hg tip}
   129.5 +<screen><prompt>$</prompt> <userinput>hg tip</userinput>
   129.6  changeset:   
   129.7  tag:         tip
   129.8 -user:        Bryan O'Sullivan <bos@serpentine.com>
   129.9 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  129.10  
  129.11  summary:     first change
  129.12  
  129.13 -$ \textbf{hg qnew first.patch}
  129.14 -$ \textbf{hg tip}
  129.15 +<prompt>$</prompt> <userinput>hg qnew first.patch</userinput>
  129.16 +<prompt>$</prompt> <userinput>hg tip</userinput>
  129.17  changeset:   
  129.18  tag:         qtip
  129.19  tag:         first.patch
  129.20  tag:         tip
  129.21  tag:         qbase
  129.22 -user:        Bryan O'Sullivan <bos@serpentine.com>
  129.23 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  129.24  
  129.25  summary:     [mq]: first.patch
  129.26  
  129.27 -$ \textbf{ls .hg/patches}
  129.28 +<prompt>$</prompt> <userinput>ls .hg/patches</userinput>
  129.29  first.patch  series  status
  129.30 +</screen>

   130.1 --- a/en/examples/results/mq.tutorial.qnew2.out	Mon Mar 09 21:37:47 2009 -0700
   130.2 +++ b/en/examples/results/mq.tutorial.qnew2.out	Mon Mar 09 21:39:23 2009 -0700
   130.3 @@ -1,15 +1,15 @@
   130.4 -$ \textbf{hg qnew second.patch}
   130.5 -$ \textbf{hg log --style=compact --limit=2}
   130.6 -2[qtip,second.patch,tip]      2009-01-30 06:34 +0000   bos
   130.7 +<screen><prompt>$</prompt> <userinput>hg qnew second.patch</userinput>
   130.8 +<prompt>$</prompt> <userinput>hg log --style=compact --limit=2</userinput>
   130.9 +2[qtip,second.patch,tip]      2009-03-10 04:38 +0000   bos
  130.10    [mq]: second.patch
  130.11  
  130.12 -1[first.patch,qbase]      2009-01-30 06:34 +0000   bos
  130.13 +1[first.patch,qbase]      2009-03-10 04:38 +0000   bos
  130.14    [mq]: first.patch
  130.15  
  130.16 -$ \textbf{echo 'line 4' >> file1}
  130.17 -$ \textbf{hg qrefresh}
  130.18 -$ \textbf{hg tip --style=compact --patch}
  130.19 -2[qtip,second.patch,tip]      2009-01-30 06:34 +0000   bos
  130.20 +<prompt>$</prompt> <userinput>echo 'line 4' &gt;&gt; file1</userinput>
  130.21 +<prompt>$</prompt> <userinput>hg qrefresh</userinput>
  130.22 +<prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput>
  130.23 +2[qtip,second.patch,tip]      2009-03-10 04:38 +0000   bos
  130.24    [mq]: second.patch
  130.25  
  130.26  diff -r  -r  file1
  130.27 @@ -21,8 +21,9 @@
  130.28   line 3
  130.29  +line 4
  130.30  
  130.31 -$ \textbf{hg annotate file1}
  130.32 +<prompt>$</prompt> <userinput>hg annotate file1</userinput>
  130.33  0: line 1
  130.34  1: line 2
  130.35  1: line 3
  130.36  2: line 4
  130.37 +</screen>

   131.1 --- a/en/examples/results/mq.tutorial.qpop.out	Mon Mar 09 21:37:47 2009 -0700
   131.2 +++ b/en/examples/results/mq.tutorial.qpop.out	Mon Mar 09 21:39:23 2009 -0700
   131.3 @@ -1,14 +1,15 @@
   131.4 -$ \textbf{hg qapplied}
   131.5 +<screen><prompt>$</prompt> <userinput>hg qapplied</userinput>
   131.6  first.patch
   131.7  second.patch
   131.8 -$ \textbf{hg qpop}
   131.9 +<prompt>$</prompt> <userinput>hg qpop</userinput>
  131.10  now at: first.patch
  131.11 -$ \textbf{hg qseries}
  131.12 +<prompt>$</prompt> <userinput>hg qseries</userinput>
  131.13  first.patch
  131.14  second.patch
  131.15 -$ \textbf{hg qapplied}
  131.16 +<prompt>$</prompt> <userinput>hg qapplied</userinput>
  131.17  first.patch
  131.18 -$ \textbf{cat file1}
  131.19 +<prompt>$</prompt> <userinput>cat file1</userinput>
  131.20  line 1
  131.21  line 2
  131.22  line 3
  131.23 +</screen>

   132.1 --- a/en/examples/results/mq.tutorial.qpush-a.out	Mon Mar 09 21:37:47 2009 -0700
   132.2 +++ b/en/examples/results/mq.tutorial.qpush-a.out	Mon Mar 09 21:39:23 2009 -0700
   132.3 @@ -1,8 +1,9 @@
   132.4 -$ \textbf{hg qpush -a}
   132.5 +<screen><prompt>$</prompt> <userinput>hg qpush -a</userinput>
   132.6  applying second.patch
   132.7  now at: second.patch
   132.8 -$ \textbf{cat file1}
   132.9 +<prompt>$</prompt> <userinput>cat file1</userinput>
  132.10  line 1
  132.11  line 2
  132.12  line 3
  132.13  line 4
  132.14 +</screen>

   133.1 --- a/en/examples/results/mq.tutorial.qrefresh.out	Mon Mar 09 21:37:47 2009 -0700
   133.2 +++ b/en/examples/results/mq.tutorial.qrefresh.out	Mon Mar 09 21:39:23 2009 -0700
   133.3 @@ -1,15 +1,15 @@
   133.4 -$ \textbf{echo 'line 2' >> file1}
   133.5 -$ \textbf{hg diff}
   133.6 +<screen><prompt>$</prompt> <userinput>echo 'line 2' &gt;&gt; file1</userinput>
   133.7 +<prompt>$</prompt> <userinput>hg diff</userinput>
   133.8  diff -r  file1
   133.9  
  133.10  
  133.11  @@ -1,1 +1,2 @@
  133.12   line 1
  133.13  +line 2
  133.14 -$ \textbf{hg qrefresh}
  133.15 -$ \textbf{hg diff}
  133.16 -$ \textbf{hg tip --style=compact --patch}
  133.17 -1[qtip,first.patch,tip,qbase]      2009-01-30 06:34 +0000   bos
  133.18 +<prompt>$</prompt> <userinput>hg qrefresh</userinput>
  133.19 +<prompt>$</prompt> <userinput>hg diff</userinput>
  133.20 +<prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput>
  133.21 +1[qtip,first.patch,tip,qbase]      2009-03-10 04:38 +0000   bos
  133.22    [mq]: first.patch
  133.23  
  133.24  diff -r  -r  file1
  133.25 @@ -19,3 +19,4 @@
  133.26   line 1
  133.27  +line 2
  133.28  
  133.29 +</screen>

   134.1 --- a/en/examples/results/mq.tutorial.qrefresh2.out	Mon Mar 09 21:37:47 2009 -0700
   134.2 +++ b/en/examples/results/mq.tutorial.qrefresh2.out	Mon Mar 09 21:39:23 2009 -0700
   134.3 @@ -1,9 +1,9 @@
   134.4 -$ \textbf{echo 'line 3' >> file1}
   134.5 -$ \textbf{hg status}
   134.6 +<screen><prompt>$</prompt> <userinput>echo 'line 3' &gt;&gt; file1</userinput>
   134.7 +<prompt>$</prompt> <userinput>hg status</userinput>
   134.8  M file1
   134.9 -$ \textbf{hg qrefresh}
  134.10 -$ \textbf{hg tip --style=compact --patch}
  134.11 -1[qtip,first.patch,tip,qbase]      2009-01-30 06:34 +0000   bos
  134.12 +<prompt>$</prompt> <userinput>hg qrefresh</userinput>
  134.13 +<prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput>
  134.14 +1[qtip,first.patch,tip,qbase]      2009-03-10 04:38 +0000   bos
  134.15    [mq]: first.patch
  134.16  
  134.17  diff -r  -r  file1
  134.18 @@ -14,3 +14,4 @@
  134.19  +line 2
  134.20  +line 3
  134.21  
  134.22 +</screen>

   135.1 --- a/en/examples/results/mq.tutorial.qseries.out	Mon Mar 09 21:37:47 2009 -0700
   135.2 +++ b/en/examples/results/mq.tutorial.qseries.out	Mon Mar 09 21:39:23 2009 -0700
   135.3 @@ -1,6 +1,7 @@
   135.4 -$ \textbf{hg qseries}
   135.5 +<screen><prompt>$</prompt> <userinput>hg qseries</userinput>
   135.6  first.patch
   135.7  second.patch
   135.8 -$ \textbf{hg qapplied}
   135.9 +<prompt>$</prompt> <userinput>hg qapplied</userinput>
  135.10  first.patch
  135.11  second.patch
  135.12 +</screen>

   136.1 --- a/en/examples/results/rename.divergent.clone.out	Mon Mar 09 21:37:47 2009 -0700
   136.2 +++ b/en/examples/results/rename.divergent.clone.out	Mon Mar 09 21:39:23 2009 -0700
   136.3 @@ -1,6 +1,7 @@
   136.4 -$ \textbf{hg clone orig anne}
   136.5 +<screen><prompt>$</prompt> <userinput>hg clone orig anne</userinput>
   136.6  updating working directory
   136.7  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   136.8 -$ \textbf{hg clone orig bob}
   136.9 +<prompt>$</prompt> <userinput>hg clone orig bob</userinput>
  136.10  updating working directory
  136.11  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  136.12 +</screen>

   137.1 --- a/en/examples/results/rename.divergent.merge.out	Mon Mar 09 21:37:47 2009 -0700
   137.2 +++ b/en/examples/results/rename.divergent.merge.out	Mon Mar 09 21:39:23 2009 -0700
   137.3 @@ -1,6 +1,6 @@
   137.4 -# See http://www.selenic.com/mercurial/bts/issue455
   137.5 -$ \textbf{cd ../orig}
   137.6 -$ \textbf{hg pull -u ../anne}
   137.7 +<screen># See http://www.selenic.com/mercurial/bts/issue455
   137.8 +<prompt>$</prompt> <userinput>cd ../orig</userinput>
   137.9 +<prompt>$</prompt> <userinput>hg pull -u ../anne</userinput>
  137.10  pulling from ../anne
  137.11  searching for changes
  137.12  adding changesets
  137.13 @@ -8,7 +8,7 @@
  137.14  adding file changes
  137.15  added 1 changesets with 1 changes to 1 files
  137.16  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  137.17 -$ \textbf{hg pull ../bob}
  137.18 +<prompt>$</prompt> <userinput>hg pull ../bob</userinput>
  137.19  pulling from ../bob
  137.20  searching for changes
  137.21  adding changesets
  137.22 @@ -16,11 +16,12 @@
  137.23  adding file changes
  137.24  added 1 changesets with 1 changes to 1 files (+1 heads)
  137.25  (run 'hg heads' to see heads, 'hg merge' to merge)
  137.26 -$ \textbf{hg merge}
  137.27 +<prompt>$</prompt> <userinput>hg merge</userinput>
  137.28  warning: detected divergent renames of foo to:
  137.29   bar
  137.30   quux
  137.31  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  137.32  (branch merge, don't forget to commit)
  137.33 -$ \textbf{ls}
  137.34 +<prompt>$</prompt> <userinput>ls</userinput>
  137.35  bar  quux
  137.36 +</screen>

   138.1 --- a/en/examples/results/rename.divergent.rename.anne.out	Mon Mar 09 21:37:47 2009 -0700
   138.2 +++ b/en/examples/results/rename.divergent.rename.anne.out	Mon Mar 09 21:39:23 2009 -0700
   138.3 @@ -1,3 +1,4 @@
   138.4 -$ \textbf{cd anne}
   138.5 -$ \textbf{hg mv foo bar}
   138.6 -$ \textbf{hg ci -m 'Rename foo to bar'}
   138.7 +<screen><prompt>$</prompt> <userinput>cd anne</userinput>
   138.8 +<prompt>$</prompt> <userinput>hg mv foo bar</userinput>
   138.9 +<prompt>$</prompt> <userinput>hg ci -m 'Rename foo to bar'</userinput>
  138.10 +</screen>

   139.1 --- a/en/examples/results/rename.divergent.rename.bob.out	Mon Mar 09 21:37:47 2009 -0700
   139.2 +++ b/en/examples/results/rename.divergent.rename.bob.out	Mon Mar 09 21:39:23 2009 -0700
   139.3 @@ -1,3 +1,4 @@
   139.4 -$ \textbf{cd ../bob}
   139.5 -$ \textbf{hg mv foo quux}
   139.6 -$ \textbf{hg ci -m 'Rename foo to quux'}
   139.7 +<screen><prompt>$</prompt> <userinput>cd ../bob</userinput>
   139.8 +<prompt>$</prompt> <userinput>hg mv foo quux</userinput>
   139.9 +<prompt>$</prompt> <userinput>hg ci -m 'Rename foo to quux'</userinput>
  139.10 +</screen>

   140.1 --- a/en/examples/results/rollback.add.out	Mon Mar 09 21:37:47 2009 -0700
   140.2 +++ b/en/examples/results/rollback.add.out	Mon Mar 09 21:39:23 2009 -0700
   140.3 @@ -1,2 +1,3 @@
   140.4 -$ \textbf{hg add b}
   140.5 -$ \textbf{hg commit -m 'Add file b, this time for real'}
   140.6 +<screen><prompt>$</prompt> <userinput>hg add b</userinput>
   140.7 +<prompt>$</prompt> <userinput>hg commit -m 'Add file b, this time for real'</userinput>
   140.8 +</screen>

   141.1 --- a/en/examples/results/rollback.commit.out	Mon Mar 09 21:37:47 2009 -0700
   141.2 +++ b/en/examples/results/rollback.commit.out	Mon Mar 09 21:39:23 2009 -0700
   141.3 @@ -1,4 +1,5 @@
   141.4 -$ \textbf{hg status}
   141.5 +<screen><prompt>$</prompt> <userinput>hg status</userinput>
   141.6  M a
   141.7 -$ \textbf{echo b > b}
   141.8 -$ \textbf{hg commit -m 'Add file b'}
   141.9 +<prompt>$</prompt> <userinput>echo b &gt; b</userinput>
  141.10 +<prompt>$</prompt> <userinput>hg commit -m 'Add file b'</userinput>
  141.11 +</screen>

   142.1 --- a/en/examples/results/rollback.rollback.out	Mon Mar 09 21:37:47 2009 -0700
   142.2 +++ b/en/examples/results/rollback.rollback.out	Mon Mar 09 21:39:23 2009 -0700
   142.3 @@ -1,12 +1,13 @@
   142.4 -$ \textbf{hg rollback}
   142.5 +<screen><prompt>$</prompt> <userinput>hg rollback</userinput>
   142.6  rolling back last transaction
   142.7 -$ \textbf{hg tip}
   142.8 +<prompt>$</prompt> <userinput>hg tip</userinput>
   142.9  changeset:   
  142.10  tag:         tip
  142.11 -user:        Bryan O'Sullivan <bos@serpentine.com>
  142.12 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  142.13  
  142.14  summary:     First commit
  142.15  
  142.16 -$ \textbf{hg status}
  142.17 +<prompt>$</prompt> <userinput>hg status</userinput>
  142.18  M a
  142.19  ? b
  142.20 +</screen>

   143.1 --- a/en/examples/results/rollback.status.out	Mon Mar 09 21:37:47 2009 -0700
   143.2 +++ b/en/examples/results/rollback.status.out	Mon Mar 09 21:39:23 2009 -0700
   143.3 @@ -1,9 +1,10 @@
   143.4 -$ \textbf{hg status}
   143.5 +<screen><prompt>$</prompt> <userinput>hg status</userinput>
   143.6  ? b
   143.7 -$ \textbf{hg tip}
   143.8 +<prompt>$</prompt> <userinput>hg tip</userinput>
   143.9  changeset:   
  143.10  tag:         tip
  143.11 -user:        Bryan O'Sullivan <bos@serpentine.com>
  143.12 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  143.13  
  143.14  summary:     Add file b
  143.15  
  143.16 +</screen>

   144.1 --- a/en/examples/results/rollback.tip.out	Mon Mar 09 21:37:47 2009 -0700
   144.2 +++ b/en/examples/results/rollback.tip.out	Mon Mar 09 21:39:23 2009 -0700
   144.3 @@ -0,0 +1,1 @@
   144.4 +<screen></screen>

   145.1 --- a/en/examples/results/rollback.twice.out	Mon Mar 09 21:37:47 2009 -0700
   145.2 +++ b/en/examples/results/rollback.twice.out	Mon Mar 09 21:39:23 2009 -0700
   145.3 @@ -1,4 +1,5 @@
   145.4 -$ \textbf{hg rollback}
   145.5 +<screen><prompt>$</prompt> <userinput>hg rollback</userinput>
   145.6  rolling back last transaction
   145.7 -$ \textbf{hg rollback}
   145.8 +<prompt>$</prompt> <userinput>hg rollback</userinput>
   145.9  no rollback information available
  145.10 +</screen>

   146.1 --- a/en/examples/results/tag.init.out	Mon Mar 09 21:37:47 2009 -0700
   146.2 +++ b/en/examples/results/tag.init.out	Mon Mar 09 21:39:23 2009 -0700
   146.3 @@ -1,5 +1,6 @@
   146.4 -$ \textbf{hg init mytag}
   146.5 -$ \textbf{cd mytag}
   146.6 -$ \textbf{echo hello > myfile}
   146.7 -$ \textbf{hg commit -A -m 'Initial commit'}
   146.8 +<screen><prompt>$</prompt> <userinput>hg init mytag</userinput>
   146.9 +<prompt>$</prompt> <userinput>cd mytag</userinput>
  146.10 +<prompt>$</prompt> <userinput>echo hello &gt; myfile</userinput>
  146.11 +<prompt>$</prompt> <userinput>hg commit -A -m 'Initial commit'</userinput>
  146.12  adding myfile
  146.13 +</screen>

   147.1 --- a/en/examples/results/tag.log.out	Mon Mar 09 21:37:47 2009 -0700
   147.2 +++ b/en/examples/results/tag.log.out	Mon Mar 09 21:39:23 2009 -0700
   147.3 @@ -1,13 +1,14 @@
   147.4 -$ \textbf{hg log}
   147.5 +<screen><prompt>$</prompt> <userinput>hg log</userinput>
   147.6  changeset:   
   147.7  tag:         tip
   147.8 -user:        Bryan O'Sullivan <bos@serpentine.com>
   147.9 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  147.10  
  147.11  summary:     Added tag v1.0 for changeset 
  147.12  
  147.13  changeset:   
  147.14  tag:         v1.0
  147.15 -user:        Bryan O'Sullivan <bos@serpentine.com>
  147.16 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  147.17  
  147.18  summary:     Initial commit
  147.19  
  147.20 +</screen>

   148.1 --- a/en/examples/results/tag.log.v1.0.out	Mon Mar 09 21:37:47 2009 -0700
   148.2 +++ b/en/examples/results/tag.log.v1.0.out	Mon Mar 09 21:39:23 2009 -0700
   148.3 @@ -1,10 +1,11 @@
   148.4 -$ \textbf{echo goodbye > myfile2}
   148.5 -$ \textbf{hg commit -A -m 'Second commit'}
   148.6 +<screen><prompt>$</prompt> <userinput>echo goodbye &gt; myfile2</userinput>
   148.7 +<prompt>$</prompt> <userinput>hg commit -A -m 'Second commit'</userinput>
   148.8  adding myfile2
   148.9 -$ \textbf{hg log -r v1.0}
  148.10 +<prompt>$</prompt> <userinput>hg log -r v1.0</userinput>
  148.11  changeset:   
  148.12  tag:         v1.0
  148.13 -user:        Bryan O'Sullivan <bos@serpentine.com>
  148.14 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  148.15  
  148.16  summary:     Initial commit
  148.17  
  148.18 +</screen>

   149.1 --- a/en/examples/results/tag.remove.out	Mon Mar 09 21:37:47 2009 -0700
   149.2 +++ b/en/examples/results/tag.remove.out	Mon Mar 09 21:39:23 2009 -0700
   149.3 @@ -1,3 +1,4 @@
   149.4 -$ \textbf{hg tag --remove v1.0}
   149.5 -$ \textbf{hg tags}
   149.6 +<screen><prompt>$</prompt> <userinput>hg tag --remove v1.0</userinput>
   149.7 +<prompt>$</prompt> <userinput>hg tags</userinput>
   149.8  tip                                
   149.9 +</screen>

   150.1 --- a/en/examples/results/tag.replace.out	Mon Mar 09 21:37:47 2009 -0700
   150.2 +++ b/en/examples/results/tag.replace.out	Mon Mar 09 21:39:23 2009 -0700
   150.3 @@ -1,10 +1,11 @@
   150.4 -$ \textbf{hg tag -r 1 v1.1}
   150.5 -$ \textbf{hg tags}
   150.6 +<screen><prompt>$</prompt> <userinput>hg tag -r 1 v1.1</userinput>
   150.7 +<prompt>$</prompt> <userinput>hg tags</userinput>
   150.8  tip                                
   150.9  v1.1                               
  150.10 -$ \textbf{hg tag -r 2 v1.1}
  150.11 +<prompt>$</prompt> <userinput>hg tag -r 2 v1.1</userinput>
  150.12  abort: tag 'v1.1' already exists (use -f to force)
  150.13 -$ \textbf{hg tag -f -r 2 v1.1}
  150.14 -$ \textbf{hg tags}
  150.15 +<prompt>$</prompt> <userinput>hg tag -f -r 2 v1.1</userinput>
  150.16 +<prompt>$</prompt> <userinput>hg tags</userinput>
  150.17  tip                                
  150.18  v1.1                               
  150.19 +</screen>

   151.1 --- a/en/examples/results/tag.tag.out	Mon Mar 09 21:37:47 2009 -0700
   151.2 +++ b/en/examples/results/tag.tag.out	Mon Mar 09 21:39:23 2009 -0700
   151.3 @@ -1,1 +1,2 @@
   151.4 -$ \textbf{hg tag v1.0}
   151.5 +<screen><prompt>$</prompt> <userinput>hg tag v1.0</userinput>
   151.6 +</screen>

   152.1 --- a/en/examples/results/tag.tags.out	Mon Mar 09 21:37:47 2009 -0700
   152.2 +++ b/en/examples/results/tag.tags.out	Mon Mar 09 21:39:23 2009 -0700
   152.3 @@ -1,3 +1,4 @@
   152.4 -$ \textbf{hg tags}
   152.5 +<screen><prompt>$</prompt> <userinput>hg tags</userinput>
   152.6  tip                                
   152.7  v1.0                               
   152.8 +</screen>

   153.1 --- a/en/examples/results/tag.tip.out	Mon Mar 09 21:37:47 2009 -0700
   153.2 +++ b/en/examples/results/tag.tip.out	Mon Mar 09 21:39:23 2009 -0700
   153.3 @@ -1,7 +1,8 @@
   153.4 -$ \textbf{hg tip}
   153.5 +<screen><prompt>$</prompt> <userinput>hg tip</userinput>
   153.6  changeset:   
   153.7  tag:         tip
   153.8 -user:        Bryan O'Sullivan <bos@serpentine.com>
   153.9 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  153.10  
  153.11  summary:     Added tag v1.1 for changeset 
  153.12  
  153.13 +</screen>

   154.1 --- a/en/examples/results/template.simple.changelog.out	Mon Mar 09 21:37:47 2009 -0700
   154.2 +++ b/en/examples/results/template.simple.changelog.out	Mon Mar 09 21:39:23 2009 -0700
   154.3 @@ -20,3 +20,4 @@
   154.4  
   154.5  
   154.6  
   154.7 +

   155.1 --- a/en/examples/results/template.simple.combine.out	Mon Mar 09 21:37:47 2009 -0700
   155.2 +++ b/en/examples/results/template.simple.combine.out	Mon Mar 09 21:39:23 2009 -0700
   155.3 @@ -4,3 +4,4 @@
   155.4  
   155.5  
   155.6  
   155.7 +

   156.1 --- a/en/examples/results/template.simple.compact.out	Mon Mar 09 21:37:47 2009 -0700
   156.2 +++ b/en/examples/results/template.simple.compact.out	Mon Mar 09 21:39:23 2009 -0700
   156.3 @@ -11,3 +11,4 @@
   156.4  
   156.5  
   156.6  
   156.7 +

   157.1 --- a/en/examples/results/template.simple.datekeyword.out	Mon Mar 09 21:37:47 2009 -0700
   157.2 +++ b/en/examples/results/template.simple.datekeyword.out	Mon Mar 09 21:39:23 2009 -0700
   157.3 @@ -2,3 +2,4 @@
   157.4  
   157.5  
   157.6  
   157.7 +

   158.1 --- a/en/examples/results/template.simple.keywords.out	Mon Mar 09 21:37:47 2009 -0700
   158.2 +++ b/en/examples/results/template.simple.keywords.out	Mon Mar 09 21:39:23 2009 -0700
   158.3 @@ -19,3 +19,4 @@
   158.4  
   158.5  
   158.6  
   158.7 +

   159.1 --- a/en/examples/results/template.simple.manyfilters.out	Mon Mar 09 21:37:47 2009 -0700
   159.2 +++ b/en/examples/results/template.simple.manyfilters.out	Mon Mar 09 21:39:23 2009 -0700
   159.3 @@ -60,3 +60,4 @@
   159.4  
   159.5  
   159.6  
   159.7 +

   160.1 --- a/en/examples/results/template.simple.normal.out	Mon Mar 09 21:37:47 2009 -0700
   160.2 +++ b/en/examples/results/template.simple.normal.out	Mon Mar 09 21:39:23 2009 -0700
   160.3 @@ -5,3 +5,4 @@
   160.4  
   160.5  
   160.6  
   160.7 +

   161.1 --- a/en/examples/results/template.simple.rev.out	Mon Mar 09 21:37:47 2009 -0700
   161.2 +++ b/en/examples/results/template.simple.rev.out	Mon Mar 09 21:39:23 2009 -0700
   161.3 @@ -1,3 +1,4 @@
   161.4  
   161.5  
   161.6  
   161.7 +

   162.1 --- a/en/examples/results/template.simple.simplest.out	Mon Mar 09 21:37:47 2009 -0700
   162.2 +++ b/en/examples/results/template.simple.simplest.out	Mon Mar 09 21:39:23 2009 -0700
   162.3 @@ -1,2 +1,3 @@
   162.4  
   162.5  
   162.6 +

   163.1 --- a/en/examples/results/template.simple.simplesub.out	Mon Mar 09 21:37:47 2009 -0700
   163.2 +++ b/en/examples/results/template.simple.simplesub.out	Mon Mar 09 21:39:23 2009 -0700
   163.3 @@ -5,3 +5,4 @@
   163.4  
   163.5  
   163.6  
   163.7 +

   164.1 --- a/en/examples/results/template.svnstyle.id.out	Mon Mar 09 21:37:47 2009 -0700
   164.2 +++ b/en/examples/results/template.svnstyle.id.out	Mon Mar 09 21:39:23 2009 -0700
   164.3 @@ -1,1 +1,2 @@
   164.4 -$ \textbf{hg log -r0 --template '\{node\}'}
   164.5 +<screen><prompt>$</prompt> <userinput>hg log -r0 --template '{node}'</userinput>
   164.6 +</screen>

   165.1 --- a/en/examples/results/template.svnstyle.result.out	Mon Mar 09 21:37:47 2009 -0700
   165.2 +++ b/en/examples/results/template.svnstyle.result.out	Mon Mar 09 21:39:23 2009 -0700
   165.3 @@ -1,11 +1,12 @@
   165.4 -$ \textbf{hg log -r1 --style svn.style}
   165.5 +<screen><prompt>$</prompt> <userinput>hg log -r1 --style svn.style</userinput>
   165.6  ------------------------------------------------------------------------
   165.7  
   165.8 -r1 | bos | 2009-01-30 06:40 +0000 (Fri, 30 Jan 2009 06:40:17 +0000)
   165.9 +r1 | bos | 
  165.10  
  165.11 -added line to end of <<hello>> file.
  165.12 +added line to end of &lt;&lt;hello&gt;&gt; file.
  165.13  
  165.14  in addition, added a file with the helpful name (at least i hope that some
  165.15  might consider it so) of goodbye.
  165.16  
  165.17  ------------------------------------------------------------------------
  165.18 +</screen>

   166.1 --- a/en/examples/results/template.svnstyle.short.out	Mon Mar 09 21:37:47 2009 -0700
   166.2 +++ b/en/examples/results/template.svnstyle.short.out	Mon Mar 09 21:39:23 2009 -0700
   166.3 @@ -1,10 +1,11 @@
   166.4 -$ \textbf{svn log -r9653}
   166.5 +<screen><prompt>$</prompt> <userinput>svn log -r9653</userinput>
   166.6  ------------------------------------------------------------------------
   166.7  r9653 | sean.hefty | 2006-09-27 14:39:55 -0700 (Wed, 27 Sep 2006) | 5 lines
   166.8  
   166.9  On reporting a route error, also include the status for the error,
  166.10  rather than indicating a status of 0 when an error has occurred.
  166.11  
  166.12 -Signed-off-by: Sean Hefty <sean.hefty@intel.com>
  166.13 +Signed-off-by: Sean Hefty &lt;sean.hefty@intel.com&gt;
  166.14  
  166.15  ------------------------------------------------------------------------
  166.16 +</screen>

   167.1 --- a/en/examples/results/template.svnstyle.simplest.out	Mon Mar 09 21:37:47 2009 -0700
   167.2 +++ b/en/examples/results/template.svnstyle.simplest.out	Mon Mar 09 21:39:23 2009 -0700
   167.3 @@ -1,4 +1,5 @@
   167.4 -$ \textbf{cat svn.style}
   167.5 -changeset = "\{node|short\}\textbackslash{}n"
   167.6 -$ \textbf{hg log -r1 --style svn.style}
   167.7 +<screen><prompt>$</prompt> <userinput>cat svn.style</userinput>
   167.8 +changeset = "{node|short}\n"
   167.9 +<prompt>$</prompt> <userinput>hg log -r1 --style svn.style</userinput>
  167.10  
  167.11 +</screen>

   168.1 --- a/en/examples/results/template.svnstyle.style.out	Mon Mar 09 21:37:47 2009 -0700
   168.2 +++ b/en/examples/results/template.svnstyle.style.out	Mon Mar 09 21:39:23 2009 -0700
   168.3 @@ -1,3 +1,4 @@
   168.4 -$ \textbf{cat svn.style}
   168.5 -header = '------------------------------------------------------------------------\textbackslash{}n\textbackslash{}n'
   168.6 +<screen><prompt>$</prompt> <userinput>cat svn.style</userinput>
   168.7 +header = '------------------------------------------------------------------------\n\n'
   168.8  changeset = svn.template
   168.9 +</screen>

   169.1 --- a/en/examples/results/template.svnstyle.syntax.error.out	Mon Mar 09 21:37:47 2009 -0700
   169.2 +++ b/en/examples/results/template.svnstyle.syntax.error.out	Mon Mar 09 21:39:23 2009 -0700
   169.3 @@ -1,2 +1,3 @@
   169.4 -$ \textbf{hg log -r1 --style broken.style}
   169.5 +<screen><prompt>$</prompt> <userinput>hg log -r1 --style broken.style</userinput>
   169.6  abort: broken.style:1: parse error
   169.7 +</screen>

   170.1 --- a/en/examples/results/template.svnstyle.syntax.input.out	Mon Mar 09 21:37:47 2009 -0700
   170.2 +++ b/en/examples/results/template.svnstyle.syntax.input.out	Mon Mar 09 21:39:23 2009 -0700
   170.3 @@ -1,2 +1,3 @@
   170.4 -$ \textbf{cat broken.style}
   170.5 +<screen><prompt>$</prompt> <userinput>cat broken.style</userinput>
   170.6  changeset =
   170.7 +</screen>

   171.1 --- a/en/examples/results/template.svnstyle.template.out	Mon Mar 09 21:37:47 2009 -0700
   171.2 +++ b/en/examples/results/template.svnstyle.template.out	Mon Mar 09 21:39:23 2009 -0700
   171.3 @@ -1,6 +1,7 @@
   171.4 -$ \textbf{cat svn.template}
   171.5 -r\{rev\} | \{author|user\} | \{date|isodate\} (\{date|rfc822date\})
   171.6 +<screen><prompt>$</prompt> <userinput>cat svn.template</userinput>
   171.7 +r{rev} | {author|user} | {date|isodate} ({date|rfc822date})
   171.8  
   171.9 -\{desc|strip|fill76\}
  171.10 +{desc|strip|fill76}
  171.11  
  171.12  ------------------------------------------------------------------------
  171.13 +</screen>

   172.1 --- a/en/examples/results/tour-merge-conflict.commit.out	Mon Mar 09 21:37:47 2009 -0700
   172.2 +++ b/en/examples/results/tour-merge-conflict.commit.out	Mon Mar 09 21:39:23 2009 -0700
   172.3 @@ -1,16 +1,17 @@
   172.4 -$ \textbf{cat > letter.txt <<EOF}
   172.5 -> \textbf{Greetings!}
   172.6 -> \textbf{I am Bryan O'Sullivan, no relation of the former}
   172.7 -> \textbf{Nigerian dictator Sani Abacha.}
   172.8 -> \textbf{EOF}
   172.9 -$ \textbf{hg resolve -m letter.txt}
  172.10 -$ \textbf{hg commit -m 'Send me your money'}
  172.11 -$ \textbf{hg tip}
  172.12 +<screen><prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
  172.13 +<prompt>></prompt> <userinput>Greetings!</userinput>
  172.14 +<prompt>></prompt> <userinput>I am Bryan O'Sullivan, no relation of the former</userinput>
  172.15 +<prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
  172.16 +<prompt>></prompt> <userinput>EOF</userinput>
  172.17 +<prompt>$</prompt> <userinput>hg resolve -m letter.txt</userinput>
  172.18 +<prompt>$</prompt> <userinput>hg commit -m 'Send me your money'</userinput>
  172.19 +<prompt>$</prompt> <userinput>hg tip</userinput>
  172.20  changeset:   
  172.21  tag:         tip
  172.22  parent:      
  172.23  parent:      
  172.24 -user:        Bryan O'Sullivan <bos@serpentine.com>
  172.25 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  172.26  
  172.27  summary:     Send me your money
  172.28  
  172.29 +</screen>

   173.1 --- a/en/examples/results/tour-merge-conflict.cousin.out	Mon Mar 09 21:37:47 2009 -0700
   173.2 +++ b/en/examples/results/tour-merge-conflict.cousin.out	Mon Mar 09 21:39:23 2009 -0700
   173.3 @@ -1,11 +1,12 @@
   173.4 -$ \textbf{cd ..}
   173.5 -$ \textbf{hg clone scam scam-cousin}
   173.6 +<screen><prompt>$</prompt> <userinput>cd ..</userinput>
   173.7 +<prompt>$</prompt> <userinput>hg clone scam scam-cousin</userinput>
   173.8  updating working directory
   173.9  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  173.10 -$ \textbf{cd scam-cousin}
  173.11 -$ \textbf{cat > letter.txt <<EOF}
  173.12 -> \textbf{Greetings!}
  173.13 -> \textbf{I am Shehu Musa Abacha, cousin to the former}
  173.14 -> \textbf{Nigerian dictator Sani Abacha.}
  173.15 -> \textbf{EOF}
  173.16 -$ \textbf{hg commit -m '419 scam, with cousin'}
  173.17 +<prompt>$</prompt> <userinput>cd scam-cousin</userinput>
  173.18 +<prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
  173.19 +<prompt>></prompt> <userinput>Greetings!</userinput>
  173.20 +<prompt>></prompt> <userinput>I am Shehu Musa Abacha, cousin to the former</userinput>
  173.21 +<prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
  173.22 +<prompt>></prompt> <userinput>EOF</userinput>
  173.23 +<prompt>$</prompt> <userinput>hg commit -m '419 scam, with cousin'</userinput>
  173.24 +</screen>

   174.1 --- a/en/examples/results/tour-merge-conflict.merge.out	Mon Mar 09 21:37:47 2009 -0700
   174.2 +++ b/en/examples/results/tour-merge-conflict.merge.out	Mon Mar 09 21:39:23 2009 -0700
   174.3 @@ -1,17 +1,18 @@
   174.4 -$ \textbf{export HGMERGE=merge}
   174.5 -$ \textbf{echo 'XXX this is broken and must be fixed'}
   174.6 +<screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput>
   174.7 +<prompt>$</prompt> <userinput>echo 'XXX this is broken and must be fixed'</userinput>
   174.8  XXX this is broken and must be fixed
   174.9 -$ \textbf{hg merge}
  174.10 +<prompt>$</prompt> <userinput>hg merge</userinput>
  174.11  merging letter.txt
  174.12  merge: warning: conflicts during merge
  174.13  merging letter.txt failed!
  174.14  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
  174.15  use 'hg resolve' to retry unresolved file merges
  174.16 -$ \textbf{cat letter.txt}
  174.17 +<prompt>$</prompt> <userinput>cat letter.txt</userinput>
  174.18  Greetings!
  174.19 -
  174.20 +&lt;&lt;&lt;&lt;&lt;&lt;&lt; /tmp/tour-merge-conflictBrdfE0/scam-merge/letter.txt
  174.21  I am Shehu Musa Abacha, cousin to the former
  174.22  =======
  174.23  I am Alhaji Abba Abacha, son of the former
  174.24 -
  174.25 +&gt;&gt;&gt;&gt;&gt;&gt;&gt; /tmp/letter.txt~other.1ctEYy
  174.26  Nigerian dictator Sani Abacha.
  174.27 +</screen>

   175.1 --- a/en/examples/results/tour-merge-conflict.pull.out	Mon Mar 09 21:37:47 2009 -0700
   175.2 +++ b/en/examples/results/tour-merge-conflict.pull.out	Mon Mar 09 21:39:23 2009 -0700
   175.3 @@ -1,9 +1,9 @@
   175.4 -$ \textbf{cd ..}
   175.5 -$ \textbf{hg clone scam-cousin scam-merge}
   175.6 +<screen><prompt>$</prompt> <userinput>cd ..</userinput>
   175.7 +<prompt>$</prompt> <userinput>hg clone scam-cousin scam-merge</userinput>
   175.8  updating working directory
   175.9  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  175.10 -$ \textbf{cd scam-merge}
  175.11 -$ \textbf{hg pull -u ../scam-son}
  175.12 +<prompt>$</prompt> <userinput>cd scam-merge</userinput>
  175.13 +<prompt>$</prompt> <userinput>hg pull -u ../scam-son</userinput>
  175.14  pulling from ../scam-son
  175.15  searching for changes
  175.16  adding changesets
  175.17 @@ -12,3 +12,4 @@
  175.18  added 1 changesets with 1 changes to 1 files (+1 heads)
  175.19  not updating, since new heads added
  175.20  (run 'hg heads' to see heads, 'hg merge' to merge)
  175.21 +</screen>

   176.1 --- a/en/examples/results/tour-merge-conflict.son.out	Mon Mar 09 21:37:47 2009 -0700
   176.2 +++ b/en/examples/results/tour-merge-conflict.son.out	Mon Mar 09 21:39:23 2009 -0700
   176.3 @@ -1,11 +1,12 @@
   176.4 -$ \textbf{cd ..}
   176.5 -$ \textbf{hg clone scam scam-son}
   176.6 +<screen><prompt>$</prompt> <userinput>cd ..</userinput>
   176.7 +<prompt>$</prompt> <userinput>hg clone scam scam-son</userinput>
   176.8  updating working directory
   176.9  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  176.10 -$ \textbf{cd scam-son}
  176.11 -$ \textbf{cat > letter.txt <<EOF}
  176.12 -> \textbf{Greetings!}
  176.13 -> \textbf{I am Alhaji Abba Abacha, son of the former}
  176.14 -> \textbf{Nigerian dictator Sani Abacha.}
  176.15 -> \textbf{EOF}
  176.16 -$ \textbf{hg commit -m '419 scam, with son'}
  176.17 +<prompt>$</prompt> <userinput>cd scam-son</userinput>
  176.18 +<prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
  176.19 +<prompt>></prompt> <userinput>Greetings!</userinput>
  176.20 +<prompt>></prompt> <userinput>I am Alhaji Abba Abacha, son of the former</userinput>
  176.21 +<prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
  176.22 +<prompt>></prompt> <userinput>EOF</userinput>
  176.23 +<prompt>$</prompt> <userinput>hg commit -m '419 scam, with son'</userinput>
  176.24 +</screen>

   177.1 --- a/en/examples/results/tour-merge-conflict.wife.out	Mon Mar 09 21:37:47 2009 -0700
   177.2 +++ b/en/examples/results/tour-merge-conflict.wife.out	Mon Mar 09 21:39:23 2009 -0700
   177.3 @@ -1,7 +1,8 @@
   177.4 -$ \textbf{cat > letter.txt <<EOF}
   177.5 -> \textbf{Greetings!}
   177.6 -> \textbf{I am Mariam Abacha, the wife of former}
   177.7 -> \textbf{Nigerian dictator Sani Abacha.}
   177.8 -> \textbf{EOF}
   177.9 -$ \textbf{hg add letter.txt}
  177.10 -$ \textbf{hg commit -m '419 scam, first draft'}
  177.11 +<screen><prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
  177.12 +<prompt>></prompt> <userinput>Greetings!</userinput>
  177.13 +<prompt>></prompt> <userinput>I am Mariam Abacha, the wife of former</userinput>
  177.14 +<prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
  177.15 +<prompt>></prompt> <userinput>EOF</userinput>
  177.16 +<prompt>$</prompt> <userinput>hg add letter.txt</userinput>
  177.17 +<prompt>$</prompt> <userinput>hg commit -m '419 scam, first draft'</userinput>
  177.18 +</screen>

   178.1 --- a/en/examples/results/tour.clone-pull.out	Mon Mar 09 21:37:47 2009 -0700
   178.2 +++ b/en/examples/results/tour.clone-pull.out	Mon Mar 09 21:39:23 2009 -0700
   178.3 @@ -1,4 +1,5 @@
   178.4 -$ \textbf{cd ..}
   178.5 -$ \textbf{hg clone hello hello-pull}
   178.6 +<screen><prompt>$</prompt> <userinput>cd ..</userinput>
   178.7 +<prompt>$</prompt> <userinput>hg clone hello hello-pull</userinput>
   178.8  updating working directory
   178.9  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  178.10 +</screen>

   179.1 --- a/en/examples/results/tour.clone-push.out	Mon Mar 09 21:37:47 2009 -0700
   179.2 +++ b/en/examples/results/tour.clone-push.out	Mon Mar 09 21:39:23 2009 -0700
   179.3 @@ -1,4 +1,5 @@
   179.4 -$ \textbf{cd ..}
   179.5 -$ \textbf{hg clone hello hello-push}
   179.6 +<screen><prompt>$</prompt> <userinput>cd ..</userinput>
   179.7 +<prompt>$</prompt> <userinput>hg clone hello hello-push</userinput>
   179.8  updating working directory
   179.9  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  179.10 +</screen>

   180.1 --- a/en/examples/results/tour.clone.out	Mon Mar 09 21:37:47 2009 -0700
   180.2 +++ b/en/examples/results/tour.clone.out	Mon Mar 09 21:39:23 2009 -0700
   180.3 @@ -1,4 +1,4 @@
   180.4 -$ \textbf{hg clone http://hg.serpentine.com/tutorial/hello}
   180.5 +<screen><prompt>$</prompt> <userinput>hg clone http://hg.serpentine.com/tutorial/hello</userinput>
   180.6  destination directory: hello
   180.7  requesting all changes
   180.8  adding changesets
   180.9 @@ -7,3 +7,4 @@
  180.10  added 5 changesets with 5 changes to 2 files
  180.11  updating working directory
  180.12  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  180.13 +</screen>

   181.1 --- a/en/examples/results/tour.commit.out	Mon Mar 09 21:37:47 2009 -0700
   181.2 +++ b/en/examples/results/tour.commit.out	Mon Mar 09 21:39:23 2009 -0700
   181.3 @@ -1,1 +1,2 @@
   181.4 -$ \textbf{hg commit}
   181.5 +<screen><prompt>$</prompt> <userinput>hg commit</userinput>
   181.6 +</screen>

   182.1 --- a/en/examples/results/tour.diff.out	Mon Mar 09 21:37:47 2009 -0700
   182.2 +++ b/en/examples/results/tour.diff.out	Mon Mar 09 21:39:23 2009 -0700
   182.3 @@ -1,11 +1,12 @@
   182.4 -$ \textbf{hg diff}
   182.5 +<screen><prompt>$</prompt> <userinput>hg diff</userinput>
   182.6  diff -r  hello.c
   182.7  
   182.8  
   182.9  @@ -8,5 +8,6 @@
  182.10   int main(int argc, char **argv)
  182.11 - \{
  182.12 - 	printf("hello, world!\textbackslash{}");
  182.13 -+	printf("hello again!\textbackslash{}n");
  182.14 + {
  182.15 + 	printf("hello, world!\");
  182.16 ++	printf("hello again!\n");
  182.17   	return 0;
  182.18 - \}
  182.19 + }
  182.20 +</screen>

   183.1 --- a/en/examples/results/tour.help.out	Mon Mar 09 21:37:47 2009 -0700
   183.2 +++ b/en/examples/results/tour.help.out	Mon Mar 09 21:39:23 2009 -0700
   183.3 @@ -1,4 +1,4 @@
   183.4 -$ \textbf{hg help init}
   183.5 +<screen><prompt>$</prompt> <userinput>hg help init</userinput>
   183.6  hg init [-e CMD] [--remotecmd CMD] [DEST]
   183.7  
   183.8  create a new repository in the given directory
   183.9 @@ -17,3 +17,4 @@
  183.10      --remotecmd  specify hg command to run on the remote side
  183.11  
  183.12  use "hg -v help init" to show global options
  183.13 +</screen>

   184.1 --- a/en/examples/results/tour.incoming.out	Mon Mar 09 21:37:47 2009 -0700
   184.2 +++ b/en/examples/results/tour.incoming.out	Mon Mar 09 21:39:23 2009 -0700
   184.3 @@ -1,10 +1,11 @@
   184.4 -$ \textbf{cd hello-pull}
   184.5 -$ \textbf{hg incoming ../my-hello}
   184.6 +<screen><prompt>$</prompt> <userinput>cd hello-pull</userinput>
   184.7 +<prompt>$</prompt> <userinput>hg incoming ../my-hello</userinput>
   184.8  comparing with ../my-hello
   184.9  searching for changes
  184.10  changeset:   
  184.11  tag:         tip
  184.12 -user:        Bryan O'Sullivan <bos@serpentine.com>
  184.13 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  184.14  
  184.15  summary:     Added an extra line of output
  184.16  
  184.17 +</screen>

   185.1 --- a/en/examples/results/tour.log-r.out	Mon Mar 09 21:37:47 2009 -0700
   185.2 +++ b/en/examples/results/tour.log-r.out	Mon Mar 09 21:39:23 2009 -0700
   185.3 @@ -1,16 +1,16 @@
   185.4 -$ \textbf{hg log -r 3}
   185.5 +<screen><prompt>$</prompt> <userinput>hg log -r 3</userinput>
   185.6  changeset:   
   185.7 -user:        Bryan O'Sullivan <bos@serpentine.com>
   185.8 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   185.9  
  185.10  summary:     Get make to generate the final binary from a .o file.
  185.11  
  185.12 -$ \textbf{hg log -r }
  185.13 +<prompt>$</prompt> <userinput>hg log -r </userinput>
  185.14  changeset:   
  185.15 -user:        Bryan O'Sullivan <bos@serpentine.com>
  185.16 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  185.17  
  185.18  summary:     Get make to generate the final binary from a .o file.
  185.19  
  185.20 -$ \textbf{hg log -r 1 -r 4}
  185.21 +<prompt>$</prompt> <userinput>hg log -r 1 -r 4</userinput>
  185.22  changeset:   
  185.23  user:        mpm@selenic.com
  185.24  
  185.25 @@ -18,7 +18,8 @@
  185.26  
  185.27  changeset:   
  185.28  tag:         tip
  185.29 -user:        Bryan O'Sullivan <bos@serpentine.com>
  185.30 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  185.31  
  185.32  summary:     Trim comments.
  185.33  
  185.34 +</screen>

   186.1 --- a/en/examples/results/tour.log-v.out	Mon Mar 09 21:37:47 2009 -0700
   186.2 +++ b/en/examples/results/tour.log-v.out	Mon Mar 09 21:39:23 2009 -0700
   186.3 @@ -1,9 +1,10 @@
   186.4 -$ \textbf{hg log -v -r 3}
   186.5 +<screen><prompt>$</prompt> <userinput>hg log -v -r 3</userinput>
   186.6  changeset:   
   186.7 -user:        Bryan O'Sullivan <bos@serpentine.com>
   186.8 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   186.9  
  186.10  files:       Makefile
  186.11  description:
  186.12  Get make to generate the final binary from a .o file.
  186.13  
  186.14  
  186.15 +</screen>

   187.1 --- a/en/examples/results/tour.log-vp.out	Mon Mar 09 21:37:47 2009 -0700
   187.2 +++ b/en/examples/results/tour.log-vp.out	Mon Mar 09 21:39:23 2009 -0700
   187.3 @@ -1,6 +1,6 @@
   187.4 -$ \textbf{hg log -v -p -r 2}
   187.5 +<screen><prompt>$</prompt> <userinput>hg log -v -p -r 2</userinput>
   187.6  changeset:   
   187.7 -user:        Bryan O'Sullivan <bos@serpentine.com>
   187.8 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   187.9  
  187.10  files:       hello.c
  187.11  description:
  187.12 @@ -13,9 +13,10 @@
  187.13  @@ -11,6 +11,6 @@
  187.14   
  187.15   int main(int argc, char **argv)
  187.16 - \{
  187.17 --	printf("hello, world!\textbackslash{}n");
  187.18 -+	printf("hello, world!\textbackslash{}");
  187.19 + {
  187.20 +-	printf("hello, world!\n");
  187.21 ++	printf("hello, world!\");
  187.22   	return 0;
  187.23 - \}
  187.24 + }
  187.25  
  187.26 +</screen>

   188.1 --- a/en/examples/results/tour.log.out	Mon Mar 09 21:37:47 2009 -0700
   188.2 +++ b/en/examples/results/tour.log.out	Mon Mar 09 21:39:23 2009 -0700
   188.3 @@ -1,17 +1,17 @@
   188.4 -$ \textbf{hg log}
   188.5 +<screen><prompt>$</prompt> <userinput>hg log</userinput>
   188.6  changeset:   
   188.7  tag:         tip
   188.8 -user:        Bryan O'Sullivan <bos@serpentine.com>
   188.9 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  188.10  
  188.11  summary:     Trim comments.
  188.12  
  188.13  changeset:   
  188.14 -user:        Bryan O'Sullivan <bos@serpentine.com>
  188.15 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  188.16  
  188.17  summary:     Get make to generate the final binary from a .o file.
  188.18  
  188.19  changeset:   
  188.20 -user:        Bryan O'Sullivan <bos@serpentine.com>
  188.21 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  188.22  
  188.23  summary:     Introduce a typo into hello.c.
  188.24  
  188.25 @@ -25,3 +25,4 @@
  188.26  
  188.27  summary:     Create a standard "hello, world" program
  188.28  
  188.29 +</screen>

   189.1 --- a/en/examples/results/tour.log.range.out	Mon Mar 09 21:37:47 2009 -0700
   189.2 +++ b/en/examples/results/tour.log.range.out	Mon Mar 09 21:39:23 2009 -0700
   189.3 @@ -1,17 +1,18 @@
   189.4 -$ \textbf{hg log -r 2:4}
   189.5 +<screen><prompt>$</prompt> <userinput>hg log -r 2:4</userinput>
   189.6  changeset:   
   189.7 -user:        Bryan O'Sullivan <bos@serpentine.com>
   189.8 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   189.9  
  189.10  summary:     Introduce a typo into hello.c.
  189.11  
  189.12  changeset:   
  189.13 -user:        Bryan O'Sullivan <bos@serpentine.com>
  189.14 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  189.15  
  189.16  summary:     Get make to generate the final binary from a .o file.
  189.17  
  189.18  changeset:   
  189.19  tag:         tip
  189.20 -user:        Bryan O'Sullivan <bos@serpentine.com>
  189.21 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  189.22  
  189.23  summary:     Trim comments.
  189.24  
  189.25 +</screen>

   190.1 --- a/en/examples/results/tour.ls-a.out	Mon Mar 09 21:37:47 2009 -0700
   190.2 +++ b/en/examples/results/tour.ls-a.out	Mon Mar 09 21:39:23 2009 -0700
   190.3 @@ -1,3 +1,4 @@
   190.4 -$ \textbf{cd hello}
   190.5 -$ \textbf{ls -a}
   190.6 +<screen><prompt>$</prompt> <userinput>cd hello</userinput>
   190.7 +<prompt>$</prompt> <userinput>ls -a</userinput>
   190.8  .  ..  .hg  Makefile  hello.c
   190.9 +</screen>

   191.1 --- a/en/examples/results/tour.ls.out	Mon Mar 09 21:37:47 2009 -0700
   191.2 +++ b/en/examples/results/tour.ls.out	Mon Mar 09 21:39:23 2009 -0700
   191.3 @@ -1,5 +1,6 @@
   191.4 -$ \textbf{ls -l}
   191.5 +<screen><prompt>$</prompt> <userinput>ls -l</userinput>
   191.6  
   191.7  
   191.8 -$ \textbf{ls hello}
   191.9 +<prompt>$</prompt> <userinput>ls hello</userinput>
  191.10  Makefile  hello.c
  191.11 +</screen>

   192.1 --- a/en/examples/results/tour.merge.cat.out	Mon Mar 09 21:37:47 2009 -0700
   192.2 +++ b/en/examples/results/tour.merge.cat.out	Mon Mar 09 21:39:23 2009 -0700
   192.3 @@ -1,28 +1,29 @@
   192.4 -$ \textbf{cat hello.c}
   192.5 +<screen><prompt>$</prompt> <userinput>cat hello.c</userinput>
   192.6  /*
   192.7   * Placed in the public domain by Bryan O'Sullivan.  This program is
   192.8   * not covered by patents in the United States or other countries.
   192.9   */
  192.10  
  192.11 -#include <stdio.h>
  192.12 +#include &lt;stdio.h&gt;
  192.13  
  192.14  int main(int argc, char **argv)
  192.15 -\{
  192.16 -	printf("once more, hello.\textbackslash{}n");
  192.17 -	printf("hello, world!\textbackslash{}");
  192.18 +{
  192.19 +	printf("once more, hello.\n");
  192.20 +	printf("hello, world!\");
  192.21  	return 0;
  192.22 -\}
  192.23 -$ \textbf{cat ../my-hello/hello.c}
  192.24 +}
  192.25 +<prompt>$</prompt> <userinput>cat ../my-hello/hello.c</userinput>
  192.26  /*
  192.27   * Placed in the public domain by Bryan O'Sullivan.  This program is
  192.28   * not covered by patents in the United States or other countries.
  192.29   */
  192.30  
  192.31 -#include <stdio.h>
  192.32 +#include &lt;stdio.h&gt;
  192.33  
  192.34  int main(int argc, char **argv)
  192.35 -\{
  192.36 -	printf("hello, world!\textbackslash{}");
  192.37 -	printf("hello again!\textbackslash{}n");
  192.38 +{
  192.39 +	printf("hello, world!\");
  192.40 +	printf("hello again!\n");
  192.41  	return 0;
  192.42 -\}
  192.43 +}
  192.44 +</screen>

   193.1 --- a/en/examples/results/tour.merge.clone.out	Mon Mar 09 21:37:47 2009 -0700
   193.2 +++ b/en/examples/results/tour.merge.clone.out	Mon Mar 09 21:39:23 2009 -0700
   193.3 @@ -1,7 +1,8 @@
   193.4 -$ \textbf{cd ..}
   193.5 -$ \textbf{hg clone hello my-new-hello}
   193.6 +<screen><prompt>$</prompt> <userinput>cd ..</userinput>
   193.7 +<prompt>$</prompt> <userinput>hg clone hello my-new-hello</userinput>
   193.8  updating working directory
   193.9  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  193.10 -$ \textbf{cd my-new-hello}
  193.11 -$ \textbf{sed -i '/printf/i\textbackslash{}\textbackslash{}tprintf("once more, hello.\textbackslash{}\textbackslash{}n");' hello.c}
  193.12 -$ \textbf{hg commit -m 'A new hello for a new day.'}
  193.13 +<prompt>$</prompt> <userinput>cd my-new-hello</userinput>
  193.14 +<prompt>$</prompt> <userinput>sed -i '/printf/i\\tprintf("once more, hello.\\n");' hello.c</userinput>
  193.15 +<prompt>$</prompt> <userinput>hg commit -m 'A new hello for a new day.'</userinput>
  193.16 +</screen>

   194.1 --- a/en/examples/results/tour.merge.commit.out	Mon Mar 09 21:37:47 2009 -0700
   194.2 +++ b/en/examples/results/tour.merge.commit.out	Mon Mar 09 21:39:23 2009 -0700
   194.3 @@ -1,1 +1,2 @@
   194.4 -$ \textbf{hg commit -m 'Merged changes'}
   194.5 +<screen><prompt>$</prompt> <userinput>hg commit -m 'Merged changes'</userinput>
   194.6 +</screen>

   195.1 --- a/en/examples/results/tour.merge.heads.out	Mon Mar 09 21:37:47 2009 -0700
   195.2 +++ b/en/examples/results/tour.merge.heads.out	Mon Mar 09 21:39:23 2009 -0700
   195.3 @@ -1,13 +1,14 @@
   195.4 -$ \textbf{hg heads}
   195.5 +<screen><prompt>$</prompt> <userinput>hg heads</userinput>
   195.6  changeset:   
   195.7  tag:         tip
   195.8  parent:      
   195.9 -user:        Bryan O'Sullivan <bos@serpentine.com>
  195.10 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  195.11  
  195.12  summary:     Added an extra line of output
  195.13  
  195.14  changeset:   
  195.15 -user:        Bryan O'Sullivan <bos@serpentine.com>
  195.16 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  195.17  
  195.18  summary:     A new hello for a new day.
  195.19  
  195.20 +</screen>

   196.1 --- a/en/examples/results/tour.merge.merge.out	Mon Mar 09 21:37:47 2009 -0700
   196.2 +++ b/en/examples/results/tour.merge.merge.out	Mon Mar 09 21:39:23 2009 -0700
   196.3 @@ -1,4 +1,5 @@
   196.4 -$ \textbf{hg merge}
   196.5 +<screen><prompt>$</prompt> <userinput>hg merge</userinput>
   196.6  merging hello.c
   196.7  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   196.8  (branch merge, don't forget to commit)
   196.9 +</screen>

   197.1 --- a/en/examples/results/tour.merge.parents.out	Mon Mar 09 21:37:47 2009 -0700
   197.2 +++ b/en/examples/results/tour.merge.parents.out	Mon Mar 09 21:39:23 2009 -0700
   197.3 @@ -1,28 +1,29 @@
   197.4 -$ \textbf{hg parents}
   197.5 +<screen><prompt>$</prompt> <userinput>hg parents</userinput>
   197.6  changeset:   
   197.7 -user:        Bryan O'Sullivan <bos@serpentine.com>
   197.8 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   197.9  
  197.10  summary:     A new hello for a new day.
  197.11  
  197.12  changeset:   
  197.13  tag:         tip
  197.14  parent:      
  197.15 -user:        Bryan O'Sullivan <bos@serpentine.com>
  197.16 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  197.17  
  197.18  summary:     Added an extra line of output
  197.19  
  197.20 -$ \textbf{cat hello.c}
  197.21 +<prompt>$</prompt> <userinput>cat hello.c</userinput>
  197.22  /*
  197.23   * Placed in the public domain by Bryan O'Sullivan.  This program is
  197.24   * not covered by patents in the United States or other countries.
  197.25   */
  197.26  
  197.27 -#include <stdio.h>
  197.28 +#include &lt;stdio.h&gt;
  197.29  
  197.30  int main(int argc, char **argv)
  197.31 -\{
  197.32 -	printf("once more, hello.\textbackslash{}n");
  197.33 -	printf("hello, world!\textbackslash{}");
  197.34 -	printf("hello again!\textbackslash{}n");
  197.35 +{
  197.36 +	printf("once more, hello.\n");
  197.37 +	printf("hello, world!\");
  197.38 +	printf("hello again!\n");
  197.39  	return 0;
  197.40 -\}
  197.41 +}
  197.42 +</screen>

   198.1 --- a/en/examples/results/tour.merge.pull.out	Mon Mar 09 21:37:47 2009 -0700
   198.2 +++ b/en/examples/results/tour.merge.pull.out	Mon Mar 09 21:39:23 2009 -0700
   198.3 @@ -1,4 +1,4 @@
   198.4 -$ \textbf{hg pull ../my-hello}
   198.5 +<screen><prompt>$</prompt> <userinput>hg pull ../my-hello</userinput>
   198.6  pulling from ../my-hello
   198.7  searching for changes
   198.8  adding changesets
   198.9 @@ -6,3 +6,4 @@
  198.10  adding file changes
  198.11  added 1 changesets with 1 changes to 1 files (+1 heads)
  198.12  (run 'hg heads' to see heads, 'hg merge' to merge)
  198.13 +</screen>

   199.1 --- a/en/examples/results/tour.merge.tip.out	Mon Mar 09 21:37:47 2009 -0700
   199.2 +++ b/en/examples/results/tour.merge.tip.out	Mon Mar 09 21:39:23 2009 -0700
   199.3 @@ -1,9 +1,10 @@
   199.4 -$ \textbf{hg tip}
   199.5 +<screen><prompt>$</prompt> <userinput>hg tip</userinput>
   199.6  changeset:   
   199.7  tag:         tip
   199.8  parent:      
   199.9  parent:      
  199.10 -user:        Bryan O'Sullivan <bos@serpentine.com>
  199.11 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  199.12  
  199.13  summary:     Merged changes
  199.14  
  199.15 +</screen>

   200.1 --- a/en/examples/results/tour.merge.update.out	Mon Mar 09 21:37:47 2009 -0700
   200.2 +++ b/en/examples/results/tour.merge.update.out	Mon Mar 09 21:39:23 2009 -0700
   200.3 @@ -1,2 +1,3 @@
   200.4 -$ \textbf{hg update}
   200.5 +<screen><prompt>$</prompt> <userinput>hg update</userinput>
   200.6  abort: crosses branches (use 'hg merge' or 'hg update -C')
   200.7 +</screen>

   201.1 --- a/en/examples/results/tour.older.out	Mon Mar 09 21:37:47 2009 -0700
   201.2 +++ b/en/examples/results/tour.older.out	Mon Mar 09 21:39:23 2009 -0700
   201.3 @@ -1,10 +1,11 @@
   201.4 -$ \textbf{hg update 2}
   201.5 +<screen><prompt>$</prompt> <userinput>hg update 2</userinput>
   201.6  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   201.7 -$ \textbf{hg parents}
   201.8 +<prompt>$</prompt> <userinput>hg parents</userinput>
   201.9  changeset:   
  201.10 -user:        Bryan O'Sullivan <bos@serpentine.com>
  201.11 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  201.12  
  201.13  summary:     Introduce a typo into hello.c.
  201.14  
  201.15 -$ \textbf{hg update}
  201.16 +<prompt>$</prompt> <userinput>hg update</userinput>
  201.17  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  201.18 +</screen>

   202.1 --- a/en/examples/results/tour.outgoing.net.out	Mon Mar 09 21:37:47 2009 -0700
   202.2 +++ b/en/examples/results/tour.outgoing.net.out	Mon Mar 09 21:39:23 2009 -0700
   202.3 @@ -1,9 +1,10 @@
   202.4 -$ \textbf{hg outgoing http://hg.serpentine.com/tutorial/hello}
   202.5 +<screen><prompt>$</prompt> <userinput>hg outgoing http://hg.serpentine.com/tutorial/hello</userinput>
   202.6  comparing with http://hg.serpentine.com/tutorial/hello
   202.7  searching for changes
   202.8  changeset:   
   202.9  tag:         tip
  202.10 -user:        Bryan O'Sullivan <bos@serpentine.com>
  202.11 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  202.12  
  202.13  summary:     Added an extra line of output
  202.14  
  202.15 +</screen>

   203.1 --- a/en/examples/results/tour.outgoing.out	Mon Mar 09 21:37:47 2009 -0700
   203.2 +++ b/en/examples/results/tour.outgoing.out	Mon Mar 09 21:39:23 2009 -0700
   203.3 @@ -1,10 +1,11 @@
   203.4 -$ \textbf{cd my-hello}
   203.5 -$ \textbf{hg outgoing ../hello-push}
   203.6 +<screen><prompt>$</prompt> <userinput>cd my-hello</userinput>
   203.7 +<prompt>$</prompt> <userinput>hg outgoing ../hello-push</userinput>
   203.8  comparing with ../hello-push
   203.9  searching for changes
  203.10  changeset:   
  203.11  tag:         tip
  203.12 -user:        Bryan O'Sullivan <bos@serpentine.com>
  203.13 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  203.14  
  203.15  summary:     Added an extra line of output
  203.16  
  203.17 +</screen>

   204.1 --- a/en/examples/results/tour.parents.out	Mon Mar 09 21:37:47 2009 -0700
   204.2 +++ b/en/examples/results/tour.parents.out	Mon Mar 09 21:39:23 2009 -0700
   204.3 @@ -1,7 +1,8 @@
   204.4 -$ \textbf{hg parents}
   204.5 +<screen><prompt>$</prompt> <userinput>hg parents</userinput>
   204.6  changeset:   
   204.7  tag:         tip
   204.8 -user:        Bryan O'Sullivan <bos@serpentine.com>
   204.9 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  204.10  
  204.11  summary:     Added an extra line of output
  204.12  
  204.13 +</screen>

   205.1 --- a/en/examples/results/tour.pull.out	Mon Mar 09 21:37:47 2009 -0700
   205.2 +++ b/en/examples/results/tour.pull.out	Mon Mar 09 21:39:23 2009 -0700
   205.3 @@ -1,11 +1,11 @@
   205.4 -$ \textbf{hg tip}
   205.5 +<screen><prompt>$</prompt> <userinput>hg tip</userinput>
   205.6  changeset:   
   205.7  tag:         tip
   205.8 -user:        Bryan O'Sullivan <bos@serpentine.com>
   205.9 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  205.10  
  205.11  summary:     Trim comments.
  205.12  
  205.13 -$ \textbf{hg pull ../my-hello}
  205.14 +<prompt>$</prompt> <userinput>hg pull ../my-hello</userinput>
  205.15  pulling from ../my-hello
  205.16  searching for changes
  205.17  adding changesets
  205.18 @@ -13,10 +13,11 @@
  205.19  adding file changes
  205.20  added 1 changesets with 1 changes to 1 files
  205.21  (run 'hg update' to get a working copy)
  205.22 -$ \textbf{hg tip}
  205.23 +<prompt>$</prompt> <userinput>hg tip</userinput>
  205.24  changeset:   
  205.25  tag:         tip
  205.26 -user:        Bryan O'Sullivan <bos@serpentine.com>
  205.27 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  205.28  
  205.29  summary:     Added an extra line of output
  205.30  
  205.31 +</screen>

   206.1 --- a/en/examples/results/tour.push.net.out	Mon Mar 09 21:37:47 2009 -0700
   206.2 +++ b/en/examples/results/tour.push.net.out	Mon Mar 09 21:39:23 2009 -0700
   206.3 @@ -1,4 +1,5 @@
   206.4 -$ \textbf{hg push http://hg.serpentine.com/tutorial/hello}
   206.5 +<screen><prompt>$</prompt> <userinput>hg push http://hg.serpentine.com/tutorial/hello</userinput>
   206.6  pushing to http://hg.serpentine.com/tutorial/hello
   206.7  searching for changes
   206.8  ssl required
   206.9 +</screen>

   207.1 --- a/en/examples/results/tour.push.nothing.out	Mon Mar 09 21:37:47 2009 -0700
   207.2 +++ b/en/examples/results/tour.push.nothing.out	Mon Mar 09 21:39:23 2009 -0700
   207.3 @@ -1,4 +1,5 @@
   207.4 -$ \textbf{hg push ../hello-push}
   207.5 +<screen><prompt>$</prompt> <userinput>hg push ../hello-push</userinput>
   207.6  pushing to ../hello-push
   207.7  searching for changes
   207.8  no changes found
   207.9 +</screen>

   208.1 --- a/en/examples/results/tour.push.out	Mon Mar 09 21:37:47 2009 -0700
   208.2 +++ b/en/examples/results/tour.push.out	Mon Mar 09 21:39:23 2009 -0700
   208.3 @@ -1,7 +1,8 @@
   208.4 -$ \textbf{hg push ../hello-push}
   208.5 +<screen><prompt>$</prompt> <userinput>hg push ../hello-push</userinput>
   208.6  pushing to ../hello-push
   208.7  searching for changes
   208.8  adding changesets
   208.9  adding manifests
  208.10  adding file changes
  208.11  added 1 changesets with 1 changes to 1 files
  208.12 +</screen>

   209.1 --- a/en/examples/results/tour.reclone.out	Mon Mar 09 21:37:47 2009 -0700
   209.2 +++ b/en/examples/results/tour.reclone.out	Mon Mar 09 21:39:23 2009 -0700
   209.3 @@ -1,5 +1,6 @@
   209.4 -$ \textbf{cd ..}
   209.5 -$ \textbf{hg clone hello my-hello}
   209.6 +<screen><prompt>$</prompt> <userinput>cd ..</userinput>
   209.7 +<prompt>$</prompt> <userinput>hg clone hello my-hello</userinput>
   209.8  updating working directory
   209.9  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  209.10 -$ \textbf{cd my-hello}
  209.11 +<prompt>$</prompt> <userinput>cd my-hello</userinput>
  209.12 +</screen>

   210.1 --- a/en/examples/results/tour.sed.out	Mon Mar 09 21:37:47 2009 -0700
   210.2 +++ b/en/examples/results/tour.sed.out	Mon Mar 09 21:39:23 2009 -0700
   210.3 @@ -1,1 +1,2 @@
   210.4 -$ \textbf{sed -i '/printf/a\textbackslash{}\textbackslash{}tprintf("hello again!\textbackslash{}\textbackslash{}n");' hello.c}
   210.5 +<screen><prompt>$</prompt> <userinput>sed -i '/printf/a\\tprintf("hello again!\\n");' hello.c</userinput>
   210.6 +</screen>

   211.1 --- a/en/examples/results/tour.status.out	Mon Mar 09 21:37:47 2009 -0700
   211.2 +++ b/en/examples/results/tour.status.out	Mon Mar 09 21:39:23 2009 -0700
   211.3 @@ -1,4 +1,5 @@
   211.4 -$ \textbf{ls}
   211.5 +<screen><prompt>$</prompt> <userinput>ls</userinput>
   211.6  Makefile  hello.c
   211.7 -$ \textbf{hg status}
   211.8 +<prompt>$</prompt> <userinput>hg status</userinput>
   211.9  M hello.c
  211.10 +</screen>

   212.1 --- a/en/examples/results/tour.tip.out	Mon Mar 09 21:37:47 2009 -0700
   212.2 +++ b/en/examples/results/tour.tip.out	Mon Mar 09 21:39:23 2009 -0700
   212.3 @@ -1,7 +1,7 @@
   212.4 -$ \textbf{hg tip -vp}
   212.5 +<screen><prompt>$</prompt> <userinput>hg tip -vp</userinput>
   212.6  changeset:   
   212.7  tag:         tip
   212.8 -user:        Bryan O'Sullivan <bos@serpentine.com>
   212.9 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  212.10  
  212.11  files:       hello.c
  212.12  description:
  212.13 @@ -13,9 +13,10 @@
  212.14  
  212.15  @@ -8,5 +8,6 @@
  212.16   int main(int argc, char **argv)
  212.17 - \{
  212.18 - 	printf("hello, world!\textbackslash{}");
  212.19 -+	printf("hello again!\textbackslash{}n");
  212.20 + {
  212.21 + 	printf("hello, world!\");
  212.22 ++	printf("hello again!\n");
  212.23   	return 0;
  212.24 - \}
  212.25 + }
  212.26  
  212.27 +</screen>

   213.1 --- a/en/examples/results/tour.update.out	Mon Mar 09 21:37:47 2009 -0700
   213.2 +++ b/en/examples/results/tour.update.out	Mon Mar 09 21:39:23 2009 -0700
   213.3 @@ -1,7 +1,8 @@
   213.4 -$ \textbf{grep printf hello.c}
   213.5 -	printf("hello, world!\textbackslash{}");
   213.6 -$ \textbf{hg update tip}
   213.7 +<screen><prompt>$</prompt> <userinput>grep printf hello.c</userinput>
   213.8 +	printf("hello, world!\");
   213.9 +<prompt>$</prompt> <userinput>hg update tip</userinput>
  213.10  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  213.11 -$ \textbf{grep printf hello.c}
  213.12 -	printf("hello, world!\textbackslash{}");
  213.13 -	printf("hello again!\textbackslash{}n");
  213.14 +<prompt>$</prompt> <userinput>grep printf hello.c</userinput>
  213.15 +	printf("hello, world!\");
  213.16 +	printf("hello again!\n");
  213.17 +</screen>

   214.1 --- a/en/examples/results/tour.version.out	Mon Mar 09 21:37:47 2009 -0700
   214.2 +++ b/en/examples/results/tour.version.out	Mon Mar 09 21:39:23 2009 -0700
   214.3 @@ -1,6 +1,7 @@
   214.4 -$ \textbf{hg version}
   214.5 +<screen><prompt>$</prompt> <userinput>hg version</userinput>
   214.6  Mercurial Distributed SCM (version )
   214.7  
   214.8 -Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others
   214.9 +Copyright (C) 2005-2008 Matt Mackall &lt;mpm@selenic.com&gt; and others
  214.10  This is free software; see the source for copying conditions. There is NO
  214.11  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  214.12 +</screen>

   215.1 --- a/en/examples/run-example	Mon Mar 09 21:37:47 2009 -0700
   215.2 +++ b/en/examples/run-example	Mon Mar 09 21:39:23 2009 -0700
   215.3 @@ -18,23 +18,23 @@
   215.4  import tempfile
   215.5  import time
   215.6  
   215.7 -tex_subs = {
   215.8 -    '\\': '\\textbackslash{}',
   215.9 -    '{': '\\{',
  215.10 -    '}': '\\}',
  215.11 +xml_subs = {
  215.12 +    '<': '&lt;',
  215.13 +    '>': '&gt;',
  215.14 +    '&': '&amp;',
  215.15      }
  215.16  
  215.17  def gensubs(s):
  215.18      start = 0
  215.19      for i, c in enumerate(s):
  215.20 -        sub = tex_subs.get(c)
  215.21 +        sub = xml_subs.get(c)
  215.22          if sub:
  215.23              yield s[start:i]
  215.24              start = i + 1
  215.25              yield sub
  215.26      yield s[start:]
  215.27  
  215.28 -def tex_escape(s):
  215.29 +def xml_escape(s):
  215.30      return ''.join(gensubs(s))
  215.31          
  215.32  def maybe_unlink(name):
  215.33 @@ -53,6 +53,10 @@
  215.34              return p
  215.35      return None
  215.36          
  215.37 +def result_name(name):
  215.38 +    dirname, basename = os.path.split(name)
  215.39 +    return os.path.join(dirname, 'results', basename)
  215.40 +
  215.41  class example:
  215.42      shell = '/usr/bin/env bash'
  215.43      ps1 = '__run_example_ps1__ '
  215.44 @@ -231,12 +235,15 @@
  215.45                                  return 1
  215.46                              assert os.sep not in out
  215.47                              if ofp is not None:
  215.48 +                                ofp.write('</screen>\n')
  215.49                                  ofp.close()
  215.50                                  err |= self.rename_output(ofp_basename, ignore)
  215.51                              if out:
  215.52                                  ofp_basename = '%s.%s' % (self.name, out)
  215.53                                  read_hint = ofp_basename + ' '
  215.54 -                                ofp = open(ofp_basename + '.tmp', 'w')
  215.55 +                                ofp = open(result_name(ofp_basename + '.tmp'),
  215.56 +                                           'w')
  215.57 +                                ofp.write('<screen>')
  215.58                              else:
  215.59                                  ofp = None
  215.60                          elif pi == 'ignore':
  215.61 @@ -249,13 +256,13 @@
  215.62                          # first, print the command we ran
  215.63                          if not hunk.startswith('#'):
  215.64                              nl = hunk.endswith('\n')
  215.65 -                            hunk = ('%s \\textbf{%s}' %
  215.66 +                            hunk = ('<prompt>%s</prompt> <userinput>%s</userinput>' %
  215.67                                      (prompts[ps],
  215.68 -                                     tex_escape(hunk.rstrip('\n'))))
  215.69 +                                     xml_escape(hunk.rstrip('\n'))))
  215.70                              if nl: hunk += '\n'
  215.71                          ofp.write(hunk)
  215.72                          # then its output
  215.73 -                        ofp.write(tex_escape(output))
  215.74 +                        ofp.write(xml_escape(output))
  215.75                      ps = newps
  215.76                  self.status('\n')
  215.77              except:
  215.78 @@ -268,6 +275,7 @@
  215.79                      ps, output = self.sendreceive('exit\n', read_hint)
  215.80                      if ofp is not None:
  215.81                          ofp.write(output)
  215.82 +                        ofp.write('</screen>\n')
  215.83                          ofp.close()
  215.84                          err |= self.rename_output(ofp_basename, ignore)
  215.85                      os.close(self.cfd)
  215.86 @@ -282,7 +290,7 @@
  215.87                      elif os.WIFSIGNALED(rc):
  215.88                          print >> sys.stderr, '(signal %s)' % os.WTERMSIG(rc)
  215.89                  else:
  215.90 -                    open(self.name + '.run', 'w')
  215.91 +                    open(result_name(self.name + '.run'), 'w')
  215.92                  return err
  215.93          finally:
  215.94              shutil.rmtree(tmpdir)
  215.95 @@ -301,13 +309,13 @@
  215.96                      return True
  215.97              return False
  215.98  
  215.99 -        oldname = base + '.out'
 215.100 -        tmpname = base + '.tmp'
 215.101 -        errname = base + '.err'
 215.102 +        oldname = result_name(base + '.out')
 215.103 +        tmpname = result_name(base + '.tmp')
 215.104 +        errname = result_name(base + '.err')
 215.105          errfp = open(errname, 'w+')
 215.106          for line in open(tmpname):
 215.107              errfp.write(mangle_re.sub('', line))
 215.108 -        os.rename(tmpname, base + '.lxo')
 215.109 +        os.rename(tmpname, result_name(base + '.lxo'))
 215.110          errfp.seek(0)
 215.111          try:
 215.112              oldfp = open(oldname)
 215.113 @@ -374,8 +382,7 @@
 215.114          names.sort()
 215.115          for name in names:
 215.116              if name == 'run-example' or name.startswith('.'): continue
 215.117 -            if name.endswith('.out') or name.endswith('~'): continue
 215.118 -            if name.endswith('.run'): continue
 215.119 +            if name.endswith('~'): continue
 215.120              pathname = os.path.join(path, name)
 215.121              try:
 215.122                  st = os.lstat(pathname)