Document support for separate preseeding of language, country and locale

3 files changed, 49 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index b115f5c29..57517dc95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,9 @@ 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 change in locale selection in localechooser 2.17.
+  * Update for changes in locale selection in localechooser 2.17:
+    - change in order of selection of additional locales and default locale;
+    - support for separate preseeding of language, country and locale.
 
  -- Frans Pop <fjp@debian.org>  Tue, 01 Sep 2009 19:01:59 +0200
 
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 1d12a99d0..bf5d9e3f8 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -529,6 +529,8 @@ always need to specify a value as well: for example,
 <row><entry>auto</entry><entry>auto-install/enable</entry></row>
 <row><entry>classes</entry><entry>auto-install/classes</entry></row>
 <row><entry>fb</entry><entry>debian-installer/framebuffer</entry></row>
+<row><entry>language</entry><entry>debian-installer/language</entry></row>
+<row><entry>country</entry><entry>debian-installer/country</entry></row>
 <row><entry>locale</entry><entry>debian-installer/locale</entry></row>
 <row><entry>priority</entry><entry>debconf/priority</entry></row>
 <row><entry>file</entry><entry>preseed/file</entry></row>
@@ -725,9 +727,31 @@ select a locale that is valid for the selected language.
 To specify the locale as a boot parameter, use
 <userinput>locale=<replaceable>en_US</replaceable></userinput>.
 
+</para><para>
+
+Although this method is very easy to use, it does not allow preseeding of
+all possible combinations of language, country and locale<footnote>
+
+<para>
+Preseeding <literal>locale</literal> to <userinput>en_NL</userinput> would
+for example result in <literal>en_US.UTF-8</literal> as default locale for
+the installed system. If e.g. <literal>en_GB.UTF-8</literal> is preferred
+instead, the values will need to be preseeded individually.
+</para>
+
+</footnote>. So alternatively the values can be preseeded individually.
+Language and country can also be specified as boot parameters.
+
 <informalexample role="example"><screen>
-# Locale sets language and country.
+# Preseeding only locale sets language, country and locale.
 d-i debian-installer/locale string en_US
+
+# The values can also be preseeded individually for greater flexibility.
+#d-i debian-installer/language string en
+#d-i debian-installer/country string NL
+#d-i debian-installer/locale string en_GB.UTF-8
+# Optionally specify additional locales to be generated.
+#d-i localechooser/supported-locales en_US.UTF-8, nl_NL.UTF-8
 </screen></informalexample>
 
 </para><para>
diff --git a/en/boot-installer/parameters.xml b/en/boot-installer/parameters.xml
index 0d0a0a6d4..d1848b5ea 100644
--- a/en/boot-installer/parameters.xml
+++ b/en/boot-installer/parameters.xml
@@ -538,13 +538,30 @@ cases. General instructions how to do this can be found in
 <variablelist>
 
 <varlistentry>
+<term>debian-installer/language (language)</term>
+<term>debian-installer/country (country)</term>
 <term>debian-installer/locale (locale)</term>
 <listitem><para>
 
-Can be used to set both the language and country for the installation.
-This will only work if the locale is supported in Debian.
-For example, use <userinput>locale=de_CH</userinput> to select German as
-language and Switzerland as country.
+There are two ways to specify the language, country and locale to use for
+the installation and the installed system.
+
+</para><para>
+
+The first and easiest is to pass only the parameter <literal>locale</literal>.
+Language and country will then be derived from its value. You can for example
+use <userinput>locale=de_CH</userinput> to select German as language and
+Switzerland as country (<literal>de_CH.UTF-8</literal> will be set as default
+locale for the installed system). Limitation is that not all possible
+combinations of language, country and locale can be achieved this way.
+
+</para><para>
+
+The second, more flexible option is to specify <literal>language</literal>
+and <literal>country</literal> separately. In this case
+<literal>locale</literal> can optionally be added to specify a specific
+default locale for the installed system. Example:
+<userinput>language=en country=DE locale=en_GB.UTF-8</userinput>.
 
 </para></listitem>
 </varlistentry>