Index: settings.txt
===================================================================
--- settings.txt	(revision 6728)
+++ settings.txt	(working copy)
@@ -538,6 +538,16 @@
 
 .. _internationalization docs: ../i18n/
 
+LANGUAGE_COOKIE_NAME
+--------------------
+
+Default: ``'django_language'``
+
+The name of the cookie to use for the language cookie. This can be whatever
+you want but must be different to all other cookie names (e.g. SESSION_COOKIE_NAME).
+See the `internationalization docs`_ for details.
+
+
 LANGUAGES
 ---------
 
@@ -781,7 +791,8 @@
 
 Default: ``'sessionid'``
 
-The name of the cookie to use for sessions. This can be whatever you want.
+The name of the cookie to use for sessions. This can be whatever you want
+but must be different to all other cookie names (e.g. LANGUAGE_COOKIE_NAME).
 See the `session docs`_.
 
 SESSION_COOKIE_PATH
Index: i18n.txt
===================================================================
--- i18n.txt	(revision 6728)
+++ i18n.txt	(working copy)
@@ -539,7 +539,7 @@
 
     * First, it looks for a ``django_language`` key in the the current user's
       `session`_.
-    * Failing that, it looks for a cookie called ``django_language``.
+    * Failing that, it looks for a cookie that is named according to your ``LANGUAGE_COOKIE_NAME`` setting (the default name is: ``django_language``).
     * Failing that, it looks at the ``Accept-Language`` HTTP header. This
       header is sent by your browser and tells the server which language(s) you
       prefer, in order by priority. Django tries each language in the header
@@ -711,7 +711,8 @@
 The view expects to be called via the ``POST`` method, with a ``language``
 parameter set in request. If session support is enabled, the view
 saves the language choice in the user's session. Otherwise, it saves the
-language choice in a ``django_language`` cookie.
+language choice in a cookie that is by default named ``django_language``
+(the name can be changed through the ``LANGUAGE_COOKIE_NAME`` setting).
 
 After setting the language choice, Django redirects the user, following this
 algorithm: