Updated various links in docs

docs/faq/admin.txt

@@ -106,4 +106,4 @@ There *may* be minor stylistic differences between supported browsers—for
 example, some browsers may not support rounded corners. These are considered
 acceptable variations in rendering.
 
-.. _YUI's A-grade: http://yuilibrary.com/yui/docs/tutorials/gbs/
+.. _YUI's A-grade: https://github.com/yui/yui3/wiki/Graded-Browser-Support

docs/howto/auth-remote-user.txt

@@ -10,7 +10,7 @@ Windows Authentication or Apache and `mod_authnz_ldap`_, `CAS`_, `Cosign`_,
 `WebAuth`_, `mod_auth_sspi`_, etc.
 
 .. _mod_authnz_ldap: http://httpd.apache.org/docs/2.2/mod/mod_authnz_ldap.html
-.. _CAS: https://www.apereo.org/cas
+.. _CAS: https://www.apereo.org/projects/cas
 .. _Cosign: http://weblogin.org
 .. _WebAuth: http://www.stanford.edu/services/webauth/
 .. _mod_auth_sspi: http://sourceforge.net/projects/mod-auth-sspi

docs/howto/jython.txt

@@ -45,7 +45,7 @@ The `django-jython`_ project contains database backends and management commands
 for Django/Jython development. Note that the builtin Django backends won't work
 on top of Jython.
 
-.. _`django-jython`: http://code.google.com/p/django-jython/
+.. _`django-jython`: https://github.com/beachmachine/django-jython
 
 To install it, follow the `installation instructions`_ detailed on the project
 Web site. Also, read the `database backends`_ documentation there.

docs/howto/upgrade-version.txt

@@ -62,7 +62,7 @@ If you use some other installation process, you might have to manually
 :ref:`uninstall the old Django version <removing-old-versions-of-django>` and
 should look at the complete installation instructions.
 
-.. _pip: http://www.pip-installer.org/
+.. _pip: https://pip.pypa.io/
 .. _virtualenv: http://www.virtualenv.org/
 
 Testing

docs/howto/windows.txt

@@ -39,7 +39,7 @@ your Python version and follow the installation instructions given there.
 Install PIP
 ===========
 
-`PIP <http://www.pip-installer.org/>`_ is a package manager for Python that
+`PIP <https://pip.pypa.io/>`_ is a package manager for Python that
 uses the `Python Package Index <https://pypi.python.org>`_ to install Python
 packages. PIP will later be used to install Django from PyPI. If you've
 installed Python 3.4, ``pip`` is included so you may skip this section.
@@ -48,7 +48,7 @@ Open a command prompt and execute ``easy_install pip``. This will install
 ``pip`` on your system. This command will work if you have successfully
 installed Setuptools.
 
-Alternatively, go to `<http://www.pip-installer.org/en/latest/installing.html>`_
+Alternatively, go to `<https://pip.pypa.io/en/latest/installing.html>`_
 for installing/upgrading instructions.
 
 Install Django

docs/internals/contributing/committing-code.txt

@@ -176,7 +176,7 @@ Django's Git repository:
     commit message, GitHub will close the pull request, but the Trac plugin
     will also close the same numbered ticket in Trac.
 
-.. _Trac plugin: https://github.com/aaugustin/trac-github
+.. _Trac plugin: https://github.com/trac-hacks/trac-github
 
 * If your commit references a ticket in the Django `ticket tracker`_ but
   does *not* close the ticket, include the phrase "Refs #xxxxx", where "xxxxx"

docs/internals/contributing/writing-code/unit-tests.txt

@@ -183,7 +183,7 @@ associated tests will be skipped.
 .. _gettext: http://www.gnu.org/software/gettext/manual/gettext.html
 .. _selenium: https://pypi.python.org/pypi/selenium
 .. _sqlparse: https://pypi.python.org/pypi/sqlparse
-.. _pip requirements files: http://www.pip-installer.org/en/latest/user_guide.html#requirements-files
+.. _pip requirements files: https://pip.pypa.io/en/latest/user_guide.html#requirements-files
 
 Code coverage
 ~~~~~~~~~~~~~

docs/internals/team.txt

@@ -52,7 +52,7 @@ Journal-World`_ of Lawrence, Kansas, USA.
 .. _soundslice: https://www.soundslice.com/
 .. _simon willison: http://simonwillison.net/
 .. _web-development blog: `simon willison`_
-.. _jacob kaplan-moss: http://jacobian.org/
+.. _jacob kaplan-moss: https://jacobian.org/
 .. _revolution systems: http://revsys.com/
 .. _wilson miner: http://wilsonminer.com/
 .. _heroku: https://heroku.com/
@@ -151,7 +151,7 @@ Karen Tracey
     .. _Jannis Leidel: https://jezdez.com/
     .. _Bauhaus-University Weimar: http://www.uni-weimar.de/
     .. _virtualenv: http://www.virtualenv.org/
-    .. _pip: http://www.pip-installer.org/
+    .. _pip: https://pip.pypa.io/
     .. _Mozilla: https://www.mozilla.org/
 
 `Andrew Godwin`_
@@ -232,7 +232,7 @@ Tim Graham
     things Django and Python.
 
     .. _Idan Gazit: http://idan.gazit.me
-    .. _photographer: http://flickr.com/photos/idangazit
+    .. _photographer: https://flickr.com/photos/idangazit
     .. _Pixane: http://pixane.com
     .. _Skills: http://skillsapp.com
 
@@ -421,8 +421,8 @@ Daniele Procida
     that goal in mind. Erik lives in Amsterdam, The Netherlands.
 
     .. _Erik Romijn: http://erik.io/
-    .. _Solid Links: http://solidlinks.nl/
-    .. _Erik's Pony Checkup: http://ponycheckup.com/
+    .. _Solid Links: https://solidlinks.nl/
+    .. _Erik's Pony Checkup: https://ponycheckup.com/
 
 `Loïc Bistuer`_
     Loïc studied telecommunications engineering and works as an independent
@@ -537,7 +537,7 @@ Daniele Procida
 
     .. _Tomek Paczkowski: https://hauru.eu
     .. _DjangoCon Europe 2013: http://love.djangocircus.com
-    .. _Django Girls: http://djangogirls.org
+    .. _Django Girls: https://djangogirls.org
     .. _Squirrel: http://squirrel.me
 
 `Ola Sitarska`_
@@ -558,8 +558,8 @@ Daniele Procida
     .. _Ola Sitarska: http://ola.sitarska.com/
     .. _DjangoCon Europe 2013: http://love.djangocircus.com
     .. _Django Girls Tutorial: http://tutorial.djangogirls.org
-    .. _Django Girls: http://djangogirls.org
-    .. _Potato: http://p.ota.to
+    .. _Django Girls: https://djangogirls.org
+    .. _Potato: https://p.ota.to
 
 Past team members
 =================

docs/ref/clickjacking.txt

@@ -35,7 +35,7 @@ load the resource in a frame if the request originated from the same site. If
 the header is set to ``DENY`` then the browser will block the resource from
 loading in a frame no matter which site made the request.
 
-.. _X-Frame-Options: https://developer.mozilla.org/en/The_X-FRAME-OPTIONS_response_header
+.. _X-Frame-Options: https://developer.mozilla.org/en-US/docs/Web/HTTP/X-Frame-Options
 
 Django provides a few simple ways to include this header in responses from your
 site:
@@ -127,5 +127,5 @@ See also
 
 A `complete list`_ of browsers supporting ``X-Frame-Options``.
 
-.. _complete list: https://developer.mozilla.org/en/The_X-FRAME-OPTIONS_response_header#Browser_compatibility
+.. _complete list: https://developer.mozilla.org/en-US/docs/Web/HTTP/X-Frame-Options#Browser_compatibility
 .. _other clickjacking prevention techniques: https://en.wikipedia.org/wiki/Clickjacking#Prevention

docs/ref/contrib/gis/gdal.txt

@@ -22,7 +22,7 @@ to raster (image) data.
      some of the capabilities of OGR and GDAL's raster features at this time.
 
 __ http://www.gdal.org/
-__ http://www.gdal.org/ogr/
+__ http://www.gdal.org/ogr_arch.html
 
 Overview
 ========
@@ -94,7 +94,7 @@ each feature in that layer.
 
    Returns the name of the data source.
 
-__ http://www.gdal.org/ogr/ogr_formats.html
+__ http://www.gdal.org/ogr_formats.html
 
 ``Layer``
 ---------
@@ -455,7 +455,7 @@ systems and coordinate transformation::
    reading vector data from :class:`Layer` (which is in turn a part of
    a :class:`DataSource`).
 
-   __ http://www.gdal.org/ogr/classOGRGeometry.html
+   __ http://www.gdal.org/classOGRGeometry.html
 
    .. classmethod:: from_bbox(bbox)
 

docs/ref/contrib/gis/install/geolibs.txt

@@ -263,4 +263,4 @@ the GDAL library.  For example::
        It is easier to install the shifting files now, then to have debug a
        problem caused by their absence later.
 .. [#] Specifically, GeoDjango provides support for the `OGR
-       <http://gdal.org/ogr>`_ library, a component of GDAL.
+       <http://gdal.org/ogr_arch.html>`_ library, a component of GDAL.

docs/ref/contrib/gis/install/index.txt

@@ -234,15 +234,12 @@ Foundation, however, this is not required.
 Python
 ^^^^^^
 
-Although OS X comes with Python installed, users can use framework
-installers (`2.7`__, `3.2`__ and `3.3`__ are available) provided by
-the Python Software Foundation.  An advantage to using the installer is
-that OS X's Python will remain "pristine" for internal operating system
-use.
-
-__ https://python.org/ftp/python/2.7.5/
-__ https://python.org/ftp/python/3.2.5/
-__ https://python.org/ftp/python/3.3.2/
+Although OS X comes with Python installed, users can use `framework
+installers`__ provided by the Python Software Foundation.  An advantage to
+using the installer is that OS X's Python will remain "pristine" for internal
+operating system use.
+
+__ https://www.python.org/ftp/python/
 
 .. note::
 

docs/ref/contrib/gis/measure.txt

@@ -174,5 +174,5 @@ Measurement API
 
 .. rubric:: Footnotes
 .. [#] `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 was inspired by Brian Beck's work in `geopy <https://github.com/geopy/geopy/>`_
        and Geoff Biggs' PhD work on dimensioned units for robotics.

docs/ref/contrib/gis/model-api.txt

@@ -118,7 +118,7 @@ are not.
 
 Most people are familiar with using latitude and longitude to reference a
 location on the earth's surface.  However, latitude and longitude are angles,
-not distances. [#fnharvard]_  In other words, while the shortest path between two points on
+not distances. In other words, while the shortest path between two points on
 a flat surface is a straight line, the shortest path between two points on a curved
 surface (such as the earth) is an *arc* of a `great circle`__. [#fnthematic]_  Thus,
 additional computation is required to obtain distances in planar units (e.g.,
@@ -281,7 +281,6 @@ for example::
 .. [#fnogc] OpenGIS Consortium, Inc., `Simple Feature Specification For SQL <http://www.opengeospatial.org/standards/sfs>`_.
 .. [#fnogcsrid] *See id.* at Ch. 2.3.8, p. 39 (Geometry Values and Spatial Reference Systems).
 .. [#fnsrid] Typically, SRID integer corresponds to an EPSG (`European Petroleum Survey Group <http://www.epsg.org>`_) identifier.  However, it may also be associated with custom projections defined in spatial database's spatial reference systems table.
-.. [#fnharvard] Harvard Graduate School of Design, `An Overview of Geodesy and Geographic Referencing Systems <http://www.gsd.harvard.edu/gis/manual/projections/fundamentals/>`_.  This is an excellent resource for an overview of principles relating to geographic and Cartesian coordinate systems.
 .. [#fnthematic] Terry A. Slocum, Robert B. McMaster, Fritz C. Kessler, & Hugh H. Howard, *Thematic Cartography and Geographic Visualization* (Prentice Hall, 2nd edition), at Ch. 7.1.3.
 .. [#fndist] This limitation does not apply to PostGIS.
 .. [#fngeography] Please refer to the `PostGIS Geography Type <http://postgis.net/docs/manual-2.1/using_postgis_dbmanagement.html#PostGIS_Geography>`_ documentation for more details.

docs/releases/1.0-porting-guide.txt

@@ -79,8 +79,8 @@ see `the admin`_ below for more details.
     A contributor to djangosnippets__ has written a script that'll `scan your
     models.py and generate a corresponding admin.py`__.
 
-    __ http://www.djangosnippets.org/
-    __ http://www.djangosnippets.org/snippets/603/
+    __ https://www.djangosnippets.org/
+    __ https://www.djangosnippets.org/snippets/603/
 
 Example
 ~~~~~~~

docs/releases/1.9.txt

@@ -122,7 +122,7 @@ The admin sports a modern, flat design. It still provides a fully-functional
 experience to `YUI's A-grade`_ browsers. Older browser may experience varying
 levels of graceful degradation.
 
-.. _YUI's A-grade: http://yuilibrary.com/yui/docs/tutorials/gbs/
+.. _YUI's A-grade: https://github.com/yui/yui3/wiki/Graded-Browser-Support
 
 Minor features
 ~~~~~~~~~~~~~~

docs/topics/install.txt

@@ -184,10 +184,10 @@ This is the recommended way to install Django.
    privileges, and this will install Django in the virtualenv's
    ``site-packages`` directory.
 
-.. _pip: http://www.pip-installer.org/
+.. _pip: https://pip.pypa.io/
 .. _virtualenv: http://www.virtualenv.org/
 .. _virtualenvwrapper: http://virtualenvwrapper.readthedocs.org/en/latest/
-.. _standalone pip installer: http://www.pip-installer.org/en/latest/installing.html#install-pip
+.. _standalone pip installer: https://pip.pypa.io/en/latest/installing.html#install-pip
 
 Installing an official release manually
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

docs/topics/python3.txt

@@ -245,7 +245,7 @@ consequence, the following pattern is sometimes necessary::
 
 Be cautious if you have to `index bytestrings`_.
 
-.. _index bytestrings: https://docs.python.org/3/howto/pyporting.html#indexing-bytes-objects
+.. _index bytestrings: https://docs.python.org/3/howto/pyporting.html#text-versus-binary-data
 
 Exceptions
 ~~~~~~~~~~

docs/topics/security.txt

@@ -271,4 +271,4 @@ security protection of the Web server, operating system and other components.
 * It is a good idea to limit the accessibility of your caching system and
   database using a firewall.
 
-.. _LimitRequestBody: http://httpd.apache.org/docs/2.2/mod/core.html#limitrequestbody
+.. _LimitRequestBody: http://httpd.apache.org/docs/2.4/mod/core.html#limitrequestbody