Merge stable

docs/contributing.rst

@@ -137,7 +137,7 b' Coding guidelines'
 -----------------
 
 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.
 

docs/index.rst

@@ -74,7 +74,7 b' Other topics'
 .. _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/

docs/setup.rst

@@ -864,11 +864,11 b' the ``init.d`` directory of the Kallithe'
 
 .. _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

docs/usage/troubleshooting.rst

@@ -69,7 +69,7 b' Troubleshooting'
 
 .. _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/