Rename debian entity to debian-gnu.

41 files changed, 69 insertions, 69 deletions

diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml
index 8e7f47ca2..9cfe3874a 100644
--- a/en/appendix/chroot-install.xml
+++ b/en/appendix/chroot-install.xml
@@ -2,14 +2,14 @@
 <!-- $Id$ -->
 
  <sect1 id="linux-upgrade">
- <title>Installing &debian; from a Unix/Linux System</title>
+ <title>Installing &debian-gnu; from a Unix/Linux System</title>
 
 <para>
 
-This section explains how to install &debian; from an existing
+This section explains how to install &debian-gnu; from an existing
 Unix or Linux system, without using the menu-driven installer as
 explained in the rest of the manual. This <quote>cross-install</quote>
-HOWTO has been requested by users switching to &debian; from
+HOWTO has been requested by users switching to &debian-gnu; from
 Red Hat, Mandrake, and SUSE. In this section some familiarity with
 entering *nix commands and navigating the file system is assumed. In
 this section, <prompt>$</prompt> symbolizes a command to be entered in
@@ -20,7 +20,7 @@ command entered in the Debian chroot.
 
 Once you've got the new Debian system configured to your preference,
 you can migrate your existing user data (if any) to it, and keep on
-rolling. This is therefore a <quote>zero downtime</quote> &debian;
+rolling. This is therefore a <quote>zero downtime</quote> &debian-gnu;
 install. It's also a clever way for dealing with hardware that
 otherwise doesn't play friendly with various boot or installation
 media.
@@ -165,7 +165,7 @@ network-wise. Mirrors are listed at
 
 </para><para>
 
-If you have a &releasename; &debian; CD mounted at
+If you have a &releasename; &debian-gnu; CD mounted at
 <filename>/cdrom</filename>, you could substitute a file URL instead
 of the http URL: <userinput>file:/cdrom/debian/</userinput>
 
@@ -542,7 +542,7 @@ its installation that refer to it.
 <title>Set up the Boot Loader</title>
 <para>
 
-To make your &debian; system bootable, set up your boot loader to load
+To make your &debian-gnu; system bootable, set up your boot loader to load
 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.
diff --git a/en/appendix/plip.xml b/en/appendix/plip.xml
index 841087e20..d07909ee0 100644
--- a/en/appendix/plip.xml
+++ b/en/appendix/plip.xml
@@ -2,11 +2,11 @@
 <!-- $Id$ -->
 
  <sect1 id="plip" arch="x86">
- <title>Installing &debian; over Parallel Line IP (PLIP)</title>
+ <title>Installing &debian-gnu; over Parallel Line IP (PLIP)</title>
 
 <para>
 
-This section explains how to install &debian; on a computer without an
+This section explains how to install &debian-gnu; on a computer without an
 Ethernet card, but with just a remote gateway computer attached via
 a Null-Modem cable (also called Null-Printer cable). The gateway
 computer should be connected to a network that has a Debian mirror
diff --git a/en/appendix/pppoe.xml b/en/appendix/pppoe.xml
index 6043bf1db..a4610abbf 100644
--- a/en/appendix/pppoe.xml
+++ b/en/appendix/pppoe.xml
@@ -2,7 +2,7 @@
 <!-- $Id$ -->
 
  <sect1 id="pppoe" arch="not-s390">
- <title>Installing &debian; using PPP over Ethernet (PPPoE)</title>
+ <title>Installing &debian-gnu; using PPP over Ethernet (PPPoE)</title>
 
 <para>
 
diff --git a/en/bookinfo.xml b/en/bookinfo.xml
index 2ae2beb4e..b24167fe8 100644
--- a/en/bookinfo.xml
+++ b/en/bookinfo.xml
@@ -2,11 +2,11 @@
 <!-- $Id$ -->
 
 <bookinfo id="debian_installation_guide">
-<title>&debian; Installation Guide</title>
+<title>&debian-gnu; Installation Guide</title>
 
 <abstract>
 <para>
-This document contains installation instructions for the &debian;
+This document contains installation instructions for the &debian-gnu;
 &release; system (codename <quote>&releasename;</quote>),
 for the &arch-title; (<quote>&architecture;</quote>)
 architecture.  It also contains pointers to more information and
diff --git a/en/boot-installer/x86.xml b/en/boot-installer/x86.xml
index 272aca753..5bf8e052f 100644
--- a/en/boot-installer/x86.xml
+++ b/en/boot-installer/x86.xml
@@ -90,7 +90,7 @@ memory stick, you can run it manually by accessing the device and executing
 </para><para>
 
 After the program has been started, a few preliminary questions will be
-asked and the system will be prepared to start the &debian; installer.
+asked and the system will be prepared to start the &debian-gnu; installer.
 
 </para>
   </sect2>
diff --git a/en/boot-new/boot-new.xml b/en/boot-new/boot-new.xml
index cb16d2fcc..8f5596708 100644
--- a/en/boot-new/boot-new.xml
+++ b/en/boot-new/boot-new.xml
@@ -98,7 +98,7 @@ e.g. <userinput>/dev/hda8</userinput>.
 
 On G4 machines and iBooks, you can hold down the
 <keycap>option</keycap> key and get a graphical screen with a button
-for each bootable OS, &debian; will be a button with a small penguin
+for each bootable OS, &debian-gnu; will be a button with a small penguin
 icon.
 
 </para><para>
@@ -118,15 +118,15 @@ displayed if you press the <keycap>Tab</keycap> key at the
 </para><para>
 
 Resetting OpenFirmware on G3 or G4 hardware will cause it to boot
-&debian; by default (if you correctly partitioned and placed the
-Apple_Bootstrap partition first).  If you have &debian; on a SCSI disk
+&debian-gnu; by default (if you correctly partitioned and placed the
+Apple_Bootstrap partition first).  If you have &debian-gnu; on a SCSI disk
 and MacOS on an IDE disk this may not work and you will have to enter
 OpenFirmware and set the <envar>boot-device</envar> variable,
 <command>ybin</command> normally does this automatically.
 
 </para><para>
 
-After you boot &debian; for the first time you can add any additional
+After you boot &debian-gnu; for the first time you can add any additional
 options you desire (such as dual boot options) to
 <filename>/etc/yaboot.conf</filename> and run <command>ybin</command>
 to update your boot partition with the changed configuration.  Please
diff --git a/en/hardware/accessibility.xml b/en/hardware/accessibility.xml
index dedd68d41..ee44e9202 100644
--- a/en/hardware/accessibility.xml
+++ b/en/hardware/accessibility.xml
@@ -10,7 +10,7 @@ found in <classname>brltty</classname>. Most displays work under
 <classname>brltty</classname>, connected via either a serial port, USB
 or bluetooth. Details on supported braille devices can be found on the
 <ulink url="&url-brltty;"><classname>brltty</classname> website</ulink>.
-&debian; &release; ships with <classname>brltty</classname> version
+&debian-gnu; &release; ships with <classname>brltty</classname> version
 &brlttyver;.
 
 </para>
@@ -27,7 +27,7 @@ external devices connected to a serial port (no USB or serial-to-USB
 adapters are supported). Details on supported hardware speech synthesis
 devices can be found on the
 <ulink url="&url-speakup;"><classname>speakup</classname> website</ulink>.
-&debian; &release; ships with <classname>speakup</classname> version
+&debian-gnu; &release; ships with <classname>speakup</classname> version
 &speakupver;.
 
 </para>
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index ca21f27cd..7ead9f639 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -12,7 +12,7 @@ architecture or platform to which the Linux or kFreeBSD 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-gnu;.
 
 </para><para>
 
@@ -200,7 +200,7 @@ architecture.
 </para></caution>
 <para condition="new-arch">
 
-This is the first official release of &debian; for the &arch-title;
+This is the first official release of &debian-gnu; for the &arch-title;
 architecture.  We feel that it has proven itself sufficiently to be
 released. However, because it has not had the exposure (and hence
 testing by users) that some other architectures have had, you may
@@ -403,16 +403,16 @@ some USB devices and even some hard disk controllers also require firmware.
 </para><para>
 
 In most cases firmware is non-free according to the criteria used by the
-&debian; project and thus cannot be included in the main distribution
+&debian-gnu; project and thus cannot be included in the main distribution
 or in the installation system. If the device driver itself is included in
-the distribution and if &debian; legally can distribute the firmware,
+the distribution and if &debian-gnu; legally can distribute the firmware,
 it will often be available as a separate package from the non-free section
 of the archive.
 
 </para><para>
 
 However, this does not mean that such hardware cannot be used during an
-installation. Starting with &debian; 5.0, &d-i; supports loading
+installation. Starting with &debian-gnu; 5.0, &d-i; supports loading
 firmware files or packages containing firmware from a removable medium,
 such as a floppy disk or USB stick.
 See <xref linkend="loading-firmware"/> for detailed information on how to
diff --git a/en/hardware/installation-media.xml b/en/hardware/installation-media.xml
index ec7986ea7..e289ceb6c 100644
--- a/en/hardware/installation-media.xml
+++ b/en/hardware/installation-media.xml
@@ -140,7 +140,7 @@ and NFS-mounting of all local filesystems, is another option.
 <para>
 
 If you are running another Unix-like system, you could use it to install
-&debian; without using the &d-i; described in the rest of this
+&debian-gnu; without using the &d-i; described in the rest of this
 manual. This kind of install may be useful for users with otherwise
 unsupported hardware or on hosts which can't afford downtime.  If you
 are interested in this technique, skip to the <xref
diff --git a/en/hardware/network-cards.xml b/en/hardware/network-cards.xml
index b42dc056d..9825bb343 100644
--- a/en/hardware/network-cards.xml
+++ b/en/hardware/network-cards.xml
@@ -98,7 +98,7 @@ for detailed information on how to load firmware during the installation.
 </para><para>
 
 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.
+be made to work under &debian-gnu;, but are not supported during the installation.
 
 </para><para>
 
@@ -110,7 +110,7 @@ installation process.
 
 If there is a problem with wireless and there
 is no other NIC you can use during the installation, it is still
-possible to install &debian; using a full CD-ROM or DVD image. Select the
+possible to install &debian-gnu; using a full CD-ROM or DVD image. Select the
 option to not configure a network and install using only the packages
 available from the CD/DVD. You can then install the driver and firmware you
 need after the installation is completed (after the reboot) and configure
diff --git a/en/hardware/supported/powerpc.xml b/en/hardware/supported/powerpc.xml
index bc13cb142..5d57c6992 100644
--- a/en/hardware/supported/powerpc.xml
+++ b/en/hardware/supported/powerpc.xml
@@ -5,7 +5,7 @@
   <sect2 arch="powerpc"><title>CPU, Main Boards, and Video Support</title>
 <para>
 
-For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP
+For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and PreP
 subarchitectures are supported.
 
 <!--
diff --git a/en/howto/installation-howto.xml b/en/howto/installation-howto.xml
index 059b527e4..aeb6851d3 100644
--- a/en/howto/installation-howto.xml
+++ b/en/howto/installation-howto.xml
@@ -6,7 +6,7 @@
 
 <para>
 
-This document describes how to install &debian; &releasename; for
+This document describes how to install &debian-gnu; &releasename; for
 the &arch-title; (<quote>&architecture;</quote>) with the
 new &d-i;. It is a quick walkthrough of the installation process
 which should contain all the information you will need for most installs.
diff --git a/en/install-methods/floppy/powerpc.xml b/en/install-methods/floppy/powerpc.xml
index a4c272647..b0892e08a 100644
--- a/en/install-methods/floppy/powerpc.xml
+++ b/en/install-methods/floppy/powerpc.xml
@@ -29,7 +29,7 @@ floppy image with these utilities.
 <para>
 
 If you are creating the floppy image from files which were originally
-on the official &debian; CD, then the Type and Creator are already set
+on the official &debian-gnu; CD, then the Type and Creator are already set
 correctly. The following <command>Creator-Changer</command> steps are
 only necessary if you downloaded the image files from a Debian mirror.
 
diff --git a/en/install-methods/install-tftp.xml b/en/install-methods/install-tftp.xml
index 116756845..5402c66be 100644
--- a/en/install-methods/install-tftp.xml
+++ b/en/install-methods/install-tftp.xml
@@ -53,7 +53,7 @@ this section, we shall provide commands for SunOS 4.x, SunOS 5.x
 
 <note arch="x86"><para>
 
-For a &debian; server we recommend <classname>tftpd-hpa</classname>.
+For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>.
 It's written by the same author as the <classname>syslinux</classname>
 bootloader and is therefore least likely to cause issues.
 A good alternative is <classname>atftpd</classname>.
@@ -85,7 +85,7 @@ package is installed and can be changed by reconfiguring the package.
 <note><para>
 
 Historically, TFTP servers used <filename>/tftpboot</filename> as directory
-to serve images from. However, &debian; packages may use other directories
+to serve images from. However, &debian-gnu; packages may use other directories
 to comply with the <ulink url="&url-fhs-home;">Filesystem Hierarchy
 Standard</ulink>. For example, <classname>tftpd-hpa</classname> by default
 uses <filename>/var/lib/tftpboot</filename>. You may have to adjust the
diff --git a/en/install-methods/official-cdrom.xml b/en/install-methods/official-cdrom.xml
index 3b8c44901..4325bca81 100644
--- a/en/install-methods/official-cdrom.xml
+++ b/en/install-methods/official-cdrom.xml
@@ -2,10 +2,10 @@
 <!-- $Id$ -->
 
  <sect1 id="official-cdrom">
- <title>Official &debian; CD-ROM Sets</title>
+ <title>Official &debian-gnu; CD-ROM Sets</title>
 <para>
 
-By far the easiest way to install &debian; is from an Official
+By far the easiest way to install &debian-gnu; is from an Official
 Debian CD-ROM Set. You can buy a set from a vendor (see the
 <ulink url="&url-debian-cd-vendors;">CD vendors page</ulink>).
 You may also download the CD-ROM images from a Debian mirror and make
diff --git a/en/install-methods/tftp/bootp.xml b/en/install-methods/tftp/bootp.xml
index b083ba03e..38a74b09e 100644
--- a/en/install-methods/tftp/bootp.xml
+++ b/en/install-methods/tftp/bootp.xml
@@ -8,7 +8,7 @@
 
 There are two BOOTP servers available for GNU/Linux. The first is CMU
 <command>bootpd</command>. The other is actually a DHCP server: ISC
-<command>dhcpd</command>. In &debian; these are contained in the
+<command>dhcpd</command>. In &debian-gnu; these are contained in the
 <classname>bootp</classname> and <classname>dhcp3-server</classname>
 packages respectively.
 
@@ -16,7 +16,7 @@ packages respectively.
 
 To use CMU <command>bootpd</command>, you must first uncomment (or
 add) the relevant line in <filename>/etc/inetd.conf</filename>.  On
-&debian;, you can run <userinput>update-inetd --enable
+&debian-gnu;, you can run <userinput>update-inetd --enable
 bootps</userinput>, then <userinput>/etc/init.d/inetd
 reload</userinput> to do so. Just in case your BOOTP server does not
 run Debian, the line in question should look like:
diff --git a/en/install-methods/tftp/dhcp.xml b/en/install-methods/tftp/dhcp.xml
index cb5f391cb..e1418d451 100644
--- a/en/install-methods/tftp/dhcp.xml
+++ b/en/install-methods/tftp/dhcp.xml
@@ -6,7 +6,7 @@
 <para>
 
 One free software DHCP server is ISC <command>dhcpd</command>.
-For &debian;, the <classname>dhcp3-server</classname> package is
+For &debian-gnu;, the <classname>dhcp3-server</classname> package is
 recommended.  Here is a sample configuration file for it (see
 <filename>/etc/dhcp3/dhcpd.conf</filename>):
 
diff --git a/en/partitioning/partition/powerpc.xml b/en/partitioning/partition/powerpc.xml
index 9b4450126..ae28f24c7 100644
--- a/en/partitioning/partition/powerpc.xml
+++ b/en/partitioning/partition/powerpc.xml
@@ -35,7 +35,7 @@ utilities are used to manipulate this partition.
 
 </para><para>
 
-In order for OpenFirmware to automatically boot &debian; the bootstrap
+In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap
 partition should appear before other boot partitions on the disk,
 especially MacOS boot partitions.  The bootstrap partition should be
 the first one you create. However, if you add a bootstrap partition
diff --git a/en/partitioning/partition/x86.xml b/en/partitioning/partition/x86.xml
index 01979f2e7..4fea5c7b5 100644
--- a/en/partitioning/partition/x86.xml
+++ b/en/partitioning/partition/x86.xml
@@ -40,7 +40,7 @@ drive.
 Linux limits the partitions per drive to 15 partitions for SCSI disks
 (3 usable primary partitions, 12 logical partitions), and 63
 partitions on an IDE drive (3 usable primary partitions, 60 logical
-partitions). However the normal &debian; system provides
+partitions). However the normal &debian-gnu; system provides
 only 20 devices for partitions, so you may not install on partitions
 higher than 20 unless you first manually create devices for those
 partitions.
diff --git a/en/partitioning/tree.xml b/en/partitioning/tree.xml
index 352365afd..771e5deb7 100644
--- a/en/partitioning/tree.xml
+++ b/en/partitioning/tree.xml
@@ -6,7 +6,7 @@
  <title>The Directory Tree</title>
 <para>
 
-&debian; adheres to the
+&debian-gnu; adheres to the
 <ulink url="&url-fhs-home;">Filesystem Hierarchy Standard</ulink>
 for directory and file naming. This standard allows users and software
 programs to predict the location of files and directories. The root
diff --git a/en/post-install/mail-setup.xml b/en/post-install/mail-setup.xml
index 1e65b58b1..5278d6bad 100644
--- a/en/post-install/mail-setup.xml
+++ b/en/post-install/mail-setup.xml
@@ -58,7 +58,7 @@ in combination with the traditional Linux tools.
 
 Even if you are planning to use a graphical mail program, it is important
 that a traditional MTA/MDA is also installed and correctly set up on your
-&debian; system. Reason is that various utilities running on the
+&debian-gnu; system. Reason is that various utilities running on the
 system<footnote>
 
 <para>
diff --git a/en/post-install/shutdown.xml b/en/post-install/shutdown.xml
index 7fe11a87f..9d54f681d 100644
--- a/en/post-install/shutdown.xml
+++ b/en/post-install/shutdown.xml
@@ -7,9 +7,9 @@
 
 <para>
 
-To shut down a running &debian; system, you must not reboot with the
+To shut down a running &debian-gnu; system, you must not reboot with the
 reset switch on the front or back of your computer, or just turn off
-the computer.  &debian; should be shut down in a controlled manner,
+the computer.  &debian-gnu; should be shut down in a controlled manner,
 otherwise files might get lost and/or disk damage might occur. If you run a
 desktop environment, there is usually an option to <quote>log out</quote>
 available from the application menu that allows you to shutdown (or reboot)
diff --git a/en/preface.xml b/en/preface.xml
index bd422ffe2..f5aedb494 100644
--- a/en/preface.xml
+++ b/en/preface.xml
@@ -2,12 +2,12 @@
 <!-- $Id$ -->
 
 <preface>
- <title>Installing &debian; &release; For &architecture;</title>
+ <title>Installing &debian-gnu; &release; For &architecture;</title>
 <para>
 
 We are delighted that you have decided to try Debian, and are
 sure that you will find that Debian's GNU/&arch-kernel; distribution is
-unique. &debian; brings together high-quality free software
+unique. &debian-gnu; brings together high-quality free software
 from around the world, integrating it into a coherent whole. We
 believe that you will find that the result is truly more than the sum
 of the parts.
diff --git a/en/preparing/backup.xml b/en/preparing/backup.xml
index 548646bb7..2b86e17bd 100644
--- a/en/preparing/backup.xml
+++ b/en/preparing/backup.xml
@@ -8,7 +8,7 @@
 Before you start, make sure to back up every file that is now on your
 system. If this is the first time a non-native operating system has
 been installed on your computer, it's quite likely you will need to
-re-partition your disk to make room for &debian;. Anytime you
+re-partition your disk to make room for &debian-gnu;. Anytime you
 partition your disk, you run a risk of losing everything on the
 disk, no matter what program you use to do it. The programs used in
 installation are quite reliable and most have seen years of use; but
diff --git a/en/preparing/bios-setup/s390.xml b/en/preparing/bios-setup/s390.xml
index 3a7e141e4..6a5edf30e 100644
--- a/en/preparing/bios-setup/s390.xml
+++ b/en/preparing/bios-setup/s390.xml
@@ -5,7 +5,7 @@
   <sect2 arch="s390"><title>BIOS Setup</title>
 <para>
 
-In order to install &debian; on a &arch-title; or zSeries
+In order to install &debian-gnu; on a &arch-title; or zSeries
 machine you have first boot a kernel into the system.  The boot
 mechanism of this platform is inherently different to other ones,
 especially from PC-like systems: there are no floppy devices available
@@ -94,7 +94,7 @@ FTP.
 </para><para>
 
 The installation server needs to copy the exact directory structure
-from any &debian; mirror, but only the s390 and
+from any &debian-gnu; mirror, but only the s390 and
 architecture-independent files are required. You can also copy the
 contents of all installation CDs into such a directory tree.
 
diff --git a/en/preparing/install-overview.xml b/en/preparing/install-overview.xml
index 2b66eb8c1..a52e2cd8c 100644
--- a/en/preparing/install-overview.xml
+++ b/en/preparing/install-overview.xml
@@ -20,7 +20,7 @@ the new OS.
 
 </para><para>
 
-Under &debian;, it is much more likely that your OS can be repaired
+Under &debian-gnu;, it is much more likely that your OS can be repaired
 rather than replaced if things go wrong. Upgrades never require a
 wholesale installation; you can always upgrade in-place. And the
 programs are almost always compatible with successive OS releases.  If
@@ -114,7 +114,7 @@ Watch the automatic download/install/setup of the
 <listitem><para>
 
 Install a <firstterm>boot loader</firstterm>
-which can start up &debian; and/or your existing system.
+which can start up &debian-gnu; and/or your existing system.
 
 </para></listitem>
 <listitem><para>
@@ -164,7 +164,7 @@ one of the available graphical desktop environments.
 If you choose not to select the <quote>Desktop environment</quote> task,
 you will only have a relatively basic, command line driven system.
 Installing the Desktop environment task is optional because it requires a
-fairly large amount of disk space, and because many &debian; systems are
+fairly large amount of disk space, and because many &debian-gnu; systems are
 servers which don't really have any need for a graphical user interface
 to do their job.
 
diff --git a/en/preparing/minimum-hardware-reqts.xml b/en/preparing/minimum-hardware-reqts.xml
index 08b0cb240..8c41f57d3 100644
--- a/en/preparing/minimum-hardware-reqts.xml
+++ b/en/preparing/minimum-hardware-reqts.xml
@@ -87,7 +87,7 @@ files and data.
 
 </para><para>
 
-Disk space required for the smooth operation of the &debian; system
+Disk space required for the smooth operation of the &debian-gnu; system
 itself is taken into account in these recommended system requirements.
 Notably, the <filename>/var</filename> partition contains
 a lot of state information specific to Debian in addition to its regular
diff --git a/en/preparing/non-debian-partitioning.xml b/en/preparing/non-debian-partitioning.xml
index 6a8803db5..37dad488c 100644
--- a/en/preparing/non-debian-partitioning.xml
+++ b/en/preparing/non-debian-partitioning.xml
@@ -66,7 +66,7 @@ installer's included partitioning program can handle the job nicely.
 </para><para>
 
 If your machine has only one hard disk, and you would like to
-completely replace the current operating system with &debian;,
+completely replace the current operating system with &debian-gnu;,
 you also can wait to partition as part of the installation process
 (<xref linkend="di-partition"/>), after you have booted the
 installation system.  However this only works if you plan to boot the
@@ -101,7 +101,7 @@ starting the installation to create partitionable space for
 Debian. If some of the partitions will be owned by other operating
 systems, you should create those partitions using native operating
 system partitioning programs. We recommend that you do
-<emphasis>not</emphasis> attempt to create partitions for &debian;
+<emphasis>not</emphasis> attempt to create partitions for &debian-gnu;
 using another operating system's tools. Instead, you should just
 create the native operating system's partitions you will want to
 retain.
@@ -121,7 +121,7 @@ the native system first saves you trouble.
 
 </para><para arch="powerpc">
 
-In order for OpenFirmware to automatically boot &debian; the &arch-parttype;
+In order for OpenFirmware to automatically boot &debian-gnu; the &arch-parttype;
 partitions should appear before all other partitions on the disk,
 especially MacOS boot partitions. This should be kept in mind when
 pre-partitioning; you should create a &arch-parttype; placeholder partition to
@@ -157,7 +157,7 @@ booting to force the CD to become the active MacOS system.</phrase>
 
 Use the native partitioning tools to create native system
 partition(s). Leave either a place holder partition or free space for
-&debian;.
+&debian-gnu;.
 
 </para></listitem>
 <listitem><para>
diff --git a/en/preparing/nondeb-part/powerpc.xml b/en/preparing/nondeb-part/powerpc.xml
index 948995d9e..f9baf3bbc 100644
--- a/en/preparing/nondeb-part/powerpc.xml
+++ b/en/preparing/nondeb-part/powerpc.xml
@@ -15,7 +15,7 @@ disk driver partitions don't show up in <application>Drive Setup</application>.
 
 Remember to create a placeholder partition for GNU/Linux, preferably
 positioned first in the disk layout. it doesn't matter what type it
-is, it will be deleted and replaced later inside the &debian; installer.
+is, it will be deleted and replaced later inside the &debian-gnu; installer.
 
 </para><para>
 
diff --git a/en/preparing/pre-install-bios-setup.xml b/en/preparing/pre-install-bios-setup.xml
index 3bf222467..564788045 100644
--- a/en/preparing/pre-install-bios-setup.xml
+++ b/en/preparing/pre-install-bios-setup.xml
@@ -11,7 +11,7 @@ this involves checking and possibly changing firmware settings for
 your system.  The <quote>firmware</quote> is the core software used by the
 hardware; it is most critically invoked during the bootstrap process
 (after power-up). Known hardware issues affecting the reliability of
-&debian; on your system are also highlighted.
+&debian-gnu; on your system are also highlighted.
 
 </para>
 
diff --git a/en/preparing/preparing.xml b/en/preparing/preparing.xml
index cdedadffc..1ed52ff71 100644
--- a/en/preparing/preparing.xml
+++ b/en/preparing/preparing.xml
@@ -2,7 +2,7 @@
 <!-- $Id$ -->
 
 <chapter id="preparing">
- <title>Before Installing &debian;</title>
+ <title>Before Installing &debian-gnu;</title>
 <para>
 
 This chapter deals with the preparation for installing Debian before you even
diff --git a/en/using-d-i/modules/apt-setup.xml b/en/using-d-i/modules/apt-setup.xml
index 94bc47880..473e82287 100644
--- a/en/using-d-i/modules/apt-setup.xml
+++ b/en/using-d-i/modules/apt-setup.xml
@@ -6,7 +6,7 @@
 
 <para>
 
-One of the tools used to install packages on a &debian; system is
+One of the tools used to install packages on a &debian-gnu; system is
 a program called <command>apt-get</command>, from the
 <classname>apt</classname> package<footnote>
 
diff --git a/en/using-d-i/modules/finish-install.xml b/en/using-d-i/modules/finish-install.xml
index 032901eef..b116ebdbe 100644
--- a/en/using-d-i/modules/finish-install.xml
+++ b/en/using-d-i/modules/finish-install.xml
@@ -14,7 +14,7 @@ your new Debian system.
 
 After a final prompt the system will be halted because rebooting is not
 supported on &arch-title;.
-You then need to IPL &debian; from the DASD which you selected for the
+You then need to IPL &debian-gnu; from the DASD which you selected for the
 root filesystem during the first steps of the installation.
 
 </para>
diff --git a/en/using-d-i/modules/lowmem.xml b/en/using-d-i/modules/lowmem.xml
index 7d7331e37..02e4890ac 100644
--- a/en/using-d-i/modules/lowmem.xml
+++ b/en/using-d-i/modules/lowmem.xml
@@ -9,7 +9,7 @@
 One of the first things &d-i; does, is to check available memory.
 If the available memory is limited, this component will make some
 changes in the installation process which hopefully will allow
-you to install &debian; on your system.
+you to install &debian-gnu; on your system.
 
 </para><para>
 
diff --git a/en/using-d-i/modules/powerpc/yaboot-installer.xml b/en/using-d-i/modules/powerpc/yaboot-installer.xml
index b3ad198b6..29383ae5d 100644
--- a/en/using-d-i/modules/powerpc/yaboot-installer.xml
+++ b/en/using-d-i/modules/powerpc/yaboot-installer.xml
@@ -11,7 +11,7 @@ automatically, so all you need is a small 820k partition named
 <quote>bootstrap</quote> with type
 <emphasis>Apple_Bootstrap</emphasis> created back in the partitioning
 component.  If this step completes successfully then your disk should
-now be bootable and OpenFirmware will be set to boot &debian;.
+now be bootable and OpenFirmware will be set to boot &debian-gnu;.
 
 </para>
   </sect3>
diff --git a/en/using-d-i/using-d-i.xml b/en/using-d-i/using-d-i.xml
index eb4ed7a0a..9c5bf5cc3 100644
--- a/en/using-d-i/using-d-i.xml
+++ b/en/using-d-i/using-d-i.xml
@@ -315,7 +315,7 @@ newer motherboards.
 <term>base-installer</term><listitem><para>
 
 Installs the most basic set of packages which would allow
-the computer to operate under &debian; when rebooted.
+the computer to operate under &debian-gnu; when rebooted.
 
 </para></listitem>
 </varlistentry>
diff --git a/en/welcome/about-copyright.xml b/en/welcome/about-copyright.xml
index 9400318ff..39bb9537a 100644
--- a/en/welcome/about-copyright.xml
+++ b/en/welcome/about-copyright.xml
@@ -10,7 +10,7 @@
 We're sure that you've read some of the licenses that come with most
 commercial software &mdash; they usually say that you can only use one
 copy of the software on a single computer.  This system's license
-isn't like that at all.  We encourage you to put a copy of &debian; on every
+isn't like that at all.  We encourage you to put a copy of &debian-gnu; on every
 computer in your school or place of business.  Lend your installation
 media to your friends and help them install it on their computers!
 You can even make thousands of copies and <emphasis>sell</emphasis>
diff --git a/en/welcome/doc-organization.xml b/en/welcome/doc-organization.xml
index db8f9fcd3..222add960 100644
--- a/en/welcome/doc-organization.xml
+++ b/en/welcome/doc-organization.xml
@@ -22,7 +22,7 @@ encourage expert users to jump around in the document.
 
 In general, this manual is arranged in a linear fashion, walking you
 through the installation process from start to finish.  Here are the
-steps in installing &debian;, and the sections of this document which
+steps in installing &debian-gnu;, and the sections of this document which
 correlate with each step:
 
 <orderedlist>
diff --git a/en/welcome/getting-newest-doc.xml b/en/welcome/getting-newest-doc.xml
index 859ac23a3..968f4feec 100644
--- a/en/welcome/getting-newest-doc.xml
+++ b/en/welcome/getting-newest-doc.xml
@@ -9,7 +9,7 @@
 This document is constantly being revised.  Be sure to check the
 <ulink url="&url-release-area;">
 Debian &release; pages</ulink> for any last-minute information about
-the &release; release of the &debian; system.  Updated versions of
+the &release; release of the &debian-gnu; system.  Updated versions of
 this installation manual are also available from the
 <ulink url="&url-install-manual;">official Install Manual pages</ulink>.
 
diff --git a/en/welcome/getting-newest-inst.xml b/en/welcome/getting-newest-inst.xml
index 191abdd2f..e20000c0f 100644
--- a/en/welcome/getting-newest-inst.xml
+++ b/en/welcome/getting-newest-inst.xml
@@ -6,7 +6,7 @@
 
 <para>
 
-For information on how to download &debian; from the Internet
+For information on how to download &debian-gnu; from the Internet
 or from whom official Debian CDs can be purchased, see the
 <ulink url="&url-debian-distrib;">distribution web page</ulink>.
 The <ulink url="&url-debian-mirrors;">list of Debian mirrors</ulink>
diff --git a/en/welcome/welcome.xml b/en/welcome/welcome.xml
index 5d20fbbc0..b88e83943 100644
--- a/en/welcome/welcome.xml
+++ b/en/welcome/welcome.xml
@@ -5,8 +5,8 @@
 <para>
 
 This chapter provides an overview of the Debian Project and
-&debian;. If you already know about the Debian Project's
-history and the &debian; distribution, feel free to skip to
+&debian-gnu;. If you already know about the Debian Project's
+history and the &debian-gnu; distribution, feel free to skip to
 the next chapter.
 
 </para>