From 6bdb3b1135d1bd7b2dc24131b9d26ac19ebdba67 Mon Sep 17 00:00:00 2001
From: Mel Collins <mel@raumkraut.net>
Date: Mon, 13 May 2013 13:38:53 +0200
Subject: Fixed #13518 -- Added FILE_UPLOAD_DIRECTORY_PERMISSIONS setting

This setting does for new directories what FILE_UPLOAD_PERMISSIONS
does for new files.

Thanks jacob@ for the suggestion.
---
 docs/ref/settings.txt | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'docs/ref')

diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 38d7275aed..90545d96c5 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1108,6 +1108,19 @@ Default: ``2621440`` (i.e. 2.5 MB).
 The maximum size (in bytes) that an upload will be before it gets streamed to
 the file system. See :doc:`/topics/files` for details.
 
+.. setting:: FILE_UPLOAD_DIRECTORY_PERMISSIONS
+
+FILE_UPLOAD_DIRECTORY_PERMISSIONS
+---------------------------------
+
+.. versionadded:: 1.7
+
+Default: ``None``
+
+The numeric mode to apply to directories created in the process of
+uploading files. This value mirrors the functionality and caveats of
+the :setting:`FILE_UPLOAD_PERMISSIONS` setting.
+
 .. setting:: FILE_UPLOAD_PERMISSIONS
 
 FILE_UPLOAD_PERMISSIONS
-- 
cgit v1.3


From 907ef9d0d157c47c66bf265dca93a0bee8664ea3 Mon Sep 17 00:00:00 2001
From: Matt Johnson <mdj2@pdx.edu>
Date: Tue, 4 Jun 2013 22:41:49 +0200
Subject: Fixed #20555 -- Make subwidget id attribute available

In `BoundField.__iter__`, the widget's id attribute is now passed to
each subwidget. A new id_for_label property was added to ChoiceInput.
---
 django/forms/forms.py                   |  4 +-
 django/forms/widgets.py                 | 15 ++++----
 docs/ref/forms/widgets.txt              | 65 +++++++++++++++++++++------------
 docs/releases/1.7.txt                   |  7 ++++
 tests/forms_tests/tests/test_widgets.py | 16 ++++++++
 5 files changed, 75 insertions(+), 32 deletions(-)

(limited to 'docs/ref')

diff --git a/django/forms/forms.py b/django/forms/forms.py
index c2b700ce77..ec51507981 100644
--- a/django/forms/forms.py
+++ b/django/forms/forms.py
@@ -434,7 +434,9 @@ class BoundField(object):
         This really is only useful for RadioSelect widgets, so that you can
         iterate over individual radio buttons in a template.
         """
-        for subwidget in self.field.widget.subwidgets(self.html_name, self.value()):
+        id_ = self.field.widget.attrs.get('id') or self.auto_id
+        attrs = {'id': id_} if id_ else {}
+        for subwidget in self.field.widget.subwidgets(self.html_name, self.value(), attrs):
             yield subwidget
 
     def __len__(self):
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index 0a5059a9c2..98d47d0b00 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -601,16 +601,15 @@ class ChoiceInput(SubWidget):
         self.choice_value = force_text(choice[0])
         self.choice_label = force_text(choice[1])
         self.index = index
+        if 'id' in self.attrs:
+            self.attrs['id'] += "_%d" % self.index
 
     def __str__(self):
         return self.render()
 
     def render(self, name=None, value=None, attrs=None, choices=()):
-        name = name or self.name
-        value = value or self.value
-        attrs = attrs or self.attrs
-        if 'id' in self.attrs:
-            label_for = format_html(' for="{0}_{1}"', self.attrs['id'], self.index)
+        if self.id_for_label:
+            label_for = format_html(' for="{0}"', self.id_for_label)
         else:
             label_for = ''
         return format_html('<label{0}>{1} {2}</label>', label_for, self.tag(), self.choice_label)
@@ -619,13 +618,15 @@ class ChoiceInput(SubWidget):
         return self.value == self.choice_value
 
     def tag(self):
-        if 'id' in self.attrs:
-            self.attrs['id'] = '%s_%s' % (self.attrs['id'], self.index)
         final_attrs = dict(self.attrs, type=self.input_type, name=self.name, value=self.choice_value)
         if self.is_checked():
             final_attrs['checked'] = 'checked'
         return format_html('<input{0} />', flatatt(final_attrs))
 
+    @property
+    def id_for_label(self):
+        return self.attrs.get('id', '')
+
 
 class RadioChoiceInput(ChoiceInput):
     input_type = 'radio'
diff --git a/docs/ref/forms/widgets.txt b/docs/ref/forms/widgets.txt
index 080d1fea86..951fbfa310 100644
--- a/docs/ref/forms/widgets.txt
+++ b/docs/ref/forms/widgets.txt
@@ -590,25 +590,26 @@ Selector and checkbox widgets
     .. code-block:: html
 
         <div class="myradio">
-            <label><input type="radio" name="beatles" value="john" /> John</label>
+            <label for="id_beatles_0"><input id="id_beatles_0" name="beatles" type="radio" value="john" /> John</label>
         </div>
         <div class="myradio">
-            <label><input type="radio" name="beatles" value="paul" /> Paul</label>
+            <label for="id_beatles_1"><input id="id_beatles_1" name="beatles" type="radio" value="paul" /> Paul</label>
         </div>
         <div class="myradio">
-            <label><input type="radio" name="beatles" value="george" /> George</label>
+            <label for="id_beatles_2"><input id="id_beatles_2" name="beatles" type="radio" value="george" /> George</label>
         </div>
         <div class="myradio">
-            <label><input type="radio" name="beatles" value="ringo" /> Ringo</label>
+            <label for="id_beatles_3"><input id="id_beatles_3" name="beatles" type="radio" value="ringo" /> Ringo</label>
         </div>
 
     That included the ``<label>`` tags. To get more granular, you can use each
-    radio button's ``tag`` and ``choice_label`` attributes. For example, this template...
+    radio button's ``tag``, ``choice_label`` and ``id_for_label`` attributes.
+    For example, this template...
 
     .. code-block:: html+django
 
         {% for radio in myform.beatles %}
-            <label>
+            <label for="{{ radio.id_for_label }}">
                 {{ radio.choice_label }}
                 <span class="radio">{{ radio.tag }}</span>
             </label>
@@ -618,31 +619,41 @@ Selector and checkbox widgets
 
     .. code-block:: html
 
-            <label>
-                John
-                <span class="radio"><input type="radio" name="beatles" value="john" /></span>
-            </label>
-            <label>
-                Paul
-                <span class="radio"><input type="radio" name="beatles" value="paul" /></span>
-            </label>
-            <label>
-                George
-                <span class="radio"><input type="radio" name="beatles" value="george" /></span>
-            </label>
-            <label>
-                Ringo
-                <span class="radio"><input type="radio" name="beatles" value="ringo" /></span>
-            </label>
+        <label for="id_beatles_0">
+            John
+            <span class="radio"><input id="id_beatles_0" name="beatles" type="radio" value="john" /></span>
+        </label>
+
+        <label for="id_beatles_1">
+            Paul
+            <span class="radio"><input id="id_beatles_1" name="beatles" type="radio" value="paul" /></span>
+        </label>
+
+        <label for="id_beatles_2">
+            George
+            <span class="radio"><input id="id_beatles_2" name="beatles" type="radio" value="george" /></span>
+        </label>
 
-    If you decide not to loop over the radio buttons -- e.g., if your template simply includes
-    ``{{ myform.beatles }}`` -- they'll be output in a ``<ul>`` with ``<li>`` tags, as above.
+        <label for="id_beatles_3">
+            Ringo
+            <span class="radio"><input id="id_beatles_3" name="beatles" type="radio" value="ringo" /></span>
+        </label>
+
+    If you decide not to loop over the radio buttons -- e.g., if your template
+    simply includes ``{{ myform.beatles }}`` -- they'll be output in a ``<ul>``
+    with ``<li>`` tags, as above.
 
 .. versionchanged:: 1.6
 
 The outer ``<ul>`` container will now receive the ``id`` attribute defined on
 the widget.
 
+.. versionchanged:: 1.7
+
+    When looping over the radio buttons, the ``label`` and ``input`` tags include
+    ``for`` and ``id`` attributes, respectively. Each radio button has an
+    ``id_for_label`` attribute to output the element's ID.
+
 ``CheckboxSelectMultiple``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -666,6 +677,12 @@ the widget.
 Like :class:`RadioSelect`, you can now loop over the individual checkboxes making
 up the lists. See the documentation of :class:`RadioSelect` for more details.
 
+.. versionchanged:: 1.7
+
+    When looping over the checkboxes, the ``label`` and ``input`` tags include
+    ``for`` and ``id`` attributes, respectively. Each checkbox has an
+    ``id_for_label`` attribute to output the element's ID.
+
 .. _file-upload-widgets:
 
 File upload widgets
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 6ea957d959..9fe8fc89df 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -145,6 +145,13 @@ Minor features
 * Explicit :class:`~django.db.models.OneToOneField` for
   :ref:`multi-table-inheritance` are now discovered in abstract classes.
 
+* The ``<label>`` and ``<input>`` tags rendered by
+  :class:`~django.forms.RadioSelect` and
+  :class:`~django.forms.CheckboxSelectMultiple` when looping over the radio
+  buttons or checkboxes now include ``for`` and ``id`` attributes, respectively.
+  Each radio button or checkbox includes an ``id_for_label`` attribute to
+  output the element's ID.
+
 Backwards incompatible changes in 1.7
 =====================================
 
diff --git a/tests/forms_tests/tests/test_widgets.py b/tests/forms_tests/tests/test_widgets.py
index 06ee2d6c53..3f11771d7a 100644
--- a/tests/forms_tests/tests/test_widgets.py
+++ b/tests/forms_tests/tests/test_widgets.py
@@ -833,6 +833,22 @@ beatle J R Ringo False""")
         with self.assertRaises(IndexError):
             r[42]
 
+    def test_subwidget(self):
+        # Each subwidget tag gets a separate ID when the widget has an ID specified
+        self.assertHTMLEqual("\n".join([c.tag() for c in CheckboxSelectMultiple(attrs={'id': 'abc'}).subwidgets('letters', list('ac'), choices=zip(list('abc'), list('ABC')))]), """<input checked="checked" type="checkbox" name="letters" value="a" id="abc_0" />
+<input type="checkbox" name="letters" value="b" id="abc_1" />
+<input checked="checked" type="checkbox" name="letters" value="c" id="abc_2" />""")
+
+        # Each subwidget tag does not get an ID if the widget does not have an ID specified
+        self.assertHTMLEqual("\n".join([c.tag() for c in CheckboxSelectMultiple().subwidgets('letters', list('ac'), choices=zip(list('abc'), list('ABC')))]), """<input checked="checked" type="checkbox" name="letters" value="a" />
+<input type="checkbox" name="letters" value="b" />
+<input checked="checked" type="checkbox" name="letters" value="c" />""")
+
+        # The id_for_label property of the subwidget should return the ID that is used on the subwidget's tag
+        self.assertHTMLEqual("\n".join(['<input type="checkbox" name="letters" value="%s" id="%s" />' % (c.choice_value, c.id_for_label) for c in CheckboxSelectMultiple(attrs={'id': 'abc'}).subwidgets('letters', [], choices=zip(list('abc'), list('ABC')))]), """<input type="checkbox" name="letters" value="a" id="abc_0" />
+<input type="checkbox" name="letters" value="b" id="abc_1" />
+<input type="checkbox" name="letters" value="c" id="abc_2" />""")
+
     def test_multi(self):
         class MyMultiWidget(MultiWidget):
             def decompress(self, value):
-- 
cgit v1.3


From 71c491972eecae8783cf46e69fac7e5f9f83fc59 Mon Sep 17 00:00:00 2001
From: SusanTan <onceuponatimeforever@gmail.com>
Date: Sat, 10 Aug 2013 01:13:41 -0700
Subject: Fixed #11400 -- Passed kwargs from AbstractUser.email_user() to
 send_mail()

Thanks Jug_ for suggestion, john_scott for the initial patch,
and Tim Graham for code review.
---
 AUTHORS                                  |  1 +
 django/contrib/auth/models.py            |  4 ++--
 django/contrib/auth/tests/test_models.py | 26 +++++++++++++++++++++++++-
 docs/ref/contrib/auth.txt                |  7 ++++++-
 docs/releases/1.7.txt                    |  4 ++++
 5 files changed, 38 insertions(+), 4 deletions(-)

(limited to 'docs/ref')

diff --git a/AUTHORS b/AUTHORS
index e41a4aa4db..cec85c093f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -575,6 +575,7 @@ answer newbie questions, and generally made Django that much better:
     Aaron Swartz <http://www.aaronsw.com/>
     Ville Säävuori <http://www.unessa.net/>
     Mart Sõmermaa <http://mrts.pri.ee/>
+    Susan Tan <susan.tan.fleckerl@gmail.com>
     Christian Tanzer <tanzer@swing.co.at>
     Tyler Tarabula <tyler.tarabula@gmail.com>
     Tyson Tate <tyson@fallingbullets.com>
diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py
index cf3d37e5c3..cf1ca8ca1f 100644
--- a/django/contrib/auth/models.py
+++ b/django/contrib/auth/models.py
@@ -400,11 +400,11 @@ class AbstractUser(AbstractBaseUser, PermissionsMixin):
         "Returns the short name for the user."
         return self.first_name
 
-    def email_user(self, subject, message, from_email=None):
+    def email_user(self, subject, message, from_email=None, **kwargs):
         """
         Sends an email to this User.
         """
-        send_mail(subject, message, from_email, [self.email])
+        send_mail(subject, message, from_email, [self.email], **kwargs)
 
 
 class User(AbstractUser):
diff --git a/django/contrib/auth/tests/test_models.py b/django/contrib/auth/tests/test_models.py
index fa20775a8d..1373a3c1c1 100644
--- a/django/contrib/auth/tests/test_models.py
+++ b/django/contrib/auth/tests/test_models.py
@@ -1,6 +1,7 @@
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import Group, User, UserManager
+from django.contrib.auth.models import AbstractUser, Group, User, UserManager
 from django.contrib.auth.tests.utils import skipIfCustomUser
+from django.core import mail
 from django.db.models.signals import post_save
 from django.test import TestCase
 from django.test.utils import override_settings
@@ -73,6 +74,29 @@ class UserManagerTestCase(TestCase):
                                   User.objects.create_user, username='')
 
 
+class AbstractUserTestCase(TestCase):
+    def test_email_user(self):
+        # valid send_mail parameters
+        kwargs = {
+            "fail_silently": False,
+            "auth_user": None,
+            "auth_password": None,
+            "connection": None,
+            "html_message": None,
+        }
+        abstract_user = AbstractUser(email='foo@bar.com')
+        abstract_user.email_user(subject="Subject here",
+            message="This is a message", from_email="from@domain.com", **kwargs)
+        # Test that one message has been sent.
+        self.assertEqual(len(mail.outbox), 1)
+        # Verify that test email contains the correct attributes:
+        message = mail.outbox[0]
+        self.assertEqual(message.subject, "Subject here")
+        self.assertEqual(message.body, "This is a message")
+        self.assertEqual(message.from_email, "from@domain.com")
+        self.assertEqual(message.to, [abstract_user.email])
+
+
 class IsActiveTestCase(TestCase):
     """
     Tests the behavior of the guaranteed is_active attribute
diff --git a/docs/ref/contrib/auth.txt b/docs/ref/contrib/auth.txt
index 4fe87e9872..ba4c9425a5 100644
--- a/docs/ref/contrib/auth.txt
+++ b/docs/ref/contrib/auth.txt
@@ -215,11 +215,16 @@ Methods
         (the Django app label). If the user is inactive, this method will
         always return ``False``.
 
-    .. method:: email_user(subject, message, from_email=None)
+    .. method:: email_user(subject, message, from_email=None, **kwargs)
 
         Sends an email to the user. If ``from_email`` is ``None``, Django uses
         the :setting:`DEFAULT_FROM_EMAIL`.
 
+        .. versionchanged:: 1.7
+
+            Any ``**kwargs`` are passed to the underlying
+            :meth:`~django.core.mail.send_mail()` call.
+
 Manager methods
 ---------------
 
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 9fe8fc89df..f4bbd058d6 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -152,6 +152,10 @@ Minor features
   Each radio button or checkbox includes an ``id_for_label`` attribute to
   output the element's ID.
 
+* Any ``**kwargs`` passed to
+  :meth:`~django.contrib.auth.models.User.email_user()` are passed to the
+  underlying :meth:`~django.core.mail.send_mail()` call.
+
 Backwards incompatible changes in 1.7
 =====================================
 
-- 
cgit v1.3


From ff410565bf1cf1a2905c1ef83db408d455211446 Mon Sep 17 00:00:00 2001
From: Jonathan Slenders <jonathan@slenders.be>
Date: Wed, 14 Aug 2013 16:14:32 +0200
Subject: Fixed #20709 -- Allowed {% widthratio %} to accept an "as" parameter.

Thanks clay.evil@ for the suggestion.
---
 AUTHORS                         |  1 +
 django/template/defaulttags.py  | 35 ++++++++++++++++++++++++++++-------
 docs/ref/templates/builtins.txt |  8 ++++++++
 docs/releases/1.7.txt           |  3 +++
 tests/template_tests/tests.py   |  7 +++++++
 5 files changed, 47 insertions(+), 7 deletions(-)

(limited to 'docs/ref')

diff --git a/AUTHORS b/AUTHORS
index cec85c093f..215a06235a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -539,6 +539,7 @@ answer newbie questions, and generally made Django that much better:
     Brenton Simpson <http://theillustratedlife.com>
     Jozko Skrablin <jozko.skrablin@gmail.com>
     Ben Slavin <benjamin.slavin@gmail.com>
+    Jonathan Slenders
     sloonz <simon.lipp@insa-lyon.fr>
     Paul Smith <blinkylights23@gmail.com>
     Steven L. Smith (fvox13) <steven@stevenlsmith.com>
diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index 5c9490f749..921a3594cc 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -458,10 +458,11 @@ class VerbatimNode(Node):
         return self.content
 
 class WidthRatioNode(Node):
-    def __init__(self, val_expr, max_expr, max_width):
+    def __init__(self, val_expr, max_expr, max_width, asvar=None):
         self.val_expr = val_expr
         self.max_expr = max_expr
         self.max_width = max_width
+        self.asvar = asvar
 
     def render(self, context):
         try:
@@ -480,7 +481,13 @@ class WidthRatioNode(Node):
             return '0'
         except (ValueError, TypeError):
             return ''
-        return str(int(round(ratio)))
+        result = str(int(round(ratio)))
+
+        if self.asvar:
+            context[self.asvar] = result
+            return ''
+        else:
+            return result
 
 class WithNode(Node):
     def __init__(self, var, name, nodelist, extra_context=None):
@@ -1353,20 +1360,34 @@ def widthratio(parser, token):
 
     For example::
 
-        <img src='bar.gif' height='10' width='{% widthratio this_value max_value max_width %}' />
+        <img src="bar.png" alt="Bar"
+             height="10" width="{% widthratio this_value max_value max_width %}" />
 
     If ``this_value`` is 175, ``max_value`` is 200, and ``max_width`` is 100,
     the image in the above example will be 88 pixels wide
     (because 175/200 = .875; .875 * 100 = 87.5 which is rounded up to 88).
+
+    In some cases you might want to capture the result of widthratio in a
+    variable. It can be useful for instance in a blocktrans like this::
+
+        {% widthratio this_value max_value max_width as width %}
+        {% blocktrans %}The width is: {{ width }}{% endblocktrans %}
     """
     bits = token.split_contents()
-    if len(bits) != 4:
-        raise TemplateSyntaxError("widthratio takes three arguments")
-    tag, this_value_expr, max_value_expr, max_width = bits
+    if len(bits) == 4:
+        tag, this_value_expr, max_value_expr, max_width = bits
+        asvar = None
+    elif len(bits) == 6:
+        tag, this_value_expr, max_value_expr, max_width, as_, asvar = bits
+        if as_ != 'as':
+            raise TemplateSyntaxError("Invalid syntax in widthratio tag. Expecting 'as' keyword")
+    else:
+        raise TemplateSyntaxError("widthratio takes at least three arguments")
 
     return WidthRatioNode(parser.compile_filter(this_value_expr),
                           parser.compile_filter(max_value_expr),
-                          parser.compile_filter(max_width))
+                          parser.compile_filter(max_width),
+                          asvar=asvar)
 
 @register.tag('with')
 def do_with(parser, token):
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index afb6e4b123..1fadf77d50 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1108,6 +1108,14 @@ If ``this_value`` is 175, ``max_value`` is 200, and ``max_width`` is 100, the
 image in the above example will be 88 pixels wide
 (because 175/200 = .875; .875 * 100 = 87.5 which is rounded up to 88).
 
+.. versionchanged:: 1.7
+
+In some cases you might want to capture the result of ``widthratio`` in a
+variable. It can be useful, for instance, in a :ttag:`blocktrans` like this::
+
+    {% widthratio this_value max_value max_width as width %}
+    {% blocktrans %}The width is: {{ width }}{% endblocktrans %}
+
 .. templatetag:: with
 
 with
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index f4bbd058d6..6f6efcb3ca 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -156,6 +156,9 @@ Minor features
   :meth:`~django.contrib.auth.models.User.email_user()` are passed to the
   underlying :meth:`~django.core.mail.send_mail()` call.
 
+* The :ttag:`widthratio` template tag now accepts an "as" parameter to capture
+  the result in a variable.
+
 Backwards incompatible changes in 1.7
 =====================================
 
diff --git a/tests/template_tests/tests.py b/tests/template_tests/tests.py
index aa0283be79..034280f08d 100644
--- a/tests/template_tests/tests.py
+++ b/tests/template_tests/tests.py
@@ -1575,6 +1575,13 @@ class TemplateTests(TransRealMixin, TestCase):
             # Test whitespace in filter argument
             'widthratio15': ('{% load custom %}{% widthratio a|noop:"x y" b 0 %}', {'a':50,'b':100}, '0'),
 
+            # Widthratio with variable assignment
+            'widthratio16': ('{% widthratio a b 100 as variable %}-{{ variable }}-', {'a':50,'b':100}, '-50-'),
+            'widthratio17': ('{% widthratio a b 100 as variable %}-{{ variable }}-', {'a':100,'b':100}, '-100-'),
+
+            'widthratio18': ('{% widthratio a b 100 as %}', { }, template.TemplateSyntaxError),
+            'widthratio19': ('{% widthratio a b 100 not_as variable %}', { }, template.TemplateSyntaxError),
+
             ### WITH TAG ########################################################
             'with01': ('{% with key=dict.key %}{{ key }}{% endwith %}', {'dict': {'key': 50}}, '50'),
             'legacywith01': ('{% with dict.key as key %}{{ key }}{% endwith %}', {'dict': {'key': 50}}, '50'),
-- 
cgit v1.3


From b6178fa24be8a628cb002afe6a80db6391bb67d8 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Wed, 14 Aug 2013 12:57:55 -0400
Subject: Added some doc links for django.contrib.messages

---
 docs/ref/contrib/messages.txt | 11 +++++++----
 docs/ref/settings.txt         |  4 +++-
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'docs/ref')

diff --git a/docs/ref/contrib/messages.txt b/docs/ref/contrib/messages.txt
index 608c37bb7f..2014c7c183 100644
--- a/docs/ref/contrib/messages.txt
+++ b/docs/ref/contrib/messages.txt
@@ -54,20 +54,21 @@ Storage backends
 
 The messages framework can use different backends to store temporary messages.
 
-Django provides three built-in storage classes:
+Django provides three built-in storage classes in
+:mod:`django.contrib.messages`:
 
-.. class:: django.contrib.messages.storage.session.SessionStorage
+.. class:: storage.session.SessionStorage
 
     This class stores all messages inside of the request's session. Therefore
     it requires Django's ``contrib.sessions`` application.
 
-.. class:: django.contrib.messages.storage.cookie.CookieStorage
+.. class:: storage.cookie.CookieStorage
 
     This class stores the message data in a cookie (signed with a secret hash
     to prevent manipulation) to persist notifications across requests. Old
     messages are dropped if the cookie data size would exceed 2048 bytes.
 
-.. class:: django.contrib.messages.storage.fallback.FallbackStorage
+.. class:: storage.fallback.FallbackStorage
 
     This class first uses ``CookieStorage``, and falls back to using
     ``SessionStorage`` for the messages that could not fit in a single cookie.
@@ -83,6 +84,8 @@ path, for example::
 
     MESSAGE_STORAGE = 'django.contrib.messages.storage.cookie.CookieStorage'
 
+.. class:: storage.base.BaseStorage
+
 To write your own storage class, subclass the ``BaseStorage`` class in
 ``django.contrib.messages.storage.base`` and implement the ``_get`` and
 ``_store`` methods.
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 90545d96c5..bc4666d435 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2262,7 +2262,9 @@ Controls where Django stores message data. Valid values are:
 
 See :ref:`message storage backends <message-storage-backends>` for more details.
 
-The backends that use cookies -- ``CookieStorage`` and ``FallbackStorage`` --
+The backends that use cookies --
+:class:`~django.contrib.messages.storage.cookie.CookieStorage` and
+:class:`~django.contrib.messages.storage.fallback.FallbackStorage` --
 use the value of :setting:`SESSION_COOKIE_DOMAIN` when setting their cookies.
 
 .. setting:: MESSAGE_TAGS
-- 
cgit v1.3


From 354009d67eb56301457ec26c1c847af5fdfc083b Mon Sep 17 00:00:00 2001
From: Alasdair Nicol <alasdair@thenicols.net>
Date: Thu, 15 Aug 2013 00:27:16 +0100
Subject: Updated docs following deprecation of django.views.defaults.shortcut

Follows 3f2befc
---
 docs/internals/deprecation.txt | 13 +++++--------
 docs/ref/contrib/sites.txt     |  7 ++++---
 2 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'docs/ref')

diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index fe8b48a5a9..29e9231896 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -370,8 +370,11 @@ these changes.
 * Remove the backward compatible shims introduced to rename the attributes
   ``ChangeList.root_query_set`` and ``ChangeList.query_set``.
 
-* ``django.conf.urls.shortcut`` and ``django.views.defaults.shortcut`` will be
-  removed.
+* ``django.views.defaults.shortcut`` will be removed, as part of the
+  goal of removing all ``django.contrib`` references from the core
+  Django codebase. Instead use
+  ``django.contrib.contenttypes.views.shortcut``. ``django.conf.urls.shortcut``
+  will also be removed.
 
 * Support for the Python Imaging Library (PIL) module will be removed, as it
   no longer appears to be actively maintained & does not work on Python 3.
@@ -431,11 +434,5 @@ these changes.
 2.0
 ---
 
-* ``django.views.defaults.shortcut()``. This function has been moved
-  to ``django.contrib.contenttypes.views.shortcut()`` as part of the
-  goal of removing all ``django.contrib`` references from the core
-  Django codebase. The old shortcut will be removed in the 2.0
-  release.
-
 * ``ssi`` and ``url`` template tags will be removed from the ``future`` template
   tag library (used during the 1.3/1.4 deprecation period).
diff --git a/docs/ref/contrib/sites.txt b/docs/ref/contrib/sites.txt
index 65838dfa3e..131c9645e8 100644
--- a/docs/ref/contrib/sites.txt
+++ b/docs/ref/contrib/sites.txt
@@ -417,9 +417,10 @@ Here's how Django uses the sites framework:
   :class:`~django.contrib.sites.models.Site` name to the template as
   ``{{ site_name }}``.
 
-* The shortcut view (``django.views.defaults.shortcut``) uses the domain
-  of the current :class:`~django.contrib.sites.models.Site` object when
-  calculating an object's URL.
+* The shortcut view (``django.contrib.contenttypes.views.shortcut``)
+  uses the domain of the current
+  :class:`~django.contrib.sites.models.Site` object when calculating
+  an object's URL.
 
 * In the admin framework, the "view on site" link uses the current
   :class:`~django.contrib.sites.models.Site` to work out the domain for the
-- 
cgit v1.3


From 29255fcb4f5f50334cda9546ada2f31e825deec3 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Thu, 15 Aug 2013 07:14:10 -0400
Subject: Fixed some ReST errors regarding backticks

---
 docs/howto/custom-model-fields.txt         | 4 ++--
 docs/howto/deployment/index.txt            | 3 ++-
 docs/howto/deployment/wsgi/apache-auth.txt | 2 +-
 docs/howto/deployment/wsgi/modwsgi.txt     | 2 +-
 docs/intro/tutorial01.txt                  | 2 +-
 docs/ref/contrib/admin/actions.txt         | 4 ++--
 docs/ref/contrib/admin/admindocs.txt       | 2 +-
 docs/ref/models/querysets.txt              | 2 +-
 docs/releases/1.7.txt                      | 2 +-
 docs/topics/auth/customizing.txt           | 4 ++--
 docs/topics/db/managers.txt                | 4 ++--
 docs/topics/http/shortcuts.txt             | 5 +++--
 12 files changed, 19 insertions(+), 17 deletions(-)

(limited to 'docs/ref')

diff --git a/docs/howto/custom-model-fields.txt b/docs/howto/custom-model-fields.txt
index af652de78c..6493c18f99 100644
--- a/docs/howto/custom-model-fields.txt
+++ b/docs/howto/custom-model-fields.txt
@@ -295,9 +295,9 @@ validation process will break.
 Therefore, you must ensure that the form field used to represent your
 custom field performs whatever input validation and data cleaning is
 necessary to convert user-provided form input into a
-`to_python()`-compatible model field value. This may require writing a
+``to_python()``-compatible model field value. This may require writing a
 custom form field, and/or implementing the :meth:`.formfield` method on
-your field to return a form field class whose `to_python()` returns the
+your field to return a form field class whose ``to_python()`` returns the
 correct datatype.
 
 Documenting your custom field
diff --git a/docs/howto/deployment/index.txt b/docs/howto/deployment/index.txt
index 8b0368ac67..688bae2397 100644
--- a/docs/howto/deployment/index.txt
+++ b/docs/howto/deployment/index.txt
@@ -28,6 +28,7 @@ the easiest, fastest, and most stable deployment choice.
     * `Chapter 12 of the Django Book (second edition)`_ discusses deployment
       and especially scaling in more detail. However, note that this edition
       was written against Django version 1.1 and has not been updated since
-      `mod_python` was first deprecated, then completely removed in Django 1.5.
+      ``mod_python`` was first deprecated, then completely removed in
+      Django 1.5.
 
 .. _chapter 12 of the django book (second edition): http://djangobook.com/en/2.0/chapter12/
diff --git a/docs/howto/deployment/wsgi/apache-auth.txt b/docs/howto/deployment/wsgi/apache-auth.txt
index d06e89cd0e..80219ffdf4 100644
--- a/docs/howto/deployment/wsgi/apache-auth.txt
+++ b/docs/howto/deployment/wsgi/apache-auth.txt
@@ -16,7 +16,7 @@ version >= 2.2 and mod_wsgi >= 2.0. For example, you could:
 
 .. note::
     If you have installed a :ref:`custom User model <auth-custom-user>` and
-    want to use this default auth handler, it must support an `is_active`
+    want to use this default auth handler, it must support an ``is_active``
     attribute. If you want to use group based authorization, your custom user
     must have a relation named 'groups', referring to a related object that has
     a 'name' field. You can also specify your own custom mod_wsgi
diff --git a/docs/howto/deployment/wsgi/modwsgi.txt b/docs/howto/deployment/wsgi/modwsgi.txt
index 2cbcd8ce7e..1d11e94685 100644
--- a/docs/howto/deployment/wsgi/modwsgi.txt
+++ b/docs/howto/deployment/wsgi/modwsgi.txt
@@ -193,7 +193,7 @@ other approaches:
    configuration).
 
 2. Use an ``Alias`` directive, as demonstrated above, to alias the appropriate
-   URL (probably :setting:`STATIC_URL` + `admin/`) to the actual location of
+   URL (probably :setting:`STATIC_URL` + ``admin/``) to the actual location of
    the admin files.
 
 3. Copy the admin static files so that they live within your Apache
diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt
index f2b01758aa..b99d3be3e2 100644
--- a/docs/intro/tutorial01.txt
+++ b/docs/intro/tutorial01.txt
@@ -600,7 +600,7 @@ for your own sanity when dealing with the interactive prompt, but also because
 objects' representations are used throughout Django's automatically-generated
 admin.
 
-.. admonition:: `__unicode__` or `__str__`?
+.. admonition:: ``__unicode__`` or ``__str__``?
 
     On Python 3, things are simpler, just use
     :meth:`~django.db.models.Model.__str__` and forget about
diff --git a/docs/ref/contrib/admin/actions.txt b/docs/ref/contrib/admin/actions.txt
index 58d8244525..b982aa64f7 100644
--- a/docs/ref/contrib/admin/actions.txt
+++ b/docs/ref/contrib/admin/actions.txt
@@ -269,8 +269,8 @@ Making actions available site-wide
 
         admin.site.add_action(export_selected_objects)
 
-    This makes the `export_selected_objects` action globally available as an
-    action named `"export_selected_objects"`. You can explicitly give the action
+    This makes the ``export_selected_objects`` action globally available as an
+    action named "export_selected_objects". You can explicitly give the action
     a name -- good if you later want to programmatically :ref:`remove the action
     <disabling-admin-actions>` -- by passing a second argument to
     :meth:`AdminSite.add_action()`::
diff --git a/docs/ref/contrib/admin/admindocs.txt b/docs/ref/contrib/admin/admindocs.txt
index 6deb7bdbf8..8809502288 100644
--- a/docs/ref/contrib/admin/admindocs.txt
+++ b/docs/ref/contrib/admin/admindocs.txt
@@ -156,6 +156,6 @@ Edit this object
 Using these bookmarklets requires that you are either logged into the
 :mod:`Django admin <django.contrib.admin>` as a
 :class:`~django.contrib.auth.models.User` with
-:attr:`~django.contrib.auth.models.User.is_staff` set to `True`, or that the
+:attr:`~django.contrib.auth.models.User.is_staff` set to ``True``, or that the
 ``XViewMiddleware`` is installed and you are accessing the site from an IP
 address listed in :setting:`INTERNAL_IPS`.
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 0f08022179..9782864a43 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -913,7 +913,7 @@ needed by ``select_related``), it is able to detect that the ``best_pizza``
 objects have already been fetched, and it will skip fetching them again.
 
 Chaining ``prefetch_related`` calls will accumulate the lookups that are
-prefetched. To clear any ``prefetch_related`` behavior, pass `None` as a
+prefetched. To clear any ``prefetch_related`` behavior, pass ``None`` as a
 parameter::
 
    >>> non_prefetched = qs.prefetch_related(None)
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 6f6efcb3ca..7a46b3facb 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -75,7 +75,7 @@ Minor features
   context level.
 
 * The :class:`~django.utils.feedgenerator.Atom1Feed` syndication feed's
-  ``updated`` element now utilizes `updateddate` instead of ``pubdate``,
+  ``updated`` element now utilizes ``updateddate`` instead of ``pubdate``,
   allowing the ``published`` element to be included in the feed (which
   relies on ``pubdate``).
 
diff --git a/docs/topics/auth/customizing.txt b/docs/topics/auth/customizing.txt
index e27f257f80..5c60c52297 100644
--- a/docs/topics/auth/customizing.txt
+++ b/docs/topics/auth/customizing.txt
@@ -686,13 +686,13 @@ auth views.
 * :class:`~django.contrib.auth.forms.AuthenticationForm`
 
   Works with any subclass of :class:`~django.contrib.auth.models.AbstractBaseUser`,
-  and will adapt to use the field defined in `USERNAME_FIELD`.
+  and will adapt to use the field defined in ``USERNAME_FIELD``.
 
 * :class:`~django.contrib.auth.forms.PasswordResetForm`
 
   Assumes that the user model has an integer primary key, has a field named
   ``email`` that can be used to identify the user, and a boolean field
-  named `is_active` to prevent password resets for inactive users.
+  named ``is_active`` to prevent password resets for inactive users.
 
 * :class:`~django.contrib.auth.forms.SetPasswordForm`
 
diff --git a/docs/topics/db/managers.txt b/docs/topics/db/managers.txt
index 2d3f35db8b..c97149cfd1 100644
--- a/docs/topics/db/managers.txt
+++ b/docs/topics/db/managers.txt
@@ -265,8 +265,8 @@ Methods are copied according to the following rules:
 
 - Public methods are copied by default.
 - Private methods (starting with an underscore) are not copied by default.
-- Methods with a `queryset_only` attribute set to `False` are always copied.
-- Methods with a `queryset_only` attribute set to `True` are never copied.
+- Methods with a ``queryset_only`` attribute set to ``False`` are always copied.
+- Methods with a ``queryset_only`` attribute set to ``True`` are never copied.
 
 For example::
 
diff --git a/docs/topics/http/shortcuts.txt b/docs/topics/http/shortcuts.txt
index 5c8725172a..8a1d5ca5a7 100644
--- a/docs/topics/http/shortcuts.txt
+++ b/docs/topics/http/shortcuts.txt
@@ -21,7 +21,7 @@ introduce controlled coupling for convenience's sake.
    :class:`~django.http.HttpResponse` object with that rendered text.
 
    :func:`render()` is the same as a call to
-   :func:`render_to_response()` with a `context_instance` argument that
+   :func:`render_to_response()` with a ``context_instance`` argument that
    forces the use of a :class:`~django.template.RequestContext`.
 
 Required arguments
@@ -169,7 +169,8 @@ This example is equivalent to::
 
    The arguments could be:
 
-   * A model: the model's `get_absolute_url()` function will be called.
+   * A model: the model's `:meth:`~django.db.models.Model.get_absolute_url()`
+     function will be called.
 
    * A view name, possibly with arguments: :func:`urlresolvers.reverse
      <django.core.urlresolvers.reverse>` will be used to reverse-resolve the
-- 
cgit v1.3


From 4668c142dce77c6f29fb75532c1acfa1b2d322ff Mon Sep 17 00:00:00 2001
From: Anssi Kääriäinen <akaariai@gmail.com>
Date: Wed, 7 Aug 2013 09:51:32 +0300
Subject: Made Model.__eq__ consider proxy models equivalent

Fixed #11892, fixed #16458, fixed #14492.
---
 django/db/models/base.py         |  4 +++-
 docs/ref/models/instances.txt    | 34 ++++++++++++++++++++++++++++++++++
 docs/releases/1.7.txt            |  5 +++++
 tests/basic/tests.py             |  4 ++++
 tests/defer/tests.py             |  6 ++++++
 tests/model_inheritance/tests.py |  5 +++++
 tests/proxy_models/tests.py      |  3 +++
 7 files changed, 60 insertions(+), 1 deletion(-)

(limited to 'docs/ref')

diff --git a/django/db/models/base.py b/django/db/models/base.py
index cd3768bccb..3e2ae8d425 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -459,7 +459,9 @@ class Model(six.with_metaclass(ModelBase)):
         return '%s object' % self.__class__.__name__
 
     def __eq__(self, other):
-        return isinstance(other, self.__class__) and self._get_pk_val() == other._get_pk_val()
+        return (isinstance(other, Model) and
+                self._meta.concrete_model == other._meta.concrete_model and
+                self._get_pk_val() == other._get_pk_val())
 
     def __ne__(self, other):
         return not self.__eq__(other)
diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt
index cb8570afdc..94b1face81 100644
--- a/docs/ref/models/instances.txt
+++ b/docs/ref/models/instances.txt
@@ -494,6 +494,40 @@ using ``__str__()`` like this::
             # first_name and last_name will be unicode strings.
             return force_bytes('%s %s' % (self.first_name, self.last_name))
 
+``__eq__``
+----------
+
+.. method:: Model.__eq__()
+
+The equality method is defined such that instances with the same primary
+key value and the same concrete class are considered equal. The term
+concrete class means proxy model's first non-proxy parent or the class
+itself if it isn't a proxy class.
+
+For example::
+
+    form django.db import models
+
+    class MyModel(models.Model):
+        id = models.AutoField(primary_key=True)
+
+    class MyProxyModel(MyModel):
+        class Meta:
+            proxy = True
+
+    class MultitableInherited(MyModel):
+        pass
+
+    MyModel(id=1) == MyModel(id=1)
+    MyModel(id=1) == MyProxyModel(id=1)
+    MyModel(id=1) != MultitableInherited(id=1)
+    MyModel(id=1) != MyModel(id=2)
+
+.. versionchanged:: 1.7
+
+  In previous versions only instances of the exact same class and same
+  primary key value were considered equal.
+
 ``get_absolute_url``
 --------------------
 
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 7a46b3facb..774d9d3161 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -194,6 +194,11 @@ Miscellaneous
   removes the ability for visitors to generate spurious HTTP 500 errors by
   requesting static files that don't exist or haven't been collected yet.
 
+* The :meth:`django.db.models.Model.__eq__` method is now defined in a
+  way where instances of a proxy model and its base model are considered
+  equal when primary keys match. Previously only instances of exact same
+  class were considered equal on primary key match.
+
 Features deprecated in 1.7
 ==========================
 
diff --git a/tests/basic/tests.py b/tests/basic/tests.py
index 55ed6a436f..2b051621ef 100644
--- a/tests/basic/tests.py
+++ b/tests/basic/tests.py
@@ -707,6 +707,10 @@ class ModelTest(TestCase):
         with self.assertRaises(ObjectDoesNotExist):
             SelfRef.objects.get(selfref=sr)
 
+    def test_eq(self):
+        self.assertNotEqual(Article(id=1), object())
+        self.assertNotEqual(object(), Article(id=1))
+
 
 class ConcurrentSaveTests(TransactionTestCase):
 
diff --git a/tests/defer/tests.py b/tests/defer/tests.py
index 1df312e1bf..b66b173f7a 100644
--- a/tests/defer/tests.py
+++ b/tests/defer/tests.py
@@ -183,3 +183,9 @@ class DeferTests(TestCase):
         with self.assertNumQueries(0):
             bc_deferred.id
         self.assertEqual(bc_deferred.pk, bc_deferred.id)
+
+    def test_eq(self):
+        s1 = Secondary.objects.create(first="x1", second="y1")
+        s1_defer = Secondary.objects.only('pk').get(pk=s1.pk)
+        self.assertEqual(s1, s1_defer)
+        self.assertEqual(s1_defer, s1)
diff --git a/tests/model_inheritance/tests.py b/tests/model_inheritance/tests.py
index eb50d30cf8..0ba6a15e5d 100644
--- a/tests/model_inheritance/tests.py
+++ b/tests/model_inheritance/tests.py
@@ -318,3 +318,8 @@ class ModelInheritanceTests(TestCase):
             sql = query['sql']
             if 'UPDATE' in sql:
                 self.assertEqual(expected_sql, sql)
+
+    def test_eq(self):
+        # Equality doesn't transfer in multitable inheritance.
+        self.assertNotEqual(Place(id=1), Restaurant(id=1))
+        self.assertNotEqual(Restaurant(id=1), Place(id=1))
diff --git a/tests/proxy_models/tests.py b/tests/proxy_models/tests.py
index 240198cc39..3598d65935 100644
--- a/tests/proxy_models/tests.py
+++ b/tests/proxy_models/tests.py
@@ -362,6 +362,9 @@ class ProxyModelTests(TestCase):
         p = MyPerson.objects.get(pk=100)
         self.assertEqual(p.name, 'Elvis Presley')
 
+    def test_eq(self):
+        self.assertEqual(MyPerson(id=100), Person(id=100))
+
 
 class ProxyModelAdminTests(TestCase):
     fixtures = ['myhorses']
-- 
cgit v1.3


From 3844089edc43ff29aab5bac82a0eecab23d8d14a Mon Sep 17 00:00:00 2001
From: Anssi Kääriäinen <akaariai@gmail.com>
Date: Thu, 15 Aug 2013 10:32:54 +0300
Subject: Fixed #20777 -- Admin proxy model deletion regression

Added proxy_models tests by Harm Geerts <github@geertswei.nl>.
---
 django/contrib/admin/util.py              |  3 ---
 docs/ref/models/instances.txt             |  6 +++---
 tests/proxy_models/admin.py               |  6 ++++++
 tests/proxy_models/fixtures/myhorses.json | 20 +++++++++++++++++++-
 tests/proxy_models/models.py              |  6 +++++-
 tests/proxy_models/tests.py               | 27 +++++++++++++++++++++++++++
 tests/proxy_models/urls.py                |  7 +++++++
 7 files changed, 67 insertions(+), 8 deletions(-)
 create mode 100644 tests/proxy_models/admin.py
 create mode 100644 tests/proxy_models/urls.py

(limited to 'docs/ref')

diff --git a/django/contrib/admin/util.py b/django/contrib/admin/util.py
index dd9047c428..b31756d762 100644
--- a/django/contrib/admin/util.py
+++ b/django/contrib/admin/util.py
@@ -155,9 +155,6 @@ class NestedObjects(Collector):
             if source_attr:
                 self.add_edge(getattr(obj, source_attr), obj)
             else:
-                if obj._meta.proxy:
-                    # Take concrete model's instance to avoid mismatch in edges
-                    obj = obj._meta.concrete_model(pk=obj.pk)
                 self.add_edge(None, obj)
         try:
             return super(NestedObjects, self).collect(objs, source_attr=source_attr, **kwargs)
diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt
index 94b1face81..f0ec5b8ac0 100644
--- a/docs/ref/models/instances.txt
+++ b/docs/ref/models/instances.txt
@@ -500,9 +500,9 @@ using ``__str__()`` like this::
 .. method:: Model.__eq__()
 
 The equality method is defined such that instances with the same primary
-key value and the same concrete class are considered equal. The term
-concrete class means proxy model's first non-proxy parent or the class
-itself if it isn't a proxy class.
+key value and the same concrete class are considered equal. For proxy
+models, concrete class is defined as the model's first non-proxy parent;
+for all other models it is simply the model's class.
 
 For example::
 
diff --git a/tests/proxy_models/admin.py b/tests/proxy_models/admin.py
new file mode 100644
index 0000000000..d2b6319301
--- /dev/null
+++ b/tests/proxy_models/admin.py
@@ -0,0 +1,6 @@
+from django.contrib import admin
+
+from .models import TrackerUser, ProxyTrackerUser
+
+admin.site.register(TrackerUser)
+admin.site.register(ProxyTrackerUser)
diff --git a/tests/proxy_models/fixtures/myhorses.json b/tests/proxy_models/fixtures/myhorses.json
index 15943064c8..97e190a8a2 100644
--- a/tests/proxy_models/fixtures/myhorses.json
+++ b/tests/proxy_models/fixtures/myhorses.json
@@ -1,4 +1,22 @@
 [
+    {
+        "pk": 100,
+        "model": "auth.user",
+        "fields": {
+            "username": "super",
+            "first_name": "Super",
+            "last_name": "User",
+            "is_active": true,
+            "is_superuser": true,
+            "is_staff": true,
+            "last_login": "2007-05-30 13:20:10",
+            "groups": [],
+            "user_permissions": [],
+            "password": "sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158",
+            "email": "super@example.com",
+            "date_joined": "2007-05-30 13:20:10"
+        }
+    },
     {
         "pk": 100,
         "model": "proxy_models.BaseUser",
@@ -21,4 +39,4 @@
             "assignee": 100
         }
     }
-]
\ No newline at end of file
+]
diff --git a/tests/proxy_models/models.py b/tests/proxy_models/models.py
index ffb36657e1..2e5741ab6b 100644
--- a/tests/proxy_models/models.py
+++ b/tests/proxy_models/models.py
@@ -117,9 +117,13 @@ class StateProxy(State):
 
 # Proxy models still works with filters (on related fields)
 # and select_related, even when mixed with model inheritance
+@python_2_unicode_compatible
 class BaseUser(models.Model):
     name = models.CharField(max_length=255)
 
+    def __str__(self):
+        return ':'.join((self.__class__.__name__, self.name,))
+
 class TrackerUser(BaseUser):
     status = models.CharField(max_length=50)
 
@@ -134,7 +138,7 @@ class Issue(models.Model):
     assignee = models.ForeignKey(TrackerUser)
 
     def __str__(self):
-        return ':'.join((self.__class__.__name__,self.summary,))
+        return ':'.join((self.__class__.__name__, self.summary,))
 
 class Bug(Issue):
     version = models.CharField(max_length=50)
diff --git a/tests/proxy_models/tests.py b/tests/proxy_models/tests.py
index 3598d65935..f0c0d046e1 100644
--- a/tests/proxy_models/tests.py
+++ b/tests/proxy_models/tests.py
@@ -10,12 +10,14 @@ from django.db import models, DEFAULT_DB_ALIAS
 from django.db.models import signals
 from django.db.models.loading import cache
 from django.test import TestCase
+from django.test.utils import override_settings
 
 
 from .models import (MyPerson, Person, StatusPerson, LowerStatusPerson,
     MyPersonProxy, Abstract, OtherPerson, User, UserProxy, UserProxyProxy,
     Country, State, StateProxy, TrackerUser, BaseUser, Bug, ProxyTrackerUser,
     Improvement, ProxyProxyBug, ProxyBug, ProxyImprovement, Issue)
+from .admin import admin as force_admin_model_registration
 
 
 class ProxyModelTests(TestCase):
@@ -366,8 +368,10 @@ class ProxyModelTests(TestCase):
         self.assertEqual(MyPerson(id=100), Person(id=100))
 
 
+@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class ProxyModelAdminTests(TestCase):
     fixtures = ['myhorses']
+    urls = 'proxy_models.urls'
 
     def test_cascade_delete_proxy_model_admin_warning(self):
         """
@@ -383,3 +387,26 @@ class ProxyModelAdminTests(TestCase):
         self.assertTrue(tracker_user in collector.edges.get(None, ()))
         self.assertTrue(base_user in collector.edges.get(None, ()))
         self.assertTrue(issue in collector.edges.get(tracker_user, ()))
+
+    def test_delete_str_in_model_admin(self):
+        """
+        Test if the admin delete page shows the correct string representation
+        for a proxy model.
+        """
+        user = TrackerUser.objects.get(name='Django Pony')
+        proxy = ProxyTrackerUser.objects.get(name='Django Pony')
+
+        user_str = (
+            'Tracker user: <a href="/admin/proxy_models/trackeruser/%s/">%s</a>' % (user.pk, user))
+        proxy_str = (
+            'Proxy tracker user: <a href="/admin/proxy_models/proxytrackeruser/%s/">%s</a>' %
+            (proxy.pk, proxy))
+
+        self.client.login(username='super', password='secret')
+        response = self.client.get('/admin/proxy_models/trackeruser/%s/delete/' % (user.pk,))
+        delete_str = response.context['deleted_objects'][0]
+        self.assertEqual(delete_str, user_str)
+        response = self.client.get('/admin/proxy_models/proxytrackeruser/%s/delete/' % (proxy.pk,))
+        delete_str = response.context['deleted_objects'][0]
+        self.assertEqual(delete_str, proxy_str)
+        self.client.logout()
diff --git a/tests/proxy_models/urls.py b/tests/proxy_models/urls.py
new file mode 100644
index 0000000000..644a34f556
--- /dev/null
+++ b/tests/proxy_models/urls.py
@@ -0,0 +1,7 @@
+from django.conf.urls import patterns, include
+
+from django.contrib import admin
+
+urlpatterns = patterns('',
+    (r'^admin/', include(admin.site.urls)),
+)
-- 
cgit v1.3


From 7b69c3e7758770dd632e1754c30714e91868e037 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Mon, 19 Aug 2013 08:29:32 -0400
Subject: Removed versionadded/changed annotations for 1.5

---
 docs/ref/class-based-views/base.txt                |  6 ---
 docs/ref/class-based-views/generic-date-based.txt  |  8 ----
 docs/ref/class-based-views/mixins-date-based.txt   |  5 --
 .../class-based-views/mixins-multiple-object.txt   |  2 -
 docs/ref/class-based-views/mixins-simple.txt       |  4 --
 docs/ref/contrib/admin/index.txt                   |  8 ----
 docs/ref/contrib/auth.txt                          |  2 -
 docs/ref/contrib/contenttypes.txt                  | 23 +++------
 docs/ref/contrib/gis/geoquerysets.txt              |  4 --
 docs/ref/contrib/gis/geos.txt                      | 12 -----
 docs/ref/contrib/staticfiles.txt                   |  4 --
 docs/ref/databases.txt                             |  4 --
 docs/ref/django-admin.txt                          | 12 -----
 docs/ref/files/file.txt                            |  4 --
 docs/ref/forms/api.txt                             |  5 --
 docs/ref/forms/fields.txt                          |  9 ----
 docs/ref/forms/validation.txt                      | 10 +---
 docs/ref/forms/widgets.txt                         |  5 --
 docs/ref/models/fields.txt                         | 11 -----
 docs/ref/models/instances.txt                      |  2 -
 docs/ref/models/options.txt                        |  2 -
 docs/ref/models/querysets.txt                      | 38 +++++----------
 docs/ref/request-response.txt                      |  8 ----
 docs/ref/settings.txt                              | 26 ++++-------
 docs/ref/signals.txt                               | 13 +-----
 docs/ref/template-response.txt                     | 23 +++------
 docs/ref/templates/api.txt                         |  5 --
 docs/ref/templates/builtins.txt                    | 14 +-----
 docs/ref/unicode.txt                               | 30 ++++++------
 docs/ref/utils.txt                                 | 14 ------
 docs/topics/auth/customizing.txt                   |  2 -
 docs/topics/auth/default.txt                       | 14 ++----
 docs/topics/class-based-views/mixins.txt           |  2 -
 docs/topics/db/multi-db.txt                        |  5 --
 docs/topics/db/queries.txt                         | 11 +----
 docs/topics/http/middleware.txt                    |  5 --
 docs/topics/http/sessions.txt                      | 10 +---
 docs/topics/http/shortcuts.txt                     |  9 ----
 docs/topics/i18n/translation.txt                   |  2 -
 docs/topics/logging.txt                            |  7 ---
 docs/topics/pagination.txt                         | 14 ++----
 docs/topics/serialization.txt                      | 11 ++---
 docs/topics/signals.txt                            |  4 --
 docs/topics/testing/advanced.txt                   |  2 -
 docs/topics/testing/overview.txt                   | 54 ----------------------
 45 files changed, 65 insertions(+), 400 deletions(-)

(limited to 'docs/ref')

diff --git a/docs/ref/class-based-views/base.txt b/docs/ref/class-based-views/base.txt
index 24058311a4..0db1e15ea9 100644
--- a/docs/ref/class-based-views/base.txt
+++ b/docs/ref/class-based-views/base.txt
@@ -104,12 +104,6 @@ TemplateView
     Renders a given template, with the context containing parameters captured
     in the URL.
 
-    .. versionchanged:: 1.5
-
-        The context used to be populated with a ``{{ params }}`` dictionary of
-        the parameters captured in the URL. Now those parameters are first-level
-        context variables.
-
     **Ancestors (MRO)**
 
     This view inherits methods and attributes from the following views:
diff --git a/docs/ref/class-based-views/generic-date-based.txt b/docs/ref/class-based-views/generic-date-based.txt
index 205d556463..427d8f6ceb 100644
--- a/docs/ref/class-based-views/generic-date-based.txt
+++ b/docs/ref/class-based-views/generic-date-based.txt
@@ -138,24 +138,16 @@ YearArchiveView
     * ``year``: A :class:`~datetime.date` object
       representing the given year.
 
-      .. versionchanged:: 1.5
-
-         Previously, this returned a string.
-
     * ``next_year``: A :class:`~datetime.date` object
       representing the first day of the next year, according to
       :attr:`~BaseDateListView.allow_empty` and
       :attr:`~DateMixin.allow_future`.
 
-      .. versionadded:: 1.5
-
     * ``previous_year``: A :class:`~datetime.date` object
       representing the first day of the previous year, according to
       :attr:`~BaseDateListView.allow_empty` and
       :attr:`~DateMixin.allow_future`.
 
-      .. versionadded:: 1.5
-
     **Notes**
 
     * Uses a default ``template_name_suffix`` of ``_archive_year``.
diff --git a/docs/ref/class-based-views/mixins-date-based.txt b/docs/ref/class-based-views/mixins-date-based.txt
index 1162b2a194..48faf28a44 100644
--- a/docs/ref/class-based-views/mixins-date-based.txt
+++ b/docs/ref/class-based-views/mixins-date-based.txt
@@ -328,8 +328,3 @@ BaseDateListView
         :meth:`~BaseDateListView.get_date_list_period` is used. ``date_type``
         and ``ordering`` are simply passed to
         :meth:`QuerySet.dates()<django.db.models.query.QuerySet.dates>`.
-
-        .. versionchanged:: 1.5
-
-            The ``ordering`` parameter was added, and the default order was
-            changed to ascending.
diff --git a/docs/ref/class-based-views/mixins-multiple-object.txt b/docs/ref/class-based-views/mixins-multiple-object.txt
index 67ca5429fa..5a2ae85751 100644
--- a/docs/ref/class-based-views/mixins-multiple-object.txt
+++ b/docs/ref/class-based-views/mixins-multiple-object.txt
@@ -90,8 +90,6 @@ MultipleObjectMixin
 
     .. attribute:: page_kwarg
 
-        .. versionadded:: 1.5
-
         A string specifying the name to use for the page parameter.
         The view will expect this prameter to be available either as a query
         string parameter (via ``request.GET``) or as a kwarg variable specified
diff --git a/docs/ref/class-based-views/mixins-simple.txt b/docs/ref/class-based-views/mixins-simple.txt
index 377c85cc3b..3b12ee7689 100644
--- a/docs/ref/class-based-views/mixins-simple.txt
+++ b/docs/ref/class-based-views/mixins-simple.txt
@@ -7,8 +7,6 @@ ContextMixin
 
 .. class:: django.views.generic.base.ContextMixin
 
-    .. versionadded:: 1.5
-
     **Methods**
 
     .. method:: get_context_data(**kwargs)
@@ -77,8 +75,6 @@ TemplateResponseMixin
 
     .. attribute:: content_type
 
-        .. versionadded:: 1.5
-
         The content type to use for the response. ``content_type`` is passed
         as a keyword argument to ``response_class``. Default is ``None`` --
         meaning that Django uses :setting:`DEFAULT_CONTENT_TYPE`.
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 8feb574efd..ba5fa3bff6 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1235,8 +1235,6 @@ templates used by the :class:`ModelAdmin` views:
 
 .. method:: ModelAdmin.get_list_filter(self, request)
 
-    .. versionadded:: 1.5
-
     The ``get_list_filter`` method is given the ``HttpRequest`` and is expected
     to return the same kind of sequence type as for the
     :attr:`~ModelAdmin.list_filter` attribute.
@@ -1251,8 +1249,6 @@ templates used by the :class:`ModelAdmin` views:
 
 .. method:: ModelAdmin.get_inline_instances(self, request, obj=None)
 
-    .. versionadded:: 1.5
-
     The ``get_inline_instances`` method is given the ``HttpRequest`` and the
     ``obj`` being edited (or ``None`` on an add form) and is expected to return
     a ``list`` or ``tuple`` of :class:`~django.contrib.admin.InlineModelAdmin`
@@ -1506,10 +1502,6 @@ templates used by the :class:`ModelAdmin` views:
     Sends a message to the user using the :mod:`django.contrib.messages`
     backend.  See the :ref:`custom ModelAdmin example <custom-admin-action>`.
 
-    .. versionchanged:: 1.5
-
-        Keyword arguments were added in Django 1.5.
-
     Keyword arguments allow you to change the message level, add extra CSS
     tags, or fail silently if the ``contrib.messages`` framework is not
     installed. These keyword arguments match those for
diff --git a/docs/ref/contrib/auth.txt b/docs/ref/contrib/auth.txt
index ba4c9425a5..799d3277ab 100644
--- a/docs/ref/contrib/auth.txt
+++ b/docs/ref/contrib/auth.txt
@@ -389,8 +389,6 @@ can be used for notification when a user logs in or out.
 
 .. function:: user_login_failed
 
-    .. versionadded:: 1.5
-
     Sent when the user failed to login successfully
 
     ``sender``
diff --git a/docs/ref/contrib/contenttypes.txt b/docs/ref/contrib/contenttypes.txt
index fcd66a5b03..bfe92b88a6 100644
--- a/docs/ref/contrib/contenttypes.txt
+++ b/docs/ref/contrib/contenttypes.txt
@@ -199,14 +199,18 @@ The ``ContentTypeManager``
 
         Takes either a model class or an instance of a model, and returns the
         :class:`~django.contrib.contenttypes.models.ContentType` instance
-        representing that model.
+        representing that model. ``for_concrete_model=False`` allows fetching
+        the :class:`~django.contrib.contenttypes.models.ContentType` of a proxy
+        model.
 
     .. method:: get_for_models(*models[, for_concrete_models=True])
 
         Takes a variadic number of model classes, and returns a dictionary
         mapping the model classes to the
         :class:`~django.contrib.contenttypes.models.ContentType` instances
-        representing them.
+        representing them. ``for_concrete_models=False`` allows fetching the
+        :class:`~django.contrib.contenttypes.models.ContentType` of proxy
+        models.
 
     .. method:: get_by_natural_key(app_label, model)
 
@@ -232,21 +236,6 @@ lookup::
 
 .. _generic-relations:
 
-.. versionadded:: 1.5
-
-    Prior to Django 1.5,
-    :meth:`~django.contrib.contenttypes.models.ContentTypeManager.get_for_model` and
-    :meth:`~django.contrib.contenttypes.models.ContentTypeManager.get_for_models`
-    always returned the :class:`~django.contrib.contenttypes.models.ContentType`
-    associated with the concrete model of the specified one(s). That means there
-    was no way to retrieve the
-    :class:`~django.contrib.contenttypes.models.ContentType` of a proxy model
-    using those methods. As of Django 1.5 you can now pass a boolean flag –
-    ``for_concrete_model`` and ``for_concrete_models`` respectively – to specify
-    wether or not you want to retrieve the
-    :class:`~django.contrib.contenttypes.models.ContentType` for the concrete or
-    direct model.
-
 Generic relations
 =================
 
diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt
index 5e51e4cbf3..66afc3d377 100644
--- a/docs/ref/contrib/gis/geoquerysets.txt
+++ b/docs/ref/contrib/gis/geoquerysets.txt
@@ -949,10 +949,6 @@ __ http://geohash.org/
 
 *Availability*: PostGIS, SpatiaLite
 
-.. versionchanged:: 1.5
-
-    ``geojson`` support for Spatialite > 3.0 has been added.
-
 Attaches a ``geojson`` attribute to every model in the queryset that contains the
 `GeoJSON`__ representation of the geometry.
 
diff --git a/docs/ref/contrib/gis/geos.txt b/docs/ref/contrib/gis/geos.txt
index 12e4e55165..a9c947407f 100644
--- a/docs/ref/contrib/gis/geos.txt
+++ b/docs/ref/contrib/gis/geos.txt
@@ -276,10 +276,6 @@ that the SRID value is not included in this representation
 because it is not a part of the OGC specification (use the
 :attr:`GEOSGeometry.hexewkb` property instead).
 
-.. versionchanged:: 1.5
-
-    Prior to Django 1.5, the Z value of the geometry was dropped.
-
 .. attribute:: GEOSGeometry.hexewkb
 
 Returns the EWKB of this Geometry in hexadecimal form.  This is an
@@ -325,10 +321,6 @@ Returns the WKB (Well-Known Binary) representation of this Geometry
 as a Python buffer.  SRID value is not included, use the
 :attr:`GEOSGeometry.ewkb` property instead.
 
-.. versionchanged:: 1.5
-
-    Prior to Django 1.5, the Z value of the geometry was dropped.
-
 .. _ewkb:
 
 .. attribute:: GEOSGeometry.ewkb
@@ -426,8 +418,6 @@ geometry that do not make up other.
 .. method:: GEOSGeometry.interpolate(distance)
 .. method:: GEOSGeometry.interpolate_normalized(distance)
 
-.. versionadded:: 1.5
-
 Given a distance (float), returns the point (or closest point) within the
 geometry (:class:`LineString` or :class:`MultiLineString`) at that distance.
 The normalized version takes the distance as a float between 0 (origin) and 1
@@ -443,8 +433,6 @@ geometry and other.
 .. method:: GEOSGeometry.project(point)
 .. method:: GEOSGeometry.project_normalized(point)
 
-.. versionadded:: 1.5
-
 Returns the distance (float) from the origin of the geometry
 (:class:`LineString` or :class:`MultiLineString`) to the point projected on the
 geometry (that is to a point of the line the closest to the given point).
diff --git a/docs/ref/contrib/staticfiles.txt b/docs/ref/contrib/staticfiles.txt
index f96c2e8a1b..b9963414f4 100644
--- a/docs/ref/contrib/staticfiles.txt
+++ b/docs/ref/contrib/staticfiles.txt
@@ -255,8 +255,6 @@ CachedStaticFilesStorage
 
     .. method:: file_hash(name, content=None)
 
-    .. versionadded:: 1.5
-
     The method that is used when creating the hashed name of a file.
     Needs to return a hash for the given file name and content.
     By default it calculates a MD5 hash from the content's chunks as
@@ -290,8 +288,6 @@ The previous example is equal to calling the ``url`` method of an instance of
 useful when using a non-local storage backend to deploy files as documented
 in :ref:`staticfiles-from-cdn`.
 
-.. versionadded:: 1.5
-
 If you'd like to retrieve a static URL without displaying it, you can use a
 slightly different call:
 
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index 29f2f3972d..545f5df84c 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -191,10 +191,6 @@ Django supports MySQL 5.0.3 and higher.
 `MySQL 5.0`_ adds the ``information_schema`` database, which contains detailed
 data on all database schema. Django's ``inspectdb`` feature uses it.
 
-.. versionchanged:: 1.5
-
-    The minimum version requirement of MySQL 5.0.3 was set in Django 1.5.
-
 Django expects the database to support Unicode (UTF-8 encoding) and delegates to
 it the task of enforcing transactions and referential integrity. It is important
 to be aware of the fact that the two latter ones aren't actually enforced by
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index fb9264559c..146740b8eb 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -256,8 +256,6 @@ to flush.
 ``--no-initial-data``
 ~~~~~~~~~~~~~~~~~~~~~
 
-.. versionadded:: 1.5
-
 Use ``--no-initial-data`` to avoid loading the initial_data fixture.
 
 
@@ -334,8 +332,6 @@ onto which the data will be loaded.
 
 .. django-admin-option:: --ignorenonexistent
 
-.. versionadded:: 1.5
-
 The :djadminopt:`--ignorenonexistent` option can be used to ignore fields that
 may have been removed from models since the fixture was originally generated.
 
@@ -859,10 +855,6 @@ behavior you can use the ``--no-startup`` option. e.g.::
 
     django-admin.py shell --plain --no-startup
 
-.. versionadded:: 1.5
-
-    The ``--interface`` option was added in Django 1.5.
-
 .. versionadded:: 1.6
 
     The ``--no-startup`` option was added in Django 1.6.
@@ -1148,8 +1140,6 @@ synchronize.
 ``--no-initial-data``
 ~~~~~~~~~~~~~~~~~~~~~
 
-.. versionadded:: 1.5
-
 Use ``--no-initial-data`` to avoid loading the initial_data fixture.
 
 test <app or test identifier>
@@ -1327,8 +1317,6 @@ clearsessions
 
 .. django-admin:: clearsessions
 
-.. versionadded:: 1.5
-
 Can be run as a cron job or directly to clean out expired sessions.
 
 ``django.contrib.sitemaps``
diff --git a/docs/ref/files/file.txt b/docs/ref/files/file.txt
index 7562f9b6bf..6ca7ec121a 100644
--- a/docs/ref/files/file.txt
+++ b/docs/ref/files/file.txt
@@ -100,10 +100,6 @@ The ``ContentFile`` Class
         f1 = ContentFile("esta sentencia está en español")
         f2 = ContentFile(b"these are bytes")
 
-    .. versionchanged:: 1.5
-
-        ContentFile also accepts Unicode strings.
-
 .. currentmodule:: django.core.files.images
 
 The ``ImageFile`` Class
diff --git a/docs/ref/forms/api.txt b/docs/ref/forms/api.txt
index 780cb5d4f7..f084273cd9 100644
--- a/docs/ref/forms/api.txt
+++ b/docs/ref/forms/api.txt
@@ -211,11 +211,6 @@ only the valid fields::
     >>> f.cleaned_data
     {'cc_myself': True, 'message': u'Hi there'}
 
-.. versionchanged:: 1.5
-
-Until Django 1.5, the ``cleaned_data`` attribute wasn't defined at all when
-the ``Form`` didn't validate.
-
 ``cleaned_data`` will always *only* contain a key for fields defined in the
 ``Form``, even if you pass extra data when you define the ``Form``. In this
 example, we pass a bunch of extra fields to the ``ContactForm`` constructor,
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index e7c6612a72..0e4d352132 100644
--- a/docs/ref/forms/fields.txt
+++ b/docs/ref/forms/fields.txt
@@ -573,16 +573,12 @@ For each field, we describe the default widget used if you don't specify
 
     .. attribute:: allow_files
 
-        .. versionadded:: 1.5
-
         Optional.  Either ``True`` or ``False``.  Default is ``True``.  Specifies
         whether files in the specified location should be included.  Either this or
         :attr:`allow_folders` must be ``True``.
 
     .. attribute:: allow_folders
 
-        .. versionadded:: 1.5
-
         Optional.  Either ``True`` or ``False``.  Default is ``False``.  Specifies
         whether folders in the specified location should be included.  Either this or
         :attr:`allow_files` must be ``True``.
@@ -1065,11 +1061,6 @@ objects (in the case of ``ModelMultipleChoiceField``) into the
     * Error message keys: ``required``, ``list``, ``invalid_choice``,
       ``invalid_pk_value``
 
-    .. versionchanged:: 1.5
-
-        The empty and normalized values were changed to be consistently
-        ``QuerySets`` instead of ``[]`` and ``QuerySet`` respectively.
-
     .. versionchanged:: 1.6
 
         The ``invalid_choice`` message may contain ``%(value)s`` and the
diff --git a/docs/ref/forms/validation.txt b/docs/ref/forms/validation.txt
index 255b665c42..94e9308c9a 100644
--- a/docs/ref/forms/validation.txt
+++ b/docs/ref/forms/validation.txt
@@ -450,11 +450,5 @@ entries in ``_errors``.
 
 Secondly, once we have decided that the combined data in the two fields we are
 considering aren't valid, we must remember to remove them from the
-``cleaned_data``.
-
-.. versionchanged:: 1.5
-
-    Django used to remove the ``cleaned_data`` attribute entirely if there were
-    any errors in the form. Since version 1.5, ``cleaned_data`` is present even if
-    the form doesn't validate, but it contains only field values that did
-    validate.
+``cleaned_data``. `cleaned_data`` is present even if the form doesn't
+validate, but it contains only field values that did validate.
diff --git a/docs/ref/forms/widgets.txt b/docs/ref/forms/widgets.txt
index 951fbfa310..47e14043fc 100644
--- a/docs/ref/forms/widgets.txt
+++ b/docs/ref/forms/widgets.txt
@@ -525,11 +525,6 @@ Selector and checkbox widgets
         A callable that takes the value of the CheckBoxInput and returns
         ``True`` if the checkbox should be checked for that value.
 
-        .. versionchanged:: 1.5
-
-            Exceptions from ``check_test`` used to be silenced by its caller,
-            this is no longer the case, they will propagate upwards.
-
 ``Select``
 ~~~~~~~~~~
 
diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index 01215884c4..a9673ce3d2 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -757,21 +757,16 @@ directory on the filesystem. Has three special arguments, of which the first is
 
 .. attribute:: FilePathField.allow_files
 
-    .. versionadded:: 1.5
-
     Optional.  Either ``True`` or ``False``.  Default is ``True``.  Specifies
     whether files in the specified location should be included.  Either this or
     :attr:`~FilePathField.allow_folders` must be ``True``.
 
 .. attribute:: FilePathField.allow_folders
 
-    .. versionadded:: 1.5
-
     Optional.  Either ``True`` or ``False``.  Default is ``False``.  Specifies
     whether folders in the specified location should be included.  Either this
     or :attr:`~FilePathField.allow_files` must be ``True``.
 
-
 Of course, these arguments can be used together.
 
 The one potential gotcha is that :attr:`~FilePathField.match` applies to the
@@ -980,12 +975,6 @@ Like all :class:`CharField` subclasses, :class:`URLField` takes the optional
 :attr:`~CharField.max_length` argument. If you don't specify
 :attr:`~CharField.max_length`, a default of 200 is used.
 
-.. versionadded:: 1.5
-
-    The current value of the field will be displayed as a clickable link above the
-    input widget.
-
-
 Relationship fields
 ===================
 
diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt
index f0ec5b8ac0..015393a408 100644
--- a/docs/ref/models/instances.txt
+++ b/docs/ref/models/instances.txt
@@ -388,8 +388,6 @@ For more details, see the documentation on :ref:`F() expressions
 Specifying which fields to save
 -------------------------------
 
-.. versionadded:: 1.5
-
 If ``save()`` is passed a list of field names in keyword argument
 ``update_fields``, only the fields named in that list will be updated.
 This may be desirable if you want to update just one or a few fields on
diff --git a/docs/ref/models/options.txt b/docs/ref/models/options.txt
index 3e8f64c37a..7ad0242df7 100644
--- a/docs/ref/models/options.txt
+++ b/docs/ref/models/options.txt
@@ -286,8 +286,6 @@ Django quotes column and table names behind the scenes.
 
 .. attribute:: Options.index_together
 
-    .. versionadded:: 1.5
-
     Sets of field names that, taken together, are indexed::
 
         index_together = [
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 9782864a43..910f7d94d5 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -1149,13 +1149,11 @@ to ``defer()``::
     # Load all fields immediately.
     my_queryset.defer(None)
 
-.. versionchanged:: 1.5
-
-    Some fields in a model won't be deferred, even if you ask for them. You can
-    never defer the loading of the primary key. If you are using
-    :meth:`select_related()` to retrieve related models, you shouldn't defer the
-    loading of the field that connects from the primary model to the related
-    one, doing so will result in an error.
+Some fields in a model won't be deferred, even if you ask for them. You can
+never defer the loading of the primary key. If you are using
+:meth:`select_related()` to retrieve related models, you shouldn't defer the
+loading of the field that connects from the primary model to the related
+one, doing so will result in an error.
 
 .. note::
 
@@ -1178,8 +1176,6 @@ to ``defer()``::
     reader, is slightly faster and consumes a little less memory in the Python
     process.
 
-.. versionchanged:: 1.5
-
 .. note::
 
     When calling :meth:`~django.db.models.Model.save()` for instances with
@@ -1227,16 +1223,14 @@ All of the cautions in the note for the :meth:`defer` documentation apply to
 ``only()`` as well. Use it cautiously and only after exhausting your other
 options.
 
-.. versionchanged:: 1.5
-
-    Using :meth:`only` and omitting a field requested using
-    :meth:`select_related` is an error as well.
+Using :meth:`only` and omitting a field requested using :meth:`select_related`
+is an error as well.
 
-    .. note::
+.. note::
 
-        When calling :meth:`~django.db.models.Model.save()` for instances with
-        deferred fields, only the loaded fields will be saved. See
-        :meth:`~django.db.models.Model.save()` for more details.
+    When calling :meth:`~django.db.models.Model.save()` for instances with
+    deferred fields, only the loaded fields will be saved. See
+    :meth:`~django.db.models.Model.save()` for more details.
 
 using
 ~~~~~
@@ -1567,10 +1561,6 @@ The ``batch_size`` parameter controls how many objects are created in single
 query. The default is to create all objects in one batch, except for SQLite
 where the default is such that at maximum 999 variables per query is used.
 
-.. versionadded:: 1.5
-
-    The ``batch_size`` parameter was added in version 1.5.
-
 count
 ~~~~~
 
@@ -1900,10 +1890,6 @@ methods on your models. It does, however, emit the
 :data:`~django.db.models.signals.post_delete` signals for all deleted objects
 (including cascaded deletions).
 
-.. versionadded:: 1.5
-
-    Allow fast-path deletion of objects.
-
 Django needs to fetch objects into memory to send signals and handle cascades.
 However, if there are no cascades and no signals, then Django may take a
 fast-path and delete objects without fetching into memory. For large
@@ -1911,7 +1897,7 @@ deletes this can result in significantly reduced memory usage. The amount of
 executed queries can be reduced, too.
 
 ForeignKeys which are set to :attr:`~django.db.models.ForeignKey.on_delete`
-DO_NOTHING do not prevent taking the fast-path in deletion.
+``DO_NOTHING`` do not prevent taking the fast-path in deletion.
 
 Note that the queries generated in object deletion is an implementation
 detail subject to change.
diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt
index c57a1470d6..a4ed6a2645 100644
--- a/docs/ref/request-response.txt
+++ b/docs/ref/request-response.txt
@@ -93,10 +93,6 @@ All attributes should be considered read-only, unless stated otherwise below.
     non-form data posted in the request, access this through the
     :attr:`HttpRequest.body` attribute instead.
 
-    .. versionchanged:: 1.5
-
-        Before Django 1.5, HttpRequest.POST contained non-form data.
-
     It's possible that a request can come in via POST with an empty ``POST``
     dictionary -- if, say, a form is requested via the POST HTTP method but
     does not include form data. Therefore, you shouldn't use ``if request.POST``
@@ -196,8 +192,6 @@ All attributes should be considered read-only, unless stated otherwise below.
 
 .. attribute:: HttpRequest.resolver_match
 
-    .. versionadded:: 1.5
-
     An instance of :class:`~django.core.urlresolvers.ResolverMatch` representing
     the resolved url. This attribute is only set after url resolving took place,
     which means it's available in all views but not in middleware methods which
@@ -824,8 +818,6 @@ types of HTTP responses. Like ``HttpResponse``, these subclasses live in
 StreamingHttpResponse objects
 =============================
 
-.. versionadded:: 1.5
-
 .. class:: StreamingHttpResponse
 
 The :class:`StreamingHttpResponse` class is used to stream a response from
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index bc4666d435..424f7d5795 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1542,6 +1542,8 @@ unpredictable value.
 :djadmin:`django-admin.py startproject <startproject>` automatically adds a
 randomly-generated ``SECRET_KEY`` to each new project.
 
+Django will refuse to start if :setting:`SECRET_KEY` is not set.
+
 .. warning::
 
     **Keep this value secret.**
@@ -1550,10 +1552,6 @@ randomly-generated ``SECRET_KEY`` to each new project.
     security protections, and can lead to privilege escalation and remote code
     execution vulnerabilities.
 
-.. versionchanged:: 1.5
-
-    Django will now refuse to start if :setting:`SECRET_KEY` is not set.
-
 .. setting:: SECURE_PROXY_SSL_HEADER
 
 SECURE_PROXY_SSL_HEADER
@@ -2108,13 +2106,9 @@ The URL where requests are redirected after login when the
 This is used by the :func:`~django.contrib.auth.decorators.login_required`
 decorator, for example.
 
-.. versionchanged:: 1.5
-
-    This setting now also accepts view function names and
-    :ref:`named URL patterns <naming-url-patterns>` which can be used to reduce
-    configuration duplication since you no longer have to define the URL in two
-    places (``settings`` and URLconf).
-    For backward compatibility reasons the default remains unchanged.
+This setting also accepts view function names and :ref:`named URL patterns
+<naming-url-patterns>` which can be used to reduce configuration duplication
+since you don't have to define the URL in two places (``settings`` and URLconf).
 
 .. setting:: LOGIN_URL
 
@@ -2126,13 +2120,9 @@ Default: ``'/accounts/login/'``
 The URL where requests are redirected for login, especially when using the
 :func:`~django.contrib.auth.decorators.login_required` decorator.
 
-.. versionchanged:: 1.5
-
-    This setting now also accepts view function names and
-    :ref:`named URL patterns <naming-url-patterns>` which can be used to reduce
-    configuration duplication since you no longer have to define the URL in two
-    places (``settings`` and URLconf).
-    For backward compatibility reasons the default remains unchanged.
+This setting also accepts view function names and :ref:`named URL patterns
+<naming-url-patterns>` which can be used to reduce configuration duplication
+since you don't have to define the URL in two places (``settings`` and URLconf).
 
 .. setting:: LOGOUT_URL
 
diff --git a/docs/ref/signals.txt b/docs/ref/signals.txt
index d4f261cadb..71756c98c6 100644
--- a/docs/ref/signals.txt
+++ b/docs/ref/signals.txt
@@ -118,8 +118,6 @@ Arguments sent with this signal:
 ``using``
     The database alias being used.
 
-.. versionadded:: 1.5
-
 ``update_fields``
     The set of fields to update explicitly specified in the ``save()`` method.
     ``None`` if this argument was not used in the ``save()`` call.
@@ -153,8 +151,6 @@ Arguments sent with this signal:
 ``using``
     The database alias being used.
 
-.. versionadded:: 1.5
-
 ``update_fields``
     The set of fields to update explicitly specified in the ``save()`` method.
     ``None`` if this argument was not used in the ``save()`` call.
@@ -496,14 +492,7 @@ request_finished
 .. data:: django.core.signals.request_finished
    :module:
 
-Sent when Django finishes processing an HTTP request.
-
-.. versionchanged:: 1.5
-
-    Before Django 1.5, this signal was sent before delivering content to the
-    client. In order to accommodate :ref:`streaming responses
-    <httpresponse-streaming>`, it is now sent after the response has been fully
-    delivered to the client.
+Sent when Django finishes delvering an HTTP response to the client.
 
 .. note::
 
diff --git a/docs/ref/template-response.txt b/docs/ref/template-response.txt
index a8fb8dfee6..47c012e12a 100644
--- a/docs/ref/template-response.txt
+++ b/docs/ref/template-response.txt
@@ -75,16 +75,10 @@ Methods
         The HTTP Status code for the response.
 
     ``content_type``
-
-        .. versionchanged:: 1.5
-
-            Historically, this parameter was only called ``mimetype`` (now
-            deprecated), but since this is actually the value included in the HTTP
-            ``Content-Type`` header, it can also include the character set
-            encoding, which makes it more than just a MIME type specification. If
-            ``content_type`` is specified, then its value is used. Otherwise,
-            :setting:`DEFAULT_CONTENT_TYPE` is used.
-
+        The value included in the HTTP ``Content-Type`` header, including the
+        MIME type specification and the character set encoding. If
+        ``content_type`` is specified, then its value is used. Otherwise,
+        :setting:`DEFAULT_CONTENT_TYPE` is used.
 
 .. method:: SimpleTemplateResponse.resolve_context(context)
 
@@ -167,13 +161,8 @@ Methods
         The HTTP Status code for the response.
 
     ``content_type``
-
-        .. versionchanged:: 1.5
-
-        Historically, this parameter was only called ``mimetype`` (now
-        deprecated), but since this is actually the value included in the HTTP
-        ``Content-Type`` header, it can also include the character set
-        encoding, which makes it more than just a MIME type specification. If
+        The value included in the HTTP ``Content-Type`` header, including the
+        MIME type specification and the character set encoding. If
         ``content_type`` is specified, then its value is used. Otherwise,
         :setting:`DEFAULT_CONTENT_TYPE` is used.
 
diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt
index 87822fe7f8..05f8c249c5 100644
--- a/docs/ref/templates/api.txt
+++ b/docs/ref/templates/api.txt
@@ -274,11 +274,6 @@ Builtin variables
 Every context contains ``True``, ``False`` and ``None``. As you would expect,
 these variables resolve to the corresponding Python objects.
 
-.. versionadded:: 1.5
-
-    Before Django 1.5, these variables weren't a special case, and they
-    resolved to ``None`` unless you defined them in the context.
-
 Playing with Context objects
 ----------------------------
 
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 1fadf77d50..5b02ab22d1 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1059,22 +1059,14 @@ by the context as to the current application.
 
 .. warning::
 
-    Don't forget to put quotes around the function path or pattern name!
-
-    .. versionchanged:: 1.5
-
-        The first parameter used not to be quoted, which was inconsistent with
-        other template tags. Since Django 1.5, it is evaluated according to
-        the usual rules: it can be a quoted string or a variable that will be
-        looked up in the context.
+    Don't forget to put quotes around the function path or pattern name,
+    otherwise the value will be interpreted as a context variable!
 
 .. templatetag:: verbatim
 
 verbatim
 ^^^^^^^^
 
-.. versionadded:: 1.5
-
 Stops the template engine from rendering the contents of this block tag.
 
 A common use is to allow a Javascript template layer that collides with
@@ -2411,8 +2403,6 @@ It is also able to consume standard context variables, e.g. assuming a
 If you'd like to retrieve a static URL without displaying it, you can use a
 slightly different call:
 
-.. versionadded:: 1.5
-
 .. code-block:: html+django
 
     {% load static %}
diff --git a/docs/ref/unicode.txt b/docs/ref/unicode.txt
index c9534c12c9..306a2dfb48 100644
--- a/docs/ref/unicode.txt
+++ b/docs/ref/unicode.txt
@@ -45,28 +45,26 @@ rendering or anywhere else -- you have two choices for encoding those strings.
 You can use Unicode strings, or you can use normal strings (sometimes called
 "bytestrings") that are encoded using UTF-8.
 
-.. versionchanged:: 1.5
+In Python 3, the logic is reversed, that is normal strings are Unicode, and
+when you want to specifically create a bytestring, you have to prefix the
+string with a 'b'. As we are doing in Django code from version 1.5,
+we recommend that you import ``unicode_literals`` from the __future__ library
+in your code. Then, when you specifically want to create a bytestring literal,
+prefix the string with 'b'.
 
-    In Python 3, the logic is reversed, that is normal strings are Unicode, and
-    when you want to specifically create a bytestring, you have to prefix the
-    string with a 'b'. As we are doing in Django code from version 1.5,
-    we recommend that you import ``unicode_literals`` from the __future__ library
-    in your code. Then, when you specifically want to create a bytestring literal,
-    prefix the string with 'b'.
+Python 2 legacy::
 
-    Python 2 legacy::
+    my_string = "This is a bytestring"
+    my_unicode = u"This is an Unicode string"
 
-        my_string = "This is a bytestring"
-        my_unicode = u"This is an Unicode string"
+Python 2 with unicode literals or Python 3::
 
-    Python 2 with unicode literals or Python 3::
-
-        from __future__ import unicode_literals
+    from __future__ import unicode_literals
 
-        my_string = b"This is a bytestring"
-        my_unicode = "This is an Unicode string"
+    my_string = b"This is a bytestring"
+    my_unicode = "This is an Unicode string"
 
-    See also :doc:`Python 3 compatibility </topics/python3>`.
+See also :doc:`Python 3 compatibility </topics/python3>`.
 
 .. warning::
 
diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt
index d31de35006..a093de18b7 100644
--- a/docs/ref/utils.txt
+++ b/docs/ref/utils.txt
@@ -204,8 +204,6 @@ The functions defined in this module share the following properties:
 
 .. function:: smart_text(s, encoding='utf-8', strings_only=False, errors='strict')
 
-    .. versionadded:: 1.5
-
     Returns a text object representing ``s`` -- ``unicode`` on Python 2 and
     ``str`` on Python 3. Treats bytestrings using the ``encoding`` codec.
 
@@ -225,8 +223,6 @@ The functions defined in this module share the following properties:
 
 .. function:: force_text(s, encoding='utf-8', strings_only=False, errors='strict')
 
-    .. versionadded:: 1.5
-
     Similar to ``smart_text``, except that lazy instances are resolved to
     strings, rather than kept as lazy objects.
 
@@ -239,8 +235,6 @@ The functions defined in this module share the following properties:
 
 .. function:: smart_bytes(s, encoding='utf-8', strings_only=False, errors='strict')
 
-    .. versionadded:: 1.5
-
     Returns a bytestring version of ``s``, encoded as specified in
     ``encoding``.
 
@@ -249,8 +243,6 @@ The functions defined in this module share the following properties:
 
 .. function:: force_bytes(s, encoding='utf-8', strings_only=False, errors='strict')
 
-    .. versionadded:: 1.5
-
     Similar to ``smart_bytes``, except that lazy instances are resolved to
     bytestrings, rather than kept as lazy objects.
 
@@ -745,8 +737,6 @@ appropriate entities.
 
 .. class:: SafeBytes
 
-    .. versionadded:: 1.5
-
     A ``bytes`` subclass that has been specifically marked as "safe"
     (requires no further escaping) for HTML output purposes.
 
@@ -758,8 +748,6 @@ appropriate entities.
 
 .. class:: SafeText
 
-    .. versionadded:: 1.5
-
     A ``str`` (in Python 3) or ``unicode`` (in Python 2) subclass
     that has been specifically marked as "safe" for HTML output purposes.
 
@@ -977,8 +965,6 @@ For a complete discussion on the usage of the following see the
     ``None``, the :ref:`current time zone <default-current-time-zone>` is unset
     on entry with :func:`deactivate()` instead.
 
-.. versionadded:: 1.5
-
 .. function:: localtime(value, timezone=None)
 
     Converts an aware :class:`~datetime.datetime` to a different time zone,
diff --git a/docs/topics/auth/customizing.txt b/docs/topics/auth/customizing.txt
index 5c60c52297..8a44d58ef6 100644
--- a/docs/topics/auth/customizing.txt
+++ b/docs/topics/auth/customizing.txt
@@ -359,8 +359,6 @@ the extra database load.
 Substituting a custom User model
 ================================
 
-.. versionadded:: 1.5
-
 Some kinds of projects may have authentication requirements for which Django's
 built-in :class:`~django.contrib.auth.models.User` model is not always
 appropriate. For instance, on some sites it makes more sense to use an email
diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt
index 78bf820e89..fdeb20fd10 100644
--- a/docs/topics/auth/default.txt
+++ b/docs/topics/auth/default.txt
@@ -434,12 +434,10 @@ The login_required decorator
 
         (r'^accounts/login/$', 'django.contrib.auth.views.login'),
 
-    .. versionchanged:: 1.5
-
-        The :setting:`settings.LOGIN_URL <LOGIN_URL>` also accepts
-        view function names and :ref:`named URL patterns <naming-url-patterns>`.
-        This allows you to freely remap your login view within your URLconf
-        without having to update the setting.
+    The :setting:`settings.LOGIN_URL <LOGIN_URL>` also accepts view function
+    names and :ref:`named URL patterns <naming-url-patterns>`. This allows you
+    to freely remap your login view within your URLconf without having to
+    update the setting.
 
 .. note::
 
@@ -1187,10 +1185,6 @@ Thus, you can check permissions in template ``{% if %}`` statements:
         <p>You don't have permission to do anything in the foo app.</p>
     {% endif %}
 
-.. versionadded:: 1.5
-
-    Permission lookup by "if in".
-
 It is possible to also look permissions up by ``{% if in %}`` statements.
 For example:
 
diff --git a/docs/topics/class-based-views/mixins.txt b/docs/topics/class-based-views/mixins.txt
index fdd5d42c5d..fb0b388b57 100644
--- a/docs/topics/class-based-views/mixins.txt
+++ b/docs/topics/class-based-views/mixins.txt
@@ -55,8 +55,6 @@ interface to working with templates in class-based views.
     override this to provide more flexible defaults when dealing with actual
     objects.
 
-.. versionadded:: 1.5
-
 :class:`~django.views.generic.base.ContextMixin`
     Every built in view which needs context data, such as for rendering a
     template (including ``TemplateResponseMixin`` above), should call
diff --git a/docs/topics/db/multi-db.txt b/docs/topics/db/multi-db.txt
index ac329cc4fc..3a902a9793 100644
--- a/docs/topics/db/multi-db.txt
+++ b/docs/topics/db/multi-db.txt
@@ -680,11 +680,6 @@ In addition, some objects are automatically created just after
 - three ``Permission`` for each model (including those not stored in that
   database).
 
-.. versionchanged:: 1.5
-
-    Previously, ``ContentType`` and ``Permission`` instances were created only
-    in the default database.
-
 For common setups with multiple databases, it isn't useful to have these
 objects in more than one database. Common setups include master / slave and
 connecting to external databases. Therefore, it's recommended:
diff --git a/docs/topics/db/queries.txt b/docs/topics/db/queries.txt
index 9a0d0ce6b9..30335f266d 100644
--- a/docs/topics/db/queries.txt
+++ b/docs/topics/db/queries.txt
@@ -639,20 +639,11 @@ that were modified more than 3 days after they were published::
     >>> from datetime import timedelta
     >>> Entry.objects.filter(mod_date__gt=F('pub_date') + timedelta(days=3))
 
-.. versionadded:: 1.5
-
-    ``.bitand()`` and ``.bitor()``
-
-The ``F()`` objects now support bitwise operations by ``.bitand()`` and
+The ``F()`` objects support bitwise operations by ``.bitand()`` and
 ``.bitor()``, for example::
 
     >>> F('somefield').bitand(16)
 
-.. versionchanged:: 1.5
-
-    The previously undocumented operators ``&`` and ``|`` no longer produce
-    bitwise operations, use ``.bitand()`` and ``.bitor()`` instead.
-
 The pk lookup shortcut
 ----------------------
 
diff --git a/docs/topics/http/middleware.txt b/docs/topics/http/middleware.txt
index 6bb7ccb8f8..da3f7ce4c1 100644
--- a/docs/topics/http/middleware.txt
+++ b/docs/topics/http/middleware.txt
@@ -204,11 +204,6 @@ reverse order, from the bottom up. This means classes defined at the end of
 Dealing with streaming responses
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. versionchanged:: 1.5
-
-    ``response`` may also be an :class:`~django.http.StreamingHttpResponse`
-    object.
-
 Unlike :class:`~django.http.HttpResponse`,
 :class:`~django.http.StreamingHttpResponse` does not have a ``content``
 attribute. As a result, middleware can no longer assume that all responses
diff --git a/docs/topics/http/sessions.txt b/docs/topics/http/sessions.txt
index 8538859dad..87b5972c2e 100644
--- a/docs/topics/http/sessions.txt
+++ b/docs/topics/http/sessions.txt
@@ -70,10 +70,6 @@ If you have multiple caches defined in :setting:`CACHES`, Django will use the
 default cache. To use another cache, set :setting:`SESSION_CACHE_ALIAS` to the
 name of that cache.
 
-.. versionchanged:: 1.5
-
-    The :setting:`SESSION_CACHE_ALIAS` setting was added.
-
 Once your cache is configured, you've got two choices for how to store data in
 the cache:
 
@@ -302,8 +298,6 @@ You can edit it multiple times.
 
     .. method:: SessionBase.clear_expired
 
-      .. versionadded:: 1.5
-
       Removes expired sessions from the session store. This class method is
       called by :djadmin:`clearsessions`.
 
@@ -469,9 +463,7 @@ cookie will be sent on every request.
 Similarly, the ``expires`` part of a session cookie is updated each time the
 session cookie is sent.
 
-.. versionchanged:: 1.5
-
-  The session is not saved if the response's status code is 500.
+The session is not saved if the response's status code is 500.
 
 .. _browser-length-vs-persistent-sessions:
 
diff --git a/docs/topics/http/shortcuts.txt b/docs/topics/http/shortcuts.txt
index 8a1d5ca5a7..8a80affb2a 100644
--- a/docs/topics/http/shortcuts.txt
+++ b/docs/topics/http/shortcuts.txt
@@ -50,10 +50,6 @@ Optional arguments
     The MIME type to use for the resulting document. Defaults to the value of
     the :setting:`DEFAULT_CONTENT_TYPE` setting.
 
-    .. versionchanged:: 1.5
-
-        This parameter used to be called ``mimetype``.
-
 ``status``
     The status code for the response. Defaults to ``200``.
 
@@ -129,11 +125,6 @@ Optional arguments
     The MIME type to use for the resulting document. Defaults to the value of
     the :setting:`DEFAULT_CONTENT_TYPE` setting.
 
-    .. versionchanged:: 1.5
-
-        This parameter used to be called ``mimetype``.
-
-
 Example
 -------
 
diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt
index e724837ce1..6436e7dcf9 100644
--- a/docs/topics/i18n/translation.txt
+++ b/docs/topics/i18n/translation.txt
@@ -1031,8 +1031,6 @@ in django-statici18n_.
 Internationalization: in URL patterns
 =====================================
 
-..  versionadded:: 1.4
-
 .. module:: django.conf.urls.i18n
 
 Django provides two mechanisms to internationalize URL patterns:
diff --git a/docs/topics/logging.txt b/docs/topics/logging.txt
index 66c517d615..21eac6e120 100644
--- a/docs/topics/logging.txt
+++ b/docs/topics/logging.txt
@@ -581,8 +581,6 @@ logging module.
 
 .. class:: RequireDebugTrue()
 
-   .. versionadded:: 1.5
-
    This filter is similar to :class:`RequireDebugFalse`, except that records are
    passed only when :setting:`DEBUG` is ``True``.
 
@@ -599,10 +597,5 @@ All messages reaching the ``django`` catch-all logger when :setting:`DEBUG` is
 ``True`` are sent to the console. They are simply discarded (sent to
 ``NullHandler``) when :setting:`DEBUG` is ``False``.
 
-.. versionchanged:: 1.5
-
-    Before Django 1.5, all messages reaching the ``django`` logger were
-    discarded, regardless of :setting:`DEBUG`.
-
 See also :ref:`Configuring logging <configuring-logging>` to learn how you can
 complement or replace this default logging configuration.
diff --git a/docs/topics/pagination.txt b/docs/topics/pagination.txt
index 9da71563c3..f3c8e35c25 100644
--- a/docs/topics/pagination.txt
+++ b/docs/topics/pagination.txt
@@ -248,19 +248,13 @@ Methods
 
 .. method:: Page.next_page_number()
 
-    Returns the next page number.
-
-    .. versionchanged:: 1.5
-
-        Raises :exc:`InvalidPage` if next page doesn't exist.
+    Returns the next page number. Raises :exc:`InvalidPage` if next page
+    doesn't exist.
 
 .. method:: Page.previous_page_number()
 
-    Returns the previous page number.
-
-    .. versionchanged:: 1.5
-
-        Raises :exc:`InvalidPage` if previous page doesn't exist.
+    Returns the previous page number. Raises :exc:`InvalidPage` if previous
+    page doesn't exist.
 
 .. method:: Page.start_index()
 
diff --git a/docs/topics/serialization.txt b/docs/topics/serialization.txt
index e88e16029e..8078e0f2c6 100644
--- a/docs/topics/serialization.txt
+++ b/docs/topics/serialization.txt
@@ -141,14 +141,11 @@ sure that they are "appropriate" for saving before doing so.  Of course, if you
 trust your data source you could just save the object and move on.
 
 The Django object itself can be inspected as ``deserialized_object.object``.
+If fields in the serialized data do not exist on a model, a
+``DeserializationError`` will be raised unless the ``ignorenonexistent``
+argument is passed in as ``True``::
 
-.. versionadded:: 1.5
-
-    If fields in the serialized data do not exist on a model,
-    a ``DeserializationError`` will be raised unless the ``ignorenonexistent``
-    argument is passed in as True::
-
-        serializers.deserialize("xml", data, ignorenonexistent=True)
+    serializers.deserialize("xml", data, ignorenonexistent=True)
 
 .. _serialization-formats:
 
diff --git a/docs/topics/signals.txt b/docs/topics/signals.txt
index a97fb2f14f..587590096c 100644
--- a/docs/topics/signals.txt
+++ b/docs/topics/signals.txt
@@ -132,10 +132,6 @@ Now, our ``my_callback`` function will be called each time a request finishes.
 Note that ``receiver`` can also take a list of signals to connect a function
 to.
 
-.. versionchanged:: 1.5
-
-    The ability to pass a list of signals was added.
-
 .. admonition:: Where should this code live?
 
     You can put signal handling and registration code anywhere you like.
diff --git a/docs/topics/testing/advanced.txt b/docs/topics/testing/advanced.txt
index 26d7521177..9ed06447c0 100644
--- a/docs/topics/testing/advanced.txt
+++ b/docs/topics/testing/advanced.txt
@@ -217,8 +217,6 @@ Advanced features of ``TransactionTestCase``
 
 .. attribute:: TransactionTestCase.reset_sequences
 
-    .. versionadded:: 1.5
-
     Setting ``reset_sequences = True`` on a ``TransactionTestCase`` will make
     sure sequences are always reset before the test run::
 
diff --git a/docs/topics/testing/overview.txt b/docs/topics/testing/overview.txt
index 0673ed6e7a..746c78f41b 100644
--- a/docs/topics/testing/overview.txt
+++ b/docs/topics/testing/overview.txt
@@ -219,12 +219,6 @@ the Django test runner reorders tests in the following way:
 * Then any other tests (e.g. doctests) that may alter the database without
   restoring it to its original state are run.
 
-.. versionchanged:: 1.5
-
-    Before Django 1.5, the only guarantee was that
-    :class:`~django.test.TestCase` tests were always ran first, before any other
-    tests.
-
 .. note::
 
     The new ordering of tests may reveal unexpected dependencies on test case
@@ -587,11 +581,6 @@ Use the ``django.test.client.Client`` class to make requests.
         When ``data`` is provided, it is used as the request body, and
         a ``Content-Type`` header is set to ``content_type``.
 
-        .. versionchanged:: 1.5
-
-            :meth:`Client.options` used to process ``data`` like
-            :meth:`Client.get`.
-
         The ``follow`` and ``extra`` arguments act the same as for
         :meth:`Client.get`.
 
@@ -603,11 +592,6 @@ Use the ``django.test.client.Client`` class to make requests.
         When ``data`` is provided, it is used as the request body, and
         a ``Content-Type`` header is set to ``content_type``.
 
-        .. versionchanged:: 1.5
-
-            :meth:`Client.put` used to process ``data`` like
-            :meth:`Client.post`.
-
         The ``follow`` and ``extra`` arguments act the same as for
         :meth:`Client.get`.
 
@@ -627,15 +611,9 @@ Use the ``django.test.client.Client`` class to make requests.
         When ``data`` is provided, it is used as the request body, and
         a ``Content-Type`` header is set to ``content_type``.
 
-        .. versionchanged:: 1.5
-
-            :meth:`Client.delete` used to process ``data`` like
-            :meth:`Client.get`.
-
         The ``follow`` and ``extra`` arguments act the same as for
         :meth:`Client.get`.
 
-
     .. method:: Client.login(**credentials)
 
         If your site uses Django's :doc:`authentication system</topics/auth/index>`
@@ -931,25 +909,6 @@ to test the effects of commit and rollback:
     database. This can cause your tests to pass or fail unexpectedly. Always
     use ``TransactionTestCase`` when testing transactional behavior.
 
-.. versionchanged:: 1.5
-
-    Prior to 1.5, :class:`~django.test.TransactionTestCase` flushed the
-    database tables *before* each test. In Django 1.5, this is instead done
-    *after* the test has been run.
-
-    When the flush took place before the test, it was guaranteed that primary
-    key values started at one in :class:`~django.test.TransactionTestCase`
-    tests.
-
-    Tests should not depend on this behavior, but for legacy tests that do,
-    the :attr:`~TransactionTestCase.reset_sequences` attribute can be used
-    until the test has been properly updated.
-
-.. versionchanged:: 1.5
-
-    The order in which tests are run has changed. See `Order in which tests are
-    executed`_.
-
 ``TransactionTestCase`` inherits from :class:`~django.test.SimpleTestCase`.
 
 TestCase
@@ -975,11 +934,6 @@ additions, including:
 * Django-specific assertions for testing for things like redirection and form
   errors.
 
-.. versionchanged:: 1.5
-
-    The order in which tests are run has changed. See `Order in which tests are
-    executed`_.
-
 ``TestCase`` inherits from :class:`~django.test.TransactionTestCase`.
 
 .. _live-test-server:
@@ -1636,8 +1590,6 @@ your test suite.
 
 .. method:: SimpleTestCase.assertXMLEqual(xml1, xml2, msg=None)
 
-    .. versionadded:: 1.5
-
     Asserts that the strings ``xml1`` and ``xml2`` are equal. The
     comparison is based on XML semantics. Similarly to
     :meth:`~SimpleTestCase.assertHTMLEqual`, the comparison is
@@ -1649,8 +1601,6 @@ your test suite.
 
 .. method:: SimpleTestCase.assertXMLNotEqual(xml1, xml2, msg=None)
 
-    .. versionadded:: 1.5
-
     Asserts that the strings ``xml1`` and ``xml2`` are *not* equal. The
     comparison is based on XML semantics. See
     :meth:`~SimpleTestCase.assertXMLEqual` for details.
@@ -1659,8 +1609,6 @@ your test suite.
 
 .. method:: SimpleTestCase.assertInHTML(needle, haystack, count=None, msg_prefix='')
 
-    .. versionadded:: 1.5
-
     Asserts that the HTML fragment ``needle`` is contained in the ``haystack`` one.
 
     If the ``count`` integer argument is specified, then additionally the number
@@ -1671,8 +1619,6 @@ your test suite.
 
 .. method:: SimpleTestCase.assertJSONEqual(raw, expected_data, msg=None)
 
-    .. versionadded:: 1.5
-
     Asserts that the JSON fragments ``raw`` and ``expected_data`` are equal.
     Usual JSON non-significant whitespace rules apply as the heavyweight is
     delegated to the :mod:`json` library.
-- 
cgit v1.3