[install-guide/f21-branch] BZ#1045205 - Updated information about inst.askmethod in Boot Options and SourceSpoke

[pbokoc]

commit 760f614b5f12585fdb2c8cd1f3b10cf2a043cd0d
Author: Petr Bokoc <pbokoc at redhat.com>
Date:   Mon Dec 15 16:35:03 2014 +0100

    BZ#1045205 - Updated information about inst.askmethod in Boot Options and SourceSpoke

 en-US/Boot_Options.xml |   18 ++++++++++++++++--
 en-US/SourceSpoke.xml  |    7 ++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/en-US/Boot_Options.xml b/en-US/Boot_Options.xml
index 5747e10..fa561f6 100644
--- a/en-US/Boot_Options.xml
+++ b/en-US/Boot_Options.xml
@@ -216,6 +216,20 @@
 						</important>
                     </listitem>
                 </varlistentry>
+                <varlistentry>
+                    <term><option>isnt.askmethod</option></term>
+                    <listitem>
+                        <para>
+                            Prevents the installer from trying to automatically configure an installation source.
+                        </para>
+                        <para>
+                            Normally, when you first enter the <guilabel>Installation Summary</guilabel> screen, the installer will attempt to configure an installation source based on the type of media you used to boot. The full &PRODUCT; Server DVD will configure the source as local media, the netinst ISO image will configure the closest network mirror, etc. This process takes time; therefore, if you plan to use a different source than the default, this option will allow you to enter the <guilabel>Installation Source</guilabel> screen immediately without having to wait for the initial configuration to finish.
+                        </para>
+                        <para>
+                            Using this option will leave the installation source configuration in an error state - you must manually specify a source in the <guilabel>Installation Source</guilabel> screen to proceed with the installation. Alternatively, you can use the <option>inst.repo=</option> option described above to configure a specific source directly in the boot menu.
+                        </para>
+                    </listitem>
+                </varlistentry>
             </variablelist>
         </section>
 
@@ -1026,10 +1040,10 @@ Password:
         </para>
         <variablelist>
             <varlistentry>
-                <term><option>askmethod</option>, <option>asknetwork</option></term>
+                <term><option>asknetwork</option></term>
                 <listitem>
                     <para>
-                        The installation program's <systemitem>initramfs</systemitem> is now completely non-interactive, which means that these options are not available anymore. Instead, use the <option>inst.repo=</option> to specify the installation method and <option>ip=</option> to configure network settings.
+                        The installation program's <systemitem>initramfs</systemitem> is now completely non-interactive, which means that this option are not available anymore. Use <option>ip=</option> to configure network settings.
                     </para>
                 </listitem>
             </varlistentry>
diff --git a/en-US/SourceSpoke.xml b/en-US/SourceSpoke.xml
index 2e211e1..28d7c49 100644
--- a/en-US/SourceSpoke.xml
+++ b/en-US/SourceSpoke.xml
@@ -8,6 +8,11 @@
 	<para>
 		The <guilabel>Installation Source</guilabel> screen allows you to specify a location (local or on the network) from which packages will be downloaded and installed on your system. This screen will be configured automatically in most cases, but you can change your settings or add additional sources.
 	</para>
+	<note>
+	    <para>
+	        Normally, when you first enter the <guilabel>Installation Summary</guilabel> screen, the installer will attempt to configure an installation source based on the type of media you used to boot. The full &PRODUCT; Server DVD will configure the source as local media, the netinst ISO image will configure the closest network mirror, etc. This process takes some time, especially if the default source is a network mirror. If you plan to use a custom installation source, use the <option>inst.askmethod</option> boot option to skip the initial configuration; this will allow you to enter this screen immediately. See <xref linkend="sect-boot-options-sources" /> for information about boot options.
+	    </para>
+	</note>
 	<figure>
 		<title>Installation Source</title>
 		<mediaobject>
@@ -16,7 +21,7 @@
 			</imageobject>
 			<textobject>
 				<para>
-					The Installation Source screen, configured to download packages to be installed from the closest network mirror. An options to use a locally available ISO file is displayed above.
+					The Installation Source screen, configured to download packages to be installed from the closest network mirror. An option to use a locally available ISO file is displayed above.
 				</para>
 			</textobject>
 		</mediaobject>