summaryrefslogtreecommitdiff
path: root/docs
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:46:03 +0100
commit67c6c1a7cb2ef971497ba8827be5d6e781c0d2e8 (patch)
tree80bdaa58d378711bab3a36be63adb46af51d954c /docs
parent2bba0d275bdf392deb144a6e83392a80d57c8c03 (diff)
Fixed #21359 -- Corrected MySQL collation name in databases docs
Thanks k_sze for the report.
Diffstat (limited to 'docs')
-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 7be439ce81..6ffd84ced3 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -299,7 +299,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
@@ -336,7 +336,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