summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamiro Morales <cramm0@gmail.com>2014-05-10 23:13:50 -0300
committerRamiro Morales <cramm0@gmail.com>2014-05-10 23:13:50 -0300
commit38036e16c8fc7a1f7438f86dca12d667d7b300f1 (patch)
treec25f6de3f3f83086b729a45a8a64218cf2548cbc
parent4cf82e5bcf87e0d5419d941c2ef7ec8855801319 (diff)
Fixed a few release notes typos.
-rw-r--r--docs/releases/1.6.txt2
-rw-r--r--docs/releases/1.7.txt14
2 files changed, 8 insertions, 8 deletions
diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt
index 171e599b8f..3ddc745841 100644
--- a/docs/releases/1.6.txt
+++ b/docs/releases/1.6.txt
@@ -453,7 +453,7 @@ to the item above about changes in the test runners:
The ``django.contrib.gis.tests.GeoDjangoTestSuiteRunner`` test runner has been
removed and the standalone GeoDjango tests execution setup it implemented isn't
supported anymore. To run the GeoDjango tests simply use the new
-``DicoverRunner`` and specify the ``django.contrib.gis`` app.
+``DiscoverRunner`` and specify the ``django.contrib.gis`` app.
Custom User models in tests
~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 6bc70da3f0..b8bc1f8f54 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -459,7 +459,7 @@ Cache
* Defining the :setting:`TIMEOUT <CACHES-TIMEOUT>` argument of the
:setting:`CACHES` setting as ``None`` will set the cache keys as
"non-expiring" by default. Previously, it was only possible to pass
- ``timeout=None` to the cache backend's ``set()`` method.
+ ``timeout=None`` to the cache backend's ``set()`` method.
Cross Site Request Forgery
^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -579,7 +579,7 @@ Internationalization
is still read from in 1.7. Sessions will be migrated to the new key
as they are written.
-* The :ttag:`blocktrans` now supports a ``trimmed`` option. This
+* The :ttag:`blocktrans` tag now supports a ``trimmed`` option. This
option will remove newline characters from the beginning and the end of the
content of the ``{% blocktrans %}`` tag, replace any whitespace at the
beginning and end of a line and merge all lines into one using a space
@@ -738,8 +738,8 @@ Templates
internal structure of each ``Context``'s stack doesn't matter as long as their
flattened version is identical).
-* The :ttag:`widthratio` template tag now accepts an "as" parameter to capture
- the result in a variable.
+* The :ttag:`widthratio` template tag now accepts an ``"as"`` parameter to
+ capture the result in a variable.
* The :ttag:`include` template tag will now also accept anything with a
``render()`` method (such as a ``Template``) as an argument. String
@@ -1138,7 +1138,7 @@ Miscellaneous
two ``Model`` instances without primary key values won't be considered
equal (unless they are the same instance).
-* The :meth:`django.db.models.Model.__hash__` will now raise ``TypeError``
+* The :meth:`django.db.models.Model.__hash__` method will now raise ``TypeError``
when called on an instance without a primary key value. This is done to
avoid mutable ``__hash__`` values in containers.
@@ -1381,7 +1381,7 @@ to ``utils.py`` in an effort to unify all util and utils references:
``ModelAdmin.get_formsets`` has been deprecated in favor of the new
:meth:`~django.contrib.admin.ModelAdmin.get_formsets_with_inlines`, in order to
-better handle the case of selecting showing inlines on a ``ModelAdmin``.
+better handle the case of selectively showing inlines on a ``ModelAdmin``.
``IPAddressField``
~~~~~~~~~~~~~~~~~~
@@ -1537,6 +1537,6 @@ will be removed in Django 1.8.
Reorganization of database test settings
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-All database settings with a `TEST_` prefix have been deprecated in favor of
+All database settings with a ``TEST_`` prefix have been deprecated in favor of
entries in a :setting:`TEST <DATABASE-TEST>` dictionary in the database
settings. The old settings will be supported until Django 1.9.