summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-11-01 10:43:27 +0100
committerClaude Paroz <claude@2xlibre.net>2013-11-01 10:47:29 +0100
commitdd0c204828f58f63caa573b0a03df7665c97e6d3 (patch)
tree91f2a5981b94e4bb45e7eb73afc5a79a208f9031
parent3ec994de2af20def51da54a510cb264d744ea48b (diff)
[1.5.x] Fixed #21359 -- Corrected MySQL collation name in databases docs
Thanks k_sze for the report. Backport of 67c6c1a7c from master.
-rw-r--r--docs/ref/databases.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index cd6c50903a..60001abcb5 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -247,7 +247,7 @@ the model definition.
.. _documented thoroughly: http://dev.mysql.com/doc/refman/5.0/en/charset.html
By default, with a UTF-8 database, MySQL will use the
-``utf8_general_ci_swedish`` collation. This results in all string equality
+``utf8_general_ci`` collation. This results in all string equality
comparisons being done in a *case-insensitive* manner. That is, ``"Fred"`` and
``"freD"`` are considered equal at the database level. If you have a unique
constraint on a field, it would be illegal to try to insert both ``"aa"`` and
@@ -284,7 +284,7 @@ bytestrings (which shouldn't be too difficult) as described above is the
recommended solution.
Should you decide to use ``utf8_bin`` collation for some of your tables with
-MySQLdb 1.2.1p2 or 1.2.2, you should still use ``utf8_collation_ci_swedish``
+MySQLdb 1.2.1p2 or 1.2.2, you should still use ``utf8_general_ci``
(the default) collation for the ``django.contrib.sessions.models.Session``
table (usually called ``django_session``) and the
``django.contrib.admin.models.LogEntry`` table (usually called