5 files changed, 12 insertions, 12 deletions
diff --git a/en/boot-installer/boot-installer.xml b/en/boot-installer/boot-installer.xml
index a1845a192..61c60df6f 100644
--- a/en/boot-installer/boot-installer.xml
+++ b/en/boot-installer/boot-installer.xml
@@ -5,7 +5,7 @@
 
 <!-- Include only archs that are documented to avoid build-errors -->
 <!-- The arch="..." condition can be deleted when al archs are present -->
- <sect1 arch="alpha;arm;i386;ia64;m68k;mips;mipsel;s390;powerpc;sparc">
+ <sect1 arch="alpha;arm;x86;ia64;m68k;mips;mipsel;s390;powerpc;sparc">
  <title>Booting the Installer on &arch-title;</title>
 
 <!-- This info is so architecture dependent, that I have turned the   -->
diff --git a/en/boot-installer/i386.xml b/en/boot-installer/i386.xml
index d58bea242..fbdb87ba5 100644
--- a/en/boot-installer/i386.xml
+++ b/en/boot-installer/i386.xml
@@ -1,7 +1,7 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- $Id$ -->
 
-  <sect2 arch="i386"><title>Booting from a CD-ROM</title>
+  <sect2 arch="x86"><title>Booting from a CD-ROM</title>
 
 &boot-installer-intro-cd.xml;
 
@@ -74,7 +74,7 @@ Boots the <quote>bf2.4</quote> flavor.
 <!-- FIXME the documented procedure does not exactly work, commented out
      until fixes
 
-  <sect2 arch="i386" id="install-from-dos">
+  <sect2 arch="x86" id="install-from-dos">
   <title>Booting from a DOS partition</title>
 
 &boot-installer-intro-hd.xml;
@@ -105,7 +105,7 @@ bf2.4 flavor. The symptom of the problem is an
 
 END FIXME -->
 
-  <sect2 arch="i386" id="boot-initrd">
+  <sect2 arch="x86" id="boot-initrd">
   <title>Booting from Linux Using <command>LILO</command> or
   <command>GRUB</command></title>
 
@@ -192,7 +192,7 @@ or <command>LILO</command>.
 </para>
   </sect2>
 
-  <sect2 arch="i386" condition="bootable-usb" id="usb-boot">
+  <sect2 arch="x86" condition="bootable-usb" id="usb-boot">
   <title>Booting from USB Memory Stick</title>
 <para>
 
@@ -206,7 +206,7 @@ arguments, or just hit &enterkey;.
 </para>
   </sect2>
 
-  <sect2 arch="i386" condition="supports-floppy-boot" id="floppy-boot">
+  <sect2 arch="x86" condition="supports-floppy-boot" id="floppy-boot">
   <title>Booting from Floppies</title>
 <para>
 
@@ -266,7 +266,7 @@ contents are loaded into memory. The installer program
 </para>
   </sect2>
 
-  <sect2 arch="i386" id="boot-tftp"><title>Booting with TFTP</title>
+  <sect2 arch="x86" id="boot-tftp"><title>Booting with TFTP</title>
 
 &boot-installer-intro-net.xml;
 
@@ -312,7 +312,7 @@ provides bootdiskettes and even bootroms that do a TFTPboot.
    </sect3>
   </sect2>
 
-  <sect2 arch="i386"><title>The Boot Prompt</title>
+  <sect2 arch="x86"><title>The Boot Prompt</title>
 <para>
 
 When the installer boots, you should be presented with a friendly graphical
diff --git a/en/boot-installer/intro-cd.xml b/en/boot-installer/intro-cd.xml
index d32a37e9a..523976a08 100644
--- a/en/boot-installer/intro-cd.xml
+++ b/en/boot-installer/intro-cd.xml
@@ -6,7 +6,7 @@
 The easiest route for most people will be to use a set of Debian CDs.
 If you have a CD set, and if your machine supports booting directly off
 the CD, great!  Simply
-<phrase arch="i386">
+<phrase arch="x86">
 configure your system for booting off a CD as described in
 <xref linkend="boot-dev-select"/>,
 </phrase>
diff --git a/en/boot-installer/parameters.xml b/en/boot-installer/parameters.xml
index f261a694e..9c6c34904 100644
--- a/en/boot-installer/parameters.xml
+++ b/en/boot-installer/parameters.xml
@@ -220,7 +220,7 @@ you can disable the feature by the parameter
 about bterm or bogl, a blank screen, or a freeze within a few minutes after
 starting the install.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 The <userinput>video=vga16:off</userinput> argument may also be used
 to disable the kernel's use of the framebuffer. Such problems have been
diff --git a/en/boot-installer/trouble.xml b/en/boot-installer/trouble.xml
index 17d1bbc6a..8ff3536cb 100644
--- a/en/boot-installer/trouble.xml
+++ b/en/boot-installer/trouble.xml
@@ -67,7 +67,7 @@ your kernel.  The installer requires
 </para><para>
 
 Often, problems can be solved by removing add-ons and peripherals, and
-then trying booting again.  <phrase arch="i386">Internal modems, sound
+then trying booting again.  <phrase arch="x86">Internal modems, sound
 cards, and Plug-n-Play devices can be especially problematic.</phrase>
 
 </para><para>
@@ -80,7 +80,7 @@ kernel sees, such as <userinput>mem=512m</userinput>.
 </para>
   </sect2>
 
-  <sect2 arch="i386" id="i386-boot-problems">
+  <sect2 arch="x86" id="i386-boot-problems">
   <title>Common &arch-title; Installation Problems</title>
 <para>