Change many occurences of 'Debian' into &debian;.

This run is in the english version, other languages will follow.

10 files changed, 23 insertions, 23 deletions

diff --git a/en/using-d-i/components.xml b/en/using-d-i/components.xml
index 438b36183..11e6e5395 100644
--- a/en/using-d-i/components.xml
+++ b/en/using-d-i/components.xml
@@ -15,10 +15,10 @@ the installation method you use and on your hardware.
 </para>
 
   <sect2 id="di-setup">
-  <title>Setting up Debian Installer and Hardware Configuration</title>
+  <title>Setting up &debian; Installer and Hardware Configuration</title>
 <para>
 
-Let's assume the Debian Installer has booted and you are facing its
+Let's assume the &debian; Installer has booted and you are facing its
 first screen.  At this time, the capabilities of &d-i; are still quite
 limited. It doesn't know much about your hardware, preferred language,
 or even the task it should perform. Don't worry. Because &d-i; is quite
@@ -162,7 +162,7 @@ linkend="boot-dev-select-sun"/>.</phrase>
   <title>Finishing the Installation</title>
 <para>
 
-This is the last step in the Debian installation process during which the
+This is the last step in the &debian; installation process during which the
 installer will do any last minute tasks.
 It mostly consists of tidying up after the &d-i;.
 
diff --git a/en/using-d-i/modules/finish-install.xml b/en/using-d-i/modules/finish-install.xml
index b116ebdbe..64d330960 100644
--- a/en/using-d-i/modules/finish-install.xml
+++ b/en/using-d-i/modules/finish-install.xml
@@ -8,7 +8,7 @@
 
 You will be prompted to remove the boot media (CD, floppy, etc) that you
 used to boot the installer. After that the system will be rebooted into
-your new Debian system.
+your new &debian; system.
 
 </para><para arch="s390">
 
diff --git a/en/using-d-i/modules/ia64/elilo-installer.xml b/en/using-d-i/modules/ia64/elilo-installer.xml
index 5fa5d0efd..1567b7ad8 100644
--- a/en/using-d-i/modules/ia64/elilo-installer.xml
+++ b/en/using-d-i/modules/ia64/elilo-installer.xml
@@ -88,7 +88,7 @@ the filenames re-written to refer to files in the EFI partition.
 
 This is the boot loader program that the <quote>EFI Boot Manager</quote>
 runs to boot the system.
-It is the program behind the <guimenuitem>Debian GNU/Linux</guimenuitem>
+It is the program behind the <guimenuitem>&debian; GNU/Linux</guimenuitem>
 menu item of the <quote>EFI Boot Manager</quote> command menu.
 
 </para></listitem></varlistentry>
@@ -100,7 +100,7 @@ menu item of the <quote>EFI Boot Manager</quote> command menu.
 This is the initial root filesystem used to boot the kernel.
 It is a copy of the file referenced in the
 <filename>/etc/elilo.conf</filename>.
-In a standard Debian installation it would be the file in
+In a standard &debian; installation it would be the file in
 <filename>/boot</filename> pointed to by the symbolic link
 <filename>/initrd.img</filename>.
 
@@ -124,7 +124,7 @@ any local changes would be lost at the next time
 This is the compressed kernel itself.
 It is a copy of the file referenced in the
 <filename>/etc/elilo.conf</filename>.
-In a standard Debian installation it would be the file in
+In a standard &debian; installation it would be the file in
 <filename>/boot</filename> pointed to by the symbolic link
 <filename>/vmlinuz</filename>.
 
diff --git a/en/using-d-i/modules/iso-scan.xml b/en/using-d-i/modules/iso-scan.xml
index aaf56d89d..926e44fb2 100644
--- a/en/using-d-i/modules/iso-scan.xml
+++ b/en/using-d-i/modules/iso-scan.xml
@@ -2,11 +2,11 @@
 <!-- $Id$ -->
 
    <sect3 id="iso-scan">
-   <title>Looking for the Debian Installer ISO Image</title>
+   <title>Looking for the &debian; Installer ISO Image</title>
 <para>
 
 When installing via the <emphasis>hd-media</emphasis> method, there
-will be a moment where you need to find and mount the Debian Installer
+will be a moment where you need to find and mount the &debian; Installer
 iso image in order to get the rest of the installation files. The
 component <command>iso-scan</command> does exactly this.
 
@@ -23,7 +23,7 @@ directory and in the first level of subdirectories (i.e. it finds
 but not
 <filename>/data/tmp/<replaceable>whatever</replaceable>.iso</filename>).
 After an iso image has been found, <command>iso-scan</command> checks
-its content to determine if the image is a valid Debian iso image or
+its content to determine if the image is a valid &debian; iso image or
 not. In the former case we are done, in the latter
 <command>iso-scan</command> seeks for another image.
 
diff --git a/en/using-d-i/modules/localechooser.xml b/en/using-d-i/modules/localechooser.xml
index 7607ff0a2..b66c96a9c 100644
--- a/en/using-d-i/modules/localechooser.xml
+++ b/en/using-d-i/modules/localechooser.xml
@@ -23,7 +23,7 @@ installer will default to English.
 
 The selected geographic location (in most cases a country) will be used
 later in the installation process to select the correct time zone and a
-Debian mirror appropriate for that country.
+&debian; mirror appropriate for that country.
 Language and country together will help determine the default locale for
 your system and select the correct keyboard layout.
 
diff --git a/en/using-d-i/modules/os-prober.xml b/en/using-d-i/modules/os-prober.xml
index 43c761c04..b20f100ac 100644
--- a/en/using-d-i/modules/os-prober.xml
+++ b/en/using-d-i/modules/os-prober.xml
@@ -10,7 +10,7 @@ Before a boot loader is installed, the installer will attempt to probe for
 other operating systems which are installed on the machine. If it finds a
 supported operating system, you will be informed of this during the boot
 loader installation step, and the computer will be configured to boot this
-other operating system in addition to Debian.
+other operating system in addition to &debian;.
 
 </para><para>
 
diff --git a/en/using-d-i/modules/partman.xml b/en/using-d-i/modules/partman.xml
index 3589939e6..22f58403f 100644
--- a/en/using-d-i/modules/partman.xml
+++ b/en/using-d-i/modules/partman.xml
@@ -320,7 +320,7 @@ modify the proposed changes as described below for manual partitioning.
 A similar screen to the one shown just above will be displayed if you
 choose manual partitioning except that your existing partition table will
 be shown and without the mount points. How to manually set up your partition
-table and the usage of partitions by your new Debian system will be covered
+table and the usage of partitions by your new &debian; system will be covered
 in the remainder of this section.
 
 </para><para>
diff --git a/en/using-d-i/modules/save-logs.xml b/en/using-d-i/modules/save-logs.xml
index 2addf18a3..6cf9b0e3c 100644
--- a/en/using-d-i/modules/save-logs.xml
+++ b/en/using-d-i/modules/save-logs.xml
@@ -9,7 +9,7 @@
 If the installation is successful, the logfiles created during
 the installation process will be automatically saved to
 <filename>/var/log/installer/</filename> on your new
-Debian system.
+&debian; system.
 
 </para><para>
 
diff --git a/en/using-d-i/modules/x86/lilo-installer.xml b/en/using-d-i/modules/x86/lilo-installer.xml
index 730b162a7..0295119f2 100644
--- a/en/using-d-i/modules/x86/lilo-installer.xml
+++ b/en/using-d-i/modules/x86/lilo-installer.xml
@@ -36,11 +36,11 @@ boot process.
 
 </para></listitem></varlistentry>
 <varlistentry>
-<term>new Debian partition</term><listitem><para>
+<term>new &debian; partition</term><listitem><para>
 
 Choose this if you want to use another boot
 manager. <command>LILO</command> will install itself at the beginning
-of the new Debian partition and it will serve as a secondary boot
+of the new &debian; partition and it will serve as a secondary boot
 loader.
 
 </para></listitem></varlistentry>
@@ -61,7 +61,7 @@ If you can no longer boot into Windows 9x (or DOS) after this step,
 you'll need to use a Windows 9x (MS-DOS) boot disk and use the
 <userinput>fdisk /mbr</userinput> command to reinstall the MS-DOS
 master boot record &mdash; however, this means that you'll need to use
-some other way to get back into Debian!
+some other way to get back into &debian;!
 
 </para>
   </sect3>
diff --git a/en/using-d-i/using-d-i.xml b/en/using-d-i/using-d-i.xml
index 9c5bf5cc3..e8d1bafec 100644
--- a/en/using-d-i/using-d-i.xml
+++ b/en/using-d-i/using-d-i.xml
@@ -2,12 +2,12 @@
 <!-- $Id$ -->
 
 
- <chapter id="d-i-intro"><title>Using the Debian Installer</title>
+ <chapter id="d-i-intro"><title>Using the &debian; Installer</title>
 
  <sect1><title>How the Installer Works</title>
 <para>
 
-The Debian Installer consists of a number of special-purpose
+The &debian; Installer consists of a number of special-purpose
 components to perform each installation task. Each component performs
 its task, asking the user questions as necessary to do its job.
 The questions themselves are given priorities, and the priority
@@ -184,7 +184,7 @@ cards, disk drives, and PCMCIA.
 
 <term>cdrom-detect</term><listitem><para>
 
-Looks for and mounts a Debian installation CD.
+Looks for and mounts a &debian; installation CD.
 
 </para></listitem>
 </varlistentry>
@@ -209,7 +209,7 @@ Searches for ISO images (<filename>.iso</filename> files) on hard drives.
 
 <term>choose-mirror</term><listitem><para>
 
-Presents a list of Debian archive mirrors. The user may choose
+Presents a list of &debian; archive mirrors. The user may choose
 the source of his installation packages.
 
 </para></listitem>
@@ -267,7 +267,7 @@ Allows the user to partition disks attached to the system, create file
 systems on the selected partitions, and attach them to the
 mountpoints. Included are also interesting features like a fully
 automatic mode or LVM support. This is the preferred partitioning tool
-in Debian.
+in &debian;.
 
 </para></listitem>
 </varlistentry>
@@ -382,7 +382,7 @@ console.
 
 Provides a way for the user to record information on a floppy disk, network,
 hard disk, or other media when trouble is encountered, in order to accurately
-report installer software problems to Debian developers later.
+report installer software problems to &debian; developers later.
 
 </para></listitem>
 </varlistentry>