# HG changeset patch
# User Arne Babenhauserheide <bab@draketo.de>
# Date 1243978671 -7200
# Node ID 3531c412ab40be5d3aac08a27cbc3363b178cfdf
# Parent  c3b7cf9896aaca4d044c87911b6d507f36fddf5c# Parent  307dd774a9b6619ad0e7f7659a111b37ab20111a
merge

diff -r 307dd774a9b6 -r 3531c412ab40 hgscm/templates/Who-uses-Mercurial.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hgscm/templates/Who-uses-Mercurial.html	Tue Jun 02 23:37:51 2009 +0200
@@ -0,0 +1,27 @@
+<p><em>Mercurial is being used by all kinds of companies and projects. On this page we only list 8 picks. For a longer list, please visit <a href="http://www.selenic.com/mercurial/wiki/ProjectsUsingMercurial">the dedicated wiki-page</a>.</em></p>
+
+<h3>Companies</h3>
+
+<ul>
+<li><a href="http://google.com">Google</a> for internal use and their <a href="http://code.google.org">free project hosting</a>.<br />
+  <em>Mercurial offers an excellent "sweet spot" in terms of flexibility, simplicity, and speed.</em> - Alex Martelli, Google Tech Lead.</li>
+<li>Mozilla for <a href="https://developer.mozilla.org/en/Mozilla_Source_Code_(Mercurial)">all kinds of projects</a>, including <a href="http://hg.mozilla.org/mozilla-central/">Firefox from 3.x onward</a>.</li>
+<li>Sun for projects including <a href="">OpenJDK</a> and <a href="">Open Solaris</a>.</li>
+<li> <a href="http://bitbucket.org">Bitbucket</a> to provide free project hosting.</li>
+</ul>
+
+<h3>Community Projects</h3>
+
+<ul>
+<li><a href="http://python.org">Python</a> for future development. <br />
+  <em>It's hard to explain my reasons for choosing -- like most language decisions (especially the difficult ones) it's mostly a matter of gut feelings</em> - <a href="http://mail.python.org/pipermail/python-dev/2009-March/087931.html">Guido van Rossum</a>, Python BDFL</li>
+<li>Xen for developing their <a href="">Paravirtualization System</a>.</li>
+<li>MoinMoin for developing their <a href="">wiki engine</a>.</li>
+<li>Adium, for writing their <a href="">MacOSX Chat client</a>.</li>
+</ul>
+
+<!--Missing: high profile windows software? -->
+
+<!-- Wish: A quote for every project! -->
+
+<!--Alternates: XEmacs (many experienced devs), SciPy (to better reach scientists), wmii/dwm (for WM nerds :), -->
\ No newline at end of file
diff -r 307dd774a9b6 -r 3531c412ab40 hgscm/templates/quotes.txt
--- a/hgscm/templates/quotes.txt	Mon May 25 21:00:58 2009 +0200
+++ b/hgscm/templates/quotes.txt	Tue Jun 02 23:37:51 2009 +0200
@@ -10,7 +10,7 @@
 The included web server [...] replaces a lot of functionality of GUI tools in a truly multiplatform way. - Daniel Serpell
 There isn't much to learn to be effective. - Doug Philips
 It took my less than an hour to understand it. - Thomas Burdick
-It has a tortoise so I can actually show my boss its highly productive even in windows. - Thomas Burdick
+It has a tortoise so I can actually show my boss it's highly productive even in windows. - Thomas Burdick
 The commands usually do what I assume them to do. - Bastian Doetsch
 Mercurial's conceptual model is clean and simple enough to carry around in my head. - hgbook
 It's so easy to start a project; hg init, and you're good to go. - Paul Fisher
diff -r 307dd774a9b6 -r 3531c412ab40 hgscm/templates/workflow_guide.html
--- a/hgscm/templates/workflow_guide.html	Mon May 25 21:00:58 2009 +0200
+++ b/hgscm/templates/workflow_guide.html	Tue Jun 02 23:37:51 2009 +0200
@@ -16,6 +16,8 @@
 <p>Note: This guide doesn't require any prior knowledge of version control systems (though subversion users will likely feel at home quite quickly). Basic commandline abilities are helpful, because we'll use the commandline client. <!--If you already know other systems, please check our transition guides: svn, cvs, git, bzr --></p>
 <h1 id="basic_workflow">Basic workflows</h1>
 
+<p><em>We go from simple to more complex workflows. Those further down build on previous workflows.</em></p>
+
 <h2 id="log_keeping">Log keeping</h2>
 
 <h3>Use Case</h3>
diff -r 307dd774a9b6 -r 3531c412ab40 text/Who-uses-Mercurial.txt
--- a/text/Who-uses-Mercurial.txt	Mon May 25 21:00:58 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-*Mercurial is being used by all kinds of companies and projects. On this page we only list 8 picks. For a longer list, please visit [the dedicated wiki-page](http://www.selenic.com/mercurial/wiki/ProjectsUsingMercurial).* 
-
-=== Companies ===
-
-* [Google](http://google.com) for internal use and as option for their [free project hosting](http://code.google.org)
-  *Mercurial offers an excellent "sweet spot" in terms of flexibility, simplicity, and speed.* - Alex Martelli, Google Tech Lead.
-* Mozilla for [all kinds of projects](https://developer.mozilla.org/en/Mozilla_Source_Code_(Mercurial)), including [Firefox from 3.x onward](http://hg.mozilla.org/mozilla-central/). 
-  *QUOTE FROM MOZILLA* - Person
-* Sun for projects including [OpenJDK]() and [Open Solaris](). 
-  *QUOTE FROM SUN* - Person
-* [Bitbucket](http://bitbucket.org) to provide free project hosting.
-  *QUOTE FROM BITBUCKET* - Person
-
-=== Independent Projects ===
-
-* Python for future development. 
-  *It's hard to explain my reasons for choosing -- like most language decisions (especially the difficult ones) it's mostly a matter of gut feelings* - [Guido van Rossum](http://mail.python.org/pipermail/python-dev/2009-March/087931.html)
-* Xen for developing their [Paravirtualization System]()
-  *QUOTE FROM XEN* - Person
-* MoinMoin for developing their [wiki engine](). 
-  *QUOTE FROM MOINMOIN* - Person
-* Adium, the [MacOSX Chat client](). 
-  *QUOTE FROM ADIUM* - Person
-
-For a longer list, please visit [the dedicated wiki-page](http://www.selenic.com/mercurial/wiki/ProjectsUsingMercurial).*
-
-<!--Missing: high profile windows software? -->
-
-<!--Alternates: XEmacs (many experienced devs), SciPy (to better reach scientists), wmii (for WM nerds :), -->
\ No newline at end of file