Edited settings.txt and i18n.txt changes from [7185]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7238 bcc190cf-cafb-0310-a4f2-bffc1f526a37

docs/i18n.txt

@@ -547,7 +547,7 @@ following this algorithm:
 
     * First, it looks for a ``django_language`` key in the the current user's
       `session`_.
-    * 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 for a cookie that is named according to your ``LANGUAGE_COOKIE_NAME`` setting. (The default name is ``django_language``, and this setting is new in the Django development version. In Django version 0.96 and before, the cookie's name is hard-coded to ``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
@@ -719,8 +719,9 @@ Activate this view by adding the following line to your URLconf::
 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 cookie that is by default named ``django_language``
-(the name can be changed through the ``LANGUAGE_COOKIE_NAME`` setting).
+language choice in a cookie that is by default named ``django_language``.
+(The name can be changed through the ``LANGUAGE_COOKIE_NAME`` setting if you're
+using the Django development version.)
 
 After setting the language choice, Django redirects the user, following this
 algorithm:

docs/settings.txt

@@ -582,13 +582,14 @@ in standard language format. For example, U.S. English is ``"en-us"``. See the
 LANGUAGE_COOKIE_NAME
 --------------------
 
+**New in Django development version**
+
 Default: ``'django_language'``
 
 The name of the cookie to use for the language cookie. This can be whatever
-you want (but should be different from SESSION_COOKIE_NAME). See the
+you want (but should be different from ``SESSION_COOKIE_NAME``). See the
 `internationalization docs`_ for details.
 
-
 LANGUAGES
 ---------