13 files changed, 29 insertions, 29 deletions
diff --git a/nl/install-methods/automatic-install.xml b/nl/install-methods/automatic-install.xml
index 9410b23fe..6aaddea31 100644
--- a/nl/install-methods/automatic-install.xml
+++ b/nl/install-methods/automatic-install.xml
@@ -6,20 +6,20 @@
 <para>
 
 For installing on multiple computers it's possible to do fully
-automatic installations. Debian packages intended for this include
+automatic installations. &debian; packages intended for this include
 <classname>fai</classname> (which uses an install server),
 <classname>replicator</classname>,
 <classname>systemimager</classname>,
 <classname>autoinstall</classname>, and
-the Debian Installer itself.
+the &debian; Installer itself.
 
 </para>
 
   <sect2 id="preseed">
-  <title>Automatic Installation Using the Debian Installer</title>
+  <title>Automatic Installation Using the &debian; Installer</title>
 <para>
 
-The Debian Installer supports automating installs via preconfiguration
+The &debian; Installer supports automating installs via preconfiguration
 files. A preconfiguration file can be loaded from the network or from
 removable media, and used to fill in answers to questions asked during the
 installation process.
diff --git a/nl/install-methods/boot-drive-files.xml b/nl/install-methods/boot-drive-files.xml
index 3b0542625..22205ddd1 100644
--- a/nl/install-methods/boot-drive-files.xml
+++ b/nl/install-methods/boot-drive-files.xml
@@ -56,7 +56,7 @@ the root file-system by the kernel.
 
 </para><para>
 
-Copy the following files from the Debian archives to a
+Copy the following files from the &debian; archives to a
 convenient location on your hard drive, for instance to
 <filename>/boot/newinstall/</filename>.
 
@@ -92,7 +92,7 @@ The <filename>boot-floppy-hfs</filename> floppy uses
 booting. <application>BootX</application>, launched from MacOS,
 supports booting from files placed on the hard
 disk. <application>BootX</application> can also be used to dual-boot
-MacOS and Linux after your Debian installation is complete. For the
+MacOS and Linux after your &debian; installation is complete. For the
 Performa 6360, it appears that <command>quik</command> cannot make the
 hard disk bootable.  So <application>BootX</application> is required
 on that model.
@@ -103,7 +103,7 @@ Download and unstuff the <application>BootX</application>
 distribution, available from <ulink url="&url-powerpc-bootx;"></ulink>,
 or in the
 <filename>dists/woody/main/disks-powerpc/current/powermac</filename>
-directory on Debian http/ftp mirrors and official Debian CDs. Use
+directory on &debian; http/ftp mirrors and official &debian; CDs. Use
 <application>Stuffit Expander</application> to extract it from its
 archive. Within the package, there is an empty folder called
 <filename>Linux Kernels</filename>. Download
@@ -132,7 +132,7 @@ not supported and must not be used on NewWorld PowerMacs.
 </para><para>
 
 <emphasis>Copy</emphasis> (not move) the following four files which
-you downloaded earlier from the Debian archives, onto the root level
+you downloaded earlier from the &debian; archives, onto the root level
 of your hard drive (this can be accomplished by
 <keycap>option</keycap>-dragging each file to the hard drive icon).
 
diff --git a/nl/install-methods/boot-usb-files.xml b/nl/install-methods/boot-usb-files.xml
index b7211a9e4..afffe991d 100644
--- a/nl/install-methods/boot-usb-files.xml
+++ b/nl/install-methods/boot-usb-files.xml
@@ -117,7 +117,7 @@ After that, mount the USB memory stick
 which will now have
 <phrase arch="x86">a FAT filesystem</phrase>
 <phrase arch="powerpc">an HFS filesystem</phrase>
-on it, and copy a Debian netinst or businesscard ISO image to it.
+on it, and copy a &debian; netinst or businesscard ISO image to it.
 Unmount the stick (<userinput>umount /mnt</userinput>) and you are done.
 
 </para>
diff --git a/nl/install-methods/create-floppy.xml b/nl/install-methods/create-floppy.xml
index 19140a496..6722dcde4 100644
--- a/nl/install-methods/create-floppy.xml
+++ b/nl/install-methods/create-floppy.xml
@@ -33,7 +33,7 @@ different platforms.
 </para><para>
 
 Before you can create the floppies, you will first need to download them
-from one of the Debian mirrors, as explained in
+from one of the &debian; mirrors, as explained in
 <xref linkend="downloading-files"/>. <phrase arch="i386">If you already
 have an installation CD-ROM or DVD, the floppy images may also be included
 on the CD/DVD.</phrase>
diff --git a/nl/install-methods/download/arm.xml b/nl/install-methods/download/arm.xml
index 1a9dd5664..d4f3650a3 100644
--- a/nl/install-methods/download/arm.xml
+++ b/nl/install-methods/download/arm.xml
@@ -32,7 +32,7 @@ obtained from &n2100-firmware-img;.
 <para>
 
 The GLAN Tank requires a kernel and ramdisk on an ext2 partition on the
-disk on which you intend to install Debian.  These images can be obtained
+disk on which you intend to install &debian;.  These images can be obtained
 from &glantank-firmware-img;.
 
 </para>
@@ -43,7 +43,7 @@ from &glantank-firmware-img;.
 <para>
 
 The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the
-disk on which you intend to install Debian.  These images can be obtained
+disk on which you intend to install &debian;.  These images can be obtained
 from &kuroboxpro-firmware-img;.
 
 </para>
diff --git a/nl/install-methods/downloading-files.xml b/nl/install-methods/downloading-files.xml
index 2e7dbbc2d..e799e7354 100644
--- a/nl/install-methods/downloading-files.xml
+++ b/nl/install-methods/downloading-files.xml
@@ -2,7 +2,7 @@
 <!-- original version: 61147 untranslated -->
 
  <sect1 id="downloading-files">
- <title>Downloading Files from Debian Mirrors</title>
+ <title>Downloading Files from &debian; Mirrors</title>
 
 <para>
 
@@ -11,7 +11,7 @@ To find the nearest (and thus probably the fastest) mirror, see the
 
 </para><para>
 
-When downloading files from a Debian mirror using FTP, be sure to download the
+When downloading files from a &debian; mirror using FTP, be sure to download the
 files in <emphasis>binary</emphasis> mode, not text or automatic mode.
 
 </para>
@@ -20,7 +20,7 @@ files in <emphasis>binary</emphasis> mode, not text or automatic mode.
   <title>Where to Find Installation Images</title>
 
 <para>
-The installation images are located on each Debian mirror in the directory
+The installation images are located on each &debian; mirror in the directory
 <ulink url="&url-debian-installer;images">debian/dists/&releasename;/main/installer-&architecture;/current/images/</ulink>
 &mdash; the <ulink url="&url-debian-installer;images/MANIFEST">MANIFEST</ulink>
 lists each image and its purpose.
diff --git a/nl/install-methods/floppy/i386.xml b/nl/install-methods/floppy/i386.xml
index 3cd6b77bb..dba3753e2 100644
--- a/nl/install-methods/floppy/i386.xml
+++ b/nl/install-methods/floppy/i386.xml
@@ -28,7 +28,7 @@ diskio.dll in the same directory.
 
 </para><para>
 
-These tools can be found on the Official Debian CD-ROMs under the
+These tools can be found on the Official &debian; CD-ROMs under the
 <filename>/tools</filename> directory.
 
 </para>
diff --git a/nl/install-methods/floppy/powerpc.xml b/nl/install-methods/floppy/powerpc.xml
index 9935bb48c..ffaa8ab70 100644
--- a/nl/install-methods/floppy/powerpc.xml
+++ b/nl/install-methods/floppy/powerpc.xml
@@ -31,7 +31,7 @@ floppy image with these utilities.
 If you are creating the floppy image from files which were originally
 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.
+only necessary if you downloaded the image files from a &debian; mirror.
 
 </para>
 <orderedlist>
diff --git a/nl/install-methods/install-tftp.xml b/nl/install-methods/install-tftp.xml
index a4f05e822..0717951cc 100644
--- a/nl/install-methods/install-tftp.xml
+++ b/nl/install-methods/install-tftp.xml
@@ -41,7 +41,7 @@ are unable to boot using BOOTP.
 </para><para arch="hppa">
 
 Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP.
-There is an <classname>rbootd</classname> package available in Debian.
+There is an <classname>rbootd</classname> package available in &debian;.
 
 </para><para>
 
@@ -94,7 +94,7 @@ configuration examples in this section accordingly.
 </para></note>
 <para>
 
-All <command>in.tftpd</command> alternatives available in Debian should
+All <command>in.tftpd</command> alternatives available in &debian; should
 log TFTP requests to the system logs by default. Some of them support a
 <userinput>-v</userinput> argument to increase verbosity.
 It is recommended to check these log messages in case of boot problems
@@ -102,7 +102,7 @@ as they are a good starting point for diagnosing the cause of errors.
 
 </para><para arch="mips">
 
-If you intend to install Debian on an SGI machine and your TFTP server is a
+If you intend to install &debian; on an SGI machine and your TFTP server is a
 GNU/Linux box running Linux 2.4, you'll need to set the following on your
 server:
 
diff --git a/nl/install-methods/official-cdrom.xml b/nl/install-methods/official-cdrom.xml
index a31fcb7dd..0965582c3 100644
--- a/nl/install-methods/official-cdrom.xml
+++ b/nl/install-methods/official-cdrom.xml
@@ -6,12 +6,12 @@
 <para>
 
 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
+&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
+You may also download the CD-ROM images from a &debian; mirror and make
 your own set, if you have a fast network connection and a CD burner
 (see the <ulink url="&url-debian-cd;">Debian CD page</ulink> for
-detailed instructions). If you have a Debian CD set and CDs are
+detailed instructions). If you have a &debian; CD set and CDs are
 bootable on your machine, you can skip right to
 <xref linkend="boot-installer"/>; much effort has been expended to ensure
 the files most people need are there on the CD. Although a full set of
@@ -37,7 +37,7 @@ you can use an alternative strategy such as
 
 or manually loading the kernel from the CD to initially boot the
 system installer. The files you need for booting by another means are
-also on the CD; the Debian network archive and CD folder organization
+also on the CD; the &debian; network archive and CD folder organization
 are identical. So when archive file paths are given below for
 particular files you need for booting, look for those files in the
 same directories and subdirectories on your CD.
diff --git a/nl/install-methods/tftp/bootp.xml b/nl/install-methods/tftp/bootp.xml
index e1eb8ea15..42f52e321 100644
--- a/nl/install-methods/tftp/bootp.xml
+++ b/nl/install-methods/tftp/bootp.xml
@@ -19,7 +19,7 @@ add) the relevant line in <filename>/etc/inetd.conf</filename>.  On
 &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:
+run &debian;, the line in question should look like:
 
 <informalexample><screen>
 bootps  dgram  udp  wait  root  /usr/sbin/bootpd  bootpd -i -t 120
diff --git a/nl/install-methods/usb-setup/powerpc.xml b/nl/install-methods/usb-setup/powerpc.xml
index 2ed205351..6eba27fb6 100644
--- a/nl/install-methods/usb-setup/powerpc.xml
+++ b/nl/install-methods/usb-setup/powerpc.xml
@@ -20,7 +20,7 @@ $ hformat /dev/<replaceable>sdX2</replaceable>
 
 Take care that you use the correct device name for your USB stick. The
 <command>hformat</command> command is contained in the
-<classname>hfsutils</classname> Debian package.
+<classname>hfsutils</classname> &debian; package.
 
 </para><para>
 
@@ -111,7 +111,7 @@ may need to be increased, depending on the image you are booting.
 </para><para>
 
 If you used an <filename>hd-media</filename> image, you should now copy a
-Debian ISO image (businesscard, netinst or full CD image; be sure to select
+&debian; ISO image (businesscard, netinst or full CD image; be sure to select
 one that fits) onto the stick. When you are done, unmount the USB memory
 stick (<userinput>umount /mnt</userinput>).
 
diff --git a/nl/install-methods/usb-setup/x86.xml b/nl/install-methods/usb-setup/x86.xml
index 5694b170b..bd9ca83e0 100644
--- a/nl/install-methods/usb-setup/x86.xml
+++ b/nl/install-methods/usb-setup/x86.xml
@@ -27,7 +27,7 @@ Don't forget to set the <quote>bootable</quote> bootable flag.
 
 Take care that you use the correct device name for your USB stick. The
 <command>mkdosfs</command> command is contained in the
-<classname>dosfstools</classname> Debian package.
+<classname>dosfstools</classname> &debian; package.
 
 </para></note><para>
 
@@ -101,7 +101,7 @@ For the graphical installer you should add
 </para><para>
 
 If you used an <filename>hd-media</filename> image, you should now copy a
-Debian ISO image<footnote>
+&debian; ISO image<footnote>
 
 <para>
 You can use either a businesscard, a netinst or a full CD image (see