summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-07-02 14:14:56 -0400
committerTim Graham <timograham@gmail.com>2013-07-02 14:14:56 -0400
commit3632d289dedc2e83cde1976e5a4cd00b08c799ee (patch)
treea986820f3b6030bd1bd32e211e3cdbbc017c8b8e /docs
parentddf9ced5bc542c9ca9146450df752ed8ccdccc5f (diff)
A couple more semicolon -> colon fixes; refs #18134.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/forms/api.txt2
-rw-r--r--docs/releases/1.6.txt8
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/ref/forms/api.txt b/docs/ref/forms/api.txt
index 3c17827800..aa19719a68 100644
--- a/docs/ref/forms/api.txt
+++ b/docs/ref/forms/api.txt
@@ -661,7 +661,7 @@ additional attributes for the ``<label>`` tag.
.. versionchanged:: 1.6
The label now includes the form's :attr:`~django.forms.Form.label_suffix`
- (a semicolon, by default).
+ (a colon, by default).
.. method:: BoundField.css_classes()
diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt
index 4219edb1a0..462a389b27 100644
--- a/docs/releases/1.6.txt
+++ b/docs/releases/1.6.txt
@@ -337,8 +337,8 @@ Minor features
default) to allow customizing the :attr:`~django.forms.Form.prefix` of the
form.
-* Raw queries (``Manager.raw()`` or ``cursor.execute()``) can now use the
- "pyformat" parameter style, where placeholders in the query are given as
+* Raw queries (``Manager.raw()`` or ``cursor.execute()``) can now use the
+ "pyformat" parameter style, where placeholders in the query are given as
``'%(name)s'`` and the parameters are passed as a dictionary rather than
a list (except on SQLite). This has long been possible (but not officially
supported) on MySQL and PostgreSQL, and is now also available on Oracle.
@@ -634,10 +634,10 @@ If you manually render ``label_tag`` in your templates:
{{ form.my_field.label_tag }}: {{ form.my_field }}
-you'll want to remove the semicolon (or whatever other separator you may be
+you'll want to remove the colon (or whatever other separator you may be
using) to avoid duplicating it when upgrading to Django 1.6. The following
template in Django 1.6 will render identically to the above template in Django
-1.5, except that the semicolon will appear inside the ``<label>`` element.
+1.5, except that the colon will appear inside the ``<label>`` element.
.. code-block:: html+django