Fixed broken links in docs and comments.

14 files changed, 16 insertions, 16 deletions

diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 87fdbf8832..b1868b97fb 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -302,12 +302,12 @@ DATA_UPLOAD_MAX_NUMBER_FIELDS = 1000
 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
index 74c1da342e..e9d588e285 100644
--- a/django/contrib/gis/gdal/datasource.py
+++ b/django/contrib/gis/gdal/datasource.py
@@ -46,7 +46,7 @@ from django.utils.six.moves import range
 
 
 # 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
index ae9ba434e7..64cac5baa0 100644
--- a/django/contrib/gis/gdal/envelope.py
+++ b/django/contrib/gis/gdal/envelope.py
@@ -17,7 +17,7 @@ from django.contrib.gis.gdal.error import GDALException
 
 # 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
index 5c8c1a9233..7983c2f599 100644
--- a/django/contrib/gis/gdal/feature.py
+++ b/django/contrib/gis/gdal/feature.py
@@ -9,7 +9,7 @@ from django.utils.six.moves import range
 
 
 # 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
index 38a72b6e19..c2f16e90b2 100644
--- a/django/contrib/gis/gdal/field.py
+++ b/django/contrib/gis/gdal/field.py
@@ -8,7 +8,7 @@ from django.utils.encoding import force_text
 
 
 # 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
index 64e9efb5bb..1d76da18d8 100644
--- 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 @@ from django.utils.six.moves import range
 
 
 # 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
index 82b0d8dd5d..e7e13f9468 100644
--- a/django/contrib/gis/gdal/layer.py
+++ b/django/contrib/gis/gdal/layer.py
@@ -19,7 +19,7 @@ from django.utils.six.moves import range
 
 
 # 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
index 682e88d5ce..b80e6d30cd 100644
--- 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
index 209bcb5369..71bc5ff83b 100644
--- a/django/contrib/gis/measure.py
+++ b/django/contrib/gis/measure.py
@@ -32,7 +32,7 @@ and conversions.
 
 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.
 """
 from decimal import Decimal
diff --git a/django/core/cache/backends/memcached.py b/django/core/cache/backends/memcached.py
index 1573746329..ee6b3b7712 100644
--- a/django/core/cache/backends/memcached.py
+++ b/django/core/cache/backends/memcached.py
@@ -53,7 +53,7 @@ class BaseMemcachedCache(BaseCache):
             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
index 39b61fd52e..f5aea1a9a8 100644
--- a/django/core/files/temp.py
+++ b/django/core/files/temp.py
@@ -12,7 +12,7 @@ processes in a manner that works across platforms.
 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
index aa00f93f92..10426928ce 100644
--- a/django/db/backends/oracle/operations.py
+++ b/django/db/backends/oracle/operations.py
@@ -242,7 +242,7 @@ WHEN (new.%(col_name)s IS NULL)
             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
index f91a46bbbe..c63b446b21 100644
--- a/django/http/response.py
+++ b/django/http/response.py
@@ -240,7 +240,7 @@ class HttpResponseBase(six.Iterator):
         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
index a5307a4310..e0b2b0da6c 100644
--- a/django/test/utils.py
+++ b/django/test/utils.py
@@ -352,7 +352,7 @@ def compare_xml(want, got):
     ordering should not be important. Comment nodes are not considered in the
     comparison. Leading and trailing whitespace is ignored on both chunks.
 
-    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]+')