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

Backport of 96f9769 from master
django · Jun 16, 2016 · 1cfcc02 · 1cfcc02
1 parent 99e51bf
commit 1cfcc02
Show file tree

Hide file tree

Showing 22 changed files with 25 additions and 25 deletions.
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
@@ -318,12 +318,12 @@
 FILE_UPLOAD_TEMP_DIR = None
 
 # The numeric mode to set newly-uploaded files to. The value should be a mode
-# you'd pass directly to os.chmod; see http://docs.python.org/lib/os-file-dir.html.
+# you'd pass directly to os.chmod; see https://docs.python.org/3/library/os.html#files-and-directories.
 FILE_UPLOAD_PERMISSIONS = None
 
 # The numeric mode to assign to newly-created directories, when uploading files.
 # The value should be a mode as you'd pass to os.chmod;
-# see http://docs.python.org/lib/os-file-dir.html.
+# see https://docs.python.org/3/library/os.html#files-and-directories.
 FILE_UPLOAD_DIRECTORY_PERMISSIONS = None
 
 # Python module path where user will place custom format definition.

diff --git a/django/contrib/gis/gdal/datasource.py b/django/contrib/gis/gdal/datasource.py
@@ -46,7 +46,7 @@
 
 
 # For more information, see the OGR C API source code:
-#  http://www.gdal.org/ogr/ogr__api_8h.html
+#  http://www.gdal.org/ogr__api_8h.html
 #
 # The OGR_DS_* routines are relevant here.
 class DataSource(GDALBase):

diff --git a/django/contrib/gis/gdal/envelope.py b/django/contrib/gis/gdal/envelope.py
@@ -17,7 +17,7 @@
 
 # The OGR definition of an Envelope is a C structure containing four doubles.
 #  See the 'ogr_core.h' source file for more information:
-#   http://www.gdal.org/ogr/ogr__core_8h-source.html
+#   http://www.gdal.org/ogr__core_8h_source.html
 class OGREnvelope(Structure):
     "Represents the OGREnvelope C Structure."
     _fields_ = [("MinX", c_double),

diff --git a/django/contrib/gis/gdal/feature.py b/django/contrib/gis/gdal/feature.py
@@ -9,7 +9,7 @@
 
 
 # For more information, see the OGR C API source code:
-#  http://www.gdal.org/ogr/ogr__api_8h.html
+#  http://www.gdal.org/ogr__api_8h.html
 #
 # The OGR_F_* routines are relevant here.
 class Feature(GDALBase):

diff --git a/django/contrib/gis/gdal/field.py b/django/contrib/gis/gdal/field.py
@@ -8,7 +8,7 @@
 
 
 # For more information, see the OGR C API source code:
-#  http://www.gdal.org/ogr/ogr__api_8h.html
+#  http://www.gdal.org/ogr__api_8h.html
 #
 # The OGR_Fld_* routines are relevant here.
 class Field(GDALBase):

diff --git a/django/contrib/gis/gdal/geometries.py b/django/contrib/gis/gdal/geometries.py
@@ -1,6 +1,6 @@
 """
  The OGRGeometry is a wrapper for using the OGR Geometry class
- (see http://www.gdal.org/ogr/classOGRGeometry.html).  OGRGeometry
+ (see http://www.gdal.org/classOGRGeometry.html).  OGRGeometry
  may be instantiated when reading geometries from OGR Data Sources
  (e.g. SHP files), or when given OGC WKT (a string).
 
@@ -56,7 +56,7 @@
 
 
 # For more information, see the OGR C API source code:
-#  http://www.gdal.org/ogr/ogr__api_8h.html
+#  http://www.gdal.org/ogr__api_8h.html
 #
 # The OGR_G_* routines are relevant here.
 class OGRGeometry(GDALBase):

diff --git a/django/contrib/gis/gdal/layer.py b/django/contrib/gis/gdal/layer.py
@@ -19,7 +19,7 @@
 
 
 # For more information, see the OGR C API source code:
-#  http://www.gdal.org/ogr/ogr__api_8h.html
+#  http://www.gdal.org/ogr__api_8h.html
 #
 # The OGR_L_* routines are relevant here.
 class Layer(GDALBase):

diff --git a/django/contrib/gis/maps/google/__init__.py b/django/contrib/gis/maps/google/__init__.py
@@ -52,7 +52,7 @@
 
   The following attributes may be set or customized in your local settings:
    * GOOGLE_MAPS_API_KEY: String of your Google Maps API key.  These are tied
-      to a domain.  May be obtained from http://www.google.com/apis/maps/
+      to a domain.  May be obtained from https://developers.google.com/maps/
    * GOOGLE_MAPS_API_VERSION (optional): Defaults to using "2.x"
    * GOOGLE_MAPS_URL (optional): Must have a substitution ('%s') for the API
       version.

diff --git a/django/contrib/gis/measure.py b/django/contrib/gis/measure.py
@@ -32,7 +32,7 @@
 
 Authors: Robert Coup, Justin Bronn, Riccardo Di Virgilio
 
-Inspired by GeoPy (http://exogen.case.edu/projects/geopy/)
+Inspired by GeoPy (https://github.com/geopy/geopy)
 and Geoff Biggs' PhD work on dimensioned units for robotics.
 """
 __all__ = ['A', 'Area', 'D', 'Distance']

diff --git a/django/core/cache/backends/memcached.py b/django/core/cache/backends/memcached.py
@@ -53,7 +53,7 @@ def get_backend_timeout(self, timeout=DEFAULT_TIMEOUT):
             timeout = -1
 
         if timeout > 2592000:  # 60*60*24*30, 30 days
-            # See http://code.google.com/p/memcached/wiki/NewProgramming#Expiration
+            # See https://github.com/memcached/memcached/wiki/Programming#expiration
             # "Expiration times can be set from 0, meaning "never expire", to
             # 30 days. Any time higher than 30 days is interpreted as a Unix
             # timestamp date. If you want to expire an object on January 1st of

diff --git a/django/core/files/temp.py b/django/core/files/temp.py
@@ -12,7 +12,7 @@
 Also note that the custom version of NamedTemporaryFile does not support the
 full range of keyword arguments available in Python 2.6+ and 3.0+.
 
-1: https://mail.python.org/pipermail/python-list/2005-December/336958.html
+1: https://mail.python.org/pipermail/python-list/2005-December/336957.html
 2: http://bugs.python.org/issue14243
 """
 

diff --git a/django/db/backends/oracle/operations.py b/django/db/backends/oracle/operations.py
@@ -242,7 +242,7 @@ def field_cast_sql(self, db_type, internal_type):
             return "%s"
 
     def last_executed_query(self, cursor, sql, params):
-        # http://cx-oracle.sourceforge.net/html/cursor.html#Cursor.statement
+        # https://cx-oracle.readthedocs.io/en/latest/cursor.html#Cursor.statement
         # The DB API definition does not define this attribute.
         statement = cursor.statement
         if statement and six.PY2 and not isinstance(statement, unicode):  # NOQA: unicode undefined on PY3

diff --git a/django/http/response.py b/django/http/response.py
@@ -238,7 +238,7 @@ def make_bytes(self, value):
         return force_bytes(value, self.charset)
 
     # These methods partially implement the file-like object interface.
-    # See http://docs.python.org/lib/bltin-file-objects.html
+    # See https://docs.python.org/3/library/io.html#io.IOBase
 
     # The WSGI server must call this method upon completion of the request.
     # See http://blog.dscpl.com.au/2012/10/obligations-for-calling-close-on.html

diff --git a/django/test/utils.py b/django/test/utils.py
@@ -295,7 +295,7 @@ def compare_xml(want, got):
     ordering should not be important. Comment nodes are not considered in the
     comparison.
 
-    Based on http://codespeak.net/svn/lxml/trunk/src/lxml/doctestcompare.py
+    Based on https://github.com/lxml/lxml/blob/master/src/lxml/doctestcompare.py
     """
     _norm_whitespace_re = re.compile(r'[ \t\n][ \t\n]+')
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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