* Fix "howto" part for non-Linux ports.

31 files changed, 105 insertions, 105 deletions

diff --git a/ca/boot-installer/x86.xml b/ca/boot-installer/x86.xml
index bccd171ff..791104562 100644
--- a/ca/boot-installer/x86.xml
+++ b/ca/boot-installer/x86.xml
@@ -225,7 +225,7 @@ d'haver cap diferència entre el <command>GRUB</command> i el
 </para>
   </sect2>
 
-  <sect2 arch="x86" condition="bootable-usb" id="usb-boot">
+  <sect2 arch="any-x86" condition="bootable-usb" id="usb-boot">
   <title>Arrencada des d'un llapis USB</title>
 <para>
 
diff --git a/ca/howto/installation-howto.xml b/ca/howto/installation-howto.xml
index 89746f48d..9a13ace08 100644
--- a/ca/howto/installation-howto.xml
+++ b/ca/howto/installation-howto.xml
@@ -82,7 +82,7 @@ conjunt de CDs de Debian.
 </para><para>
 
 Descarregueu la que preferiu i graveu-la a un CD.
-<phrase arch="x86">Per arrencar el CD, necessiteu canviar la configuració de
+<phrase arch="any-x86">Per arrencar el CD, necessiteu canviar la configuració de
 la vostra BIOS, com s'explica a la <xref linkend="bios-setup" />.</phrase>
 <phrase arch="powerpc">
 Per arrencar un PowerMac des de CD, premeu la tecla <keycap>c</keycap> mentre
@@ -158,7 +158,7 @@ Hi ha formes més flexibles per preparar un llapis de memòria per fer ús del
 debian-installer, i també és possible que funcioni amb llapis de memòria
 mes petits. Per més detalls, podeu mirar <xref linkend="boot-usb-files" />.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Algunes BIOS poden arrencar directament de dispositius USB, i d'altres no.
 Heu de configurar la vostra BIOS per que arrenque des del «disc extraïble» o
@@ -196,7 +196,7 @@ Si voleu instruccions més detallades, mireu <xref linkend="install-tftp" />.
 </para>
   </sect2>
 
-  <sect2 id="howto-getting-images-hard-disk">
+  <sect2 arch="linux-any" id="howto-getting-images-hard-disk">
   <title>Arrencada des del disc dur</title>
 
 <para>
@@ -264,7 +264,7 @@ a l'espai buit disponible (vegeu <xref linkend="partman-auto" />). Recomenat
 si sou nous usuaris o si teniu pressa. Si no voleu fer particions
 automàticament, trieu <guimenuitem>Manual</guimenuitem> des del menú.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Si teniu una partició amb DOS o Windows que voleu conservar,
 aneu amb molt de compte amb la partició automàtica. Si seleccioneu
@@ -316,7 +316,7 @@ compte d'usuari normal.
 L'últim pas és la instal·lació del gestor d'arrencada. Si l'instal·lador
 detecta altres sistemes operatius al vostre ordinador, els afegirà al menú
 d'arrencada i ho farà saber.
-<phrase arch="x86">Per defecte el GRUB s'instal·larà al sector d'arrencada
+<phrase arch="any-x86">Per defecte el GRUB s'instal·larà al sector d'arrencada
 del vostre primer disc dur, cosa que normalment serà una bona elecció.
 Podreu canviar-lo i instal·lar-lo a un altre lloc si ho desitgeu.
 </phrase>
diff --git a/cs/boot-installer/x86.xml b/cs/boot-installer/x86.xml
index f6967c56e..fd203695e 100644
--- a/cs/boot-installer/x86.xml
+++ b/cs/boot-installer/x86.xml
@@ -219,7 +219,7 @@ Od teď by neměl být mezi oběma zavaděči žádný rozdíl.
 </para>
   </sect2>
 
-  <sect2 arch="x86" condition="bootable-usb" id="usb-boot">
+  <sect2 arch="any-x86" condition="bootable-usb" id="usb-boot">
   <title>Zavedení z USB <quote>klíčenky</quote></title>
 <para>
 
diff --git a/cs/howto/installation-howto.xml b/cs/howto/installation-howto.xml
index 2ab63cc69..4ea57ef16 100644
--- a/cs/howto/installation-howto.xml
+++ b/cs/howto/installation-howto.xml
@@ -81,7 +81,7 @@ vám bude stačit pouze první obraz.)
 
 Stáhněte si preferovaný obraz a vypalte jej na CD.
 
-<phrase arch="x86">
+<phrase arch="any-x86">
 
 Pro zavedení z CD možná budete muset změnit nastavení v BIOSu, viz
 <xref linkend="bios-setup"/>.
@@ -165,7 +165,7 @@ z nichž některé jsou popsány v kapitole <xref
 linkend="boot-usb-files"/>. (Například návod, jak použít klíčenku
 menší než 256 MB.)
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Některé BIOSy umí zavádět přímo z USB, jiným je třeba pomoci. Hledejte
 menu, které povolí zavádění z <quote>removable drive</quote> nebo
@@ -201,7 +201,7 @@ naleznete v kapitole <xref linkend="install-tftp"/>.
 </para>
   </sect2>
 
-  <sect2 id="howto-getting-images-hard-disk">
+  <sect2 arch="linux-any" id="howto-getting-images-hard-disk">
   <title>Zavedení z pevného disku</title>
 <para>
 
@@ -270,7 +270,7 @@ doporučený způsob rozdělení disku pro začátečníky nebo pro lidi
 ve spěchu. Pokud nechcete využít této možnosti, vyberte
 z menu <guimenuitem>Ruční</guimenuitem> rozdělení.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Máte-li stávající DOSové nebo windowsové oblasti, které chcete
 zachovat, buďte s automatickým dělením velmi opatrní. Pokud vyberete
@@ -321,7 +321,7 @@ běžného uživatele.
 Posledním krokem je instalace zavaděče. Pokud instalátor rozpozná na
 počítači jiné operační systémy, přidá je do zaváděcího menu.
 
-<phrase arch="x86">
+<phrase arch="any-x86">
 Implicitně se GRUB nainstaluje do hlavního zaváděcího záznamu prvního
 disku. K dispozici však máte i možnost instalovat zavaděč kamkoliv
 jinam.
diff --git a/de/boot-installer/x86.xml b/de/boot-installer/x86.xml
index b964eafd0..739649641 100644
--- a/de/boot-installer/x86.xml
+++ b/de/boot-installer/x86.xml
@@ -226,7 +226,7 @@ Ab hier sollte es keinen Unterschied mehr geben zwischen
 </para>
   </sect2>
 
-  <sect2 arch="x86" condition="bootable-usb" id="usb-boot">
+  <sect2 arch="any-x86" condition="bootable-usb" id="usb-boot">
   <title>Von einem USB-Memory-Stick booten</title>
 <para>
 
diff --git a/de/howto/installation-howto.xml b/de/howto/installation-howto.xml
index b8c577c33..dd90b43b3 100644
--- a/de/howto/installation-howto.xml
+++ b/de/howto/installation-howto.xml
@@ -81,7 +81,7 @@ nur die erste CD aus dem Satz.
 </para><para>
 
 Laden Sie das Image herunter, das Sie bevorzugen, und brennen Sie es auf CD.
-<phrase arch="x86">Um von CD zu booten, müssen Sie unter Umständen die
+<phrase arch="any-x86">Um von CD zu booten, müssen Sie unter Umständen die
 BIOS-Einstellungen ändern, wie in <xref linkend="bios-setup" />
 beschrieben.</phrase>
 <phrase arch="powerpc">Um einen PowerMac von CD zu starten, drücken Sie während
@@ -161,7 +161,7 @@ Debian-Installers einzurichten und es ist auch möglich, es mit kleineren
 Speicher-Sticks hinzubekommen. Details finden Sie im
 <xref linkend="boot-usb-files" />.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Bei einigen Systemen kann das BIOS direkt vom USB-Speicher starten, bei
 anderen nicht. Eventuell müssen Sie das BIOS konfigurieren, von einem
@@ -201,7 +201,7 @@ Detaillierte Informationen finden Sie im <xref linkend="install-tftp" />.
 </para>
   </sect2>
   
-  <sect2 id="howto-getting-images-hard-disk">
+  <sect2 arch="linux-any" id="howto-getting-images-hard-disk">
   <title>Von Festplatte starten</title>
 <para>
 
@@ -274,7 +274,7 @@ Dies wird empfohlen für neue Benutzer oder falls Sie es eilig haben.
 Wenn Sie keine automatische Partitionierung wollen, wählen Sie im Menü
 <guimenuitem>Manuell</guimenuitem>.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Wenn Sie eine vorhandene DOS- oder Windows-Partition auf dem Rechner
 haben und diese auch behalten möchten, seien Sie mit der automatischen
@@ -333,7 +333,7 @@ Benutzers.
 Der letzte Schritt ist die Installation des Bootloaders. Wenn der
 Installer ein anderes Betriebssystem auf Ihrem Rechner erkennt, wird es
 zum Boot-Menü hinzugefügt und Sie werden darüber informiert.
-<phrase arch="x86">Standardmäßig wird der Bootloader GRUB in den
+<phrase arch="any-x86">Standardmäßig wird der Bootloader GRUB in den
 Master-Boot-Record der ersten Festplatte installiert, was meistens eine
 gute Wahl ist. Sie haben aber die Möglichkeit, diese Auswahl zu überschreiben
 und ihn anderswo zu installieren.
diff --git a/debian/changelog b/debian/changelog
index 8881a31fa..c66d8be5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,8 +25,8 @@ installation-guide (2010xxxx) UNRELEASED; urgency=low
     people.
   * Fix "boot-installer" part for non-Linux ports. Still needs extensive
     review from BSD people.
-  * Fix "preparing", "using-d-i", "boot-new", and "post-install" parts for
-    non-Linux ports.
+  * Fix "preparing", "using-d-i", "boot-new", "post-install", and "howto" parts
+    for non-Linux ports.
 
   [ Joey Hess ]
   * Update USB stick documentation to reflect isohybird mini.iso files,
diff --git a/en/boot-installer/x86.xml b/en/boot-installer/x86.xml
index 041daaa2e..272aca753 100644
--- a/en/boot-installer/x86.xml
+++ b/en/boot-installer/x86.xml
@@ -220,7 +220,7 @@ or <command>LILO</command>.
 </para>
   </sect2>
 
-  <sect2 arch="x86" condition="bootable-usb" id="usb-boot">
+  <sect2 arch="any-x86" condition="bootable-usb" id="usb-boot">
   <title>Booting from USB Memory Stick</title>
 <para>
 
diff --git a/en/howto/installation-howto.xml b/en/howto/installation-howto.xml
index 3897df0ee..059b527e4 100644
--- a/en/howto/installation-howto.xml
+++ b/en/howto/installation-howto.xml
@@ -78,7 +78,7 @@ only need the first CD of the set.
 </para><para>
 
 Download whichever type you prefer and burn it to a CD.
-<phrase arch="x86">To boot the CD, you may need to change your BIOS
+<phrase arch="any-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="x86">
+</para><para arch="any-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
@@ -188,7 +188,7 @@ For detailed instructions, see <xref linkend="install-tftp" />.
 </para>
   </sect2>
 
-  <sect2 id="howto-getting-images-hard-disk">
+  <sect2 arch="linux-any" id="howto-getting-images-hard-disk">
   <title>Booting from hard disk</title>
 <para>
 
@@ -253,7 +253,7 @@ free space on a drive (see <xref linkend="partman-auto" />).
 This is recommended for new users or anyone in a hurry. If you do not want
 to autopartition, choose <guimenuitem>Manual</guimenuitem> from the menu.
 
-</para><para arch="x86">
+</para><para arch="any-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,
@@ -302,7 +302,7 @@ account.
 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="x86">By default GRUB will be installed to the master boot
+<phrase arch="any-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/es/boot-installer/x86.xml b/es/boot-installer/x86.xml
index 464f8e350..650c3e9a8 100644
--- a/es/boot-installer/x86.xml
+++ b/es/boot-installer/x86.xml
@@ -219,7 +219,7 @@ Desde este momento en adelante, no habrá diferencia entre
 </para>
   </sect2>
 
-  <sect2 arch="x86" condition="bootable-usb" id="usb-boot">
+  <sect2 arch="any-x86" condition="bootable-usb" id="usb-boot">
   <title>Arranque desde un dispositivo de memoria USB</title>
 <para>
 
diff --git a/es/howto/installation-howto.xml b/es/howto/installation-howto.xml
index 8ed32eea0..5b641752d 100644
--- a/es/howto/installation-howto.xml
+++ b/es/howto/installation-howto.xml
@@ -79,7 +79,7 @@ primer CD del conjunto de CDs de Debian.
 </para><para>
 
 Descargue la imagen que prefiera y gr�bela en un CD.
-<phrase arch="x86">Para arrancar el CD, puede que necesite modificar la
+<phrase arch="any-x86">Para arrancar el CD, puede que necesite modificar la
 configuraci�n de su BIOS, como se detalla en <xref linkend="bios-setup" />.</phrase>
 <phrase arch="powerpc">
 Para arrancar un PowerMac desde el CD, pulse la tecla <keycap>c</keycap>
@@ -170,7 +170,7 @@ m�s detalles, vea <xref linkend="boot-usb-files" />.
 El arranque de sistemas desde dispositivos de almacenamiento USB requiere el uso
 manual de �OpenFirmware�. Para m�s indicaciones, vea <xref linkend="usb-boot" />.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Algunas BIOS pueden arrancar directamente desde dispositivos de
 almacenamiento USB, pero otras no. Puede que necesite configurar su BIOS
@@ -205,7 +205,7 @@ Para instrucciones detalladas, vea <xref linkend="install-tftp" />.
 </para>
   </sect2>
 
-  <sect2 id="howto-getting-images-hard-disk">
+  <sect2 arch="linux-any" id="howto-getting-images-hard-disk">
   <title>Arrancar desde un disco duro</title>
 <para>
 
@@ -272,7 +272,7 @@ m�s recomendable para usuarios noveles o alguien con prisa. Escoja la
 <guimenuitem>Manual</guimenuitem> en el men� si no desea particionado
 autom�tico.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Si tiene una partici�n DOS o Windows que quiera preservar, tenga cuidado con el
 particionado autom�tico. Si elije particionado manual, puede usar el instalador
@@ -323,7 +323,7 @@ crear una cuenta para un usuario normal.
 El �ltimo paso es la instalaci�n del gestor de arranque. El instalador
 a�adir� autom�ticamente al men� de arranque y mostrar� un aviso si
 detecta otros sistemas operativos en su ordenador.
-<phrase arch="x86">GRUB se instala de forma predeterminada en el sector de
+<phrase arch="any-x86">GRUB se instala de forma predeterminada en el sector de
 arranque del primer disco duro, lo que generalmente es una buena elecci�n.
 Podr� cambiarlo e instalarlo en otra ubicaci�n si as� lo desea.</phrase>
 
diff --git a/eu/howto/installation-howto.xml b/eu/howto/installation-howto.xml
index f7adafcd4..758f40370 100644
--- a/eu/howto/installation-howto.xml
+++ b/eu/howto/installation-howto.xml
@@ -79,7 +79,7 @@ CD-arekin aski izan beharko zenuke.
 </para><para>
 
 Deskargatu naiago duzun moetako eta graba ezazu CD batetan.
-<phrase arch="x86">CD-tik abiaraz ahal izateko, agian zuk BIOS-eko ezarpenak
+<phrase arch="any-x86">CD-tik abiaraz ahal izateko, agian zuk BIOS-eko ezarpenak
 aldatu behar izango dituzu, honi buruzko argibideak:
 <xref linkend="bios-setup" />.</phrase>
 <phrase arch="powerpc">
@@ -157,7 +157,7 @@ Badago debian installer erabiliaz memoria gailua erabiltzeko modu malguago
 bat, eta posible da memoria gutxiagoko gailuekin funtzionatzea. Xehetasunak
 ikusteko  <xref linkend="boot-usb-files" />.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Zenbait BIOS erabiliaz usb biltegiratzetik zuzenean abiarazi daitezke. BIOS-a
 "gailu aldakorra" edo "USB_ZIP"-tik abiarazteko konfiguratu behar duzu, USB
@@ -191,7 +191,7 @@ Argibide zeatzagoetarako ikusi  <xref linkend="install-tftp" />
 </para>
   </sect2>
   
-  <sect2 id="howto-getting-images-hard-disk">
+  <sect2 arch="linux-any" id="howto-getting-images-hard-disk">
   <title>Diska gogorretik abiarazten</title>
 <para>
 
@@ -276,7 +276,7 @@ Honen ondoren kernel instalazioa egingo da.
 Azkenengo pausua abiarazle bat instalatzea da. Instalatzaileak zure
 ordenagiluan beste sistema bat aurkituko balu, abiarazte menuan 
 gehituko luke eta zuri honen berri emango lizuke.
-<phrase arch="x86">Lehenespen bezala, arruntenean erabaki egokia den,
+<phrase arch="any-x86">Lehenespen bezala, arruntenean erabaki egokia den,
  GRUB abiarzlea lehenengo diska gogorreko abiarazte grabaketa nagusian 
 (MBR) grabatuko da. Zuri ezarpen hau aldatu eta GRUB beste edonon
 grabatzeko aukera emango zaizu.
diff --git a/fr/boot-installer/x86.xml b/fr/boot-installer/x86.xml
index 9f182e36e..e06774923 100644
--- a/fr/boot-installer/x86.xml
+++ b/fr/boot-installer/x86.xml
@@ -218,7 +218,7 @@ entre <command>GRUB</command> et <command>LILO</command>.
 </para>
 </sect2>
 
-<sect2 arch="x86" condition="bootable-usb" id="usb-boot">
+<sect2 arch="any-x86" condition="bootable-usb" id="usb-boot">
 <title>Amorcer sur une clé USB</title>
 
 <para>
diff --git a/fr/howto/installation-howto.xml b/fr/howto/installation-howto.xml
index 89840b788..26b08d62b 100644
--- a/fr/howto/installation-howto.xml
+++ b/fr/howto/installation-howto.xml
@@ -75,7 +75,7 @@ l'installation. Seul le premier cédérom de cet ensemble est nécessaire.
 </para><para>
 
 Téléchargez l'image que vous préférez et gravez-la sur un cédérom.
-<phrase arch="x86">Pour amorcer à partir du cédérom, vous devrez sans doute
+<phrase arch="any-x86">Pour amorcer à partir du cédérom, vous devrez sans doute
 changer la configuration du BIOS&nbsp;; c'est expliqué dans la
 <xref linkend="bios-setup" />.</phrase>
 <phrase arch="powerpc">
@@ -154,7 +154,7 @@ Il y a des moyens plus souples de mettre en oeuvre une clé USB et
 l'installateur Debian peut fonctionner avec des clés qui possèdent moins de
 mémoire. Pour des précisions, voyez la <xref linkend="boot-usb-files" />.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Certains BIOS peuvent lancer directement des périphériques USB, d'autres
 non. Il vous faudra configurer le BIOS et permettre l'amorçage d'un
@@ -192,7 +192,7 @@ Pour des instructions précises, voyez la <xref linkend="install-tftp" />.
 </para>
   </sect2>
   
-  <sect2 id="howto-getting-images-hard-disk">
+  <sect2 arch="linux-any" id="howto-getting-images-hard-disk">
 <title>Amorcer depuis un disque dur</title>
 <para>
 
@@ -267,7 +267,7 @@ ou pour les gens pressés. Si vous ne voulez pas du partitionnement automatique,
 <guimenuitem>Manuel</guimenuitem> dans le menu.
 </para>
 
-<para arch="x86">
+<para arch="any-x86">
 
 Si vous voulez préserver une partition DOS ou Windows, faites attention en
 utilisant le partitionnement automatique. Si vous utilisez le partitionnement
@@ -322,7 +322,7 @@ Par défaut vous devez fournir un mot de passe pour le compte du superutilisateu
 La dernière étape est l'installation d'un programme d'amorçage. Si
 l'installateur a détecté d'autres systèmes d'exploitation sur la machine,
 il les ajoutera au menu du programme d'amorçage.
-<phrase arch="x86">GRUB est par défaut installé sur le secteur principal 
+<phrase arch="any-x86">GRUB est par défaut installé sur le secteur principal 
 d'amorçage du premier disque dur, ce qui est une bonne idée. Mais vous avez la 
 possibilité de refuser ce choix et de l'installer ailleurs.
 </phrase>
diff --git a/it/boot-installer/x86.xml b/it/boot-installer/x86.xml
index 9b149e7f9..cb9956b6b 100644
--- a/it/boot-installer/x86.xml
+++ b/it/boot-installer/x86.xml
@@ -348,7 +348,7 @@ D'ora in poi non ci sono differenze fra <command>GRUB</command> e
 </para>
   </sect2>
 
-  <sect2 arch="x86" condition="bootable-usb" id="usb-boot">
+  <sect2 arch="any-x86" condition="bootable-usb" id="usb-boot">
   <!-- <title>Booting from USB Memory Stick</title> -->
   <title>Avvio da chiavetta USB</title>
 <para>
diff --git a/it/howto/installation-howto.xml b/it/howto/installation-howto.xml
index bda14e4e3..062983e9c 100644
--- a/it/howto/installation-howto.xml
+++ b/it/howto/installation-howto.xml
@@ -142,7 +142,7 @@ il primo CD della serie.
 
 <!--
 Download whichever type you prefer and burn it to a CD.
-<phrase arch="x86">To boot the CD, you may need to change your BIOS
+<phrase arch="any-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
@@ -151,7 +151,7 @@ To boot a PowerMac from CD, press the <keycap>c</keycap> key while booting. See
 -->
 
 Scaricare il tipo che si preferisce e masterizzare l'immagine su un CD.
-<phrase arch="x86">
+<phrase arch="any-x86">
 Per fare l'avvio da CD potrebbe essere necessario modificare la
 configurazione del BIOS del proprio computer come spiegato in
 <xref linkend="bios-setup" />.
@@ -293,7 +293,7 @@ C'è un altro modo, più flessibile, per preparare una chiavetta con il
 debian-installer che permette anche l'uso di chiavette più piccole. Per i
 dettagli si veda <xref linkend="boot-usb-files" />.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 <!--
 Some BIOSes can boot USB storage directly, and some cannot. You may need to
@@ -360,7 +360,7 @@ un po' di fortuna funziona. Per le istruzioni dettagliate si veda
 </para>
   </sect2>
 
-  <sect2 id="howto-getting-images-hard-disk">
+  <sect2 arch="linux-any" id="howto-getting-images-hard-disk">
   <!-- <title>Booting from hard disk</title> -->
   <title>Avvio da disco fisso</title>
 <para>
@@ -488,7 +488,7 @@ disponibile (si veda <xref linkend="partman-auto" />). Questa procedura
 fretta, se non si desidera usare il partizionamento automatico si deve
 scegliere <guimenuitem>manuale</guimenuitem> dal menu.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 <!--
 If you have an existing DOS or Windows partition that you want to preserve,
@@ -587,7 +587,7 @@ e le informazioni per creare l'account di un utente normale.
 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="x86">By default GRUB will be installed to the master boot
+<phrase arch="any-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>
@@ -596,7 +596,7 @@ given the opportunity to override that choice and install it elsewhere.
 L'ultimo passo è installare un boot loader. Se l'installatore rileva la
 presenza di altri sistemi operativi sul computer è in grado di aggiungerli
 nel menu di avvio.
-<phrase arch="x86">
+<phrase arch="any-x86">
 GRUB viene installato nel master boot record del primo disco, normalmente
 questa è una buona scelta. Comunque viene data l'opportunità di cambiare
 questa scelta in modo da installarlo da qualche altra parte.
diff --git a/nl/boot-installer/x86.xml b/nl/boot-installer/x86.xml
index 9ce5b716b..e3a381012 100644
--- a/nl/boot-installer/x86.xml
+++ b/nl/boot-installer/x86.xml
@@ -214,7 +214,7 @@ or <command>LILO</command>.
 </para>
   </sect2>
 
-  <sect2 arch="x86" condition="bootable-usb" id="usb-boot">
+  <sect2 arch="any-x86" condition="bootable-usb" id="usb-boot">
   <title>Booting from USB Memory Stick</title>
 <para>
 
diff --git a/nl/howto/installation-howto.xml b/nl/howto/installation-howto.xml
index e7e95b291..497b67767 100644
--- a/nl/howto/installation-howto.xml
+++ b/nl/howto/installation-howto.xml
@@ -78,7 +78,7 @@ only need the first CD of the set.
 </para><para>
 
 Download whichever type you prefer and burn it to a CD.
-<phrase arch="x86">To boot the CD, you may need to change your BIOS
+<phrase arch="any-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="x86">
+</para><para arch="any-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
@@ -188,7 +188,7 @@ For detailed instructions, see <xref linkend="install-tftp" />.
 </para>
   </sect2>
 
-  <sect2 id="howto-getting-images-hard-disk">
+  <sect2 arch="linux-any" id="howto-getting-images-hard-disk">
   <title>Booting from hard disk</title>
 <para>
 
@@ -253,7 +253,7 @@ free space on a drive (see <xref linkend="partman-auto" />).
 This is recommended for new users or anyone in a hurry. If you do not want
 to autopartition, choose <guimenuitem>Manual</guimenuitem> from the menu.
 
-</para><para arch="x86">
+</para><para arch="any-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,
@@ -302,7 +302,7 @@ account.
 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="x86">By default GRUB will be installed to the master boot
+<phrase arch="any-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/po/el/installation-howto.po b/po/el/installation-howto.po
index c3c960026..9c38edf89 100644
--- a/po/el/installation-howto.po
+++ b/po/el/installation-howto.po
@@ -153,7 +153,7 @@ msgstr ""
 #: installation-howto.xml:78
 #, no-c-format
 msgid ""
-"Download whichever type you prefer and burn it to a CD. <phrase arch=\"x86"
+"Download whichever type you prefer and burn it to a CD. <phrase arch=\"any-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 "
@@ -161,7 +161,7 @@ msgid ""
 "phrase>"
 msgstr ""
 "Κατεβάστε οποιονδήποτε τύπο εικόνας που προτιμάτε και γράψτε την σ' ένα κενό "
-"CD. <phrase arch=\"x86\">Για να εκκινήσετε από το CD, ίσως χρειαστεί να "
+"CD. <phrase arch=\"any-x86\">Για να εκκινήσετε από το CD, ίσως χρειαστεί να "
 "αλλάξετε τις ρυθμίσεις του BIOS, όπως εξηγείται στο <xref linkend=\"bios-"
 "setup\" />.</phrase> <phrase arch=\"powerpc\"> Για να εκκινήσετε ένα "
 "μηχάνημα PowerMac από CD, πατήστε το πλήκτρο <keycap>c</keycap> κατά τη "
@@ -595,7 +595,7 @@ msgstr ""
 msgid ""
 "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=\"x86\">By default GRUB will be installed to the "
+"let you know. <phrase arch=\"any-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>"
@@ -603,7 +603,7 @@ msgstr ""
 "Το τελευταίο βήμα είναι η εγκατάσταση ενός φορτωτή εκκίνησης. Αν ο "
 "εγκαταστάτης ανιχνεύσει άλλα λειτουργικά συστήματα στον υπολογιστή, θα τα "
 "προσθέσει στο μενού εκκίνησης και θα σας ενημερώσει σχετικά.<phrase arch="
-"\"x86\">. Η προεπιλογή είναι η εγκατάσταση του GRUB στο master boot record "
+"\"any-x86\">. Η προεπιλογή είναι η εγκατάσταση του GRUB στο master boot record "
 "του πρώτου σκληρού δίσκου, που είναι γενικά μια καλή επιλογή. Σας δίνεται "
 "όμως η ευκαιρία να παρακάμψετε αυτή την επιλογή και να εγκαταστήσετε το GRUB "
 "κάπου αλλού.</phrase>"
diff --git a/po/fi/installation-howto.po b/po/fi/installation-howto.po
index 661f81c77..71aa52b0e 100644
--- a/po/fi/installation-howto.po
+++ b/po/fi/installation-howto.po
@@ -141,14 +141,14 @@ msgstr ""
 #: installation-howto.xml:78
 #, no-c-format
 msgid ""
-"Download whichever type you prefer and burn it to a CD. <phrase arch=\"x86"
+"Download whichever type you prefer and burn it to a CD. <phrase arch=\"any-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 <xref linkend=\"boot-cd\"/> for other ways to boot from CD. </"
 "phrase>"
 msgstr ""
-"Nouda mieluisa CD-otos ja kirjoita se CD-aihiolle. <phrase arch=\"x86"
+"Nouda mieluisa CD-otos ja kirjoita se CD-aihiolle. <phrase arch=\"any-x86"
 "\">Käynnistettäessä CD-levyltä voi olla tarpeen muuttaa BIOS:n asetuksia, "
 "kuten neuvotaan luvussa <xref linkend=\"bios-setup\"/>. </phrase> <phrase "
 "arch=\"powerpc\"> PowerMac käynnistyy CD-levyltä painettaessa näppäintä "
@@ -558,14 +558,14 @@ msgstr ""
 msgid ""
 "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=\"x86\">By default GRUB will be installed to the "
+"let you know. <phrase arch=\"any-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>"
 msgstr ""
 "Viimeinen vaihe on alkulatausohjelman asentaminen. Jos asennin havaitsee "
 "muita käyttöjärjestelmiä tietokoneella, niistä ilmoitetaan ja lisätään "
-"käynnistysvalikkoon. <phrase arch=\"x86\">Oletusarvona GRUB asennetaan "
+"käynnistysvalikkoon. <phrase arch=\"any-x86\">Oletusarvona GRUB asennetaan "
 "ensimmäisen kiintolevyn pääkäynnistyslohkoon, joka yleensä on hyvä valinta. "
 "Tämä valinta voidaan ohittaa ja tehdä asennus muualle. </phrase>"
 
diff --git a/po/hu/installation-howto.po b/po/hu/installation-howto.po
index 88c0080e3..385374be4 100644
--- a/po/hu/installation-howto.po
+++ b/po/hu/installation-howto.po
@@ -140,14 +140,14 @@ msgstr ""
 #: installation-howto.xml:78
 #, no-c-format
 msgid ""
-"Download whichever type you prefer and burn it to a CD. <phrase arch=\"x86"
+"Download whichever type you prefer and burn it to a CD. <phrase arch=\"any-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 <xref linkend=\"boot-cd\"/> for other ways to boot from CD. </"
 "phrase>"
 msgstr ""
-"Töltsd le a választott típust és írd ki egy CD lemezre. <phrase arch=\"x86"
+"Töltsd le a választott típust és írd ki egy CD lemezre. <phrase arch=\"any-x86"
 "\">A CD indításához, a BIOS beállításaid meg kell feleljenek a <xref linkend="
 "\"bios-setup\"/> részben leírtaknak.</phrase> <phrase arch=\"powerpc\"> Egy "
 "PowerMac CD-képről indításához, nyomd le a <keycap>c</keycap> billentyűt "
@@ -568,14 +568,14 @@ msgstr ""
 msgid ""
 "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=\"x86\">By default GRUB will be installed to the "
+"let you know. <phrase arch=\"any-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>"
 msgstr ""
 "Utolsó lépésként pedig a boot betöltő telepítését végzi el. Ha a telepítő "
 "más rendszert is érzékelt, hozzáadja az indító menühöz és tudatja ezt. "
-"<phrase arch=\"x86\">Alapértelmezetten a GRUB betöltő kerül telepítésre, "
+"<phrase arch=\"any-x86\">Alapértelmezetten a GRUB betöltő kerül telepítésre, "
 "éspedig az 1. merevlemez MBR részébe, mely általában jó választás. E "
 "lehetőség felülbírálható és a boot betöltő máshová is telepíthető. </phrase>"
 
diff --git a/po/ja/installation-howto.po b/po/ja/installation-howto.po
index 68f075916..6e58af959 100644
--- a/po/ja/installation-howto.po
+++ b/po/ja/installation-howto.po
@@ -142,13 +142,13 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Download whichever type you prefer and burn it to a CD. <phrase arch="
-"\"x86\">To boot the CD, you may need to change your BIOS configuration, as "
+"\"any-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 <xref linkend=\"boot-cd\"/> for other ways to boot from CD. </"
 "phrase>"
 msgstr ""
-"好みのタイプをダウンロードして、CD に焼いてください。<phrase arch=\"x86\">CD "
+"好みのタイプをダウンロードして、CD に焼いてください。<phrase arch=\"any-x86\">CD "
 "から起動するには、<xref linkend=\"bios-setup\"/> で説明しているように、BIOS "
 "設定を変更する必要があるかもしれません。</phrase> <phrase arch=\"powerpc\"> "
 "CD から PowerMac を起動するには、起動中ずっと <keycap>c</keycap> キーを押し続"
@@ -561,14 +561,14 @@ msgstr ""
 msgid ""
 "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=\"x86\">By default GRUB will be installed to the "
+"let you know. <phrase arch=\"any-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>"
 msgstr ""
 "最後の段階はブートローダをインストールすることです。コンピュータ上に他のオペ"
 "レーティングシステムを検出した場合は、インストーラがブートメニューにそれらを"
-"加えて知らせます。<phrase arch=\"x86\">GRUB は、デフォルトで第 1 ハードドライ"
+"加えて知らせます。<phrase arch=\"any-x86\">GRUB は、デフォルトで第 1 ハードドライ"
 "ブのマスターブートレコードにインストールされ、一般にそれは良い選択です。その"
 "選択を無効にして他の場所にインストールする機会が与えられます。</phrase>"
 
diff --git a/po/ko/installation-howto.po b/po/ko/installation-howto.po
index 37a9650a9..add94fc89 100644
--- a/po/ko/installation-howto.po
+++ b/po/ko/installation-howto.po
@@ -141,14 +141,14 @@ msgstr ""
 #: installation-howto.xml:78
 #, no-c-format
 msgid ""
-"Download whichever type you prefer and burn it to a CD. <phrase arch=\"x86"
+"Download whichever type you prefer and burn it to a CD. <phrase arch=\"any-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 <xref linkend=\"boot-cd\"/> for other ways to boot from CD. </"
 "phrase>"
 msgstr ""
-"마음에 드는 이미지를 다운로드하고 CD를 굽습니다. <phrase arch=\"x86\">CD로 부"
+"마음에 드는 이미지를 다운로드하고 CD를 굽습니다. <phrase arch=\"any-x86\">CD로 부"
 "팅하려면 <xref linkend=\"bios-setup\"/>에 설명한 대로 BIOS 설정을 바꿔야 할 "
 "수 있습니다.</phrase> <phrase arch=\"powerpc\"> 부팅할 때 <keycap>c</keycap> "
 "키를 누르면 CD에서 PowerMac을 부팅할 수 있습니다. 다른 방법으로 CD에서 부팅하"
@@ -543,13 +543,13 @@ msgstr ""
 msgid ""
 "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=\"x86\">By default GRUB will be installed to the "
+"let you know. <phrase arch=\"any-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>"
 msgstr ""
 "마지막 단계는 부트로더 설치입니다. 컴퓨터에서 다른 운영체제를 찾으면, 그 운영"
-"체제를 부팅 메뉴에 추가하고 알려줍니다. <phrase arch=\"x86\">첫번째 하드디스"
+"체제를 부팅 메뉴에 추가하고 알려줍니다. <phrase arch=\"any-x86\">첫번째 하드디스"
 "크의 마스터 부트 레코드에 (대부분 이 위치에 설치하면 맞습니다) GRUB을 설치합"
 "니다. 기본 설정을 바꾸거나 다른 위치에 설치할 수도 있습니다. </phrase>"
 
diff --git a/po/pt/installation-howto.po b/po/pt/installation-howto.po
index c364d4cd9..4dc9a9b3e 100644
--- a/po/pt/installation-howto.po
+++ b/po/pt/installation-howto.po
@@ -144,14 +144,14 @@ msgstr ""
 #: installation-howto.xml:78
 #, no-c-format
 msgid ""
-"Download whichever type you prefer and burn it to a CD. <phrase arch=\"x86"
+"Download whichever type you prefer and burn it to a CD. <phrase arch=\"any-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 <xref linkend=\"boot-cd\"/> for other ways to boot from CD. </"
 "phrase>"
 msgstr ""
-"Faça o download do tipo que preferir e grave para um CD. <phrase arch=\"x86"
+"Faça o download do tipo que preferir e grave para um CD. <phrase arch=\"any-x86"
 "\">Para arrancar a partir de CD, poderá ter de alterar a configuração da sua "
 "BIOS, como é explicado na <xref linkend=\"bios-setup\"/>.</phrase> <phrase "
 "arch=\"powerpc\"> Para arrancar um PowerMac a partir de CD, pressione a "
@@ -573,14 +573,14 @@ msgstr ""
 msgid ""
 "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=\"x86\">By default GRUB will be installed to the "
+"let you know. <phrase arch=\"any-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>"
 msgstr ""
 "A última etapa é instalar o gestor de arranque. Se o instalador detectar "
 "outros sistemas operativos no seu computador, irá adicioná-los ao menu do "
-"gestor e notificá-lo-á do acrescento. <phrase arch=\"x86\">Por omissão o "
+"gestor e notificá-lo-á do acrescento. <phrase arch=\"any-x86\">Por omissão o "
 "GRUB será instalado no master boot record do seu primeiro disco rígido, que "
 "por norma é uma boa escolha. Ser-lhe-á dada a oportunidade para alterar essa "
 "opção e instalar noutro sítio. </phrase>"
diff --git a/po/ru/installation-howto.po b/po/ru/installation-howto.po
index 1dc69a82c..9005d866a 100644
--- a/po/ru/installation-howto.po
+++ b/po/ru/installation-howto.po
@@ -142,7 +142,7 @@ msgstr ""
 #: installation-howto.xml:78
 #, no-c-format
 msgid ""
-"Download whichever type you prefer and burn it to a CD. <phrase arch=\"x86"
+"Download whichever type you prefer and burn it to a CD. <phrase arch=\"any-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 "
@@ -150,7 +150,7 @@ msgid ""
 "phrase>"
 msgstr ""
 "Загрузите любой понравившийся вам тип образа и запишите его на CD. <phrase "
-"arch=\"x86\"> Чтобы загрузиться с CD, вам может понадобиться изменить "
+"arch=\"any-x86\"> Чтобы загрузиться с CD, вам может понадобиться изменить "
 "конфигурацию BIOS. <xref linkend=\"bios-setup\"/> описывает, как это сделать."
 "</phrase><phrase arch=\"powerpc\"> Для загрузки с CD на PowerMac, нажмите "
 "клавишу <keycap>c</keycap> во время загрузки. <xref linkend=\"boot-cd\"/> "
@@ -564,14 +564,14 @@ msgstr ""
 msgid ""
 "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=\"x86\">By default GRUB will be installed to the "
+"let you know. <phrase arch=\"any-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>"
 msgstr ""
 "На последнем шаге устанавливается системный загрузчик. Если программа "
 "установки обнаружит другую операционную систему на компьютере, то добавит её "
-"в меню загрузки и скажет вам об этом. <phrase arch=\"x86\">По умолчанию в "
+"в меню загрузки и скажет вам об этом. <phrase arch=\"any-x86\">По умолчанию в "
 "главную загрузочную запись первого жёсткого диска устанавливается GRUB, что "
 "обычно и нужно. Вам будет предоставлена возможность изменения и установки "
 "его в другое место. </phrase>"
diff --git a/po/sv/installation-howto.po b/po/sv/installation-howto.po
index 5197bb187..55c926d61 100644
--- a/po/sv/installation-howto.po
+++ b/po/sv/installation-howto.po
@@ -141,14 +141,14 @@ msgstr ""
 #: installation-howto.xml:78
 #, no-c-format
 msgid ""
-"Download whichever type you prefer and burn it to a CD. <phrase arch=\"x86"
+"Download whichever type you prefer and burn it to a CD. <phrase arch=\"any-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 <xref linkend=\"boot-cd\"/> for other ways to boot from CD. </"
 "phrase>"
 msgstr ""
-"Hämta den typ du föredrar och bränn den till en cd-skiva. <phrase arch=\"x86"
+"Hämta den typ du föredrar och bränn den till en cd-skiva. <phrase arch=\"any-x86"
 "\">För att starta cd-skivan kanske du behöver att ändra din BIOS-"
 "konfiguration som förklaras i <xref linkend=\"bios-setup\"/>.</phrase> "
 "<phrase arch=\"powerpc\"> För att starta en PowerMac från cd-skiva, tryck "
@@ -565,7 +565,7 @@ msgstr ""
 msgid ""
 "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=\"x86\">By default GRUB will be installed to the "
+"let you know. <phrase arch=\"any-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>"
@@ -573,7 +573,7 @@ msgstr ""
 "Det sista steget är att installera en starthanterare. Om "
 "installationsprogrammet identifierar andra operativsystem på din dator "
 "kommer den att lägga till de i uppstartsmenyn och informera dig. <phrase "
-"arch=\"x86\">Som standard kommer GRUB att installeras på huvudstartsektorn "
+"arch=\"any-x86\">Som standard kommer GRUB att installeras på huvudstartsektorn "
 "(MBR) på första hårddisken som normalt sett är ett bra val. Du kommer att "
 "ges möjligheten att åsidosätta det valet och installera den någon "
 "annanstans. </phrase>"
diff --git a/po/vi/installation-howto.po b/po/vi/installation-howto.po
index bd840e2ea..0c605cc0b 100644
--- a/po/vi/installation-howto.po
+++ b/po/vi/installation-howto.po
@@ -140,7 +140,7 @@ msgstr ""
 #: installation-howto.xml:78
 #, no-c-format
 msgid ""
-"Download whichever type you prefer and burn it to a CD. <phrase arch=\"x86"
+"Download whichever type you prefer and burn it to a CD. <phrase arch=\"any-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 "
@@ -148,7 +148,7 @@ msgid ""
 "phrase>"
 msgstr ""
 "Hãy tải về kiểu nào bạn thích, và chép ra nó vào một đĩa CD. <phrase arch="
-"\"x86\">Để khởi động đĩa CD này, bạn có thể cần phải thay đổi cấu hình BIOS, "
+"\"any-x86\">Để khởi động đĩa CD này, bạn có thể cần phải thay đổi cấu hình BIOS, "
 "như được diễn tả trong <xref linkend=\"bios-setup\"/>.</phrase> <phrase arch="
 "\"powerpc\"> Để khởi động máy kiểu PowerMac từ đĩa CD, hãy bấm phím "
 "<keycap>c</keycap> trong khi khởi động. Xem <xref linkend=\"boot-cd\"/> để "
@@ -561,14 +561,14 @@ msgstr ""
 msgid ""
 "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=\"x86\">By default GRUB will be installed to the "
+"let you know. <phrase arch=\"any-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>"
 msgstr ""
 "Bước cuối cùng là cài đặt một bộ nạp khởi động (boot loader). Nếu trình cài "
 "đặt phát hiện hệ điều hành khác nằm trên máy tính của bạn, nó sẽ thêm mỗi "
-"HĐH vào trình đơn khởi động, cũng cho bạn biết như thế. <phrase arch=\"x86"
+"HĐH vào trình đơn khởi động, cũng cho bạn biết như thế. <phrase arch=\"any-x86"
 "\">Mặc định là GRUB sẽ được cài đặt vào mục ghi khởi động chủ của đĩa cứng "
 "thứ nhất, mà thường là sự chọn tốt. Bạn sẽ có dịp bỏ qua sự chọn đó và cài "
 "đặt GRUB vào nơi khác. </phrase>"
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index f5591b162..78d8554cb 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.po
@@ -130,14 +130,14 @@ msgstr ""
 #: installation-howto.xml:78
 #, no-c-format
 msgid ""
-"Download whichever type you prefer and burn it to a CD. <phrase arch=\"x86"
+"Download whichever type you prefer and burn it to a CD. <phrase arch=\"any-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 <xref linkend=\"boot-cd\"/> for other ways to boot from CD. </"
 "phrase>"
 msgstr ""
-"下载您打算使用的映像文件，把它刻成光盘。<phrase arch=\"x86\">若要从光盘启动，"
+"下载您打算使用的映像文件，把它刻成光盘。<phrase arch=\"any-x86\">若要从光盘启动，"
 "可能要根据 <xref linkend=\"bios-setup\"/> 的提示，修改 BIOS 设置。</phrase> "
 "<phrase arch=\"powerpc\"> 若要从光盘启动 PowerMac，可以在它启动时按住 "
 "<keycap>c</keycap> 键不放。参阅 <xref linkend=\"boot-cd\"/> 了解其他启动 CD "
@@ -524,13 +524,13 @@ msgstr ""
 msgid ""
 "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=\"x86\">By default GRUB will be installed to the "
+"let you know. <phrase arch=\"any-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>"
 msgstr ""
 "最后一步就是安装 boot loader 了。如果安装程序发现您的计算机还安装有其它的操作"
-"系统，它会把它们加入启动菜单，并通知您。<phrase arch=\"x86\">缺省情况下，"
+"系统，它会把它们加入启动菜单，并通知您。<phrase arch=\"any-x86\">缺省情况下，"
 "GRUB 将安装到第一块硬盘的引导记录上。一般来说，这样做没什么问题。您也可以不让"
 "它这样做，而是把 GRUB 装在其它什么地方。</phrase>"
 
diff --git a/po/zh_TW/installation-howto.po b/po/zh_TW/installation-howto.po
index e33c13aa6..0f0dfcb27 100644
--- a/po/zh_TW/installation-howto.po
+++ b/po/zh_TW/installation-howto.po
@@ -129,14 +129,14 @@ msgstr ""
 #: installation-howto.xml:78
 #, fuzzy, no-c-format
 msgid ""
-"Download whichever type you prefer and burn it to a CD. <phrase arch=\"x86"
+"Download whichever type you prefer and burn it to a CD. <phrase arch=\"any-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 <xref linkend=\"boot-cd\"/> for other ways to boot from CD. </"
 "phrase>"
 msgstr ""
-"您想用哪種辦法安裝，就下載相對應的映像檔，再燒成光碟。<phrase arch=\"i386\"> "
+"您想用哪種辦法安裝，就下載相對應的映像檔，再燒成光碟。<phrase arch=\"any-x86\"> "
 "若要利用光碟進行開機動作，得先修改 BIOS 設定，方法參照 <xref linkend=\"bios-"
 "setup\"/>。</phrase> <phrase arch=\"powerpc\"> 若要利用光碟啟動 PowerMac ，在"
 "開機時按著 <keycap>c</keycap> 鍵不放。其他使用光碟開機的方法請參閱 <xref "
@@ -518,13 +518,13 @@ msgstr ""
 msgid ""
 "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=\"x86\">By default GRUB will be installed to the "
+"let you know. <phrase arch=\"any-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>"
 msgstr ""
 "最後一步就是安裝 boot loader 了。如果安裝程式發現您的電腦還安裝有其它作業系"
-"統，它會把它們加入開機選單並通知您。<phrase arch=\"i386\">預設狀況下會把 "
+"統，它會把它們加入開機選單並通知您。<phrase arch=\"any-x86\">預設狀況下會把 "
 "GRUB 安裝到第一塊硬碟的開機記錄上，一般來說，這是一個不錯的方法。當然您也可以"
 "不讓它這樣做，而是把 GRUB 裝在其它地方。</phrase>"
 
diff --git a/pt_BR/boot-installer/x86.xml b/pt_BR/boot-installer/x86.xml
index 76f41463c..23353d435 100644
--- a/pt_BR/boot-installer/x86.xml
+++ b/pt_BR/boot-installer/x86.xml
@@ -222,7 +222,7 @@ De agora em diante, não deverá existir diferenças entre o
 </para>
   </sect2>
 
-  <sect2 arch="x86" condition="bootable-usb" id="usb-boot">
+  <sect2 arch="any-x86" condition="bootable-usb" id="usb-boot">
   <title>Inicialização através de <quote>memory stick</quote> USB</title>
 <para>
 
diff --git a/pt_BR/howto/installation-howto.xml b/pt_BR/howto/installation-howto.xml
index 487aa8b24..e81d36516 100644
--- a/pt_BR/howto/installation-howto.xml
+++ b/pt_BR/howto/installation-howto.xml
@@ -84,7 +84,7 @@ CD do conjunto.
 </para><para>
 
 Baixe o tipo de imagem que deseja e grave-a para um CD.
-<phrase arch="x86">Para inicializar através do CD, você precisará
+<phrase arch="any-x86">Para inicializar através do CD, você precisará
 alterar a configuração de sua BIOS como explicado em <xref linkend="bios-setup" />.</phrase>
 <phrase arch="powerpc">
 Par inicializar no PowerMac através do CD, pressione <keycap>c</keycap>
@@ -166,7 +166,7 @@ Existem outros métodos mais flexíveis de configurar uma memory stick para
 ser usada pelo debian-installer, sendo possível trabalhar com memory sticks
 pequenas. Para detalhes, veja <xref linkend="boot-usb-files" />.
 
-</para><para arch="x86">
+</para><para arch="any-x86">
 
 Alguns tipos de BIOS não podem inicializar diretamente de dispositivos USB.
 Você pode precisar configurar sua BIOS para inicializar através de um
@@ -206,7 +206,7 @@ Para instruções detalhadas, veja <xref linkend="install-tftp" />.
 </para>
   </sect2>
 
-  <sect2 id="howto-getting-images-hard-disk">
+  <sect2 arch="linux-any" id="howto-getting-images-hard-disk">
   <title>Inicializando através do disco rígido</title>
 <para>
 
@@ -320,7 +320,7 @@ uma conta de usuário comum.
 O último passo é instalar um gerenciador de inicialização. Caso o programa
 de instalação detectar outro sistema operacional em seu computador, ele
 o adicionará no menu de inicialização e lhe informará isto.
-<phrase arch="x86">Por padrão, o GRUB será instalado no registro mestre de
+<phrase arch="any-x86">Por padrão, o GRUB será instalado no registro mestre de
 inicialização de seu primeiro disco rígido, que é uma boa escolha. Você será
 capaz de alterar aquela escolha e instalá-lo em qualquer outro lugar.
 </phrase>