[1.9.x] Fixed broken links in docs and comments.

Backport of 96f97691ad5e1483263cea3bb4e4021b4c8dcc41 from master

8 files changed, 9 insertions, 9 deletions

diff --git a/docs/howto/deployment/wsgi/apache-auth.txt b/docs/howto/deployment/wsgi/apache-auth.txt
index ff84a3f433..3d4b35fd04 100644
--- a/docs/howto/deployment/wsgi/apache-auth.txt
+++ b/docs/howto/deployment/wsgi/apache-auth.txt
@@ -22,7 +22,7 @@ version >= 2.2 and mod_wsgi >= 2.0. For example, you could:
     a 'name' field. You can also specify your own custom mod_wsgi
     auth handler if your custom cannot conform to these requirements.
 
-.. _Subversion: http://subversion.tigris.org/
+.. _Subversion: http://subversion.apache.org/
 .. _mod_dav: https://httpd.apache.org/docs/2.2/mod/mod_dav.html
 
 Authentication with ``mod_wsgi``
diff --git a/docs/intro/reusable-apps.txt b/docs/intro/reusable-apps.txt
index c0e5e086f6..32752bbfbd 100644
--- a/docs/intro/reusable-apps.txt
+++ b/docs/intro/reusable-apps.txt
@@ -185,7 +185,7 @@ this. For a small app like polls, this process isn't too difficult.
 5. Next we'll create a ``setup.py`` file which provides details about how to
    build and install the app.  A full explanation of this file is beyond the
    scope of this tutorial, but the `setuptools docs
-   <https://pythonhosted.org/setuptools/setuptools.html>`_ have a good
+   <https://setuptools.readthedocs.io/en/latest/>`_ have a good
    explanation. Create a file ``django-polls/setup.py`` with the following
    contents:
 
diff --git a/docs/ref/contrib/gis/install/index.txt b/docs/ref/contrib/gis/install/index.txt
index b7ba8e594d..51fba61885 100644
--- a/docs/ref/contrib/gis/install/index.txt
+++ b/docs/ref/contrib/gis/install/index.txt
@@ -327,7 +327,7 @@ Fink
 of the `Fink`__ package system. `Different packages are available`__ (starting
 with "django-gis"), depending on which version of Python you want to use.
 
-__ http://schwehr.org/blog/
+__ https://schwehr.blogspot.com/
 __ http://www.finkproject.org/
 __ http://pdb.finkproject.org/pdb/browse.php?summary=django-gis
 
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 1afaf15038..d0e88fd457 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -967,7 +967,7 @@ interpreter, use the ``--plain`` option, like so::
 
     django-admin shell --plain
 
-.. _IPython: http://ipython.scipy.org/
+.. _IPython: https://ipython.org/
 .. _bpython: http://bpython-interpreter.org/
 
 .. django-admin-option:: --nostartup
diff --git a/docs/topics/auth/passwords.txt b/docs/topics/auth/passwords.txt
index 2da25ecf6c..5b88ce33dd 100644
--- a/docs/topics/auth/passwords.txt
+++ b/docs/topics/auth/passwords.txt
@@ -292,7 +292,7 @@ Include any other hashers that your site uses in this list.
 
 .. _sha1: https://en.wikipedia.org/wiki/SHA1
 .. _pbkdf2: https://en.wikipedia.org/wiki/PBKDF2
-.. _nist: http://csrc.nist.gov/publications/nistpubs/800-132/nist-sp800-132.pdf
+.. _nist: https://dx.doi.org/10.6028/NIST.SP.800-132
 .. _bcrypt: https://en.wikipedia.org/wiki/Bcrypt
 .. _`bcrypt library`: https://pypi.python.org/pypi/bcrypt/
 
diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt
index 5eea38e1da..8719f7de7f 100644
--- a/docs/topics/i18n/translation.txt
+++ b/docs/topics/i18n/translation.txt
@@ -1569,9 +1569,9 @@ multiple times::
     in general, and doesn't depend on ``gettext``. For more information, read
     its documentation about `working with message catalogs`_.
 
-    .. _Message extracting: http://babel.pocoo.org/docs/messages/#message-extraction
+    .. _Message extracting: http://babel.pocoo.org/en/latest/messages.html#message-extraction
     .. _Babel: http://babel.pocoo.org/
-    .. _working with message catalogs: http://babel.pocoo.org/docs/messages/
+    .. _working with message catalogs: http://babel.pocoo.org/en/latest/messages.html
 
 .. admonition:: No gettext?
 
diff --git a/docs/topics/install.txt b/docs/topics/install.txt
index 2b5a5d045f..e42ff7c6da 100644
--- a/docs/topics/install.txt
+++ b/docs/topics/install.txt
@@ -179,7 +179,7 @@ This is the recommended way to install Django.
 .. _pip: https://pip.pypa.io/
 .. _virtualenv: http://www.virtualenv.org/
 .. _virtualenvwrapper: https://virtualenvwrapper.readthedocs.io/en/latest/
-.. _standalone pip installer: https://pip.pypa.io/en/latest/installing.html#install-pip
+.. _standalone pip installer: https://pip.pypa.io/en/latest/installing/#installing-with-get-pip-py
 
 Installing a distribution-specific package
 ------------------------------------------
diff --git a/docs/topics/testing/tools.txt b/docs/topics/testing/tools.txt
index 8890afcf08..510ebacf5d 100644
--- a/docs/topics/testing/tools.txt
+++ b/docs/topics/testing/tools.txt
@@ -971,7 +971,7 @@ out the `full reference`_ for more details.
     use cases. Please refer to the `Selenium FAQ`_ and
     `Selenium documentation`_ for more information.
 
-    .. _Selenium FAQ: https://code.google.com/p/selenium/wiki/FrequentlyAskedQuestions#Q:_WebDriver_fails_to_find_elements_/_Does_not_block_on_page_loa
+    .. _Selenium FAQ: https://web.archive.org/web/20160129132110/http://code.google.com/p/selenium/wiki/FrequentlyAskedQuestions#Q:_WebDriver_fails_to_find_elements_/_Does_not_block_on_page_loa
     .. _Selenium documentation: http://seleniumhq.org/docs/04_webdriver_advanced.html#explicit-waits
 
 Test cases features