# HG changeset patch
# User David Soria Parra <dsp@php.net>
# Date 1321186491 -3600
# Node ID 85e290c9b474e2603bbdd126e4e0c9d2bce08f89
# Parent  7129a490d67ee18e5712f7c094f59352c83d549a# Parent  c9ca0d691c2696c2d2b965e8dfd643c3d7904c50
Merge with Arne

diff -r 7129a490d67e -r 85e290c9b474 .hgsubstate
diff -r 7129a490d67e -r 85e290c9b474 templates/frontpage.html
--- a/templates/frontpage.html	Sun Nov 13 13:14:32 2011 +0100
+++ b/templates/frontpage.html	Sun Nov 13 13:14:51 2011 +0100
@@ -21,7 +21,7 @@
         <!-- The three sections should now grow more compact as you go down, with power and speed the longest and just works only two simple, clean sentences. -->
             <li class="i-1">
                 It is <a href="/about/">fast and powerful</a>
-                <p>Mercurial offers you the power and speed to efficiently handle <a href="/who/">projects of any size and kind</a><!--Reference: http://mercurial.selenic.com/wiki/ProjectsUsingMercurial -->. Every clone contains the whole project history, so committing, branching, tagging and merging are local, fast and convenient. You can use a multitude of <a href="http://mercurial.selenic.com/wiki/Workflows">workflows</a> and easily enhance its functionality with <a href="http://mercurial.selenic.com/wiki/UsingExtensions">extensions</a>.</p>
+                <p>Mercurial efficiently handles <a href="/who/">projects of any size and kind</a><!--Reference: http://mercurial.selenic.com/wiki/ProjectsUsingMercurial -->. Every clone contains the whole project history, so most actions are local, fast and convenient. You can use it for a multitude of <a href="http://mercurial.selenic.com/wiki/WorkingPractices">workflows</a> and easily enhance its functionality with <a href="http://mercurial.selenic.com/wiki/UsingExtensions">extensions</a>.</p>
             </li>
             <li class="i-2">
                 It is <a href="/learn/">easy to learn</a><!-- point to a site which begins with a random "easy to learn" testimonial and then shows ways to learn Mercurial, from quick start to indepth -->