# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1479427873 -3600
# Node ID 9c6f717823e1d0f33f640be02ac276c0a22866e7
# Parent  73654990ba75b5b8e3c04261f64bad4e515706bf# Parent  cc21a2b86a30b727dc5b5c0141042865c7d476c9
Merge stable

diff -r 73654990ba75 -r 9c6f717823e1 docs/contributing.rst
--- a/docs/contributing.rst	Tue Nov 15 22:53:41 2016 +0100
+++ b/docs/contributing.rst	Fri Nov 18 01:11:13 2016 +0100
@@ -137,7 +137,7 @@
 -----------------
 
 We don't have a formal coding/formatting standard. We are currently using a mix
-of Mercurial (http://mercurial.selenic.com/wiki/CodingStyle), pep8, and
+of Mercurial's (https://www.mercurial-scm.org/wiki/CodingStyle), pep8, and
 consistency with existing code. Run ``scripts/run-all-cleanup`` before
 committing to ensure some basic code formatting consistency.
 
diff -r 73654990ba75 -r 9c6f717823e1 docs/index.rst
--- a/docs/index.rst	Tue Nov 15 22:53:41 2016 +0100
+++ b/docs/index.rst	Fri Nov 18 01:11:13 2016 +0100
@@ -74,7 +74,7 @@
 .. _virtualenv: http://pypi.python.org/pypi/virtualenv
 .. _python: http://www.python.org/
 .. _django: http://www.djangoproject.com/
-.. _mercurial: http://mercurial.selenic.com/
+.. _mercurial: https://www.mercurial-scm.org/
 .. _bitbucket: http://bitbucket.org/
 .. _subversion: http://subversion.tigris.org/
 .. _git: http://git-scm.com/
diff -r 73654990ba75 -r 9c6f717823e1 docs/setup.rst
--- a/docs/setup.rst	Tue Nov 15 22:53:41 2016 +0100
+++ b/docs/setup.rst	Fri Nov 18 01:11:13 2016 +0100
@@ -864,11 +864,11 @@
 
 .. _virtualenv: http://pypi.python.org/pypi/virtualenv
 .. _python: http://www.python.org/
-.. _Mercurial: http://mercurial.selenic.com/
+.. _Mercurial: https://www.mercurial-scm.org/
 .. _Celery: http://celeryproject.org/
 .. _Celery documentation: http://docs.celeryproject.org/en/latest/getting-started/index.html
 .. _RabbitMQ: http://www.rabbitmq.com/
 .. _Redis: http://redis.io/
 .. _python-ldap: http://www.python-ldap.org/
 .. _mercurial-server: http://www.lshift.net/mercurial-server.html
-.. _PublishingRepositories: http://mercurial.selenic.com/wiki/PublishingRepositories
+.. _PublishingRepositories: https://www.mercurial-scm.org/wiki/PublishingRepositories
diff -r 73654990ba75 -r 9c6f717823e1 docs/usage/troubleshooting.rst
--- a/docs/usage/troubleshooting.rst	Tue Nov 15 22:53:41 2016 +0100
+++ b/docs/usage/troubleshooting.rst	Fri Nov 18 01:11:13 2016 +0100
@@ -69,7 +69,7 @@
 
 .. _virtualenv: http://pypi.python.org/pypi/virtualenv
 .. _python: http://www.python.org/
-.. _mercurial: http://mercurial.selenic.com/
+.. _mercurial: https://www.mercurial-scm.org/
 .. _celery: http://celeryproject.org/
 .. _rabbitmq: http://www.rabbitmq.com/
 .. _python-ldap: http://www.python-ldap.org/