The ref '9da80dce8fbf4ceed3cafc2b57ae98fc20dc7aca' was updated from:
71fcbf874cf647655d844d7ed9d6b18554f2beba
To:
71fcbf874cf647655d844d7ed9d6b18554f2beba
This is unexpected because:
'9da80dce8fbf4ceed3cafc2b57ae98fc20dc7aca' is not in refs/heads/ or refs/tags/
The ref '71fcbf874cf647655d844d7ed9d6b18554f2beba' was updated from:
b89479e3475f67e98174702d9c7e2233a92a7f6e
To:
b89479e3475f67e98174702d9c7e2233a92a7f6e
This is unexpected because:
'71fcbf874cf647655d844d7ed9d6b18554f2beba' is not in refs/heads/ or refs/tags/
The ref 'b89479e3475f67e98174702d9c7e2233a92a7f6e' was updated from:
16be275b9235231c90748f41a22694de1847b797
To:
16be275b9235231c90748f41a22694de1847b797
This is unexpected because:
'b89479e3475f67e98174702d9c7e2233a92a7f6e' is not in refs/heads/ or refs/tags/
en-US/Automatic_Partitioning_common-para-1.xml | 5 +++--
en-US/Automatic_Partitioning_common-para-2.xml | 5 +++--
en-US/Automatic_Partitioning_common-para-5.xml | 9 ++++-----
en-US/Automatic_Partitioning_x86-variablelist-1.xml | 2 +-
en-US/Disk_Partitioning_Setup_common-para-1.xml | 5 +++--
en-US/Disk_Partitioning_Setup_common-para-2.xml | 8 +++-----
en-US/Encrypt-x86.xml | 19 +++++++++++++++++++
en-US/Encrypt_common-figure-1.xml | 19 +++++++++++++++++++
en-US/Encrypt_common-para-1.xml | 7 +++++++
en-US/Encrypt_common-para-2.xml | 7 +++++++
en-US/Encrypt_common-title-1.xml | 7 +++++++
en-US/Graphical_Installation-x86.xml | 4 ++--
12 files changed, 78 insertions(+), 19 deletions(-)
New commits:
commit f0926a04e561127e1ec6e83e731176800fb190be
Author: Ruediger Landmann <r.landmann(a)redhat.com>
Date: Thu Apr 29 21:53:28 2010 +1000
Update section 7.18, add Encryption step
diff --git a/en-US/Automatic_Partitioning_common-para-1.xml b/en-US/Automatic_Partitioning_common-para-1.xml
index e9c9d2a..75368cd 100644
--- a/en-US/Automatic_Partitioning_common-para-1.xml
+++ b/en-US/Automatic_Partitioning_common-para-1.xml
@@ -6,5 +6,6 @@
]>
<para>
- Create default layout allows you to have some control concerning what data is removed (if any) from your system. Your options are:
-</para>
\ No newline at end of file
+ Your options are:
+</para>
+
diff --git a/en-US/Automatic_Partitioning_common-para-2.xml b/en-US/Automatic_Partitioning_common-para-2.xml
index 2ebd0ad..9eda6af 100644
--- a/en-US/Automatic_Partitioning_common-para-2.xml
+++ b/en-US/Automatic_Partitioning_common-para-2.xml
@@ -3,5 +3,6 @@
]>
<para>
- Using your mouse, choose the storage drive(s) on which you want Fedora to be installed. If you have two or more drives, you can choose which drive(s) should contain this installation. Unselected drives, and any data on them, are not touched.
-</para>
\ No newline at end of file
+ Choose your preferred partitioning method by clicking the radio button to the left of its description in the dialog box.
+</para>
+
diff --git a/en-US/Automatic_Partitioning_common-para-5.xml b/en-US/Automatic_Partitioning_common-para-5.xml
index f5e6498..2b7e439 100644
--- a/en-US/Automatic_Partitioning_common-para-5.xml
+++ b/en-US/Automatic_Partitioning_common-para-5.xml
@@ -3,9 +3,8 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
- <para>
- Select <guilabel>Encrypt system</guilabel> to encrypt all
- partitions except the <filename class="partition">/boot</filename>
- partition.
- </para>
+<para>
+ Select <guilabel>Encrypt system</guilabel> to encrypt all partitions except the <filename class="partition">/boot</filename> partition. Refer to <xref linkend="Disk_Encryption_Guide"/> for information on encryption.
+</para>
+
diff --git a/en-US/Automatic_Partitioning_x86-variablelist-1.xml b/en-US/Automatic_Partitioning_x86-variablelist-1.xml
index def1351..e47d35c 100644
--- a/en-US/Automatic_Partitioning_x86-variablelist-1.xml
+++ b/en-US/Automatic_Partitioning_x86-variablelist-1.xml
@@ -16,7 +16,7 @@
<term>Use Free Space</term>
<listitem>
<para>
- Select this option to retain your current data and partitions and install Red Hat Enterprise Linux in the unused space available on the storage drives. Ensure that there is sufficient space available on the storage drives before you select this option — refer to <xref linkend="Disk_Space-x86"/>.
+ Select this option to retain your current data and partitions and install Fedora in the unused space available on the storage drives. Ensure that there is sufficient space available on the storage drives before you select this option — refer to <xref linkend="Disk_Space-x86"/>.
</para>
</listitem>
</varlistentry>
diff --git a/en-US/Disk_Partitioning_Setup_common-para-1.xml b/en-US/Disk_Partitioning_Setup_common-para-1.xml
index dbe51bc..dfd253f 100644
--- a/en-US/Disk_Partitioning_Setup_common-para-1.xml
+++ b/en-US/Disk_Partitioning_Setup_common-para-1.xml
@@ -3,5 +3,6 @@
]>
<para>
- On this screen you can choose to create the default layout or choose to manual partition using the <guimenuitem>Create custom layout</guimenuitem> option.
-</para>
\ No newline at end of file
+ On this screen you can choose to create the default partition layout in one of four different ways, or choose to partition storage devices manually to create a custom layout.
+</para>
+
diff --git a/en-US/Disk_Partitioning_Setup_common-para-2.xml b/en-US/Disk_Partitioning_Setup_common-para-2.xml
index def803e..3798e1c 100644
--- a/en-US/Disk_Partitioning_Setup_common-para-2.xml
+++ b/en-US/Disk_Partitioning_Setup_common-para-2.xml
@@ -1,10 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-
-
-
]>
<para>
- The first four options allow you to perform an automated installation without having to partition your drive(s) yourself. If you do not feel comfortable with partitioning your system, it is recommended that you <emphasis>do not</emphasis> choose to create a custom layout and instead let the installation program partition for you.
-</para>
\ No newline at end of file
+ The first four options allow you to perform an automated installation without having to partition your storage devices yourself. If you do not feel comfortable with partitioning your system, choose one of these options and let the installation program partition the storage devices for you. Depending on the option that you choose, you can still control what data (if any) is removed from the system.
+</para>
+
diff --git a/en-US/Encrypt-x86.xml b/en-US/Encrypt-x86.xml
new file mode 100644
index 0000000..f69e010
--- /dev/null
+++ b/en-US/Encrypt-x86.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<section id="encrypt-x86">
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Encrypt_common-title-1.xml"/>
+ <!-- Encrypt Partitions -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Encrypt_common-para-1.xml"/>
+ <!-- Encrypt Partitions -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Encrypt_common-figure-1.xml"/>
+ <!-- Enter passphrase for encrypted partition -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Encrypt_common-para-2.xml"/>
+ <!-- Choose a phassphrase -->
+
+</section>
+
diff --git a/en-US/Encrypt_common-figure-1.xml b/en-US/Encrypt_common-figure-1.xml
new file mode 100644
index 0000000..5c3e3ec
--- /dev/null
+++ b/en-US/Encrypt_common-figure-1.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<figure>
+ <title>
+ Enter passphrase for encrypted partition
+ </title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/encrypt/passphrase.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <para>
+ The dialog contains text boxes to enter a passphrase and to confirm it.
+ </para>
+ </textobject>
+ </mediaobject>
+</figure>
diff --git a/en-US/Encrypt_common-para-1.xml b/en-US/Encrypt_common-para-1.xml
new file mode 100644
index 0000000..f407c75
--- /dev/null
+++ b/en-US/Encrypt_common-para-1.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+ If you selected the <guilabel>Encrypt System</guilabel> option, the installater prompts you for a passphrase with which to encrypt the partitions on the system.
+</para>
diff --git a/en-US/Encrypt_common-para-2.xml b/en-US/Encrypt_common-para-2.xml
new file mode 100644
index 0000000..116b7ba
--- /dev/null
+++ b/en-US/Encrypt_common-para-2.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+ Choose a passphrase and type it into each of the two fields in the dialog box. You must provide this passphrase every time that the system boots.
+</para>
diff --git a/en-US/Encrypt_common-title-1.xml b/en-US/Encrypt_common-title-1.xml
new file mode 100644
index 0000000..2782f83
--- /dev/null
+++ b/en-US/Encrypt_common-title-1.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<title>
+ Encrypt Partitions
+</title>
diff --git a/en-US/Graphical_Installation-x86.xml b/en-US/Graphical_Installation-x86.xml
index 5d405b4..adc61ab 100644
--- a/en-US/Graphical_Installation-x86.xml
+++ b/en-US/Graphical_Installation-x86.xml
@@ -261,8 +261,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Setup-x86.xml"/>
<!-- Disk Partitioning Setup -->
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Automatic_Partitioning-x86.xml"/>
- <!-- Default Layout -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Encrypt-x86.xml"/>
+ <!-- Disk Encryption -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning-x86.xml"/>
<!-- Partitioning Your System
en-US/Initializing_Hard_Disk-x86.xml | 5
en-US/Initializing_Hard_Disk_common-indexterm.xml | 1
en-US/Initializing_Hard_Disk_common-note-1.xml | 1
en-US/Initializing_Hard_Disk_common-para-1.xml | 3
en-US/Initializing_Hard_Disk_common-para-2.xml | 3
en-US/Initializing_Hard_Disk_common-para-3.xml | 9
en-US/Initializing_Hard_Disk_common-title.xml | 1
en-US/Upgrade-x86.xml | 2
en-US/Upgrading-common-figure-1.xml | 14 +
en-US/Upgrading-common-figure-2.xml | 14 +
en-US/Upgrading-common-indexterm-1.xml | 11 +
en-US/Upgrading-common-note-1.xml | 11 +
en-US/Upgrading-common-note-2.xml | 12 +
en-US/Upgrading-common-para-1.xml | 9
en-US/Upgrading-common-para-2.xml | 8
en-US/Upgrading-common-para-3.xml | 9
en-US/Upgrading-common-para-4.xml | 9
en-US/Upgrading-common-para-5.xml | 9
en-US/Upgrading-common-para-6.xml | 9
en-US/Upgrading-common-para-7.xml | 9
en-US/Upgrading-common-para-8.xml | 10
en-US/Upgrading-common-para-9.xml | 11 +
en-US/Upgrading-common-screen-1.xml | 8
en-US/Upgrading-common-screen-2.xml | 8
en-US/Upgrading-common-title-1.xml | 8
en-US/Upgrading-common-title-2.xml | 8
en-US/Upgrading-common-title-3.xml | 8
en-US/Upgrading-common-title-4.xml | 8
en-US/Upgrading-common-warning-1.xml | 13 +
en-US/adminoptions.xml | 4
en-US/networkconfig-fedora.xml | 6
en-US/nextsteps.xml | 2
en-US/upgrading-fedora.xml | 232 ++++++++--------------
33 files changed, 323 insertions(+), 152 deletions(-)
New commits:
commit 3f36880298e4c0dfb1d7f929526106ab6064d8eb
Author: Ruediger Landmann <r.landmann(a)redhat.com>
Date: Thu Apr 29 21:26:50 2010 +1000
Update sections 7.14 and 7.15
diff --git a/en-US/Initializing_Hard_Disk-x86.xml b/en-US/Initializing_Hard_Disk-x86.xml
index 9be45d1..8c91060 100644
--- a/en-US/Initializing_Hard_Disk-x86.xml
+++ b/en-US/Initializing_Hard_Disk-x86.xml
@@ -14,6 +14,10 @@
href="Initializing_Hard_Disk_common-para-1.xml"/>
<!-- If no readable partition tables are found on existing hard disks... -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="Initializing_Hard_Disk_common-para-3.xml"/>
+ <!-- The installation program presents you with a separate dialog for each disk... -->
+
<figure float="0" id="fig-initializing-x86"><title>Warning screen – initializing hard drive</title>
<mediaobject>
<imageobject><imagedata fileref="images/initializing/initializing.png" format="PNG"/></imageobject>
@@ -33,3 +37,4 @@
<!-- Detach Unneeded Disks -->
</section>
+
diff --git a/en-US/Initializing_Hard_Disk_common-indexterm.xml b/en-US/Initializing_Hard_Disk_common-indexterm.xml
index 4272f8b..a1cc0a2 100644
--- a/en-US/Initializing_Hard_Disk_common-indexterm.xml
+++ b/en-US/Initializing_Hard_Disk_common-indexterm.xml
@@ -6,3 +6,4 @@
<primary>Hard disk</primary>
<secondary>initializing</secondary>
</indexterm>
+
diff --git a/en-US/Initializing_Hard_Disk_common-note-1.xml b/en-US/Initializing_Hard_Disk_common-note-1.xml
index ba9e805..4371646 100644
--- a/en-US/Initializing_Hard_Disk_common-note-1.xml
+++ b/en-US/Initializing_Hard_Disk_common-note-1.xml
@@ -9,3 +9,4 @@
afterward, power off the system, detach it, and restart the
installation.</para>
</warning>
+
diff --git a/en-US/Initializing_Hard_Disk_common-para-1.xml b/en-US/Initializing_Hard_Disk_common-para-1.xml
index e60db28..0be9422 100644
--- a/en-US/Initializing_Hard_Disk_common-para-1.xml
+++ b/en-US/Initializing_Hard_Disk_common-para-1.xml
@@ -5,4 +5,5 @@
<para>
If no readable partition tables are found on existing hard disks, the installation program asks to initialize the hard disk. This operation makes any existing data on the hard disk unreadable. If your system has a brand new hard disk with no operating system installed, or you have removed all partitions on the hard disk, click <guibutton>Re-initialize drive</guibutton>.
</para>
-
\ No newline at end of file
+
+
diff --git a/en-US/Initializing_Hard_Disk_common-para-2.xml b/en-US/Initializing_Hard_Disk_common-para-2.xml
index 3b0c20f..3d798b6 100644
--- a/en-US/Initializing_Hard_Disk_common-para-2.xml
+++ b/en-US/Initializing_Hard_Disk_common-para-2.xml
@@ -5,4 +5,5 @@
<para>
Certain RAID systems or other nonstandard configurations may be unreadable to the installation program and the prompt to initialize the hard disk may appear. The installation program responds to the physical disk structures it is able to detect.
</para>
-
\ No newline at end of file
+
+
diff --git a/en-US/Initializing_Hard_Disk_common-para-3.xml b/en-US/Initializing_Hard_Disk_common-para-3.xml
new file mode 100644
index 0000000..b1a9060
--- /dev/null
+++ b/en-US/Initializing_Hard_Disk_common-para-3.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+ The installation program presents you with a separate dialog for each disk on which it cannot read a valid partition table. Click the <guibutton>Ignore all</guibutton> button or <guibutton>Re-initialize all</guibutton> button to apply the same answer to all devices.
+</para>
+
+
diff --git a/en-US/Initializing_Hard_Disk_common-title.xml b/en-US/Initializing_Hard_Disk_common-title.xml
index 20a8a50..3e12d0b 100644
--- a/en-US/Initializing_Hard_Disk_common-title.xml
+++ b/en-US/Initializing_Hard_Disk_common-title.xml
@@ -3,3 +3,4 @@
]>
<title>Initializing the Hard Disk</title>
+
diff --git a/en-US/Upgrade-x86.xml b/en-US/Upgrade-x86.xml
index db15902..a7dc2bc 100644
--- a/en-US/Upgrade-x86.xml
+++ b/en-US/Upgrade-x86.xml
@@ -29,7 +29,7 @@
</para>
<para>
- You can also upgrade a Fedora installation by starting the installation process by any of the methods described in <xref linkend="ch-guimode-x86"/>. If the installer detects a previous Fedora installation on the system, it will ask you whether you want to upgrade that installation — refer to <xref linkend="sn-upgrade-examine"/>
+ You can also upgrade a Fedora installation by starting the installation process by any of the methods described in <xref linkend="ch-guimode-x86"/>. If the installer detects a previous Fedora installation on the system, it will ask you whether you want to upgrade that installation — refer to <xref linkend="sn-upgrade-examine-x86"/>
</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrade_common-section-2-para-1.xml"/>
diff --git a/en-US/Upgrading-common-figure-1.xml b/en-US/Upgrading-common-figure-1.xml
new file mode 100644
index 0000000..0a6ec47
--- /dev/null
+++ b/en-US/Upgrading-common-figure-1.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<figure float="0"><title>The Upgrade Dialog</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/upgrading/upgrading.png" format="PNG"/></imageobject>
+ <textobject><para>
+ The Upgrade Dialog
+ </para>
+ </textobject>
+ </mediaobject>
+</figure>
diff --git a/en-US/Upgrading-common-figure-2.xml b/en-US/Upgrading-common-figure-2.xml
new file mode 100644
index 0000000..cd3356e
--- /dev/null
+++ b/en-US/Upgrading-common-figure-2.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<figure float="0"><title>The Upgrade Boot Loader Dialog</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/upgrading/upgradebootloader.png" format="PNG"/></imageobject>
+ <textobject><para>
+ The dialog includes three radio buttons, labeled <guilabel>Update boot loader configuration</guilabel>, <guilabel>Skip boot loader updating</guilabel>, and <guilabel>Create new boot loader configuration</guilabel>
+ </para>
+ </textobject>
+ </mediaobject>
+</figure>
diff --git a/en-US/Upgrading-common-indexterm-1.xml b/en-US/Upgrading-common-indexterm-1.xml
new file mode 100644
index 0000000..2c73900
--- /dev/null
+++ b/en-US/Upgrading-common-indexterm-1.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<indexterm>
+ <primary>boot loader</primary>
+ <secondary>upgrading</secondary>
+</indexterm>
+
+
diff --git a/en-US/Upgrading-common-note-1.xml b/en-US/Upgrading-common-note-1.xml
new file mode 100644
index 0000000..1e03a5e
--- /dev/null
+++ b/en-US/Upgrading-common-note-1.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<note>
+ <title>Manually Installed Software</title>
+ <para>
+ Software you have installed manually on your existing Fedora or Red Hat Linux system may behave differently after an upgrade. You may need to manually reinstall or recompile this software after an upgrade to ensure it performs correctly on the updated system.
+ </para>
+</note>
diff --git a/en-US/Upgrading-common-note-2.xml b/en-US/Upgrading-common-note-2.xml
new file mode 100644
index 0000000..ad90b5e
--- /dev/null
+++ b/en-US/Upgrading-common-note-2.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<note>
+ <title>Installations are Recommended</title>
+ <para>
+ In general, the Fedora Project recommends that you keep user data on a separate <filename class="partition">/home</filename> partition and perform a fresh installation. For more information on partitions and how to set them up, refer to <xref linkend="s1-diskpartsetup-x86"/>.
+ </para>
+</note>
+
diff --git a/en-US/Upgrading-common-para-1.xml b/en-US/Upgrading-common-para-1.xml
new file mode 100644
index 0000000..6ae74c3
--- /dev/null
+++ b/en-US/Upgrading-common-para-1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+ The installation system automatically detects any existing installation of Red Hat Enterprise Linux. The upgrade process updates the existing system software with new versions, but does not remove any data from users' home directories. The existing partition structure on your hard drives does not change. Your system configuration changes only if a package upgrade demands it. Most package upgrades do not change system configuration, but rather install an additional configuration file for you to examine later.
+</para>
+
diff --git a/en-US/Upgrading-common-para-2.xml b/en-US/Upgrading-common-para-2.xml
new file mode 100644
index 0000000..1987193
--- /dev/null
+++ b/en-US/Upgrading-common-para-2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+ Note that the installation medium that you are using might not contain all the software packages that you need to upgrade your computer. In particular, the Fedora live CD contains a relatively small subset of the packages available in Fedora. To update packages that are not included on the installation medium, make sure that you select the <literal>Fedora &PRODVER; - <replaceable>architecture</replaceable></literal> or the <literal>Fedora &PRODVER; - <replaceable>architecture</replaceable> - Updates</literal> repository the during package group selection — refer to <xref linkend="sn-additional-repos"/>.
+</para>
diff --git a/en-US/Upgrading-common-para-3.xml b/en-US/Upgrading-common-para-3.xml
new file mode 100644
index 0000000..650487d
--- /dev/null
+++ b/en-US/Upgrading-common-para-3.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+ If your system contains a Fedora or Red Hat Linux installation, a dialog appears asking whether you want to upgrade that installation. To perform an upgrade of an existing system, choose the appropriate installation from the drop-down list and select <guibutton>Next</guibutton>.
+</para>
+
diff --git a/en-US/Upgrading-common-para-4.xml b/en-US/Upgrading-common-para-4.xml
new file mode 100644
index 0000000..bd350bb
--- /dev/null
+++ b/en-US/Upgrading-common-para-4.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+ If you choose to upgrade your system using the installation program, any software that is not part of the Fedora distribution that conflicts with software that is part of the distribution is overwritten. Before you begin an upgrade this way, make a list of your system's current packages for later reference:
+</para>
+
diff --git a/en-US/Upgrading-common-para-5.xml b/en-US/Upgrading-common-para-5.xml
new file mode 100644
index 0000000..9fec8a5
--- /dev/null
+++ b/en-US/Upgrading-common-para-5.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+ After installation, consult this list to discover which packages you may need to rebuild or retrieve from sources other than the Fedora repositories.
+</para>
+
diff --git a/en-US/Upgrading-common-para-6.xml b/en-US/Upgrading-common-para-6.xml
new file mode 100644
index 0000000..4f725df
--- /dev/null
+++ b/en-US/Upgrading-common-para-6.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+ Next, make a backup of any system configuration data:
+</para>
+
diff --git a/en-US/Upgrading-common-para-7.xml b/en-US/Upgrading-common-para-7.xml
new file mode 100644
index 0000000..546a4ca
--- /dev/null
+++ b/en-US/Upgrading-common-para-7.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+ Make a complete backup of any important data before performing an upgrade. Important data may include the contents of your entire <filename class="directory">/home</filename> directory as well as content from services such as an Apache, FTP, or SQL server, or a source code management system. Although upgrades are not destructive, if you perform one improperly there is a small possibility of data loss.
+</para>
+
diff --git a/en-US/Upgrading-common-para-8.xml b/en-US/Upgrading-common-para-8.xml
new file mode 100644
index 0000000..4c6f153
--- /dev/null
+++ b/en-US/Upgrading-common-para-8.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+ For more information on completing the upgrade process later, refer to <xref linkend="sn-finishing-upgrade"/>.
+</para>
+
+
diff --git a/en-US/Upgrading-common-para-9.xml b/en-US/Upgrading-common-para-9.xml
new file mode 100644
index 0000000..ccdf7a9
--- /dev/null
+++ b/en-US/Upgrading-common-para-9.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+ If the existing boot loader was installed by a Linux distribution, the installation system can modify it to load the new Fedora system. To update the existing Linux boot loader, select <guilabel>Update boot loader configuration</guilabel>. This is the default behavior when you upgrade an existing Red Hat Linux or Fedora installation.
+</para>
+
+
+
diff --git a/en-US/Upgrading-common-screen-1.xml b/en-US/Upgrading-common-screen-1.xml
new file mode 100644
index 0000000..018eb07
--- /dev/null
+++ b/en-US/Upgrading-common-screen-1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE screen PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<screen><command>rpm -qa --qf '%{NAME} %{VERSION}-%{RELEASE} %{ARCH}\n' > ~/old-pkglist.txt</command></screen>
+
+
diff --git a/en-US/Upgrading-common-screen-2.xml b/en-US/Upgrading-common-screen-2.xml
new file mode 100644
index 0000000..82ffb50
--- /dev/null
+++ b/en-US/Upgrading-common-screen-2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE screen PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<screen><command>su -c 'tar czf /tmp/etc-`date +%F`.tar.gz /etc' </command>
+<command>su -c 'mv /tmp/etc-*.tar.gz /home'</command></screen>
+
diff --git a/en-US/Upgrading-common-title-1.xml b/en-US/Upgrading-common-title-1.xml
new file mode 100644
index 0000000..ee9978a
--- /dev/null
+++ b/en-US/Upgrading-common-title-1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<title>
+ Upgrading an Existing System
+</title>
diff --git a/en-US/Upgrading-common-title-2.xml b/en-US/Upgrading-common-title-2.xml
new file mode 100644
index 0000000..75b1ba5
--- /dev/null
+++ b/en-US/Upgrading-common-title-2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<title>
+ The Upgrade Dialog
+</title>
diff --git a/en-US/Upgrading-common-title-3.xml b/en-US/Upgrading-common-title-3.xml
new file mode 100644
index 0000000..121acd3
--- /dev/null
+++ b/en-US/Upgrading-common-title-3.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<title>
+ Upgrading Using the Installer
+</title>
diff --git a/en-US/Upgrading-common-title-4.xml b/en-US/Upgrading-common-title-4.xml
new file mode 100644
index 0000000..873eee4
--- /dev/null
+++ b/en-US/Upgrading-common-title-4.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<title>
+ Upgrading Boot Loader Configuration
+</title>
diff --git a/en-US/Upgrading-common-warning-1.xml b/en-US/Upgrading-common-warning-1.xml
new file mode 100644
index 0000000..43881fd
--- /dev/null
+++ b/en-US/Upgrading-common-warning-1.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE warning PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<warning>
+ <title>Storing Backups</title>
+ <para>
+ Note that the above examples store backup materials in a <filename class="directory">/home</filename> directory. If your <filename class="directory">/home</filename> directory is not a separate partition, <emphasis>you should not follow these examples verbatim!</emphasis> Store your backups on another device such as CD or DVD discs or an external hard disk.
+ </para>
+</warning>
+
+
diff --git a/en-US/adminoptions.xml b/en-US/adminoptions.xml
index 4c5e4ce..f8bbd10 100644
--- a/en-US/adminoptions.xml
+++ b/en-US/adminoptions.xml
@@ -257,7 +257,7 @@
<screen>
<userinput>linux ip=<replaceable>192.168.1.10</replaceable> netmask=<replaceable>255.255.255.0</replaceable> gateway=<replaceable>192.168.1.1</replaceable> dns=<replaceable>192.168.1.2,192.168.1.3</replaceable></userinput>
</screen>
- <note>
+ <!-- <note>
<title>Configuring the Installed System</title>
<para>
@@ -266,7 +266,7 @@
<xref linkend="sn-networkconfig-fedora_manual-configuration"/> for more information on
configuring the network settings for the installed system.
</para>
- </note>
+ </note> -->
</section>
</section>
<section id="sn-remoteaccess-installation">
diff --git a/en-US/networkconfig-fedora.xml b/en-US/networkconfig-fedora.xml
index 4ce0512..d5f71e6 100644
--- a/en-US/networkconfig-fedora.xml
+++ b/en-US/networkconfig-fedora.xml
@@ -6,7 +6,7 @@
<!-- $Id: -->
<section id="sn-networkconfig-fedora">
- <title>Network Configuration</title>
+ <title>Setting the Hostname</title>
<!-- Indexterms -->
<indexterm>
@@ -78,7 +78,7 @@
</para>
</note>
- <section id="sn-networkconfig-fedora_manual-configuration">
+<!-- <section id="sn-networkconfig-fedora_manual-configuration">
<title>Manual configuration</title>
<para>
Installations that require certain advanced configurations cannot succeed without network connectivity during the installation process, for example, installations on systems with ISCSI drives. In situations where successful installation depends upon correct network settings, the installation program will present you with a dialog that allows you to confirm these details.
@@ -104,7 +104,7 @@
</section>
-<!--
+
<section id="sn-hostname">
<title>Hostname</title>
<section id="sn-network-misc-settings">
diff --git a/en-US/nextsteps.xml b/en-US/nextsteps.xml
index e1e8a1e..5cf9eda 100644
--- a/en-US/nextsteps.xml
+++ b/en-US/nextsteps.xml
@@ -146,7 +146,7 @@
<para>If you chose to upgrade your system from a previous release rather
than perform a fresh installation, you may want to examine the
differences in the package set. <xref
- linkend="sn-upgrade-tree"/> advised you to create a package
+ linkend="sn-upgrade-tree-x86"/> advised you to create a package
listing for your original system. You can now use that listing to
determine how to bring your new system close to the original
system state.</para>
diff --git a/en-US/upgrading-fedora.xml b/en-US/upgrading-fedora.xml
index e2254c5..66acd86 100644
--- a/en-US/upgrading-fedora.xml
+++ b/en-US/upgrading-fedora.xml
@@ -3,10 +3,10 @@
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
]>
-<!-- $Id: -->
+<section id="sn-upgrading-system-x86">
-<section id="sn-upgrading-system">
- <title>Upgrading an Existing System</title>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-title-1.xml"/>
+ <!-- Upgrading an existing system -->
<note>
<title>Preupgrade</title>
@@ -14,149 +14,95 @@
Fedora includes <application>preupgrade</application>, a command-line tool that allows you to upgrade easily to a new version from within your existing Fedora installation.
</para>
</note>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-1.xml"/>
+ <!-- The installation system automatically detects any existing installation of Red Hat Enterprise Linux. -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-2.xml"/>
+ <!-- Note that the installation medium that you are using might not contain all the software packages that you need to upgrade your computer. -->
+
+ <section id="sn-upgrade-examine-x86">
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-title-2.xml"/>
+ <!-- The Upgrade Dialog -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-3.xml"/>
+ <!-- If your system contains a Fedora or Red Hat Linux installation... -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-figure-1.xml"/>
+ <!-- The Upgrade Dialog -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-note-1.xml"/>
+ <!-- Manually Installed Software -->
+
+ </section>
+
+ <section id="sn-upgrade-tree-x86">
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-title-3.xml"/>
+ <!-- Upgrading Using the Installer -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-note-2.xml"/>
+ <!-- Installations are Recommended -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-4.xml"/>
+ <!-- If you choose to upgrade your system using the installation program... -->
+
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-screen-1.xml"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-5.xml"/>
+ <!-- After installation, consult this list to discover which packages you may need to rebuild or retrieve... -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-6.xml"/>
+ <!-- Next, make a backup of any system configuration data: -->
+
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-screen-2.xml"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-7.xml"/>
+ <!-- Make a complete backup of any important data before performing an upgrade. -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-warning-1.xml"/>
+ <!-- Storing Backups -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-8.xml"/>
+ <!-- For more information on completing the upgrade process later... -->
+ </section>
+
+ <section id="sn-upgrading-bootloader-x86">
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-title-4.xml"/>
+ <!-- Upgrading Boot Loader Configuration -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-indexterm-1.xml"/>
+
+ <indexterm>
+ <primary>boot loader</primary>
+ <seealso>GRUB</seealso>
+ </indexterm>
+
+ <para>
+ Your completed Red Hat Enterprise Linux installation must be registered in the <firstterm>boot loader</firstterm> to boot properly. A boot loader is software on your machine that locates and starts the operating system. Refer to <xref linkend="ch-grub" /> for more information about boot loaders.
+ </para>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-figure-2.xml"/>
+ <!-- The Update Boot Loader Dialog -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-9.xml"/>
+ <!-- If the existing boot loader was installed by a Linux distribution... -->
+
+ <para>
+ <firstterm>GRUB</firstterm> is the standard boot loader for Fedora on 32-bit and 64-bit x86 architectures. If your machine uses another boot loader, such as BootMagic, System Commander, or the loader installed by Microsoft Windows, then the Fedora installation system cannot update it. In this case, select <guilabel>Skip boot loader updating</guilabel>. When the installation process completes, refer to the documentation for your product for assistance.
+ </para>
- <para>
- The installation system automatically detects any existing
- installation of Fedora. The upgrade process updates the existing
- system software with new versions, but does not remove any data from
- users' home directories. The existing partition structure on your
- hard drives does not change. Your system configuration changes only
- if a package upgrade demands it. Most package upgrades do not
- change system configuration, but rather install an additional
- configuration file for you to examine later.
- </para>
-
- <para>
- Note that the installation medium that you are using might not contain all the software packages that you need to upgrade your computer. In particular, the Fedora live CD contains a relatively small subset of the packages available in Fedora. To update packages that are not included on the installation medium, make sure that you select the <literal>Fedora &PRODVER; - <replaceable>architecture</replaceable></literal> or the <literal>Fedora &PRODVER; - <replaceable>architecture</replaceable> - Updates</literal> repository the during package group selection — refer to <xref linkend="sn-additional-repos"/>.
- </para>
-
- <section id="sn-upgrade-examine">
- <title>Upgrade Examine</title>
-
- <para>
- If your system contains a Fedora or Red Hat Linux installation, a dialog
- appears asking whether you want to upgrade that installation. To
- perform an upgrade of an existing system, choose the appropriate
- installation from the drop-down list and select
- <guibutton>Next</guibutton>.
- </para>
- <figure float="0" id="fig-upgrading-fedora"><title>The upgrade screen</title>
- <mediaobject>
- <imageobject><imagedata fileref="images/upgrading/upgrading.png" format="PNG"/></imageobject>
- <textobject><para>
- The upgrade screen.
- </para>
- </textobject>
- </mediaobject>
- </figure>
- <note>
- <title>Manually Installed Software</title>
- <para>
- Software you have installed manually on your existing Fedora or
- Red Hat Linux system may behave differently after an upgrade. You may
- need to manually reinstall or recompile this software after an
- upgrade to ensure it performs correctly on the updated system.
- </para>
- </note>
- </section>
-
- <section id="sn-upgrade-tree">
- <title>Upgrading Using the Installer</title>
- <note>
- <title>Installations are Recommended</title>
- <para>In general, the Fedora Project recommends that you keep user data on a
- separate <filename class="partition">/home</filename> partition
- and perform a fresh installation. For more information on
- partitions and how to set them up, refer to <xref
- linkend="s1-diskpartsetup-x86"/>.</para>
- </note>
- <para>If you choose to upgrade your system using the installation
- program, any software not provided by Fedora that conflicts with
- Fedora software is overwritten. Before you begin an upgrade
- this way, make a list of your system's current packages for later
- reference:</para>
-
- <screen><command><![CDATA[rpm -qa --qf '%{NAME} %{VERSION}-%{RELEASE} %{ARCH}\n' > ~/old-pkglist.txt]]></command></screen>
-
- <para>After installation, consult this list to discover which
- packages you may need to rebuild or retrieve from non-Fedora
- software repositories.</para>
- <para>Next, make a backup of any system configuration data:</para>
-
- <screen><command><![CDATA[su -c 'tar czf /tmp/etc-`date +%F`.tar.gz /etc'
-su -c 'mv /tmp/etc-*.tar.gz /home']]></command></screen>
-
- <para>Make a complete backup of any important data before performing
- an upgrade. Important data may include the contents of your
- entire <filename class="directory">/home</filename> directory as
- well as content from services such as an Apache, FTP, or SQL
- server, or a source code management system. Although upgrades are
- not destructive, if you perform one improperly there is a small
- possibility of data loss.</para>
- <warning>
- <title>Storing Backups</title>
- <para>Note that the above examples store backup materials in a
- <filename class="directory">/home</filename> directory. If your
- <filename class="directory">/home</filename> directory is not a
- separate partition, <emphasis>you should not follow these
- examples verbatim!</emphasis> Store your backups on another
- device such as CD or DVD discs or an external hard disk.</para>
- </warning>
- <para>For more information on completing the upgrade process later,
- refer to <xref linkend="sn-finishing-upgrade"/>.</para>
- </section>
-
- <section id="sn-upgrading-bootloader">
- <title>Upgrading Boot Loader Configuration</title>
-
- <para>
- <indexterm>
- <primary>boot loader</primary>
- <secondary>upgrading</secondary>
- </indexterm> Your completed Fedora installation must be registered
- in the <indexterm>
- <primary>boot loader</primary>
- <seealso>GRUB</seealso>
- </indexterm> <firstterm>boot loader</firstterm> to boot properly.
- A boot loader is software on your machine that locates and starts
- the operating system. Refer to <xref linkend="s1-x86-bootloader" />
- for more information about boot loaders.
- </para>
- <para>
- If the existing boot loader was installed by a Linux distribution,
- the installation system can modify it to load the new Fedora system.
- To update the existing Linux boot loader, select <guilabel>Update
- boot loader configuration</guilabel>. This is the default
- behavior when you upgrade an existing Fedora or Red Hat Linux installation.
- </para>
-
- <para>
- <firstterm>GRUB</firstterm> is the standard boot loader for Fedora.
- If your machine uses another boot loader, such as
- <trademark>BootMagic</trademark>, <trademark>System
- Commander</trademark>, or the loader installed by Microsoft
- Windows, then the Fedora installation system cannot update it.
- In this case, select <guilabel>Skip boot loader
- updating</guilabel>. When the installation process completes,
- refer to the documentation for your product for assistance.
- </para>
-
- <para>
- Install a new boot loader as part of an upgrade process only if
- you are certain you want to replace the existing boot loader. If
- you install a new boot loader, you may not be able to boot other
- operating systems on the same machine until you have configured
- the new boot loader. Select <guilabel>Create new boot loader
- configuration</guilabel> to remove the existing boot loader and
- install GRUB.
- </para>
+ <para>
+ Install a new boot loader as part of an upgrade process only if you are certain you want to replace the existing boot loader. If you install a new boot loader, you may not be able to boot other operating systems on the same machine until you have configured the new boot loader. Select <guilabel>Create new boot loader configuration</guilabel> to remove the existing boot loader and install GRUB.
+ </para>
- <para>
- After you make your selection, click <guibutton>Next</guibutton>
- to continue.
- </para>
+ <para>
+ After you make your selection, click <guibutton>Next</guibutton> to continue. If you selected the <guilabel>Create new boot loader configuration</guilabel> option, refer to <xref linkend="s1-x86-bootloader"/>. If you chose to update or skip boot loader configuration, installation continues without further input from you.
+ </para>
- </section>
+ </section>
</section>
en-US/Assign_Storage_Devices-common-figure-1.xml | 14 +++
en-US/Assign_Storage_Devices-common-para-1.xml | 7 +
en-US/Assign_Storage_Devices-common-para-2.xml | 7 +
en-US/Assign_Storage_Devices-common-para-3.xml | 7 +
en-US/Assign_Storage_Devices-common-para-4.xml | 7 +
en-US/Assign_Storage_Devices-common-para-5.xml | 7 +
en-US/Assign_Storage_Devices-common-para-6.xml | 7 +
en-US/Assign_Storage_Devices-common-title.xml | 7 +
en-US/Assign_Storage_Devices-x86.xml | 36 +++++++
en-US/Automatic_Partitioning_common-varlistentry-1.xml | 2
en-US/Graphical_Installation-x86.xml | 9 +
en-US/Specialized_Storage_Devices-x86.xml | 52 +++++++++++
en-US/Specialized_Storage_Devices_common-figure-1.xml | 14 +++
en-US/Specialized_Storage_Devices_common-figure-2.xml | 14 +++
en-US/Specialized_Storage_Devices_common-figure-3.xml | 14 +++
en-US/Specialized_Storage_Devices_common-para-1.xml | 7 +
en-US/Specialized_Storage_Devices_common-para-2.xml | 7 +
en-US/Specialized_Storage_Devices_common-para-3.xml | 7 +
en-US/Specialized_Storage_Devices_common-para-4.xml | 7 +
en-US/Specialized_Storage_Devices_common-para-5.xml | 7 +
en-US/Specialized_Storage_Devices_common-para-6.xml | 7 +
en-US/Specialized_Storage_Devices_common-title.xml | 8 +
en-US/Specialized_Storage_Devices_common-variablelist-1.xml | 38 ++++++++
en-US/Storage_Devices-x86.xml | 33 +++++++
en-US/Storage_Devices_common-figure-1.xml | 14 +++
en-US/Storage_Devices_common-indexterm-1.xml | 12 ++
en-US/Storage_Devices_common-indexterm-2.xml | 12 ++
en-US/Storage_Devices_common-para-1.xml | 8 +
en-US/Storage_Devices_common-title.xml | 6 +
en-US/Storage_Devices_common-variablelist-1.xml | 55 ++++++++++++
30 files changed, 428 insertions(+), 4 deletions(-)
New commits:
commit 9022432aaf908e58358f13b3e9e4dd443fe43e22
Author: Ruediger Landmann <r.landmann(a)redhat.com>
Date: Thu Apr 29 20:03:05 2010 +1000
Add storage device selection screens
diff --git a/en-US/Assign_Storage_Devices-common-figure-1.xml b/en-US/Assign_Storage_Devices-common-figure-1.xml
new file mode 100644
index 0000000..ab00669
--- /dev/null
+++ b/en-US/Assign_Storage_Devices-common-figure-1.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+
+<figure float="0"><title>Assign storage devices</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/storagedevices/assignstoragedevices.png" format="PNG"/></imageobject>
+ <textobject><para>
+ Screen to select storage devices for installation or for data storage only
+ </para>
+ </textobject>
+ </mediaobject>
+</figure>
diff --git a/en-US/Assign_Storage_Devices-common-para-1.xml b/en-US/Assign_Storage_Devices-common-para-1.xml
new file mode 100644
index 0000000..b3b91c8
--- /dev/null
+++ b/en-US/Assign_Storage_Devices-common-para-1.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+ During installation, the devices that you identify here as being for data storage only are mounted as part of the file system, but are not partitioned or formatted.
+</para>
diff --git a/en-US/Assign_Storage_Devices-common-para-2.xml b/en-US/Assign_Storage_Devices-common-para-2.xml
new file mode 100644
index 0000000..bf4b1c4
--- /dev/null
+++ b/en-US/Assign_Storage_Devices-common-para-2.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+ The screen is split into two panes. The left pane contains a list of devices to be used for data storage only. The right pane contains a list of devices that are to be available for installation of the operating system.
+</para>
diff --git a/en-US/Assign_Storage_Devices-common-para-3.xml b/en-US/Assign_Storage_Devices-common-para-3.xml
new file mode 100644
index 0000000..c6c998a
--- /dev/null
+++ b/en-US/Assign_Storage_Devices-common-para-3.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+ Each list contains information about the devices to help you to identify them. A small drop-down menu marked with an icon is located to the right of the column headings. This menu allows you to select the types of data presented on each device. Reducing or expanding the amount of information presented might help you to identify particular devices.
+</para>
diff --git a/en-US/Assign_Storage_Devices-common-para-4.xml b/en-US/Assign_Storage_Devices-common-para-4.xml
new file mode 100644
index 0000000..077d98c
--- /dev/null
+++ b/en-US/Assign_Storage_Devices-common-para-4.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+ Move a device from one list to the other by clicking on the device, then clicking either the button labeled with a left-pointing arrow to move it to the list of data storage devices or the button labeled with a right-pointing arrow to move it to the list of devices available for installation of the operating system.
+</para>
diff --git a/en-US/Assign_Storage_Devices-common-para-5.xml b/en-US/Assign_Storage_Devices-common-para-5.xml
new file mode 100644
index 0000000..98aec91
--- /dev/null
+++ b/en-US/Assign_Storage_Devices-common-para-5.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+ The list of devices available as installation targets also includes a radio button beside each device. Use this radio button to specify the device that you want to use as the boot device for the system.
+</para>
diff --git a/en-US/Assign_Storage_Devices-common-para-6.xml b/en-US/Assign_Storage_Devices-common-para-6.xml
new file mode 100644
index 0000000..0787d78
--- /dev/null
+++ b/en-US/Assign_Storage_Devices-common-para-6.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+ When you have finished identifying devices to be used for installation, click <guibutton>Next</guibutton> to continue.
+</para>
diff --git a/en-US/Assign_Storage_Devices-common-title.xml b/en-US/Assign_Storage_Devices-common-title.xml
new file mode 100644
index 0000000..8fa40c9
--- /dev/null
+++ b/en-US/Assign_Storage_Devices-common-title.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<title>
+ Assign Storage Devices
+</title>
diff --git a/en-US/Assign_Storage_Devices-x86.xml b/en-US/Assign_Storage_Devices-x86.xml
new file mode 100644
index 0000000..609c4cd
--- /dev/null
+++ b/en-US/Assign_Storage_Devices-x86.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<section id="Assign_Storage_Devices-x86">
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-title.xml"/>
+ <!-- Storage Devices -->
+
+ <para>
+ If you selected more than one storage device on the storage devices selection screen (refer to <xref linkend="Storage_Devices-x86"/>) system, <application>anaconda</application> asks you to select which of these devices should be available for installation of the operating system, and which should only be attached to the file system for data storage.
+ </para>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-para-1.xml"/>
+ <!-- During installation, the devices that you identify here -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-figure-1.xml"/>
+ <!-- Assign Storage Devices -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-para-2.xml"/>
+ <!-- The screen is split into two panes. -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-para-3.xml"/>
+ <!-- Each list contains information about the devices to help you to identify them. -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-para-4.xml"/>
+ <!-- Move a device from one list to the other by clicking on the device, -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-para-5.xml"/>
+ <!-- The list of devices available as installation targets includes -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-para-6.xml"/>
+ <!-- When you have finished identifying devices to be used for installation -->
+
+</section>
+
diff --git a/en-US/Automatic_Partitioning_common-varlistentry-1.xml b/en-US/Automatic_Partitioning_common-varlistentry-1.xml
index 713c40f..7e88634 100644
--- a/en-US/Automatic_Partitioning_common-varlistentry-1.xml
+++ b/en-US/Automatic_Partitioning_common-varlistentry-1.xml
@@ -11,7 +11,7 @@
<warning>
<title>Warning</title>
<para>
- If you select this option, all data on the selected hard drive(s) is removed by the installation program. Do not select this option if you have information that you want to keep on the hard drive(s) where you are installing Red Hat Enterprise Linux.
+ If you select this option, all data on the selected hard drive(s) is removed by the installation program. Do not select this option if you have information that you want to keep on the hard drive(s) where you are installing Fedora.
</para>
</warning>
</listitem>
diff --git a/en-US/Graphical_Installation-x86.xml b/en-US/Graphical_Installation-x86.xml
index 3adb102..5d405b4 100644
--- a/en-US/Graphical_Installation-x86.xml
+++ b/en-US/Graphical_Installation-x86.xml
@@ -232,6 +232,12 @@
<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_HTTP-x86.xml"/> -->
<!-- Installing via HTTP -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Storage_Devices-x86.xml"/>
+ <!-- Storage devices -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-x86.xml"/>
+ <!-- Assign Storage devices -->
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Initializing_Hard_Disk-x86.xml"/>
<!-- Initializing Hard Disk -->
@@ -255,9 +261,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Setup-x86.xml"/>
<!-- Disk Partitioning Setup -->
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Advanced_Storage-x86.xml"/>
- <!-- Advanced Storage Options -->
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Automatic_Partitioning-x86.xml"/>
<!-- Default Layout -->
diff --git a/en-US/Specialized_Storage_Devices-x86.xml b/en-US/Specialized_Storage_Devices-x86.xml
new file mode 100644
index 0000000..c3bca66
--- /dev/null
+++ b/en-US/Specialized_Storage_Devices-x86.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+
+<section id="sect-Storage_Device_Selection_Screen-x86">
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-title.xml"/>
+ <!-- Storage Device Selection Screen -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-para-1.xml"/>
+ <!-- The storage devices selection screen displays all storage devices to which anaconda has access. -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-figure-1.xml"/>
+ <!-- Select storage devices -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-para-2.xml"/>
+ <!-- Devices are grouped under the following tabs: -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-variablelist-1.xml"/>
+ <!-- Basic Devices Basic storage devices directly connected to -->
+
+ <para>
+ If you do need to configure iSCSI or FCoE storage, click <guibutton>Add Advanced Target</guibutton> and refer to <xref linkend="s1-advanced-storage-x86"/>.
+ </para>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-para-3.xml"/>
+ <!-- The storage devices selection screen also contains a Search tab -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-figure-2.xml"/>
+ <!-- The Storage Devices Search Tab -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-para-4.xml"/>
+ <!-- Each tab presents a list of devices detected by anaconda, with information about the device to help you to identify it. -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-figure-3.xml"/>
+ <!-- Selecting Columns -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-para-5.xml"/>
+ <!-- Each device is presented on a separate row, with a checkbox to its left. -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-para-6.xml"/>
+ <!-- Note that the devices that you select here are not automatically wiped by the installation process. -->
+
+ <para>
+ If you selected only one storage device, click <guibutton>Next</guibutton> and proceed to <xref linkend="sn-initialize-hdd-x86"/>. If you selected two or more storage devices, click <guibutton>Next</guibutton> and proceed to <xref linkend="Assign_Storage_Devices-x86"/>.
+ </para>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Advanced_Storage-x86.xml"/>
+ <!-- Advanced Storage Options -->
+
+</section>
diff --git a/en-US/Specialized_Storage_Devices_common-figure-1.xml b/en-US/Specialized_Storage_Devices_common-figure-1.xml
new file mode 100644
index 0000000..1666633
--- /dev/null
+++ b/en-US/Specialized_Storage_Devices_common-figure-1.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<figure float="0"><title>Select storage devices</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/storagedevices/selectstoragedevices.png" format="PNG"/></imageobject>
+ <textobject><para>
+ Screen to select available storage devices, with tabs for basic devices, firmware RAID, multipath devices, and other SAN devices.
+ </para>
+ </textobject>
+ </mediaobject>
+</figure>
+
\ No newline at end of file
diff --git a/en-US/Specialized_Storage_Devices_common-figure-2.xml b/en-US/Specialized_Storage_Devices_common-figure-2.xml
new file mode 100644
index 0000000..1553eb5
--- /dev/null
+++ b/en-US/Specialized_Storage_Devices_common-figure-2.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<figure float="0"><title>The Storage Devices Search Tab</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/storagedevices/searchstoragedevices.png" format="PNG"/></imageobject>
+ <textobject><para>
+ The tab contains a drop-down menu to select between searching by port, target, and LUN (with corresponding text boxes for these values) and searching by WWID (with a corresponding text box for this value).
+ </para>
+ </textobject>
+ </mediaobject>
+</figure>
+
\ No newline at end of file
diff --git a/en-US/Specialized_Storage_Devices_common-figure-3.xml b/en-US/Specialized_Storage_Devices_common-figure-3.xml
new file mode 100644
index 0000000..c3a3159
--- /dev/null
+++ b/en-US/Specialized_Storage_Devices_common-figure-3.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<figure float="0"><title>Selecting Columns</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/storagedevices/storagedevicescolumns.png" format="PNG"/></imageobject>
+ <textobject><para>
+ The drop-down menu in its expanded state
+ </para>
+ </textobject>
+ </mediaobject>
+</figure>
+
\ No newline at end of file
diff --git a/en-US/Specialized_Storage_Devices_common-para-1.xml b/en-US/Specialized_Storage_Devices_common-para-1.xml
new file mode 100644
index 0000000..d64007b
--- /dev/null
+++ b/en-US/Specialized_Storage_Devices_common-para-1.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+ The storage devices selection screen displays all storage devices to which <application>anaconda</application> has access.
+</para>
diff --git a/en-US/Specialized_Storage_Devices_common-para-2.xml b/en-US/Specialized_Storage_Devices_common-para-2.xml
new file mode 100644
index 0000000..1a778a9
--- /dev/null
+++ b/en-US/Specialized_Storage_Devices_common-para-2.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+ Devices are grouped under the following tabs:
+</para>
diff --git a/en-US/Specialized_Storage_Devices_common-para-3.xml b/en-US/Specialized_Storage_Devices_common-para-3.xml
new file mode 100644
index 0000000..aa0b418
--- /dev/null
+++ b/en-US/Specialized_Storage_Devices_common-para-3.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+ The storage devices selection screen also contains a <guilabel>Search</guilabel> tab that allows you to filter storage devices either by their <firstterm>World Wide Identifier</firstterm> (WWID) or by the port, target, or <firstterm>logical unit number</firstterm> (LUN) at which they are accessed.
+</para>
diff --git a/en-US/Specialized_Storage_Devices_common-para-4.xml b/en-US/Specialized_Storage_Devices_common-para-4.xml
new file mode 100644
index 0000000..9c248c3
--- /dev/null
+++ b/en-US/Specialized_Storage_Devices_common-para-4.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+ Each tab presents a list of devices detected by <application>anaconda</application>, with information about the device to help you to identify it. A small drop-down menu marked with an icon is located to the right of the column headings. This menu allows you to select the types of data presented on each device. For example, the menu on the <guilabel>Multipath Devices</guilabel> tab allows you to specify any of <guimenuitem>WWID</guimenuitem>, <guimenuitem>Capacity</guimenuitem>, <guimenuitem>Vendor</guimenuitem>, <guimenuitem>Interconnect</guimenuitem>, and <guimenuitem>Paths</guimenuitem> to include among the details presented for each device. Reducing or expanding the amount of information presented might help you to identify particular devices.
+</para>
diff --git a/en-US/Specialized_Storage_Devices_common-para-5.xml b/en-US/Specialized_Storage_Devices_common-para-5.xml
new file mode 100644
index 0000000..13b93d6
--- /dev/null
+++ b/en-US/Specialized_Storage_Devices_common-para-5.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+ Each device is presented on a separate row, with a checkbox to its left. Click the checkbox to make a device available during the installation process, or click the <firstterm>radio button</firstterm> at the left of the column headings to select or deselect all the devices listed in a particular screen. Later in the installation process, you can choose to install Fedora onto any of the devices selected here, and can choose to automatically mount any of the other devices selected here as part of the installed system.
+</para>
diff --git a/en-US/Specialized_Storage_Devices_common-para-6.xml b/en-US/Specialized_Storage_Devices_common-para-6.xml
new file mode 100644
index 0000000..85a5674
--- /dev/null
+++ b/en-US/Specialized_Storage_Devices_common-para-6.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+ Note that the devices that you select here are not automatically wiped by the installation process. Selecting a device on this screen does not, in itself, place data stored on the device at risk. Note also that any devices that you do not select here to form part of the installed system can be added to the system after installation by modifying the <filename>/etc/fstab</filename> file.
+</para>
diff --git a/en-US/Specialized_Storage_Devices_common-title.xml b/en-US/Specialized_Storage_Devices_common-title.xml
new file mode 100644
index 0000000..0bd2b72
--- /dev/null
+++ b/en-US/Specialized_Storage_Devices_common-title.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+
+<title>
+ The Storage Devices Selection Screen
+</title>
diff --git a/en-US/Specialized_Storage_Devices_common-variablelist-1.xml b/en-US/Specialized_Storage_Devices_common-variablelist-1.xml
new file mode 100644
index 0000000..bd5e021
--- /dev/null
+++ b/en-US/Specialized_Storage_Devices_common-variablelist-1.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!DOCTYPE variablelist PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<variablelist>
+ <varlistentry>
+ <term>Basic Devices</term>
+ <listitem>
+ <para>
+ Basic storage devices directly connected to the local system, such as hard disk drives and solid-state drives.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Firmware RAID</term>
+ <listitem>
+ <para>
+ Storage devices attached to a firmware RAID controller.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Multipath Devices</term>
+ <listitem>
+ <para>
+ Storage devices accessible through more than one path, such as through multiple SCSI controllers or Fiber Channel ports on the same system.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Other SAN Devices</term>
+ <listitem>
+ <para>
+ Any other devices available on a storage area network (SAN).
+ </para>
+ </listitem>
+ </varlistentry>
+</variablelist>
diff --git a/en-US/Storage_Devices-x86.xml b/en-US/Storage_Devices-x86.xml
new file mode 100644
index 0000000..20ea612
--- /dev/null
+++ b/en-US/Storage_Devices-x86.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+
+<section id="Storage_Devices-x86">
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Storage_Devices_common-title.xml"/>
+ <!-- Storage Devices -->
+
+ <!-- Index terms -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Storage_Devices_common-indexterm-1.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Storage_Devices_common-indexterm-2.xml"/>
+ <!-- End Index terms -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Storage_Devices_common-para-1.xml"/>
+ <!-- You can install Red Hat Enterprise Linux on a large variety of storage devices... -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Storage_Devices_common-figure-1.xml"/>
+ <!-- Storage devices -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Storage_Devices_common-variablelist-1.xml"/>
+ <!-- Basic Storage Devices -->
+
+ <para>
+ If you select <guimenuitem>Basic Storage Devices</guimenuitem> and have only one storage device attached to your system, <application>anaconda</application> automatically detects the local storage attached to the system and does not require further input from you. Proceed to <xref linkend="sn-initialize-hdd-x86"/>.
+ </para>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices-x86.xml"/>
+ <!-- Specialized Storage Devices -->
+
+</section>
+
diff --git a/en-US/Storage_Devices_common-figure-1.xml b/en-US/Storage_Devices_common-figure-1.xml
new file mode 100644
index 0000000..b879c91
--- /dev/null
+++ b/en-US/Storage_Devices_common-figure-1.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+
+<figure float="0"><title>Storage devices</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/storagedevices/storagedevices.png" format="PNG"/></imageobject>
+ <textobject><para>
+ Screen to select basic or specialized storage devices
+ </para>
+ </textobject>
+ </mediaobject>
+</figure>
diff --git a/en-US/Storage_Devices_common-indexterm-1.xml b/en-US/Storage_Devices_common-indexterm-1.xml
new file mode 100644
index 0000000..648f345
--- /dev/null
+++ b/en-US/Storage_Devices_common-indexterm-1.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+
+
+
+]>
+
+<indexterm significance="normal">
+ <primary>storage devices</primary>
+ <secondary>basic storage devices</secondary>
+</indexterm>
+
diff --git a/en-US/Storage_Devices_common-indexterm-2.xml b/en-US/Storage_Devices_common-indexterm-2.xml
new file mode 100644
index 0000000..739d776
--- /dev/null
+++ b/en-US/Storage_Devices_common-indexterm-2.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+
+
+
+]>
+
+<indexterm significance="normal">
+ <primary>storage devices</primary>
+ <secondary>specialized storage devices</secondary>
+</indexterm>
+
diff --git a/en-US/Storage_Devices_common-para-1.xml b/en-US/Storage_Devices_common-para-1.xml
new file mode 100644
index 0000000..c00430a
--- /dev/null
+++ b/en-US/Storage_Devices_common-para-1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+
+<para>
+ You can install Fedora on a large variety of storage devices. This screen allows you to select either basic or specialized storage devices.
+</para>
diff --git a/en-US/Storage_Devices_common-title.xml b/en-US/Storage_Devices_common-title.xml
new file mode 100644
index 0000000..4a1bee1
--- /dev/null
+++ b/en-US/Storage_Devices_common-title.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<title>Storage Devices</title>
+
diff --git a/en-US/Storage_Devices_common-variablelist-1.xml b/en-US/Storage_Devices_common-variablelist-1.xml
new file mode 100644
index 0000000..74d804a
--- /dev/null
+++ b/en-US/Storage_Devices_common-variablelist-1.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<variablelist>
+ <varlistentry>
+ <term>Basic Storage Devices</term>
+ <listitem>
+ <para>
+ Select <guimenuitem>Basic Storage Devices</guimenuitem> to install Fedora on the following storage devices:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ hard drives or solid-state drives connected directly to the local system.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Specialized Storage Devices</term>
+ <listitem>
+ <para>
+ Select <guimenuitem>Specialized Storage Devices</guimenuitem> to install Fedora on the following storage devices:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <firstterm>Storage area networks</firstterm> (SANs)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <firstterm>Direct access storage devices</firstterm> (DASDs)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Firmware RAID devices
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Multipath devices
+ </para>
+ </listitem>
+ </itemizedlist>
+ <para>
+ Use the <guimenuitem>Specialized Storage Devices</guimenuitem> option to configure <firstterm>Internet Small Computer System Interface</firstterm> (iSCSI) and <firstterm>FCoE</firstterm> (Fiber Channel over Ethernet) connections.
+ </para>
+ </listitem>
+ </varlistentry>
+</variablelist>
+
en-US/Beginning_Installation_Hard_Disk_common-para-1.xml | 4 ++--
en-US/Beginning_Installation_Network_x86_ppc-para-5.xml | 2 +-
en-US/Beginning_Installation_URL-common-para-2-Fedora.xml | 4 ++--
en-US/Beginning_Installation_URL-x86.xml | 3 ---
en-US/Language_Selection-x86.xml | 11 +++++++----
en-US/Package_Selection_Customizing-x86.xml | 2 +-
en-US/Package_Selection_Repositories-x86.xml | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit a32b6980a646a0e7ea5eea0240185d904a1f6d8c
Author: Ruediger Landmann <r.landmann(a)redhat.com>
Date: Thu Apr 29 19:48:38 2010 +1000
Update sections 7.6 and 7.7
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-para-1.xml b/en-US/Beginning_Installation_Hard_Disk_common-para-1.xml
index 132c202..34f0b4a 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-para-1.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-para-1.xml
@@ -3,5 +3,5 @@
]>
<para>
- The <guilabel>Select Partition</guilabel> screen applies only if you are installing from a disk partition (that is, if you used the <literal>askmethod</literal> boot options and selected <guimenuitem>Hard Drive</guimenuitem> in the <guilabel>Installation Method</guilabel> dialog). This dialog allows you to name the disk partition and directory from which you are installing Fedora. If you used the <literal>repo=hd</literal>boot option, you already specified a partition.
-</para>
\ No newline at end of file
+ The <guilabel>Select Partition</guilabel> screen applies only if you are installing from a disk partition (that is, if you used the <literal>askmethod</literal> boot options and selected <guimenuitem>Hard Drive</guimenuitem> in the <guilabel>Installation Method</guilabel> dialog). This dialog allows you to name the disk partition and directory from which you are installing Fedora. If you used the <literal>repo=hd</literal> boot option, you already specified a partition.
+</para>
diff --git a/en-US/Beginning_Installation_Network_x86_ppc-para-5.xml b/en-US/Beginning_Installation_Network_x86_ppc-para-5.xml
index 7409a81..c7e6106 100644
--- a/en-US/Beginning_Installation_Network_x86_ppc-para-5.xml
+++ b/en-US/Beginning_Installation_Network_x86_ppc-para-5.xml
@@ -3,6 +3,6 @@
]>
<para>
- The installation program supports only the IPv4 protocol. Refer also to <xref linkend="sn-networkconfig-fedora"/> for more information on configuring your network.
+ The installation program supports the IPv4 and IPv6 protocols.
</para>
diff --git a/en-US/Beginning_Installation_URL-common-para-2-Fedora.xml b/en-US/Beginning_Installation_URL-common-para-2-Fedora.xml
index 3536784..a3dd700 100644
--- a/en-US/Beginning_Installation_URL-common-para-2-Fedora.xml
+++ b/en-US/Beginning_Installation_URL-common-para-2-Fedora.xml
@@ -4,5 +4,5 @@
<para>
- Enter the URL for the directory that contains the installation image file (<filename>install.img</filename>) on your chosen FTP or HTTP site and press <keycap>Enter</keycap>. By default, this directory will be named <filename>/pub/fedora/linux/releases/&PRODVER;/Fedora/<replaceable>arch</replaceable>/os/images/</filename>, where <replaceable>arch</replaceable> is replaced with the architecture type of your system, such as i386. The complete URL will therefore resemble this example:<filename>http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Fedor…</filename>. If the system can reach the URL that you provided, and can find a file named <filename>install.img</filename> at that location, a message box appears indicating that files are being retrieved from the server.
-</para>
\ No newline at end of file
+ Enter the URL for the directory that contains the installation image file (<filename>install.img</filename>) on your chosen FTP or HTTP site and press <keycap>Enter</keycap>. By default, this directory will be named <filename>/pub/fedora/linux/releases/&PRODVER;/Fedora/<replaceable>arch</replaceable>/os/images/</filename>, where <replaceable>arch</replaceable> is replaced with the architecture type of your system, such as i386. The complete URL will therefore resemble this example:<filename>http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Fedor…</filename>. Specify the address of a proxy server, and if necessary, provide a port number, username, and password. If the system can reach the URL that you provided, and can find a file named <filename>install.img</filename> at that location, a message box appears indicating that files are being retrieved from the server.
+</para>
diff --git a/en-US/Beginning_Installation_URL-x86.xml b/en-US/Beginning_Installation_URL-x86.xml
index 6294ea3..2598a25 100644
--- a/en-US/Beginning_Installation_URL-x86.xml
+++ b/en-US/Beginning_Installation_URL-x86.xml
@@ -30,7 +30,4 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-common-para-3.xml"/>
<!-- Next, the Welcome dialog appears -->
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Loopbacktip-common.xml"/>
- <!-- Tip: You can save disk space by using the ISO images... -->
-
</section>
\ No newline at end of file
diff --git a/en-US/Language_Selection-x86.xml b/en-US/Language_Selection-x86.xml
index 3395a50..a70787d 100644
--- a/en-US/Language_Selection-x86.xml
+++ b/en-US/Language_Selection-x86.xml
@@ -11,16 +11,18 @@
href="Language_Selection_common-indexterm.xml"/>
<para>
- Using your mouse, select a language to use for the installation (refer to <xref linkend="fig-langselection-x86"/>).
+ Use the arrow keys on your keyboard to select a language to use during the installation process (refer to <xref linkend="fig-langselection-x86"/>). With your selected language highlighted, press the <keycap>Tab</keycap> key to move to the <guibutton>OK</guibutton> button and press the <keycap>Enter</keycap> key to confirm your choice.
</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="Language_Selection_common-para-1.xml"/>
<!-- The language you select here will become the default language... -->
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="Language_Selection_common-para-3.xml"/>
- <!-- To add support for additional languages, customize... -->
+ <para>
+ To add support for additional languages, customize the
+ installation at the package selection stage. For more information,
+ refer to <xref linkend="sn-package-selection-x86"/>.
+ </para>
<figure float="0" id="fig-langselection-x86"><title>Language Selection</title>
<mediaobject>
@@ -37,3 +39,4 @@
<!-- Once you have selected the appropriate language... -->
</section>
+
diff --git a/en-US/Package_Selection_Customizing-x86.xml b/en-US/Package_Selection_Customizing-x86.xml
index 3b1c7bb..e3ec488 100644
--- a/en-US/Package_Selection_Customizing-x86.xml
+++ b/en-US/Package_Selection_Customizing-x86.xml
@@ -4,7 +4,7 @@
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
]>
- <section id="sn-package-selection">
+ <section id="sn-package-selection-x86">
<title>Customizing the Software Selection</title>
<para>
Select <guilabel>Customize now</guilabel> to specify the software
diff --git a/en-US/Package_Selection_Repositories-x86.xml b/en-US/Package_Selection_Repositories-x86.xml
index e2b6bf7..3912665 100644
--- a/en-US/Package_Selection_Repositories-x86.xml
+++ b/en-US/Package_Selection_Repositories-x86.xml
@@ -92,7 +92,7 @@
Once you provide information for an additional repository, the
installer reads the package metadata over the network. Software
that is specially marked is then included in the package group
- selection system. See <xref linkend="sn-package-selection"/> for
+ selection system. See <xref linkend="sn-package-selection-x86"/> for
more information on selecting packages.
</para>
<note>
it-IT/Xorg.po | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit a047932b363c11e1f54ab18dc8af200825cd7b25
Author: lewis41 <lewis41(a)fedoraproject.org>
Date: Thu Apr 29 07:49:00 2010 +0000
l10n: Updates to Italian (it) translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/it-IT/Xorg.po b/it-IT/Xorg.po
index 50e2c84..958df26 100644
--- a/it-IT/Xorg.po
+++ b/it-IT/Xorg.po
@@ -69,13 +69,13 @@ msgstr "I dettagli su questa caratteristica si trovano sulla wiki di Fedora: <ul
#. Tag: para
#, no-c-format
-msgid "There is also enhanced support for the DisplayPort in X and kernel drivers for Radeon hardware. Refer to: <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Features/RadeonDisplayPort\" />."
-msgstr "Esteso il supporto a DisplayPort in X e nei driver del kernel, per HW Radeon. I dettagli su questa caratteristica si trovano sulla wiki di Fedora: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/It_IT/Releases/13/Features/RadeonDisplayPort>DisplayPort per HW Radeon</ulink>."
+msgid "<indexterm> <primary>Video Driver</primary> <secondary>Third Party</secondary> </indexterm> <indexterm> <primary>Fedora Wiki</primary> <secondary>Third Party Video Drivers</secondary> </indexterm> Refer to the Xorg third-party drivers page for detailed guidelines on using third-party video drivers: <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers\">http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers</ulink>"
+msgstr "<indexterm> <primary>Video Driver</primary> <secondary>Third Party</secondary> </indexterm> <indexterm> <primary>Fedora Wiki</primary> <secondary>Third Party Video Drivers</secondary> </indexterm> Fare riferimento alla pagina dei driver di terze parti per le linee guida sull'utilizzo di tali driver: <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers\">http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers </ulink>"
#. Tag: para
#, no-c-format
-msgid "<indexterm> <primary>Video Driver</primary> <secondary>Third Party</secondary> </indexterm> <indexterm> <primary>Fedora Wiki</primary> <secondary>Third Party Video Drivers</secondary> </indexterm> Refer to the Xorg third-party drivers page for detailed guidelines on using third-party video drivers: <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers\">http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers</ulink>"
-msgstr "<indexterm> <primary>Video Driver</primary> <secondary>Third Party</secondary> </indexterm> <indexterm> <primary>Fedora Wiki</primary> <secondary>Third Party Video Drivers</secondary> </indexterm> Fare riferimento alla pagina dei driver di terze parti per le linee guida sull'utilizzo di tali driver: <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers\">http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers </ulink>"
+msgid "There is also enhanced support for the DisplayPort in X and kernel drivers for Radeon hardware. Refer to: <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Features/RadeonDisplayPort\" />."
+msgstr "Esteso il supporto a DisplayPort in X e nei driver del kernel, per HW Radeon. I dettagli su questa caratteristica si trovano sulla wiki di Fedora: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/It_IT/Releases/13/Features/RadeonDisplayPort\">DisplayPort per HW Radeon</ulink>."
#~ msgid "For more detail, refer to:"
#~ msgstr "Per maggiori dettagli fare riferimento alle pagine seguenti del wiki di Fedora:"
en-US/Graphical_Installation-x86.xml | 36 +++--------
en-US/Graphical_Installation_x86-Installation-methods.xml | 12 ++-
en-US/Installation_Method-x86.xml | 44 ++++++++++++++
en-US/Installation_Method_common-indexterm.xml | 9 ++
en-US/Installation_Method_common-title.xml | 6 +
5 files changed, 79 insertions(+), 28 deletions(-)
New commits:
commit 75fcc8c305ff2f944575cdbd518b273b99b09ae0
Author: Ruediger Landmann <r.landmann(a)redhat.com>
Date: Thu Apr 29 17:07:29 2010 +1000
Update section 7.5; start reordering later sections of chapter 7
diff --git a/en-US/Graphical_Installation-x86.xml b/en-US/Graphical_Installation-x86.xml
index 350c721..3adb102 100644
--- a/en-US/Graphical_Installation-x86.xml
+++ b/en-US/Graphical_Installation-x86.xml
@@ -211,39 +211,27 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_x86-Installation-methods.xml"/>
<!-- Selecting an Installation Method -->
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation-x86.xml"/>
- <!-- Installing from CD-ROM or DVD-->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Hard_Disk-x86.xml"/>
- <!-- Installing from a Hard Drive -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Network-x86.xml"/>
- <!-- Performing a Network Installation -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_NFS-x86.xml"/>
- <!-- Installing via NFS -->
-
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_FTP-x86.xml"/> -->
- <!-- Installing via FTP -->
-
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_HTTP-x86.xml"/> -->
- <!-- Installing via HTTP -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Language_Selection-x86.xml"/>
+ <!-- Language Selection -->
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-x86.xml"/>
- <!-- Installing via FTP or HTTP -->
-
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installation_Method-x86.xml"/>
+ <!-- Installation Method -->
+
<xi:include href="Verifying_Media.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<!-- Verifying Media - The DVD offers an option to verify the integrity of the media. -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Welcome-x86.xml"/>
- <!-- Welcome to Red Hat Enterprise Linux -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Language_Selection-x86.xml"/>
- <!-- Language Selection -->
+ <!-- Welcome to Fedora -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Key_Board_Configuration-x86.xml"/>
<!-- Keyboard Configuration -->
+<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_FTP-x86.xml"/> -->
+ <!-- Installing via FTP -->
+
+<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_HTTP-x86.xml"/> -->
+ <!-- Installing via HTTP -->
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Initializing_Hard_Disk-x86.xml"/>
<!-- Initializing Hard Disk -->
diff --git a/en-US/Graphical_Installation_x86-Installation-methods.xml b/en-US/Graphical_Installation_x86-Installation-methods.xml
index 8a57f23..63573ab 100644
--- a/en-US/Graphical_Installation_x86-Installation-methods.xml
+++ b/en-US/Graphical_Installation_x86-Installation-methods.xml
@@ -24,6 +24,9 @@
<para>
If you have a DVD/CD-ROM drive and the Fedora CD-ROMs or DVD you can use this method. Refer to <xref linkend="s1-begininstall-cd-inst-x86"/>, for DVD/CD-ROM installation instructions.
</para>
+ <para>
+ If you booted the installation from a piece of media other than the installation CD-ROM or DVD, you can specify the CD-ROM or DVD as the installation source with the <command>linux askmethod</command> or <command>linux repo=cdrom:<replaceable>device</replaceable>:/<replaceable>device</replaceable></command> boot option, or by selecting <guimenuitem>Local CD/DVD</guimenuitem> on the <guimenu>Installation Method</guimenu> menu (refer to <xref linkend="s1-installationmethod-x86"/>).
+ </para>
</listitem>
</varlistentry>
@@ -36,7 +39,7 @@
<tertiary>hard drive</tertiary>
</indexterm>
<para>
- If you have copied the Fedora ISO images to a local hard drive, you can use this method. You need a boot CD-ROM (use the <command>linux askmethod</command> or <command>linux repo=hd:<replaceable>device</replaceable>:/<replaceable>path</replaceable></command> boot option). Refer to <xref linkend="s1-begininstall-hd-x86"/>, for hard drive installation instructions.
+ If you have copied the Fedora ISO images to a local hard drive, you can use this method. You need a boot CD-ROM (use the <command>linux askmethod</command> or <command>linux repo=hd:<replaceable>device</replaceable>:/<replaceable>path</replaceable></command> boot option), or by selecting <guimenuitem>Hard drive</guimenuitem> on the <guimenu>Installation Method</guimenu> menu (refer to <xref linkend="s1-installationmethod-x86"/>). Refer to <xref linkend="s1-begininstall-hd-x86"/>, for hard drive installation instructions.
</para>
</listitem>
</varlistentry>
@@ -50,7 +53,7 @@
<tertiary>NFS image</tertiary>
</indexterm>
<para>
- If you are installing from an NFS server using ISO images or a mirror image of Fedora, you can use this method. You need a boot CD-ROM (use the <command>linux askmethod</command> or <command>linux repo=nfs:<replaceable>server</replaceable> <replaceable>:options</replaceable>:/<replaceable>path</replaceable></command> boot option). Refer to <xref linkend="s1-begininstall-nfs-x86"/> for network installation instructions. Note that NFS installations may also be performed in GUI mode.
+ If you are installing from an NFS server using ISO images or a mirror image of Fedora, you can use this method. You need a boot CD-ROM (use the <command>linux askmethod</command> or <command>linux repo=nfs:<replaceable>server</replaceable> <replaceable>:options</replaceable>:/<replaceable>path</replaceable></command> boot option, or the <guimenuitem>NFS directory</guimenuitem> option on the <guimenu>Installation Method</guimenu> menu described in <xref linkend="s1-installationmethod-x86"/>). Refer to <xref linkend="s1-begininstall-nfs-x86"/> for network installation instructions. Note that NFS installations may also be performed in GUI mode.
</para>
</listitem>
</varlistentry>
@@ -64,7 +67,7 @@
<tertiary>URL</tertiary>
</indexterm>
<para>
- If you are installing directly from an HTTP (Web) server or FTP server, use this method. You need a boot CD-ROM (use the <command>linux askmethod</command>, <command>linux repo=ftp://<replaceable>user</replaceable>:<replaceable>password</replaceable>@<replaceable>host</replaceable>/<replaceable>path</replaceable></command>, or <command>linux repo=http://<replaceable>host</replaceable>/<replaceable>path</replaceable></command> boot option). Refer to <xref linkend="s1-begininstall-url-x86"/>, for FTP and HTTP installation
+ If you are installing directly from an HTTP (Web) server or FTP server, use this method. You need a boot CD-ROM (use the <command>linux askmethod</command>, <command>linux repo=ftp://<replaceable>user</replaceable>:<replaceable>password</replaceable>@<replaceable>host</replaceable>/<replaceable>path</replaceable></command>, or <command>linux repo=http://<replaceable>host</replaceable>/<replaceable>path</replaceable></command> boot option, or the <guimenuitem>URL</guimenuitem> option on the <guimenu>Installation Method</guimenu> menu described in <xref linkend="s1-installationmethod-x86"/>). Refer to <xref linkend="s1-begininstall-url-x86"/>, for FTP and HTTP installation
instructions.
</para>
</listitem>
@@ -73,7 +76,7 @@
<para>If you booted the distribution DVD and did not use the
alternate installation source option <option>askmethod</option>,
the next stage loads automatically from the DVD. Proceed to
- <xref linkend="sn-welcome-x86"/>.</para>
+ <xref linkend="s1-langselection-x86"/>.</para>
<note>
<title>CD/DVD Activity</title>
<para>
@@ -87,3 +90,4 @@
</note>
</section>
+
diff --git a/en-US/Installation_Method-x86.xml b/en-US/Installation_Method-x86.xml
new file mode 100644
index 0000000..916ba9e
--- /dev/null
+++ b/en-US/Installation_Method-x86.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<section id="s1-installationmethod-x86">
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="Installation_Method_common-title.xml"/>
+ <!-- Title: Language Selection -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="Installation_Method_common-indexterm.xml"/>
+
+ <para>
+ Use the arrow keys on your keyboard to select an installation method (refer to <xref linkend="fig-installationmethod-x86"/>). With your selected method highlighted, press the <keycap>Tab</keycap> key to move to the <guibutton>OK</guibutton> button and press the <keycap>Enter</keycap> key to confirm your choice.
+ </para>
+
+ <figure float="0" id="fig-installationmethod-x86"><title>Language Selection</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/installationmethod/method.png" format="PNG"/></imageobject>
+ <textobject><para>
+ Installation method screen.
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation-x86.xml"/>
+ <!-- Installing from CD-ROM or DVD-->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Hard_Disk-x86.xml"/>
+ <!-- Installing from a Hard Drive -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Network-x86.xml"/>
+ <!-- Performing a Network Installation -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_NFS-x86.xml"/>
+ <!-- Installing via NFS -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-x86.xml"/>
+ <!-- Installing via FTP or HTTP -->
+
+
+</section>
+
diff --git a/en-US/Installation_Method_common-indexterm.xml b/en-US/Installation_Method_common-indexterm.xml
new file mode 100644
index 0000000..0d51156
--- /dev/null
+++ b/en-US/Installation_Method_common-indexterm.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<indexterm significance="normal">
+ <primary>installation method</primary>
+ <secondary>selecting</secondary>
+</indexterm>
+
diff --git a/en-US/Installation_Method_common-title.xml b/en-US/Installation_Method_common-title.xml
new file mode 100644
index 0000000..9e012c0
--- /dev/null
+++ b/en-US/Installation_Method_common-title.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<title>Installation Method</title>
+
The ref '16be275b9235231c90748f41a22694de1847b797' was updated from:
31e4597f7160adffef5fe7a8fbb784d3a2e94237
To:
31e4597f7160adffef5fe7a8fbb784d3a2e94237
This is unexpected because:
'16be275b9235231c90748f41a22694de1847b797' is not in refs/heads/ or refs/tags/