summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog5
-rw-r--r--en/using-d-i/modules/localechooser.xml50
2 files changed, 42 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog
index a0cc612bd..5ed6454c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,11 @@ installation-guide (2009xxxx) UNRELEASED; urgency=low
* welcome: add a link to www.kernel.org and remove the no longer valid link
to www.kerneltraffic.org. Closes: #331523.
* Document new help functionality.
- * Update for changes in locale selection in localechooser 2.17:
+ * Update for changes in locale selection in localechooser 2.17 and 2.18:
+ - selecting a different country is now always possible at high priority;
- change in order of selection of additional locales and default locale;
+ - selection of a preferred locale if a combination of language and country
+ was selected for which no locale exists;
- support for separate preseeding of language, country and locale.
* Mention option to select UTC as time zone at medium/low priority.
diff --git a/en/using-d-i/modules/localechooser.xml b/en/using-d-i/modules/localechooser.xml
index b332ddbee..013a3b14d 100644
--- a/en/using-d-i/modules/localechooser.xml
+++ b/en/using-d-i/modules/localechooser.xml
@@ -22,9 +22,9 @@ installer will default to English.
</para><para>
The selected country will be used later in the installation process to
-pick the default timezone and a Debian mirror appropriate for your
-geographic location. Language and country together will be used to set
-the default locale for your system and to help select your keyboard.
+pick the default time zone and a Debian mirror appropriate for your
+geographic location. Language and country together will help determine
+the default locale for your system and select the correct keyboard layout.
</para><para>
@@ -51,25 +51,51 @@ differing country codes.
</para>
</footnote>, you will be shown a list of only those countries. To select a
-country that is not in that list, choose <guimenuitem>Other</guimenuitem>
+country that is not in that list, choose <guimenuitem>other</guimenuitem>
(the last option). You will then be presented with a list of continents;
selecting a continent will lead to a list of relevant countries on that
continent.
</para><para>
-If the language has only one country associated with it, that country
-will be selected automatically. In that case it is only possible to select
-a different country by first lowering the debconf priority to medium,
-followed by revisiting the language selection option in the main menu of
-the installer.
+If the language has only one country associated with it, a list of countries
+will be displayed for the continent or region the country belongs to, with
+that country selected as the default. Use the <guibutton>Go Back</guibutton>
+option to select countries on a different continent.
+
+</para><note><para>
+
+It is important to select the country where you live or where you are
+located as it determines the time zone that will be configured for the
+installed system.
+
+</para></note><para>
+
+If you selected a combination of language and country for which no locale is
+defined and there exist multiple locales for the language, then the installer
+will allow you to choose which of those locales you prefer as the default
+locale for the installed system. In all other cases a default locale will be
+selected based on the selected language and country.
+
+</para><para>
+
+Any default locale selected as described in the previous paragraph will use
+UTF-8 as character encoding.
</para><para>
-A default locale will be selected based on the selected language and country.
If you are installing at medium or low priority, you will have the option
-of selecting additional locales to be generated for the installed system;
-if you do, you will be asked which locale should be the default for the
+of selecting additional locales, including so-called <quote>legacy</quote>
+locales<footnote>
+
+<para>
+Legacy locales are locales which do not use UTF-8, but one of the older
+standards for character encoding such as ISO&nbsp;8859-1 (used by West
+European languages) or EUC-JP (used by Japanese).
+</para>
+
+</footnote>, to be generated for the installed system; if you do, you will
+be asked which of the selected locales should be the default for the
installed system.
</para>