summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--en/appendix/preseed.xml2
-rw-r--r--en/install-methods/install-tftp.xml2
-rw-r--r--en/install-methods/usb-setup/x86.xml2
-rw-r--r--en/preparing/bios-setup/i386.xml6
-rw-r--r--en/using-d-i/modules/mdcfg.xml4
-rw-r--r--en/using-d-i/modules/partman.xml2
-rw-r--r--en/using-d-i/using-d-i.xml2
7 files changed, 10 insertions, 10 deletions
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 8e72a23f3..8940dc27d 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -1142,7 +1142,7 @@ The <classname>passwd/root-password-crypted</classname> and
<classname>passwd/user-password-crypted</classname> variables can also
be preseeded with <quote>!</quote> as their value. In that case, the
corresponding account is disabled. This may be convenient for the root
-account, provided of course that an alternative method is setup to allow
+account, provided of course that an alternative method is set up to allow
administrative activities or root login (for instance by using SSH key
authentication or <command>sudo</command>).
diff --git a/en/install-methods/install-tftp.xml b/en/install-methods/install-tftp.xml
index 8e96d4837..3c57d28e4 100644
--- a/en/install-methods/install-tftp.xml
+++ b/en/install-methods/install-tftp.xml
@@ -13,7 +13,7 @@ and the machine configured to support booting of your specific machine.
</para><para>
-You need to setup a TFTP server, and for many machines a DHCP
+You need to set up a TFTP server, and for many machines a DHCP
server<phrase condition="supports-rarp">, or RARP
server</phrase><phrase condition="supports-bootp">, or BOOTP
server</phrase>.
diff --git a/en/install-methods/usb-setup/x86.xml b/en/install-methods/usb-setup/x86.xml
index 50f2d51ae..5e9f28509 100644
--- a/en/install-methods/usb-setup/x86.xml
+++ b/en/install-methods/usb-setup/x86.xml
@@ -5,7 +5,7 @@
<title>USB stick partitioning on &arch-title;</title>
<para>
-We will show how to setup the memory stick to use the first partition,
+We will show how to set up the memory stick to use the first partition,
instead of the entire device.
</para><note><para>
diff --git a/en/preparing/bios-setup/i386.xml b/en/preparing/bios-setup/i386.xml
index f1c6eb17d..455f6e6a1 100644
--- a/en/preparing/bios-setup/i386.xml
+++ b/en/preparing/bios-setup/i386.xml
@@ -13,9 +13,9 @@
BIOS provides the basic functions needed to boot your machine to allow
your operating system to access your hardware. Your system probably
-provides a BIOS set-up menu, which is used to configure the BIOS.
+provides a BIOS setup menu, which is used to configure the BIOS.
Before installing, you <emphasis>must</emphasis> ensure that your BIOS
-is setup correctly; not doing so can lead to intermittent crashes or
+is set up correctly; not doing so can lead to intermittent crashes or
an inability to install Debian.
</para><para>
@@ -111,7 +111,7 @@ try using a shareware/freeware program. Try looking in
<para>
-Many BIOS set-up menus allow you to select the devices that will be
+Many BIOS setup menus allow you to select the devices that will be
used to bootstrap the system. Set this to look for a bootable
operating system on <filename>A:</filename> (the first floppy disk),
then optionally the first CD-ROM device (possibly appearing as
diff --git a/en/using-d-i/modules/mdcfg.xml b/en/using-d-i/modules/mdcfg.xml
index 9eac7b4cb..c0ae399ac 100644
--- a/en/using-d-i/modules/mdcfg.xml
+++ b/en/using-d-i/modules/mdcfg.xml
@@ -12,7 +12,7 @@ residing on single physical drive, but that won't bring you anything
useful.
</para></footnote> in your computer, you can use
-<command>mdcfg</command> to setup your drives for increased
+<command>mdcfg</command> to set up your drives for increased
performance and/or better reliability of your data. The result is
called <firstterm>Multidisk Device</firstterm> (or after its most
famous variant <firstterm>software RAID</firstterm>).
@@ -302,7 +302,7 @@ and use the other three partitions (2 active and 1 spare) for RAID1
</para><para>
-After you setup MD devices to your liking, you can
+After you set up MD devices to your liking, you can
<guimenuitem>Finish</guimenuitem> <command>mdcfg</command> to return
back to the <command>partman</command> to create filesystems on your
new MD devices and assign them the usual attributes like mountpoints.
diff --git a/en/using-d-i/modules/partman.xml b/en/using-d-i/modules/partman.xml
index f0fb3f66e..afddd78a6 100644
--- a/en/using-d-i/modules/partman.xml
+++ b/en/using-d-i/modules/partman.xml
@@ -217,7 +217,7 @@ modify the proposed changes as described below for manual partitioning.
A similar screen to the one shown just above will be displayed if you
choose manual partitioning except that your existing partition table will
-be shown and without the mount points. How to manually setup your partition
+be shown and without the mount points. How to manually set up your partition
table and the usage of partitions by your new Debian system will be covered
in the remainder of this section.
diff --git a/en/using-d-i/using-d-i.xml b/en/using-d-i/using-d-i.xml
index 03ac89cfe..312b8ecde 100644
--- a/en/using-d-i/using-d-i.xml
+++ b/en/using-d-i/using-d-i.xml
@@ -298,7 +298,7 @@ Helps the user with the configuration of the
<term>mdcfg</term><listitem><para>
-Allows the user to setup Software <firstterm>RAID</firstterm>
+Allows the user to set up Software <firstterm>RAID</firstterm>
(Redundant Array of Inexpensive Disks). This Software RAID is usually
superior to the cheap IDE (pseudo hardware) RAID controllers found on
newer motherboards.