Skip to content

Commit

Permalink
A couple more semicolon -> colon fixes; refs django#18134.
Browse files Browse the repository at this point in the history
  • Loading branch information
timgraham committed Jul 2, 2013
1 parent ddf9ced commit 3632d28
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/ref/forms/api.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
8 changes: 4 additions & 4 deletions docs/releases/1.6.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 3632d28

Please sign in to comment.