summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/gis/admin.txt6
-rw-r--r--docs/ref/contrib/gis/forms-api.txt20
-rw-r--r--docs/releases/1.11.txt4
3 files changed, 19 insertions, 11 deletions
diff --git a/docs/ref/contrib/gis/admin.txt b/docs/ref/contrib/gis/admin.txt
index b873f51a05..01a936ef0f 100644
--- a/docs/ref/contrib/gis/admin.txt
+++ b/docs/ref/contrib/gis/admin.txt
@@ -42,8 +42,12 @@ GeoDjango's admin site
.. attribute:: openlayers_url
Link to the URL of the OpenLayers JavaScript. Defaults to
- ``'http://openlayers.org/api/2.13.1/OpenLayers.js'``.
+ ``'https://cdnjs.cloudflare.com/ajax/libs/openlayers/2.13.1/OpenLayers.js'``.
+ .. versionchanged:: 1.11
+
+ Older versions default to
+ ``'http://openlayers.org/api/2.13.1/OpenLayers.js'``.
.. attribute:: modifiable
diff --git a/docs/ref/contrib/gis/forms-api.txt b/docs/ref/contrib/gis/forms-api.txt
index 7580fac86a..dae758c8cc 100644
--- a/docs/ref/contrib/gis/forms-api.txt
+++ b/docs/ref/contrib/gis/forms-api.txt
@@ -153,16 +153,16 @@ Widget classes
``template_name`` is ``gis/openlayers.html``.
``OpenLayersWidget`` and :class:`OSMWidget` use the ``openlayers.js`` file
- hosted on the ``openlayers.org`` website. This works for basic usage
- during development, but isn't appropriate for a production deployment as
- ``openlayers.org/api/`` has no guaranteed uptime and runs on a slow server.
- You are therefore advised to subclass these widgets in order to specify
- your own version of the ``openlayers.js`` file in the ``js`` property of
- the inner ``Media`` class (see :ref:`assets-as-a-static-definition`). You
- can host a copy of ``openlayers.js``
- `tailored to your needs`_ on your own server or refer to a copy from a
- content-delivery network like https://cdnjs.com/. This will also allow
- you to serve the JavaScript file(s) using the ``https`` protocol if needed.
+ hosted on the ``cdnjs.cloudflare.com`` content-delivery network. You can
+ subclass these widgets in order to specify your own version of the
+ ``OpenLayers.js`` file `tailored to your needs`_ in the ``js`` property of
+ the inner ``Media`` class (see :ref:`assets-as-a-static-definition`).
+
+ .. versionchanged:: 1.11
+
+ Older versions use ``OpenLayers.js`` from ``openlayers.org`` which
+ isn't suitable for production use since it offers no guaranteed uptime
+ and runs on a slow server.
.. _tailored to your needs: http://docs.openlayers.org/library/deploying.html
diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt
index 20f2306ede..e45a64ffd5 100644
--- a/docs/releases/1.11.txt
+++ b/docs/releases/1.11.txt
@@ -116,6 +116,10 @@ Minor features
* Added support for the :lookup:`dwithin` lookup on SpatiaLite.
+* The OpenLayers-based form widgets now use ``OpenLayers.js`` from
+ ``https://cdnjs.cloudflare.com`` which is more suitable for production use
+ than the the old ``http://openlayers.org`` source.
+
:mod:`django.contrib.messages`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~