7 files changed, 47 insertions, 47 deletions
diff --git a/en/welcome/about-copyright.xml b/en/welcome/about-copyright.xml
index 39bb9537a..30ed47ff2 100644
--- a/en/welcome/about-copyright.xml
+++ b/en/welcome/about-copyright.xml
@@ -15,7 +15,7 @@ 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>
 them &mdash; albeit with a few restrictions.  Your freedom to install
-and use the system comes directly from Debian being based on
+and use the system comes directly from &debian; being based on
 <emphasis>free software</emphasis>.
 
 </para><para>
@@ -31,12 +31,12 @@ well.
 
 <note><para>
 
-The Debian project, as a pragmatic concession to its users,
+The &debian; project, as a pragmatic concession to its users,
 does make some packages available that do not meet our criteria for
 being free.  These packages are not part of the official distribution,
 however, and are only available from the
 <userinput>contrib</userinput> or <userinput>non-free</userinput>
-areas of Debian mirrors or on third-party CD-ROMs; see the
+areas of &debian; mirrors or on third-party CD-ROMs; see the
 <ulink url="&url-debian-faq;">Debian FAQ</ulink>, under
 <quote>The Debian FTP archives</quote>, for more information about the
 layout and contents of the archives.
@@ -55,17 +55,17 @@ software.  Because of this provision, the source code<footnote>
 <para>
 
 For information on how to locate, unpack, and build
-binaries from Debian source packages, see the
+binaries from &debian; source packages, see the
 <ulink url="&url-debian-faq;">Debian FAQ</ulink>,
 under <quote>Basics of the Debian Package Management System</quote>.
 
 </para>
-</footnote> for all such programs is available in the Debian system.
+</footnote> for all such programs is available in the &debian; system.
 
 </para><para>
 
 There are several other forms of copyright statements and software
-licenses used on the programs in Debian. You can find the copyrights
+licenses used on the programs in &debian;. You can find the copyrights
 and licenses for every package installed on your system by looking in
 the file
 <filename>/usr/share/doc/<replaceable>package-name</replaceable>/copyright
@@ -74,7 +74,7 @@ once you've installed a package on your system.
 
 </para><para>
 
-For more information about licenses and how Debian determines whether
+For more information about licenses and how &debian; determines whether
 software is free enough to be included in the main distribution, see the
 <ulink url="&url-dfsg;">Debian Free Software Guidelines</ulink>.
 
diff --git a/en/welcome/doc-organization.xml b/en/welcome/doc-organization.xml
index 222add960..39975d2c1 100644
--- a/en/welcome/doc-organization.xml
+++ b/en/welcome/doc-organization.xml
@@ -6,7 +6,7 @@
 
 <para>
 
-This document is meant to serve as a manual for first-time Debian
+This document is meant to serve as a manual for first-time &debian;
 users.  It tries to make as few assumptions as possible about your
 level of expertise.  However, we do assume that you have a general
 understanding of how the hardware in your computer works.
@@ -15,7 +15,7 @@ understanding of how the hardware in your computer works.
 
 Expert users may also find interesting reference information in this
 document, including minimum installation sizes, details about the
-hardware supported by the Debian installation system, and so on.  We
+hardware supported by the &debian; installation system, and so on.  We
 encourage expert users to jump around in the document.
 
 </para><para>
@@ -35,9 +35,9 @@ installation system, in <xref linkend="hardware-req"/>.
 <listitem><para>
 
 Backup your system, perform any necessary planning and hardware
-configuration prior to installing Debian, in <xref linkend="preparing"/>. If
+configuration prior to installing &debian;, in <xref linkend="preparing"/>. If
 you are preparing a multi-boot system, you may need to create
-partitionable space on your hard disk for Debian to use.
+partitionable space on your hard disk for &debian; to use.
 
 </para></listitem>
 <listitem><para>
@@ -59,10 +59,10 @@ Perform the actual installation according to
 <xref linkend="d-i-intro"/>. This involves choosing your language,
 configuring peripheral driver modules, configuring your network
 connection, so that remaining installation files can be obtained
-directly from a Debian server (if you are not installing from a CD),
+directly from a &debian; server (if you are not installing from a CD),
 partitioning your hard drives and installation of a base system, then
 selection and installation of tasks.
-(Some background about setting up the partitions for your Debian
+(Some background about setting up the partitions for your &debian;
 system is explained in <xref linkend="partitioning"/>.)
 
 </para></listitem>
@@ -78,7 +78,7 @@ Boot into your newly installed base system, from <xref linkend="boot-new"/>.
 
 Once you've got your system installed, you can read
 <xref linkend="post-install"/>.  That chapter explains where to
-look to find more information about Unix and Debian, and how to
+look to find more information about Unix and &debian;, and how to
 replace your kernel.
 
 <!-- XXX FIXME: If you want to build your own install system
diff --git a/en/welcome/getting-newest-inst.xml b/en/welcome/getting-newest-inst.xml
index e20000c0f..f424b6efa 100644
--- a/en/welcome/getting-newest-inst.xml
+++ b/en/welcome/getting-newest-inst.xml
@@ -2,20 +2,20 @@
 <!-- $Id$ -->
 
  <sect1 id="getting-newest-inst">
- <title>Getting Debian</title>
+ <title>Getting &debian;</title>
 
 <para>
 
 For information on how to download &debian-gnu; from the Internet
-or from whom official Debian CDs can be purchased, see the
+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>
-contains a full set of official Debian
+The <ulink url="&url-debian-mirrors;">list of &debian; mirrors</ulink>
+contains a full set of official &debian;
 mirrors, so you can easily find the nearest one.
 
 </para><para>
 
-Debian can be upgraded after installation very easily.  The
+&debian; can be upgraded after installation very easily.  The
 installation procedure will help set up the system so that you can
 make those upgrades once installation is complete, if need be.
 
diff --git a/en/welcome/welcome.xml b/en/welcome/welcome.xml
index b88e83943..ea97359e4 100644
--- a/en/welcome/welcome.xml
+++ b/en/welcome/welcome.xml
@@ -1,11 +1,11 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- $Id$ -->
 
-<chapter id="welcome"><title>Welcome to Debian</title>
+<chapter id="welcome"><title>Welcome to &debian;</title>
 <para>
 
-This chapter provides an overview of the Debian Project and
-&debian-gnu;. If you already know about the Debian Project's
+This chapter provides an overview of the &debian; Project and
+&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.
 
diff --git a/en/welcome/what-is-debian-hurd.xml b/en/welcome/what-is-debian-hurd.xml
index fffbdd656..158b46ac4 100644
--- a/en/welcome/what-is-debian-hurd.xml
+++ b/en/welcome/what-is-debian-hurd.xml
@@ -4,11 +4,11 @@
 <!-- conditionalised because the hurd port is not yet an official debian
 release -->
  <sect1 id="what-is-debian-hurd" condition="unofficial-build">
- <title>What is Debian GNU/Hurd?</title>
+ <title>What is &debian; GNU/Hurd?</title>
 
 <para>
 
-Debian GNU/Hurd is a Debian GNU system with the GNU Hurd &mdash; a set of
+&debian; GNU/Hurd is a &debian; GNU system with the GNU Hurd &mdash; a set of
 servers running on top of the GNU Mach microkernel.
 
 </para><para>
@@ -21,14 +21,14 @@ stable.
 
 </para><para>
 
-Please note that Debian GNU/Hurd is not a Linux system, and thus some
+Please note that &debian; GNU/Hurd is not a Linux system, and thus some
 information on Linux system may not apply to it.
 
 </para><para>
 
 For more information, see the
 <ulink url="http://www.debian.org/ports/hurd/">
-Debian GNU/Hurd ports page</ulink>
+&debian; GNU/Hurd ports page</ulink>
 and the <email>debian-hurd@lists.debian.org</email>
 mailing list.
 
diff --git a/en/welcome/what-is-debian-kfreebsd.xml b/en/welcome/what-is-debian-kfreebsd.xml
index 368410b11..f214c3180 100644
--- a/en/welcome/what-is-debian-kfreebsd.xml
+++ b/en/welcome/what-is-debian-kfreebsd.xml
@@ -2,27 +2,27 @@
 <!-- $Id$ -->
 
  <sect1 id="what-is-debian-kfreebsd">
- <title>What is Debian GNU/kFreeBSD?</title>
+ <title>What is &debian; GNU/kFreeBSD?</title>
 
 <para>
 
-Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel.
+&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel.
 
 </para><para>
 
-This port of Debian is currently only being developed for the i386 and amd64
+This port of &debian; is currently only being developed for the i386 and amd64
 architectures, although ports to other architectures is possible.
 
 </para><para>
 
-Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some
+Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some
 information on Linux system may not apply to it.
 
 </para><para>
 
 For more information, see the
 <ulink url="http://www.debian.org/ports/kfreebsd-gnu/">
-Debian GNU/kFreeBSD ports page</ulink>
+&debian; GNU/kFreeBSD ports page</ulink>
 and the <email>debian-bsd@lists.debian.org</email>
 mailing list.
 
diff --git a/en/welcome/what-is-debian-linux.xml b/en/welcome/what-is-debian-linux.xml
index ef172281b..fdd50c4f9 100644
--- a/en/welcome/what-is-debian-linux.xml
+++ b/en/welcome/what-is-debian-linux.xml
@@ -2,12 +2,12 @@
 <!-- $Id$ -->
 
  <sect1 id="what-is-debian-linux">
- <title>What is Debian GNU/Linux?</title>
+ <title>What is &debian; GNU/Linux?</title>
 <para>
 
-The combination of Debian's philosophy and methodology and the GNU
+The combination of &debian;'s philosophy and methodology and the GNU
 tools, the Linux kernel, and other important free software, form a
-unique software distribution called Debian GNU/Linux. This
+unique software distribution called &debian; GNU/Linux. This
 distribution is made up of a large number of software
 <emphasis>packages</emphasis>.  Each package in the distribution
 contains executables, scripts, documentation, and configuration
@@ -19,37 +19,37 @@ tracking system ensures that problems are found and fixed quickly.
 
 </para><para>
 
-Debian's attention to detail allows us to produce a high-quality,
+&debian;'s attention to detail allows us to produce a high-quality,
 stable, and scalable distribution.  Installations can be easily
 configured to serve many roles, from stripped-down firewalls to
 desktop scientific workstations to high-end network servers.
 
 </para><para>
 
-Debian is especially popular among advanced users because of its
+&debian; is especially popular among advanced users because of its
 technical excellence and its deep commitment to the needs and
-expectations of the Linux community. Debian also introduced many
+expectations of the Linux community. &debian; also introduced many
 features to Linux that are now commonplace.
 
 </para><para>
 
-For example, Debian was the first Linux distribution to include a
+For example, &debian; was the first Linux distribution to include a
 package management system for easy installation and removal of
 software. It was also the first Linux distribution that could be
 upgraded without requiring reinstallation.
 
 </para><para>
 
-Debian continues to be a leader in Linux development. Its development
+&debian; continues to be a leader in Linux development. Its development
 process is an example of just how well the Open Source development
 model can work &mdash; even for very complex tasks such as building and
 maintaining a complete operating system.
 
 </para><para>
 
-The feature that most distinguishes Debian from other Linux
+The feature that most distinguishes &debian; from other Linux
 distributions is its package management system.  These tools give the
-administrator of a Debian system complete control over the packages
+administrator of a &debian; system complete control over the packages
 installed on that system, including the ability to install a single
 package or automatically update the entire operating system.
 Individual packages can also be protected from being updated.  You can
@@ -59,18 +59,18 @@ compiled yourself and what dependencies it fulfills.
 </para><para>
 
 To protect your system against <quote>Trojan horses</quote> and other malevolent
-software, Debian's servers verify that uploaded packages come from
-their registered Debian maintainers.  Debian packagers also take great
+software, &debian;'s servers verify that uploaded packages come from
+their registered &debian; maintainers.  &debian; packagers also take great
 care to configure their packages in a secure manner.  When security
 problems in shipped packages do appear, fixes are usually available
-very quickly.  With Debian's simple update options, security fixes can
+very quickly.  With &debian;'s simple update options, security fixes can
 be downloaded and installed automatically across the Internet.
 
 </para><para>
 
-The primary, and best, method of getting support for your Debian GNU/Linux
-system and communicating with Debian Developers is through
-the many mailing lists maintained by the Debian Project (there are
+The primary, and best, method of getting support for your &debian; GNU/Linux
+system and communicating with &debian; Developers is through
+the many mailing lists maintained by the &debian; Project (there are
 more than &num-of-debian-maillists; at this writing).  The easiest
 way to subscribe to one or more of these lists is visit
 <ulink url="&url-debian-lists-subscribe;">