Permalink
Browse files

[1.6.x] A couple more semicolon -> colon fixes; refs #18134.

Backport of 3632d28 from master.
  • Loading branch information...
1 parent 4c10299 commit 5ecdf0eb9ccd47c102deb873a242ed40d1cf45cd @timgraham timgraham committed Jul 2, 2013
Showing with 6 additions and 6 deletions.
  1. +1 −1 docs/ref/forms/api.txt
  2. +4 −4 docs/releases/1.6.txt
  3. +1 −1 docs/topics/forms/index.txt
View
2 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()
View
8 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
View
2 docs/topics/forms/index.txt
@@ -321,7 +321,7 @@ attributes, which can be useful in your templates:
.. versionchanged:: 1.6
This includes the form's :attr:`~django.forms.Form.label_suffix`. For
- example, the default ``label_suffix`` is a semicolon::
+ example, the default ``label_suffix`` is a colon::
<label for="id_email">Email address:</label>

0 comments on commit 5ecdf0e

Please sign in to comment.