1 files changed, 25 insertions, 1 deletions
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>