11 files changed, 51 insertions, 51 deletions
diff --git a/en/hardware/buying-hardware.xml b/en/hardware/buying-hardware.xml
index f2547cf6d..4995508a1 100644
--- a/en/hardware/buying-hardware.xml
+++ b/en/hardware/buying-hardware.xml
@@ -5,7 +5,7 @@
 
 <para arch="linux-any">
 
-There are several vendors, who ship systems with Debian or other
+There are several vendors, who ship systems with &debian; or other
 distributions of GNU/Linux
 <ulink url="&url-pre-installed;">pre-installed</ulink>. You might pay more
 for the privilege, but it does buy a level of peace of mind, since you can
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index 7ead9f639..717ae8ec2 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -5,11 +5,11 @@
  <title>Supported Hardware</title>
 <para>
 
-Debian does not impose hardware requirements beyond the requirements
+&debian; does not impose hardware requirements beyond the requirements
 of the Linux or kFreeBSD kernel and the GNU tool-sets.  Therefore, any
 architecture or platform to which the Linux or kFreeBSD kernel, libc,
-<command>gcc</command>, etc. have been ported, and for which a Debian
-port exists, can run Debian. Please refer to the Ports pages at
+<command>gcc</command>, etc. have been ported, and for which a &debian;
+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-gnu;.
@@ -26,7 +26,7 @@ information can be found.
   <sect2><title>Supported Architectures</title>
 <para>
 
-Debian GNU/Linux &release; supports eleven major architectures and several
+&debian; GNU/Linux &release; supports eleven major architectures and several
 variations of each architecture known as <quote>flavors</quote>.
 
 </para><para>
@@ -35,7 +35,7 @@ variations of each architecture known as <quote>flavors</quote>.
 <tgroup cols="4">
 <thead>
 <row>
-  <entry>Architecture</entry><entry>Debian Designation</entry>
+  <entry>Architecture</entry><entry>&debian; Designation</entry>
   <entry>Subarchitecture</entry><entry>Flavor</entry>
 </row>
 </thead>
@@ -153,7 +153,7 @@ variations of each architecture known as <quote>flavors</quote>.
 
 </para><para>
 
-Debian GNU/kFreeBSD &release; supports two architectures.
+&debian; GNU/kFreeBSD &release; supports two architectures.
 
 </para><para>
 
@@ -161,7 +161,7 @@ Debian GNU/kFreeBSD &release; supports two architectures.
 <tgroup cols="2">
 <thead>
 <row>
-  <entry>Architecture</entry><entry>Debian Designation</entry>
+  <entry>Architecture</entry><entry>&debian; Designation</entry>
 </row>
 </thead>
 
@@ -183,9 +183,9 @@ Debian GNU/kFreeBSD &release; supports two architectures.
 This document covers installation for the <emphasis>&arch-title;</emphasis>
 architecture using the <emphasis>&arch-kernel;</emphasis> kernel.
 If you are looking
-for information on any of the other Debian-supported architectures
+for information on any of the other &debian;-supported architectures
 take a look at the
-<ulink url="http://www.debian.org/ports/">Debian-Ports</ulink> pages.
+<ulink url="http://www.debian.org/ports/">&debian;-Ports</ulink> pages.
 
 </para>
 <caution arch="ia64"><para>
@@ -244,7 +244,7 @@ with GNU/Linux, see for example the
 <para>
 
 Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</quote>
-or SMP &mdash; is available for this architecture.  The standard Debian
+or SMP &mdash; is available for this architecture.  The standard &debian;
 &release; kernel image has been compiled with SMP support.  The standard
 kernel is also usable on non-SMP systems, but has a slight overhead which
 will cause a small reduction in performance. For normal system use this
@@ -253,7 +253,7 @@ will hardly be noticable.
 </para><para>
 
 In order to optimize the kernel for single CPU systems, you'll have to
-replace the standard Debian kernel.<phrase arch="linux-any">  You can find a discussion of how
+replace the standard &debian; kernel.<phrase arch="linux-any">  You can find a discussion of how
 to do this in <xref linkend="kernel-baking"/>.  At this time
 (kernel version &kernelversion;) the way you disable SMP is to deselect
 <quote>&smp-config-option;</quote> in the <quote>&smp-config-section;</quote>
@@ -269,14 +269,14 @@ section of the kernel config.</phrase>
 
 Multiprocessor support &mdash; also called <quote>symmetric
 multiprocessing</quote> or SMP &mdash; is available for this architecture.
-The standard Debian &release; kernel image has been compiled with
+The standard &debian; &release; kernel image has been compiled with
 <firstterm>SMP-alternatives</firstterm> support. This means that the kernel
 will detect the number of processors (or processor cores) and will
 automatically deactivate SMP on uniprocessor systems.
 
 </para><para arch="i386">
 
-The 486 flavour of the Debian kernel image packages for &arch-title;
+The 486 flavour of the &debian; kernel image packages for &arch-title;
 is not compiled with SMP support.
 
 </para>
@@ -288,7 +288,7 @@ is not compiled with SMP support.
 
 Multiprocessor support &mdash; also called <quote>symmetric
 multiprocessing</quote> or SMP &mdash; is available for this architecture.
-However, the standard Debian &release; kernel image does not support
+However, the standard &debian; &release; kernel image does not support
 SMP.  This should not prevent installation, since the standard,
 non-SMP kernel should boot on SMP systems; the kernel will simply use
 the first CPU.
@@ -296,7 +296,7 @@ the first CPU.
 </para><para>
 
 In order to take advantage of multiple processors, you'll have to
-replace the standard Debian kernel.<phrase arch="linux-any">  You can find a discussion of how
+replace the standard &debian; kernel.<phrase arch="linux-any">  You can find a discussion of how
 to do this in <xref linkend="kernel-baking"/>.  At this time
 (kernel version &kernelversion;) the way you enable SMP is to select
 <quote>&smp-config-option;</quote> in the <quote>&smp-config-section;</quote>
@@ -311,7 +311,7 @@ section of the kernel config.</phrase>
 
 Multiprocessor support &mdash; also called <quote>symmetric
 multiprocessing</quote> or SMP &mdash; is available for this architecture,
-and is supported by a precompiled Debian kernel image. Depending on your
+and is supported by a precompiled &debian; kernel image. Depending on your
 install media, this SMP-capable kernel may or may not be installed by
 default. This should not prevent installation, since the standard,
 non-SMP kernel should boot on SMP systems; the kernel will simply use
@@ -345,11 +345,11 @@ during the installation process described in this document.
 
 </para><para>
 
-Debian's support for graphical interfaces is determined by the
+&debian;'s support for graphical interfaces is determined by the
 underlying support found in X.Org's X11 system.  Most AGP, PCI and
 PCIe video cards work under X.Org.  Details on supported graphics
 buses, cards, monitors, and pointing devices can be found at
-<ulink url="&url-xorg;"></ulink>.  Debian &release; ships
+<ulink url="&url-xorg;"></ulink>.  &debian; &release; ships
 with X.Org version &x11ver;.
 
 </para><para arch="mips">
diff --git a/en/hardware/hardware.xml b/en/hardware/hardware.xml
index 642ae48f7..caca5d8e4 100644
--- a/en/hardware/hardware.xml
+++ b/en/hardware/hardware.xml
@@ -7,7 +7,7 @@
 <para>
 
 This section contains information about what hardware you need to get
-started with Debian.  You will also find links to further information
+started with &debian;.  You will also find links to further information
 about hardware supported by GNU and &arch-kernel;.
 
 </para>
diff --git a/en/hardware/installation-media.xml b/en/hardware/installation-media.xml
index e289ceb6c..fc8a8ff56 100644
--- a/en/hardware/installation-media.xml
+++ b/en/hardware/installation-media.xml
@@ -7,8 +7,8 @@
 <para>
 
 This section will help you determine which different media types you can use to
-install Debian. For example, if you have a floppy disk drive on your machine,
-it can be used to install Debian. There is a whole chapter devoted to media,
+install &debian;. For example, if you have a floppy disk drive on your machine,
+it can be used to install &debian;. There is a whole chapter devoted to media,
 <xref linkend="install-methods"/>, which lists the advantages and
 disadvantages of each media type. You may want to refer back to this page once
 you reach that section.
@@ -99,7 +99,7 @@ Although the &arch-title; does not allow booting from SunOS
 
 <para>
 
-Many Debian boxes need their floppy and/or CD-ROM drives only for
+Many &debian; boxes need their floppy and/or CD-ROM drives only for
 setting up the system and for rescue purposes. If you operate some
 servers, you will probably already have thought about omitting those
 drives and using an USB memory stick for installing and (when
@@ -153,17 +153,17 @@ linkend="linux-upgrade"/>.
 
 <para>
 
-The Debian boot disks contain a kernel which is built to maximize the
+The &debian; boot disks contain a kernel which is built to maximize the
 number of systems it runs on.  Unfortunately, this makes for a larger
 kernel, which includes many drivers that won't be used for your
 machine<phrase arch="linux-any"> (see <xref linkend="kernel-baking"/> to learn how to
 build your own kernel)</phrase>.  Support for the widest possible range of
-devices is desirable in general, to ensure that Debian can be
+devices is desirable in general, to ensure that &debian; can be
 installed on the widest array of hardware.
 
 </para><para arch="x86">
 
-Generally, the Debian installation system includes support for floppies,
+Generally, the &debian; installation system includes support for floppies,
 IDE (also known as PATA) drives, IDE floppies, parallel port IDE devices, SATA
 and SCSI controllers and drives, USB, and FireWire.  The supported file systems
 include FAT, Win-32 FAT extensions (VFAT) and NTFS.
diff --git a/en/hardware/network-cards.xml b/en/hardware/network-cards.xml
index 9825bb343..802019393 100644
--- a/en/hardware/network-cards.xml
+++ b/en/hardware/network-cards.xml
@@ -118,7 +118,7 @@ your network manually.
 
 </para><para>
 
-In some cases the driver you need may not be available as a Debian package.
+In some cases the driver you need may not be available as a &debian; package.
 You will then have to look if there is source code available in the internet
 and compile the driver yourself. How to do this is outside the scope of this
 manual.
diff --git a/en/hardware/supported/arm.xml b/en/hardware/supported/arm.xml
index 73f0a4e40..b0186bb03 100644
--- a/en/hardware/supported/arm.xml
+++ b/en/hardware/supported/arm.xml
@@ -7,8 +7,8 @@
 <para>
 
 Each distinct ARM architecture requires its own kernel. Because of
-this the standard Debian distribution only supports installation on
-a number of the most common platforms. The Debian userland however may be
+this the standard &debian; distribution only supports installation on
+a number of the most common platforms. The &debian; userland however may be
 used by <emphasis>any</emphasis> ARM CPU.
 
 </para>
@@ -17,7 +17,7 @@ used by <emphasis>any</emphasis> ARM CPU.
 
 Most ARM CPUs may be run in either endian mode (big or little). However,
 the majority of current system implementation uses little-endian mode.
-Debian currently only supports little-endian ARM systems.
+&debian; currently only supports little-endian ARM systems.
 
 </para>
 
@@ -32,9 +32,9 @@ The supported platforms are:
 <listitem><para>
 
 Intel's I/O Processor (IOP) line is found in a number of products related
-to data storage and processing.  Debian currently supports the IOP32x
+to data storage and processing.  &debian; currently supports the IOP32x
 platform, featuring the IOP 80219 and 32x chips commonly found in Network
-Attached Storage (NAS) devices.  Debian explicitly supports two such
+Attached Storage (NAS) devices.  &debian; explicitly supports two such
 devices: the <ulink url="&url-arm-cyrius-glantank;">GLAN Tank</ulink> from
 IO-Data and the <ulink url="&url-arm-cyrius-n2100;">Thecus N2100</ulink>.
 
@@ -93,7 +93,7 @@ TS-409).
 <listitem><para>
 
 The Versatile platform is emulated by QEMU and is therefore a nice way to
-test and run Debian on ARM if you don't have the hardware.
+test and run &debian; on ARM if you don't have the hardware.
 
 </para></listitem>
 </varlistentry>
diff --git a/en/hardware/supported/i386.xml b/en/hardware/supported/i386.xml
index db1f26355..b66536d76 100644
--- a/en/hardware/supported/i386.xml
+++ b/en/hardware/supported/i386.xml
@@ -21,16 +21,16 @@ processors like the Athlon XP and Intel P4 Xeon.
 
 </para><para>
 
-However, Debian GNU/Linux &releasename; will <emphasis>not</emphasis> run
+However, &debian; GNU/Linux &releasename; will <emphasis>not</emphasis> run
 on 386 or earlier processors.  Despite the architecture name "i386", support
 for actual 80386 processors (and their clones) was dropped with the Sarge
-(r3.1) release of Debian<footnote>
+(r3.1) release of &debian;<footnote>
 
 <para>
 We have long tried to avoid this, but in the end it was necessary due a
 unfortunate series of issues with the compiler and the kernel, starting
 with an bug in the C++ ABI provided by GCC.  You should still be able to
-run Debian GNU/Linux on actual 80386 processors if you compile your own
+run &debian; GNU/Linux on actual 80386 processors if you compile your own
 kernel and compile all packages from source, but that is beyond the
 scope of this manual.
 </para>
@@ -41,11 +41,11 @@ supported<footnote>
 
 <para>
 
-Many Debian packages will actually run slightly faster on modern computers
+Many &debian; packages will actually run slightly faster on modern computers
 as a positive side effect of dropping support for these old chips.  The
 i486, introduced in 1989, has three opcodes (bswap, cmpxchg, and xadd)
 which the i386, introduced in 1986, did not have. Previously, these could not
-be easily used by most Debian packages; now they can.
+be easily used by most &debian; packages; now they can.
 
 </para>
 
diff --git a/en/hardware/supported/mips.xml b/en/hardware/supported/mips.xml
index fecec2d54..eba14c64f 100644
--- a/en/hardware/supported/mips.xml
+++ b/en/hardware/supported/mips.xml
@@ -5,7 +5,7 @@
   <sect2 arch="mips"><title>CPU, Main Boards, and Video Support</title>
 <para>
 
-Debian on &arch-title; supports the following platforms:
+&debian; on &arch-title; supports the following platforms:
 
 <itemizedlist>
 <listitem><para>
@@ -23,14 +23,14 @@ SGI IP32: this platform is generally known as SGI O2.
 <listitem><para>
 
 MIPS Malta: this platform is emulated by QEMU and is therefore a nice way
-to test and run Debian on MIPS if you don't have the hardware.
+to test and run &debian; on MIPS if you don't have the hardware.
 
 </para></listitem>
 </itemizedlist>
 
 Complete information regarding supported mips/mipsel machines can be found
 at the <ulink url="&url-linux-mips;">Linux-MIPS homepage</ulink>.  In the
-following, only the systems supported by the Debian installer will be
+following, only the systems supported by the &debian; installer will be
 covered.  If you are looking for support for other subarchitectures, please
 contact the <ulink url="&url-list-subscribe;">
 debian-&arch-listname; mailing list</ulink>.
@@ -41,7 +41,7 @@ debian-&arch-listname; mailing list</ulink>.
 <para>
 
 On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 and R5000
-processors are supported by the Debian installation system on big endian
+processors are supported by the &debian; installation system on big endian
 MIPS.  On SGI IP32, currently only systems based on the R5000 are supported.
 
 </para><para>
diff --git a/en/hardware/supported/mipsel.xml b/en/hardware/supported/mipsel.xml
index ac6d09ae4..a4c8a80a9 100644
--- a/en/hardware/supported/mipsel.xml
+++ b/en/hardware/supported/mipsel.xml
@@ -5,7 +5,7 @@
   <sect2 arch="mipsel"><title>CPU, Main Boards, and Video Support</title>
 <para>
 
-Debian on &arch-title; supports the following platforms:
+&debian; on &arch-title; supports the following platforms:
 
 <itemizedlist>
 <listitem><para>
@@ -17,14 +17,14 @@ includes the Cobalt RaQ, Qube2 and RaQ2, and the Gateway Microserver.
 <listitem><para>
 
 MIPS Malta: this platform is emulated by QEMU and is therefore a nice way
-to test and run Debian on MIPS if you don't have the hardware.
+to test and run &debian; on MIPS if you don't have the hardware.
 
 </para></listitem>
 </itemizedlist>
 
 Complete information regarding supported mips/mipsel machines can be found
 at the <ulink url="&url-linux-mips;">Linux-MIPS homepage</ulink>.  In the
-following, only the systems supported by the Debian installer will be
+following, only the systems supported by the &debian; installer will be
 covered.  If you are looking for support for other subarchitectures, please
 contact the <ulink url="&url-list-subscribe;">
 debian-&arch-listname; mailing list</ulink>.
diff --git a/en/hardware/supported/powerpc.xml b/en/hardware/supported/powerpc.xml
index 5d57c6992..e2cbf28c8 100644
--- a/en/hardware/supported/powerpc.xml
+++ b/en/hardware/supported/powerpc.xml
@@ -19,7 +19,7 @@ supporting different CPU variants.
 
 Ports to other <emphasis>&architecture;</emphasis> architectures, such
 as the Be-Box and MBX architecture, are underway but not yet supported
-by Debian. We may have a 64-bit port in the future.
+by &debian;. We may have a 64-bit port in the future.
 -->
 
 </para>
@@ -28,7 +28,7 @@ by Debian. We may have a 64-bit port in the future.
 
 <para>
 
-There are two flavours of the powerpc kernel in Debian, based on the
+There are two flavours of the powerpc kernel in &debian;, based on the
 CPU type:
 
 <variablelist>
@@ -101,7 +101,7 @@ currently disabled.
 Apple (and briefly a few other manufacturers &mdash; Power Computing, for
 example) made a series of Macintosh computers based on the PowerPC
 processor. For purposes of architecture support, they are categorized
-as NuBus (not supported by Debian), OldWorld, and NewWorld.
+as NuBus (not supported by &debian;), OldWorld, and NewWorld.
 
 </para><para>
 
@@ -362,10 +362,10 @@ and, for older hardware,
 
 <para>
 
-NuBus systems are not currently supported by Debian/powerpc. The
+NuBus systems are not currently supported by &debian;/powerpc. The
 monolithic Linux/PPC kernel architecture does not have support for
 these machines; instead, one must use the MkLinux Mach microkernel,
-which Debian does not yet support. These include the following:
+which &debian; does not yet support. These include the following:
 
 <itemizedlist>
 <listitem><para>
diff --git a/en/hardware/supported/sparc.xml b/en/hardware/supported/sparc.xml
index 196b4a1dc..a8261e45f 100644
--- a/en/hardware/supported/sparc.xml
+++ b/en/hardware/supported/sparc.xml
@@ -25,7 +25,7 @@ SPARCstation page</ulink>.
 
 </para><para>
 
-The last Debian release to support sparc32 was Etch, but even then only
+The last &debian; release to support sparc32 was Etch, but even then only
 for sun4m systems. Support for the other 32-bits subarchitectures had
 already been discontinued after earlier releases.