Ticket #14704: patch.2

File patch.2, 934 bytes (added by dmoisset, 5 years ago)

Update d patch to apply against current tree

Line 
1diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
2index b394cd7..c4e9f91 100644
3--- a/docs/ref/settings.txt
4+++ b/docs/ref/settings.txt
5@@ -1220,7 +1220,7 @@ will be applied to the number. If this setting is greater than ``0`` then the
6 setting :setting:`THOUSAND_SEPARATOR` will be used as the separator between those
7 groups.
8 
9-See also :setting:`THOUSAND_SEPARATOR`.
10+See also :setting:`THOUSAND_SEPARATOR` and :setting:`USE_THOUSAND_SEPARATOR`.
11 
12 .. setting:: PASSWORD_RESET_TIMEOUT_DAYS
13 
14@@ -1593,9 +1593,9 @@ THOUSAND_SEPARATOR
15 Default ``,`` (Comma)
16 
17 Default thousand separator used when formatting numbers. This setting is
18-used only when ``NUMBER_GROUPING`` is set.
19+used only when ``NUMBER_GROUPING`` and ``USE_THOUSAND_SEPARATOR`` are set.
20 
21-See also ``NUMBER_GROUPING``, ``DECIMAL_SEPARATOR``
22+See also ``NUMBER_GROUPING``, ``DECIMAL_SEPARATOR`` and ``USE_THOUSAND_SEPARATOR``
23 
24 .. setting:: TIME_FORMAT
25 
Back to Top