summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-01-18 13:29:33 -0500
committerTim Graham <timograham@gmail.com>2015-01-18 13:33:19 -0500
commitba27f895878bb155fefb8c1b9beee2c9f3d85b3f (patch)
treecc983703d24af4db44ba7d39ab76ff7a4e7d8c47 /docs/ref
parent3b89d2d540a96ffd33c294b576147ff800b16632 (diff)
Clarified a contrib.sites deprecation and added to 1.7 release notes.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/contrib/sites.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/docs/ref/contrib/sites.txt b/docs/ref/contrib/sites.txt
index 91fbd2af85..b3dd2933a7 100644
--- a/docs/ref/contrib/sites.txt
+++ b/docs/ref/contrib/sites.txt
@@ -472,9 +472,10 @@ a fallback when the database-backed sites framework is not available.
Sets the ``name`` and ``domain`` attributes to the value of
:meth:`~django.http.HttpRequest.get_host`.
- .. versionchanged:: 1.7
+ .. deprecated:: 1.7
- This class used to be defined in ``django.contrib.sites.models``.
+ This class used to be defined in ``django.contrib.sites.models``. The
+ old import location will work until Django 1.9.
A :class:`~django.contrib.sites.requests.RequestSite` object has a similar
interface to a normal :class:`~django.contrib.sites.models.Site` object,
@@ -498,9 +499,10 @@ Finally, to avoid repetitive fallback code, the framework provides a
object or a :class:`~django.contrib.sites.requests.RequestSite` object
based on the request.
- .. versionchanged:: 1.7
+ .. deprecated:: 1.7
This function used to be defined in ``django.contrib.sites.models``.
+ The old import location will work until Django 1.9.
.. versionchanged:: 1.8