5 files changed, 17 insertions, 17 deletions
diff --git a/nl/hardware/buying-hardware.xml b/nl/hardware/buying-hardware.xml
index 710163ad9..b0a061db1 100644
--- a/nl/hardware/buying-hardware.xml
+++ b/nl/hardware/buying-hardware.xml
@@ -1,9 +1,9 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- original version: 61133 untranslated -->
 
- <sect1 arch="not-s390"><title>Purchasing Hardware Specifically for GNU/Linux</title>
+ <sect1 arch="not-s390"><title>Purchasing Hardware Specifically for GNU/&arch-kernel;</title>
 
-<para>
+<para arch="linux-any">
 
 There are several vendors, who ship systems with Debian or other
 distributions of GNU/Linux
@@ -11,7 +11,7 @@ distributions of GNU/Linux
 for the privilege, but it does buy a level of peace of mind, since you can
 be sure that the hardware is well-supported by GNU/Linux.
 
-</para><para arch="x86">
+</para><para arch="any-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
@@ -21,11 +21,11 @@ information to help with that.
 
 </para><para>
 
-Whether or not you are purchasing a system with Linux bundled, or even
+Whether or not you are purchasing a system with &arch-kernel; bundled, or even
 a used system, it is still important to check that your hardware is
-supported by the Linux kernel.  Check if your hardware is listed in
+supported by the &arch-kernel; kernel.  Check if your hardware is listed in
 the references found above.  Let your salesperson (if any) know that
-you're shopping for a Linux system.  Support Linux-friendly hardware
+you're shopping for a &arch-kernel; system.  Support &arch-kernel;-friendly hardware
 vendors.
 
 </para>
@@ -36,12 +36,12 @@ vendors.
 Some hardware manufacturers simply won't tell us how to write drivers
 for their hardware. Others won't allow us access to the documentation
 without a non-disclosure agreement that would prevent us from
-releasing the Linux source code.
+releasing the &arch-kernel; source code.
 
 </para><para>
 
 Since we haven't been granted access to the documentation on these
-devices, they simply won't work under Linux. You can help by asking
+devices, they simply won't work under &arch-kernel;. You can help by asking
 the manufacturers of such hardware to release the documentation. If
 enough people ask, they will realize that the free software community
 is an important market.
@@ -50,7 +50,7 @@ is an important market.
 </sect2>
 
 
-  <sect2 arch="x86"><title>Windows-specific Hardware</title>
+  <sect2 arch="any-x86"><title>Windows-specific Hardware</title>
 <para>
 
 A disturbing trend is the proliferation of Windows-specific modems and
@@ -68,7 +68,7 @@ devices that retain their embedded intelligence.
 
 You should avoid Windows-specific hardware for two reasons. The first
 is that the manufacturers do not generally make the resources
-available to write a Linux driver. Generally, the hardware and
+available to write a &arch-kernel; driver. Generally, the hardware and
 software interface to the device is proprietary, and documentation is
 not available without a non-disclosure agreement, if it is available
 at all. This precludes it being used for free software, since free
@@ -78,7 +78,7 @@ processors removed, the operating system must perform the work of the
 embedded processors, often at <emphasis>real-time</emphasis> priority,
 and thus the CPU is not available to run your programs while it is
 driving these devices. Since the typical Windows user does not
-multi-process as intensively as a Linux user, the manufacturers hope
+multi-process as intensively as a &arch-kernel; user, the manufacturers hope
 that the Windows user simply won't notice the burden this hardware
 places on their CPU.  However, any multi-processing operating system,
 even Windows 2000 or XP, suffers from degraded performance when
diff --git a/nl/hardware/hardware-supported.xml b/nl/hardware/hardware-supported.xml
index 1aade2701..b6a45280e 100644
--- a/nl/hardware/hardware-supported.xml
+++ b/nl/hardware/hardware-supported.xml
@@ -12,7 +12,7 @@ architecture or platform to which the Linux kernel, libc,
 port exists, can run Debian. Please refer to the Ports pages at
 <ulink url="&url-ports;"></ulink> for
 more details on &arch-title; architecture systems which have been
-tested with Debian.
+tested with &debian;.
 
 </para><para>
 
diff --git a/nl/hardware/hardware.xml b/nl/hardware/hardware.xml
index 9eecf6792..54eda16ab 100644
--- a/nl/hardware/hardware.xml
+++ b/nl/hardware/hardware.xml
@@ -8,7 +8,7 @@
 
 This section contains information about what hardware you need to get
 started with Debian.  You will also find links to further information
-about hardware supported by GNU and Linux.
+about hardware supported by GNU and &arch-kernel;.
 
 </para>
 
diff --git a/nl/hardware/network-cards.xml b/nl/hardware/network-cards.xml
index 8f6528051..9b3667f0e 100644
--- a/nl/hardware/network-cards.xml
+++ b/nl/hardware/network-cards.xml
@@ -5,7 +5,7 @@
  <title>Network Connectivity Hardware</title>
 <para>
 
-Almost any network interface card (NIC) supported by the Linux kernel
+Almost any network interface card (NIC) supported by the &arch-kernel; kernel
 should also be supported by the installation system; modular drivers
 should normally be loaded automatically.
 
@@ -90,14 +90,14 @@ ISDN is supported, but not during the installation.
 <para>
 
 Wireless networking is in general supported as well and a growing number of
-wireless adapters are supported by the official Linux kernel, although many
+wireless adapters are supported by the official &arch-kernel; kernel, although many
 of them do require firmware to be loaded. If firmware is needed, the installer
 will prompt you to load firmware. See <xref linkend="loading-firmware"/>
 for detailed information on how to load firmware during the installation.
 
 </para><para>
 
-Wireless NICs that are not supported by the official Linux kernel can generally
+Wireless NICs that are not supported by the official &arch-kernel; kernel can generally
 be made to work under &debian;, but are not supported during the installation.
 
 </para><para>
diff --git a/nl/hardware/supported-peripherals.xml b/nl/hardware/supported-peripherals.xml
index 6c6da802e..799e12666 100644
--- a/nl/hardware/supported-peripherals.xml
+++ b/nl/hardware/supported-peripherals.xml
@@ -5,7 +5,7 @@
  <title>Peripherals and Other Hardware</title>
 <para arch="not-s390">
 
-Linux supports a large variety of hardware devices such as mice,
+&arch-kernel; 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.