20 files changed, 32 insertions, 31 deletions
diff --git a/ca/install-methods/usb-setup/x86.xml b/ca/install-methods/usb-setup/x86.xml
index 34330301f..dd0dba0c0 100644
--- a/ca/install-methods/usb-setup/x86.xml
+++ b/ca/install-methods/usb-setup/x86.xml
@@ -98,7 +98,7 @@ append initrd=initrd.gz
 </screen></informalexample>
 
 Per a emprar l'instal·lador gràfic heu d'afegir
-<userinput>video=vesa:ywrap,mtrr vga=788</userinput> a la segona línia.
+<userinput>vga=788</userinput> a la segona línia.
 
 </para><para>
 
diff --git a/cs/install-methods/usb-setup/x86.xml b/cs/install-methods/usb-setup/x86.xml
index d0e26ada7..27687006b 100644
--- a/cs/install-methods/usb-setup/x86.xml
+++ b/cs/install-methods/usb-setup/x86.xml
@@ -89,7 +89,7 @@ append initrd=initrd.gz
 </screen></informalexample>
 
 Pro grafickou instalaci byste na druhý řádek měli přidat ještě
-parametry <userinput>video=vesa:ywrap,mtrr vga=788</userinput>.
+parametry <userinput>vga=788</userinput>.
 
 </para><para>
 
diff --git a/de/install-methods/usb-setup/x86.xml b/de/install-methods/usb-setup/x86.xml
index 4be250da9..bdab0d233 100644
--- a/de/install-methods/usb-setup/x86.xml
+++ b/de/install-methods/usb-setup/x86.xml
@@ -102,7 +102,7 @@ append initrd=initrd.gz
 </screen></informalexample>
 
 Falls Sie den grafischen Installer verwenden möchten, sollten Sie
-<userinput>video=vesa:ywrap,mtrr vga=788</userinput> zur zweiten Zeile
+<userinput>vga=788</userinput> zur zweiten Zeile
 hinzufügen.
 
 </para><para>
diff --git a/debian/changelog b/debian/changelog
index 0213df38f..5694db7aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ installation-guide (2010xxxx) UNRELEASED; urgency=low
   * Rename Mandrake into Mandriva (Closes: Bug#601308).
   * Update installation sizes.
   * Mention Windows 2003, Vista, and 7.
+  * Fix graphical boot options.
 
   [ Joey Hess ]
   * Update USB stick documentation to reflect isohybird mini.iso files,
diff --git a/en/install-methods/usb-setup/x86.xml b/en/install-methods/usb-setup/x86.xml
index 2991b724b..b431a2962 100644
--- a/en/install-methods/usb-setup/x86.xml
+++ b/en/install-methods/usb-setup/x86.xml
@@ -96,7 +96,7 @@ append initrd=initrd.gz
 </screen></informalexample>
 
 For the graphical installer you should add
-<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line.
+<userinput>vga=788</userinput> to the second line.
 
 </para><para>
 
diff --git a/fr/install-methods/usb-setup/x86.xml b/fr/install-methods/usb-setup/x86.xml
index 7bdbdb868..118633e16 100644
--- a/fr/install-methods/usb-setup/x86.xml
+++ b/fr/install-methods/usb-setup/x86.xml
@@ -102,7 +102,7 @@ append initrd=initrd.gz
 </screen></informalexample>
 
 Pour l'installateur graphique, vous devez ajouter à la deuxième ligne
-le paramètre <userinput>video=vesa:ywrap,mtrr vga=788</userinput>.
+le paramètre <userinput>vga=788</userinput>.
 </para>
 
 <para>
diff --git a/it/install-methods/usb-setup/x86.xml b/it/install-methods/usb-setup/x86.xml
index 2a05af22f..05b19826f 100644
--- a/it/install-methods/usb-setup/x86.xml
+++ b/it/install-methods/usb-setup/x86.xml
@@ -181,11 +181,11 @@ append initrd=initrd.gz
 
 <!--
 For the graphical installer you should add
-<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line.
+<userinput>vga=788</userinput> to the second line.
 -->
 
 Per utilizzare l'installatore grafico si deve aggiungere
-<userinput>video=vesa:ywrap,mtrr vga=788</userinput> alla seconda riga.
+<userinput>vga=788</userinput> alla seconda riga.
 
 </para><para>
 
diff --git a/nl/install-methods/usb-setup/x86.xml b/nl/install-methods/usb-setup/x86.xml
index bd9ca83e0..36a96af21 100644
--- a/nl/install-methods/usb-setup/x86.xml
+++ b/nl/install-methods/usb-setup/x86.xml
@@ -96,7 +96,7 @@ append initrd=initrd.gz
 </screen></informalexample>
 
 For the graphical installer you should add
-<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line.
+<userinput>vga=788</userinput> to the second line.
 
 </para><para>
 
diff --git a/po/el/install-methods.po b/po/el/install-methods.po
index 229d7115f..91d271b5c 100644
--- a/po/el/install-methods.po
+++ b/po/el/install-methods.po
@@ -1215,7 +1215,7 @@ msgid ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> For the graphical installer you should add "
-"<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line."
+"<userinput>vga=788</userinput> to the second line."
 msgstr ""
 "Στη συνέχεια θα πρέπει να δημιουργήσετε ένα αρχείο ρυθμίσεων "
 "<filename>syslinux.cfg</filename>, που θα πρέπει τουλάχιστον να περιέχει τις "
@@ -1225,7 +1225,7 @@ msgstr ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> Για τον γραφικό εγκαταστάτη θα πρέπει να "
-"προσθέσετε τις παραμέτρους <userinput>video=vesa:ywrap,mtrr vga=788</"
+"προσθέσετε τις παραμέτρους <userinput>vga=788</"
 "userinput> στη δεύτερη γραμμή."
 
 #. Tag: para
diff --git a/po/es/install-methods.po b/po/es/install-methods.po
index a92608754..3af7c5388 100644
--- a/po/es/install-methods.po
+++ b/po/es/install-methods.po
@@ -1203,7 +1203,7 @@ msgid ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> For the graphical installer you should add "
-"<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line."
+"<userinput>vga=788</userinput> to the second line."
 msgstr ""
 "A continuación debe crear el fichero de configuración <filename>syslinux."
 "cfg</filename>, que como mínimo debe contener las dos líneas siguientes "
@@ -1213,7 +1213,7 @@ msgstr ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> Si usa el instalador gráfico necesitará "
-"adicionar <userinput>video=vesa:ywrap,mtrr vga=788</userinput> a la segunda "
+"adicionar <userinput>vga=788</userinput> a la segunda "
 "línea."
 
 #. Tag: para
diff --git a/po/fi/install-methods.po b/po/fi/install-methods.po
index 0aa1c9838..4392e7f2a 100644
--- a/po/fi/install-methods.po
+++ b/po/fi/install-methods.po
@@ -1157,7 +1157,7 @@ msgid ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> For the graphical installer you should add "
-"<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line."
+"<userinput>vga=788</userinput> to the second line."
 msgstr ""
 "Seuraavaksi olisi tehtävä asetustiedosto\n"
 "<filename>syslinux.cfg</filename>, jossa yksinkertaisimmillaan on\n"
@@ -1169,7 +1169,7 @@ msgstr ""
 "append initrd=initrd.gz\n"
 "</screen></informalexample> \n"
 "Asentimen graafista käyttöliittymää varten olisi toiseen riviin\n"
-"lisättävä <userinput>video=vesa:ywrap,mtrr vga=788</userinput>."
+"lisättävä <userinput>vga=788</userinput>."
 
 #. Tag: para
 #: install-methods.xml:768
diff --git a/po/ja/install-methods.po b/po/ja/install-methods.po
index 499dc0b05..f19a4dd84 100644
--- a/po/ja/install-methods.po
+++ b/po/ja/install-methods.po
@@ -1159,7 +1159,7 @@ msgid ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> For the graphical installer you should add "
-"<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line."
+"<userinput>vga=788</userinput> to the second line."
 msgstr ""
 "次に、<filename>syslinux.cfg</filename> 設定ファイルを作成します。最低限必要"
 "なのは以下の 2 行です (<filename>netboot</filename> を使用している場合、カー"
@@ -1168,7 +1168,7 @@ msgstr ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> グラフィカルインストーラ用には、2 行目に "
-"<userinput>video=vesa:ywrap,mtrr vga=788</userinput> を追加すると良いでしょ"
+"<userinput>vga=788</userinput> を追加すると良いでしょ"
 "う。"
 
 #. Tag: para
diff --git a/po/ko/install-methods.po b/po/ko/install-methods.po
index f4aece94b..a4d818375 100644
--- a/po/ko/install-methods.po
+++ b/po/ko/install-methods.po
@@ -1224,7 +1224,7 @@ msgstr ""
 #| "default vmlinuz\n"
 #| "append initrd=initrd.gz\n"
 #| "</screen></informalexample> For the graphical installer you should add "
-#| "<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line."
+#| "<userinput>vga=788</userinput> to the second line."
 msgid ""
 "Next you should create a <filename>syslinux.cfg</filename> configuration "
 "file, which at a bare minimum should contain the following two lines (change "
@@ -1234,14 +1234,14 @@ msgid ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> For the graphical installer you should add "
-"<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line."
+"<userinput>vga=788</userinput> to the second line."
 msgstr ""
 "그 다음에 <filename>syslinux.cfg</filename> 설정 파일을 만들어야 합니다. 설"
 "정 파일에는 최소한 다음 두 줄이 들어가야 합니다: <informalexample><screen>\n"
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> 그래픽 설치 프로그램의 경우 두 번째 줄에 "
-"<userinput>video=vesa:ywrap,mtrr vga=788</userinput> 옵션을 덧붙입니다."
+"<userinput>vga=788</userinput> 옵션을 덧붙입니다."
 
 #. Tag: para
 #: install-methods.xml:768
diff --git a/po/pot/install-methods.pot b/po/pot/install-methods.pot
index f5a43a005..bba47dd40 100644
--- a/po/pot/install-methods.pot
+++ b/po/pot/install-methods.pot
@@ -549,7 +549,7 @@ msgid ""
       "Next you should create a <filename>syslinux.cfg</filename> configuration file, which at a bare minimum should contain the following two lines (change the name of the kernel binary to <quote><filename>linux</filename></quote> if you used a <filename>netboot</filename> image): <informalexample><screen>\n"
       "default vmlinuz\n"
       "append initrd=initrd.gz\n"
-      "</screen></informalexample> For the graphical installer you should add <userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line."
+      "</screen></informalexample> For the graphical installer you should add <userinput>vga=788</userinput> to the second line."
 msgstr ""
 
 #. Tag: para
diff --git a/po/pt/install-methods.po b/po/pt/install-methods.po
index 254842e10..04a772a82 100644
--- a/po/pt/install-methods.po
+++ b/po/pt/install-methods.po
@@ -1174,7 +1174,7 @@ msgid ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> For the graphical installer you should add "
-"<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line."
+"<userinput>vga=788</userinput> to the second line."
 msgstr ""
 "De seguida deverá criar um ficheiro de configuração <filename>syslinux.cfg</"
 "filename> o qual, no mínimo, deve conter as seguintes duas linhas (mude o "
@@ -1184,7 +1184,7 @@ msgstr ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> Para o instalador gráfico deve acrescentar "
-"<userinput>video=vesa:ywrap,mtrr vga=788</userinput> na segunda linha."
+"<userinput>vga=788</userinput> na segunda linha."
 
 #. Tag: para
 #: install-methods.xml:768
diff --git a/po/ru/install-methods.po b/po/ru/install-methods.po
index 16b13d320..d86f6bdfb 100644
--- a/po/ru/install-methods.po
+++ b/po/ru/install-methods.po
@@ -1291,7 +1291,7 @@ msgid ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> For the graphical installer you should add "
-"<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line."
+"<userinput>vga=788</userinput> to the second line."
 msgstr ""
 "Затем, вам нужно создать файл настройки <filename>syslinux.cfg</filename>, "
 "который, как минимум содержит две строки (измените имя файла с ядром на "
@@ -1300,7 +1300,7 @@ msgstr ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> Для графической версии программы установки нужно "
-"добавить <userinput>video=vesa:ywrap,mtrr vga=788</userinput> во вторую "
+"добавить <userinput>vga=788</userinput> во вторую "
 "строку."
 
 #. Tag: para
diff --git a/po/sv/install-methods.po b/po/sv/install-methods.po
index f8e61a441..5973bc776 100644
--- a/po/sv/install-methods.po
+++ b/po/sv/install-methods.po
@@ -1263,7 +1263,7 @@ msgid ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> For the graphical installer you should add "
-"<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line."
+"<userinput>vga=788</userinput> to the second line."
 msgstr ""
 "Härnäst ska du skapa konfigurationsfilen <filename>syslinux.cfg</filename>, "
 "som minimum bör innehålla följande två rader (ändra namnet på kärnbinärfilen "
@@ -1272,7 +1272,7 @@ msgstr ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> För det grafiska installationsprogrammet så bör "
-"du lägga till <userinput>video=vesa:ywrap,mtrr vga=788</userinput> på den "
+"du lägga till <userinput>vga=788</userinput> på den "
 "andra raden."
 
 #. Tag: para
diff --git a/po/vi/install-methods.po b/po/vi/install-methods.po
index e334f1a35..3de60564d 100644
--- a/po/vi/install-methods.po
+++ b/po/vi/install-methods.po
@@ -1201,7 +1201,7 @@ msgid ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> For the graphical installer you should add "
-"<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line."
+"<userinput>vga=788</userinput> to the second line."
 msgstr ""
 "Sau đó thì bạn nên tạo một tập tin cấu hình <filename>syslinux.cfg</"
 "filename>: nó nên chứa ít nhất hai dòng này (thay đổi tên của bản nhị phân "
@@ -1210,7 +1210,7 @@ msgstr ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> Đối với trình cài đặt kiểu đồ họa, bạn nên thêm "
-"vào dòng thứ hai chuỗi <userinput>video=vesa:ywrap,mtrr vga=788</userinput>."
+"vào dòng thứ hai chuỗi <userinput>vga=788</userinput>."
 
 #: install-methods.xml:768
 #, no-c-format
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index f3aecbb4c..c022f10f6 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -1100,7 +1100,7 @@ msgid ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> For the graphical installer you should add "
-"<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line."
+"<userinput>vga=788</userinput> to the second line."
 msgstr ""
 "接下来，您需要创建一个 <filename>syslinux.cfg</filename> 配置文件，里面最少要"
 "包含下面两行(如果您使用 <filename>netboot</filename> 映象，修改内核文件名为  "
@@ -1108,7 +1108,7 @@ msgstr ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> 对于图形安装程序，您需要添加 "
-"<userinput>video=vesa:ywrap,mtrr vga=788</userinput> 到第二行尾部。"
+"<userinput>vga=788</userinput> 到第二行尾部。"
 
 #. Tag: para
 #: install-methods.xml:768
diff --git a/pt_BR/install-methods/usb-setup/x86.xml b/pt_BR/install-methods/usb-setup/x86.xml
index 6277bcb0e..b772daecb 100644
--- a/pt_BR/install-methods/usb-setup/x86.xml
+++ b/pt_BR/install-methods/usb-setup/x86.xml
@@ -105,7 +105,7 @@ append initrd=initrd.gz
 </screen></informalexample>
 
 Para o instalador gráfico você deverá adicionar
-<userinput>video=vesa:ywrap,mtrr vga=788</userinput> à segunda linha.
+<userinput>vga=788</userinput> à segunda linha.
 
 </para><para>