Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Edited docs/releases/1.5.txt

  • Loading branch information...
commit e7d99aa0fee232e8dd2b9a15112a56f35cea4e9b 1 parent 76c3314
Adrian Holovaty authored

Showing 1 changed file with 10 additions and 11 deletions. Show diff stats Hide diff stats

  1. 21  docs/releases/1.5.txt
21  docs/releases/1.5.txt
@@ -23,12 +23,12 @@ required Python version. Django is tested and supported on Python 2.6 and
23 23
 This change should affect only a small number of Django users, as most
24 24
 operating-system vendors today are shipping Python 2.6 or newer as their default
25 25
 version. If you're still using Python 2.5, however, you'll need to stick to
26  
-Django 1.4 until you can upgrade. Per :doc:`our support policy
  26
+Django 1.4 until you can upgrade your Python version. Per :doc:`our support policy
27 27
 </internals/release-process>`, Django 1.4 will continue to receive security
28 28
 support until the release of Django 1.6.
29 29
 
30  
-As Jython does currently not offer any version compatible with Python 2.6,
31  
-Django 1.5 does not run on Jython.
  30
+Django 1.5 does not run on Jython, because Jython doesn't currently offer any
  31
+version compatible with Python 2.6.
32 32
 
33 33
 What's new in Django 1.5
34 34
 ========================
@@ -42,7 +42,7 @@ Django 1.5 also includes several smaller improvements worth noting:
42 42
   corresponding Python objects.
43 43
 
44 44
 * :mod:`django.utils.timezone` provides a helper for converting aware
45  
-  datetimes between time zones, see :func:`~django.utils.timezone.localtime`.
  45
+  datetimes between time zones. See :func:`~django.utils.timezone.localtime`.
46 46
 
47 47
 Backwards incompatible changes in 1.5
48 48
 =====================================
@@ -51,7 +51,7 @@ Backwards incompatible changes in 1.5
51 51
 
52 52
     In addition to the changes outlined in this section, be sure to review the
53 53
     :doc:`deprecation plan </internals/deprecation>` for any features that
54  
-    have been removed. If you have not updated your code within the
  54
+    have been removed. If you haven't updated your code within the
55 55
     deprecation timeline for a given feature, its removal may appear as a
56 56
     backwards incompatible change.
57 57
 
@@ -61,14 +61,13 @@ Features deprecated in 1.5
61 61
 ``django.utils.simplejson``
62 62
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
63 63
 
64  
-Since Django 1.5 drops support for Python 2.5, all supported versions of
65  
-Python provide the :mod:`json` module in their standard library. This module
66  
-is actually a version of ``simplejson`` distributed by Python, so Django no
67  
-longer needs to provide a copy. Any use of :mod:`django.utils.simplejson` can
68  
-be safely changed to :mod:`json`.
  64
+Since Django 1.5 drops support for Python 2.5, we can now rely on the
  65
+:mod:`json` module being in Python's standard library -- so we've removed
  66
+our own copy of ``simplejson``. You can safely change any use of
  67
+:mod:`django.utils.simplejson` to :mod:`json`.
69 68
 
70 69
 ``itercompat.product``
71 70
 ~~~~~~~~~~~~~~~~~~~~~~
72 71
 
73 72
 The :func:`~django.utils.itercompat.product` function has been deprecated. Use
74  
-the builtin `itertools.product` instead.
  73
+the built-in `itertools.product` instead.

0 notes on commit e7d99aa

Please sign in to comment.
Something went wrong with that request. Please try again.