# HG changeset patch
# User David Soria Parra <dsp@php.net>
# Date 1257176344 -3600
# Node ID 7e304195d9f3ee63c4113feb574a58b7ff354d61
# Parent  a1f67c0087753be6d00a93d8146d90ab388b8374# Parent  b7d5f97e1034f06202feef2d6cd95da8750aadfd
Merge

diff -r a1f67c008775 -r 7e304195d9f3 original/hgscm/media/downloads.json
--- a/original/hgscm/media/downloads.json	Mon Nov 02 14:15:30 2009 +0100
+++ b/original/hgscm/media/downloads.json	Mon Nov 02 16:39:04 2009 +0100
@@ -48,7 +48,7 @@
         },{
             "system": "Source",
             "identifier": "source",
-            "url": "http://www.selenic.com/mercurial/release/mercurial-1.2.1.tar.gz"
+            "url": "http://mercurial.selenic.com/release/mercurial-1.2.1.tar.gz"
         }]
     }
 ]
diff -r a1f67c008775 -r 7e304195d9f3 original/hgscm/templates/Who-uses-Mercurial.html
--- a/original/hgscm/templates/Who-uses-Mercurial.html	Mon Nov 02 14:15:30 2009 +0100
+++ b/original/hgscm/templates/Who-uses-Mercurial.html	Mon Nov 02 16:39:04 2009 +0100
@@ -1,4 +1,4 @@
-<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>
+<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://mercurial.selenic.com/wiki/ProjectsUsingMercurial">the dedicated wiki-page</a>.</em></p>
 
 <h3>Companies</h3>
 
diff -r a1f67c008775 -r 7e304195d9f3 original/hgscm/templates/about.html
--- a/original/hgscm/templates/about.html	Mon Nov 02 14:15:30 2009 +0100
+++ b/original/hgscm/templates/about.html	Mon Nov 02 16:39:04 2009 +0100
@@ -23,7 +23,7 @@
 
 		<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>
+		<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://mercurial.selenic.com/wiki/UsingExtensions">from the wiki</a> or by <a href="http://mercurial.selenic.com/wiki/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>Easy to use</h2>
 
diff -r a1f67c008775 -r 7e304195d9f3 original/hgscm/templates/base.html
--- a/original/hgscm/templates/base.html	Mon Nov 02 14:15:30 2009 +0100
+++ b/original/hgscm/templates/base.html	Mon Nov 02 16:39:04 2009 +0100
@@ -17,8 +17,8 @@
 			<li><a href="{% url about %}">about</a></li>
 			<li><a href="{% url workflow_guide %}">guide</a></li>
 			<li><a href="{% url downloads %}">download</a></li>
-			<li><a href="http://www.selenic.com/mercurial/wiki/UsingExtensions">extensions</a></li>
-			<li><a href="http://www.selenic.com/mercurial">docs/news</a></li>
+			<li><a href="http://mercurial.selenic.com/wiki/UsingExtensions">extensions</a></li>
+			<li><a href="http://mercurial.selenic.com">docs/news</a></li>
 		</ul>
 		<!-- original Search form: 
 		<form id="search" method="post" action="search/">
diff -r a1f67c008775 -r 7e304195d9f3 original/hgscm/templates/frontpage.html
--- a/original/hgscm/templates/frontpage.html	Mon Nov 02 14:15:30 2009 +0100
+++ b/original/hgscm/templates/frontpage.html	Mon Nov 02 16:39:04 2009 +0100
@@ -20,7 +20,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">
 				<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="{% url who_uses %}">projects of any size and kind</a><!--Reference: http://www.selenic.com/mercurial/wiki/ProjectsUsingMercurial -->. Every clone contains the whole project history, so committing, branching, tagging and merging are local operations which makes them fast and convenient. You can use a multitude of <a href="http://www.selenic.com/mercurial/wiki/Workflows">workflows</a> and easily enhance its functionality with <a href="http://www.selenic.com/mercurial/wiki/UsingExtensions">extensions</a>.</p>
+				<p>Mercurial offers you the power and speed to efficiently handle <a href="{% url who_uses %}">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 operations which makes them 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>
 			</li>
 			<li class="i-2">
 				<h4>It is <a href="{% url learn_mercurial %}">easy to learn</a></h4> <!-- 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 -->
diff -r a1f67c008775 -r 7e304195d9f3 original/hgscm/templates/quick_start.html
--- a/original/hgscm/templates/quick_start.html	Mon Nov 02 14:15:30 2009 +0100
+++ b/original/hgscm/templates/quick_start.html	Mon Nov 02 16:39:04 2009 +0100
@@ -140,7 +140,7 @@
 </ul>
 </ol>
 
-<p>And if you want to quickly look up something, you can use one of the <a href="http://www.selenic.com/mercurial/wiki/index.cgi/QuickReferenceCardsAndCheatSheets">Mercurial cheatsheets</a>. </p>
+<p>And if you want to quickly look up something, you can use one of the <a href="http://mercurial.selenic.com/wiki/QuickReferenceCardsAndCheatSheets">Mercurial cheatsheets</a>. </p>
 <p><em>Compiled from a great email by Martin Geisler.</em></p>
 
 </div>
diff -r a1f67c008775 -r 7e304195d9f3 original/hgscm/templates/who_uses.html
--- a/original/hgscm/templates/who_uses.html	Mon Nov 02 14:15:30 2009 +0100
+++ b/original/hgscm/templates/who_uses.html	Mon Nov 02 16:39:04 2009 +0100
@@ -21,7 +21,7 @@
         OpenJDK is a the official open sourced Java implementation of Sun Microsystems. When open sourcing the project, Sun chose Mercurial as their main version control system.
         <p><a href="http://openjdk.java.net/">http://openjdk.java.net/</a></p>
         <h3>and others...</h3>
-        <p>Not just OpenSolaris, Mozilla, Java and Python chose Mercurial. A lot of projects of any size decided to use Mercurial for it's efficiency and it's power. A longer list of projects which use Mercurial can be found <a href="http://www.selenic.com/mercurial/wiki/ProjectsUsingMercurial">in the wiki.</a>.</p>
+        <p>Not just OpenSolaris, Mozilla, Java and Python chose Mercurial. A lot of projects of any size decided to use Mercurial for it's efficiency and it's power. A longer list of projects which use Mercurial can be found <a href="http://mercurial.selenic.com/wiki/ProjectsUsingMercurial">in the wiki.</a>.</p>
 	</div>
 	<div class="col">					
         {% download_button %}
diff -r a1f67c008775 -r 7e304195d9f3 original/hgscm/templates/workflow_guide.html
--- a/original/hgscm/templates/workflow_guide.html	Mon Nov 02 14:15:30 2009 +0100
+++ b/original/hgscm/templates/workflow_guide.html	Mon Nov 02 16:39:04 2009 +0100
@@ -9,9 +9,9 @@
 
 <h1>Learning Mercurial in Workflows</h1>
 
-<p>With Mercurial you can use a multitude of different workflows. This page shows some of them, including their use cases. It is intended to make it easy for beginners of version tracking to get going instantly and learn completely incrementally. It doesn't explain the concepts used, because there are already many other great resources doing that, for example <a title="Understanding Mercurial" href="http://www.selenic.com/mercurial/wiki/UnderstandingMercurial">the wiki</a> and <a title="Behind the Scenes" href="http://hgbook.red-bean.com/read/behind-the-scenes.html">the hgbook</a>.</p>
+<p>With Mercurial you can use a multitude of different workflows. This page shows some of them, including their use cases. It is intended to make it easy for beginners of version tracking to get going instantly and learn completely incrementally. It doesn't explain the concepts used, because there are already many other great resources doing that, for example <a title="Understanding Mercurial" href="http://mercurial.selenic.com/wiki/UnderstandingMercurial">the wiki</a> and <a title="Behind the Scenes" href="http://hgbook.red-bean.com/read/behind-the-scenes.html">the hgbook</a>.</p>
 
-<p>If you want a more exhaustive tutorial with the basics, please have a look at the <a title="Mercurial Tutorial" href="http://www.selenic.com/mercurial/wiki/Tutorial">Tutorial in the Mercurial Wiki</a>. For a really detailed and very nice to read description of Mercurial, please have a look at <a title="Mercurial: The definitive Guide" href="http://hgbook.red-bean.com/">Mercurial: The definitive Guide</a>.</p>
+<p>If you want a more exhaustive tutorial with the basics, please have a look at the <a title="Mercurial Tutorial" href="http://mercurial.selenic.com/wiki/Tutorial">Tutorial in the Mercurial Wiki</a>. For a really detailed and very nice to read description of Mercurial, please have a look at <a title="Mercurial: The definitive Guide" href="http://hgbook.red-bean.com/">Mercurial: The definitive Guide</a>.</p>
 
 <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>
@@ -433,7 +433,7 @@
 
 <p>By default <em>hg serve</em> doesn't allow pushing, since that would be a major security hole. You can allow pushing in the server, but that's no solution when you live in different timezones, so we'll go with another approach here: Using a shared repository, either on an existing shared server or on a service like <a title="BitBucket" href="http://bitbucket.org">BitBucket</a>. Doing so has a bit higher starting cost and takes a bit longer to explain, but it's well worth the effort spent.</p>
 
-<p>If you want to use an existing shared server, you can use <em>serve</em> there and <a title="How to allow pushing for hg serve" href="http://www.selenic.com/mercurial/wiki/HgWebDirStepByStep#head-746ca383e3a62df34279ec2fca888113497da022">allow pushing</a>. Also there are some other nice ways to <a title="Multiple Committers" href="http://www.selenic.com/mercurial/wiki/MultipleCommitters">allow pushing to a Mercurial repository</a>, including simple <a title="Setting up a shared Mercurial repository using SSH" href="http://www.selenic.com/mercurial/wiki/SharedSSH">access via SSH</a>.</p>
+<p>If you want to use an existing shared server, you can use <em>serve</em> there and <a title="How to allow pushing for hg serve" href="http://mercurial.selenic.com/wiki/HgWebDirStepByStep#head-746ca383e3a62df34279ec2fca888113497da022">allow pushing</a>. Also there are some other nice ways to <a title="Multiple Committers" href="http://mercurial.selenic.com/wiki/MultipleCommitters">allow pushing to a Mercurial repository</a>, including simple <a title="Setting up a shared Mercurial repository using SSH" href="http://mercurial.selenic.com/wiki/SharedSSH">access via SSH</a>.</p>
 
 <p>Otherwise you first need to setup a BitBucket Account. Just signup at <a title="BitBucket" href="http://bitbucket.org">BitBucket</a>. After signing up (and login) hover your mouse over "Repositories". There click the item at the bottom of the opening dialog which say "Create new".</p>
 
@@ -667,7 +667,7 @@
 
 <p>And that's it. Now you can easily keep features separate without unnecessary bookkeeping.</p>
 
-<p>Note: Named branches stay in history as permanent record after you finished your work. If you don't like having that record in your history, please have a look at some of the advanced <a title="Mercurial Workflows" href="http://www.selenic.com/mercurial/wiki/Workflows">workflows</a>.</p>
+<p>Note: Named branches stay in history as permanent record after you finished your work. If you don't like having that record in your history, please have a look at some of the advanced <a title="Mercurial Workflows" href="http://mercurial.selenic.com/wiki/Workflows">workflows</a>.</p>
 
 <h2 id="tagging">Tagging revisions</h2>
 
@@ -679,7 +679,7 @@
 
 <p>Note: A tag must not contain the char ":", since that char is used for specifying multiple reivions - see "hg help revisions".</p>
 
-<p>Note: To securely mark a revision, you can use the <a title="Using GnuPG to securely sign revisions in Mercurial" href="http://www.selenic.com/mercurial/wiki/GpgExtension">gpg extension</a> to sign the tag.</p>
+<p>Note: To securely mark a revision, you can use the <a title="Using GnuPG to securely sign revisions in Mercurial" href="http://mercurial.selenic.com/wiki/GpgExtension">gpg extension</a> to sign the tag.</p>
 
 <h3>Workflow</h3>
 
@@ -712,7 +712,7 @@
 
 <p>At times you will have changes in your repository, which you really don't want in it.</p>
 
-<p>There are many advanced options for removing these, and most of them use great extensions (<a title="Mercurial Queues Extension" href="http://www.selenic.com/mercurial/wiki/MqExtension">Mercurial Queues</a> is the most often used one), but in this basic guide, we'll solve the problem with just the commands we already learned. But we'll use an option to clone which we didn't yet use.</p>
+<p>There are many advanced options for removing these, and most of them use great extensions (<a title="Mercurial Queues Extension" href="http://mercurial.selenic.com/wiki/MqExtension">Mercurial Queues</a> is the most often used one), but in this basic guide, we'll solve the problem with just the commands we already learned. But we'll use an option to clone which we didn't yet use.</p>
 
 <p>This workflow becomes inconvenient when you need to remove changes, which are buried below many new changes. If you spot the bad changes early enough, you can get rid of them without too much effort, though.</p>
 
diff -r a1f67c008775 -r 7e304195d9f3 original/text/Main.txt
--- a/original/text/Main.txt	Mon Nov 02 14:15:30 2009 +0100
+++ b/original/text/Main.txt	Mon Nov 02 16:39:04 2009 +0100
@@ -22,7 +22,7 @@
 * [NetBeans](http://hg.netbeans.org/)
 * [OpenSolaris](http://hg.genunix.org/)
 
-[and many more](http://www.selenic.com/mercurial/wiki/index.cgi/ProjectsUsingMercurial)
+[and many more](http://mercurial.selenic.com/wiki/ProjectsUsingMercurial)
 
 
 How you can benefit from using Mercurial
diff -r a1f67c008775 -r 7e304195d9f3 original/text/about.txt
--- a/original/text/about.txt	Mon Nov 02 14:15:30 2009 +0100
+++ b/original/text/about.txt	Mon Nov 02 16:39:04 2009 +0100
@@ -12,7 +12,7 @@
 Mercurial was written with platform independence in mind. Therefore most of Mercurial is written in Python, with a small part written in C for performance reasons. As a result, binary releases are available on all major platforms.
 
 Extensible
-The functionality of Mercurial can be increased with extensions, either by activating the official ones which are shipped with Mercurial or downloading some [from the wiki](http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions) or by [writing your own](http://www.selenic.com/mercurial/wiki/index.cgi/WritingExtensions). 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. 
+The functionality of Mercurial can be increased with extensions, either by activating the official ones which are shipped with Mercurial or downloading some [from the wiki](http://mercurial.selenic.com/wiki/UsingExtensions) or by [writing your own](http://mercurial.selenic.com/wiki/WritingExtensions). 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. 
 
 Open Source
 Mercurial is free software licensed under the terms of the GNU General Public License Version 2.
diff -r a1f67c008775 -r 7e304195d9f3 original/text/from-svn-to-hg.txt
--- a/original/text/from-svn-to-hg.txt	Mon Nov 02 14:15:30 2009 +0100
+++ b/original/text/from-svn-to-hg.txt	Mon Nov 02 16:39:04 2009 +0100
@@ -95,7 +95,7 @@
 
 There are some here:
 
-http://www.selenic.com/mercurial/wiki/index.cgi/QuickReferenceCardsAndCheatSheets
+http://mercurial.selenic.com/wiki/QuickReferenceCardsAndCheatSheets
 
 - Martin Geisler
 
diff -r a1f67c008775 -r 7e304195d9f3 templates/data
--- a/templates/data	Mon Nov 02 14:15:30 2009 +0100
+++ b/templates/data	Mon Nov 02 16:39:04 2009 +0100
@@ -5,5 +5,5 @@
         'Windows': 'http://mercurial.berkwood.com/binaries/Mercurial-1.3.1.exe',
         'Mac OS X 10.6': 'http://mercurial.berkwood.com/binaries/Mercurial-1.3.1-py2.6-macosx10.6.zip',
         'Mac OS X 10.5': 'http://mercurial.berkwood.com/binaries/Mercurial-1.3.1-py2.5-macosx10.5.zip',
-        'Source code': 'http://www.selenic.com/mercurial/release/mercurial-1.3.1.tar.gz'}}
+        'Source code': 'http://mercurial.selenic.com/release/mercurial-1.3.1.tar.gz'}}
 %}
diff -r a1f67c008775 -r 7e304195d9f3 templates/frontpage.html
--- a/templates/frontpage.html	Mon Nov 02 14:15:30 2009 +0100
+++ b/templates/frontpage.html	Mon Nov 02 16:39:04 2009 +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://www.selenic.com/mercurial/wiki/ProjectsUsingMercurial -->. Every clone contains the whole project history, so committing, branching, tagging and merging are local operations which makes them fast and convenient. You can use a multitude of <a href="http://www.selenic.com/mercurial/wiki/Workflows">workflows</a> and easily enhance its functionality with <a href="http://www.selenic.com/mercurial/wiki/UsingExtensions">extensions</a>.</p>
+                <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 operations which makes them 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>
             </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 -->