Index: ref/settings.txt
===================================================================
--- ref/settings.txt	(revision 16140)
+++ ref/settings.txt	(working copy)
@@ -716,6 +716,13 @@
 
 Default decimal separator used when formatting decimal numbers.
 
+Note that if :setting:`USE_I18N` is set to ``True``, then the locale-dictated
+format has higher precedence and will be applied instead.
+
+See also :setting:`NUMBER_GROUPING`, :setting:`THOUSAND_SEPARATOR` and
+:setting:`USE_THOUSAND_SEPARATOR`.
+
+
 .. setting:: DEFAULT_CHARSET
 
 DEFAULT_CHARSET
@@ -1349,14 +1356,19 @@
 
 Default: ``0``
 
-Number of digits grouped together on the integer part of a number. Common use
-is to display a thousand separator. If this setting is ``0``, then, no grouping
-will be applied to the number. If this setting is greater than ``0`` then the
-setting :setting:`THOUSAND_SEPARATOR` will be used as the separator between those
-groups.
+Number of digits grouped together on the integer part of a number.
 
-See also :setting:`THOUSAND_SEPARATOR` and :setting:`USE_THOUSAND_SEPARATOR`.
+Common use is to display a thousand separator. If this setting is ``0``, then
+no grouping will be applied to the number. If this setting is greater than
+``0``, then :setting:`THOUSAND_SEPARATOR` will be used as the separator between
+those groups.
 
+Note that if :setting:`USE_I18N` is set to ``True``, then the locale-dictated
+format has higher precedence and will be applied instead.
+
+See also :setting:`DECIMAL_SEPARATOR`, :setting:`THOUSAND_SEPARATOR` and
+:setting:`USE_THOUSAND_SEPARATOR`.
+
 .. setting:: PASSWORD_RESET_TIMEOUT_DAYS
 
 PASSWORD_RESET_TIMEOUT_DAYS
@@ -1794,12 +1806,16 @@
 
 .. versionadded:: 1.2
 
-Default ``,`` (Comma)
+Default: ``,`` (Comma)
 
 Default thousand separator used when formatting numbers. This setting is
-used only when ``NUMBER_GROUPING`` and ``USE_THOUSAND_SEPARATOR`` are set.
+used only when :setting:`USE_THOUSAND_SEPARATOR` is ``True`` and
+:setting:`NUMBER_GROUPING` is greater than ``0``.
 
-See also :setting:`NUMBER_GROUPING`, :setting:`DECIMAL_SEPARATOR` and
+Note that if :setting:`USE_I18N` is set to ``True``, then the locale-dictated
+format has higher precedence and will be applied instead.
+
+See also :setting:`DECIMAL_SEPARATOR`, :setting:`NUMBER_GROUPING` and
 :setting:`USE_THOUSAND_SEPARATOR`.
 
 .. setting:: TIME_FORMAT
@@ -1944,13 +1960,15 @@
 
 Default ``False``
 
-A boolean that specifies wheter to display numbers using a thousand separator.
-If this is set to ``True``, Django will use values from ``THOUSAND_SEPARATOR``
-and ``NUMBER_GROUPING`` from current locale, to format the number.
-``USE_L10N`` must be set to ``True``, in order to format numbers.
+A boolean that specifies whether to display numbers using a thousand separator.
 
-See also ``THOUSAND_SEPARATOR`` and ``NUMBER_GROUPING``.
+When :setting:`USE_L10N` is set to ``True``, if this is also set to ``True``,
+Django will use the values of :setting:`THOUSAND_SEPARATOR` and
+:setting:`NUMBER_GROUPING` to format numbers.
 
+See also :setting:`DECIMAL_SEPARATOR`, :setting:`NUMBER_GROUPING` and
+:setting:`THOUSAND_SEPARATOR`.
+
 .. setting:: YEAR_MONTH_FORMAT
 
 YEAR_MONTH_FORMAT