Initial commit preparing to add variant for AMD64.

This commit basically creates the AMD64 variant as a copy of the i386 manual.
Further commits will be needed to differentiate the AMD64 variant from i386 where needed.
Commit includes changes for all translations.

34 files changed, 79 insertions, 79 deletions

diff --git a/nl/administrivia/administrivia.xml b/nl/administrivia/administrivia.xml
index 755206e5b..bda5de650 100644
--- a/nl/administrivia/administrivia.xml
+++ b/nl/administrivia/administrivia.xml
@@ -131,7 +131,7 @@ The section on chrooted installations in this manual
 (<xref linkend="linux-upgrade"/>) was derived in part from
 documents copyright Karsten M. Self.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 The section on installations over plip in this manual
 (<xref linkend="plip"/>) was based on the
diff --git a/nl/appendix/chroot-install.xml b/nl/appendix/chroot-install.xml
index 33acc1e47..3239a6998 100644
--- a/nl/appendix/chroot-install.xml
+++ b/nl/appendix/chroot-install.xml
@@ -403,7 +403,7 @@ the installed kernel with your new root partition. Note that
 <command>debootstrap</command> does not install a boot loader, though you
 can use <command>aptitude</command> inside your Debian chroot to do so.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 Check <userinput>info grub</userinput> or <userinput>man
 lilo.conf</userinput> for instructions on setting up the
@@ -414,7 +414,7 @@ add an entry for the Debian install to your existing grub
 edit it there. After you are done editing, call lilo (remember it will use
 <filename>lilo.conf</filename> relative to the system you call it from).
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 Here is a basic <filename>/etc/lilo.conf</filename> as an example:
 
diff --git a/nl/appendix/plip.xml b/nl/appendix/plip.xml
index 858f97d4d..f3d889ecf 100644
--- a/nl/appendix/plip.xml
+++ b/nl/appendix/plip.xml
@@ -1,7 +1,7 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- original version: 39463 untranslated -->
 
- <sect1 id="plip" arch="i386">
+ <sect1 id="plip" arch="x86">
  <title>Installing &debian; over Parallel Line IP (PLIP)</title>
 
 <para>
diff --git a/nl/boot-installer/boot-installer.xml b/nl/boot-installer/boot-installer.xml
index 0a5a08799..797bc7dcf 100644
--- a/nl/boot-installer/boot-installer.xml
+++ b/nl/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/nl/boot-installer/i386.xml b/nl/boot-installer/i386.xml
index ab6130b4b..04a390056 100644
--- a/nl/boot-installer/i386.xml
+++ b/nl/boot-installer/i386.xml
@@ -1,7 +1,7 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- original version: 38231 untranslated -->
 
-  <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/nl/boot-installer/intro-cd.xml b/nl/boot-installer/intro-cd.xml
index 8a3e1b20a..2e8898998 100644
--- a/nl/boot-installer/intro-cd.xml
+++ b/nl/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/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml
index e8e0d8cb3..3f5672214 100644
--- a/nl/boot-installer/parameters.xml
+++ b/nl/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/nl/boot-installer/trouble.xml b/nl/boot-installer/trouble.xml
index bd3a3be40..18c9916bf 100644
--- a/nl/boot-installer/trouble.xml
+++ b/nl/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>
 
diff --git a/nl/hardware/hardware-supported.xml b/nl/hardware/hardware-supported.xml
index 8d077a974..60ae21274 100644
--- a/nl/hardware/hardware-supported.xml
+++ b/nl/hardware/hardware-supported.xml
@@ -222,7 +222,7 @@ as well.
 
   <sect2 id="gfx" arch="not-s390"><title>Graphics Card</title>
 
-<para arch="i386">
+<para arch="x86">
 
 You should be using a VGA-compatible display interface for the console
 terminal. Nearly every modern display card is compatible with
@@ -260,7 +260,7 @@ listing</ulink> for Broadcom evaluation boards is available.
 
   </sect2>
 
-  <sect2 arch="i386" id="laptops"><title>Laptops</title>
+  <sect2 arch="x86" id="laptops"><title>Laptops</title>
 <para>
 
 Laptops are also supported.  Laptops are often specialized or contain
diff --git a/nl/hardware/installation-media.xml b/nl/hardware/installation-media.xml
index 34a6e015f..cdcb110bc 100644
--- a/nl/hardware/installation-media.xml
+++ b/nl/hardware/installation-media.xml
@@ -50,7 +50,7 @@ support booting from a CD-ROM, you can use the CD-ROM in conjunction
 with the other techniques to install your system, once you've booted
 up by other means; see <xref linkend="boot-installer"/>.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 Both SCSI and IDE/ATAPI CD-ROMs are supported.  In addition, all
 non-standard CD interfaces supported by Linux are supported by the
@@ -60,7 +60,7 @@ them to work, and booting off these non-standard interfaces is
 unlikely.  The <ulink url="&url-cd-howto;">Linux CD-ROM HOWTO</ulink>
 contains in-depth information on using CD-ROMs with Linux.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 USB CD-ROM drives are also supported, as are FireWire devices that
 are supported by the ohci1394 and sbp2 drivers.
@@ -214,14 +214,14 @@ build your own kernel).  Support for the widest possible range of
 devices is desirable in general, to ensure that Debian can be
 installed on the widest array of hardware.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 Generally, the Debian installation system includes support for floppies,
 IDE drives, IDE floppies, parallel port IDE devices, SCSI controllers and
 drives, USB, and FireWire.  The supported file systems include FAT,
 Win-32 FAT extensions (VFAT) and NTFS.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 Disk interfaces that emulate the <quote>AT</quote> hard disk interface
 &mdash; often called MFM, RLL, IDE, or ATA &mdash; are supported.  Very old
diff --git a/nl/hardware/network-cards.xml b/nl/hardware/network-cards.xml
index deb384f58..55d1ba8f7 100644
--- a/nl/hardware/network-cards.xml
+++ b/nl/hardware/network-cards.xml
@@ -4,7 +4,7 @@
  <sect1 id="network-cards">
  <title>Network Connectivity Hardware</title>
 
-<para arch="i386">
+<para arch="x86">
 
 <!-- last updated for kernel-image_2.0.36-2 -->
 
@@ -23,7 +23,7 @@ cards and protocols.
 otherwise unsupported card and then substitute in the installer (see
 <xref linkend="rescue-replace-kernel"/>). -->
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 As for ISDN, the D-channel protocol for the (old) German 1TR6 is not
 supported; Spellcaster BRI ISDN boards are also not supported by the
diff --git a/nl/hardware/supported-peripherals.xml b/nl/hardware/supported-peripherals.xml
index 43512b498..1cb38ab47 100644
--- a/nl/hardware/supported-peripherals.xml
+++ b/nl/hardware/supported-peripherals.xml
@@ -9,13 +9,13 @@ Linux supports a large variety of hardware devices such as mice,
 printers, scanners, PCMCIA and USB devices.  However, most of these
 devices are not required while installing the system.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 USB hardware generally works fine, only some
 USB keyboards may require additional configuration
 (see <xref linkend="usb-keyboard-config"/>).
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 Again, see the
 <ulink url="&url-hardware-howto;">Linux Hardware Compatibility HOWTO</ulink>
@@ -58,7 +58,7 @@ be sure that the hardware is well-supported by GNU/Linux.
 Unfortunately, it's quite rare to find any vendor shipping
 new &arch-title; machines at all.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 If you do have to buy a machine with Windows bundled, carefully read
 the software license that comes with Windows; you may be able to
@@ -108,7 +108,7 @@ is an important market.
 </sect2>
 
 
-  <sect2 arch="i386"><title>Windows-specific Hardware</title>
+  <sect2 arch="x86"><title>Windows-specific Hardware</title>
 <para>
 
 A disturbing trend is the proliferation of Windows-specific modems and
diff --git a/nl/hardware/supported/i386.xml b/nl/hardware/supported/i386.xml
index 725a5169b..6159a9fc9 100644
--- a/nl/hardware/supported/i386.xml
+++ b/nl/hardware/supported/i386.xml
@@ -2,7 +2,7 @@
 <!-- original version: 11648 untranslated -->
 
 
-  <sect2 arch="i386"><title>CPU, Main Boards, and Video Support</title>
+  <sect2 arch="x86"><title>CPU, Main Boards, and Video Support</title>
 <para>
 
 Complete information concerning supported peripherals can be found at
diff --git a/nl/howto/installation-howto.xml b/nl/howto/installation-howto.xml
index 438c3be8a..4f4e4b67b 100644
--- a/nl/howto/installation-howto.xml
+++ b/nl/howto/installation-howto.xml
@@ -79,7 +79,7 @@ only need the first CD of the set.
 </para><para>
 
 Download whichever type you prefer and burn it to a CD.
-<phrase arch="i386">To boot the CD, you may need to change your BIOS
+<phrase arch="x86">To boot the CD, you may need to change your BIOS
 configuration, as explained in <xref linkend="bios-setup" />.</phrase>
 <phrase arch="powerpc">
 To boot a PowerMac from CD, press the <keycap>c</keycap> key while booting. See
@@ -152,7 +152,7 @@ There are other, more flexible ways to set up a memory stick to use the
 debian-installer, and it's possible to get it to work with smaller memory
 sticks. For details, see <xref linkend="boot-usb-files" />.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 Some BIOSes can boot USB storage directly, and some cannot. You may need to
 configure your BIOS to boot from a <quote>removable drive</quote> or even a
@@ -175,7 +175,7 @@ It's also possible to boot &d-i; completely from the net. The
 various methods to netboot depend on your architecture and netboot setup.
 The files in <filename>netboot/</filename> can be used to netboot &d-i;.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 The easiest thing to set up is probably PXE netbooting. Untar the
 file <filename>netboot/pxeboot.tar.gz</filename> into
@@ -198,7 +198,7 @@ existing hard disk, which can have a different OS on it. Download
 and a Debian CD image to the top-level directory of the hard disk. Make sure
 that the CD image has a filename ending in <literal>.iso</literal>. Now
 it's just a matter of booting linux with the initrd.
-<phrase arch="i386">
+<phrase arch="x86">
 <xref linkend="boot-initrd" /> explains one way to do it.
 </phrase>
 
@@ -213,7 +213,7 @@ it's just a matter of booting linux with the initrd.
 Once the installer starts, you will be greeted with an initial screen. Press
 &enterkey; to boot, or read the instructions for other boot
 methods and parameters (see <xref linkend="boot-parms" />).
-<phrase arch="i386">
+<phrase arch="x86">
 If you want a 2.4 kernel, type <userinput>install24</userinput> at the
 <prompt>boot:</prompt> prompt.
 <footnote><para>
@@ -255,7 +255,7 @@ opportunity to automatically partition either an entire drive, or free
 space on a drive. This is recommended for new users or anyone in a hurry,
 but if you do not want to autopartition, choose manual from the menu.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 If you have an existing DOS or Windows partition that you want to preserve,
 be very careful with automatic partitioning. If you choose manual partitioning,
@@ -282,7 +282,7 @@ which can take a while. That is followed by installing a kernel.
 The last step is to install a boot loader. If the installer detects
 other operating systems on your computer, it will add them to the boot menu
 and let you know.
-<phrase arch="i386">By default GRUB will be installed to the master boot
+<phrase arch="x86">By default GRUB will be installed to the master boot
 record of the first harddrive, which is generally a good choice. You'll be
 given the opportunity to override that choice and install it elsewhere.
 </phrase>
diff --git a/nl/install-methods/boot-drive-files.xml b/nl/install-methods/boot-drive-files.xml
index 1cea9d4f6..3c471f6f7 100644
--- a/nl/install-methods/boot-drive-files.xml
+++ b/nl/install-methods/boot-drive-files.xml
@@ -16,7 +16,7 @@ technique. This avoids all hassles of removable media, like finding
 and burning CD images or struggling with too numerous and
 unreliable floppy disks.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 The installer cannot boot from files on an NTFS file system.
 
@@ -39,7 +39,7 @@ depending on whether the system is a <quote>NewWorld</quote> or an
 
 </para>
 
-  <sect2 arch="i386" id="files-lilo">
+  <sect2 arch="x86" id="files-lilo">
   <title>Hard disk installer booting using <command>LILO</command> or
   <command>GRUB</command></title>
 <para>
diff --git a/nl/install-methods/boot-usb-files.xml b/nl/install-methods/boot-usb-files.xml
index fb4198303..8187b3ddd 100644
--- a/nl/install-methods/boot-usb-files.xml
+++ b/nl/install-methods/boot-usb-files.xml
@@ -23,7 +23,7 @@ setups are possible if you follow <xref linkend="usb-copy-flexible"/>).
 
   <sect2 id="usb-copy-easy">
   <title>Copying the files &mdash; the easy way</title>
-<para arch="i386">
+<para arch="x86">
 
 There is an all-in-one file <filename>hd-media/boot.img.gz</filename>
 which contains all the installer files (including the kernel) as well
@@ -57,10 +57,10 @@ that you use the correct device name for your USB stick.
 <para>
 
 After that, mount the USB memory stick (<userinput>mount
-<replaceable arch="i386">/dev/sda</replaceable>
+<replaceable arch="x86">/dev/sda</replaceable>
 <replaceable arch="powerpc">/dev/sda2</replaceable>
 /mnt</userinput>), which will now have
-<phrase arch="i386">a FAT filesystem</phrase>
+<phrase arch="x86">a FAT filesystem</phrase>
 <phrase arch="powerpc">an HFS filesystem</phrase>
 on it, and copy a Debian netinst or businesscard ISO image to it.
 Please note that the file name must end in <filename>.iso</filename>.
@@ -110,7 +110,7 @@ When you are done, unmount the USB memory stick (<userinput>umount
   </sect2>
 
   <!-- TODO: doesn't this section belong later? -->
-  <sect2 arch="i386">
+  <sect2 arch="x86">
   <title>Booting the USB stick</title>
 <warning><para>
 
diff --git a/nl/install-methods/install-tftp.xml b/nl/install-methods/install-tftp.xml
index 51730ad2a..6900aac44 100644
--- a/nl/install-methods/install-tftp.xml
+++ b/nl/install-methods/install-tftp.xml
@@ -70,7 +70,7 @@ which implements these protocols, may be used.  In the examples in
 this section, we shall provide commands for SunOS 4.x, SunOS 5.x
 (a.k.a. Solaris), and GNU/Linux.
 
-<note arch="i386"><para>
+<note arch="x86"><para>
 
 To use the Pre-boot Execution Environment (PXE) method of TFTP
 booting, you will need a TFTP server with <userinput>tsize</userinput>
@@ -161,7 +161,7 @@ images via TFTP itself.  For net booting, use the
 <filename>yaboot-netboot.conf</filename>.  Just rename this to
 <filename>yaboot.conf</filename> in the TFTP directory.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 For PXE booting, everything you should need is set up in the
 <filename>netboot/netboot.tar.gz</filename> tarball. Simply extract this
diff --git a/nl/install-methods/tftp/dhcp.xml b/nl/install-methods/tftp/dhcp.xml
index f51eb2622..4e292ceef 100644
--- a/nl/install-methods/tftp/dhcp.xml
+++ b/nl/install-methods/tftp/dhcp.xml
@@ -52,7 +52,7 @@ restart it with <userinput>/etc/init.d/dhcpd restart</userinput>.
 
 </para>
 
-   <sect3 arch="i386">
+   <sect3 arch="x86">
    <title>Enabling PXE Booting in the DHCP configuration</title>
 <para>
 Here is another example for a <filename>dhcp.conf</filename> using the
diff --git a/nl/install-methods/usb-setup/i386.xml b/nl/install-methods/usb-setup/i386.xml
index a6e062902..8652b4845 100644
--- a/nl/install-methods/usb-setup/i386.xml
+++ b/nl/install-methods/usb-setup/i386.xml
@@ -1,7 +1,7 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- original version: 36841 untranslated -->
 
-   <sect3 arch="i386">
+   <sect3 arch="x86">
    <title>USB stick partitioning on &arch-title;</title>
 <para>
 
diff --git a/nl/partitioning/device-names.xml b/nl/partitioning/device-names.xml
index 49effd568..fdd81d286 100644
--- a/nl/partitioning/device-names.xml
+++ b/nl/partitioning/device-names.xml
@@ -67,12 +67,12 @@ up as <filename>/dev/hda</filename> in Debian).
 
 </para></listitem>
 
-<listitem arch="i386"><para>
+<listitem arch="x86"><para>
 
 The first XT disk is named <filename>/dev/xda</filename>.
 
 </para></listitem>
-<listitem arch="i386"><para>
+<listitem arch="x86"><para>
 
 The second XT disk is named <filename>/dev/xdb</filename>.
 
@@ -125,7 +125,7 @@ the order of the drives can get confusing.  The best solution in this
 case is to watch the boot messages, assuming you know the drive models
 and/or capacities.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 Linux represents the primary partitions as the drive name, plus the
 numbers 1 through 4.  For example, the first primary partition on the
diff --git a/nl/partitioning/partition-programs.xml b/nl/partitioning/partition-programs.xml
index a5852ac9f..5d951dbb2 100644
--- a/nl/partitioning/partition-programs.xml
+++ b/nl/partitioning/partition-programs.xml
@@ -20,7 +20,7 @@ your architecture.
 
 Recommended partitioning tool in Debian. This Swiss army knife can
 also resize partitions, create filesystems
-<phrase arch="i386"> (<quote>format</quote> in Windows speak)</phrase>
+<phrase arch="x86"> (<quote>format</quote> in Windows speak)</phrase>
 and assign them to the mountpoints.
 
 </para></listitem>
@@ -140,7 +140,7 @@ on the target system. After installing the kernel and modules, execute:
 # chmod 660 hda21
 </screen></informalexample>
 
-<phrase arch="i386">Remember to mark your boot partition as
+<phrase arch="x86">Remember to mark your boot partition as
 <quote>Bootable</quote>.</phrase>
 
 </para><para condition="mac-fdisk.txt">
diff --git a/nl/partitioning/partition/i386.xml b/nl/partitioning/partition/i386.xml
index 6d864a2ba..979106c98 100644
--- a/nl/partitioning/partition/i386.xml
+++ b/nl/partitioning/partition/i386.xml
@@ -2,7 +2,7 @@
 <!-- original version: 39465 untranslated -->
 
 
-  <sect2 arch="i386"><title>Partitioning for &arch-title;</title>
+  <sect2 arch="x86"><title>Partitioning for &arch-title;</title>
 <para>
 
 If you have an existing other operating system such as DOS or Windows and
diff --git a/nl/post-install/kernel-baking.xml b/nl/post-install/kernel-baking.xml
index 433375fd7..9b021deed 100644
--- a/nl/post-install/kernel-baking.xml
+++ b/nl/post-install/kernel-baking.xml
@@ -158,7 +158,7 @@ like any package.  As root, do
 </phrase>
 The <replaceable>subarchitecture</replaceable> part is an optional
 sub-architecture,
-<phrase arch="i386"> such as <quote>i586</quote>, </phrase>
+<phrase arch="x86"> such as <quote>i586</quote>, </phrase>
 depending on what kernel options you set.
 <userinput>dpkg -i</userinput> will install the
 kernel, along with some other nice supporting files.  For instance,
diff --git a/nl/post-install/reactivating-win.xml b/nl/post-install/reactivating-win.xml
index e34f01d12..413eaa571 100644
--- a/nl/post-install/reactivating-win.xml
+++ b/nl/post-install/reactivating-win.xml
@@ -2,7 +2,7 @@
 <!-- original version: 28672 untranslated -->
 
 
- <sect1 arch="i386" id="reactivating-win">
+ <sect1 arch="x86" id="reactivating-win">
  <title>Reactivating DOS and Windows</title>
 <para>
 
diff --git a/nl/post-install/rescue.xml b/nl/post-install/rescue.xml
index 1ec1fd1b6..ca4eeb478 100644
--- a/nl/post-install/rescue.xml
+++ b/nl/post-install/rescue.xml
@@ -42,7 +42,7 @@ If possible, the installer will now present you with a shell prompt in the
 file system you selected, which you can use to perform any necessary
 repairs.
 
-<phrase arch="i386">
+<phrase arch="x86">
 For example, if you need to reinstall the GRUB boot loader into the master
 boot record of the first hard disk, you could enter the command
 <userinput>grub-install '(hd0)'</userinput> to do so.
diff --git a/nl/preparing/bios-setup/i386.xml b/nl/preparing/bios-setup/i386.xml
index 224945c26..26bfbea9f 100644
--- a/nl/preparing/bios-setup/i386.xml
+++ b/nl/preparing/bios-setup/i386.xml
@@ -2,7 +2,7 @@
 <!-- original version: 36732 untranslated -->
 
 
-  <sect2 arch="i386" id="bios-setup"><title>Invoking the BIOS Set-Up Menu</title>
+  <sect2 arch="x86" id="bios-setup"><title>Invoking the BIOS Set-Up Menu</title>
 
 <para>
 
@@ -102,7 +102,7 @@ try using a shareware/freeware program.  Try looking in
 </para>
   </sect2>
 
-  <sect2 arch="i386" id="boot-dev-select"><title>Boot Device Selection</title>
+  <sect2 arch="x86" id="boot-dev-select"><title>Boot Device Selection</title>
 
 <para>
 
@@ -230,7 +230,7 @@ save the changes on your computer. Often, you must press
    </sect3>
   </sect2>
 
-  <sect2 arch="i386">
+  <sect2 arch="x86">
   <title>Miscellaneous BIOS Settings</title>
 
    <sect3 id="cd-settings"><title>CD-ROM Settings</title>
diff --git a/nl/preparing/minimum-hardware-reqts.xml b/nl/preparing/minimum-hardware-reqts.xml
index 9866cec25..234f5c472 100644
--- a/nl/preparing/minimum-hardware-reqts.xml
+++ b/nl/preparing/minimum-hardware-reqts.xml
@@ -14,7 +14,7 @@ bent, kunt uitvoeren.
 Afhankelijk van uw behoeften, zou u op sommige punten met minder kunnen
 volstaan dan de in de tabel hieronder aanbevolen specificaties.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 Voor desktop systemen wordt tenminste een Pentium 100 aanbevolen; voor
 een server tenminste een Pentium II-300.
diff --git a/nl/preparing/needed-info.xml b/nl/preparing/needed-info.xml
index 5b530d25e..67265b9dd 100644
--- a/nl/preparing/needed-info.xml
+++ b/nl/preparing/needed-info.xml
@@ -47,8 +47,8 @@ Bevat vaak bruikbare informatie over de configuratie of het gebruik
 van uw hardware.
 </para>
 
- <itemizedlist arch="i386;m68k;alpha;sparc;mips;mipsel">
-<listitem arch="i386"><para>
+ <itemizedlist arch="x86;m68k;alpha;sparc;mips;mipsel">
+<listitem arch="x86"><para>
 
 <ulink url="&url-hardware-howto;">Linux Hardware Compatibility HOWTO</ulink>
 
@@ -169,7 +169,7 @@ De verpakkingen van uw hardware.
 
 </para></listitem>
 
-<listitem arch="i386"><para>
+<listitem arch="x86"><para>
 
 Het Systeem-venster in het Configuratiescherm (Control Panel) van Windows.
 
@@ -209,7 +209,7 @@ uw netwerk en e-mail.
 </row>
 <row arch="not-s390"><entry>Hun volgorde in het systeem.</entry></row>
 <!-- "not-m68k;not-s390" would really turn out to be everything... -->
-<row arch="alpha;arm;hppa;i386;ia64;mips;mipsel;powerpc;sparc">
+<row arch="alpha;arm;hppa;x86;ia64;mips;mipsel;powerpc;sparc">
   <entry>Zijn ze IDE of SCSI (de meeste computers hebben IDE).</entry>
 </row>
 <row arch="m68k">
@@ -293,19 +293,19 @@ Toch ondersteunt Linux nog niet dezelfde variëteit aan apparatuur als
 sommige andere besturingssystemen.
 <!-- s/hardware for/hardware support for/ ? //-->
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 In het bijzonder kan Linux geen hardware aansturen die vereist dat
 een versie van Microsoft Windows actief is.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 Hoewel het mogelijk is om sommige Windows-specifieke apparatuur onder
 Linux aan de praat te krijgen, vereist dit vaak extra inspanning. Daarnaast
 horen de stuurprogramma's voor Windows-specifieke apparatuur vaak bij één
 bepaalde versie van de Linux kernel waardoor ze snel verouderd kunnen raken.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 De meest voorkomende apparatuur van dit type zijn de zogenaamde win-modems.
 Maar ook printers en andere apparatuur kunnen Windows-specifiek zijn.
diff --git a/nl/preparing/non-debian-partitioning.xml b/nl/preparing/non-debian-partitioning.xml
index 1cb00e460..3c40183ef 100644
--- a/nl/preparing/non-debian-partitioning.xml
+++ b/nl/preparing/non-debian-partitioning.xml
@@ -21,7 +21,7 @@ Analoog dient u systeem of machine te lezen als LPAR of VM-guest.
 
 Als er al een besturingssysteem op uw systeem aanwezig is
 
-<phrase arch="i386">
+<phrase arch="x86">
 (Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, &hellip;)
 </phrase>
 
@@ -48,7 +48,7 @@ partitie nodig hebben voor het root-bestandssysteem van Debian.
 
 U kunt informatie over uw huidige partitie-indeling vinden door gebruik te maken
 van een schijfindelingsprogramma voor uw huidige besturingssysteem<phrase
-arch="i386">, zoals fdisk of PartitionMagic</phrase><phrase
+arch="x86">, zoals fdisk of PartitionMagic</phrase><phrase
 arch="powerpc">, zoals Drive Setup, HD Toolkit of MacTools</phrase><phrase
 arch="m68k">, zoals HD SC Setup, HDToolBox of SCSITool</phrase><phrase
 arch="s390">, zoals de VM diskmap</phrase>. Schijfindelingsprogramma's
@@ -103,7 +103,7 @@ informatie hieronder door te lezen omdat er bijzondere omstandigheden kunnen
 zijn &mdash; zoals de volgorde van bestaande partities in de partitie-index
 &mdash; waardoor u alsnog wordt gedwongen om te herindelen vóór de installatie.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 Als uw machine een FAT of NTFS bestandssysteem heeft, zoals wordt gebruikt door
 DOS en Windows, kunt u wachten en het schijfindelingsprogramma van het Debian
diff --git a/nl/preparing/nondeb-part/i386.xml b/nl/preparing/nondeb-part/i386.xml
index eb0b6afb1..b5452a31e 100644
--- a/nl/preparing/nondeb-part/i386.xml
+++ b/nl/preparing/nondeb-part/i386.xml
@@ -2,7 +2,7 @@
 <!-- original version: 36732 untranslated -->
 
 
-  <sect2 arch="i386"><title>Partitioning From DOS or Windows</title>
+  <sect2 arch="x86"><title>Partitioning From DOS or Windows</title>
 <para>
 
 If you are manipulating existing FAT or NTFS partitions, it is
diff --git a/nl/preparing/pre-install-bios-setup.xml b/nl/preparing/pre-install-bios-setup.xml
index 6692f33c3..3f79d9f20 100644
--- a/nl/preparing/pre-install-bios-setup.xml
+++ b/nl/preparing/pre-install-bios-setup.xml
@@ -58,7 +58,7 @@ FIXME: more description of this needed.
 
 </emphasis></phrase>
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 De betere moederborden ondersteunen RAM met pariteitscontrole en kunnen u
 melden als uw systeem een fout van één bit in het geheugen heeft. Helaas
@@ -69,7 +69,7 @@ fouten in uw gegevens ontstaan. Daarom beschikken de betere systemen over
 moederborden die geheugenmodules met 'parity' en 'true-parity' ondersteunen;
 zie ook <xref linkend="Parity-RAM"/>.
 
-</para><para arch="i386">
+</para><para arch="x86">
 
 Als u 'true-parity' RAM heeft en als dit door uw moederbord wordt ondersteund,
 activeer dan eventuele BIOS-instellingen die ervoor zorgen dat het moederbord
@@ -77,7 +77,7 @@ een interrupt genereert bij pariteitsfouten in het geheugen.
 
 </para>
 
-   <sect3 arch="i386"><title>De turboschakelaar</title>
+   <sect3 arch="x86"><title>De turboschakelaar</title>
 <para>
 
 Veel systemen hebben een <emphasis>turboschakelaar</emphasis> die de
@@ -91,7 +91,7 @@ apparatuur, per ongeluk de softwarematige besturing van de turboschakelaar raakt
 </para>
    </sect3>
 
-   <sect3 arch="i386"><title>Cyrix-CPU's en diskettefouten</title>
+   <sect3 arch="x86"><title>Cyrix-CPU's en diskettefouten</title>
 <para>
 
 Bij systemen met een Cyrix-CPU kan het noodzakelijk zijn om tijdens de
@@ -111,7 +111,7 @@ naar 32-bit.)
 </para>
    </sect3>
 
-   <sect3 arch="i386"><title>Instellingen van randapparatuur</title>
+   <sect3 arch="x86"><title>Instellingen van randapparatuur</title>
 <para>
 
 Mogelijk moet u instellingen of jumpers op in uw computer aanwezige kaarten
@@ -130,7 +130,7 @@ hoeveelheid RAM in uw systeem.
 </para>
    </sect3>
 
-   <sect3 arch="i386" id="usb-keyboard-config">
+   <sect3 arch="x86" id="usb-keyboard-config">
    <title>USB BIOS instellingen en toetsenborden</title>
 <para>
 
diff --git a/nl/using-d-i/modules/clock-setup.xml b/nl/using-d-i/modules/clock-setup.xml
index 22e8dd023..e42cce2c4 100644
--- a/nl/using-d-i/modules/clock-setup.xml
+++ b/nl/using-d-i/modules/clock-setup.xml
@@ -19,7 +19,7 @@ klok staat ingesteld op UTC of niet.
 <phrase arch="m68k;powerpc">De interne klok van Macintosh computers staat
 gewoonlijk ingesteld op de lokale tijd. Selecteer lokaal in plaats van
 GMT als u meerdere besturingssystemen op uw computer wilt gebruiken.</phrase>
-<phrase arch="i386">Systemen waarop (ook) Dos of Windows draait, staan
+<phrase arch="x86">Systemen waarop (ook) Dos of Windows draait, staan
 gewoonlijk ingesteld op de lokale tijd. Selecteer lokaal in plaats van
 GMT als u meerdere besturingssystemen op uw computer wilt gebruiken.</phrase>
 
diff --git a/nl/using-d-i/modules/i386/grub-installer.xml b/nl/using-d-i/modules/i386/grub-installer.xml
index 64e1e7ffb..fdb192e37 100644
--- a/nl/using-d-i/modules/i386/grub-installer.xml
+++ b/nl/using-d-i/modules/i386/grub-installer.xml
@@ -1,7 +1,7 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- original version: 18640 untranslated -->
 
-  <sect3 arch="i386">
+  <sect3 arch="x86">
   <title>Install the <command>Grub</command> Boot Loader
          on a Hard Disk</title>
 <para>
diff --git a/nl/using-d-i/modules/i386/lilo-installer.xml b/nl/using-d-i/modules/i386/lilo-installer.xml
index 30726d83a..5223cb0f1 100644
--- a/nl/using-d-i/modules/i386/lilo-installer.xml
+++ b/nl/using-d-i/modules/i386/lilo-installer.xml
@@ -1,7 +1,7 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- original version: 22935 untranslated -->
 
-  <sect3 arch="i386">
+  <sect3 arch="x86">
   <title>Install the <command>LILO</command> Boot Loader
          on a Hard Disk</title>
 <para>