summaryrefslogtreecommitdiff
path: root/en/welcome
diff options
context:
space:
mode:
authorSamuel Thibault <sthibault@debian.org>2010-09-05 22:42:14 +0000
committerSamuel Thibault <sthibault@debian.org>2010-09-05 22:42:14 +0000
commit5784974896a206cfb904410047156223fdd6d849 (patch)
tree75bb03329f8d2d4ea390afe34791897fe6b2630e /en/welcome
parentc2ede88b730e074da89d3aa310aae7419f78fdbd (diff)
downloadinstallation-guide-5784974896a206cfb904410047156223fdd6d849.zip
* Replace Linuxish bits with per-port entities in "What is Debian GNU/Linux?"
Diffstat (limited to 'en/welcome')
-rw-r--r--en/welcome/what-is-debian-linux.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/en/welcome/what-is-debian-linux.xml b/en/welcome/what-is-debian-linux.xml
index db2cd2306..ef172281b 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;?</title>
+ <title>What is Debian GNU/Linux?</title>
<para>
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;. 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
@@ -68,7 +68,7 @@ be downloaded and installed automatically across the Internet.
</para><para>
-The primary, and best, method of getting support for your &debian;
+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