Ticket #7283: i18n.patch

docs/i18n.txt

@@ -2 +2 @@
 Internationalization
 ====================
 
-Django has full support for internationalization of text in code and templates.
-Here's how it works.
+The goal of internationalization is to allow a single Web application to offer
+its content and functionality in multiple languages.
 
+It has 2 aspects, both of which are fully supported by Django::
+
+    * Internationalization is the process of designing an application 
+      so that it can easily adapt to different characters.
+    * Localization is the process of translating text to the language of the 
+      user.
+      
+The section below describes the localization aspect. The internationalization 
+aspect is covered in the documentation on `Unicode data in Django`_. 
+
+.. _Unicode data in Django: ../unicode
+
 Overview
 ========
 
-The goal of internationalization is to allow a single Web application to offer
-its content and functionality in multiple languages.
-
-You, the Django developer, can accomplish this goal by adding a minimal amount
-of hooks to your Python code and templates. These hooks are called
+You, the Django developer, can accomplish localization by adding a minimal 
+amount of hooks to your Python code and templates. These hooks are called
 **translation strings**. They tell Django: "This text should be translated into
 the end user's language, if a translation for this text is available in that
 language."
@@ -27 +36 @@
     * It uses these hooks to translate Web apps for particular users according
       to their language preferences.
 
-If you don't need internationalization in your app
-==================================================
+If you don't need localization in your app
+==========================================
 
-Django's internationalization hooks are on by default, and that means there's a
+Django's localization hooks are on by default, and that means there's a
 bit of i18n-related overhead in certain places of the framework. If you don't
-use internationalization, you should take the two seconds to set
-``USE_I18N = False`` in your settings file. If ``USE_I18N`` is set to
-``False``, then Django will make some optimizations so as not to load the
-internationalization machinery. See the `documentation for USE_I18N`_.
+use localization, you should take the two seconds to set ``USE_I18N = False`` 
+in your settings file. If ``USE_I18N`` is set to ``False``, then Django will 
+make some optimizations so as not to load the localization machinery. 
+See the `documentation for USE_I18N`_.
 
 You'll probably also want to remove ``'django.core.context_processors.i18n'``
 from your ``TEMPLATE_CONTEXT_PROCESSORS`` setting.
 
 .. _documentation for USE_I18N: ../settings/#use-i18n
 
-If you do need internationalization: three steps
-================================================
+If you do need localization: three steps
+========================================
 
     1. Embed translation strings in your Python code and templates.
     2. Get translations for those strings, in whichever languages you want to