From 5ecdf0eb9ccd47c102deb873a242ed40d1cf45cd Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Tue, 2 Jul 2013 14:14:56 -0400
Subject: [PATCH] [1.6.x] A couple more semicolon -> colon fixes; refs #18134.

Backport of 3632d289de from master.
---
 docs/ref/forms/api.txt      | 2 +-
 docs/releases/1.6.txt       | 8 ++++----
 docs/topics/forms/index.txt | 2 +-
 3 files changed, 6 insertions(+), 6 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
 
diff --git a/docs/topics/forms/index.txt b/docs/topics/forms/index.txt
index 7d5a0ed411..66461c80db 100644
--- a/docs/topics/forms/index.txt
+++ b/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>