6 files changed, 12 insertions, 12 deletions
diff --git a/en/partitioning/partition-programs.xml b/en/partitioning/partition-programs.xml
index dcb0009c0..cb63a3489 100644
--- a/en/partitioning/partition-programs.xml
+++ b/en/partitioning/partition-programs.xml
@@ -2,10 +2,10 @@
 <!-- $Id$ -->
 
  <sect1 id="partition-programs">
- <title>Debian Partitioning Programs</title>
+ <title>&debian; Partitioning Programs</title>
 <para>
 
-Several varieties of partitioning programs have been adapted by Debian
+Several varieties of partitioning programs have been adapted by &debian;
 developers to work on various types of hard disks and computer
 architectures. Following is a list of the program(s) applicable for
 your architecture.
@@ -18,7 +18,7 @@ your architecture.
 <term><command>partman</command></term>
 <listitem><para>
 
-Recommended partitioning tool in Debian. This Swiss army knife can
+Recommended partitioning tool in &debian;. This Swiss army knife can
 also resize partitions, create filesystems
 <phrase arch="any-x86"> (<quote>format</quote> in Windows speak)</phrase>
 and assign them to the mountpoints.
diff --git a/en/partitioning/partition/x86.xml b/en/partitioning/partition/x86.xml
index 4fea5c7b5..5b7f7698f 100644
--- a/en/partitioning/partition/x86.xml
+++ b/en/partitioning/partition/x86.xml
@@ -6,8 +6,8 @@
 <para>
 
 If you have an existing other operating system such as DOS or Windows and
-you want to preserve that operating system while installing Debian, you may
-need to resize its partition to free up space for the Debian installation.
+you want to preserve that operating system while installing &debian;, you may
+need to resize its partition to free up space for the &debian; installation.
 The installer supports resizing of both FAT and NTFS filesystems; when you
 get to the installer's partitioning step, select the option
 <guimenuitem>Manual</guimenuitem> and then simply select an existing
@@ -58,7 +58,7 @@ must be placed within the first 1024 cylinders of your hard drive
 This restriction doesn't apply if you have a BIOS newer than around
 1995&ndash;98 (depending on the manufacturer) that supports the <quote>Enhanced
 Disk Drive Support Specification</quote>.  Both Lilo, the Linux loader, and
-Debian's alternative <command>mbr</command> must use the BIOS to read the
+&debian;'s alternative <command>mbr</command> must use the BIOS to read the
 kernel from the disk into RAM.  If the BIOS int 0x13 large disk access
 extensions are found to be present, they will be utilized. Otherwise,
 the legacy disk access interface is used as a fall-back, and it cannot
diff --git a/en/partitioning/partitioning.xml b/en/partitioning/partitioning.xml
index 66136a451..9748036c3 100644
--- a/en/partitioning/partitioning.xml
+++ b/en/partitioning/partitioning.xml
@@ -2,7 +2,7 @@
 <!-- $Id$ -->
 
 <appendix id="partitioning">
-<title>Partitioning for Debian</title>
+<title>Partitioning for &debian;</title>
 
 &sizing.xml;
 &tree.xml;
diff --git a/en/partitioning/schemes.xml b/en/partitioning/schemes.xml
index 6ff4253ef..f4156827c 100644
--- a/en/partitioning/schemes.xml
+++ b/en/partitioning/schemes.xml
@@ -6,7 +6,7 @@
  <title>Recommended Partitioning Scheme</title>
 <para>
 
-For new users, personal Debian boxes, home systems, and other
+For new users, personal &debian; boxes, home systems, and other
 single-user setups, a single <filename>/</filename> partition (plus
 swap) is probably the easiest, simplest way to go.  However, if your
 partition is larger than around 6GB, choose ext3 as your partition
@@ -24,7 +24,7 @@ partition.
 </para><para>
 
 You might need a separate <filename>/usr/local</filename> partition if
-you plan to install many programs that are not part of the Debian
+you plan to install many programs that are not part of the &debian;
 distribution.  If your machine will be a mail server, you might need
 to make <filename>/var/mail</filename> a separate partition.  Often,
 putting <filename>/tmp</filename> on its own partition, for instance
diff --git a/en/partitioning/sizing.xml b/en/partitioning/sizing.xml
index 510d60e77..214132964 100644
--- a/en/partitioning/sizing.xml
+++ b/en/partitioning/sizing.xml
@@ -3,7 +3,7 @@
 
 
  <sect1 id="partition-sizing">
- <title>Deciding on Debian Partitions and Sizes</title>
+ <title>Deciding on &debian; Partitions and Sizes</title>
 <para>
 
 At a bare minimum, GNU/&arch-kernel; needs one partition for itself.  You can
diff --git a/en/partitioning/tree.xml b/en/partitioning/tree.xml
index 771e5deb7..5868f9f2a 100644
--- a/en/partitioning/tree.xml
+++ b/en/partitioning/tree.xml
@@ -11,7 +11,7 @@
 for directory and file naming. This standard allows users and software
 programs to predict the location of files and directories. The root
 level directory is represented simply by the slash
-<filename>/</filename>. At the root level, all Debian systems include
+<filename>/</filename>. At the root level, all &debian; systems include
 these directories:
 
 <informaltable>
@@ -117,7 +117,7 @@ web sites, databases, the packaging system cache, etc. will be placed
 under this directory. The size of this directory depends greatly on
 the usage of your system, but for most people will be dictated by
 the package management tool's overhead.  If you are going to do a full
-installation of just about everything Debian has to offer, all in one
+installation of just about everything &debian; has to offer, all in one
 session, setting aside 2 or 3 GB of space for
 <filename>/var</filename> should be sufficient. If you are going to
 install in pieces (that is to say, install services and utilities,