summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Lorant <maxime.lorant@gmail.com>2015-09-03 23:23:08 +0200
committerTim Graham <timograham@gmail.com>2015-09-04 08:14:21 -0400
commitc92cd22d02349b73d169a3a2ff3b6fe7a54bfb0c (patch)
treeaf2ce876b52b6663656abae97c7f1e7b90e3532b
parent526a413870b9844c2279f5855ad0774edb24f971 (diff)
Refs #25345 -- Updated links to code.google.com.
-rw-r--r--django/contrib/admin/static/admin/fonts/README.txt2
-rw-r--r--django/contrib/gis/maps/google/overlays.py10
-rw-r--r--django/utils/ipv6.py2
-rw-r--r--docs/howto/deployment/wsgi/modwsgi.txt6
-rw-r--r--docs/ref/databases.txt4
-rw-r--r--docs/topics/install.txt2
-rw-r--r--tests/validators/valid_urls.txt2
7 files changed, 13 insertions, 15 deletions
diff --git a/django/contrib/admin/static/admin/fonts/README.txt b/django/contrib/admin/static/admin/fonts/README.txt
index 93b476cfcb..cc2135a30a 100644
--- a/django/contrib/admin/static/admin/fonts/README.txt
+++ b/django/contrib/admin/static/admin/fonts/README.txt
@@ -1,2 +1,2 @@
-Roboto webfont source: https://code.google.com/p/roboto-webfont/
+Roboto webfont source: https://www.google.com/fonts/specimen/Roboto
Weights used in this project: Light (300), Regular (400), Bold (700)
diff --git a/django/contrib/gis/maps/google/overlays.py b/django/contrib/gis/maps/google/overlays.py
index 98ad97f770..51247ea47d 100644
--- a/django/contrib/gis/maps/google/overlays.py
+++ b/django/contrib/gis/maps/google/overlays.py
@@ -20,7 +20,7 @@ class GEvent(object):
add_event() call.
For more information please see the Google Maps API Reference:
- http://code.google.com/apis/maps/documentation/reference.html#GEvent
+ https://developers.google.com/maps/documentation/javascript/reference#event
Example:
@@ -84,7 +84,7 @@ class GPolygon(GOverlayBase):
"""
A Python wrapper for the Google GPolygon object. For more information
please see the Google Maps API Reference:
- http://code.google.com/apis/maps/documentation/reference.html#GPolygon
+ https://developers.google.com/maps/documentation/javascript/reference#Polygon
"""
def __init__(self, poly,
stroke_color='#0000ff', stroke_weight=2, stroke_opacity=1,
@@ -144,7 +144,7 @@ class GPolyline(GOverlayBase):
"""
A Python wrapper for the Google GPolyline object. For more information
please see the Google Maps API Reference:
- http://code.google.com/apis/maps/documentation/reference.html#GPolyline
+ https://developers.google.com/maps/documentation/javascript/reference#Polyline
"""
def __init__(self, geom, color='#0000ff', weight=2, opacity=1):
"""
@@ -195,7 +195,7 @@ class GIcon(object):
in turn, correspond to a subset of the attributes of the official GIcon
javascript object:
- http://code.google.com/apis/maps/documentation/reference.html#GIcon
+ https://developers.google.com/maps/documentation/javascript/reference#Icon
Because a Google map often uses several different icons, a name field has
been added to the required arguments.
@@ -267,7 +267,7 @@ class GMarker(GOverlayBase):
"""
A Python wrapper for the Google GMarker object. For more information
please see the Google Maps API Reference:
- http://code.google.com/apis/maps/documentation/reference.html#GMarker
+ https://developers.google.com/maps/documentation/javascript/reference#Marker
Example:
diff --git a/django/utils/ipv6.py b/django/utils/ipv6.py
index ce37760fb3..a0cd606043 100644
--- a/django/utils/ipv6.py
+++ b/django/utils/ipv6.py
@@ -1,5 +1,5 @@
# This code was mostly based on ipaddr-py
-# Copyright 2007 Google Inc. http://code.google.com/p/ipaddr-py/
+# Copyright 2007 Google Inc. https://github.com/google/ipaddr-py
# Licensed under the Apache License, Version 2.0 (the "License").
from django.core.exceptions import ValidationError
from django.utils.six.moves import range
diff --git a/docs/howto/deployment/wsgi/modwsgi.txt b/docs/howto/deployment/wsgi/modwsgi.txt
index 4e7d627b31..689effba17 100644
--- a/docs/howto/deployment/wsgi/modwsgi.txt
+++ b/docs/howto/deployment/wsgi/modwsgi.txt
@@ -6,7 +6,7 @@ Deploying Django with Apache_ and `mod_wsgi`_ is a tried and tested way to get
Django into production.
.. _Apache: http://httpd.apache.org/
-.. _mod_wsgi: http://code.google.com/p/modwsgi/
+.. _mod_wsgi: http://www.modwsgi.org/
mod_wsgi is an Apache module which can host any Python WSGI_ application,
including Django. Django will work with any version of Apache which supports
@@ -18,8 +18,8 @@ The `official mod_wsgi documentation`_ is fantastic; it's your source for all
the details about how to use mod_wsgi. You'll probably want to start with the
`installation and configuration documentation`_.
-.. _official mod_wsgi documentation: http://code.google.com/p/modwsgi/
-.. _installation and configuration documentation: http://code.google.com/p/modwsgi/wiki/InstallationInstructions
+.. _official mod_wsgi documentation: http://modwsgi.readthedocs.org/
+.. _installation and configuration documentation: http://modwsgi.readthedocs.org/en/develop/installation.html
Basic configuration
===================
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index 4eb3ffda09..3a846ef6ea 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -923,7 +923,6 @@ by 3rd parties that allow you to use other databases with Django:
* `Microsoft SQL Server`_
* Firebird_
* ODBC_
-* ADSDB_
The Django versions and ORM features supported by these unofficial backends
vary considerably. Queries regarding the specific capabilities of these
@@ -931,8 +930,7 @@ unofficial backends, along with any support queries, should be directed to
the support channels provided by each 3rd party project.
.. _SAP SQL Anywhere: https://github.com/sqlanywhere/sqlany-django
-.. _IBM DB2: http://code.google.com/p/ibm-db/
+.. _IBM DB2: https://pypi.python.org/pypi/ibm_db/
.. _Microsoft SQL Server: http://django-mssql.readthedocs.org/en/latest/
.. _Firebird: https://github.com/maxirobaina/django-firebird
.. _ODBC: https://github.com/lionheart/django-pyodbc/
-.. _ADSDB: http://code.google.com/p/adsdb-django/
diff --git a/docs/topics/install.txt b/docs/topics/install.txt
index 48c78c9e7c..027dd5db31 100644
--- a/docs/topics/install.txt
+++ b/docs/topics/install.txt
@@ -60,7 +60,7 @@ very well with `nginx`_. Additionally, Django follows the WSGI spec
.. _Apache: http://httpd.apache.org/
.. _nginx: http://nginx.org/
-.. _mod_wsgi: http://code.google.com/p/modwsgi/
+.. _mod_wsgi: http://www.modwsgi.org/
.. _database-installation:
diff --git a/tests/validators/valid_urls.txt b/tests/validators/valid_urls.txt
index 8c98f848e4..ad30811177 100644
--- a/tests/validators/valid_urls.txt
+++ b/tests/validators/valid_urls.txt
@@ -41,7 +41,7 @@ http://foo.com/blah_(wikipedia)_blah#cite-1
http://foo.com/unicode_(✪)_in_parens
http://foo.com/(something)?after=parens
http://☺.damowmow.com/
-http://code.google.com/events/#&product=browser
+http://djangoproject.com/events/#&product=browser
http://j.mp
ftp://foo.bar/baz
http://foo.bar/?q=Test%20URL-encoded%20stuff