summaryrefslogtreecommitdiff
path: root/en/welcome
diff options
context:
space:
mode:
authorSamuel Thibault <sthibault@debian.org>2010-09-20 23:44:21 +0000
committerSamuel Thibault <sthibault@debian.org>2010-09-20 23:44:21 +0000
commit48310375a315fece8013b22cd3bd28d997096d05 (patch)
tree97af00a827545d6c2ecc65540ab6ed5f77fd0e49 /en/welcome
parentbc67d7c9649ede1b64cc596bfc33a8dbfa0da4e7 (diff)
downloadinstallation-guide-48310375a315fece8013b22cd3bd28d997096d05.zip
Rename debian entity to debian-gnu.
Diffstat (limited to 'en/welcome')
-rw-r--r--en/welcome/about-copyright.xml2
-rw-r--r--en/welcome/doc-organization.xml2
-rw-r--r--en/welcome/getting-newest-doc.xml2
-rw-r--r--en/welcome/getting-newest-inst.xml2
-rw-r--r--en/welcome/welcome.xml4
5 files changed, 6 insertions, 6 deletions
diff --git a/en/welcome/about-copyright.xml b/en/welcome/about-copyright.xml
index 9400318ff..39bb9537a 100644
--- a/en/welcome/about-copyright.xml
+++ b/en/welcome/about-copyright.xml
@@ -10,7 +10,7 @@
We're sure that you've read some of the licenses that come with most
commercial software &mdash; they usually say that you can only use one
copy of the software on a single computer. This system's license
-isn't like that at all. We encourage you to put a copy of &debian; on every
+isn't like that at all. We encourage you to put a copy of &debian-gnu; on every
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>
diff --git a/en/welcome/doc-organization.xml b/en/welcome/doc-organization.xml
index db8f9fcd3..222add960 100644
--- a/en/welcome/doc-organization.xml
+++ b/en/welcome/doc-organization.xml
@@ -22,7 +22,7 @@ encourage expert users to jump around in the document.
In general, this manual is arranged in a linear fashion, walking you
through the installation process from start to finish. Here are the
-steps in installing &debian;, and the sections of this document which
+steps in installing &debian-gnu;, and the sections of this document which
correlate with each step:
<orderedlist>
diff --git a/en/welcome/getting-newest-doc.xml b/en/welcome/getting-newest-doc.xml
index 859ac23a3..968f4feec 100644
--- a/en/welcome/getting-newest-doc.xml
+++ b/en/welcome/getting-newest-doc.xml
@@ -9,7 +9,7 @@
This document is constantly being revised. Be sure to check the
<ulink url="&url-release-area;">
Debian &release; pages</ulink> for any last-minute information about
-the &release; release of the &debian; system. Updated versions of
+the &release; release of the &debian-gnu; system. Updated versions of
this installation manual are also available from the
<ulink url="&url-install-manual;">official Install Manual pages</ulink>.
diff --git a/en/welcome/getting-newest-inst.xml b/en/welcome/getting-newest-inst.xml
index 191abdd2f..e20000c0f 100644
--- a/en/welcome/getting-newest-inst.xml
+++ b/en/welcome/getting-newest-inst.xml
@@ -6,7 +6,7 @@
<para>
-For information on how to download &debian; from the Internet
+For information on how to download &debian-gnu; from the Internet
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>
diff --git a/en/welcome/welcome.xml b/en/welcome/welcome.xml
index 5d20fbbc0..b88e83943 100644
--- a/en/welcome/welcome.xml
+++ b/en/welcome/welcome.xml
@@ -5,8 +5,8 @@
<para>
This chapter provides an overview of the Debian Project and
-&debian;. If you already know about the Debian Project's
-history and the &debian; distribution, feel free to skip to
+&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.
</para>