summaryrefslogtreecommitdiff
path: root/docs/topics
diff options
context:
space:
mode:
Diffstat (limited to 'docs/topics')
-rw-r--r--docs/topics/i18n/formatting.txt16
-rw-r--r--docs/topics/i18n/timezones.txt6
-rw-r--r--docs/topics/i18n/translation.txt6
3 files changed, 7 insertions, 21 deletions
diff --git a/docs/topics/i18n/formatting.txt b/docs/topics/i18n/formatting.txt
index 16fd7ca0cb..671901dcdc 100644
--- a/docs/topics/i18n/formatting.txt
+++ b/docs/topics/i18n/formatting.txt
@@ -18,18 +18,16 @@ necessary to set :setting:`USE_L10N = True <USE_L10N>` in your settings file.
.. note::
- The default :file:`settings.py` file created by :djadmin:`django-admin
- startproject <startproject>` includes :setting:`USE_L10N = True <USE_L10N>`
- for convenience. Note, however, that to enable number formatting with
- thousand separators it is necessary to set :setting:`USE_THOUSAND_SEPARATOR
- = True <USE_THOUSAND_SEPARATOR>` in your settings file. Alternatively, you
- could use :tfilter:`intcomma` to format numbers in your template.
+ To enable number formatting with thousand separators, it is necessary to
+ set :setting:`USE_THOUSAND_SEPARATOR = True <USE_THOUSAND_SEPARATOR>` in
+ your settings file. Alternatively, you could use :tfilter:`intcomma` to
+ format numbers in your template.
.. note::
- There is also an independent but related :setting:`USE_I18N` setting that
- controls if Django should activate translation. See
- :doc:`/topics/i18n/translation` for more details.
+ There is a related :setting:`USE_I18N` setting that controls if Django
+ should activate translation. See :doc:`/topics/i18n/translation` for more
+ details.
Locale aware input in forms
===========================
diff --git a/docs/topics/i18n/timezones.txt b/docs/topics/i18n/timezones.txt
index 847e5ff593..5b475bd44f 100644
--- a/docs/topics/i18n/timezones.txt
+++ b/docs/topics/i18n/timezones.txt
@@ -47,12 +47,6 @@ functions in :mod:`django.utils.timezone`.
startproject <startproject>` includes :setting:`USE_TZ = True <USE_TZ>`
for convenience.
-.. note::
-
- There is also an independent but related :setting:`USE_L10N` setting that
- controls whether Django should activate format localization. See
- :doc:`/topics/i18n/formatting` for more details.
-
If you're wrestling with a particular problem, start with the :ref:`time zone
FAQ <time-zones-faq>`.
diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt
index 4c5b8181bc..99fc41ebb6 100644
--- a/docs/topics/i18n/translation.txt
+++ b/docs/topics/i18n/translation.txt
@@ -31,12 +31,6 @@ make some optimizations so as not to load the internationalization machinery.
.. note::
- There is also an independent but related :setting:`USE_L10N` setting that
- controls if Django should implement format localization. See
- :doc:`/topics/i18n/formatting` for more details.
-
-.. note::
-
Make sure you've activated translation for your project (the fastest way is
to check if :setting:`MIDDLEWARE` includes
:mod:`django.middleware.locale.LocaleMiddleware`). If you haven't yet,