129 files changed, 77 insertions, 77 deletions

diff --git a/build/templates/docstruct.ent b/build/templates/docstruct.ent
index 925bc2fa4..f757a6c7d 100644
--- a/build/templates/docstruct.ent
+++ b/build/templates/docstruct.ent
@@ -38,7 +38,7 @@
   <!ENTITY minimum-hardware-reqts.xml  SYSTEM "##SRCPATH##/preparing/minimum-hardware-reqts.xml">
   <!ENTITY non-debian-partitioning.xml SYSTEM "##SRCPATH##/preparing/non-debian-partitioning.xml">
    <!ENTITY nondeb-part-alpha.xml    SYSTEM "##SRCPATH##/preparing/nondeb-part/alpha.xml">
-   <!ENTITY nondeb-part-i386.xml     SYSTEM "##SRCPATH##/preparing/nondeb-part/i386.xml">
+   <!ENTITY nondeb-part-x86.xml      SYSTEM "##SRCPATH##/preparing/nondeb-part/x86.xml">
    <!ENTITY nondeb-part-m68k.xml     SYSTEM "##SRCPATH##/preparing/nondeb-part/m68k.xml">
    <!ENTITY nondeb-part-powerpc.xml  SYSTEM "##SRCPATH##/preparing/nondeb-part/powerpc.xml">
    <!ENTITY nondeb-part-sparc.xml    SYSTEM "##SRCPATH##/preparing/nondeb-part/sparc.xml">
@@ -62,10 +62,10 @@
   <!ENTITY create-floppy.xml        SYSTEM "##SRCPATH##/install-methods/create-floppy.xml">
    <!ENTITY floppy-i386.xml       SYSTEM "##SRCPATH##/install-methods/floppy/i386.xml">
    <!ENTITY floppy-m68k.xml       SYSTEM "##SRCPATH##/install-methods/floppy/m68k.xml">
-   <!ENTITY floppy-powerpc.xml   SYSTEM "##SRCPATH##/install-methods/floppy/powerpc.xml">
+   <!ENTITY floppy-powerpc.xml     SYSTEM "##SRCPATH##/install-methods/floppy/powerpc.xml">
 
   <!ENTITY boot-usb-files.xml       SYSTEM "##SRCPATH##/install-methods/boot-usb-files.xml">
-   <!ENTITY usb-setup-i386.xml          SYSTEM "##SRCPATH##/install-methods/usb-setup/i386.xml">
+   <!ENTITY usb-setup-x86.xml           SYSTEM "##SRCPATH##/install-methods/usb-setup/x86.xml">
    <!ENTITY usb-setup-powerpc.xml       SYSTEM "##SRCPATH##/install-methods/usb-setup/powerpc.xml">
 
   <!ENTITY boot-drive-files.xml     SYSTEM "##SRCPATH##/install-methods/boot-drive-files.xml">
@@ -80,7 +80,7 @@
  <!ENTITY boot-installer.xml      SYSTEM "##SRCPATH##/boot-installer/boot-installer.xml">
   <!ENTITY boot-installer-alpha.xml        SYSTEM "##SRCPATH##/boot-installer/alpha.xml">
   <!ENTITY boot-installer-arm.xml          SYSTEM "##SRCPATH##/boot-installer/arm.xml">
-  <!ENTITY boot-installer-i386.xml         SYSTEM "##SRCPATH##/boot-installer/i386.xml">
+  <!ENTITY boot-installer-x86.xml          SYSTEM "##SRCPATH##/boot-installer/x86.xml">
   <!ENTITY boot-installer-ia64.xml         SYSTEM "##SRCPATH##/boot-installer/ia64.xml">
   <!ENTITY boot-installer-intro-cd.xml     SYSTEM "##SRCPATH##/boot-installer/intro-cd.xml">
   <!ENTITY boot-installer-intro-hd.xml     SYSTEM "##SRCPATH##/boot-installer/intro-hd.xml">
@@ -132,8 +132,8 @@
   <!ENTITY module-mipsel-colo-installer.xml  SYSTEM "##SRCPATH##/using-d-i/modules/mipsel/colo-installer.xml">
   <!ENTITY module-mipsel-delo-installer.xml  SYSTEM "##SRCPATH##/using-d-i/modules/mipsel/delo-installer.xml">
   <!ENTITY module-alpha-aboot-installer.xml   SYSTEM "##SRCPATH##/using-d-i/modules/alpha/aboot-installer.xml">
-  <!ENTITY module-i386-grub-installer.xml     SYSTEM "##SRCPATH##/using-d-i/modules/i386/grub-installer.xml">
-  <!ENTITY module-i386-lilo-installer.xml     SYSTEM "##SRCPATH##/using-d-i/modules/i386/lilo-installer.xml">
+  <!ENTITY module-x86-grub-installer.xml      SYSTEM "##SRCPATH##/using-d-i/modules/x86/grub-installer.xml">
+  <!ENTITY module-x86-lilo-installer.xml      SYSTEM "##SRCPATH##/using-d-i/modules/x86/lilo-installer.xml">
   <!ENTITY module-hppa-palo-installer.xml     SYSTEM "##SRCPATH##/using-d-i/modules/hppa/palo-installer.xml">
   <!ENTITY module-ia64-elilo-installer.xml    SYSTEM "##SRCPATH##/using-d-i/modules/ia64/elilo-installer.xml">
   <!ENTITY module-s390-zipl-installer.xml     SYSTEM "##SRCPATH##/using-d-i/modules/s390/zipl-installer.xml">
@@ -155,7 +155,7 @@
   <!ENTITY partition-programs.xml   SYSTEM "##SRCPATH##/partitioning/partition-programs.xml">
    <!ENTITY partition-alpha.xml   SYSTEM "##SRCPATH##/partitioning/partition/alpha.xml">
    <!ENTITY partition-hppa.xml    SYSTEM "##SRCPATH##/partitioning/partition/hppa.xml">
-   <!ENTITY partition-i386.xml    SYSTEM "##SRCPATH##/partitioning/partition/i386.xml">
+   <!ENTITY partition-x86.xml     SYSTEM "##SRCPATH##/partitioning/partition/x86.xml">
    <!ENTITY partition-ia64.xml    SYSTEM "##SRCPATH##/partitioning/partition/ia64.xml">
    <!ENTITY partition-mips.xml    SYSTEM "##SRCPATH##/partitioning/partition/mips.xml">
    <!ENTITY partition-powerpc.xml SYSTEM "##SRCPATH##/partitioning/partition/powerpc.xml">
diff --git a/ca/boot-installer/boot-installer.xml b/ca/boot-installer/boot-installer.xml
index 0aac8ecd7..a3fdf5a79 100644
--- a/ca/boot-installer/boot-installer.xml
+++ b/ca/boot-installer/boot-installer.xml
@@ -15,7 +15,7 @@
 &boot-installer-alpha.xml;
 &boot-installer-arm.xml;
 <!-- &boot-installer-hppa.xml; -->
-&boot-installer-i386.xml;
+&boot-installer-x86.xml;
 &boot-installer-ia64.xml;
 &boot-installer-m68k.xml;
 &boot-installer-mips.xml;
diff --git a/ca/boot-installer/i386.xml b/ca/boot-installer/x86.xml
index c25a66c41..c25a66c41 100644
--- a/ca/boot-installer/i386.xml
+++ b/ca/boot-installer/x86.xml
diff --git a/ca/install-methods/boot-usb-files.xml b/ca/install-methods/boot-usb-files.xml
index 52de9c701..f22860ba1 100644
--- a/ca/install-methods/boot-usb-files.xml
+++ b/ca/install-methods/boot-usb-files.xml
@@ -80,7 +80,7 @@ aquest mètode per posar els fitxers al vostre llapis.
 
 </para>
 
-&usb-setup-i386.xml;
+&usb-setup-x86.xml;
 &usb-setup-powerpc.xml;
 
    </sect2>
diff --git a/ca/install-methods/usb-setup/i386.xml b/ca/install-methods/usb-setup/x86.xml
index 0e436493c..0e436493c 100644
--- a/ca/install-methods/usb-setup/i386.xml
+++ b/ca/install-methods/usb-setup/x86.xml
diff --git a/ca/partitioning/partition-programs.xml b/ca/partitioning/partition-programs.xml
index dd22b0c92..d4e7fcc65 100644
--- a/ca/partitioning/partition-programs.xml
+++ b/ca/partitioning/partition-programs.xml
@@ -157,7 +157,7 @@ inclou els passos que heu de fer si voleu compartir el disc amb un MacOS.
 
 &partition-alpha.xml;
 &partition-hppa.xml;
-&partition-i386.xml;
+&partition-x86.xml;
 &partition-ia64.xml;
 &partition-mips.xml;
 &partition-powerpc.xml;
diff --git a/ca/partitioning/partition/i386.xml b/ca/partitioning/partition/x86.xml
index 0665f2db5..0665f2db5 100644
--- a/ca/partitioning/partition/i386.xml
+++ b/ca/partitioning/partition/x86.xml
diff --git a/ca/preparing/non-debian-partitioning.xml b/ca/preparing/non-debian-partitioning.xml
index 564e3c17d..5b5a65df5 100644
--- a/ca/preparing/non-debian-partitioning.xml
+++ b/ca/preparing/non-debian-partitioning.xml
@@ -190,7 +190,7 @@ Arrenque l'instal·lador de Debian per continuar la instal·lació de Debian.
 </para>
 
 &nondeb-part-alpha.xml;
-&nondeb-part-i386.xml;
+&nondeb-part-x86.xml;
 &nondeb-part-m68k.xml;
 &nondeb-part-sparc.xml;
 &nondeb-part-powerpc.xml;
diff --git a/ca/preparing/nondeb-part/i386.xml b/ca/preparing/nondeb-part/x86.xml
index 83e9bee70..83e9bee70 100644
--- a/ca/preparing/nondeb-part/i386.xml
+++ b/ca/preparing/nondeb-part/x86.xml
diff --git a/ca/using-d-i/components.xml b/ca/using-d-i/components.xml
index f363a982c..2d41d6e4b 100644
--- a/ca/using-d-i/components.xml
+++ b/ca/using-d-i/components.xml
@@ -148,8 +148,8 @@ gestor d'arrencada.
 &module-os-prober.xml;
 &module-alpha-aboot-installer.xml;
 &module-hppa-palo-installer.xml;
-&module-i386-grub-installer.xml;
-&module-i386-lilo-installer.xml;
+&module-x86-grub-installer.xml;
+&module-x86-lilo-installer.xml;
 &module-ia64-elilo-installer.xml;
 &module-mips-arcboot-installer.xml;
 &module-mipsel-colo-installer.xml;
diff --git a/ca/using-d-i/modules/i386/grub-installer.xml b/ca/using-d-i/modules/x86/grub-installer.xml
index 98aa47945..98aa47945 100644
--- a/ca/using-d-i/modules/i386/grub-installer.xml
+++ b/ca/using-d-i/modules/x86/grub-installer.xml
diff --git a/ca/using-d-i/modules/i386/lilo-installer.xml b/ca/using-d-i/modules/x86/lilo-installer.xml
index 8a858fd3d..8a858fd3d 100644
--- a/ca/using-d-i/modules/i386/lilo-installer.xml
+++ b/ca/using-d-i/modules/x86/lilo-installer.xml
diff --git a/cs/boot-installer/boot-installer.xml b/cs/boot-installer/boot-installer.xml
index 1c5b886a0..ec30e90fc 100644
--- a/cs/boot-installer/boot-installer.xml
+++ b/cs/boot-installer/boot-installer.xml
@@ -15,7 +15,7 @@
 &boot-installer-alpha.xml;
 &boot-installer-arm.xml;
 <!-- &boot-installer-hppa.xml; -->
-&boot-installer-i386.xml;
+&boot-installer-x86.xml;
 &boot-installer-ia64.xml;
 &boot-installer-m68k.xml;
 &boot-installer-mips.xml;
diff --git a/cs/boot-installer/i386.xml b/cs/boot-installer/x86.xml
index 4400d5dc7..4400d5dc7 100644
--- a/cs/boot-installer/i386.xml
+++ b/cs/boot-installer/x86.xml
diff --git a/cs/install-methods/boot-usb-files.xml b/cs/install-methods/boot-usb-files.xml
index c931b2fe5..ee73e451b 100644
--- a/cs/install-methods/boot-usb-files.xml
+++ b/cs/install-methods/boot-usb-files.xml
@@ -79,7 +79,7 @@ jak místo celého USB zařízení použít pouze první oblast.</phrase>
 
 </para>
 
-&usb-setup-i386.xml;
+&usb-setup-x86.xml;
 &usb-setup-powerpc.xml;
 
   </sect2>
diff --git a/cs/install-methods/usb-setup/i386.xml b/cs/install-methods/usb-setup/x86.xml
index e3e7eda61..e3e7eda61 100644
--- a/cs/install-methods/usb-setup/i386.xml
+++ b/cs/install-methods/usb-setup/x86.xml
diff --git a/cs/partitioning/partition-programs.xml b/cs/partitioning/partition-programs.xml
index f77e80d42..75e692acb 100644
--- a/cs/partitioning/partition-programs.xml
+++ b/cs/partitioning/partition-programs.xml
@@ -157,7 +157,7 @@ kde je krok za krokem popsán způsob sdílení disku s MacOS.
 
 &partition-alpha.xml;
 &partition-hppa.xml;
-&partition-i386.xml;
+&partition-x86.xml;
 &partition-ia64.xml;
 &partition-mips.xml;
 &partition-powerpc.xml;
diff --git a/cs/partitioning/partition/i386.xml b/cs/partitioning/partition/x86.xml
index 7551441c6..7551441c6 100644
--- a/cs/partitioning/partition/i386.xml
+++ b/cs/partitioning/partition/x86.xml
diff --git a/cs/preparing/non-debian-partitioning.xml b/cs/preparing/non-debian-partitioning.xml
index f4fa460e7..d374a41d3 100644
--- a/cs/preparing/non-debian-partitioning.xml
+++ b/cs/preparing/non-debian-partitioning.xml
@@ -181,7 +181,7 @@ Zavést instalátor Debianu a pokra�ovat v instalaci.
 </para>
 
 &nondeb-part-alpha.xml;
-&nondeb-part-i386.xml;
+&nondeb-part-x86.xml;
 &nondeb-part-m68k.xml;
 &nondeb-part-sparc.xml;
 &nondeb-part-powerpc.xml;
diff --git a/cs/preparing/nondeb-part/i386.xml b/cs/preparing/nondeb-part/x86.xml
index 93f0e85fb..93f0e85fb 100644
--- a/cs/preparing/nondeb-part/i386.xml
+++ b/cs/preparing/nondeb-part/x86.xml
diff --git a/cs/using-d-i/components.xml b/cs/using-d-i/components.xml
index 52219148e..6b2070b00 100644
--- a/cs/using-d-i/components.xml
+++ b/cs/using-d-i/components.xml
@@ -143,8 +143,8 @@ vašeho zavadě�e a pamatujete: třikrát měř a jednou řež.
 &module-os-prober.xml;
 &module-alpha-aboot-installer.xml;
 &module-hppa-palo-installer.xml;
-&module-i386-grub-installer.xml;
-&module-i386-lilo-installer.xml;
+&module-x86-grub-installer.xml;
+&module-x86-lilo-installer.xml;
 &module-ia64-elilo-installer.xml;
 &module-mips-arcboot-installer.xml;
 &module-mipsel-colo-installer.xml;
diff --git a/cs/using-d-i/modules/i386/grub-installer.xml b/cs/using-d-i/modules/x86/grub-installer.xml
index 436314217..436314217 100644
--- a/cs/using-d-i/modules/i386/grub-installer.xml
+++ b/cs/using-d-i/modules/x86/grub-installer.xml
diff --git a/cs/using-d-i/modules/i386/lilo-installer.xml b/cs/using-d-i/modules/x86/lilo-installer.xml
index c050d1bb4..c050d1bb4 100644
--- a/cs/using-d-i/modules/i386/lilo-installer.xml
+++ b/cs/using-d-i/modules/x86/lilo-installer.xml
diff --git a/da/boot-installer/boot-installer.xml b/da/boot-installer/boot-installer.xml
index 9bf77d2b2..b98b4c6dd 100644
--- a/da/boot-installer/boot-installer.xml
+++ b/da/boot-installer/boot-installer.xml
@@ -10,7 +10,7 @@
 
 &boot-installer-alpha.xml;
 &boot-installer-arm.xml;
-&boot-installer-i386.xml;
+&boot-installer-x86.xml;
 &boot-installer-ia64.xml;
 &boot-installer-m68k.xml;
 &boot-installer-mips.xml;
diff --git a/da/boot-installer/i386.xml b/da/boot-installer/x86.xml
index 4aafec5c2..4aafec5c2 100644
--- a/da/boot-installer/i386.xml
+++ b/da/boot-installer/x86.xml
diff --git a/da/partitioning/partition-programs.xml b/da/partitioning/partition-programs.xml
index 271ef4604..468cc7cef 100644
--- a/da/partitioning/partition-programs.xml
+++ b/da/partitioning/partition-programs.xml
@@ -169,7 +169,7 @@ MacOS.
 
 &partition-alpha.xml;
 &partition-hppa.xml;
-&partition-i386.xml;
+&partition-x86.xml;
 &partition-ia64.xml;
 &partition-mips.xml;
 &partition-powerpc.xml;
diff --git a/da/partitioning/partition/i386.xml b/da/partitioning/partition/x86.xml
index 26c3e4296..26c3e4296 100644
--- a/da/partitioning/partition/i386.xml
+++ b/da/partitioning/partition/x86.xml
diff --git a/da/preparing/non-debian-partitioning.xml b/da/preparing/non-debian-partitioning.xml
index c09859b73..c0dd85634 100644
--- a/da/preparing/non-debian-partitioning.xml
+++ b/da/preparing/non-debian-partitioning.xml
@@ -196,7 +196,7 @@ Boot the Debian installer to continue installing Debian.
 </para>
 
 &nondeb-part-alpha.xml; 
-&nondeb-part-i386.xml; 
+&nondeb-part-x86.xml; 
 &nondeb-part-m68k.xml; 
 &nondeb-part-sparc.xml; 
 &nondeb-part-powerpc.xml;
diff --git a/da/preparing/nondeb-part/i386.xml b/da/preparing/nondeb-part/x86.xml
index a6d1f1be7..a6d1f1be7 100644
--- a/da/preparing/nondeb-part/i386.xml
+++ b/da/preparing/nondeb-part/x86.xml
diff --git a/da/using-d-i/components.xml b/da/using-d-i/components.xml
index 7f6f7b2c8..b5de1e2d7 100644
--- a/da/using-d-i/components.xml
+++ b/da/using-d-i/components.xml
@@ -115,8 +115,8 @@ documentation for more information.
 &module-os-prober.xml;
 &module-alpha-aboot-installer.xml;
 &module-hppa-palo-installer.xml;
-&module-i386-grub-installer.xml;
-&module-i386-lilo-installer.xml;
+&module-x86-grub-installer.xml;
+&module-x86-lilo-installer.xml;
 &module-ia64-elilo-installer.xml;
 &module-mips-arcboot-installer.xml;
 &module-mipsel-colo-installer.xml;
diff --git a/da/using-d-i/modules/i386/grub-installer.xml b/da/using-d-i/modules/x86/grub-installer.xml
index fdb192e37..fdb192e37 100644
--- a/da/using-d-i/modules/i386/grub-installer.xml
+++ b/da/using-d-i/modules/x86/grub-installer.xml
diff --git a/da/using-d-i/modules/i386/lilo-installer.xml b/da/using-d-i/modules/x86/lilo-installer.xml
index 0f38f727d..0f38f727d 100644
--- a/da/using-d-i/modules/i386/lilo-installer.xml
+++ b/da/using-d-i/modules/x86/lilo-installer.xml
diff --git a/de/boot-installer/boot-installer.xml b/de/boot-installer/boot-installer.xml
index 5ae0d7630..aedeeae87 100644
--- a/de/boot-installer/boot-installer.xml
+++ b/de/boot-installer/boot-installer.xml
@@ -15,7 +15,7 @@
 &boot-installer-alpha.xml;
 &boot-installer-arm.xml;
 <!-- &boot-installer-hppa.xml; -->
-&boot-installer-i386.xml;
+&boot-installer-x86.xml;
 &boot-installer-ia64.xml;
 &boot-installer-m68k.xml;
 &boot-installer-mips.xml;
diff --git a/de/boot-installer/i386.xml b/de/boot-installer/x86.xml
index b8c98ae1c..b8c98ae1c 100644
--- a/de/boot-installer/i386.xml
+++ b/de/boot-installer/x86.xml
diff --git a/de/install-methods/boot-usb-files.xml b/de/install-methods/boot-usb-files.xml
index 4d0c52a22..09ab03d69 100644
--- a/de/install-methods/boot-usb-files.xml
+++ b/de/install-methods/boot-usb-files.xml
@@ -83,7 +83,7 @@ befördern:
 
 </para>
 
-&usb-setup-i386.xml;
+&usb-setup-x86.xml;
 &usb-setup-powerpc.xml;
 
    </sect2>
diff --git a/de/install-methods/usb-setup/i386.xml b/de/install-methods/usb-setup/x86.xml
index 9fa9bbe42..9fa9bbe42 100644
--- a/de/install-methods/usb-setup/i386.xml
+++ b/de/install-methods/usb-setup/x86.xml
diff --git a/de/partitioning/partition-programs.xml b/de/partitioning/partition-programs.xml
index 6c0e770a0..e821aa5e0 100644
--- a/de/partitioning/partition-programs.xml
+++ b/de/partitioning/partition-programs.xml
@@ -166,7 +166,7 @@ Festplatte mit MacOS gleichzeitig nutzen wollen.
 
 &partition-alpha.xml;
 &partition-hppa.xml;
-&partition-i386.xml;
+&partition-x86.xml;
 &partition-ia64.xml;
 &partition-mips.xml;
 &partition-powerpc.xml;
diff --git a/de/partitioning/partition/i386.xml b/de/partitioning/partition/x86.xml
index 850b5f0f5..850b5f0f5 100644
--- a/de/partitioning/partition/i386.xml
+++ b/de/partitioning/partition/x86.xml
diff --git a/de/preparing/non-debian-partitioning.xml b/de/preparing/non-debian-partitioning.xml
index 86459d24a..2135efb84 100644
--- a/de/preparing/non-debian-partitioning.xml
+++ b/de/preparing/non-debian-partitioning.xml
@@ -196,7 +196,7 @@ weiterzumachen.
 </para>
 
 &nondeb-part-alpha.xml; 
-&nondeb-part-i386.xml; 
+&nondeb-part-x86.xml; 
 &nondeb-part-m68k.xml; 
 &nondeb-part-sparc.xml; 
 &nondeb-part-powerpc.xml;
diff --git a/de/preparing/nondeb-part/i386.xml b/de/preparing/nondeb-part/x86.xml
index 9a4d77ba9..9a4d77ba9 100644
--- a/de/preparing/nondeb-part/i386.xml
+++ b/de/preparing/nondeb-part/x86.xml
diff --git a/de/using-d-i/components.xml b/de/using-d-i/components.xml
index ffb4d9464..84e119ecf 100644
--- a/de/using-d-i/components.xml
+++ b/de/using-d-i/components.xml
@@ -152,8 +152,8 @@ Ihres Bootmanagers zu Hilfe nehmen, wenn Sie mehr Informationen brauchen.
 &module-os-prober.xml;
 &module-alpha-aboot-installer.xml;
 &module-hppa-palo-installer.xml;
-&module-i386-grub-installer.xml;
-&module-i386-lilo-installer.xml;
+&module-x86-grub-installer.xml;
+&module-x86-lilo-installer.xml;
 &module-ia64-elilo-installer.xml;
 &module-mips-arcboot-installer.xml;
 &module-mipsel-colo-installer.xml;
diff --git a/de/using-d-i/modules/i386/grub-installer.xml b/de/using-d-i/modules/x86/grub-installer.xml
index 73aaec6f4..73aaec6f4 100644
--- a/de/using-d-i/modules/i386/grub-installer.xml
+++ b/de/using-d-i/modules/x86/grub-installer.xml
diff --git a/de/using-d-i/modules/i386/lilo-installer.xml b/de/using-d-i/modules/x86/lilo-installer.xml
index 839ec1a67..839ec1a67 100644
--- a/de/using-d-i/modules/i386/lilo-installer.xml
+++ b/de/using-d-i/modules/x86/lilo-installer.xml
diff --git a/en/boot-installer/boot-installer.xml b/en/boot-installer/boot-installer.xml
index 61c60df6f..cf6f83f3d 100644
--- a/en/boot-installer/boot-installer.xml
+++ b/en/boot-installer/boot-installer.xml
@@ -15,7 +15,7 @@
 &boot-installer-alpha.xml;
 &boot-installer-arm.xml;
 <!-- &boot-installer-hppa.xml; -->
-&boot-installer-i386.xml;
+&boot-installer-x86.xml;
 &boot-installer-ia64.xml;
 &boot-installer-m68k.xml;
 &boot-installer-mips.xml;
diff --git a/en/boot-installer/i386.xml b/en/boot-installer/x86.xml
index fbdb87ba5..fbdb87ba5 100644
--- a/en/boot-installer/i386.xml
+++ b/en/boot-installer/x86.xml
diff --git a/en/install-methods/boot-usb-files.xml b/en/install-methods/boot-usb-files.xml
index df1d34704..ec879fd5b 100644
--- a/en/install-methods/boot-usb-files.xml
+++ b/en/install-methods/boot-usb-files.xml
@@ -78,7 +78,7 @@ should use the following method to put the files on your stick.
 
 </para>
 
-&usb-setup-i386.xml;
+&usb-setup-x86.xml;
 &usb-setup-powerpc.xml;
 
    </sect2>
diff --git a/en/install-methods/usb-setup/i386.xml b/en/install-methods/usb-setup/x86.xml
index c35ef1e24..c35ef1e24 100644
--- a/en/install-methods/usb-setup/i386.xml
+++ b/en/install-methods/usb-setup/x86.xml
diff --git a/en/partitioning/partition-programs.xml b/en/partitioning/partition-programs.xml
index 9783c19c2..c44fe79d0 100644
--- a/en/partitioning/partition-programs.xml
+++ b/en/partitioning/partition-programs.xml
@@ -156,7 +156,7 @@ includes steps you should take if you are sharing your disk with MacOS.
 
 &partition-alpha.xml;
 &partition-hppa.xml;
-&partition-i386.xml;
+&partition-x86.xml;
 &partition-ia64.xml;
 &partition-mips.xml;
 &partition-powerpc.xml;
diff --git a/en/partitioning/partition/i386.xml b/en/partitioning/partition/x86.xml
index 55681bd39..55681bd39 100644
--- a/en/partitioning/partition/i386.xml
+++ b/en/partitioning/partition/x86.xml
diff --git a/en/preparing/non-debian-partitioning.xml b/en/preparing/non-debian-partitioning.xml
index 0f95aefe4..005d9fb84 100644
--- a/en/preparing/non-debian-partitioning.xml
+++ b/en/preparing/non-debian-partitioning.xml
@@ -190,7 +190,7 @@ Boot the Debian installer to continue installing Debian.
 </para>
 
 &nondeb-part-alpha.xml;
-&nondeb-part-i386.xml;
+&nondeb-part-x86.xml;
 &nondeb-part-m68k.xml;
 &nondeb-part-sparc.xml;
 &nondeb-part-powerpc.xml;
diff --git a/en/preparing/nondeb-part/i386.xml b/en/preparing/nondeb-part/x86.xml
index 4346fe83f..4346fe83f 100644
--- a/en/preparing/nondeb-part/i386.xml
+++ b/en/preparing/nondeb-part/x86.xml
diff --git a/en/using-d-i/components.xml b/en/using-d-i/components.xml
index 0d0570fd2..5f7dfaa07 100644
--- a/en/using-d-i/components.xml
+++ b/en/using-d-i/components.xml
@@ -144,8 +144,8 @@ documentation for more information.
 &module-os-prober.xml;
 &module-alpha-aboot-installer.xml;
 &module-hppa-palo-installer.xml;
-&module-i386-grub-installer.xml;
-&module-i386-lilo-installer.xml;
+&module-x86-grub-installer.xml;
+&module-x86-lilo-installer.xml;
 &module-ia64-elilo-installer.xml;
 &module-mips-arcboot-installer.xml;
 &module-mipsel-colo-installer.xml;
diff --git a/en/using-d-i/modules/i386/grub-installer.xml b/en/using-d-i/modules/x86/grub-installer.xml
index 814ad824b..814ad824b 100644
--- a/en/using-d-i/modules/i386/grub-installer.xml
+++ b/en/using-d-i/modules/x86/grub-installer.xml
diff --git a/en/using-d-i/modules/i386/lilo-installer.xml b/en/using-d-i/modules/x86/lilo-installer.xml
index 9b2ead402..9b2ead402 100644
--- a/en/using-d-i/modules/i386/lilo-installer.xml
+++ b/en/using-d-i/modules/x86/lilo-installer.xml
diff --git a/es/boot-installer/boot-installer.xml b/es/boot-installer/boot-installer.xml
index f2ba7e296..84f8fbbfb 100644
--- a/es/boot-installer/boot-installer.xml
+++ b/es/boot-installer/boot-installer.xml
@@ -16,7 +16,7 @@
 &boot-installer-alpha.xml;
 &boot-installer-arm.xml;
 <!-- &boot-installer-hppa.xml; -->
-&boot-installer-i386.xml;
+&boot-installer-x86.xml;
 &boot-installer-ia64.xml;
 &boot-installer-m68k.xml;
 &boot-installer-mips.xml;
diff --git a/es/boot-installer/i386.xml b/es/boot-installer/x86.xml
index caeb178a9..caeb178a9 100644
--- a/es/boot-installer/i386.xml
+++ b/es/boot-installer/x86.xml
diff --git a/es/install-methods/boot-usb-files.xml b/es/install-methods/boot-usb-files.xml
index 3af53cbb3..32ef649ae 100644
--- a/es/install-methods/boot-usb-files.xml
+++ b/es/install-methods/boot-usb-files.xml
@@ -90,7 +90,7 @@ dispositivo USB.
 
 </para>
 
-&usb-setup-i386.xml;
+&usb-setup-x86.xml;
 &usb-setup-powerpc.xml;
 
    </sect2>
diff --git a/es/install-methods/usb-setup/i386.xml b/es/install-methods/usb-setup/x86.xml
index 9e2127bad..9e2127bad 100644
--- a/es/install-methods/usb-setup/i386.xml
+++ b/es/install-methods/usb-setup/x86.xml
diff --git a/es/partitioning/partition-programs.xml b/es/partitioning/partition-programs.xml
index 80413be8b..fa8fc8fb5 100644
--- a/es/partitioning/partition-programs.xml
+++ b/es/partitioning/partition-programs.xml
@@ -168,7 +168,7 @@ con MacOS.
 
 &partition-alpha.xml;
 &partition-hppa.xml;
-&partition-i386.xml;
+&partition-x86.xml;
 &partition-ia64.xml;
 &partition-mips.xml;
 &partition-powerpc.xml;
diff --git a/es/partitioning/partition/i386.xml b/es/partitioning/partition/x86.xml
index 5b2fed87e..5b2fed87e 100644
--- a/es/partitioning/partition/i386.xml
+++ b/es/partitioning/partition/x86.xml
diff --git a/es/preparing/non-debian-partitioning.xml b/es/preparing/non-debian-partitioning.xml
index 09be103cd..80e1f8ff7 100644
--- a/es/preparing/non-debian-partitioning.xml
+++ b/es/preparing/non-debian-partitioning.xml
@@ -199,7 +199,7 @@ Arrancar el instalador de Debian para continuar la instalación de Debian.
 </para>
 
 &nondeb-part-alpha.xml;
-&nondeb-part-i386.xml;
+&nondeb-part-x86.xml;
 &nondeb-part-m68k.xml;
 &nondeb-part-sparc.xml;
 &nondeb-part-powerpc.xml;
diff --git a/es/preparing/nondeb-part/i386.xml b/es/preparing/nondeb-part/x86.xml
index 23e8f9917..23e8f9917 100644
--- a/es/preparing/nondeb-part/i386.xml
+++ b/es/preparing/nondeb-part/x86.xml
diff --git a/es/using-d-i/components.xml b/es/using-d-i/components.xml
index 5491ff376..bdf11ca0f 100644
--- a/es/using-d-i/components.xml
+++ b/es/using-d-i/components.xml
@@ -149,8 +149,8 @@ su gestor de arranque para más detalles.
 &module-os-prober.xml;
 &module-alpha-aboot-installer.xml;
 &module-hppa-palo-installer.xml;
-&module-i386-grub-installer.xml;
-&module-i386-lilo-installer.xml;
+&module-x86-grub-installer.xml;
+&module-x86-lilo-installer.xml;
 &module-ia64-elilo-installer.xml;
 &module-mips-arcboot-installer.xml;
 &module-mipsel-colo-installer.xml;
diff --git a/es/using-d-i/modules/i386/grub-installer.xml b/es/using-d-i/modules/x86/grub-installer.xml
index c33500b6d..c33500b6d 100644
--- a/es/using-d-i/modules/i386/grub-installer.xml
+++ b/es/using-d-i/modules/x86/grub-installer.xml
diff --git a/es/using-d-i/modules/i386/lilo-installer.xml b/es/using-d-i/modules/x86/lilo-installer.xml
index 499131858..499131858 100644
--- a/es/using-d-i/modules/i386/lilo-installer.xml
+++ b/es/using-d-i/modules/x86/lilo-installer.xml
diff --git a/eu/boot-installer/boot-installer.xml b/eu/boot-installer/boot-installer.xml
index 9bf77d2b2..b98b4c6dd 100644
--- a/eu/boot-installer/boot-installer.xml
+++ b/eu/boot-installer/boot-installer.xml
@@ -10,7 +10,7 @@
 
 &boot-installer-alpha.xml;
 &boot-installer-arm.xml;
-&boot-installer-i386.xml;
+&boot-installer-x86.xml;
 &boot-installer-ia64.xml;
 &boot-installer-m68k.xml;
 &boot-installer-mips.xml;
diff --git a/eu/boot-installer/i386.xml b/eu/boot-installer/x86.xml
index 6a2727f83..6a2727f83 100644
--- a/eu/boot-installer/i386.xml
+++ b/eu/boot-installer/x86.xml
diff --git a/eu/partitioning/partition-programs.xml b/eu/partitioning/partition-programs.xml
index fa6f11267..0c4dfcc9a 100644
--- a/eu/partitioning/partition-programs.xml
+++ b/eu/partitioning/partition-programs.xml
@@ -127,7 +127,7 @@ beharreko pausuak baitakartza.
 </para>

 &partition-alpha.xml;

 &partition-hppa.xml;

-&partition-i386.xml;

+&partition-x86.xml;

 &partition-ia64.xml;

 &partition-mips.xml;

 &partition-powerpc.xml;

diff --git a/eu/partitioning/partition/i386.xml b/eu/partitioning/partition/x86.xml
index 26c3e4296..26c3e4296 100644
--- a/eu/partitioning/partition/i386.xml
+++ b/eu/partitioning/partition/x86.xml
diff --git a/eu/preparing/non-debian-partitioning.xml b/eu/preparing/non-debian-partitioning.xml
index 11bc81616..de301cf5d 100644
--- a/eu/preparing/non-debian-partitioning.xml
+++ b/eu/preparing/non-debian-partitioning.xml
@@ -190,7 +190,7 @@ Boot the Debian installer to continue installing Debian.
 </para>
 
 &nondeb-part-alpha.xml; 
-&nondeb-part-i386.xml; 
+&nondeb-part-x86.xml; 
 &nondeb-part-m68k.xml; 
 &nondeb-part-sparc.xml; 
 &nondeb-part-powerpc.xml;
diff --git a/eu/preparing/nondeb-part/i386.xml b/eu/preparing/nondeb-part/x86.xml
index 5ab8df92b..5ab8df92b 100644
--- a/eu/preparing/nondeb-part/i386.xml
+++ b/eu/preparing/nondeb-part/x86.xml
diff --git a/eu/using-d-i/components.xml b/eu/using-d-i/components.xml
index 6dff28b56..743ee2b76 100644
--- a/eu/using-d-i/components.xml
+++ b/eu/using-d-i/components.xml
@@ -93,8 +93,8 @@ gehiago jakiteko.
 &module-os-prober.xml;
 &module-alpha-aboot-installer.xml;
 &module-hppa-palo-installer.xml;
-&module-i386-grub-installer.xml;
-&module-i386-lilo-installer.xml;
+&module-x86-grub-installer.xml;
+&module-x86-lilo-installer.xml;
 &module-ia64-elilo-installer.xml;
 &module-mips-arcboot-installer.xml;
 &module-mipsel-colo-installer.xml;
diff --git a/eu/using-d-i/modules/i386/grub-installer.xml b/eu/using-d-i/modules/x86/grub-installer.xml
index cb42e642a..cb42e642a 100644
--- a/eu/using-d-i/modules/i386/grub-installer.xml
+++ b/eu/using-d-i/modules/x86/grub-installer.xml
diff --git a/eu/using-d-i/modules/i386/lilo-installer.xml b/eu/using-d-i/modules/x86/lilo-installer.xml
index 01dcce470..01dcce470 100644
--- a/eu/using-d-i/modules/i386/lilo-installer.xml
+++ b/eu/using-d-i/modules/x86/lilo-installer.xml
diff --git a/fr/boot-installer/boot-installer.xml b/fr/boot-installer/boot-installer.xml
index 0040d74fd..92f087855 100644
--- a/fr/boot-installer/boot-installer.xml
+++ b/fr/boot-installer/boot-installer.xml
@@ -16,7 +16,7 @@
 &boot-installer-alpha.xml;
 &boot-installer-arm.xml;
 <!-- &boot-installer-hppa.xml; -->
-&boot-installer-i386.xml;
+&boot-installer-x86.xml;
 &boot-installer-ia64.xml;
 &boot-installer-m68k.xml;
 &boot-installer-mips.xml;
diff --git a/fr/boot-installer/i386.xml b/fr/boot-installer/x86.xml
index bb293b473..bb293b473 100644
--- a/fr/boot-installer/i386.xml
+++ b/fr/boot-installer/x86.xml
diff --git a/fr/install-methods/boot-usb-files.xml b/fr/install-methods/boot-usb-files.xml
index 551315055..570c7d9c2 100644
--- a/fr/install-methods/boot-usb-files.xml
+++ b/fr/install-methods/boot-usb-files.xml
@@ -75,7 +75,7 @@ passe, vous pouvez utiliser la méthode suivante pour mettre les fichiers
 sur la clé. 
 </para>
 
-&usb-setup-i386.xml;
+&usb-setup-x86.xml;
 &usb-setup-powerpc.xml;
 
 </sect2>
diff --git a/fr/install-methods/usb-setup/i386.xml b/fr/install-methods/usb-setup/x86.xml
index 927866bb0..927866bb0 100644
--- a/fr/install-methods/usb-setup/i386.xml
+++ b/fr/install-methods/usb-setup/x86.xml
diff --git a/fr/partitioning/partition-programs.xml b/fr/partitioning/partition-programs.xml
index 25bd1e0bb..62da2000c 100644
--- a/fr/partitioning/partition-programs.xml
+++ b/fr/partitioning/partition-programs.xml
@@ -160,7 +160,7 @@ suivre si vous voulez partager votre disque avec MacOS.
 
 &partition-alpha.xml;
 &partition-hppa.xml;
-&partition-i386.xml;
+&partition-x86.xml;
 &partition-ia64.xml;
 &partition-mips.xml;
 &partition-powerpc.xml;
diff --git a/fr/partitioning/partition/i386.xml b/fr/partitioning/partition/x86.xml
index 90c37a666..90c37a666 100644
--- a/fr/partitioning/partition/i386.xml
+++ b/fr/partitioning/partition/x86.xml
diff --git a/fr/preparing/non-debian-partitioning.xml b/fr/preparing/non-debian-partitioning.xml
index 8ea73a0d9..7b9bbc354 100644
--- a/fr/preparing/non-debian-partitioning.xml
+++ b/fr/preparing/non-debian-partitioning.xml
@@ -190,7 +190,7 @@ démarrer l'installateur Debian pour commencer à installer Debian.
 </para>
 
 &nondeb-part-alpha.xml;
-&nondeb-part-i386.xml;
+&nondeb-part-x86.xml;
 &nondeb-part-m68k.xml;
 &nondeb-part-sparc.xml;
 &nondeb-part-powerpc.xml;
diff --git a/fr/preparing/nondeb-part/i386.xml b/fr/preparing/nondeb-part/x86.xml
index 7806c4041..7806c4041 100644
--- a/fr/preparing/nondeb-part/i386.xml
+++ b/fr/preparing/nondeb-part/x86.xml
diff --git a/fr/using-d-i/components.xml b/fr/using-d-i/components.xml
index b064e8706..334ff5156 100644
--- a/fr/using-d-i/components.xml
+++ b/fr/using-d-i/components.xml
@@ -147,8 +147,8 @@ d'amorçage.
 &module-os-prober.xml;
 &module-alpha-aboot-installer.xml;
 &module-hppa-palo-installer.xml;
-&module-i386-grub-installer.xml;
-&module-i386-lilo-installer.xml;
+&module-x86-grub-installer.xml;
+&module-x86-lilo-installer.xml;
 &module-ia64-elilo-installer.xml;
 &module-mips-arcboot-installer.xml;
 &module-mipsel-colo-installer.xml;
diff --git a/fr/using-d-i/modules/i386/grub-installer.xml b/fr/using-d-i/modules/x86/grub-installer.xml
index 165146507..165146507 100644
--- a/fr/using-d-i/modules/i386/grub-installer.xml
+++ b/fr/using-d-i/modules/x86/grub-installer.xml
diff --git a/fr/using-d-i/modules/i386/lilo-installer.xml b/fr/using-d-i/modules/x86/lilo-installer.xml
index 4c0c28867..4c0c28867 100644
--- a/fr/using-d-i/modules/i386/lilo-installer.xml
+++ b/fr/using-d-i/modules/x86/lilo-installer.xml
diff --git a/it/boot-installer/boot-installer.xml b/it/boot-installer/boot-installer.xml
index 75672705a..a0b5b67a9 100644
--- a/it/boot-installer/boot-installer.xml
+++ b/it/boot-installer/boot-installer.xml
@@ -19,7 +19,7 @@
 &boot-installer-alpha.xml;
 &boot-installer-arm.xml;
 <!-- &boot-installer-hppa.xml; -->
-&boot-installer-i386.xml;
+&boot-installer-x86.xml;
 &boot-installer-ia64.xml;
 &boot-installer-m68k.xml;
 &boot-installer-mips.xml;
diff --git a/it/boot-installer/i386.xml b/it/boot-installer/x86.xml
index a1f3b49a3..a1f3b49a3 100644
--- a/it/boot-installer/i386.xml
+++ b/it/boot-installer/x86.xml
diff --git a/it/install-methods/boot-usb-files.xml b/it/install-methods/boot-usb-files.xml
index b569d0f46..ea7b0288d 100644
--- a/it/install-methods/boot-usb-files.xml
+++ b/it/install-methods/boot-usb-files.xml
@@ -136,7 +136,7 @@ chiavetta.
 
 </para>
 
-&usb-setup-i386.xml;
+&usb-setup-x86.xml;
 &usb-setup-powerpc.xml;
 
   </sect2>
diff --git a/it/install-methods/usb-setup/i386.xml b/it/install-methods/usb-setup/x86.xml
index 341674784..341674784 100644
--- a/it/install-methods/usb-setup/i386.xml
+++ b/it/install-methods/usb-setup/x86.xml
diff --git a/it/partitioning/partition-programs.xml b/it/partitioning/partition-programs.xml
index 1baaa8093..bc198084e 100644
--- a/it/partitioning/partition-programs.xml
+++ b/it/partitioning/partition-programs.xml
@@ -258,7 +258,7 @@ spiega le operazioni da compiere per condividere il disco con MacOS.
 
 &partition-alpha.xml;
 &partition-hppa.xml;
-&partition-i386.xml;
+&partition-x86.xml;
 &partition-ia64.xml;
 &partition-mips.xml;
 &partition-powerpc.xml;
diff --git a/it/partitioning/partition/i386.xml b/it/partitioning/partition/x86.xml
index a270b673e..a270b673e 100644
--- a/it/partitioning/partition/i386.xml
+++ b/it/partitioning/partition/x86.xml
diff --git a/it/preparing/non-debian-partitioning.xml b/it/preparing/non-debian-partitioning.xml
index 72a6c2f28..c84d89b09 100644
--- a/it/preparing/non-debian-partitioning.xml
+++ b/it/preparing/non-debian-partitioning.xml
@@ -350,7 +350,7 @@ Debian.
 </para>
 
 &nondeb-part-alpha.xml;
-&nondeb-part-i386.xml;
+&nondeb-part-x86.xml;
 &nondeb-part-m68k.xml;
 &nondeb-part-sparc.xml;
 &nondeb-part-powerpc.xml;
diff --git a/it/preparing/nondeb-part/i386.xml b/it/preparing/nondeb-part/x86.xml
index 9f8b89764..9f8b89764 100644
--- a/it/preparing/nondeb-part/i386.xml
+++ b/it/preparing/nondeb-part/x86.xml
diff --git a/it/using-d-i/components.xml b/it/using-d-i/components.xml
index 33c482da3..5d551b936 100644
--- a/it/using-d-i/components.xml
+++ b/it/using-d-i/components.xml
@@ -243,8 +243,8 @@ manager.
 &module-os-prober.xml;
 &module-alpha-aboot-installer.xml;
 &module-hppa-palo-installer.xml;
-&module-i386-grub-installer.xml;
-&module-i386-lilo-installer.xml;
+&module-x86-grub-installer.xml;
+&module-x86-lilo-installer.xml;
 &module-ia64-elilo-installer.xml;
 &module-mips-arcboot-installer.xml;
 &module-mipsel-colo-installer.xml;
diff --git a/it/using-d-i/modules/i386/grub-installer.xml b/it/using-d-i/modules/x86/grub-installer.xml
index 3830ad345..3830ad345 100644
--- a/it/using-d-i/modules/i386/grub-installer.xml
+++ b/it/using-d-i/modules/x86/grub-installer.xml
diff --git a/it/using-d-i/modules/i386/lilo-installer.xml b/it/using-d-i/modules/x86/lilo-installer.xml
index b71456c1e..b71456c1e 100644
--- a/it/using-d-i/modules/i386/lilo-installer.xml
+++ b/it/using-d-i/modules/x86/lilo-installer.xml
diff --git a/ja/boot-installer/boot-installer.xml b/ja/boot-installer/boot-installer.xml
index abcc16147..ddac27f9d 100644
--- a/ja/boot-installer/boot-installer.xml
+++ b/ja/boot-installer/boot-installer.xml
@@ -16,7 +16,7 @@
 &boot-installer-alpha.xml;
 &boot-installer-arm.xml;
 <!-- &boot-installer-hppa.xml; -->
-&boot-installer-i386.xml;
+&boot-installer-x86.xml;
 &boot-installer-ia64.xml;
 &boot-installer-m68k.xml;
 &boot-installer-mips.xml;
diff --git a/ja/boot-installer/i386.xml b/ja/boot-installer/x86.xml
index b9fbd156c..b9fbd156c 100644
--- a/ja/boot-installer/i386.xml
+++ b/ja/boot-installer/x86.xml
diff --git a/ja/install-methods/boot-usb-files.xml b/ja/install-methods/boot-usb-files.xml
index ffb26b7bb..d2c0123a5 100644
--- a/ja/install-methods/boot-usb-files.xml
+++ b/ja/install-methods/boot-usb-files.xml
@@ -131,7 +131,7 @@ should use the following method to put the files on your stick.
 
 </para>
 
-&usb-setup-i386.xml;
+&usb-setup-x86.xml;
 &usb-setup-powerpc.xml;
 
    </sect2>
diff --git a/ja/install-methods/usb-setup/i386.xml b/ja/install-methods/usb-setup/x86.xml
index 37c53c93a..37c53c93a 100644
--- a/ja/install-methods/usb-setup/i386.xml
+++ b/ja/install-methods/usb-setup/x86.xml
diff --git a/ja/partitioning/partition-programs.xml b/ja/partitioning/partition-programs.xml
index 7f1039fdd..e577397f7 100644
--- a/ja/partitioning/partition-programs.xml
+++ b/ja/partitioning/partition-programs.xml
@@ -241,7 +241,7 @@ Mac ¥¿¥¤¥×¤Î¥Ç¥£¥¹¥¯¾å¤Ç¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤¹¤ëºÝ¤Î°ì¤Ä¤Î½ÅÍפÊÅÀ¤Ï¡¢
 
 &partition-alpha.xml;
 &partition-hppa.xml;
-&partition-i386.xml;
+&partition-x86.xml;
 &partition-ia64.xml;
 &partition-mips.xml;
 &partition-powerpc.xml;
diff --git a/ja/partitioning/partition/i386.xml b/ja/partitioning/partition/x86.xml
index 77e30ca21..77e30ca21 100644
--- a/ja/partitioning/partition/i386.xml
+++ b/ja/partitioning/partition/x86.xml
diff --git a/ja/preparing/non-debian-partitioning.xml b/ja/preparing/non-debian-partitioning.xml
index 63ade5d0e..3e9cc7fb8 100644
--- a/ja/preparing/non-debian-partitioning.xml
+++ b/ja/preparing/non-debian-partitioning.xml
@@ -340,7 +340,7 @@ Debian ¥¤¥ó¥¹¥È¡¼¥é¤òµ¯Æ°¤·¤Æ¡¢Debian ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò³¤±¤ë¡£
 </para>
 
 &nondeb-part-alpha.xml;
-&nondeb-part-i386.xml;
+&nondeb-part-x86.xml;
 &nondeb-part-m68k.xml;
 &nondeb-part-sparc.xml;
 &nondeb-part-powerpc.xml;
diff --git a/ja/preparing/nondeb-part/i386.xml b/ja/preparing/nondeb-part/x86.xml
index 7602d2408..7602d2408 100644
--- a/ja/preparing/nondeb-part/i386.xml
+++ b/ja/preparing/nondeb-part/x86.xml
diff --git a/ja/using-d-i/components.xml b/ja/using-d-i/components.xml
index 6bb450ba3..29d0d0d29 100644
--- a/ja/using-d-i/components.xml
+++ b/ja/using-d-i/components.xml
@@ -243,8 +243,8 @@ documentation for more information.
 &module-os-prober.xml;
 &module-alpha-aboot-installer.xml;
 &module-hppa-palo-installer.xml;
-&module-i386-grub-installer.xml;
-&module-i386-lilo-installer.xml;
+&module-x86-grub-installer.xml;
+&module-x86-lilo-installer.xml;
 &module-ia64-elilo-installer.xml;
 &module-mips-arcboot-installer.xml;
 &module-mipsel-colo-installer.xml;
diff --git a/ja/using-d-i/modules/i386/grub-installer.xml b/ja/using-d-i/modules/x86/grub-installer.xml
index e29ed9a87..e29ed9a87 100644
--- a/ja/using-d-i/modules/i386/grub-installer.xml
+++ b/ja/using-d-i/modules/x86/grub-installer.xml
diff --git a/ja/using-d-i/modules/i386/lilo-installer.xml b/ja/using-d-i/modules/x86/lilo-installer.xml
index 9baffe8f7..9baffe8f7 100644
--- a/ja/using-d-i/modules/i386/lilo-installer.xml
+++ b/ja/using-d-i/modules/x86/lilo-installer.xml
diff --git a/nl/boot-installer/boot-installer.xml b/nl/boot-installer/boot-installer.xml
index 4cc0608f7..9e2445a88 100644
--- a/nl/boot-installer/boot-installer.xml
+++ b/nl/boot-installer/boot-installer.xml
@@ -15,7 +15,7 @@
 &boot-installer-alpha.xml;
 &boot-installer-arm.xml;
 <!-- &boot-installer-hppa.xml; -->
-&boot-installer-i386.xml;
+&boot-installer-x86.xml;
 &boot-installer-ia64.xml;
 &boot-installer-m68k.xml;
 &boot-installer-mips.xml;
diff --git a/nl/boot-installer/i386.xml b/nl/boot-installer/x86.xml
index 4823d31bc..4823d31bc 100644
--- a/nl/boot-installer/i386.xml
+++ b/nl/boot-installer/x86.xml
diff --git a/nl/install-methods/boot-usb-files.xml b/nl/install-methods/boot-usb-files.xml
index 33cd40a85..01e5b5c71 100644
--- a/nl/install-methods/boot-usb-files.xml
+++ b/nl/install-methods/boot-usb-files.xml
@@ -78,7 +78,7 @@ should use the following method to put the files on your stick.
 
 </para>
 
-&usb-setup-i386.xml;
+&usb-setup-x86.xml;
 &usb-setup-powerpc.xml;
 
    </sect2>
diff --git a/nl/install-methods/usb-setup/i386.xml b/nl/install-methods/usb-setup/x86.xml
index c0f6ba65c..c0f6ba65c 100644
--- a/nl/install-methods/usb-setup/i386.xml
+++ b/nl/install-methods/usb-setup/x86.xml
diff --git a/nl/partitioning/partition-programs.xml b/nl/partitioning/partition-programs.xml
index 3a59463df..0048c037c 100644
--- a/nl/partitioning/partition-programs.xml
+++ b/nl/partitioning/partition-programs.xml
@@ -156,7 +156,7 @@ includes steps you should take if you are sharing your disk with MacOS.
 
 &partition-alpha.xml;
 &partition-hppa.xml;
-&partition-i386.xml;
+&partition-x86.xml;
 &partition-ia64.xml;
 &partition-mips.xml;
 &partition-powerpc.xml;
diff --git a/nl/partitioning/partition/i386.xml b/nl/partitioning/partition/x86.xml
index e3a6297a5..e3a6297a5 100644
--- a/nl/partitioning/partition/i386.xml
+++ b/nl/partitioning/partition/x86.xml
diff --git a/nl/preparing/non-debian-partitioning.xml b/nl/preparing/non-debian-partitioning.xml
index 3c40183ef..c28b64dd7 100644
--- a/nl/preparing/non-debian-partitioning.xml
+++ b/nl/preparing/non-debian-partitioning.xml
@@ -199,7 +199,7 @@ van Debian.
 </para>
 
 &nondeb-part-alpha.xml;
-&nondeb-part-i386.xml;
+&nondeb-part-x86.xml;
 &nondeb-part-m68k.xml;
 &nondeb-part-sparc.xml;
 &nondeb-part-powerpc.xml;
diff --git a/nl/preparing/nondeb-part/i386.xml b/nl/preparing/nondeb-part/x86.xml
index a2e7e51e7..a2e7e51e7 100644
--- a/nl/preparing/nondeb-part/i386.xml
+++ b/nl/preparing/nondeb-part/x86.xml
diff --git a/nl/using-d-i/components.xml b/nl/using-d-i/components.xml
index c9834c760..fd62ed170 100644
--- a/nl/using-d-i/components.xml
+++ b/nl/using-d-i/components.xml
@@ -150,8 +150,8 @@ dient u de documentatie van uw opstartlader te raadplegen.
 &module-os-prober.xml;
 &module-alpha-aboot-installer.xml;
 &module-hppa-palo-installer.xml;
-&module-i386-grub-installer.xml;
-&module-i386-lilo-installer.xml;
+&module-x86-grub-installer.xml;
+&module-x86-lilo-installer.xml;
 &module-ia64-elilo-installer.xml;
 &module-mips-arcboot-installer.xml;
 &module-mipsel-colo-installer.xml;
diff --git a/nl/using-d-i/modules/i386/grub-installer.xml b/nl/using-d-i/modules/x86/grub-installer.xml
index fdb192e37..fdb192e37 100644
--- a/nl/using-d-i/modules/i386/grub-installer.xml
+++ b/nl/using-d-i/modules/x86/grub-installer.xml
diff --git a/nl/using-d-i/modules/i386/lilo-installer.xml b/nl/using-d-i/modules/x86/lilo-installer.xml
index 5223cb0f1..5223cb0f1 100644
--- a/nl/using-d-i/modules/i386/lilo-installer.xml
+++ b/nl/using-d-i/modules/x86/lilo-installer.xml
diff --git a/pt_BR/boot-installer/boot-installer.xml b/pt_BR/boot-installer/boot-installer.xml
index 09687d42e..ea58ad064 100644
--- a/pt_BR/boot-installer/boot-installer.xml
+++ b/pt_BR/boot-installer/boot-installer.xml
@@ -19,7 +19,7 @@
 &boot-installer-alpha.xml;
 &boot-installer-arm.xml;
 <!-- &boot-installer-hppa.xml; -->
-&boot-installer-i386.xml;
+&boot-installer-x86.xml;
 &boot-installer-ia64.xml;
 &boot-installer-m68k.xml;
 &boot-installer-mips.xml;
diff --git a/pt_BR/boot-installer/i386.xml b/pt_BR/boot-installer/x86.xml
index 0384d9438..0384d9438 100644
--- a/pt_BR/boot-installer/i386.xml
+++ b/pt_BR/boot-installer/x86.xml
diff --git a/pt_BR/install-methods/boot-usb-files.xml b/pt_BR/install-methods/boot-usb-files.xml
index af9b721fb..74a174020 100644
--- a/pt_BR/install-methods/boot-usb-files.xml
+++ b/pt_BR/install-methods/boot-usb-files.xml
@@ -86,7 +86,7 @@ stick.
 
 </para>
 
-&usb-setup-i386.xml;
+&usb-setup-x86.xml;
 &usb-setup-powerpc.xml;
 
   </sect2>
diff --git a/pt_BR/install-methods/usb-setup/i386.xml b/pt_BR/install-methods/usb-setup/x86.xml
index b0b609c20..b0b609c20 100644
--- a/pt_BR/install-methods/usb-setup/i386.xml
+++ b/pt_BR/install-methods/usb-setup/x86.xml
diff --git a/pt_BR/partitioning/partition-programs.xml b/pt_BR/partitioning/partition-programs.xml
index b83ec7416..fb3c59445 100644
--- a/pt_BR/partitioning/partition-programs.xml
+++ b/pt_BR/partitioning/partition-programs.xml
@@ -162,7 +162,7 @@ com o MacOS.
 
 &partition-alpha.xml;
 &partition-hppa.xml;
-&partition-i386.xml;
+&partition-x86.xml;
 &partition-ia64.xml;
 &partition-mips.xml;
 &partition-powerpc.xml;
diff --git a/pt_BR/partitioning/partition/i386.xml b/pt_BR/partitioning/partition/x86.xml
index fe5d3ce49..fe5d3ce49 100644
--- a/pt_BR/partitioning/partition/i386.xml
+++ b/pt_BR/partitioning/partition/x86.xml
diff --git a/pt_BR/preparing/non-debian-partitioning.xml b/pt_BR/preparing/non-debian-partitioning.xml
index bd12e2c34..eda307354 100644
--- a/pt_BR/preparing/non-debian-partitioning.xml
+++ b/pt_BR/preparing/non-debian-partitioning.xml
@@ -196,7 +196,7 @@ Inicie o programa de instalação da Debian para continuar a instalação.
 </para>
 
 &nondeb-part-alpha.xml;
-&nondeb-part-i386.xml;
+&nondeb-part-x86.xml;
 &nondeb-part-m68k.xml;
 &nondeb-part-sparc.xml;
 &nondeb-part-powerpc.xml;
diff --git a/pt_BR/preparing/nondeb-part/i386.xml b/pt_BR/preparing/nondeb-part/x86.xml
index e56c1f5bf..e56c1f5bf 100644
--- a/pt_BR/preparing/nondeb-part/i386.xml
+++ b/pt_BR/preparing/nondeb-part/x86.xml
diff --git a/pt_BR/using-d-i/components.xml b/pt_BR/using-d-i/components.xml
index fafef11d0..5e66d07b0 100644
--- a/pt_BR/using-d-i/components.xml
+++ b/pt_BR/using-d-i/components.xml
@@ -148,8 +148,8 @@ de partida para mais informações.
 &module-os-prober.xml;
 &module-alpha-aboot-installer.xml;
 &module-hppa-palo-installer.xml;
-&module-i386-grub-installer.xml;
-&module-i386-lilo-installer.xml;
+&module-x86-grub-installer.xml;
+&module-x86-lilo-installer.xml;
 &module-ia64-elilo-installer.xml;
 &module-mips-arcboot-installer.xml;
 &module-mipsel-colo-installer.xml;
diff --git a/pt_BR/using-d-i/modules/i386/grub-installer.xml b/pt_BR/using-d-i/modules/x86/grub-installer.xml
index 233349861..233349861 100644
--- a/pt_BR/using-d-i/modules/i386/grub-installer.xml
+++ b/pt_BR/using-d-i/modules/x86/grub-installer.xml
diff --git a/pt_BR/using-d-i/modules/i386/lilo-installer.xml b/pt_BR/using-d-i/modules/x86/lilo-installer.xml
index df8029647..df8029647 100644
--- a/pt_BR/using-d-i/modules/i386/lilo-installer.xml
+++ b/pt_BR/using-d-i/modules/x86/lilo-installer.xml