# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1236659963 25200
# Node ID 0d5935744f87efae817177fd96f838e753648046
# Parent  44d1363234d2adacb4a4c2612a93fdcefcdbec0c
Switch from LaTeX to XML for examples.

diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/backout.init.out
--- a/en/examples/results/backout.init.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/backout.init.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,7 +1,8 @@
-$ \textbf{hg init myrepo}
-$ \textbf{cd myrepo}
-$ \textbf{echo first change >> myfile}
-$ \textbf{hg add myfile}
-$ \textbf{hg commit -m 'first change'}
-$ \textbf{echo second change >> myfile}
-$ \textbf{hg commit -m 'second change'}
+<screen><prompt>$</prompt> <userinput>hg init myrepo</userinput>
+<prompt>$</prompt> <userinput>cd myrepo</userinput>
+<prompt>$</prompt> <userinput>echo first change &gt;&gt; myfile</userinput>
+<prompt>$</prompt> <userinput>hg add myfile</userinput>
+<prompt>$</prompt> <userinput>hg commit -m 'first change'</userinput>
+<prompt>$</prompt> <userinput>echo second change &gt;&gt; myfile</userinput>
+<prompt>$</prompt> <userinput>hg commit -m 'second change'</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/backout.manual.backout.out
--- a/en/examples/results/backout.manual.backout.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/backout.manual.backout.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,8 +1,9 @@
-$ \textbf{echo third change >> myfile}
-$ \textbf{hg commit -m 'third change'}
-$ \textbf{hg backout -m 'back out second change' 1}
+<screen><prompt>$</prompt> <userinput>echo third change &gt;&gt; myfile</userinput>
+<prompt>$</prompt> <userinput>hg commit -m 'third change'</userinput>
+<prompt>$</prompt> <userinput>hg backout -m 'back out second change' 1</userinput>
 reverting myfile
 created new head
 changeset  backs out changeset 
 the backout changeset is a new head - do not forget to merge
 (use "backout --merge" if you want to auto-merge)
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/backout.manual.cat.out
--- a/en/examples/results/backout.manual.cat.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/backout.manual.cat.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{cat myfile}
+<screen><prompt>$</prompt> <userinput>cat myfile</userinput>
 first change
 second change
 third change
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/backout.manual.clone.out
--- a/en/examples/results/backout.manual.clone.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/backout.manual.clone.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,5 +1,5 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone -r1 myrepo newrepo}
+<screen><prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>hg clone -r1 myrepo newrepo</userinput>
 requesting all changes
 adding changesets
 adding manifests
@@ -7,4 +7,5 @@
 added 2 changesets with 2 changes to 1 files
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd newrepo}
+<prompt>$</prompt> <userinput>cd newrepo</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/backout.manual.heads.out
--- a/en/examples/results/backout.manual.heads.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/backout.manual.heads.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,13 +1,14 @@
-$ \textbf{hg heads}
+<screen><prompt>$</prompt> <userinput>hg heads</userinput>
 changeset:   
 tag:         tip
 parent:      
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     back out second change
 
 changeset:   
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     third change
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/backout.manual.log.out
--- a/en/examples/results/backout.manual.log.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/backout.manual.log.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,13 +1,14 @@
-$ \textbf{hg log --style compact}
-3[tip]:1      2009-01-30 06:32 +0000   bos
+<screen><prompt>$</prompt> <userinput>hg log --style compact</userinput>
+3[tip]:1      2009-03-10 04:37 +0000   bos
   back out second change
 
-2      2009-01-30 06:32 +0000   bos
+2      2009-03-10 04:37 +0000   bos
   third change
 
-1      2009-01-30 06:32 +0000   bos
+1      2009-03-10 04:37 +0000   bos
   second change
 
-0      2009-01-30 06:32 +0000   bos
+0      2009-03-10 04:37 +0000   bos
   first change
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/backout.manual.merge.out
--- a/en/examples/results/backout.manual.merge.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/backout.manual.merge.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,8 +1,9 @@
-$ \textbf{hg merge}
+<screen><prompt>$</prompt> <userinput>hg merge</userinput>
 merging myfile
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-$ \textbf{hg commit -m 'merged backout with previous tip'}
-$ \textbf{cat myfile}
+<prompt>$</prompt> <userinput>hg commit -m 'merged backout with previous tip'</userinput>
+<prompt>$</prompt> <userinput>cat myfile</userinput>
 first change
 third change
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/backout.manual.parents.out
--- a/en/examples/results/backout.manual.parents.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/backout.manual.parents.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,6 +1,7 @@
-$ \textbf{hg parents}
+<screen><prompt>$</prompt> <userinput>hg parents</userinput>
 changeset:   
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     third change
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/backout.non-tip.backout.out
--- a/en/examples/results/backout.non-tip.backout.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/backout.non-tip.backout.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,6 +1,6 @@
-$ \textbf{echo third change >> myfile}
-$ \textbf{hg commit -m 'third change'}
-$ \textbf{hg backout --merge -m 'back out second change' 1}
+<screen><prompt>$</prompt> <userinput>echo third change &gt;&gt; myfile</userinput>
+<prompt>$</prompt> <userinput>hg commit -m 'third change'</userinput>
+<prompt>$</prompt> <userinput>hg backout --merge -m 'back out second change' 1</userinput>
 reverting myfile
 created new head
 changeset  backs out changeset 
@@ -8,3 +8,4 @@
 merging myfile
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/backout.non-tip.cat.out
--- a/en/examples/results/backout.non-tip.cat.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/backout.non-tip.cat.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,3 +1,4 @@
-$ \textbf{cat myfile}
+<screen><prompt>$</prompt> <userinput>cat myfile</userinput>
 first change
 third change
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/backout.non-tip.clone.out
--- a/en/examples/results/backout.non-tip.clone.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/backout.non-tip.clone.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,5 +1,5 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone -r1 myrepo non-tip-repo}
+<screen><prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>hg clone -r1 myrepo non-tip-repo</userinput>
 requesting all changes
 adding changesets
 adding manifests
@@ -7,4 +7,5 @@
 added 2 changesets with 2 changes to 1 files
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd non-tip-repo}
+<prompt>$</prompt> <userinput>cd non-tip-repo</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/backout.simple.log.out
--- a/en/examples/results/backout.simple.log.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/backout.simple.log.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,10 +1,11 @@
-$ \textbf{hg log --style compact}
-2[tip]      2009-01-30 06:32 +0000   bos
+<screen><prompt>$</prompt> <userinput>hg log --style compact</userinput>
+2[tip]      2009-03-10 04:37 +0000   bos
   back out second change
 
-1      2009-01-30 06:32 +0000   bos
+1      2009-03-10 04:37 +0000   bos
   second change
 
-0      2009-01-30 06:32 +0000   bos
+0      2009-03-10 04:37 +0000   bos
   first change
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/backout.simple.out
--- a/en/examples/results/backout.simple.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/backout.simple.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,5 +1,6 @@
-$ \textbf{hg backout -m 'back out second change' tip}
+<screen><prompt>$</prompt> <userinput>hg backout -m 'back out second change' tip</userinput>
 reverting myfile
 changeset  backs out changeset 
-$ \textbf{cat myfile}
+<prompt>$</prompt> <userinput>cat myfile</userinput>
 first change
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/bisect.commits.out
--- a/en/examples/results/bisect.commits.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/bisect.commits.out	Mon Mar 09 21:39:23 2009 -0700
@@ -8,3 +8,4 @@
 
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/bisect.help.out
--- a/en/examples/results/bisect.help.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/bisect.help.out	Mon Mar 09 21:39:23 2009 -0700
@@ -31,3 +31,4 @@
 
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/bisect.init.out
--- a/en/examples/results/bisect.init.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/bisect.init.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/bisect.search.bad-init.out
--- a/en/examples/results/bisect.search.bad-init.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/bisect.search.bad-init.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/bisect.search.good-init.out
--- a/en/examples/results/bisect.search.good-init.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/bisect.search.good-init.out	Mon Mar 09 21:39:23 2009 -0700
@@ -2,3 +2,4 @@
 
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/bisect.search.init.out
--- a/en/examples/results/bisect.search.init.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/bisect.search.init.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/bisect.search.mytest.out
--- a/en/examples/results/bisect.search.mytest.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/bisect.search.mytest.out	Mon Mar 09 21:39:23 2009 -0700
@@ -8,3 +8,4 @@
 
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/bisect.search.reset.out
--- a/en/examples/results/bisect.search.reset.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/bisect.search.reset.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/bisect.search.rest.out
--- a/en/examples/results/bisect.search.rest.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/bisect.search.rest.out	Mon Mar 09 21:39:23 2009 -0700
@@ -17,3 +17,4 @@
 
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/bisect.search.step1.out
--- a/en/examples/results/bisect.search.step1.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/bisect.search.step1.out	Mon Mar 09 21:39:23 2009 -0700
@@ -9,3 +9,4 @@
 
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/bisect.search.step2.out
--- a/en/examples/results/bisect.search.step2.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/bisect.search.step2.out	Mon Mar 09 21:39:23 2009 -0700
@@ -3,3 +3,4 @@
 
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branch-named.branch.out
--- a/en/examples/results/branch-named.branch.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branch-named.branch.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
-$ \textbf{hg branch}
+<screen><prompt>$</prompt> <userinput>hg branch</userinput>
 default
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branch-named.branches.out
--- a/en/examples/results/branch-named.branches.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branch-named.branches.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,9 +1,10 @@
-$ \textbf{hg tip}
+<screen><prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Initial commit
 
-$ \textbf{hg branches}
+<prompt>$</prompt> <userinput>hg branches</userinput>
 default                        
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branch-named.commit.out
--- a/en/examples/results/branch-named.commit.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branch-named.commit.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,10 +1,11 @@
-$ \textbf{echo 'hello again' >> myfile}
-$ \textbf{hg commit -m 'Second commit'}
-$ \textbf{hg tip}
+<screen><prompt>$</prompt> <userinput>echo 'hello again' &gt;&gt; myfile</userinput>
+<prompt>$</prompt> <userinput>hg commit -m 'Second commit'</userinput>
+<prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 branch:      foo
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Second commit
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branch-named.create.out
--- a/en/examples/results/branch-named.create.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branch-named.create.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{hg branch foo}
+<screen><prompt>$</prompt> <userinput>hg branch foo</userinput>
 marked working directory as branch foo
-$ \textbf{hg branch}
+<prompt>$</prompt> <userinput>hg branch</userinput>
 foo
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branch-named.foo-commit.out
--- a/en/examples/results/branch-named.foo-commit.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branch-named.foo-commit.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,19 +1,20 @@
-$ \textbf{echo something > somefile}
-$ \textbf{hg commit -A -m 'New file'}
+<screen><prompt>$</prompt> <userinput>echo something &gt; somefile</userinput>
+<prompt>$</prompt> <userinput>hg commit -A -m 'New file'</userinput>
 adding somefile
 created new head
-$ \textbf{hg heads}
+<prompt>$</prompt> <userinput>hg heads</userinput>
 changeset:   
 branch:      foo
 tag:         tip
 parent:      
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     New file
 
 changeset:   
 branch:      bar
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Third commit
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branch-named.merge.out
--- a/en/examples/results/branch-named.merge.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branch-named.merge.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,16 +1,17 @@
-$ \textbf{hg branch}
+<screen><prompt>$</prompt> <userinput>hg branch</userinput>
 bar
-$ \textbf{hg merge foo}
+<prompt>$</prompt> <userinput>hg merge foo</userinput>
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-$ \textbf{hg commit -m 'Merge'}
-$ \textbf{hg tip}
+<prompt>$</prompt> <userinput>hg commit -m 'Merge'</userinput>
+<prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 branch:      bar
 tag:         tip
 parent:      
 parent:      
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Merge
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branch-named.parents.out
--- a/en/examples/results/branch-named.parents.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branch-named.parents.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,12 +1,13 @@
-$ \textbf{hg parents}
+<screen><prompt>$</prompt> <userinput>hg parents</userinput>
 changeset:   
 branch:      bar
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Third commit
 
-$ \textbf{hg branches}
+<prompt>$</prompt> <userinput>hg branches</userinput>
 bar                            
 foo                             (inactive)
 default                         (inactive)
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branch-named.rebranch.out
--- a/en/examples/results/branch-named.rebranch.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branch-named.rebranch.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,15 +1,16 @@
-$ \textbf{hg branch}
+<screen><prompt>$</prompt> <userinput>hg branch</userinput>
 foo
-$ \textbf{hg branch bar}
+<prompt>$</prompt> <userinput>hg branch bar</userinput>
 marked working directory as branch bar
-$ \textbf{echo new file > newfile}
-$ \textbf{hg commit -A -m 'Third commit'}
+<prompt>$</prompt> <userinput>echo new file &gt; newfile</userinput>
+<prompt>$</prompt> <userinput>hg commit -A -m 'Third commit'</userinput>
 adding newfile
-$ \textbf{hg tip}
+<prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 branch:      bar
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Third commit
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branch-named.status.out
--- a/en/examples/results/branch-named.status.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branch-named.status.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,8 +1,9 @@
-$ \textbf{hg status}
-$ \textbf{hg tip}
+<screen><prompt>$</prompt> <userinput>hg status</userinput>
+<prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Initial commit
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branch-named.update-bar.out
--- a/en/examples/results/branch-named.update-bar.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branch-named.update-bar.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
-$ \textbf{hg update bar}
+<screen><prompt>$</prompt> <userinput>hg update bar</userinput>
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branch-named.update-nothing.out
--- a/en/examples/results/branch-named.update-nothing.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branch-named.update-nothing.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{hg update foo}
+<screen><prompt>$</prompt> <userinput>hg update foo</userinput>
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-$ \textbf{hg update}
+<prompt>$</prompt> <userinput>hg update</userinput>
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branch-named.update-switchy.out
--- a/en/examples/results/branch-named.update-switchy.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branch-named.update-switchy.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,19 +1,20 @@
-$ \textbf{hg update foo}
+<screen><prompt>$</prompt> <userinput>hg update foo</userinput>
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-$ \textbf{hg parents}
+<prompt>$</prompt> <userinput>hg parents</userinput>
 changeset:   
 branch:      foo
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Second commit
 
-$ \textbf{hg update bar}
+<prompt>$</prompt> <userinput>hg update bar</userinput>
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{hg parents}
+<prompt>$</prompt> <userinput>hg parents</userinput>
 changeset:   
 branch:      bar
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Third commit
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branch-repo.bugfix.out
--- a/en/examples/results/branch-repo.bugfix.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branch-repo.bugfix.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,13 +1,14 @@
-$ \textbf{hg clone myproject-1.0.1 my-1.0.1-bugfix}
+<screen><prompt>$</prompt> <userinput>hg clone myproject-1.0.1 my-1.0.1-bugfix</userinput>
 updating working directory
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd my-1.0.1-bugfix}
-$ \textbf{echo 'I fixed a bug using only echo!' >> myfile}
-$ \textbf{hg commit -m 'Important fix for 1.0.1'}
-$ \textbf{hg push}
+<prompt>$</prompt> <userinput>cd my-1.0.1-bugfix</userinput>
+<prompt>$</prompt> <userinput>echo 'I fixed a bug using only echo!' &gt;&gt; myfile</userinput>
+<prompt>$</prompt> <userinput>hg commit -m 'Important fix for 1.0.1'</userinput>
+<prompt>$</prompt> <userinput>hg push</userinput>
 pushing to 
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branch-repo.clone.out
--- a/en/examples/results/branch-repo.clone.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branch-repo.clone.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone myproject myproject-1.0.1}
+<screen><prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>hg clone myproject myproject-1.0.1</userinput>
 updating working directory
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branch-repo.merge.out
--- a/en/examples/results/branch-repo.merge.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branch-repo.merge.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,11 +1,12 @@
-$ \textbf{hg merge}
+<screen><prompt>$</prompt> <userinput>hg merge</userinput>
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-$ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'}
-$ \textbf{hg push}
+<prompt>$</prompt> <userinput>hg commit -m 'Merge bugfix from 1.0.1 branch'</userinput>
+<prompt>$</prompt> <userinput>hg push</userinput>
 pushing to 
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 1 changes to 1 files
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branch-repo.new.out
--- a/en/examples/results/branch-repo.new.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branch-repo.new.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,15 +1,16 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone myproject my-feature}
+<screen><prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>hg clone myproject my-feature</userinput>
 updating working directory
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd my-feature}
-$ \textbf{echo 'This sure is an exciting new feature!' > mynewfile}
-$ \textbf{hg commit -A -m 'New feature'}
+<prompt>$</prompt> <userinput>cd my-feature</userinput>
+<prompt>$</prompt> <userinput>echo 'This sure is an exciting new feature!' &gt; mynewfile</userinput>
+<prompt>$</prompt> <userinput>hg commit -A -m 'New feature'</userinput>
 adding mynewfile
-$ \textbf{hg push}
+<prompt>$</prompt> <userinput>hg push</userinput>
 pushing to 
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branch-repo.pull.out
--- a/en/examples/results/branch-repo.pull.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branch-repo.pull.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,9 +1,9 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone myproject myproject-merge}
+<screen><prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>hg clone myproject myproject-merge</userinput>
 updating working directory
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd myproject-merge}
-$ \textbf{hg pull ../myproject-1.0.1}
+<prompt>$</prompt> <userinput>cd myproject-merge</userinput>
+<prompt>$</prompt> <userinput>hg pull ../myproject-1.0.1</userinput>
 pulling from ../myproject-1.0.1
 searching for changes
 adding changesets
@@ -11,3 +11,4 @@
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branch-repo.tag.out
--- a/en/examples/results/branch-repo.tag.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branch-repo.tag.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
-$ \textbf{cd myproject}
-$ \textbf{hg tag v1.0}
+<screen><prompt>$</prompt> <userinput>cd myproject</userinput>
+<prompt>$</prompt> <userinput>hg tag v1.0</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branching.clone.out
--- a/en/examples/results/branching.clone.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branching.clone.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,5 +1,5 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone -rv1.0 main stable}
+<screen><prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>hg clone -rv1.0 main stable</userinput>
 requesting all changes
 adding changesets
 adding manifests
@@ -7,3 +7,4 @@
 added 1 changesets with 1 changes to 1 files
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branching.init.out
--- a/en/examples/results/branching.init.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branching.init.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,5 +1,6 @@
-$ \textbf{hg init main}
-$ \textbf{cd main}
-$ \textbf{echo 'This is a boring feature.' > myfile}
-$ \textbf{hg commit -A -m 'We have reached an important milestone!'}
+<screen><prompt>$</prompt> <userinput>hg init main</userinput>
+<prompt>$</prompt> <userinput>cd main</userinput>
+<prompt>$</prompt> <userinput>echo 'This is a boring feature.' &gt; myfile</userinput>
+<prompt>$</prompt> <userinput>hg commit -A -m 'We have reached an important milestone!'</userinput>
 adding myfile
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branching.main.out
--- a/en/examples/results/branching.main.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branching.main.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,6 +1,7 @@
-$ \textbf{cd ../main}
-$ \textbf{echo 'This is exciting and new!' >> myfile}
-$ \textbf{hg commit -m 'Add a new feature'}
-$ \textbf{cat myfile}
+<screen><prompt>$</prompt> <userinput>cd ../main</userinput>
+<prompt>$</prompt> <userinput>echo 'This is exciting and new!' &gt;&gt; myfile</userinput>
+<prompt>$</prompt> <userinput>hg commit -m 'Add a new feature'</userinput>
+<prompt>$</prompt> <userinput>cat myfile</userinput>
 This is a boring feature.
 This is exciting and new!
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branching.merge.out
--- a/en/examples/results/branching.merge.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branching.merge.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,5 +1,5 @@
-$ \textbf{cd ../main}
-$ \textbf{hg pull ../stable}
+<screen><prompt>$</prompt> <userinput>cd ../main</userinput>
+<prompt>$</prompt> <userinput>hg pull ../stable</userinput>
 pulling from ../stable
 searching for changes
 adding changesets
@@ -7,11 +7,12 @@
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
-$ \textbf{hg merge}
+<prompt>$</prompt> <userinput>hg merge</userinput>
 merging myfile
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-$ \textbf{hg commit -m 'Bring in bugfix from stable branch'}
-$ \textbf{cat myfile}
+<prompt>$</prompt> <userinput>hg commit -m 'Bring in bugfix from stable branch'</userinput>
+<prompt>$</prompt> <userinput>cat myfile</userinput>
 This is a fix to a boring feature.
 This is exciting and new!
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branching.stable.out
--- a/en/examples/results/branching.stable.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branching.stable.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,13 +1,14 @@
-$ \textbf{hg clone stable stable-fix}
+<screen><prompt>$</prompt> <userinput>hg clone stable stable-fix</userinput>
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd stable-fix}
-$ \textbf{echo 'This is a fix to a boring feature.' > myfile}
-$ \textbf{hg commit -m 'Fix a bug'}
-$ \textbf{hg push}
+<prompt>$</prompt> <userinput>cd stable-fix</userinput>
+<prompt>$</prompt> <userinput>echo 'This is a fix to a boring feature.' &gt; myfile</userinput>
+<prompt>$</prompt> <userinput>hg commit -m 'Fix a bug'</userinput>
+<prompt>$</prompt> <userinput>hg push</userinput>
 pushing to 
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branching.tag.out
--- a/en/examples/results/branching.tag.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branching.tag.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,11 +1,12 @@
-$ \textbf{hg tag v1.0}
-$ \textbf{hg tip}
+<screen><prompt>$</prompt> <userinput>hg tag v1.0</userinput>
+<prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Added tag v1.0 for changeset 
 
-$ \textbf{hg tags}
+<prompt>$</prompt> <userinput>hg tags</userinput>
 tip                                
 v1.0                               
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/branching.update.out
--- a/en/examples/results/branching.update.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branching.update.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,7 +1,8 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone -U main main-old}
-$ \textbf{cd main-old}
-$ \textbf{hg update v1.0}
+<screen><prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>hg clone -U main main-old</userinput>
+<prompt>$</prompt> <userinput>cd main-old</userinput>
+<prompt>$</prompt> <userinput>hg update v1.0</userinput>
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cat myfile}
+<prompt>$</prompt> <userinput>cat myfile</userinput>
 This is a boring feature.
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/cmdref.diff-p.out
--- a/en/examples/results/cmdref.diff-p.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/cmdref.diff-p.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,22 +1,23 @@
-$ \textbf{echo '[diff]' >> $HGRC}
-$ \textbf{echo 'showfunc = False' >> $HGRC}
-$ \textbf{hg diff}
+<screen><prompt>$</prompt> <userinput>echo '[diff]' &gt;&gt; $HGRC</userinput>
+<prompt>$</prompt> <userinput>echo 'showfunc = False' &gt;&gt; $HGRC</userinput>
+<prompt>$</prompt> <userinput>hg diff</userinput>
 diff -r  myfile.c
 
 
 @@ -1,4 +1,4 @@
  int myfunc()
- \{
+ {
 -    return 1;
 +    return 10;
- \}
-$ \textbf{hg diff -p}
+ }
+<prompt>$</prompt> <userinput>hg diff -p</userinput>
 diff -r  myfile.c
 
 
 @@ -1,4 +1,4 @@
  int myfunc()
- \{
+ {
 -    return 1;
 +    return 10;
- \}
+ }
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.copy.after.out
--- a/en/examples/results/daily.copy.after.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.copy.after.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
-$ \textbf{cp a z}
-$ \textbf{hg copy --after a z}
+<screen><prompt>$</prompt> <userinput>cp a z</userinput>
+<prompt>$</prompt> <userinput>hg copy --after a z</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.copy.cat.out
--- a/en/examples/results/daily.copy.cat.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.copy.cat.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,5 +1,6 @@
-$ \textbf{cat file}
+<screen><prompt>$</prompt> <userinput>cat file</userinput>
 line
 new contents
-$ \textbf{cat ../my-copy/new-file}
+<prompt>$</prompt> <userinput>cat ../my-copy/new-file</userinput>
 line
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.copy.clone.out
--- a/en/examples/results/daily.copy.clone.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.copy.clone.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone my-copy your-copy}
+<screen><prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>hg clone my-copy your-copy</userinput>
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.copy.copy.out
--- a/en/examples/results/daily.copy.copy.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.copy.copy.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
-$ \textbf{cd my-copy}
-$ \textbf{hg copy file new-file}
+<screen><prompt>$</prompt> <userinput>cd my-copy</userinput>
+<prompt>$</prompt> <userinput>hg copy file new-file</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.copy.dir-dest.out
--- a/en/examples/results/daily.copy.dir-dest.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.copy.dir-dest.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{mkdir d}
-$ \textbf{hg copy a b d}
-$ \textbf{ls d}
+<screen><prompt>$</prompt> <userinput>mkdir d</userinput>
+<prompt>$</prompt> <userinput>hg copy a b d</userinput>
+<prompt>$</prompt> <userinput>ls d</userinput>
 a  b
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.copy.dir-src-dest.out
--- a/en/examples/results/daily.copy.dir-src-dest.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.copy.dir-src-dest.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
-$ \textbf{hg copy c d}
+<screen><prompt>$</prompt> <userinput>hg copy c d</userinput>
 copying c/a/c to d/c/a/c
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.copy.dir-src.out
--- a/en/examples/results/daily.copy.dir-src.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.copy.dir-src.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
-$ \textbf{hg copy c e}
+<screen><prompt>$</prompt> <userinput>hg copy c e</userinput>
 copying c/a/c to e/a/c
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.copy.init.out
--- a/en/examples/results/daily.copy.init.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.copy.init.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,5 +1,6 @@
-$ \textbf{hg init my-copy}
-$ \textbf{cd my-copy}
-$ \textbf{echo line > file}
-$ \textbf{hg add file}
-$ \textbf{hg commit -m 'Added a file'}
+<screen><prompt>$</prompt> <userinput>hg init my-copy</userinput>
+<prompt>$</prompt> <userinput>cd my-copy</userinput>
+<prompt>$</prompt> <userinput>echo line &gt; file</userinput>
+<prompt>$</prompt> <userinput>hg add file</userinput>
+<prompt>$</prompt> <userinput>hg commit -m 'Added a file'</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.copy.merge.out
--- a/en/examples/results/daily.copy.merge.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.copy.merge.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,4 @@
-$ \textbf{hg pull ../my-copy}
+<screen><prompt>$</prompt> <userinput>hg pull ../my-copy</userinput>
 pulling from ../my-copy
 searching for changes
 adding changesets
@@ -6,10 +6,11 @@
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
-$ \textbf{hg merge}
+<prompt>$</prompt> <userinput>hg merge</userinput>
 merging file and new-file to new-file
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-$ \textbf{cat new-file}
+<prompt>$</prompt> <userinput>cat new-file</userinput>
 line
 new contents
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.copy.other.out
--- a/en/examples/results/daily.copy.other.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.copy.other.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,3 +1,4 @@
-$ \textbf{cd ../your-copy}
-$ \textbf{echo 'new contents' >> file}
-$ \textbf{hg commit -m 'Changed file'}
+<screen><prompt>$</prompt> <userinput>cd ../your-copy</userinput>
+<prompt>$</prompt> <userinput>echo 'new contents' &gt;&gt; file</userinput>
+<prompt>$</prompt> <userinput>hg commit -m 'Changed file'</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.copy.simple.out
--- a/en/examples/results/daily.copy.simple.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.copy.simple.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{mkdir k}
-$ \textbf{hg copy a k}
-$ \textbf{ls k}
+<screen><prompt>$</prompt> <userinput>mkdir k</userinput>
+<prompt>$</prompt> <userinput>hg copy a k</userinput>
+<prompt>$</prompt> <userinput>ls k</userinput>
 a
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.copy.status-copy.out
--- a/en/examples/results/daily.copy.status-copy.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.copy.status-copy.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{hg status -C}
+<screen><prompt>$</prompt> <userinput>hg status -C</userinput>
 A new-file
   file
-$ \textbf{hg commit -m 'Copied file'}
+<prompt>$</prompt> <userinput>hg commit -m 'Copied file'</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.copy.status.out
--- a/en/examples/results/daily.copy.status.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.copy.status.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
-$ \textbf{hg status}
+<screen><prompt>$</prompt> <userinput>hg status</userinput>
 A new-file
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.files.add-dir.out
--- a/en/examples/results/daily.files.add-dir.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.files.add-dir.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,10 +1,11 @@
-$ \textbf{mkdir b}
-$ \textbf{echo b > b/b}
-$ \textbf{echo c > b/c}
-$ \textbf{mkdir b/d}
-$ \textbf{echo d > b/d/d}
-$ \textbf{hg add b}
+<screen><prompt>$</prompt> <userinput>mkdir b</userinput>
+<prompt>$</prompt> <userinput>echo b &gt; b/b</userinput>
+<prompt>$</prompt> <userinput>echo c &gt; b/c</userinput>
+<prompt>$</prompt> <userinput>mkdir b/d</userinput>
+<prompt>$</prompt> <userinput>echo d &gt; b/d/d</userinput>
+<prompt>$</prompt> <userinput>hg add b</userinput>
 adding b/b
 adding b/c
 adding b/d/d
-$ \textbf{hg commit -m 'Added all files in subdirectory'}
+<prompt>$</prompt> <userinput>hg commit -m 'Added all files in subdirectory'</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.files.add.out
--- a/en/examples/results/daily.files.add.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.files.add.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,10 +1,11 @@
-$ \textbf{hg init add-example}
-$ \textbf{cd add-example}
-$ \textbf{echo a > a}
-$ \textbf{hg status}
+<screen><prompt>$</prompt> <userinput>hg init add-example</userinput>
+<prompt>$</prompt> <userinput>cd add-example</userinput>
+<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
+<prompt>$</prompt> <userinput>hg status</userinput>
 ? a
-$ \textbf{hg add a}
-$ \textbf{hg status}
+<prompt>$</prompt> <userinput>hg add a</userinput>
+<prompt>$</prompt> <userinput>hg status</userinput>
 A a
-$ \textbf{hg commit -m 'Added one file'}
-$ \textbf{hg status}
+<prompt>$</prompt> <userinput>hg commit -m 'Added one file'</userinput>
+<prompt>$</prompt> <userinput>hg status</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.files.addremove.out
--- a/en/examples/results/daily.files.addremove.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.files.addremove.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,7 +1,8 @@
-$ \textbf{hg init addremove-example}
-$ \textbf{cd addremove-example}
-$ \textbf{echo a > a}
-$ \textbf{echo b > b}
-$ \textbf{hg addremove}
+<screen><prompt>$</prompt> <userinput>hg init addremove-example</userinput>
+<prompt>$</prompt> <userinput>cd addremove-example</userinput>
+<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
+<prompt>$</prompt> <userinput>echo b &gt; b</userinput>
+<prompt>$</prompt> <userinput>hg addremove</userinput>
 adding a
 adding b
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.files.commit-addremove.out
--- a/en/examples/results/daily.files.commit-addremove.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.files.commit-addremove.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,3 +1,4 @@
-$ \textbf{echo c > c}
-$ \textbf{hg commit -A -m 'Commit with addremove'}
+<screen><prompt>$</prompt> <userinput>echo c &gt; c</userinput>
+<prompt>$</prompt> <userinput>hg commit -A -m 'Commit with addremove'</userinput>
 adding c
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.files.hidden.out
--- a/en/examples/results/daily.files.hidden.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.files.hidden.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,14 +1,15 @@
-$ \textbf{hg init hidden-example}
-$ \textbf{cd hidden-example}
-$ \textbf{mkdir empty}
-$ \textbf{touch empty/.hidden}
-$ \textbf{hg add empty/.hidden}
-$ \textbf{hg commit -m 'Manage an empty-looking directory'}
-$ \textbf{ls empty}
-$ \textbf{cd ..}
-$ \textbf{hg clone hidden-example tmp}
+<screen><prompt>$</prompt> <userinput>hg init hidden-example</userinput>
+<prompt>$</prompt> <userinput>cd hidden-example</userinput>
+<prompt>$</prompt> <userinput>mkdir empty</userinput>
+<prompt>$</prompt> <userinput>touch empty/.hidden</userinput>
+<prompt>$</prompt> <userinput>hg add empty/.hidden</userinput>
+<prompt>$</prompt> <userinput>hg commit -m 'Manage an empty-looking directory'</userinput>
+<prompt>$</prompt> <userinput>ls empty</userinput>
+<prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>hg clone hidden-example tmp</userinput>
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{ls tmp}
+<prompt>$</prompt> <userinput>ls tmp</userinput>
 empty
-$ \textbf{ls tmp/empty}
+<prompt>$</prompt> <userinput>ls tmp/empty</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.files.missing.out
--- a/en/examples/results/daily.files.missing.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.files.missing.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,8 +1,9 @@
-$ \textbf{hg init missing-example}
-$ \textbf{cd missing-example}
-$ \textbf{echo a > a}
-$ \textbf{hg add a}
-$ \textbf{hg commit -m 'File about to be missing'}
-$ \textbf{rm a}
-$ \textbf{hg status}
+<screen><prompt>$</prompt> <userinput>hg init missing-example</userinput>
+<prompt>$</prompt> <userinput>cd missing-example</userinput>
+<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
+<prompt>$</prompt> <userinput>hg add a</userinput>
+<prompt>$</prompt> <userinput>hg commit -m 'File about to be missing'</userinput>
+<prompt>$</prompt> <userinput>rm a</userinput>
+<prompt>$</prompt> <userinput>hg status</userinput>
 ! a
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.files.recover-missing.out
--- a/en/examples/results/daily.files.recover-missing.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.files.recover-missing.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{hg revert a}
-$ \textbf{cat a}
+<screen><prompt>$</prompt> <userinput>hg revert a</userinput>
+<prompt>$</prompt> <userinput>cat a</userinput>
 a
-$ \textbf{hg status}
+<prompt>$</prompt> <userinput>hg status</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.files.remove-after.out
--- a/en/examples/results/daily.files.remove-after.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.files.remove-after.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,3 +1,4 @@
-$ \textbf{hg remove --after a}
-$ \textbf{hg status}
+<screen><prompt>$</prompt> <userinput>hg remove --after a</userinput>
+<prompt>$</prompt> <userinput>hg status</userinput>
 R a
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.files.remove.out
--- a/en/examples/results/daily.files.remove.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.files.remove.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,13 +1,14 @@
-$ \textbf{hg init remove-example}
-$ \textbf{cd remove-example}
-$ \textbf{echo a > a}
-$ \textbf{mkdir b}
-$ \textbf{echo b > b/b}
-$ \textbf{hg add a b}
+<screen><prompt>$</prompt> <userinput>hg init remove-example</userinput>
+<prompt>$</prompt> <userinput>cd remove-example</userinput>
+<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
+<prompt>$</prompt> <userinput>mkdir b</userinput>
+<prompt>$</prompt> <userinput>echo b &gt; b/b</userinput>
+<prompt>$</prompt> <userinput>hg add a b</userinput>
 adding b/b
-$ \textbf{hg commit -m 'Small example for file removal'}
-$ \textbf{hg remove a}
-$ \textbf{hg status}
+<prompt>$</prompt> <userinput>hg commit -m 'Small example for file removal'</userinput>
+<prompt>$</prompt> <userinput>hg remove a</userinput>
+<prompt>$</prompt> <userinput>hg status</userinput>
 R a
-$ \textbf{hg remove b}
+<prompt>$</prompt> <userinput>hg remove b</userinput>
 removing b/b
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.rename.rename.out
--- a/en/examples/results/daily.rename.rename.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.rename.rename.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,1 +1,2 @@
-$ \textbf{hg rename a b}
+<screen><prompt>$</prompt> <userinput>hg rename a b</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.rename.status-copy.out
--- a/en/examples/results/daily.rename.status-copy.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.rename.status-copy.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{hg status -C}
+<screen><prompt>$</prompt> <userinput>hg status -C</userinput>
 A b
   a
 R a
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.rename.status.out
--- a/en/examples/results/daily.rename.status.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.rename.status.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,3 +1,4 @@
-$ \textbf{hg status}
+<screen><prompt>$</prompt> <userinput>hg status</userinput>
 A b
 R a
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.revert.add.out
--- a/en/examples/results/daily.revert.add.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.revert.add.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,7 +1,8 @@
-$ \textbf{echo oops > oops}
-$ \textbf{hg add oops}
-$ \textbf{hg status oops}
+<screen><prompt>$</prompt> <userinput>echo oops &gt; oops</userinput>
+<prompt>$</prompt> <userinput>hg add oops</userinput>
+<prompt>$</prompt> <userinput>hg status oops</userinput>
 A oops
-$ \textbf{hg revert oops}
-$ \textbf{hg status}
+<prompt>$</prompt> <userinput>hg revert oops</userinput>
+<prompt>$</prompt> <userinput>hg status</userinput>
 ? oops
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.revert.copy.out
--- a/en/examples/results/daily.revert.copy.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.revert.copy.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{hg copy file new-file}
-$ \textbf{hg revert new-file}
-$ \textbf{hg status}
+<screen><prompt>$</prompt> <userinput>hg copy file new-file</userinput>
+<prompt>$</prompt> <userinput>hg revert new-file</userinput>
+<prompt>$</prompt> <userinput>hg status</userinput>
 ? new-file
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.revert.missing.out
--- a/en/examples/results/daily.revert.missing.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.revert.missing.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,6 +1,7 @@
-$ \textbf{rm file}
-$ \textbf{hg status}
+<screen><prompt>$</prompt> <userinput>rm file</userinput>
+<prompt>$</prompt> <userinput>hg status</userinput>
 ! file
-$ \textbf{hg revert file}
-$ \textbf{ls file}
+<prompt>$</prompt> <userinput>hg revert file</userinput>
+<prompt>$</prompt> <userinput>ls file</userinput>
 file
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.revert.modify.out
--- a/en/examples/results/daily.revert.modify.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.revert.modify.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,10 +1,11 @@
-$ \textbf{cat file}
+<screen><prompt>$</prompt> <userinput>cat file</userinput>
 original content
-$ \textbf{echo unwanted change >> file}
-$ \textbf{hg diff file}
+<prompt>$</prompt> <userinput>echo unwanted change &gt;&gt; file</userinput>
+<prompt>$</prompt> <userinput>hg diff file</userinput>
 diff -r  file
 
 
 @@ -1,1 +1,2 @@
  original content
 +unwanted change
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.revert.remove.out
--- a/en/examples/results/daily.revert.remove.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.revert.remove.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,7 +1,8 @@
-$ \textbf{hg remove file}
-$ \textbf{hg status}
+<screen><prompt>$</prompt> <userinput>hg remove file</userinput>
+<prompt>$</prompt> <userinput>hg status</userinput>
 R file
-$ \textbf{hg revert file}
-$ \textbf{hg status}
-$ \textbf{ls file}
+<prompt>$</prompt> <userinput>hg revert file</userinput>
+<prompt>$</prompt> <userinput>hg status</userinput>
+<prompt>$</prompt> <userinput>ls file</userinput>
 file
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.revert.rename-orig.out
--- a/en/examples/results/daily.revert.rename-orig.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.revert.rename-orig.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{hg revert file}
+<screen><prompt>$</prompt> <userinput>hg revert file</userinput>
 no changes needed to file
-$ \textbf{hg status}
+<prompt>$</prompt> <userinput>hg status</userinput>
 ? new-file
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.revert.rename.out
--- a/en/examples/results/daily.revert.rename.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.revert.rename.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{hg rename file new-file}
-$ \textbf{hg revert new-file}
-$ \textbf{hg status}
+<screen><prompt>$</prompt> <userinput>hg rename file new-file</userinput>
+<prompt>$</prompt> <userinput>hg revert new-file</userinput>
+<prompt>$</prompt> <userinput>hg status</userinput>
 ? new-file
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.revert.status.out
--- a/en/examples/results/daily.revert.status.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.revert.status.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,5 +1,6 @@
-$ \textbf{hg status}
+<screen><prompt>$</prompt> <userinput>hg status</userinput>
 ? file.orig
-$ \textbf{cat file.orig}
+<prompt>$</prompt> <userinput>cat file.orig</userinput>
 original content
 unwanted change
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/daily.revert.unmodify.out
--- a/en/examples/results/daily.revert.unmodify.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/daily.revert.unmodify.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,5 +1,6 @@
-$ \textbf{hg status}
+<screen><prompt>$</prompt> <userinput>hg status</userinput>
 M file
-$ \textbf{hg revert file}
-$ \textbf{cat file}
+<prompt>$</prompt> <userinput>hg revert file</userinput>
+<prompt>$</prompt> <userinput>cat file</userinput>
 original content
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/extdiff.diff.out
--- a/en/examples/results/extdiff.diff.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/extdiff.diff.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,7 +1,8 @@
-$ \textbf{hg diff}
+<screen><prompt>$</prompt> <userinput>hg diff</userinput>
 diff -r  myfile
 
 
 @@ -1,1 +1,2 @@
  The first line.
 +The second line.
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/extdiff.extdiff-ctx.out
--- a/en/examples/results/extdiff.extdiff-ctx.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/extdiff.extdiff-ctx.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,4 @@
-$ \textbf{hg extdiff -o -NprcC5}
+<screen><prompt>$</prompt> <userinput>hg extdiff -o -NprcC5</userinput>
 
 
 ***************
@@ -6,3 +6,4 @@
 
   The first line.
 + The second line.
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/extdiff.extdiff.out
--- a/en/examples/results/extdiff.extdiff.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/extdiff.extdiff.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,6 +1,7 @@
-$ \textbf{hg extdiff}
+<screen><prompt>$</prompt> <userinput>hg extdiff</userinput>
 
 
 @@ -1 +1,2 @@
  The first line.
 +The second line.
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/filenames.dirs.out
--- a/en/examples/results/filenames.dirs.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/filenames.dirs.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,5 +1,6 @@
-$ \textbf{hg status src}
+<screen><prompt>$</prompt> <userinput>hg status src</userinput>
 ? src/main.py
 ? src/watcher/_watcher.c
 ? src/watcher/watcher.py
 ? src/xyzzy.txt
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/filenames.files.out
--- a/en/examples/results/filenames.files.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/filenames.files.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,1 +1,2 @@
-$ \textbf{hg add COPYING README examples/simple.py}
+<screen><prompt>$</prompt> <userinput>hg add COPYING README examples/simple.py</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/filenames.filter.exclude.out
--- a/en/examples/results/filenames.filter.exclude.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/filenames.filter.exclude.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,3 +1,4 @@
-$ \textbf{hg status -X '**.py' src}
+<screen><prompt>$</prompt> <userinput>hg status -X '**.py' src</userinput>
 ? src/watcher/_watcher.c
 ? src/xyzzy.txt
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/filenames.filter.include.out
--- a/en/examples/results/filenames.filter.include.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/filenames.filter.include.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
-$ \textbf{hg status -I '*.in'}
+<screen><prompt>$</prompt> <userinput>hg status -I '*.in'</userinput>
 ? MANIFEST.in
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/filenames.glob.group.out
--- a/en/examples/results/filenames.glob.group.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/filenames.glob.group.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,3 +1,4 @@
-$ \textbf{hg status 'glob:*.\{in,py\}'}
+<screen><prompt>$</prompt> <userinput>hg status 'glob:*.{in,py}'</userinput>
 ? MANIFEST.in
 ? setup.py
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/filenames.glob.question.out
--- a/en/examples/results/filenames.glob.question.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/filenames.glob.question.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
-$ \textbf{hg status 'glob:**.?'}
+<screen><prompt>$</prompt> <userinput>hg status 'glob:**.?'</userinput>
 ? src/watcher/_watcher.c
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/filenames.glob.range.out
--- a/en/examples/results/filenames.glob.range.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/filenames.glob.range.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,3 +1,4 @@
-$ \textbf{hg status 'glob:**[nr-t]'}
+<screen><prompt>$</prompt> <userinput>hg status 'glob:**[nr-t]'</userinput>
 ? MANIFEST.in
 ? src/xyzzy.txt
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/filenames.glob.star-starstar.out
--- a/en/examples/results/filenames.glob.star-starstar.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/filenames.glob.star-starstar.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,8 +1,9 @@
-$ \textbf{hg status 'glob:*.py'}
+<screen><prompt>$</prompt> <userinput>hg status 'glob:*.py'</userinput>
 ? setup.py
-$ \textbf{hg status 'glob:**.py'}
+<prompt>$</prompt> <userinput>hg status 'glob:**.py'</userinput>
 A examples/simple.py
 A src/main.py
 ? examples/performant.py
 ? setup.py
 ? src/watcher/watcher.py
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/filenames.glob.star.out
--- a/en/examples/results/filenames.glob.star.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/filenames.glob.star.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
-$ \textbf{hg add 'glob:*.py'}
+<screen><prompt>$</prompt> <userinput>hg add 'glob:*.py'</userinput>
 adding main.py
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/filenames.glob.starstar.out
--- a/en/examples/results/filenames.glob.starstar.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/filenames.glob.starstar.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,7 +1,8 @@
-$ \textbf{cd ..}
-$ \textbf{hg status 'glob:**.py'}
+<screen><prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>hg status 'glob:**.py'</userinput>
 A examples/simple.py
 A src/main.py
 ? examples/performant.py
 ? setup.py
 ? src/watcher/watcher.py
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/filenames.wdir-relname.out
--- a/en/examples/results/filenames.wdir-relname.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/filenames.wdir-relname.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,4 @@
-$ \textbf{hg status}
+<screen><prompt>$</prompt> <userinput>hg status</userinput>
 A COPYING
 A README
 A examples/simple.py
@@ -9,7 +9,7 @@
 ? src/watcher/_watcher.c
 ? src/watcher/watcher.py
 ? src/xyzzy.txt
-$ \textbf{hg status `hg root`}
+<prompt>$</prompt> <userinput>hg status `hg root`</userinput>
 A ../COPYING
 A ../README
 A ../examples/simple.py
@@ -20,3 +20,4 @@
 ? watcher/_watcher.c
 ? watcher/watcher.py
 ? xyzzy.txt
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/filenames.wdir-subdir.out
--- a/en/examples/results/filenames.wdir-subdir.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/filenames.wdir-subdir.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,5 +1,5 @@
-$ \textbf{cd src}
-$ \textbf{hg add -n}
+<screen><prompt>$</prompt> <userinput>cd src</userinput>
+<prompt>$</prompt> <userinput>hg add -n</userinput>
 adding ../MANIFEST.in
 adding ../examples/performant.py
 adding ../setup.py
@@ -7,8 +7,9 @@
 adding watcher/_watcher.c
 adding watcher/watcher.py
 adding xyzzy.txt
-$ \textbf{hg add -n .}
+<prompt>$</prompt> <userinput>hg add -n .</userinput>
 adding main.py
 adding watcher/_watcher.c
 adding watcher/watcher.py
 adding xyzzy.txt
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/hook.msglen.go.out
--- a/en/examples/results/hook.msglen.go.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/hook.msglen.go.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,10 +1,11 @@
-$ \textbf{cat .hg/hgrc}
+<screen><prompt>$</prompt> <userinput>cat .hg/hgrc</userinput>
 [hooks]
-pretxncommit.msglen = test `hg tip --template \{desc\} | wc -c` -ge 10
-$ \textbf{echo a > a}
-$ \textbf{hg add a}
-$ \textbf{hg commit -A -m 'too short'}
+pretxncommit.msglen = test `hg tip --template {desc} | wc -c` -ge 10
+<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
+<prompt>$</prompt> <userinput>hg add a</userinput>
+<prompt>$</prompt> <userinput>hg commit -A -m 'too short'</userinput>
 transaction abort!
 rollback completed
 abort: pretxncommit.msglen hook exited with status 1
-$ \textbf{hg commit -A -m 'long enough'}
+<prompt>$</prompt> <userinput>hg commit -A -m 'long enough'</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/hook.simple.ext.out
--- a/en/examples/results/hook.simple.ext.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/hook.simple.ext.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,5 +1,6 @@
-$ \textbf{echo 'commit.when = echo -n "date of commit: "; date' >> .hg/hgrc}
-$ \textbf{echo a >> a}
-$ \textbf{hg commit -m 'i have two hooks'}
+<screen><prompt>$</prompt> <userinput>echo 'commit.when = echo -n "date of commit: "; date' &gt;&gt; .hg/hgrc</userinput>
+<prompt>$</prompt> <userinput>echo a &gt;&gt; a</userinput>
+<prompt>$</prompt> <userinput>hg commit -m 'i have two hooks'</userinput>
 committed 
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/hook.simple.init.out
--- a/en/examples/results/hook.simple.init.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/hook.simple.init.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,11 +1,12 @@
-$ \textbf{hg init hook-test}
-$ \textbf{cd hook-test}
-$ \textbf{echo '[hooks]' >> .hg/hgrc}
-$ \textbf{echo 'commit = echo committed $HG_NODE' >> .hg/hgrc}
-$ \textbf{cat .hg/hgrc}
+<screen><prompt>$</prompt> <userinput>hg init hook-test</userinput>
+<prompt>$</prompt> <userinput>cd hook-test</userinput>
+<prompt>$</prompt> <userinput>echo '[hooks]' &gt;&gt; .hg/hgrc</userinput>
+<prompt>$</prompt> <userinput>echo 'commit = echo committed $HG_NODE' &gt;&gt; .hg/hgrc</userinput>
+<prompt>$</prompt> <userinput>cat .hg/hgrc</userinput>
 [hooks]
 commit = echo committed $HG_NODE
-$ \textbf{echo a > a}
-$ \textbf{hg add a}
-$ \textbf{hg commit -m 'testing commit hook'}
+<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
+<prompt>$</prompt> <userinput>hg add a</userinput>
+<prompt>$</prompt> <userinput>hg commit -m 'testing commit hook'</userinput>
 committed 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/hook.simple.pretxncommit.out
--- a/en/examples/results/hook.simple.pretxncommit.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/hook.simple.pretxncommit.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,13 +1,14 @@
-$ \textbf{cat check_bug_id}
+<screen><prompt>$</prompt> <userinput>cat check_bug_id</userinput>
 #!/bin/sh
 # check that a commit comment mentions a numeric bug id
-hg log -r $1 --template \{desc\} | grep -q "\textbackslash{}<bug *[0-9]"
-$ \textbf{echo 'pretxncommit.bug_id_required = ./check_bug_id $HG_NODE' >> .hg/hgrc}
-$ \textbf{echo a >> a}
-$ \textbf{hg commit -m 'i am not mentioning a bug id'}
+hg log -r $1 --template {desc} | grep -q "\&lt;bug *[0-9]"
+<prompt>$</prompt> <userinput>echo 'pretxncommit.bug_id_required = ./check_bug_id $HG_NODE' &gt;&gt; .hg/hgrc</userinput>
+<prompt>$</prompt> <userinput>echo a &gt;&gt; a</userinput>
+<prompt>$</prompt> <userinput>hg commit -m 'i am not mentioning a bug id'</userinput>
 transaction abort!
 rollback completed
 abort: pretxncommit.bug_id_required hook exited with status 1
-$ \textbf{hg commit -m 'i refer you to bug 666'}
+<prompt>$</prompt> <userinput>hg commit -m 'i refer you to bug 666'</userinput>
 committed 
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/hook.ws.better.out
--- a/en/examples/results/hook.ws.better.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/hook.ws.better.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,17 +1,18 @@
-$ \textbf{cat .hg/hgrc}
+<screen><prompt>$</prompt> <userinput>cat .hg/hgrc</userinput>
 [hooks]
 pretxncommit.whitespace = .hg/check_whitespace.py
-$ \textbf{echo 'a ' >> a}
-$ \textbf{hg commit -A -m 'add new line with trailing whitespace'}
+<prompt>$</prompt> <userinput>echo 'a ' &gt;&gt; a</userinput>
+<prompt>$</prompt> <userinput>hg commit -A -m 'add new line with trailing whitespace'</userinput>
 a, line 2: trailing whitespace added
 commit message saved to .hg/commit.save
 transaction abort!
 rollback completed
 abort: pretxncommit.whitespace hook exited with status 1
-$ \textbf{sed -i 's, *$,,' a}
-$ \textbf{hg commit -A -m 'trimmed trailing whitespace'}
+<prompt>$</prompt> <userinput>sed -i 's, *$,,' a</userinput>
+<prompt>$</prompt> <userinput>hg commit -A -m 'trimmed trailing whitespace'</userinput>
 a, line 2: trailing whitespace added
 commit message saved to .hg/commit.save
 transaction abort!
 rollback completed
 abort: pretxncommit.whitespace hook exited with status 1
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/hook.ws.simple.out
--- a/en/examples/results/hook.ws.simple.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/hook.ws.simple.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,11 +1,12 @@
-$ \textbf{cat .hg/hgrc}
+<screen><prompt>$</prompt> <userinput>cat .hg/hgrc</userinput>
 [hooks]
-pretxncommit.whitespace = hg export tip | (! egrep -q '^\textbackslash{}+.*[ \textbackslash{}t]$')
-$ \textbf{echo 'a ' > a}
-$ \textbf{hg commit -A -m 'test with trailing whitespace'}
+pretxncommit.whitespace = hg export tip | (! egrep -q '^\+.*[ \t]$')
+<prompt>$</prompt> <userinput>echo 'a ' &gt; a</userinput>
+<prompt>$</prompt> <userinput>hg commit -A -m 'test with trailing whitespace'</userinput>
 adding a
 transaction abort!
 rollback completed
 abort: pretxncommit.whitespace hook exited with status 1
-$ \textbf{echo 'a' > a}
-$ \textbf{hg commit -A -m 'drop trailing whitespace and try again'}
+<prompt>$</prompt> <userinput>echo 'a' &gt; a</userinput>
+<prompt>$</prompt> <userinput>hg commit -A -m 'drop trailing whitespace and try again'</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/issue29.go.out
--- a/en/examples/results/issue29.go.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/issue29.go.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,17 +1,18 @@
-$ \textbf{hg init issue29}
-$ \textbf{cd issue29}
-$ \textbf{echo a > a}
-$ \textbf{hg ci -Ama}
+<screen><prompt>$</prompt> <userinput>hg init issue29</userinput>
+<prompt>$</prompt> <userinput>cd issue29</userinput>
+<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
+<prompt>$</prompt> <userinput>hg ci -Ama</userinput>
 adding a
-$ \textbf{echo b > b}
-$ \textbf{hg ci -Amb}
+<prompt>$</prompt> <userinput>echo b &gt; b</userinput>
+<prompt>$</prompt> <userinput>hg ci -Amb</userinput>
 adding b
-$ \textbf{hg up 0}
+<prompt>$</prompt> <userinput>hg up 0</userinput>
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-$ \textbf{mkdir b}
-$ \textbf{echo b > b/b}
-$ \textbf{hg ci -Amc}
+<prompt>$</prompt> <userinput>mkdir b</userinput>
+<prompt>$</prompt> <userinput>echo b &gt; b/b</userinput>
+<prompt>$</prompt> <userinput>hg ci -Amc</userinput>
 adding b/b
 created new head
-$ \textbf{hg merge}
+<prompt>$</prompt> <userinput>hg merge</userinput>
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.dodiff.diff.out
--- a/en/examples/results/mq.dodiff.diff.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.dodiff.diff.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,13 +1,14 @@
-$ \textbf{echo 'this is my original thought' > oldfile}
-$ \textbf{echo 'i have changed my mind' > newfile}
-$ \textbf{diff -u oldfile newfile > tiny.patch}
-$ \textbf{cat tiny.patch}
+<screen><prompt>$</prompt> <userinput>echo 'this is my original thought' &gt; oldfile</userinput>
+<prompt>$</prompt> <userinput>echo 'i have changed my mind' &gt; newfile</userinput>
+<prompt>$</prompt> <userinput>diff -u oldfile newfile &gt; tiny.patch</userinput>
+<prompt>$</prompt> <userinput>cat tiny.patch</userinput>
 
 
 @@ -1 +1 @@
 -this is my original thought
 +i have changed my mind
-$ \textbf{patch < tiny.patch}
+<prompt>$</prompt> <userinput>patch &lt; tiny.patch</userinput>
 patching file oldfile
-$ \textbf{cat oldfile}
+<prompt>$</prompt> <userinput>cat oldfile</userinput>
 i have changed my mind
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.guards.init.out
--- a/en/examples/results/mq.guards.init.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.guards.init.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,9 +1,10 @@
-$ \textbf{hg qinit}
-$ \textbf{hg qnew hello.patch}
-$ \textbf{echo hello > hello}
-$ \textbf{hg add hello}
-$ \textbf{hg qrefresh}
-$ \textbf{hg qnew goodbye.patch}
-$ \textbf{echo goodbye > goodbye}
-$ \textbf{hg add goodbye}
-$ \textbf{hg qrefresh}
+<screen><prompt>$</prompt> <userinput>hg qinit</userinput>
+<prompt>$</prompt> <userinput>hg qnew hello.patch</userinput>
+<prompt>$</prompt> <userinput>echo hello &gt; hello</userinput>
+<prompt>$</prompt> <userinput>hg add hello</userinput>
+<prompt>$</prompt> <userinput>hg qrefresh</userinput>
+<prompt>$</prompt> <userinput>hg qnew goodbye.patch</userinput>
+<prompt>$</prompt> <userinput>echo goodbye &gt; goodbye</userinput>
+<prompt>$</prompt> <userinput>hg add goodbye</userinput>
+<prompt>$</prompt> <userinput>hg qrefresh</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.guards.qguard.neg.out
--- a/en/examples/results/mq.guards.qguard.neg.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.guards.qguard.neg.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,3 +1,4 @@
-$ \textbf{hg qguard hello.patch -quux}
-$ \textbf{hg qguard hello.patch}
+<screen><prompt>$</prompt> <userinput>hg qguard hello.patch -quux</userinput>
+<prompt>$</prompt> <userinput>hg qguard hello.patch</userinput>
 hello.patch: -quux
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.guards.qguard.out
--- a/en/examples/results/mq.guards.qguard.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.guards.qguard.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
-$ \textbf{hg qguard}
+<screen><prompt>$</prompt> <userinput>hg qguard</userinput>
 goodbye.patch: unguarded
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.guards.qguard.pos.out
--- a/en/examples/results/mq.guards.qguard.pos.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.guards.qguard.pos.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,3 +1,4 @@
-$ \textbf{hg qguard +foo}
-$ \textbf{hg qguard}
+<screen><prompt>$</prompt> <userinput>hg qguard +foo</userinput>
+<prompt>$</prompt> <userinput>hg qguard</userinput>
 goodbye.patch: +foo
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.guards.qselect.cat.out
--- a/en/examples/results/mq.guards.qselect.cat.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.guards.qselect.cat.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
-$ \textbf{cat .hg/patches/guards}
+<screen><prompt>$</prompt> <userinput>cat .hg/patches/guards</userinput>
 foo
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.guards.qselect.error.out
--- a/en/examples/results/mq.guards.qselect.error.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.guards.qselect.error.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
-$ \textbf{hg qselect +foo}
+<screen><prompt>$</prompt> <userinput>hg qselect +foo</userinput>
 abort: guard '+foo' starts with invalid character: '+'
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.guards.qselect.foo.out
--- a/en/examples/results/mq.guards.qselect.foo.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.guards.qselect.foo.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,8 +1,9 @@
-$ \textbf{hg qpop -a}
+<screen><prompt>$</prompt> <userinput>hg qpop -a</userinput>
 patch queue now empty
-$ \textbf{hg qselect}
+<prompt>$</prompt> <userinput>hg qselect</userinput>
 no active guards
-$ \textbf{hg qselect foo}
+<prompt>$</prompt> <userinput>hg qselect foo</userinput>
 number of unguarded, unapplied patches has changed from 1 to 2
-$ \textbf{hg qselect}
+<prompt>$</prompt> <userinput>hg qselect</userinput>
 foo
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.guards.qselect.foobar.out
--- a/en/examples/results/mq.guards.qselect.foobar.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.guards.qselect.foobar.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,8 +1,9 @@
-$ \textbf{hg qselect foo bar}
+<screen><prompt>$</prompt> <userinput>hg qselect foo bar</userinput>
 number of unguarded, unapplied patches has changed from 0 to 2
-$ \textbf{hg qpop -a}
+<prompt>$</prompt> <userinput>hg qpop -a</userinput>
 no patches applied
-$ \textbf{hg qpush -a}
+<prompt>$</prompt> <userinput>hg qpush -a</userinput>
 applying hello.patch
 applying goodbye.patch
 now at: goodbye.patch
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.guards.qselect.qpush.out
--- a/en/examples/results/mq.guards.qselect.qpush.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.guards.qselect.qpush.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{hg qpush -a}
+<screen><prompt>$</prompt> <userinput>hg qpush -a</userinput>
 applying hello.patch
 applying goodbye.patch
 now at: goodbye.patch
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.guards.qselect.quux.out
--- a/en/examples/results/mq.guards.qselect.quux.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.guards.qselect.quux.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,6 +1,7 @@
-$ \textbf{hg qselect quux}
+<screen><prompt>$</prompt> <userinput>hg qselect quux</userinput>
 number of guarded, applied patches has changed from 0 to 2
-$ \textbf{hg qpop -a}
+<prompt>$</prompt> <userinput>hg qpop -a</userinput>
 patch queue now empty
-$ \textbf{hg qpush -a}
+<prompt>$</prompt> <userinput>hg qpush -a</userinput>
 patch series already fully applied
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.guards.series.out
--- a/en/examples/results/mq.guards.series.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.guards.series.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,3 +1,4 @@
-$ \textbf{cat .hg/patches/series}
+<screen><prompt>$</prompt> <userinput>cat .hg/patches/series</userinput>
 hello.patch #-quux
 goodbye.patch #+foo
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.id.output.out
--- a/en/examples/results/mq.id.output.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.id.output.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,11 +1,11 @@
-$ \textbf{hg qapplied}
+<screen><prompt>$</prompt> <userinput>hg qapplied</userinput>
 first.patch
 second.patch
-$ \textbf{hg log -r qbase:qtip}
+<prompt>$</prompt> <userinput>hg log -r qbase:qtip</userinput>
 changeset:   
 tag:         first.patch
 tag:         qbase
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     [mq]: first.patch
 
@@ -13,13 +13,13 @@
 tag:         qtip
 tag:         second.patch
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     [mq]: second.patch
 
-$ \textbf{hg export second.patch}
+<prompt>$</prompt> <userinput>hg export second.patch</userinput>
 # HG changeset patch
-# User Bryan O'Sullivan <bos@serpentine.com>
+# User Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 # Node ID 
 # Parent  
@@ -30,3 +30,4 @@
 
 @@ -0,0 +1,1 @@
 +double u;
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.qinit-help.help.out
--- a/en/examples/results/mq.qinit-help.help.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.qinit-help.help.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,4 @@
-$ \textbf{hg help qinit}
+<screen><prompt>$</prompt> <userinput>hg help qinit</userinput>
 hg qinit [-c]
 
 init a new queue repository
@@ -14,3 +14,4 @@
  -c --create-repo  create queue repository
 
 use "hg -v help qinit" to show global options
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.tarball.download.out
--- a/en/examples/results/mq.tarball.download.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.tarball.download.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,9 +1,10 @@
-$ \textbf{download netplug-1.2.5.tar.bz2}
-$ \textbf{tar jxf netplug-1.2.5.tar.bz2}
-$ \textbf{cd netplug-1.2.5}
-$ \textbf{hg init}
-$ \textbf{hg commit -q --addremove --message netplug-1.2.5}
-$ \textbf{cd ..}
-$ \textbf{hg clone netplug-1.2.5 netplug}
+<screen><prompt>$</prompt> <userinput>download netplug-1.2.5.tar.bz2</userinput>
+<prompt>$</prompt> <userinput>tar jxf netplug-1.2.5.tar.bz2</userinput>
+<prompt>$</prompt> <userinput>cd netplug-1.2.5</userinput>
+<prompt>$</prompt> <userinput>hg init</userinput>
+<prompt>$</prompt> <userinput>hg commit -q --addremove --message netplug-1.2.5</userinput>
+<prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>hg clone netplug-1.2.5 netplug</userinput>
 updating working directory
 18 files updated, 0 files merged, 0 files removed, 0 files unresolved
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.tarball.newsource.out
--- a/en/examples/results/mq.tarball.newsource.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.tarball.newsource.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,13 +1,14 @@
-$ \textbf{hg qpop -a}
+<screen><prompt>$</prompt> <userinput>hg qpop -a</userinput>
 patch queue now empty
-$ \textbf{cd ..}
-$ \textbf{download netplug-1.2.8.tar.bz2}
-$ \textbf{hg clone netplug-1.2.5 netplug-1.2.8}
+<prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>download netplug-1.2.8.tar.bz2</userinput>
+<prompt>$</prompt> <userinput>hg clone netplug-1.2.5 netplug-1.2.8</userinput>
 updating working directory
 18 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd netplug-1.2.8}
-$ \textbf{hg locate -0 | xargs -0 rm}
-$ \textbf{cd ..}
-$ \textbf{tar jxf netplug-1.2.8.tar.bz2}
-$ \textbf{cd netplug-1.2.8}
-$ \textbf{hg commit --addremove --message netplug-1.2.8}
+<prompt>$</prompt> <userinput>cd netplug-1.2.8</userinput>
+<prompt>$</prompt> <userinput>hg locate -0 | xargs -0 rm</userinput>
+<prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>tar jxf netplug-1.2.8.tar.bz2</userinput>
+<prompt>$</prompt> <userinput>cd netplug-1.2.8</userinput>
+<prompt>$</prompt> <userinput>hg commit --addremove --message netplug-1.2.8</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.tarball.qinit.out
--- a/en/examples/results/mq.tarball.qinit.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.tarball.qinit.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,15 +1,15 @@
-$ \textbf{cd netplug}
-$ \textbf{hg qinit}
-$ \textbf{hg qnew -m 'fix build problem with gcc 4' build-fix.patch}
-$ \textbf{perl -pi -e 's/int addr_len/socklen_t addr_len/' netlink.c}
-$ \textbf{hg qrefresh}
-$ \textbf{hg tip -p}
+<screen><prompt>$</prompt> <userinput>cd netplug</userinput>
+<prompt>$</prompt> <userinput>hg qinit</userinput>
+<prompt>$</prompt> <userinput>hg qnew -m 'fix build problem with gcc 4' build-fix.patch</userinput>
+<prompt>$</prompt> <userinput>perl -pi -e 's/int addr_len/socklen_t addr_len/' netlink.c</userinput>
+<prompt>$</prompt> <userinput>hg qrefresh</userinput>
+<prompt>$</prompt> <userinput>hg tip -p</userinput>
 changeset:   
 tag:         qtip
 tag:         build-fix.patch
 tag:         tip
 tag:         qbase
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     fix build problem with gcc 4
 
@@ -18,11 +18,12 @@
 
 @@ -275,7 +275,7 @@
          exit(1);
-     \}
+     }
  
 -    int addr_len = sizeof(addr);
 +    socklen_t addr_len = sizeof(addr);
  
-     if (getsockname(fd, (struct sockaddr *) &addr, &addr_len) == -1) \{
+     if (getsockname(fd, (struct sockaddr *) &amp;addr, &amp;addr_len) == -1) {
          do_log(LOG_ERR, "Could not get socket details: %m");
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.tarball.repush.out
--- a/en/examples/results/mq.tarball.repush.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.tarball.repush.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,5 +1,5 @@
-$ \textbf{cd ../netplug}
-$ \textbf{hg pull ../netplug-1.2.8}
+<screen><prompt>$</prompt> <userinput>cd ../netplug</userinput>
+<prompt>$</prompt> <userinput>hg pull ../netplug-1.2.8</userinput>
 pulling from ../netplug-1.2.8
 searching for changes
 adding changesets
@@ -7,7 +7,8 @@
 adding file changes
 added 1 changesets with 12 changes to 12 files
 (run 'hg update' to get a working copy)
-$ \textbf{hg qpush -a}
+<prompt>$</prompt> <userinput>hg qpush -a</userinput>
 (working directory not at tip)
 applying build-fix.patch
 now at: build-fix.patch
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.tools.lsdiff.out
--- a/en/examples/results/mq.tools.lsdiff.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.tools.lsdiff.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,4 @@
-$ \textbf{lsdiff -nvv remove-redundant-null-checks.patch}
+<screen><prompt>$</prompt> <userinput>lsdiff -nvv remove-redundant-null-checks.patch</userinput>
 22	File #1  	a/drivers/char/agp/sgi-agp.c
 	24	Hunk #1	static int __devinit agp_sgi_init(void)
 37	File #2  	a/drivers/char/hvcs.c
@@ -19,3 +19,4 @@
 	166	Hunk #1	int ata_cmd_ioctl(struct scsi_device *sc
 178	File #8  	a/drivers/video/au1100fb.c
 	180	Hunk #1	void __exit au1100fb_cleanup(void)
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.tools.tools.out
--- a/en/examples/results/mq.tools.tools.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.tools.tools.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,4 @@
-$ \textbf{diffstat -p1 remove-redundant-null-checks.patch}
+<screen><prompt>$</prompt> <userinput>diffstat -p1 remove-redundant-null-checks.patch</userinput>
  drivers/char/agp/sgi-agp.c        |    5 ++---
  drivers/char/hvcs.c               |   11 +++++------
  drivers/message/fusion/mptfc.c    |    6 ++----
@@ -8,16 +8,17 @@
  drivers/scsi/libata-scsi.c        |    4 +---
  drivers/video/au1100fb.c          |    3 +--
  8 files changed, 19 insertions(+), 38 deletions(-)
-$ \textbf{filterdiff -i '*/video/*' remove-redundant-null-checks.patch}
+<prompt>$</prompt> <userinput>filterdiff -i '*/video/*' remove-redundant-null-checks.patch</userinput>
 
 
 @@ -743,8 +743,7 @@ void __exit au1100fb_cleanup(void)
- \{
- 	driver_unregister(&au1100fb_driver);
+ {
+ 	driver_unregister(&amp;au1100fb_driver);
  
 -	if (drv_info.opt_mode)
 -		kfree(drv_info.opt_mode);
 +	kfree(drv_info.opt_mode);
- \}
+ }
  
  module_init(au1100fb_init);
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.tutorial.add.out
--- a/en/examples/results/mq.tutorial.add.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.tutorial.add.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{echo 'file 3, line 1' >> file3}
-$ \textbf{hg qnew add-file3.patch}
-$ \textbf{hg qnew -f add-file3.patch}
+<screen><prompt>$</prompt> <userinput>echo 'file 3, line 1' &gt;&gt; file3</userinput>
+<prompt>$</prompt> <userinput>hg qnew add-file3.patch</userinput>
+<prompt>$</prompt> <userinput>hg qnew -f add-file3.patch</userinput>
 abort: patch "add-file3.patch" already exists
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.tutorial.qinit.out
--- a/en/examples/results/mq.tutorial.qinit.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.tutorial.qinit.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,7 +1,8 @@
-$ \textbf{hg init mq-sandbox}
-$ \textbf{cd mq-sandbox}
-$ \textbf{echo 'line 1' > file1}
-$ \textbf{echo 'another line 1' > file2}
-$ \textbf{hg add file1 file2}
-$ \textbf{hg commit -m'first change'}
-$ \textbf{hg qinit}
+<screen><prompt>$</prompt> <userinput>hg init mq-sandbox</userinput>
+<prompt>$</prompt> <userinput>cd mq-sandbox</userinput>
+<prompt>$</prompt> <userinput>echo 'line 1' &gt; file1</userinput>
+<prompt>$</prompt> <userinput>echo 'another line 1' &gt; file2</userinput>
+<prompt>$</prompt> <userinput>hg add file1 file2</userinput>
+<prompt>$</prompt> <userinput>hg commit -m'first change'</userinput>
+<prompt>$</prompt> <userinput>hg qinit</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.tutorial.qnew.out
--- a/en/examples/results/mq.tutorial.qnew.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.tutorial.qnew.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,20 +1,21 @@
-$ \textbf{hg tip}
+<screen><prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     first change
 
-$ \textbf{hg qnew first.patch}
-$ \textbf{hg tip}
+<prompt>$</prompt> <userinput>hg qnew first.patch</userinput>
+<prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 tag:         qtip
 tag:         first.patch
 tag:         tip
 tag:         qbase
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     [mq]: first.patch
 
-$ \textbf{ls .hg/patches}
+<prompt>$</prompt> <userinput>ls .hg/patches</userinput>
 first.patch  series  status
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.tutorial.qnew2.out
--- a/en/examples/results/mq.tutorial.qnew2.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.tutorial.qnew2.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,15 +1,15 @@
-$ \textbf{hg qnew second.patch}
-$ \textbf{hg log --style=compact --limit=2}
-2[qtip,second.patch,tip]      2009-01-30 06:34 +0000   bos
+<screen><prompt>$</prompt> <userinput>hg qnew second.patch</userinput>
+<prompt>$</prompt> <userinput>hg log --style=compact --limit=2</userinput>
+2[qtip,second.patch,tip]      2009-03-10 04:38 +0000   bos
   [mq]: second.patch
 
-1[first.patch,qbase]      2009-01-30 06:34 +0000   bos
+1[first.patch,qbase]      2009-03-10 04:38 +0000   bos
   [mq]: first.patch
 
-$ \textbf{echo 'line 4' >> file1}
-$ \textbf{hg qrefresh}
-$ \textbf{hg tip --style=compact --patch}
-2[qtip,second.patch,tip]      2009-01-30 06:34 +0000   bos
+<prompt>$</prompt> <userinput>echo 'line 4' &gt;&gt; file1</userinput>
+<prompt>$</prompt> <userinput>hg qrefresh</userinput>
+<prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput>
+2[qtip,second.patch,tip]      2009-03-10 04:38 +0000   bos
   [mq]: second.patch
 
 diff -r  -r  file1
@@ -21,8 +21,9 @@
  line 3
 +line 4
 
-$ \textbf{hg annotate file1}
+<prompt>$</prompt> <userinput>hg annotate file1</userinput>
 0: line 1
 1: line 2
 1: line 3
 2: line 4
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.tutorial.qpop.out
--- a/en/examples/results/mq.tutorial.qpop.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.tutorial.qpop.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,14 +1,15 @@
-$ \textbf{hg qapplied}
+<screen><prompt>$</prompt> <userinput>hg qapplied</userinput>
 first.patch
 second.patch
-$ \textbf{hg qpop}
+<prompt>$</prompt> <userinput>hg qpop</userinput>
 now at: first.patch
-$ \textbf{hg qseries}
+<prompt>$</prompt> <userinput>hg qseries</userinput>
 first.patch
 second.patch
-$ \textbf{hg qapplied}
+<prompt>$</prompt> <userinput>hg qapplied</userinput>
 first.patch
-$ \textbf{cat file1}
+<prompt>$</prompt> <userinput>cat file1</userinput>
 line 1
 line 2
 line 3
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.tutorial.qpush-a.out
--- a/en/examples/results/mq.tutorial.qpush-a.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.tutorial.qpush-a.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,8 +1,9 @@
-$ \textbf{hg qpush -a}
+<screen><prompt>$</prompt> <userinput>hg qpush -a</userinput>
 applying second.patch
 now at: second.patch
-$ \textbf{cat file1}
+<prompt>$</prompt> <userinput>cat file1</userinput>
 line 1
 line 2
 line 3
 line 4
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.tutorial.qrefresh.out
--- a/en/examples/results/mq.tutorial.qrefresh.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.tutorial.qrefresh.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,15 +1,15 @@
-$ \textbf{echo 'line 2' >> file1}
-$ \textbf{hg diff}
+<screen><prompt>$</prompt> <userinput>echo 'line 2' &gt;&gt; file1</userinput>
+<prompt>$</prompt> <userinput>hg diff</userinput>
 diff -r  file1
 
 
 @@ -1,1 +1,2 @@
  line 1
 +line 2
-$ \textbf{hg qrefresh}
-$ \textbf{hg diff}
-$ \textbf{hg tip --style=compact --patch}
-1[qtip,first.patch,tip,qbase]      2009-01-30 06:34 +0000   bos
+<prompt>$</prompt> <userinput>hg qrefresh</userinput>
+<prompt>$</prompt> <userinput>hg diff</userinput>
+<prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput>
+1[qtip,first.patch,tip,qbase]      2009-03-10 04:38 +0000   bos
   [mq]: first.patch
 
 diff -r  -r  file1
@@ -19,3 +19,4 @@
  line 1
 +line 2
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.tutorial.qrefresh2.out
--- a/en/examples/results/mq.tutorial.qrefresh2.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.tutorial.qrefresh2.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,9 +1,9 @@
-$ \textbf{echo 'line 3' >> file1}
-$ \textbf{hg status}
+<screen><prompt>$</prompt> <userinput>echo 'line 3' &gt;&gt; file1</userinput>
+<prompt>$</prompt> <userinput>hg status</userinput>
 M file1
-$ \textbf{hg qrefresh}
-$ \textbf{hg tip --style=compact --patch}
-1[qtip,first.patch,tip,qbase]      2009-01-30 06:34 +0000   bos
+<prompt>$</prompt> <userinput>hg qrefresh</userinput>
+<prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput>
+1[qtip,first.patch,tip,qbase]      2009-03-10 04:38 +0000   bos
   [mq]: first.patch
 
 diff -r  -r  file1
@@ -14,3 +14,4 @@
 +line 2
 +line 3
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/mq.tutorial.qseries.out
--- a/en/examples/results/mq.tutorial.qseries.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/mq.tutorial.qseries.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,6 +1,7 @@
-$ \textbf{hg qseries}
+<screen><prompt>$</prompt> <userinput>hg qseries</userinput>
 first.patch
 second.patch
-$ \textbf{hg qapplied}
+<prompt>$</prompt> <userinput>hg qapplied</userinput>
 first.patch
 second.patch
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/rename.divergent.clone.out
--- a/en/examples/results/rename.divergent.clone.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/rename.divergent.clone.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,6 +1,7 @@
-$ \textbf{hg clone orig anne}
+<screen><prompt>$</prompt> <userinput>hg clone orig anne</userinput>
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{hg clone orig bob}
+<prompt>$</prompt> <userinput>hg clone orig bob</userinput>
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/rename.divergent.merge.out
--- a/en/examples/results/rename.divergent.merge.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/rename.divergent.merge.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,6 +1,6 @@
-# See http://www.selenic.com/mercurial/bts/issue455
-$ \textbf{cd ../orig}
-$ \textbf{hg pull -u ../anne}
+<screen># See http://www.selenic.com/mercurial/bts/issue455
+<prompt>$</prompt> <userinput>cd ../orig</userinput>
+<prompt>$</prompt> <userinput>hg pull -u ../anne</userinput>
 pulling from ../anne
 searching for changes
 adding changesets
@@ -8,7 +8,7 @@
 adding file changes
 added 1 changesets with 1 changes to 1 files
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-$ \textbf{hg pull ../bob}
+<prompt>$</prompt> <userinput>hg pull ../bob</userinput>
 pulling from ../bob
 searching for changes
 adding changesets
@@ -16,11 +16,12 @@
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
-$ \textbf{hg merge}
+<prompt>$</prompt> <userinput>hg merge</userinput>
 warning: detected divergent renames of foo to:
  bar
  quux
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-$ \textbf{ls}
+<prompt>$</prompt> <userinput>ls</userinput>
 bar  quux
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/rename.divergent.rename.anne.out
--- a/en/examples/results/rename.divergent.rename.anne.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/rename.divergent.rename.anne.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,3 +1,4 @@
-$ \textbf{cd anne}
-$ \textbf{hg mv foo bar}
-$ \textbf{hg ci -m 'Rename foo to bar'}
+<screen><prompt>$</prompt> <userinput>cd anne</userinput>
+<prompt>$</prompt> <userinput>hg mv foo bar</userinput>
+<prompt>$</prompt> <userinput>hg ci -m 'Rename foo to bar'</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/rename.divergent.rename.bob.out
--- a/en/examples/results/rename.divergent.rename.bob.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/rename.divergent.rename.bob.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,3 +1,4 @@
-$ \textbf{cd ../bob}
-$ \textbf{hg mv foo quux}
-$ \textbf{hg ci -m 'Rename foo to quux'}
+<screen><prompt>$</prompt> <userinput>cd ../bob</userinput>
+<prompt>$</prompt> <userinput>hg mv foo quux</userinput>
+<prompt>$</prompt> <userinput>hg ci -m 'Rename foo to quux'</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/rollback.add.out
--- a/en/examples/results/rollback.add.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/rollback.add.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
-$ \textbf{hg add b}
-$ \textbf{hg commit -m 'Add file b, this time for real'}
+<screen><prompt>$</prompt> <userinput>hg add b</userinput>
+<prompt>$</prompt> <userinput>hg commit -m 'Add file b, this time for real'</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/rollback.commit.out
--- a/en/examples/results/rollback.commit.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/rollback.commit.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{hg status}
+<screen><prompt>$</prompt> <userinput>hg status</userinput>
 M a
-$ \textbf{echo b > b}
-$ \textbf{hg commit -m 'Add file b'}
+<prompt>$</prompt> <userinput>echo b &gt; b</userinput>
+<prompt>$</prompt> <userinput>hg commit -m 'Add file b'</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/rollback.rollback.out
--- a/en/examples/results/rollback.rollback.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/rollback.rollback.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,12 +1,13 @@
-$ \textbf{hg rollback}
+<screen><prompt>$</prompt> <userinput>hg rollback</userinput>
 rolling back last transaction
-$ \textbf{hg tip}
+<prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     First commit
 
-$ \textbf{hg status}
+<prompt>$</prompt> <userinput>hg status</userinput>
 M a
 ? b
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/rollback.status.out
--- a/en/examples/results/rollback.status.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/rollback.status.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,9 +1,10 @@
-$ \textbf{hg status}
+<screen><prompt>$</prompt> <userinput>hg status</userinput>
 ? b
-$ \textbf{hg tip}
+<prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Add file b
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/rollback.tip.out
--- a/en/examples/results/rollback.tip.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/rollback.tip.out	Mon Mar 09 21:39:23 2009 -0700
@@ -0,0 +1,1 @@
+<screen></screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/rollback.twice.out
--- a/en/examples/results/rollback.twice.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/rollback.twice.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{hg rollback}
+<screen><prompt>$</prompt> <userinput>hg rollback</userinput>
 rolling back last transaction
-$ \textbf{hg rollback}
+<prompt>$</prompt> <userinput>hg rollback</userinput>
 no rollback information available
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tag.init.out
--- a/en/examples/results/tag.init.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tag.init.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,5 +1,6 @@
-$ \textbf{hg init mytag}
-$ \textbf{cd mytag}
-$ \textbf{echo hello > myfile}
-$ \textbf{hg commit -A -m 'Initial commit'}
+<screen><prompt>$</prompt> <userinput>hg init mytag</userinput>
+<prompt>$</prompt> <userinput>cd mytag</userinput>
+<prompt>$</prompt> <userinput>echo hello &gt; myfile</userinput>
+<prompt>$</prompt> <userinput>hg commit -A -m 'Initial commit'</userinput>
 adding myfile
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tag.log.out
--- a/en/examples/results/tag.log.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tag.log.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,13 +1,14 @@
-$ \textbf{hg log}
+<screen><prompt>$</prompt> <userinput>hg log</userinput>
 changeset:   
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Added tag v1.0 for changeset 
 
 changeset:   
 tag:         v1.0
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Initial commit
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tag.log.v1.0.out
--- a/en/examples/results/tag.log.v1.0.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tag.log.v1.0.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,10 +1,11 @@
-$ \textbf{echo goodbye > myfile2}
-$ \textbf{hg commit -A -m 'Second commit'}
+<screen><prompt>$</prompt> <userinput>echo goodbye &gt; myfile2</userinput>
+<prompt>$</prompt> <userinput>hg commit -A -m 'Second commit'</userinput>
 adding myfile2
-$ \textbf{hg log -r v1.0}
+<prompt>$</prompt> <userinput>hg log -r v1.0</userinput>
 changeset:   
 tag:         v1.0
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Initial commit
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tag.remove.out
--- a/en/examples/results/tag.remove.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tag.remove.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,3 +1,4 @@
-$ \textbf{hg tag --remove v1.0}
-$ \textbf{hg tags}
+<screen><prompt>$</prompt> <userinput>hg tag --remove v1.0</userinput>
+<prompt>$</prompt> <userinput>hg tags</userinput>
 tip                                
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tag.replace.out
--- a/en/examples/results/tag.replace.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tag.replace.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,10 +1,11 @@
-$ \textbf{hg tag -r 1 v1.1}
-$ \textbf{hg tags}
+<screen><prompt>$</prompt> <userinput>hg tag -r 1 v1.1</userinput>
+<prompt>$</prompt> <userinput>hg tags</userinput>
 tip                                
 v1.1                               
-$ \textbf{hg tag -r 2 v1.1}
+<prompt>$</prompt> <userinput>hg tag -r 2 v1.1</userinput>
 abort: tag 'v1.1' already exists (use -f to force)
-$ \textbf{hg tag -f -r 2 v1.1}
-$ \textbf{hg tags}
+<prompt>$</prompt> <userinput>hg tag -f -r 2 v1.1</userinput>
+<prompt>$</prompt> <userinput>hg tags</userinput>
 tip                                
 v1.1                               
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tag.tag.out
--- a/en/examples/results/tag.tag.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tag.tag.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,1 +1,2 @@
-$ \textbf{hg tag v1.0}
+<screen><prompt>$</prompt> <userinput>hg tag v1.0</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tag.tags.out
--- a/en/examples/results/tag.tags.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tag.tags.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,3 +1,4 @@
-$ \textbf{hg tags}
+<screen><prompt>$</prompt> <userinput>hg tags</userinput>
 tip                                
 v1.0                               
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tag.tip.out
--- a/en/examples/results/tag.tip.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tag.tip.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,7 +1,8 @@
-$ \textbf{hg tip}
+<screen><prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Added tag v1.1 for changeset 
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/template.simple.changelog.out
--- a/en/examples/results/template.simple.changelog.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/template.simple.changelog.out	Mon Mar 09 21:39:23 2009 -0700
@@ -20,3 +20,4 @@
 
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/template.simple.combine.out
--- a/en/examples/results/template.simple.combine.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/template.simple.combine.out	Mon Mar 09 21:39:23 2009 -0700
@@ -4,3 +4,4 @@
 
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/template.simple.compact.out
--- a/en/examples/results/template.simple.compact.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/template.simple.compact.out	Mon Mar 09 21:39:23 2009 -0700
@@ -11,3 +11,4 @@
 
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/template.simple.datekeyword.out
--- a/en/examples/results/template.simple.datekeyword.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/template.simple.datekeyword.out	Mon Mar 09 21:39:23 2009 -0700
@@ -2,3 +2,4 @@
 
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/template.simple.keywords.out
--- a/en/examples/results/template.simple.keywords.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/template.simple.keywords.out	Mon Mar 09 21:39:23 2009 -0700
@@ -19,3 +19,4 @@
 
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/template.simple.manyfilters.out
--- a/en/examples/results/template.simple.manyfilters.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/template.simple.manyfilters.out	Mon Mar 09 21:39:23 2009 -0700
@@ -60,3 +60,4 @@
 
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/template.simple.normal.out
--- a/en/examples/results/template.simple.normal.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/template.simple.normal.out	Mon Mar 09 21:39:23 2009 -0700
@@ -5,3 +5,4 @@
 
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/template.simple.rev.out
--- a/en/examples/results/template.simple.rev.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/template.simple.rev.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,3 +1,4 @@
 
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/template.simple.simplest.out
--- a/en/examples/results/template.simple.simplest.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/template.simple.simplest.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/template.simple.simplesub.out
--- a/en/examples/results/template.simple.simplesub.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/template.simple.simplesub.out	Mon Mar 09 21:39:23 2009 -0700
@@ -5,3 +5,4 @@
 
 
 
+
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/template.svnstyle.id.out
--- a/en/examples/results/template.svnstyle.id.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/template.svnstyle.id.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,1 +1,2 @@
-$ \textbf{hg log -r0 --template '\{node\}'}
+<screen><prompt>$</prompt> <userinput>hg log -r0 --template '{node}'</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/template.svnstyle.result.out
--- a/en/examples/results/template.svnstyle.result.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/template.svnstyle.result.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,11 +1,12 @@
-$ \textbf{hg log -r1 --style svn.style}
+<screen><prompt>$</prompt> <userinput>hg log -r1 --style svn.style</userinput>
 ------------------------------------------------------------------------
 
-r1 | bos | 2009-01-30 06:40 +0000 (Fri, 30 Jan 2009 06:40:17 +0000)
+r1 | bos | 
 
-added line to end of <<hello>> file.
+added line to end of &lt;&lt;hello&gt;&gt; file.
 
 in addition, added a file with the helpful name (at least i hope that some
 might consider it so) of goodbye.
 
 ------------------------------------------------------------------------
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/template.svnstyle.short.out
--- a/en/examples/results/template.svnstyle.short.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/template.svnstyle.short.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,10 +1,11 @@
-$ \textbf{svn log -r9653}
+<screen><prompt>$</prompt> <userinput>svn log -r9653</userinput>
 ------------------------------------------------------------------------
 r9653 | sean.hefty | 2006-09-27 14:39:55 -0700 (Wed, 27 Sep 2006) | 5 lines
 
 On reporting a route error, also include the status for the error,
 rather than indicating a status of 0 when an error has occurred.
 
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
+Signed-off-by: Sean Hefty &lt;sean.hefty@intel.com&gt;
 
 ------------------------------------------------------------------------
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/template.svnstyle.simplest.out
--- a/en/examples/results/template.svnstyle.simplest.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/template.svnstyle.simplest.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{cat svn.style}
-changeset = "\{node|short\}\textbackslash{}n"
-$ \textbf{hg log -r1 --style svn.style}
+<screen><prompt>$</prompt> <userinput>cat svn.style</userinput>
+changeset = "{node|short}\n"
+<prompt>$</prompt> <userinput>hg log -r1 --style svn.style</userinput>
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/template.svnstyle.style.out
--- a/en/examples/results/template.svnstyle.style.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/template.svnstyle.style.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,3 +1,4 @@
-$ \textbf{cat svn.style}
-header = '------------------------------------------------------------------------\textbackslash{}n\textbackslash{}n'
+<screen><prompt>$</prompt> <userinput>cat svn.style</userinput>
+header = '------------------------------------------------------------------------\n\n'
 changeset = svn.template
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/template.svnstyle.syntax.error.out
--- a/en/examples/results/template.svnstyle.syntax.error.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/template.svnstyle.syntax.error.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
-$ \textbf{hg log -r1 --style broken.style}
+<screen><prompt>$</prompt> <userinput>hg log -r1 --style broken.style</userinput>
 abort: broken.style:1: parse error
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/template.svnstyle.syntax.input.out
--- a/en/examples/results/template.svnstyle.syntax.input.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/template.svnstyle.syntax.input.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
-$ \textbf{cat broken.style}
+<screen><prompt>$</prompt> <userinput>cat broken.style</userinput>
 changeset =
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/template.svnstyle.template.out
--- a/en/examples/results/template.svnstyle.template.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/template.svnstyle.template.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,6 +1,7 @@
-$ \textbf{cat svn.template}
-r\{rev\} | \{author|user\} | \{date|isodate\} (\{date|rfc822date\})
+<screen><prompt>$</prompt> <userinput>cat svn.template</userinput>
+r{rev} | {author|user} | {date|isodate} ({date|rfc822date})
 
-\{desc|strip|fill76\}
+{desc|strip|fill76}
 
 ------------------------------------------------------------------------
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour-merge-conflict.commit.out
--- a/en/examples/results/tour-merge-conflict.commit.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour-merge-conflict.commit.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,16 +1,17 @@
-$ \textbf{cat > letter.txt <<EOF}
-> \textbf{Greetings!}
-> \textbf{I am Bryan O'Sullivan, no relation of the former}
-> \textbf{Nigerian dictator Sani Abacha.}
-> \textbf{EOF}
-$ \textbf{hg resolve -m letter.txt}
-$ \textbf{hg commit -m 'Send me your money'}
-$ \textbf{hg tip}
+<screen><prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
+<prompt>></prompt> <userinput>Greetings!</userinput>
+<prompt>></prompt> <userinput>I am Bryan O'Sullivan, no relation of the former</userinput>
+<prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
+<prompt>></prompt> <userinput>EOF</userinput>
+<prompt>$</prompt> <userinput>hg resolve -m letter.txt</userinput>
+<prompt>$</prompt> <userinput>hg commit -m 'Send me your money'</userinput>
+<prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 tag:         tip
 parent:      
 parent:      
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Send me your money
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour-merge-conflict.cousin.out
--- a/en/examples/results/tour-merge-conflict.cousin.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour-merge-conflict.cousin.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,11 +1,12 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone scam scam-cousin}
+<screen><prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>hg clone scam scam-cousin</userinput>
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd scam-cousin}
-$ \textbf{cat > letter.txt <<EOF}
-> \textbf{Greetings!}
-> \textbf{I am Shehu Musa Abacha, cousin to the former}
-> \textbf{Nigerian dictator Sani Abacha.}
-> \textbf{EOF}
-$ \textbf{hg commit -m '419 scam, with cousin'}
+<prompt>$</prompt> <userinput>cd scam-cousin</userinput>
+<prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
+<prompt>></prompt> <userinput>Greetings!</userinput>
+<prompt>></prompt> <userinput>I am Shehu Musa Abacha, cousin to the former</userinput>
+<prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
+<prompt>></prompt> <userinput>EOF</userinput>
+<prompt>$</prompt> <userinput>hg commit -m '419 scam, with cousin'</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour-merge-conflict.merge.out
--- a/en/examples/results/tour-merge-conflict.merge.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour-merge-conflict.merge.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,17 +1,18 @@
-$ \textbf{export HGMERGE=merge}
-$ \textbf{echo 'XXX this is broken and must be fixed'}
+<screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput>
+<prompt>$</prompt> <userinput>echo 'XXX this is broken and must be fixed'</userinput>
 XXX this is broken and must be fixed
-$ \textbf{hg merge}
+<prompt>$</prompt> <userinput>hg merge</userinput>
 merging letter.txt
 merge: warning: conflicts during merge
 merging letter.txt failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges
-$ \textbf{cat letter.txt}
+<prompt>$</prompt> <userinput>cat letter.txt</userinput>
 Greetings!
-
+&lt;&lt;&lt;&lt;&lt;&lt;&lt; /tmp/tour-merge-conflictBrdfE0/scam-merge/letter.txt
 I am Shehu Musa Abacha, cousin to the former
 =======
 I am Alhaji Abba Abacha, son of the former
-
+&gt;&gt;&gt;&gt;&gt;&gt;&gt; /tmp/letter.txt~other.1ctEYy
 Nigerian dictator Sani Abacha.
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour-merge-conflict.pull.out
--- a/en/examples/results/tour-merge-conflict.pull.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour-merge-conflict.pull.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,9 +1,9 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone scam-cousin scam-merge}
+<screen><prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>hg clone scam-cousin scam-merge</userinput>
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd scam-merge}
-$ \textbf{hg pull -u ../scam-son}
+<prompt>$</prompt> <userinput>cd scam-merge</userinput>
+<prompt>$</prompt> <userinput>hg pull -u ../scam-son</userinput>
 pulling from ../scam-son
 searching for changes
 adding changesets
@@ -12,3 +12,4 @@
 added 1 changesets with 1 changes to 1 files (+1 heads)
 not updating, since new heads added
 (run 'hg heads' to see heads, 'hg merge' to merge)
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour-merge-conflict.son.out
--- a/en/examples/results/tour-merge-conflict.son.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour-merge-conflict.son.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,11 +1,12 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone scam scam-son}
+<screen><prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>hg clone scam scam-son</userinput>
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd scam-son}
-$ \textbf{cat > letter.txt <<EOF}
-> \textbf{Greetings!}
-> \textbf{I am Alhaji Abba Abacha, son of the former}
-> \textbf{Nigerian dictator Sani Abacha.}
-> \textbf{EOF}
-$ \textbf{hg commit -m '419 scam, with son'}
+<prompt>$</prompt> <userinput>cd scam-son</userinput>
+<prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
+<prompt>></prompt> <userinput>Greetings!</userinput>
+<prompt>></prompt> <userinput>I am Alhaji Abba Abacha, son of the former</userinput>
+<prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
+<prompt>></prompt> <userinput>EOF</userinput>
+<prompt>$</prompt> <userinput>hg commit -m '419 scam, with son'</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour-merge-conflict.wife.out
--- a/en/examples/results/tour-merge-conflict.wife.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour-merge-conflict.wife.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,7 +1,8 @@
-$ \textbf{cat > letter.txt <<EOF}
-> \textbf{Greetings!}
-> \textbf{I am Mariam Abacha, the wife of former}
-> \textbf{Nigerian dictator Sani Abacha.}
-> \textbf{EOF}
-$ \textbf{hg add letter.txt}
-$ \textbf{hg commit -m '419 scam, first draft'}
+<screen><prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
+<prompt>></prompt> <userinput>Greetings!</userinput>
+<prompt>></prompt> <userinput>I am Mariam Abacha, the wife of former</userinput>
+<prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
+<prompt>></prompt> <userinput>EOF</userinput>
+<prompt>$</prompt> <userinput>hg add letter.txt</userinput>
+<prompt>$</prompt> <userinput>hg commit -m '419 scam, first draft'</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.clone-pull.out
--- a/en/examples/results/tour.clone-pull.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.clone-pull.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone hello hello-pull}
+<screen><prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>hg clone hello hello-pull</userinput>
 updating working directory
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.clone-push.out
--- a/en/examples/results/tour.clone-push.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.clone-push.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone hello hello-push}
+<screen><prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>hg clone hello hello-push</userinput>
 updating working directory
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.clone.out
--- a/en/examples/results/tour.clone.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.clone.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,4 @@
-$ \textbf{hg clone http://hg.serpentine.com/tutorial/hello}
+<screen><prompt>$</prompt> <userinput>hg clone http://hg.serpentine.com/tutorial/hello</userinput>
 destination directory: hello
 requesting all changes
 adding changesets
@@ -7,3 +7,4 @@
 added 5 changesets with 5 changes to 2 files
 updating working directory
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.commit.out
--- a/en/examples/results/tour.commit.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.commit.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,1 +1,2 @@
-$ \textbf{hg commit}
+<screen><prompt>$</prompt> <userinput>hg commit</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.diff.out
--- a/en/examples/results/tour.diff.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.diff.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,11 +1,12 @@
-$ \textbf{hg diff}
+<screen><prompt>$</prompt> <userinput>hg diff</userinput>
 diff -r  hello.c
 
 
 @@ -8,5 +8,6 @@
  int main(int argc, char **argv)
- \{
- 	printf("hello, world!\textbackslash{}");
-+	printf("hello again!\textbackslash{}n");
+ {
+ 	printf("hello, world!\");
++	printf("hello again!\n");
  	return 0;
- \}
+ }
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.help.out
--- a/en/examples/results/tour.help.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.help.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,4 @@
-$ \textbf{hg help init}
+<screen><prompt>$</prompt> <userinput>hg help init</userinput>
 hg init [-e CMD] [--remotecmd CMD] [DEST]
 
 create a new repository in the given directory
@@ -17,3 +17,4 @@
     --remotecmd  specify hg command to run on the remote side
 
 use "hg -v help init" to show global options
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.incoming.out
--- a/en/examples/results/tour.incoming.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.incoming.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,10 +1,11 @@
-$ \textbf{cd hello-pull}
-$ \textbf{hg incoming ../my-hello}
+<screen><prompt>$</prompt> <userinput>cd hello-pull</userinput>
+<prompt>$</prompt> <userinput>hg incoming ../my-hello</userinput>
 comparing with ../my-hello
 searching for changes
 changeset:   
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Added an extra line of output
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.log-r.out
--- a/en/examples/results/tour.log-r.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.log-r.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,16 +1,16 @@
-$ \textbf{hg log -r 3}
+<screen><prompt>$</prompt> <userinput>hg log -r 3</userinput>
 changeset:   
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Get make to generate the final binary from a .o file.
 
-$ \textbf{hg log -r }
+<prompt>$</prompt> <userinput>hg log -r </userinput>
 changeset:   
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Get make to generate the final binary from a .o file.
 
-$ \textbf{hg log -r 1 -r 4}
+<prompt>$</prompt> <userinput>hg log -r 1 -r 4</userinput>
 changeset:   
 user:        mpm@selenic.com
 
@@ -18,7 +18,8 @@
 
 changeset:   
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Trim comments.
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.log-v.out
--- a/en/examples/results/tour.log-v.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.log-v.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,9 +1,10 @@
-$ \textbf{hg log -v -r 3}
+<screen><prompt>$</prompt> <userinput>hg log -v -r 3</userinput>
 changeset:   
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 files:       Makefile
 description:
 Get make to generate the final binary from a .o file.
 
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.log-vp.out
--- a/en/examples/results/tour.log-vp.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.log-vp.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,6 +1,6 @@
-$ \textbf{hg log -v -p -r 2}
+<screen><prompt>$</prompt> <userinput>hg log -v -p -r 2</userinput>
 changeset:   
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 files:       hello.c
 description:
@@ -13,9 +13,10 @@
 @@ -11,6 +11,6 @@
  
  int main(int argc, char **argv)
- \{
--	printf("hello, world!\textbackslash{}n");
-+	printf("hello, world!\textbackslash{}");
+ {
+-	printf("hello, world!\n");
++	printf("hello, world!\");
  	return 0;
- \}
+ }
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.log.out
--- a/en/examples/results/tour.log.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.log.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,17 +1,17 @@
-$ \textbf{hg log}
+<screen><prompt>$</prompt> <userinput>hg log</userinput>
 changeset:   
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Trim comments.
 
 changeset:   
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Get make to generate the final binary from a .o file.
 
 changeset:   
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Introduce a typo into hello.c.
 
@@ -25,3 +25,4 @@
 
 summary:     Create a standard "hello, world" program
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.log.range.out
--- a/en/examples/results/tour.log.range.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.log.range.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,17 +1,18 @@
-$ \textbf{hg log -r 2:4}
+<screen><prompt>$</prompt> <userinput>hg log -r 2:4</userinput>
 changeset:   
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Introduce a typo into hello.c.
 
 changeset:   
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Get make to generate the final binary from a .o file.
 
 changeset:   
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Trim comments.
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.ls-a.out
--- a/en/examples/results/tour.ls-a.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.ls-a.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,3 +1,4 @@
-$ \textbf{cd hello}
-$ \textbf{ls -a}
+<screen><prompt>$</prompt> <userinput>cd hello</userinput>
+<prompt>$</prompt> <userinput>ls -a</userinput>
 .  ..  .hg  Makefile  hello.c
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.ls.out
--- a/en/examples/results/tour.ls.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.ls.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,5 +1,6 @@
-$ \textbf{ls -l}
+<screen><prompt>$</prompt> <userinput>ls -l</userinput>
 
 
-$ \textbf{ls hello}
+<prompt>$</prompt> <userinput>ls hello</userinput>
 Makefile  hello.c
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.merge.cat.out
--- a/en/examples/results/tour.merge.cat.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.merge.cat.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,28 +1,29 @@
-$ \textbf{cat hello.c}
+<screen><prompt>$</prompt> <userinput>cat hello.c</userinput>
 /*
  * Placed in the public domain by Bryan O'Sullivan.  This program is
  * not covered by patents in the United States or other countries.
  */
 
-#include <stdio.h>
+#include &lt;stdio.h&gt;
 
 int main(int argc, char **argv)
-\{
-	printf("once more, hello.\textbackslash{}n");
-	printf("hello, world!\textbackslash{}");
+{
+	printf("once more, hello.\n");
+	printf("hello, world!\");
 	return 0;
-\}
-$ \textbf{cat ../my-hello/hello.c}
+}
+<prompt>$</prompt> <userinput>cat ../my-hello/hello.c</userinput>
 /*
  * Placed in the public domain by Bryan O'Sullivan.  This program is
  * not covered by patents in the United States or other countries.
  */
 
-#include <stdio.h>
+#include &lt;stdio.h&gt;
 
 int main(int argc, char **argv)
-\{
-	printf("hello, world!\textbackslash{}");
-	printf("hello again!\textbackslash{}n");
+{
+	printf("hello, world!\");
+	printf("hello again!\n");
 	return 0;
-\}
+}
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.merge.clone.out
--- a/en/examples/results/tour.merge.clone.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.merge.clone.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,7 +1,8 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone hello my-new-hello}
+<screen><prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>hg clone hello my-new-hello</userinput>
 updating working directory
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd my-new-hello}
-$ \textbf{sed -i '/printf/i\textbackslash{}\textbackslash{}tprintf("once more, hello.\textbackslash{}\textbackslash{}n");' hello.c}
-$ \textbf{hg commit -m 'A new hello for a new day.'}
+<prompt>$</prompt> <userinput>cd my-new-hello</userinput>
+<prompt>$</prompt> <userinput>sed -i '/printf/i\\tprintf("once more, hello.\\n");' hello.c</userinput>
+<prompt>$</prompt> <userinput>hg commit -m 'A new hello for a new day.'</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.merge.commit.out
--- a/en/examples/results/tour.merge.commit.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.merge.commit.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,1 +1,2 @@
-$ \textbf{hg commit -m 'Merged changes'}
+<screen><prompt>$</prompt> <userinput>hg commit -m 'Merged changes'</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.merge.heads.out
--- a/en/examples/results/tour.merge.heads.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.merge.heads.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,13 +1,14 @@
-$ \textbf{hg heads}
+<screen><prompt>$</prompt> <userinput>hg heads</userinput>
 changeset:   
 tag:         tip
 parent:      
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Added an extra line of output
 
 changeset:   
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     A new hello for a new day.
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.merge.merge.out
--- a/en/examples/results/tour.merge.merge.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.merge.merge.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{hg merge}
+<screen><prompt>$</prompt> <userinput>hg merge</userinput>
 merging hello.c
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.merge.parents.out
--- a/en/examples/results/tour.merge.parents.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.merge.parents.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,28 +1,29 @@
-$ \textbf{hg parents}
+<screen><prompt>$</prompt> <userinput>hg parents</userinput>
 changeset:   
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     A new hello for a new day.
 
 changeset:   
 tag:         tip
 parent:      
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Added an extra line of output
 
-$ \textbf{cat hello.c}
+<prompt>$</prompt> <userinput>cat hello.c</userinput>
 /*
  * Placed in the public domain by Bryan O'Sullivan.  This program is
  * not covered by patents in the United States or other countries.
  */
 
-#include <stdio.h>
+#include &lt;stdio.h&gt;
 
 int main(int argc, char **argv)
-\{
-	printf("once more, hello.\textbackslash{}n");
-	printf("hello, world!\textbackslash{}");
-	printf("hello again!\textbackslash{}n");
+{
+	printf("once more, hello.\n");
+	printf("hello, world!\");
+	printf("hello again!\n");
 	return 0;
-\}
+}
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.merge.pull.out
--- a/en/examples/results/tour.merge.pull.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.merge.pull.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,4 @@
-$ \textbf{hg pull ../my-hello}
+<screen><prompt>$</prompt> <userinput>hg pull ../my-hello</userinput>
 pulling from ../my-hello
 searching for changes
 adding changesets
@@ -6,3 +6,4 @@
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.merge.tip.out
--- a/en/examples/results/tour.merge.tip.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.merge.tip.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,9 +1,10 @@
-$ \textbf{hg tip}
+<screen><prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 tag:         tip
 parent:      
 parent:      
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Merged changes
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.merge.update.out
--- a/en/examples/results/tour.merge.update.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.merge.update.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,2 +1,3 @@
-$ \textbf{hg update}
+<screen><prompt>$</prompt> <userinput>hg update</userinput>
 abort: crosses branches (use 'hg merge' or 'hg update -C')
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.older.out
--- a/en/examples/results/tour.older.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.older.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,10 +1,11 @@
-$ \textbf{hg update 2}
+<screen><prompt>$</prompt> <userinput>hg update 2</userinput>
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{hg parents}
+<prompt>$</prompt> <userinput>hg parents</userinput>
 changeset:   
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Introduce a typo into hello.c.
 
-$ \textbf{hg update}
+<prompt>$</prompt> <userinput>hg update</userinput>
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.outgoing.net.out
--- a/en/examples/results/tour.outgoing.net.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.outgoing.net.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,9 +1,10 @@
-$ \textbf{hg outgoing http://hg.serpentine.com/tutorial/hello}
+<screen><prompt>$</prompt> <userinput>hg outgoing http://hg.serpentine.com/tutorial/hello</userinput>
 comparing with http://hg.serpentine.com/tutorial/hello
 searching for changes
 changeset:   
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Added an extra line of output
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.outgoing.out
--- a/en/examples/results/tour.outgoing.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.outgoing.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,10 +1,11 @@
-$ \textbf{cd my-hello}
-$ \textbf{hg outgoing ../hello-push}
+<screen><prompt>$</prompt> <userinput>cd my-hello</userinput>
+<prompt>$</prompt> <userinput>hg outgoing ../hello-push</userinput>
 comparing with ../hello-push
 searching for changes
 changeset:   
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Added an extra line of output
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.parents.out
--- a/en/examples/results/tour.parents.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.parents.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,7 +1,8 @@
-$ \textbf{hg parents}
+<screen><prompt>$</prompt> <userinput>hg parents</userinput>
 changeset:   
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Added an extra line of output
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.pull.out
--- a/en/examples/results/tour.pull.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.pull.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,11 +1,11 @@
-$ \textbf{hg tip}
+<screen><prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Trim comments.
 
-$ \textbf{hg pull ../my-hello}
+<prompt>$</prompt> <userinput>hg pull ../my-hello</userinput>
 pulling from ../my-hello
 searching for changes
 adding changesets
@@ -13,10 +13,11 @@
 adding file changes
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
-$ \textbf{hg tip}
+<prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Added an extra line of output
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.push.net.out
--- a/en/examples/results/tour.push.net.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.push.net.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{hg push http://hg.serpentine.com/tutorial/hello}
+<screen><prompt>$</prompt> <userinput>hg push http://hg.serpentine.com/tutorial/hello</userinput>
 pushing to http://hg.serpentine.com/tutorial/hello
 searching for changes
 ssl required
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.push.nothing.out
--- a/en/examples/results/tour.push.nothing.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.push.nothing.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{hg push ../hello-push}
+<screen><prompt>$</prompt> <userinput>hg push ../hello-push</userinput>
 pushing to ../hello-push
 searching for changes
 no changes found
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.push.out
--- a/en/examples/results/tour.push.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.push.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,7 +1,8 @@
-$ \textbf{hg push ../hello-push}
+<screen><prompt>$</prompt> <userinput>hg push ../hello-push</userinput>
 pushing to ../hello-push
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.reclone.out
--- a/en/examples/results/tour.reclone.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.reclone.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,5 +1,6 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone hello my-hello}
+<screen><prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>hg clone hello my-hello</userinput>
 updating working directory
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd my-hello}
+<prompt>$</prompt> <userinput>cd my-hello</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.sed.out
--- a/en/examples/results/tour.sed.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.sed.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,1 +1,2 @@
-$ \textbf{sed -i '/printf/a\textbackslash{}\textbackslash{}tprintf("hello again!\textbackslash{}\textbackslash{}n");' hello.c}
+<screen><prompt>$</prompt> <userinput>sed -i '/printf/a\\tprintf("hello again!\\n");' hello.c</userinput>
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.status.out
--- a/en/examples/results/tour.status.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.status.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,4 +1,5 @@
-$ \textbf{ls}
+<screen><prompt>$</prompt> <userinput>ls</userinput>
 Makefile  hello.c
-$ \textbf{hg status}
+<prompt>$</prompt> <userinput>hg status</userinput>
 M hello.c
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.tip.out
--- a/en/examples/results/tour.tip.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.tip.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,7 +1,7 @@
-$ \textbf{hg tip -vp}
+<screen><prompt>$</prompt> <userinput>hg tip -vp</userinput>
 changeset:   
 tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 files:       hello.c
 description:
@@ -13,9 +13,10 @@
 
 @@ -8,5 +8,6 @@
  int main(int argc, char **argv)
- \{
- 	printf("hello, world!\textbackslash{}");
-+	printf("hello again!\textbackslash{}n");
+ {
+ 	printf("hello, world!\");
++	printf("hello again!\n");
  	return 0;
- \}
+ }
 
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.update.out
--- a/en/examples/results/tour.update.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.update.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,7 +1,8 @@
-$ \textbf{grep printf hello.c}
-	printf("hello, world!\textbackslash{}");
-$ \textbf{hg update tip}
+<screen><prompt>$</prompt> <userinput>grep printf hello.c</userinput>
+	printf("hello, world!\");
+<prompt>$</prompt> <userinput>hg update tip</userinput>
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{grep printf hello.c}
-	printf("hello, world!\textbackslash{}");
-	printf("hello again!\textbackslash{}n");
+<prompt>$</prompt> <userinput>grep printf hello.c</userinput>
+	printf("hello, world!\");
+	printf("hello again!\n");
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/results/tour.version.out
--- a/en/examples/results/tour.version.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour.version.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,6 +1,7 @@
-$ \textbf{hg version}
+<screen><prompt>$</prompt> <userinput>hg version</userinput>
 Mercurial Distributed SCM (version )
 
-Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others
+Copyright (C) 2005-2008 Matt Mackall &lt;mpm@selenic.com&gt; and others
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+</screen>
diff -r 44d1363234d2 -r 0d5935744f87 en/examples/run-example
--- a/en/examples/run-example	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/run-example	Mon Mar 09 21:39:23 2009 -0700
@@ -18,23 +18,23 @@
 import tempfile
 import time
 
-tex_subs = {
-    '\\': '\\textbackslash{}',
-    '{': '\\{',
-    '}': '\\}',
+xml_subs = {
+    '<': '&lt;',
+    '>': '&gt;',
+    '&': '&amp;',
     }
 
 def gensubs(s):
     start = 0
     for i, c in enumerate(s):
-        sub = tex_subs.get(c)
+        sub = xml_subs.get(c)
         if sub:
             yield s[start:i]
             start = i + 1
             yield sub
     yield s[start:]
 
-def tex_escape(s):
+def xml_escape(s):
     return ''.join(gensubs(s))
         
 def maybe_unlink(name):
@@ -53,6 +53,10 @@
             return p
     return None
         
+def result_name(name):
+    dirname, basename = os.path.split(name)
+    return os.path.join(dirname, 'results', basename)
+
 class example:
     shell = '/usr/bin/env bash'
     ps1 = '__run_example_ps1__ '
@@ -231,12 +235,15 @@
                                 return 1
                             assert os.sep not in out
                             if ofp is not None:
+                                ofp.write('</screen>\n')
                                 ofp.close()
                                 err |= self.rename_output(ofp_basename, ignore)
                             if out:
                                 ofp_basename = '%s.%s' % (self.name, out)
                                 read_hint = ofp_basename + ' '
-                                ofp = open(ofp_basename + '.tmp', 'w')
+                                ofp = open(result_name(ofp_basename + '.tmp'),
+                                           'w')
+                                ofp.write('<screen>')
                             else:
                                 ofp = None
                         elif pi == 'ignore':
@@ -249,13 +256,13 @@
                         # first, print the command we ran
                         if not hunk.startswith('#'):
                             nl = hunk.endswith('\n')
-                            hunk = ('%s \\textbf{%s}' %
+                            hunk = ('<prompt>%s</prompt> <userinput>%s</userinput>' %
                                     (prompts[ps],
-                                     tex_escape(hunk.rstrip('\n'))))
+                                     xml_escape(hunk.rstrip('\n'))))
                             if nl: hunk += '\n'
                         ofp.write(hunk)
                         # then its output
-                        ofp.write(tex_escape(output))
+                        ofp.write(xml_escape(output))
                     ps = newps
                 self.status('\n')
             except:
@@ -268,6 +275,7 @@
                     ps, output = self.sendreceive('exit\n', read_hint)
                     if ofp is not None:
                         ofp.write(output)
+                        ofp.write('</screen>\n')
                         ofp.close()
                         err |= self.rename_output(ofp_basename, ignore)
                     os.close(self.cfd)
@@ -282,7 +290,7 @@
                     elif os.WIFSIGNALED(rc):
                         print >> sys.stderr, '(signal %s)' % os.WTERMSIG(rc)
                 else:
-                    open(self.name + '.run', 'w')
+                    open(result_name(self.name + '.run'), 'w')
                 return err
         finally:
             shutil.rmtree(tmpdir)
@@ -301,13 +309,13 @@
                     return True
             return False
 
-        oldname = base + '.out'
-        tmpname = base + '.tmp'
-        errname = base + '.err'
+        oldname = result_name(base + '.out')
+        tmpname = result_name(base + '.tmp')
+        errname = result_name(base + '.err')
         errfp = open(errname, 'w+')
         for line in open(tmpname):
             errfp.write(mangle_re.sub('', line))
-        os.rename(tmpname, base + '.lxo')
+        os.rename(tmpname, result_name(base + '.lxo'))
         errfp.seek(0)
         try:
             oldfp = open(oldname)
@@ -374,8 +382,7 @@
         names.sort()
         for name in names:
             if name == 'run-example' or name.startswith('.'): continue
-            if name.endswith('.out') or name.endswith('~'): continue
-            if name.endswith('.run'): continue
+            if name.endswith('~'): continue
             pathname = os.path.join(path, name)
             try:
                 st = os.lstat(pathname)