en-US/Graphical_Installation_x86-Installation-methods.xml en-US/Graphical_Installation-x86.xml en-US/Installation_Method_common-indexterm.xml en-US/Installation_Method_common-title.xml en-US/Installation_Method-x86.xml
Rüdiger Landmann
rlandmann at fedoraproject.org
Thu Apr 29 07:08:17 UTC 2010
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 at 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>
+
More information about the docs-commits
mailing list