summaryrefslogtreecommitdiff
path: root/en/preparing
diff options
context:
space:
mode:
Diffstat (limited to 'en/preparing')
-rw-r--r--en/preparing/backup.xml2
-rw-r--r--en/preparing/bios-setup/s390.xml4
-rw-r--r--en/preparing/install-overview.xml6
-rw-r--r--en/preparing/minimum-hardware-reqts.xml2
-rw-r--r--en/preparing/non-debian-partitioning.xml8
-rw-r--r--en/preparing/nondeb-part/powerpc.xml2
-rw-r--r--en/preparing/pre-install-bios-setup.xml2
-rw-r--r--en/preparing/preparing.xml2
8 files changed, 14 insertions, 14 deletions
diff --git a/en/preparing/backup.xml b/en/preparing/backup.xml
index 548646bb7..2b86e17bd 100644
--- a/en/preparing/backup.xml
+++ b/en/preparing/backup.xml
@@ -8,7 +8,7 @@
Before you start, make sure to back up every file that is now on your
system. If this is the first time a non-native operating system has
been installed on your computer, it's quite likely you will need to
-re-partition your disk to make room for &debian;. Anytime you
+re-partition your disk to make room for &debian-gnu;. Anytime you
partition your disk, you run a risk of losing everything on the
disk, no matter what program you use to do it. The programs used in
installation are quite reliable and most have seen years of use; but
diff --git a/en/preparing/bios-setup/s390.xml b/en/preparing/bios-setup/s390.xml
index 3a7e141e4..6a5edf30e 100644
--- a/en/preparing/bios-setup/s390.xml
+++ b/en/preparing/bios-setup/s390.xml
@@ -5,7 +5,7 @@
<sect2 arch="s390"><title>BIOS Setup</title>
<para>
-In order to install &debian; on a &arch-title; or zSeries
+In order to install &debian-gnu; on a &arch-title; or zSeries
machine you have first boot a kernel into the system. The boot
mechanism of this platform is inherently different to other ones,
especially from PC-like systems: there are no floppy devices available
@@ -94,7 +94,7 @@ FTP.
</para><para>
The installation server needs to copy the exact directory structure
-from any &debian; mirror, but only the s390 and
+from any &debian-gnu; mirror, but only the s390 and
architecture-independent files are required. You can also copy the
contents of all installation CDs into such a directory tree.
diff --git a/en/preparing/install-overview.xml b/en/preparing/install-overview.xml
index 2b66eb8c1..a52e2cd8c 100644
--- a/en/preparing/install-overview.xml
+++ b/en/preparing/install-overview.xml
@@ -20,7 +20,7 @@ the new OS.
</para><para>
-Under &debian;, it is much more likely that your OS can be repaired
+Under &debian-gnu;, it is much more likely that your OS can be repaired
rather than replaced if things go wrong. Upgrades never require a
wholesale installation; you can always upgrade in-place. And the
programs are almost always compatible with successive OS releases. If
@@ -114,7 +114,7 @@ Watch the automatic download/install/setup of the
<listitem><para>
Install a <firstterm>boot loader</firstterm>
-which can start up &debian; and/or your existing system.
+which can start up &debian-gnu; and/or your existing system.
</para></listitem>
<listitem><para>
@@ -164,7 +164,7 @@ one of the available graphical desktop environments.
If you choose not to select the <quote>Desktop environment</quote> task,
you will only have a relatively basic, command line driven system.
Installing the Desktop environment task is optional because it requires a
-fairly large amount of disk space, and because many &debian; systems are
+fairly large amount of disk space, and because many &debian-gnu; systems are
servers which don't really have any need for a graphical user interface
to do their job.
diff --git a/en/preparing/minimum-hardware-reqts.xml b/en/preparing/minimum-hardware-reqts.xml
index 08b0cb240..8c41f57d3 100644
--- a/en/preparing/minimum-hardware-reqts.xml
+++ b/en/preparing/minimum-hardware-reqts.xml
@@ -87,7 +87,7 @@ files and data.
</para><para>
-Disk space required for the smooth operation of the &debian; system
+Disk space required for the smooth operation of the &debian-gnu; system
itself is taken into account in these recommended system requirements.
Notably, the <filename>/var</filename> partition contains
a lot of state information specific to Debian in addition to its regular
diff --git a/en/preparing/non-debian-partitioning.xml b/en/preparing/non-debian-partitioning.xml
index 6a8803db5..37dad488c 100644
--- a/en/preparing/non-debian-partitioning.xml
+++ b/en/preparing/non-debian-partitioning.xml
@@ -66,7 +66,7 @@ installer's included partitioning program can handle the job nicely.
</para><para>
If your machine has only one hard disk, and you would like to
-completely replace the current operating system with &debian;,
+completely replace the current operating system with &debian-gnu;,
you also can wait to partition as part of the installation process
(<xref linkend="di-partition"/>), after you have booted the
installation system. However this only works if you plan to boot the
@@ -101,7 +101,7 @@ starting the installation to create partitionable space for
Debian. If some of the partitions will be owned by other operating
systems, you should create those partitions using native operating
system partitioning programs. We recommend that you do
-<emphasis>not</emphasis> attempt to create partitions for &debian;
+<emphasis>not</emphasis> attempt to create partitions for &debian-gnu;
using another operating system's tools. Instead, you should just
create the native operating system's partitions you will want to
retain.
@@ -121,7 +121,7 @@ the native system first saves you trouble.
</para><para arch="powerpc">
-In order for OpenFirmware to automatically boot &debian; the &arch-parttype;
+In order for OpenFirmware to automatically boot &debian-gnu; the &arch-parttype;
partitions should appear before all other partitions on the disk,
especially MacOS boot partitions. This should be kept in mind when
pre-partitioning; you should create a &arch-parttype; placeholder partition to
@@ -157,7 +157,7 @@ booting to force the CD to become the active MacOS system.</phrase>
Use the native partitioning tools to create native system
partition(s). Leave either a place holder partition or free space for
-&debian;.
+&debian-gnu;.
</para></listitem>
<listitem><para>
diff --git a/en/preparing/nondeb-part/powerpc.xml b/en/preparing/nondeb-part/powerpc.xml
index 948995d9e..f9baf3bbc 100644
--- a/en/preparing/nondeb-part/powerpc.xml
+++ b/en/preparing/nondeb-part/powerpc.xml
@@ -15,7 +15,7 @@ disk driver partitions don't show up in <application>Drive Setup</application>.
Remember to create a placeholder partition for GNU/Linux, preferably
positioned first in the disk layout. it doesn't matter what type it
-is, it will be deleted and replaced later inside the &debian; installer.
+is, it will be deleted and replaced later inside the &debian-gnu; installer.
</para><para>
diff --git a/en/preparing/pre-install-bios-setup.xml b/en/preparing/pre-install-bios-setup.xml
index 3bf222467..564788045 100644
--- a/en/preparing/pre-install-bios-setup.xml
+++ b/en/preparing/pre-install-bios-setup.xml
@@ -11,7 +11,7 @@ this involves checking and possibly changing firmware settings for
your system. The <quote>firmware</quote> is the core software used by the
hardware; it is most critically invoked during the bootstrap process
(after power-up). Known hardware issues affecting the reliability of
-&debian; on your system are also highlighted.
+&debian-gnu; on your system are also highlighted.
</para>
diff --git a/en/preparing/preparing.xml b/en/preparing/preparing.xml
index cdedadffc..1ed52ff71 100644
--- a/en/preparing/preparing.xml
+++ b/en/preparing/preparing.xml
@@ -2,7 +2,7 @@
<!-- $Id$ -->
<chapter id="preparing">
- <title>Before Installing &debian;</title>
+ <title>Before Installing &debian-gnu;</title>
<para>
This chapter deals with the preparation for installing Debian before you even