Rename debian entity to debian-gnu.

5 files changed, 8 insertions, 8 deletions

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>):