# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1233298016 28800
# Node ID 5ffee9123bbf01d9b86f1c2b4f2c0b95a8e71e79
# Parent  c4d24e64ec1f69f360f0cbbe098b1865bf5fa246
Fix most remaining examples

diff -r c4d24e64ec1f -r 5ffee9123bbf en/examples/backout.manual.log.out
--- a/en/examples/backout.manual.log.out	Thu Jan 29 22:30:48 2009 -0800
+++ b/en/examples/backout.manual.log.out	Thu Jan 29 22:46:56 2009 -0800
@@ -1,13 +1,13 @@
 $ \textbf{hg log --style compact}
-3[tip]:1      2009-01-30 06:29 +0000   bos
+3[tip]:1      2009-01-30 06:32 +0000   bos
   back out second change
 
-2      2009-01-30 06:29 +0000   bos
+2      2009-01-30 06:32 +0000   bos
   third change
 
-1      2009-01-30 06:29 +0000   bos
+1      2009-01-30 06:32 +0000   bos
   second change
 
-0      2009-01-30 06:29 +0000   bos
+0      2009-01-30 06:32 +0000   bos
   first change
 
diff -r c4d24e64ec1f -r 5ffee9123bbf en/examples/backout.simple.log.out
--- a/en/examples/backout.simple.log.out	Thu Jan 29 22:30:48 2009 -0800
+++ b/en/examples/backout.simple.log.out	Thu Jan 29 22:46:56 2009 -0800
@@ -1,10 +1,10 @@
 $ \textbf{hg log --style compact}
-2[tip]      2009-01-30 06:29 +0000   bos
+2[tip]      2009-01-30 06:32 +0000   bos
   back out second change
 
-1      2009-01-30 06:29 +0000   bos
+1      2009-01-30 06:32 +0000   bos
   second change
 
-0      2009-01-30 06:29 +0000   bos
+0      2009-01-30 06:32 +0000   bos
   first change
 
diff -r c4d24e64ec1f -r 5ffee9123bbf en/examples/daily.copy.merge.out
--- a/en/examples/daily.copy.merge.out	Thu Jan 29 22:30:48 2009 -0800
+++ b/en/examples/daily.copy.merge.out	Thu Jan 29 22:46:56 2009 -0800
@@ -7,7 +7,7 @@
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 $ \textbf{hg merge}
-merging file and new-file
+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}
diff -r c4d24e64ec1f -r 5ffee9123bbf en/examples/mq.guards.qselect.foo.out
--- a/en/examples/mq.guards.qselect.foo.out	Thu Jan 29 22:30:48 2009 -0800
+++ b/en/examples/mq.guards.qselect.foo.out	Thu Jan 29 22:46:56 2009 -0800
@@ -1,5 +1,5 @@
 $ \textbf{hg qpop -a}
-Patch queue now empty
+patch queue now empty
 $ \textbf{hg qselect}
 no active guards
 $ \textbf{hg qselect foo}
diff -r c4d24e64ec1f -r 5ffee9123bbf en/examples/mq.guards.qselect.foobar.out
--- a/en/examples/mq.guards.qselect.foobar.out	Thu Jan 29 22:30:48 2009 -0800
+++ b/en/examples/mq.guards.qselect.foobar.out	Thu Jan 29 22:46:56 2009 -0800
@@ -5,4 +5,4 @@
 $ \textbf{hg qpush -a}
 applying hello.patch
 applying goodbye.patch
-Now at: goodbye.patch
+now at: goodbye.patch
diff -r c4d24e64ec1f -r 5ffee9123bbf en/examples/mq.guards.qselect.qpush.out
--- a/en/examples/mq.guards.qselect.qpush.out	Thu Jan 29 22:30:48 2009 -0800
+++ b/en/examples/mq.guards.qselect.qpush.out	Thu Jan 29 22:46:56 2009 -0800
@@ -1,4 +1,4 @@
 $ \textbf{hg qpush -a}
 applying hello.patch
 applying goodbye.patch
-Now at: goodbye.patch
+now at: goodbye.patch
diff -r c4d24e64ec1f -r 5ffee9123bbf en/examples/mq.guards.qselect.quux.out
--- a/en/examples/mq.guards.qselect.quux.out	Thu Jan 29 22:30:48 2009 -0800
+++ b/en/examples/mq.guards.qselect.quux.out	Thu Jan 29 22:46:56 2009 -0800
@@ -1,6 +1,6 @@
 $ \textbf{hg qselect quux}
 number of guarded, applied patches has changed from 0 to 2
 $ \textbf{hg qpop -a}
-Patch queue now empty
+patch queue now empty
 $ \textbf{hg qpush -a}
 patch series already fully applied
diff -r c4d24e64ec1f -r 5ffee9123bbf en/examples/mq.tarball.newsource.out
--- a/en/examples/mq.tarball.newsource.out	Thu Jan 29 22:30:48 2009 -0800
+++ b/en/examples/mq.tarball.newsource.out	Thu Jan 29 22:46:56 2009 -0800
@@ -1,5 +1,5 @@
 $ \textbf{hg qpop -a}
-Patch queue now empty
+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}
diff -r c4d24e64ec1f -r 5ffee9123bbf en/examples/mq.tarball.repush.out
--- a/en/examples/mq.tarball.repush.out	Thu Jan 29 22:30:48 2009 -0800
+++ b/en/examples/mq.tarball.repush.out	Thu Jan 29 22:46:56 2009 -0800
@@ -10,4 +10,4 @@
 $ \textbf{hg qpush -a}
 (working directory not at tip)
 applying build-fix.patch
-Now at: build-fix.patch
+now at: build-fix.patch
diff -r c4d24e64ec1f -r 5ffee9123bbf en/examples/mq.tutorial.qnew2.out
--- a/en/examples/mq.tutorial.qnew2.out	Thu Jan 29 22:30:48 2009 -0800
+++ b/en/examples/mq.tutorial.qnew2.out	Thu Jan 29 22:46:56 2009 -0800
@@ -1,15 +1,15 @@
 $ \textbf{hg qnew second.patch}
 $ \textbf{hg log --style=compact --limit=2}
-2[qtip,second.patch,tip]   
+2[qtip,second.patch,tip]      2009-01-30 06:34 +0000   bos
   [mq]: second.patch
 
-1[first.patch,qbase]   
+1[first.patch,qbase]      2009-01-30 06:34 +0000   bos
   [mq]: first.patch
 
 $ \textbf{echo 'line 4' >> file1}
 $ \textbf{hg qrefresh}
 $ \textbf{hg tip --style=compact --patch}
-2[qtip,second.patch,tip]   
+2[qtip,second.patch,tip]      2009-01-30 06:34 +0000   bos
   [mq]: second.patch
 
 diff -r  -r  file1
diff -r c4d24e64ec1f -r 5ffee9123bbf en/examples/mq.tutorial.qpop.out
--- a/en/examples/mq.tutorial.qpop.out	Thu Jan 29 22:30:48 2009 -0800
+++ b/en/examples/mq.tutorial.qpop.out	Thu Jan 29 22:46:56 2009 -0800
@@ -2,7 +2,7 @@
 first.patch
 second.patch
 $ \textbf{hg qpop}
-Now at: first.patch
+now at: first.patch
 $ \textbf{hg qseries}
 first.patch
 second.patch
diff -r c4d24e64ec1f -r 5ffee9123bbf en/examples/mq.tutorial.qpush-a.out
--- a/en/examples/mq.tutorial.qpush-a.out	Thu Jan 29 22:30:48 2009 -0800
+++ b/en/examples/mq.tutorial.qpush-a.out	Thu Jan 29 22:46:56 2009 -0800
@@ -1,6 +1,6 @@
 $ \textbf{hg qpush -a}
 applying second.patch
-Now at: second.patch
+now at: second.patch
 $ \textbf{cat file1}
 line 1
 line 2
diff -r c4d24e64ec1f -r 5ffee9123bbf en/examples/mq.tutorial.qrefresh.out
--- a/en/examples/mq.tutorial.qrefresh.out	Thu Jan 29 22:30:48 2009 -0800
+++ b/en/examples/mq.tutorial.qrefresh.out	Thu Jan 29 22:46:56 2009 -0800
@@ -9,7 +9,7 @@
 $ \textbf{hg qrefresh}
 $ \textbf{hg diff}
 $ \textbf{hg tip --style=compact --patch}
-1[qtip,first.patch,tip,qbase]   
+1[qtip,first.patch,tip,qbase]      2009-01-30 06:34 +0000   bos
   [mq]: first.patch
 
 diff -r  -r  file1
diff -r c4d24e64ec1f -r 5ffee9123bbf en/examples/mq.tutorial.qrefresh2.out
--- a/en/examples/mq.tutorial.qrefresh2.out	Thu Jan 29 22:30:48 2009 -0800
+++ b/en/examples/mq.tutorial.qrefresh2.out	Thu Jan 29 22:46:56 2009 -0800
@@ -3,7 +3,7 @@
 M file1
 $ \textbf{hg qrefresh}
 $ \textbf{hg tip --style=compact --patch}
-1[qtip,first.patch,tip,qbase]   
+1[qtip,first.patch,tip,qbase]      2009-01-30 06:34 +0000   bos
   [mq]: first.patch
 
 diff -r  -r  file1
diff -r c4d24e64ec1f -r 5ffee9123bbf en/examples/template.svnstyle
--- a/en/examples/template.svnstyle	Thu Jan 29 22:30:48 2009 -0800
+++ b/en/examples/template.svnstyle	Thu Jan 29 22:46:56 2009 -0800
@@ -34,6 +34,7 @@
 hg log -r0 --template '{node}'
 
 #$ name: simplest
+#$ ignore: \d+-\d+-\d+ \d+:\d+ \+.*
 
 cat svn.style
 hg log -r1 --style svn.style
diff -r c4d24e64ec1f -r 5ffee9123bbf en/examples/template.svnstyle.result.out
--- a/en/examples/template.svnstyle.result.out	Thu Jan 29 22:30:48 2009 -0800
+++ b/en/examples/template.svnstyle.result.out	Thu Jan 29 22:46:56 2009 -0800
@@ -1,7 +1,7 @@
 $ \textbf{hg log -r1 --style svn.style}
 ------------------------------------------------------------------------
 
-r1 | bos 
+r1 | bos | 2009-01-30 06:40 +0000 (Fri, 30 Jan 2009 06:40:17 +0000)
 
 added line to end of <<hello>> file.
 
diff -r c4d24e64ec1f -r 5ffee9123bbf en/examples/tour.help.out
--- a/en/examples/tour.help.out	Thu Jan 29 22:30:48 2009 -0800
+++ b/en/examples/tour.help.out	Thu Jan 29 22:46:56 2009 -0800
@@ -3,14 +3,13 @@
 
 create a new repository in the given directory
 
-    Initialize a new repository in the given directory.  If the given
+    Initialize a new repository in the given directory. If the given
     directory does not exist, it is created.
 
     If no directory is given, the current directory is used.
 
     It is possible to specify an ssh:// URL as the destination.
-    Look at the help text for the pull command for important details
-    about ssh:// URLs.
+    See 'hg help urls' for more information.
 
 options:
 
diff -r c4d24e64ec1f -r 5ffee9123bbf en/examples/tour.version.out
--- a/en/examples/tour.version.out	Thu Jan 29 22:30:48 2009 -0800
+++ b/en/examples/tour.version.out	Thu Jan 29 22:46:56 2009 -0800
@@ -1,5 +1,5 @@
 $ \textbf{hg version}
-Mercurial Distributed SCM (version 1.0)
+Mercurial Distributed SCM (version )
 
 Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others
 This is free software; see the source for copying conditions. There is NO