summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-03-24 14:30:04 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-03-24 14:30:04 +0100
commite12aad2d57f76f8acbc369feb257cea342cc30c8 (patch)
treea115ce9cb01fe701856eadea8622848b0e56c7d6 /docs
parente16c48e001ccd06830bb0bfd1d20e22ec30fce59 (diff)
Added changes missing from previous commit.
Sorry.
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.6.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt
index f3d12cac38..41611c5aaa 100644
--- a/docs/releases/1.6.txt
+++ b/docs/releases/1.6.txt
@@ -298,13 +298,13 @@ connections.
When a :class:`~django.db.models.BooleanField` doesn't have an explicit
:attr:`~django.db.models.Field.default`, the implicit default value is
``None``. In previous version of Django, it was ``False``, but that didn't
-represent accurantely the lack of a value.
+represent accurately the lack of a value.
Code that relies on the default value being ``False`` may raise an exception
when saving new model instances to the database, because ``None`` isn't an
acceptable value for a :class:`~django.db.models.BooleanField`. You should
-either specify ``default=False`` explicitly on the field definition, or ensure
-the field is set to ``True`` or ``False`` before saving the object.
+either specify ``default=False`` in the field definition, or ensure the field
+is set to ``True`` or ``False`` before saving the object.
Translations and comments in templates
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -328,7 +328,7 @@ specified using ``{#`` / ``#}`` is now stricter. All translator comments not
located at the end of their respective lines in a template are ignored and a
warning is generated by :djadmin:`makemessages` when it finds them. E.g.:
- .. code-block:: html+django
+.. code-block:: html+django
{# Translators: This is ignored #}{% trans "Translate me" %}
{{ title }}{# Translators: Extracted and associated with 'Welcome' below #}