# HG changeset patch
# User David Soria Parra <dsp@php.net>
# Date 1234916454 -3600
# Node ID a06b0f4d5c7e6e7cf70102c5acac41a07ca63559
# Parent  16016cc18dedec89c360e434e4bcc11c96111ae2# Parent  37a0375fbddc30de73d0aa3702b1d6e563adb5ba
Merge backout

diff -r 16016cc18ded -r a06b0f4d5c7e hgscm/apps/www/urls.py
--- a/hgscm/apps/www/urls.py	Wed Feb 18 01:19:32 2009 +0100
+++ b/hgscm/apps/www/urls.py	Wed Feb 18 01:20:54 2009 +0100
@@ -2,4 +2,5 @@
 
 urlpatterns = patterns('hgscm.apps.www.views',
     url(r'^$', 'frontpage', name='frontpage'),
-)
\ No newline at end of file
+    url(r'^about$', 'about', name='about'),
+)
diff -r 16016cc18ded -r a06b0f4d5c7e hgscm/apps/www/views.py
--- a/hgscm/apps/www/views.py	Wed Feb 18 01:19:32 2009 +0100
+++ b/hgscm/apps/www/views.py	Wed Feb 18 01:20:54 2009 +0100
@@ -4,3 +4,6 @@
 def frontpage(request):
     return render_to_response("frontpage.html", { },
         RequestContext(request))
+def about(request):
+    return render_to_response("about.html", { },
+        RequestContext(request))
diff -r 16016cc18ded -r a06b0f4d5c7e hgscm/media/css/styles.css
--- a/hgscm/media/css/styles.css	Wed Feb 18 01:19:32 2009 +0100
+++ b/hgscm/media/css/styles.css	Wed Feb 18 01:20:54 2009 +0100
@@ -78,6 +78,7 @@
 .row { display: block; }
 .col { float: right; display: inline; width: 270px; margin: 25px; }
 .big { float: left; width: 470px; }
+.quote { float: right; width: 740px; text-align: right; margin-right: 25px;   }
 .big h2, .big h3 { margin-top: 20px; }
 
 /*
@@ -125,6 +126,8 @@
 #home ol li { list-style: none; background: url(../images/bullet-big-1.png) no-repeat 0 0; padding-left: 60px; min-height: 43px; _height: 43px; }
 #home ol .i-2 { background-image: url(../images/bullet-big-2.png); } 
 #home ol .i-3 { background-image: url(../images/bullet-big-3.png); }
+#home ol a { text-decoration: none; }
+#home ol a:hover { text-decoration: underline; }
 
 /*
  * Footer
@@ -132,4 +135,4 @@
 #footer { font-family: Verdana, Helvetica, Arial, sans-serif; font-size: .6428em; display: inline-block; overflow: hidden; text-align: right; padding: 10px 25px; }
 #footer { display: block; }
 #footer div { float: left; }
-#footer a { text-decoration: none; }
\ No newline at end of file
+#footer a { text-decoration: none; }
diff -r 16016cc18ded -r a06b0f4d5c7e hgscm/templates/about.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hgscm/templates/about.html	Wed Feb 18 01:20:54 2009 +0100
@@ -0,0 +1,47 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+<div class="row">
+	<div class="col big">
+		<h1>Mercurial source control management</h1>
+		<p><strong>Mercurial is a free, distributed source control management tool. It offers you the power to efficiently handle projects of any size while using an intuitive interface. It is easy to use and hard to break, making it ideal for anyone working with versioned files. 
+		</strong></p>
+
+		<h2>Distributed architecture</h2>
+
+		<p>Traditional version control systems such as Subversion are typical client-server architectures with a central server to store the revisions of a project. In contrast, Mercurial is truly distributed, giving each developer a local copy of the entire development history. This way it works independent of network access or a central server. Committing, branching and merging are fast and cheap.</p>
+
+		<h2>Fast</h2>
+
+		<p>Mercurials implementation and data structures are designed to be fast. You can generate diffs between revisions, or jump back in time within seconds. Therefore Mercurial is perfectly suiteable for large projects such as OpenJDK or NetBeans.</p>
+
+		<h2>Platform independent</h2>
+
+		<p>Mercurial was written with platform independence in mind. Therefore most of Mercurial is written in Python, with a small part in portable C for performance reasons. As a result, binary releases are available on all major platforms.</p>
+
+		<h2>Extensible</h2>
+
+		<p>The functionality of Mercurial can be increased with extensions, either by activating the official ones which are shipped with Mercurial or downloading some (<a href="http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions">from the wiki</a> or by <a href="http://www.selenic.com/mercurial/wiki/index.cgi/WritingExtensions">writing your own</a>). Extensions are written in Python and can change the workings of the basic commands, add new commands and access all the core functions of Mercurial.</p>
+
+		<h2>Open Source</h2>
+
+		<p>Mercurial is free software licensed under the terms of the <a href="http://www.gnu.org/licenses/gpl-2.0.txt">GNU General Public License Version 2</a>.</p>
+
+		<h3>Similar projects</h3>
+
+		<p>Mercurial is used for version control of files. Similar projects include <a href="http://www.git-scm.org">git</a>, <a href="http://bazaar-vcs.org">Bazaar</a>, <a href="http://subversion.tigris.org/">Subversion</a> and <a href="http://www.nongnu.org/cvs/">CVS</a>.
+		</div>
+		<div class="col">
+			<h2>Download Mercurial</h2>
+			<a class="download typeface-js" href="javascript:void(0);">
+			<strong>Download now</strong>
+			Mercurial <em>2.42</em>
+			<span>Windows XP | Vista | 7</span>
+			</a>
+		</div>
+	</div>
+
+</div>
+
+{% endblock %}
diff -r 16016cc18ded -r a06b0f4d5c7e hgscm/templates/base.html
--- a/hgscm/templates/base.html	Wed Feb 18 01:19:32 2009 +0100
+++ b/hgscm/templates/base.html	Wed Feb 18 01:20:54 2009 +0100
@@ -6,21 +6,21 @@
 		<link href="{{ MEDIA_URL }}css/styles.css" type="text/css" rel="stylesheet">
 		<script type="text/javascript" src="{{ MEDIA_URL }}javascript/typeface.js"></script>
 		<script type="text/javascript" src="{{ MEDIA_URL }}javascript/optimer_regular.typeface.js"></script>					
-		<title>Mercurial</title>
+		<title>Mercurial SCM</title>
 	</head>
 	<body id="home">
 				
 		<h1 id="logo"><a href="/">mercurial</a></h1>
 			
 		<ul id="nav" class="typeface-js">
-			<li><a href="javascript:void(0);">about</a></li>
+			<li><a href="{% url about %}">about</a></li>
 			<li><a href="javascript:void(0);">download</a></li>
 			<li><a href="javascript:void(0);">extensions</a></li>
 			<li><a href="javascript:void(0);">docs</a></li>
 			<li><a href="javascript:void(0);">community</a></li>
 		</ul>
 		
-		<form id="search" method="post" action="index.html">
+		<form id="search" method="post" action="search/">
 			<fieldset>
 				<legend>Search form</legend>
 				<label for="keyword">keyword</label>
diff -r 16016cc18ded -r a06b0f4d5c7e hgscm/templates/frontpage.html
--- a/hgscm/templates/frontpage.html	Wed Feb 18 01:19:32 2009 +0100
+++ b/hgscm/templates/frontpage.html	Wed Feb 18 01:20:54 2009 +0100
@@ -5,7 +5,7 @@
 <div class="row">
 	<div class="col big">
 		<h1>Work easier <br> Work faster</h1>
-		<h2>Benefit now from one of the easiest and fastest Source Control Management systems. Mercurial makes working with documents easier.</h2>
+		<h2>Mercurial is a free, distributed source control management tool. It efficiently handles projects of any size and offers an easy and intuitive interface.</h2>
 	</div>
 	<div class="col">					
 		<a class="download typeface-js" href="javascript:void(0);">
@@ -14,39 +14,61 @@
 			<span>Windows XP | Vista | 7</span>
 		</a>
 		<dl>
-			<dt class="typeface-js">Requiurements</dt>
-			<dd>Python 2.5 (<a href="http://www.python.org">get python</a>)</dd>
+			<dt class="typeface-js">Requirements</dt>
+			<dd>Python 2.4 (<a href="http://www.python.org">get python</a>)</dd>
+			<!--2.4 is necessary for TortoiseHG, Mercurial only needs 2.3-->
 			
 			<dt>Another OS?<br><em>Get mercurial for:</em></dt>
 			<dd><a href="javascript:void(0);">Mac OS X</a></dd>
-			<dd><a href="javascript:void(0);">Linux</a></dd>						
+			<dd><a href="javascript:void(0);">Linux</a></dd>
+			<dd><a href="javascript:void(0);">other</a></dd>
 		</dl>				
 	</div>
 </div>
 
 <div class="row">
 	<div class="col big">
-		<h3>How can you benefit from Mercurial?</h3>
+		<h3>How you can benefit from Mercurial</h3>
 		<ol>
 			<li class="i-1">
-				<h4><a href="javascript:void(0);">Download and install</a></h4>
-				<p>Donec ut pede ac lorem iaculis aliquam. Curabitur feugiat, libero scelerisque laoreet malesuada, purus lorem fermentum quam, eget rhoncus quam sapien ac nulla. Praesent id turpis.</p>
+				<h4>It is <a href="{% url about %}">fast and powerful</a></h4>
+				<p>Mercurial offers you the power and speed to efficiently handle <a href="./who_uses_mercurial">projects of any size and kind</a>. You can use a multitude of <a href="./workflows">workflows</a> and easily enhance its functionality with <a href="./extensions">extensions</a>.</p>
 			</li>
 			<li class="i-2">
-				<h4><a href="javascript:void(0);">Follow our simple Guide to learn how you can Revision your documents with Mercurial</a></h4>
-				<p>Suspendisse pulvinar dolor nec massa. Mauris sit amet orci porta velit congue fringilla. Pellentesque ipsum libero, scelerisque luctus</p>
+				<h4>It is <a href="./learn_mercurial">easy to learn</a></h4>
+				<p>You can follow our simple <a href="guide">guide</a> to learn how to revision your documents with Mercurial, or just use the <a href="./quick_start">quick start</a> to get going instantly. </p>
 			</li>
 			<li class="i-3">
-				<h4><a href="javascript:void(0);">Get involved.</a></h4>
-				<p>Create extensions, translate the documentation, test beta versions.</p>
+				<h4>And it <a href="./testimonies">just works</a></h4>
+				<p>Mercurial strives to deliver on each of its promises. Most tasks simply work on the first try and without requiring arcane knowledge. <!--(If one doesn't, that's most likely no feature but a <a href="http://selenic.com/mercurial/bugs/">bug</a>. Please <a href="http://selenic.com/mercurial/bugs/">tell us about it</a>!) 
+				commented out because it feels awkward.--></p>
 			</li>
 		</ol>
 	</div>
 	<div class="col">
-		<h3>Take a look at Mercurial</h3>
-		<!-- Flash Player should probably come here-->
-		<img src="{{ MEDIA_URL }}images/tour.jpg" alt="">
+		<h3>Quick Start</h3>
+
+		<p><em>Clone a project and create a patch</em>
+<pre>$ hg clone http://hg-scm.org/hello
+$ cd hello
+$ (edit files)
+$ hg add (new files)
+$ hg commit -m 'My changes'
+$ hg export &gt; patch.diff
+
+</pre>
+</p>
+
+<p><em>Create a project and commit</em>
+<pre>$ cd (project-directory)
+$ hg init
+$ (add some files)
+$ hg add
+$ hg commit -m 'Initial commit'
+</pre>
+</p>
+	<!--Change into project dir before initiating repo to avoid a possible stumbling point.-->
 	</div>
 </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff -r 16016cc18ded -r a06b0f4d5c7e src/en/index.html
--- a/src/en/index.html	Wed Feb 18 01:19:32 2009 +0100
+++ b/src/en/index.html	Wed Feb 18 01:20:54 2009 +0100
@@ -34,7 +34,7 @@
 			<div class="row">
 				<div class="col big">
 					<h1>Work easier <br> Work faster</h1>
-					<h2>Mercurial is a free, distributed source control management tool. It offers you the power to efficiently handle projects of any size while using an easy and intuitive interface.</h2>
+					<h2>Mercurial is a free, distributed source control management tool. It efficiently handles projects of any size while offering an easy and intuitive interface.</h2>
 				</div>
 				<div class="col">
 					<a class="download typeface-js" href="javascript:void(0);">
@@ -97,31 +97,12 @@
 $ hg commit -m 'Initial commit'
 
 </pre>
-<!--Change into project dir before initiating repo to avoid a possible stumbling point.-->
+<!--Change into project dir before initiating repo to avoid a possible stumbling point. I'm not quite sure if this is the most elegant way for showing that, though. You're welcome to try and find a more elegant yet correct one!-->
                     </div>
 					
 				</div>
                                 <div class="quote">
-                                        <em>Random testimony: "I understood how to install Mercurial and how to use it in a few minutes." -Giorgos Keramidas</em>
-                                        <!-- other nice quotes: 
-                                        ## From the strengths of Mercurial discussion: 
-                                        Just works the way I expect - Paul Moore
-                                        It took me one evening to get comfortable with it.  About a month to better understand its distributed nature. - Isaac Jurado 
-                                        Mercurial strikes a marvelous balance between these two ends.  It can be configured to support either simple environments or very complicated streams of changes interacting in custom ways, and it does all that without becoming a humongous monster of complexity. - Giorgos Keramidas
-                                        The dev's of Hg are generally friendly and approachable. - Gerard Korsten
-                                        The code base for Hg is pretty small and yet its pretty feature complete. - Gerard Korsten
-                                        Simplicity, being distributed, extensibility, speed, familiarity, bash completion, understandable and reasonably small code base - Peter Arrenbrecht
-                                        The team on the project gradually grew from just me to a few people here and abroad. This was a totally seamless experience - Peter Arrenbrecht
-                                        Easy to understand at a practical level. - Michael Estrand
-                                        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
-                                        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
-                                        It simply works [...]. - Hans Meine
-                                        -->
+                                        <em id="quote">Random testimony: "I understood how to install Mercurial and how to use it in a few minutes." -Giorgos Keramidas</em>
                                 </div>
 			</div>
 		</div>
diff -r 16016cc18ded -r a06b0f4d5c7e src/en/quotes.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/en/quotes.txt	Wed Feb 18 01:20:54 2009 +0100
@@ -0,0 +1,18 @@
+## From the strengths of Mercurial discussion: 
+"I understood how to install Mercurial and how to use it in a few minutes." -Giorgos Keramidas
+Just works the way I expect - Paul Moore
+It took me one evening to get comfortable with it.  About a month to better understand its distributed nature. - Isaac Jurado 
+[Mercurial] can be configured to support either simple environments or very complicated streams of changes interacting in custom ways, and it does all that without becoming a humongous monster of complexity. - Giorgos Keramidas
+The dev's of Hg are generally friendly and approachable. - Gerard Korsten
+The code base for Hg is pretty small and yet its pretty feature complete. - Gerard Korsten
+Simplicity, being distributed, extensibility, speed, familiarity, bash completion, understandable and reasonably small code base - Peter Arrenbrecht
+The team on the project gradually grew from just me to a few people here and abroad. This was a totally seamless experience - Peter Arrenbrecht
+Easy to understand at a practical level. - Michael Estrand
+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
+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
+It simply works [...]. - Hans Meine
\ No newline at end of file
diff -r 16016cc18ded -r a06b0f4d5c7e src/en/styles/styles.css
--- a/src/en/styles/styles.css	Wed Feb 18 01:19:32 2009 +0100
+++ b/src/en/styles/styles.css	Wed Feb 18 01:20:54 2009 +0100
@@ -127,7 +127,7 @@
 #home ol .i-2 { background-image: url(../images/bullet-big-2.png); } 
 #home ol .i-3 { background-image: url(../images/bullet-big-3.png); }
 #home ol a { text-decoration: none; }
-#home ol a:hover, #home h4 a:focus { text-decoration: underline; }
+#home ol a:hover { text-decoration: underline; }
 /*
  * Footer
  */