26 files changed, 41 insertions, 77 deletions
diff --git a/ca/appendix/preseed.xml b/ca/appendix/preseed.xml
index fdd30d7e4..f0e2b1a72 100644
--- a/ca/appendix/preseed.xml
+++ b/ca/appendix/preseed.xml
@@ -773,8 +773,7 @@ La configuració del teclat consisteix en la selecció d'un mapa de teclat.
 
 <informalexample role="example"><screen>
 # Selecció del teclat.
-# keymap is an alias for keyboard-configuration/xkb-keymap
-d-i keymap select es
+d-i keyboard-configuration/xkb-keymap select es
 # d-i keyboard-configuration/toggle select No toggling
 </screen></informalexample>
 
diff --git a/cs/appendix/preseed.xml b/cs/appendix/preseed.xml
index 24a76422f..388fca3e9 100644
--- a/cs/appendix/preseed.xml
+++ b/cs/appendix/preseed.xml
@@ -849,8 +849,7 @@ keyboard-configuration</command>.
 
 <informalexample role="example"><screen>
 # Výběr klávesnice.
-# keymap je alias pro keyboard-configuration/xkb-keymap
-d-i keymap select cz
+d-i keyboard-configuration/xkb-keymap select cz
 # d-i keyboard-configuration/toggle select No toggling
 </screen></informalexample>
 
diff --git a/de/appendix/preseed.xml b/de/appendix/preseed.xml
index 3f142f5f2..0121442ea 100644
--- a/de/appendix/preseed.xml
+++ b/de/appendix/preseed.xml
@@ -857,8 +857,7 @@ verwenden Sie <command>dpkg-reconfigure keyboard-configuration</command>.
 
 <informalexample role="example"><screen>
 # Auswahl der Tastatur.
-# "keymap" ist ein Alias für "keyboard-configuration/xkb-keymap"
-d-i keymap select de
+d-i keyboard-configuration/xkb-keymap select de
 # Keine Umschalttaste:
 # d-i keyboard-configuration/toggle select No toggling
 </screen></informalexample>
diff --git a/debian/changelog b/debian/changelog
index 9932442d9..e1e8b8acb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ installation-guide (201312xx) UNRELEASED; urgency=low
 
   [ Samuel Thibault ]
   * Reference the DEBIAN_FRONTEND parameter in the accessibility section.
+  * Do not document a "d-i keymap" alias, it does not work, only the bootcommand
+    keymap alias works.
 
   [ Karsten Merker ]
   * Update and extend the "Supported Hardware" section for armel
@@ -28,7 +30,7 @@ installation-guide (201312xx) UNRELEASED; urgency=low
     guide.
   * Remove outdated reference to booting from floppy disks in the
     "Booting from CD-ROM" section.
- 
+
   [ Cyril Brulebois ]
   * Drop installation-guide-ia64 package (commented out).
 
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index d7fa144ca..ba3f9f41d 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -797,8 +797,7 @@ keyboard-configuration</command>.
 
 <informalexample role="example"><screen>
 # Keyboard selection.
-# keymap is an alias for keyboard-configuration/xkb-keymap
-d-i keymap select us
+d-i keyboard-configuration/xkb-keymap select us
 # d-i keyboard-configuration/toggle select No toggling
 </screen></informalexample>
 
diff --git a/fr/appendix/preseed.xml b/fr/appendix/preseed.xml
index b350b327e..92aa549e0 100644
--- a/fr/appendix/preseed.xml
+++ b/fr/appendix/preseed.xml
@@ -766,8 +766,7 @@ Une fois le système installé, vous pourrez choisir des cartes plus évoluées
 
 <informalexample role="example"><screen>
 # Choix du clavier :
-# keymap est un alias de keyboard-configuration/xkb-keymap
-d-i keymap select fr(latin9)
+d-i keyboard-configuration/xkb-keymap select fr(latin9)
 # d-i keyboard-configuration/toggle select No toggling
 </screen></informalexample>
 
diff --git a/it/appendix/preseed.xml b/it/appendix/preseed.xml
index a05fceff4..493f0a5ef 100644
--- a/it/appendix/preseed.xml
+++ b/it/appendix/preseed.xml
@@ -1458,10 +1458,8 @@ keyboard-configuration</command>.
 # Keyboard selection.
 --># Selezione della tastiera.
 <!--
-# keymap is an alias for keyboard-configuration/xkb-keymap
-d-i keymap select us
---># keymap è un alias per keyboard-configuration/xkb-keymap
-d-i keymap select it
+d-i keyboard-configuration/xkb-keymap select us
+-->d-i keyboard-configuration/xkb-keymap select it
 # d-i keyboard-configuration/toggle select No toggling
 </screen></informalexample>
 
diff --git a/po/da/preseed.po b/po/da/preseed.po
index 7b01be537..2113fa934 100644
--- a/po/da/preseed.po
+++ b/po/da/preseed.po
@@ -1186,8 +1186,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "# Keyboard selection.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 msgstr ""
 
diff --git a/po/el/preseed.po b/po/el/preseed.po
index 6d6e314b5..55c87e0f8 100644
--- a/po/el/preseed.po
+++ b/po/el/preseed.po
@@ -1610,13 +1610,11 @@ msgstr ""
 #, no-c-format
 msgid ""
 "# Keyboard selection.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 msgstr ""
 "# Επιλογή πληκτρολογίου.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 
 #. Tag: para
diff --git a/po/es/preseed.po b/po/es/preseed.po
index bddd43829..d0f67100d 100644
--- a/po/es/preseed.po
+++ b/po/es/preseed.po
@@ -1609,13 +1609,11 @@ msgstr ""
 #, no-c-format
 msgid ""
 "# Keyboard selection.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 msgstr ""
 "# Selección de teclado.\n"
-"# keymap es el alias de keyboard-configuration/xkb-keymap\n"
-"d-i keymap select es\n"
+"d-i keyboard-configuration/xkb-keymap select es\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 
 #. Tag: para
diff --git a/po/fi/preseed.po b/po/fi/preseed.po
index b7b6b6efa..e4f7e6ccd 100644
--- a/po/fi/preseed.po
+++ b/po/fi/preseed.po
@@ -1574,13 +1574,11 @@ msgstr ""
 #, fuzzy, no-c-format
 msgid ""
 "# Keyboard selection.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 msgstr ""
 "# Näppäimistön valinta.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select fi\n"
+"d-i keyboard-configuration/xkb-keymap select fi\n"
 "# d-i keyboard-configuration/toggle select No toggling\n"
 
 #. Tag: para
diff --git a/po/hu/preseed.po b/po/hu/preseed.po
index ccce9dcdc..18aa17ecd 100644
--- a/po/hu/preseed.po
+++ b/po/hu/preseed.po
@@ -1487,18 +1487,15 @@ msgstr ""
 #, fuzzy, no-c-format
 #| msgid ""
 #| "# Keyboard selection.\n"
-#| "# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-#| "d-i keymap select us\n"
+#| "d-i keyboard-configuration/xkb-keymap select us\n"
 #| "# d-i keyboard-configuration/toggle select No toggling\n"
 msgid ""
 "# Keyboard selection.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 msgstr ""
 "# Billentyűzet választás.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select hu\n"
+"d-i keyboard-configuration/xkb-keymap select hu\n"
 "# d-i keyboard-configuration/toggle select No toggling\n"
 
 #. Tag: para
diff --git a/po/ja/preseed.po b/po/ja/preseed.po
index 3b7354e4b..53f24b0b5 100644
--- a/po/ja/preseed.po
+++ b/po/ja/preseed.po
@@ -1485,13 +1485,11 @@ msgstr ""
 #, no-c-format
 msgid ""
 "# Keyboard selection.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 msgstr ""
 "# Keyboard selection.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select jp\n"
+"d-i keyboard-configuration/xkb-keymap select jp\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 
 #. Tag: para
diff --git a/po/ko/preseed.po b/po/ko/preseed.po
index 340b9d6a5..52e892835 100644
--- a/po/ko/preseed.po
+++ b/po/ko/preseed.po
@@ -1460,13 +1460,11 @@ msgstr ""
 #, no-c-format
 msgid ""
 "# Keyboard selection.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 msgstr ""
 "# 키보드 선택.\n"
-"# keyboard-configuration/xkb-keymap 대신 keymap이라고 줄여 쓸 수 있습니다\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 
 #. Tag: para
diff --git a/po/nl/preseed.po b/po/nl/preseed.po
index 7b01be537..2113fa934 100644
--- a/po/nl/preseed.po
+++ b/po/nl/preseed.po
@@ -1186,8 +1186,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "# Keyboard selection.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 msgstr ""
 
diff --git a/po/nn/preseed.po b/po/nn/preseed.po
index 7b01be537..2113fa934 100644
--- a/po/nn/preseed.po
+++ b/po/nn/preseed.po
@@ -1186,8 +1186,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "# Keyboard selection.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 msgstr ""
 
diff --git a/po/pot/preseed.pot b/po/pot/preseed.pot
index d04c8d767..064090393 100644
--- a/po/pot/preseed.pot
+++ b/po/pot/preseed.pot
@@ -883,8 +883,7 @@ msgstr ""
 #, no-c-format
 msgid ""
       "# Keyboard selection.\n"
-      "# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-      "d-i keymap select us\n"
+      "d-i keyboard-configuration/xkb-keymap select us\n"
       "# d-i keyboard-configuration/toggle select No toggling"
 msgstr ""
 
diff --git a/po/pt/preseed.po b/po/pt/preseed.po
index fe46773a7..c5c7e1f4e 100644
--- a/po/pt/preseed.po
+++ b/po/pt/preseed.po
@@ -1555,13 +1555,11 @@ msgstr ""
 #, no-c-format
 msgid ""
 "# Keyboard selection.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 msgstr ""
 "# Escolha de teclado.\n"
-"# keymap é um alias para keyboard-configuration/xkb-keymap\n"
-"d-i keymap select pt\n"
+"d-i keyboard-configuration/xkb-keymap select pt\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 
 #. Tag: para
diff --git a/po/ro/preseed.po b/po/ro/preseed.po
index 7b01be537..2113fa934 100644
--- a/po/ro/preseed.po
+++ b/po/ro/preseed.po
@@ -1186,8 +1186,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "# Keyboard selection.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 msgstr ""
 
diff --git a/po/ru/preseed.po b/po/ru/preseed.po
index 23b77e38a..c243a3f9b 100644
--- a/po/ru/preseed.po
+++ b/po/ru/preseed.po
@@ -1552,13 +1552,11 @@ msgstr ""
 #, no-c-format
 msgid ""
 "# Keyboard selection.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 msgstr ""
 "# Выбор клавиатуры.\n"
-"# keymap — это псевдоним keyboard-configuration/xkb-keymap\n"
-"d-i keymap select ru\n"
+"d-i keyboard-configuration/xkb-keymap select ru\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 
 #. Tag: para
diff --git a/po/sv/preseed.po b/po/sv/preseed.po
index ab502eef7..c8d50f9b2 100644
--- a/po/sv/preseed.po
+++ b/po/sv/preseed.po
@@ -1588,13 +1588,11 @@ msgstr ""
 #, fuzzy, no-c-format
 msgid ""
 "# Keyboard selection.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 msgstr ""
 "# Tangentbordsval.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select se\n"
+"d-i keyboard-configuration/xkb-keymap select se\n"
 "# d-i keyboard-configuration/toggle select No toggling\n"
 
 #. Tag: para
diff --git a/po/tl/preseed.po b/po/tl/preseed.po
index 7b01be537..2113fa934 100644
--- a/po/tl/preseed.po
+++ b/po/tl/preseed.po
@@ -1186,8 +1186,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "# Keyboard selection.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 msgstr ""
 
diff --git a/po/vi/preseed.po b/po/vi/preseed.po
index fe5e25ef5..6750adc1d 100644
--- a/po/vi/preseed.po
+++ b/po/vi/preseed.po
@@ -1561,13 +1561,11 @@ msgstr ""
 #, no-c-format
 msgid ""
 "# Keyboard selection.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 msgstr ""
 "# Chọn bàn phím.\n"
-"# keymap là bí danh cho keyboard-configuration/xkb-keymap\n"
-"d-i keymap select vn\n"
+"d-i keyboard-configuration/xkb-keymap select vn\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 
 #. Tag: para
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index fc93be236..64fdb205d 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -1425,13 +1425,11 @@ msgstr ""
 #, no-c-format
 msgid ""
 "# Keyboard selection.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 msgstr ""
 "# Keyboard selection.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 
 #. Tag: para
diff --git a/po/zh_TW/preseed.po b/po/zh_TW/preseed.po
index 7b01be537..2113fa934 100644
--- a/po/zh_TW/preseed.po
+++ b/po/zh_TW/preseed.po
@@ -1186,8 +1186,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "# Keyboard selection.\n"
-"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# d-i keyboard-configuration/toggle select No toggling"
 msgstr ""
 
diff --git a/pt_BR/appendix/preseed.xml b/pt_BR/appendix/preseed.xml
index 59ed32d16..6c6fa7bde 100644
--- a/pt_BR/appendix/preseed.xml
+++ b/pt_BR/appendix/preseed.xml
@@ -757,8 +757,7 @@ A configuração de teclado consiste na seleção do mapa de teclas.
 
 <informalexample role="example"><screen>
 # Keyboard selection.
-# keymap is an alias for keyboard-configuration/xkb-keymap
-d-i keymap select br
+d-i keyboard-configuration/xkb-keymap select br
 # d-i keyboard-configuration/toggle select No toggling
 </screen></informalexample>