summaryrefslogtreecommitdiff
path: root/en
diff options
context:
space:
mode:
Diffstat (limited to 'en')
-rw-r--r--en/boot-installer/ia64.xml6
-rw-r--r--en/hardware/hardware-supported.xml4
-rw-r--r--en/hardware/supported/amd64.xml2
-rw-r--r--en/hardware/supported/i386.xml2
-rw-r--r--en/partitioning/partition/ia64.xml6
-rw-r--r--en/using-d-i/modules/partman.xml2
6 files changed, 11 insertions, 11 deletions
diff --git a/en/boot-installer/ia64.xml b/en/boot-installer/ia64.xml
index 3fa028406..be6fb04fb 100644
--- a/en/boot-installer/ia64.xml
+++ b/en/boot-installer/ia64.xml
@@ -337,7 +337,7 @@ set up the language locale, network, and disk partitions.
<sect2 arch="ia64" id="boot-tftp"><title>Booting with TFTP</title>
<para>
-Booting an IA64 system from the network is similar to a CD boot.
+Booting an IA-64 system from the network is similar to a CD boot.
The only difference is how the installation kernel is loaded.
The EFI Boot Manager can load and start programs from a server on
the network.
@@ -352,7 +352,7 @@ rather than the CD drive.
<para>
-Network booting an ia64 system requires two architecture-specific actions.
+Network booting an IA-64 system requires two architecture-specific actions.
On the boot server, DHCP and TFTP must be configured to deliver
<command>elilo</command>.
On the client a new boot option must be defined in the EFI boot manager
@@ -364,7 +364,7 @@ to enable loading over a network.
<title>Configuring the Server</title>
<para>
-A suitable TFTP entry for network booting an ia64 system looks something
+A suitable TFTP entry for network booting an IA-64 system looks something
like this:
<informalexample><screen>
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index 936010aa6..44acf92c6 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -49,7 +49,7 @@ variations of each architecture known as <quote>flavors</quote>.
</row>
<row>
- <entry>AMD64 &amp; Intel EM64t</entry>
+ <entry>AMD64 &amp; Intel EM64T</entry>
<entry>amd64</entry>
<entry></entry>
<entry></entry>
@@ -89,7 +89,7 @@ variations of each architecture known as <quote>flavors</quote>.
</row>
<row>
- <entry>Intel ia64-based</entry>
+ <entry>Intel IA-64</entry>
<entry>ia64</entry>
<entry></entry>
<entry></entry>
diff --git a/en/hardware/supported/amd64.xml b/en/hardware/supported/amd64.xml
index a1651a2d8..652bb4ffc 100644
--- a/en/hardware/supported/amd64.xml
+++ b/en/hardware/supported/amd64.xml
@@ -14,7 +14,7 @@ This section merely outlines the basics.
<sect3><title>CPU</title>
<para>
-Both AMD64 and Intel EM64t processors are supported.
+Both AMD64 and Intel EM64T processors are supported.
</para>
</sect3>
diff --git a/en/hardware/supported/i386.xml b/en/hardware/supported/i386.xml
index b052f0a4e..1b52da93d 100644
--- a/en/hardware/supported/i386.xml
+++ b/en/hardware/supported/i386.xml
@@ -22,7 +22,7 @@ processors like the Athlon XP and Intel P4 Xeon.
</para>
<note><para>
-If your system has a 64-bit AMD64, Intel EM64t or Intel Core 2 Duo processor,
+If your system has a 64-bit AMD64, Intel EM64T or Intel Core 2 Duo processor,
you will probably want to use the installer for the amd64 architecture instead
of the installer for the (32-bit) i386 architecture.
diff --git a/en/partitioning/partition/ia64.xml b/en/partitioning/partition/ia64.xml
index c319f6d06..c4b3b6a3a 100644
--- a/en/partitioning/partition/ia64.xml
+++ b/en/partitioning/partition/ia64.xml
@@ -18,9 +18,9 @@ on-disk partitioning.
<title>EFI Recognized Formats</title>
<para>
-The IA64 EFI firmware supports two partition table (or disk label)
+The IA-64 EFI firmware supports two partition table (or disk label)
formats, GPT and MS-DOS. MS-DOS, the format typically used on i386
-PCs, is no longer recommended for IA64 systems. Although
+PCs, is no longer recommended for IA-64 systems. Although
the installer also provides <command>cfdisk</command>,
you should only use <ulink url="parted.txt">
<command>parted</command></ulink> because only it can manage both GPT
@@ -72,7 +72,7 @@ complete, as it scans the partition for bad blocks.
<sect2 arch="ia64"><title>Boot Loader Partition Requirements</title>
<para>
-ELILO, the ia64 boot loader, requires a partition containing a FAT
+ELILO, the IA-64 boot loader, requires a partition containing a FAT
file system with the <userinput>boot</userinput> flag set.
The partition must be big enough to hold the boot loader and any
kernels or RAMdisks you may wish to boot. A minimum size would be
diff --git a/en/using-d-i/modules/partman.xml b/en/using-d-i/modules/partman.xml
index 49c82a75d..6d65457e1 100644
--- a/en/using-d-i/modules/partman.xml
+++ b/en/using-d-i/modules/partman.xml
@@ -135,7 +135,7 @@ for the swap partition, will be created inside the LVM partition.
</para><para arch="ia64">
-If you choose guided partitioning for your IA64 system, there
+If you choose guided partitioning for your IA-64 system, there
will be an additional partition, formatted as a FAT16 bootable filesystem,
for the EFI boot loader.
There is also an additional menu item in the formatting menu to manually