[1.6.x] Updated a bunch of hyperlinks in documentation

Backport of 626bdf648 from master.

30 files changed, 52 insertions, 52 deletions

diff --git a/docs/faq/general.txt b/docs/faq/general.txt
index 5db3141f82..801cb334ca 100644
--- a/docs/faq/general.txt
+++ b/docs/faq/general.txt
@@ -159,7 +159,7 @@ Django has special conveniences for building "CMS-y" apps, that doesn't mean
 it's not just as appropriate for building "non-CMS-y" apps (whatever that
 means!).
 
-.. _Drupal: http://drupal.org/
+.. _Drupal: https://drupal.org/
 
 How can I download the Django documentation to read it offline?
 ---------------------------------------------------------------
@@ -183,7 +183,7 @@ Where can I find Django developers for hire?
 Consult our `developers for hire page`_ for a list of Django developers who
 would be happy to help you.
 
-You might also be interested in posting a job to http://djangogigs.com/ .
+You might also be interested in posting a job to https://djangogigs.com/ .
 If you want to find Django-capable people in your local area, try
 https://people.djangoproject.com/ .
 
@@ -198,7 +198,7 @@ software are still a matter of some debate.
 
 For example, `APA style`_,  would dictate something like::
 
-    Django (Version 1.5) [Computer Software]. (2013). Retrieved from http://djangoproject.com.
+    Django (Version 1.5) [Computer Software]. (2013). Retrieved from https://djangoproject.com.
 
 However, the only true guide is what your publisher will accept, so get a copy
 of those guidelines and fill in the gaps as best you can.
@@ -208,7 +208,7 @@ Foundation".
 
 If you need a publishing location, use "Lawrence, Kansas".
 
-If you need a web address, use http://djangoproject.com.
+If you need a web address, use https://djangoproject.com.
 
 If you need a name, just use "Django", without any tagline.
 
diff --git a/docs/howto/deployment/index.txt b/docs/howto/deployment/index.txt
index ed4bcf3d4a..6f93aeef87 100644
--- a/docs/howto/deployment/index.txt
+++ b/docs/howto/deployment/index.txt
@@ -24,4 +24,4 @@ the easiest, fastest, and most stable deployment choice.
       was written against Django version 1.1 and has not been updated since
       `mod_python` was first deprecated, then completely removed in Django 1.5.
 
-.. _chapter 12 of the django book (second edition): http://djangobook.com/en/2.0/chapter12/
+.. _chapter 12 of the django book (second edition): http://djangobook.com/en/2.0/chapter12.html
diff --git a/docs/howto/deployment/wsgi/gunicorn.txt b/docs/howto/deployment/wsgi/gunicorn.txt
index 14c80af0a0..95051b690b 100644
--- a/docs/howto/deployment/wsgi/gunicorn.txt
+++ b/docs/howto/deployment/wsgi/gunicorn.txt
@@ -13,7 +13,7 @@ There are two ways to use Gunicorn with Django. One is to have Gunicorn treat
 Django as just another WSGI application. The second is to use Gunicorn's
 special `integration with Django`_.
 
-.. _integration with Django: http://gunicorn.org/run.html#django-manage-py
+.. _integration with Django: http://docs.gunicorn.org/en/latest/run.html#django-manage-py
 
 Installing Gunicorn
 ===================
diff --git a/docs/howto/deployment/wsgi/uwsgi.txt b/docs/howto/deployment/wsgi/uwsgi.txt
index 59dddda418..47f1e7a61d 100644
--- a/docs/howto/deployment/wsgi/uwsgi.txt
+++ b/docs/howto/deployment/wsgi/uwsgi.txt
@@ -32,7 +32,7 @@ command. For example:
     # Or install LTS (long term support).
     $ sudo pip install http://projects.unbit.it/downloads/uwsgi-lts.tar.gz
 
-.. _installation procedures: http://projects.unbit.it/uwsgi/wiki/Install
+.. _installation procedures: http://uwsgi-docs.readthedocs.org/en/latest/Install.html
 
 .. warning::
 
@@ -58,7 +58,7 @@ Configuring and starting the uWSGI server for Django
 uWSGI supports multiple ways to configure the process. See uWSGI's
 `configuration documentation`_ and `examples`_
 
-.. _configuration documentation: http://projects.unbit.it/uwsgi/wiki/Doc
+.. _configuration documentation: https://uwsgi.readthedocs.org/en/latest/Configuration.html
 .. _examples: http://projects.unbit.it/uwsgi/wiki/Example
 
 Here's an example command to start a uWSGI server::
@@ -111,4 +111,4 @@ Example ini configuration file usage::
 See the uWSGI docs on `managing the uWSGI process`_ for information on
 starting, stopping and reloading the uWSGI workers.
 
-.. _managing the uWSGI process: http://projects.unbit.it/uwsgi/wiki/Management
+.. _managing the uWSGI process: http://uwsgi-docs.readthedocs.org/en/latest/Management.html
diff --git a/docs/howto/jython.txt b/docs/howto/jython.txt
index 461a5d3804..03f661dec7 100644
--- a/docs/howto/jython.txt
+++ b/docs/howto/jython.txt
@@ -37,7 +37,7 @@ such as `Apache Tomcat`_. Full JavaEE applications servers such as `GlassFish`_
 or `JBoss`_ are also OK, if you need the extra features they include.
 
 .. _`Apache Tomcat`: http://tomcat.apache.org/
-.. _GlassFish: http://glassfish.java.net/
+.. _GlassFish: https://glassfish.java.net/
 .. _JBoss: http://www.jboss.org/
 
 Installing Django
diff --git a/docs/index.txt b/docs/index.txt
index c4e9f2dcb3..1f89c500a9 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -25,8 +25,8 @@ Having trouble? We'd like to help!
 
 * Report bugs with Django in our `ticket tracker`_.
 
-.. _archives of the django-users mailing list: http://groups.google.com/group/django-users/
-.. _post a question: http://groups.google.com/group/django-users/
+.. _archives of the django-users mailing list: https://groups.google.com/d/forum/django-users
+.. _post a question: https://groups.google.com/d/forum/django-users
 .. _#django IRC channel: irc://irc.freenode.net/django
 .. _IRC logs: http://django-irc-logs.com/
 .. _ticket tracker: https://code.djangoproject.com/
diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt
index 6732f1561f..f9f9d2fd91 100644
--- a/docs/internals/committers.txt
+++ b/docs/internals/committers.txt
@@ -223,7 +223,7 @@ Karen Tracey
 
     Jannis lives in Berlin, Germany.
 
-.. _Jannis Leidel: http://jezdez.com/
+.. _Jannis Leidel: https://jezdez.com/
 .. _Bauhaus-University Weimar: http://www.uni-weimar.de/
 .. _virtualenv: http://www.virtualenv.org/
 .. _pip: http://www.pip-installer.org/
@@ -396,7 +396,7 @@ Tim Graham
 
     He works in a `management consulting company`_ in Paris, France.
 
-.. _Aymeric Augustin: http://myks.org/
+.. _Aymeric Augustin: https://myks.org/
 .. _management consulting company: http://www.polyconseil.fr/
 
 `Claude Paroz`_
@@ -410,7 +410,7 @@ Tim Graham
     Django-based `l10n.gnome.org`_.
 
 .. _Claude Paroz: http://www.2xlibre.net
-.. _l10n.gnome.org: http://l10n.gnome.org
+.. _l10n.gnome.org: https://l10n.gnome.org
 
 Anssi Kääriäinen
     Anssi works as a developer at Finnish National Institute for Health and
diff --git a/docs/internals/contributing/localizing.txt b/docs/internals/contributing/localizing.txt
index 01b88d8d9a..2069ea264c 100644
--- a/docs/internals/contributing/localizing.txt
+++ b/docs/internals/contributing/localizing.txt
@@ -61,6 +61,6 @@ Django source tree, as for any code change:
   ``Translations``, and attach the patch to it.
 
 .. _Transifex: https://www.transifex.com/
-.. _Django i18n mailing list: http://groups.google.com/group/django-i18n/
+.. _Django i18n mailing list: /https://groups.google.com/d/forum/django-i18n
 .. _Django project page: https://www.transifex.com/projects/p/django-core/
-.. _Transifex User Guide: http://help.transifex.com/
+.. _Transifex User Guide: http://support.transifex.com/
diff --git a/docs/internals/contributing/writing-code/coding-style.txt b/docs/internals/contributing/writing-code/coding-style.txt
index 437d2f7ec5..ff97aa3ce4 100644
--- a/docs/internals/contributing/writing-code/coding-style.txt
+++ b/docs/internals/contributing/writing-code/coding-style.txt
@@ -211,6 +211,6 @@ Miscellaneous
   change to the ``AUTHORS`` file in your patch if you make more than a
   single trivial change.
 
-.. _pep8: http://pypi.python.org/pypi/pep8
-.. _pyflakes: http://pypi.python.org/pypi/pyflakes
-.. _pylint: http://pypi.python.org/pypi/pylint
+.. _pep8: https://pypi.python.org/pypi/pep8
+.. _pyflakes: https://pypi.python.org/pypi/pyflakes
+.. _pylint: https://pypi.python.org/pypi/pylint
diff --git a/docs/internals/contributing/writing-code/unit-tests.txt b/docs/internals/contributing/writing-code/unit-tests.txt
index fc8a906a79..ac5cf38f3d 100644
--- a/docs/internals/contributing/writing-code/unit-tests.txt
+++ b/docs/internals/contributing/writing-code/unit-tests.txt
@@ -171,11 +171,11 @@ associated tests will be skipped.
 .. _Pillow: https://pypi.python.org/pypi/Pillow/
 .. _PyYAML: http://pyyaml.org/wiki/PyYAML
 .. _pytz: https://pypi.python.org/pypi/pytz/
-.. _setuptools: http://pypi.python.org/pypi/setuptools/
+.. _setuptools: https://pypi.python.org/pypi/setuptools/
 .. _memcached: http://memcached.org/
 .. _gettext: http://www.gnu.org/software/gettext/manual/gettext.html
-.. _selenium: http://pypi.python.org/pypi/selenium
-.. _pip requirements files: http://www.pip-installer.org/en/latest/requirements.html
+.. _selenium: https://pypi.python.org/pypi/selenium
+.. _pip requirements files: http://www.pip-installer.org/en/latest/cookbook.html#requirements-files
 
 Code coverage
 ~~~~~~~~~~~~~
diff --git a/docs/internals/security.txt b/docs/internals/security.txt
index f8d6ffbb1b..9bac9d5195 100644
--- a/docs/internals/security.txt
+++ b/docs/internals/security.txt
@@ -111,7 +111,7 @@ On the day of disclosure, we will take the following steps:
 4. Post a notice to the `django-announce`_ mailing list that links to the blog
    post.
 
-.. _the Python Package Index: http://pypi.python.org/pypi
+.. _the Python Package Index: https://pypi.python.org/pypi
 .. _the official Django development blog: https://www.djangoproject.com/weblog/
 .. _django-announce: http://groups.google.com/group/django-announce
 
diff --git a/docs/intro/index.txt b/docs/intro/index.txt
index 9e88402f6d..a7872017b9 100644
--- a/docs/intro/index.txt
+++ b/docs/intro/index.txt
@@ -35,8 +35,8 @@ place: read this material to quickly get up and running.
     a few other `books about Python`_.
 
     .. _python: http://python.org/
-    .. _list of Python resources for non-programmers: http://wiki.python.org/moin/BeginnersGuide/NonProgrammers
+    .. _list of Python resources for non-programmers: https://wiki.python.org/moin/BeginnersGuide/NonProgrammers
     .. _Python 2: http://diveintopython.net/
     .. _Python 3: http://diveintopython3.net/
     .. _dead-tree version: http://www.amazon.com/exec/obidos/ASIN/1590593561/ref=nosim/jacobian20
-    .. _books about Python: http://wiki.python.org/moin/PythonBooks
+    .. _books about Python: https://wiki.python.org/moin/PythonBooks
diff --git a/docs/intro/reusable-apps.txt b/docs/intro/reusable-apps.txt
index 73b9461408..2bd04a0be3 100644
--- a/docs/intro/reusable-apps.txt
+++ b/docs/intro/reusable-apps.txt
@@ -19,7 +19,7 @@ could save some of this repeated work?
 Reusability is the way of life in Python. `The Python Package Index (PyPI)
 <http://guide.python-distribute.org/contributing.html#pypi-info>`_ has a vast
 range of packages you can use in your own Python programs. Check out `Django
-Packages <http://www.djangopackages.com>`_ for existing reusable apps you could
+Packages <https://www.djangopackages.com>`_ for existing reusable apps you could
 incorporate in your project. Django itself is also just a Python package. This
 means that you can take existing Python packages or Django apps and compose
 them into your own web project. You only need to write the parts that make
@@ -108,7 +108,7 @@ Django with pip<installing-official-release>`. You can install ``setuptools``
 the same way.
 
 .. _setuptools: https://pypi.python.org/pypi/setuptools
-.. _pip: http://pypi.python.org/pypi/pip
+.. _pip: https://pypi.python.org/pypi/pip
 
 Packaging your app
 ==================
@@ -179,7 +179,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
-   <http://packages.python.org/setuptools/setuptools.html>`_ have a good
+   <http://pythonhosted.org/setuptools/setuptools.html>`_ have a good
    explanation. Create a file ``django-polls/setup.py`` with the following
    contents::
 
@@ -236,7 +236,7 @@ this. For a small app like polls, this process isn't too difficult.
 
    Note that the ``docs`` directory won't be included in your package unless
    you add some files to it. Many Django apps also provide their documentation
-   online through sites like `readthedocs.org <http://readthedocs.org>`_.
+   online through sites like `readthedocs.org <https://readthedocs.org>`_.
 
 8. Try building your package with ``python setup.py sdist`` (run from inside
    ``django-polls``). This creates a directory called ``dist`` and builds your
@@ -277,7 +277,7 @@ working. We'll now fix this by installing our new ``django-polls`` package.
 
     pip uninstall django-polls
 
-.. _pip: http://pypi.python.org/pypi/pip
+.. _pip: https://pypi.python.org/pypi/pip
 
 Publishing your app
 ===================
diff --git a/docs/ref/contrib/gis/admin.txt b/docs/ref/contrib/gis/admin.txt
index d1a9fc1dcb..d3bc1d26a1 100644
--- a/docs/ref/contrib/gis/admin.txt
+++ b/docs/ref/contrib/gis/admin.txt
@@ -67,6 +67,6 @@ GeoDjango's admin site
 .. class:: OSMGeoAdmin
 
    A subclass of :class:`GeoModelAdmin` that uses a spherical mercator projection
-   with `OpenStreetMap <http://openstreetmap.org/>`_ street data tiles.
+   with `OpenStreetMap <http://www.openstreetmap.org/>`_ street data tiles.
    See the :ref:`OSMGeoAdmin introduction <osmgeoadmin-intro>`
    in the tutorial for a usage example.
diff --git a/docs/ref/contrib/gis/feeds.txt b/docs/ref/contrib/gis/feeds.txt
index 7b1b6ebccf..72c51b57ab 100644
--- a/docs/ref/contrib/gis/feeds.txt
+++ b/docs/ref/contrib/gis/feeds.txt
@@ -13,7 +13,7 @@ Django's, please consult :doc:`Django's syndication documentation
 
 .. _W3C Geo: http://www.w3.org/2003/01/geo/
 
-__ http://georss.org/1.0#simple
+__ http://georss.org/simple.html
 
 Example
 =======
diff --git a/docs/ref/contrib/gis/forms-api.txt b/docs/ref/contrib/gis/forms-api.txt
index 7fe04f6dec..3bd8519134 100644
--- a/docs/ref/contrib/gis/forms-api.txt
+++ b/docs/ref/contrib/gis/forms-api.txt
@@ -14,7 +14,7 @@ display and edit geolocalized data on a map. By default, they use
 `OpenLayers`_-powered maps, with a base WMS layer provided by `Metacarta`_.
 
 .. _OpenLayers: http://openlayers.org/
-.. _Metacarta: http://metacarta.com/
+.. _Metacarta: http://www.metacarta.com/
 
 Field arguments
 ===============
diff --git a/docs/ref/contrib/gis/install/index.txt b/docs/ref/contrib/gis/install/index.txt
index 62369d8253..930d6fea09 100644
--- a/docs/ref/contrib/gis/install/index.txt
+++ b/docs/ref/contrib/gis/install/index.txt
@@ -140,7 +140,7 @@ community!  You can:
   sure to provide a complete description of the problem, versions used,
   and specify the component as "GIS".
 
-__ http://groups.google.com/group/geodjango
+__ https://groups.google.com/d/forum/geodjango
 __ https://code.djangoproject.com/newticket
 
 .. _libsettings:
@@ -272,7 +272,7 @@ Summary::
     $ brew install gdal
     $ brew install libgeoip
 
-__ http://mxcl.github.com/homebrew/
+__ http://brew.sh/
 .. _Apple Developer Tools: https://developer.apple.com/technologies/tools/
 
 .. _kyngchaos:
diff --git a/docs/ref/contrib/gis/install/postgis.txt b/docs/ref/contrib/gis/install/postgis.txt
index c651fe8fca..75597fbb38 100644
--- a/docs/ref/contrib/gis/install/postgis.txt
+++ b/docs/ref/contrib/gis/install/postgis.txt
@@ -15,7 +15,7 @@ might also need additional libraries, see `PostGIS requirements`_.
     when using GeoDjango with PostGIS.
 
 .. _psycopg2: http://initd.org/psycopg/
-.. _PostGIS requirements: http://www.postgis.org/documentation/manual-2.0/postgis_installation.html#id2711662
+.. _PostGIS requirements: http://www.postgis.org/documentation/manual-2.0/postgis_installation.html#id554707
 
 On Debian/Ubuntu, you are advised to install the following packages:
 postgresql-x.x, postgresql-x.x-postgis, postgresql-server-dev-x.x,
diff --git a/docs/ref/contrib/gis/measure.txt b/docs/ref/contrib/gis/measure.txt
index 2a05b42600..197f584729 100644
--- a/docs/ref/contrib/gis/measure.txt
+++ b/docs/ref/contrib/gis/measure.txt
@@ -175,6 +175,6 @@ Measurement API
    Alias for :class:`Area` class.
 
 .. rubric:: Footnotes
-.. [#] `Robert Coup <http://koordinates.com/>`_ is the initial author of the measure objects,
+.. [#] `Robert Coup <https://koordinates.com/>`_ is the initial author of the measure objects,
        and was inspired by Brian Beck's work in `geopy <http://code.google.com/p/geopy/>`_
        and Geoff Biggs' PhD work on dimensioned units for robotics.
diff --git a/docs/ref/contrib/gis/sitemaps.txt b/docs/ref/contrib/gis/sitemaps.txt
index 0ab8f75825..60df2b87b2 100644
--- a/docs/ref/contrib/gis/sitemaps.txt
+++ b/docs/ref/contrib/gis/sitemaps.txt
@@ -23,4 +23,4 @@ Reference
 -----------------
 
 .. rubric:: Footnotes
-.. [#] Google, Inc., `What is a Geo Sitemap? <http://support.google.com/webmasters/bin/answer.py?answer=94555>`_.
+.. [#] Google, Inc., `What is a Geo Sitemap? <https://support.google.com/webmasters/answer/94555>`_.
diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt
index 99a4814f3d..229f1be7ae 100644
--- a/docs/ref/contrib/gis/tutorial.txt
+++ b/docs/ref/contrib/gis/tutorial.txt
@@ -747,7 +747,7 @@ entries -- the borders may be edited by clicking on a polygon and dragging
 the vertexes to the desired position.
 
 .. _OpenLayers: http://openlayers.org/
-.. _Open Street Map: http://openstreetmap.org/
+.. _Open Street Map: http://www.openstreetmap.org/
 .. _Vector Map Level 0: http://earth-info.nga.mil/publications/vmap0.html
 .. _OSGeo: http://www.osgeo.org
 
diff --git a/docs/ref/contrib/sitemaps.txt b/docs/ref/contrib/sitemaps.txt
index 4467ed3a6e..ebbd4798c9 100644
--- a/docs/ref/contrib/sitemaps.txt
+++ b/docs/ref/contrib/sitemaps.txt
@@ -445,7 +445,7 @@ generate a Google News compatible sitemap:
     {% endspaceless %}
     </urlset>
 
-.. _`Google news sitemaps`: http://support.google.com/webmasters/bin/answer.py?hl=en&answer=74288
+.. _`Google news sitemaps`: https://support.google.com/webmasters/answer/74288?hl=en
 
 Pinging Google
 ==============
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index 3d7b347d0c..eaabfaa92f 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -839,5 +839,5 @@ the support channels provided by each 3rd party project.
 .. _IBM DB2: http://code.google.com/p/ibm-db/
 .. _Microsoft SQL Server 2005: http://code.google.com/p/django-mssql/
 .. _Firebird: http://code.google.com/p/django-firebird/
-.. _ODBC: https://github.com/aurorasoftware/django-pyodbc/
+.. _ODBC: https://github.com/lionheart/django-pyodbc/
 .. _ADSDB: http://code.google.com/p/adsdb-django/
diff --git a/docs/releases/1.2.txt b/docs/releases/1.2.txt
index ad39062ed1..9b4e1c7ce0 100644
--- a/docs/releases/1.2.txt
+++ b/docs/releases/1.2.txt
@@ -50,7 +50,7 @@ be found below`_.
     `Django Advent`_ covered the release of Django 1.2 with a series of
     articles and tutorials that cover some of the new features in depth.
 
-.. _django advent: http://djangoadvent.com/
+.. _django advent: https://github.com/djangoadvent/djangoadvent-articles
 
 Wherever possible these features have been introduced in a backwards-compatible
 manner per :doc:`our API stability policy </misc/api-stability>` policy.
diff --git a/docs/topics/install.txt b/docs/topics/install.txt
index fd266f18cd..50cd6c956b 100644
--- a/docs/topics/install.txt
+++ b/docs/topics/install.txt
@@ -224,7 +224,7 @@ This is the recommended way to install Django.
 
 .. _pip: http://www.pip-installer.org/
 .. _virtualenv: http://www.virtualenv.org/
-.. _virtualenvwrapper: http://www.doughellmann.com/docs/virtualenvwrapper/
+.. _virtualenvwrapper: http://virtualenvwrapper.readthedocs.org/en/latest/
 .. _standalone pip installer: http://www.pip-installer.org/en/latest/installing.html#using-the-installer
 
 Installing an official release manually
diff --git a/docs/topics/logging.txt b/docs/topics/logging.txt
index 2f72e7dff9..18eecf840e 100644
--- a/docs/topics/logging.txt
+++ b/docs/topics/logging.txt
@@ -525,7 +525,7 @@ Python logging module.
     By default, an instance of the email backend specified in
     :setting:`EMAIL_BACKEND` will be used.
 
-.. _Sentry: http://pypi.python.org/pypi/sentry
+.. _Sentry: https://pypi.python.org/pypi/sentry
 
 
 Filters
diff --git a/docs/topics/python3.txt b/docs/topics/python3.txt
index d059bc042d..15c07ccbf0 100644
--- a/docs/topics/python3.txt
+++ b/docs/topics/python3.txt
@@ -6,7 +6,7 @@ Django 1.5 is the first version of Django to support Python 3. The same code
 runs both on Python 2 (≥ 2.6.5) and Python 3 (≥ 3.2), thanks to the six_
 compatibility layer.
 
-.. _six: http://packages.python.org/six/
+.. _six: http://pythonhosted.org/six/
 
 This document is primarily targeted at authors of pluggable application
 who want to support both Python 2 and 3. It also describes guidelines that
@@ -42,7 +42,7 @@ developers are used to dealing with such constraints.
 Porting tools provided by Django are inspired by this philosophy, and it's
 reflected throughout this guide.
 
-.. _Python's official porting guide: http://docs.python.org/py3k/howto/pyporting.html
+.. _Python's official porting guide: http://docs.python.org/3/howto/pyporting.html
 .. _Pragmatic Unicode: http://nedbatchelder.com/text/unipain.html
 
 Porting tips
@@ -246,7 +246,7 @@ consequence, the following pattern is sometimes necessary::
 
 Be cautious if you have to `index bytestrings`_.
 
-.. _index bytestrings: http://docs.python.org/py3k/howto/pyporting.html#bytes-literals
+.. _index bytestrings: http://docs.python.org/3/howto/pyporting.html#bytes-literals
 
 Exceptions
 ~~~~~~~~~~
diff --git a/docs/topics/templates.txt b/docs/topics/templates.txt
index c75b83f158..732145a7ca 100644
--- a/docs/topics/templates.txt
+++ b/docs/topics/templates.txt
@@ -30,7 +30,7 @@ or CheetahTemplate_, you should feel right at home with Django's templates.
     </howto/custom-template-tags>` to the template language as needed).
 
 .. _`The Django template language: For Python programmers`: ../templates_python/
-.. _Smarty: http://smarty.php.net/
+.. _Smarty: http://www.smarty.net/
 .. _CheetahTemplate: http://www.cheetahtemplate.org/
 
 Templates
diff --git a/docs/topics/testing/advanced.txt b/docs/topics/testing/advanced.txt
index a634d8ad71..8f949c113b 100644
--- a/docs/topics/testing/advanced.txt
+++ b/docs/topics/testing/advanced.txt
@@ -535,4 +535,4 @@ For more options like annotated HTML listings detailing missed lines, see the
 `coverage.py`_ docs.
 
 .. _coverage.py: http://nedbatchelder.com/code/coverage/
-.. _install coverage.py: http://pypi.python.org/pypi/coverage
+.. _install coverage.py: https://pypi.python.org/pypi/coverage
diff --git a/docs/topics/testing/overview.txt b/docs/topics/testing/overview.txt
index 0b550c4587..3bd8f09e2b 100644
--- a/docs/topics/testing/overview.txt
+++ b/docs/topics/testing/overview.txt
@@ -43,7 +43,7 @@ module defines tests using a class-based approach.
     If you want to continue to use the legacy ``unittest`` library, you can --
     you just won't get any of the nice new ``unittest2`` features.
 
-.. _unittest2: http://pypi.python.org/pypi/unittest2
+.. _unittest2: https://pypi.python.org/pypi/unittest2
 
 Here is an example which subclasses from :class:`django.test.TestCase`,
 which is a subclass of :class:`unittest.TestCase` that runs each test inside a
@@ -1096,7 +1096,7 @@ example above is just a tiny fraction of what the Selenium client can do; check
 out the `full reference`_ for more details.
 
 .. _Selenium: http://seleniumhq.org/
-.. _selenium package: http://pypi.python.org/pypi/selenium
+.. _selenium package: https://pypi.python.org/pypi/selenium
 .. _full reference: http://selenium-python.readthedocs.org/en/latest/api.html
 .. _Firefox: http://www.mozilla.com/firefox/