[install-guide] Removed references to the removed 'askmethod' boot option.
Pete Travis
immanetize at fedoraproject.org
Thu Mar 22 14:19:31 UTC 2012
commit a23cf3eb24bfd641777203c9a3ca42705491357e
Author: Pete Travis <immanetize at fedoraproject.org>
Date: Thu Mar 22 08:13:44 2012 -0600
Removed references to the removed 'askmethod' boot option.
...ginning_Installation_Network_x86_ppc-para-3.xml | 3 ++-
...hical_Installation_x86-Installation-methods.xml | 12 ++++--------
en-US/Installation_Method-x86.xml | 2 +-
en-US/Iseries_Rescuemode.xml | 2 +-
en-US/Kickstart2.xml | 18 ------------------
en-US/Making_Minimal_Boot_Media.xml | 2 +-
en-US/adminoptions.xml | 8 ++++----
en-US/pxe-server-para-1.xml | 2 +-
8 files changed, 14 insertions(+), 35 deletions(-)
---
diff --git a/en-US/Beginning_Installation_Network_x86_ppc-para-3.xml b/en-US/Beginning_Installation_Network_x86_ppc-para-3.xml
index 5bae403..16d50a7 100644
--- a/en-US/Beginning_Installation_Network_x86_ppc-para-3.xml
+++ b/en-US/Beginning_Installation_Network_x86_ppc-para-3.xml
@@ -3,7 +3,8 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
+<!-- This might be fairly redundant, except to provide a reference to the whole sections dealing with network installation -->
<para>
- When you start an installation with the <literal>askmethod</literal> or <literal>repo=</literal> options, you can install Fedora from a network server using FTP, HTTP, or NFS protocols. <application>Anaconda</application> uses the same network connection to consult additional software repositories later in the installation process.
+ When you start an installation with the <literal>repo=</literal> options, you can install Fedora from a network server using FTP, HTTP, or NFS protocols. <application>Anaconda</application> uses the same network connection to consult additional software repositories later in the installation process.
</para>
diff --git a/en-US/Graphical_Installation_x86-Installation-methods.xml b/en-US/Graphical_Installation_x86-Installation-methods.xml
index 170bb01..5a9e93c 100644
--- a/en-US/Graphical_Installation_x86-Installation-methods.xml
+++ b/en-US/Graphical_Installation_x86-Installation-methods.xml
@@ -25,7 +25,7 @@
If you have a DVD drive and the Fedora DVD you can use this method. Refer to <xref linkend="s1-begininstall-cd-inst-x86"/>, for DVD installation instructions.
</para>
<para>
- If you booted the installation from a piece of media other than the installation DVD, you can specify the 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"/>).
+ If you booted the installation from a piece of media other than the installation DVD, you can specify the DVD as the installation source with the <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>
@@ -48,7 +48,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), 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.
+ 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 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>
@@ -62,7 +62,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, 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.
+ 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 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>
@@ -76,16 +76,12 @@
<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, 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
+ 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 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>
</varlistentry>
</variablelist>
- <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="s1-langselection-x86"/>.</para>
<note>
<title>DVD Activity</title>
<para>
diff --git a/en-US/Installation_Method-x86.xml b/en-US/Installation_Method-x86.xml
index a701cd3..981cea8 100644
--- a/en-US/Installation_Method-x86.xml
+++ b/en-US/Installation_Method-x86.xml
@@ -7,7 +7,7 @@
<xi:include href="Installation_Method_common-title.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Title: Language Selection --> <xi:include href="Installation_Method_common-indexterm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<para>
- If you booted the installation from minimal boot media or with the <command>askmethod</command> boot option, 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.
+ If you booted the installation from minimal boot media,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">
<xi:include href="Installation_Method_common-title.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/en-US/Iseries_Rescuemode.xml b/en-US/Iseries_Rescuemode.xml
index dde7e93..97604af 100644
--- a/en-US/Iseries_Rescuemode.xml
+++ b/en-US/Iseries_Rescuemode.xml
@@ -48,7 +48,7 @@
<!-- <para>
<emphasis>For OpenPower, p5, i5, and pSeries:</emphasis>
</para> --> <para>
- Boot from the CD-ROM with the <command>linux rescue askmethod</command> command. This allows you to manually select NFS as the source of your rescue media instead of defaulting to the CD-ROM drive.
+ Boot from the CD-ROM with the <command>linux rescue repo=</command> option. This allows you to manually select NFS as the source of your rescue media instead of defaulting to the CD-ROM drive. See <linkend xref="sn-boot-options-installmethod" /> for more on <option>repo=</option>.
</para>
</listitem>
diff --git a/en-US/Kickstart2.xml b/en-US/Kickstart2.xml
index 1defc16..1dea91b 100644
--- a/en-US/Kickstart2.xml
+++ b/en-US/Kickstart2.xml
@@ -3318,24 +3318,6 @@ umount /mnt/temp
<variablelist>
<varlistentry>
- <term><command>askmethod</command></term>
- <listitem>
- <para>
- Prompt the user to select an installation source, even if a Fedora installation DVD is detected on the system.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><command>asknetwork</command></term>
- <listitem>
- <para>
- Prompt for network configuration in the first stage of installation regardless of installation method.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term><command>autostep</command></term>
<listitem>
<para>
diff --git a/en-US/Making_Minimal_Boot_Media.xml b/en-US/Making_Minimal_Boot_Media.xml
index f463f3e..b3a657e 100644
--- a/en-US/Making_Minimal_Boot_Media.xml
+++ b/en-US/Making_Minimal_Boot_Media.xml
@@ -54,7 +54,7 @@
<section id="Making_Minimal_Boot_Media-UEFI">
<title>UEFI-based systems</title>
<para>
- The Fedora Project does not provide an image to produce minimal boot CDs or DVDs for UEFI-based systems. Use a USB flash drive (as described in this section) to boot the Fedora &PRODVER; installer, or use the installation DVD with the <command>linux askmethod</command> option to boot the installer from DVD and continue installation from a different installation source — refer to <xref linkend="s1-installmethod-x86"/>.
+ The Fedora Project does not provide an image to produce minimal boot CDs or DVDs for UEFI-based systems. Use a USB flash drive (as described in this section) to boot the Fedora &PRODVER; installer. The full DVD installation image should function as expected.
</para>
<para>
Use the <filename>efidisk.img</filename> file in the <filename>images/</filename> directory on the Fedora &PRODVER; installation DVD to produce a bootable USB flash drive for UEFI-based systems.
diff --git a/en-US/adminoptions.xml b/en-US/adminoptions.xml
index 875ec72..f4b4b4a 100644
--- a/en-US/adminoptions.xml
+++ b/en-US/adminoptions.xml
@@ -154,10 +154,10 @@
<section id="sn-boot-options-installmethod">
<title>Specifying the Installation Method</title>
- <para>
- Use the <option>askmethod</option> option to display additional menus that enable you to specify the installation method and network settings. You may also configure the installation method and network settings at the <prompt>boot:</prompt> prompt itself.
- </para>
- <para>
+ <warning>The <option>askmethod</option> and <option>asknetwork</option> options are no longer available. Use <option>root=</option> to specify the installation method, and see <linkend xref="sn-boot-options-network" /> to configure network interfaces.
+ </warning>
+
+ <para>
To specify the installation method from the <prompt>boot:</prompt> prompt, use the <option>repo</option> option. Refer to <xref linkend="tb-installmethods" /> for the supported installation methods.
</para>
<table frame="all" id="tb-installmethods">
diff --git a/en-US/pxe-server-para-1.xml b/en-US/pxe-server-para-1.xml
index dacfe24..ba60950 100644
--- a/en-US/pxe-server-para-1.xml
+++ b/en-US/pxe-server-para-1.xml
@@ -3,6 +3,6 @@
]>
<para>
- Fedora allows for installation over a network using the NFS, FTP, or HTTP protocols. A network installation can be started from a boot CD-ROM, a bootable flash memory drive, or by using the <command>askmethod</command> boot option with the Fedora DVD. Alternatively, if the system to be installed contains a network interface card (NIC) with Pre-Execution Environment (PXE) support, it can be configured to boot from files on another networked system rather than local media such as a DVD.
+ Fedora allows for installation over a network using the NFS, FTP, or HTTP protocols. A network installation can be started from a boot CD-ROM, a bootable flash memory drive, or by using the <option>repo=</option> boot option with the Fedora DVD. Alternatively, if the system to be installed contains a network interface card (NIC) with Pre-Execution Environment (PXE) support, it can be configured to boot from files on another networked system rather than local media such as a DVD.
</para>
More information about the docs-commits
mailing list