[install-guide] Updating the Boot Options chapter

pbokoc pbokoc at fedoraproject.org
Fri Dec 13 13:00:17 UTC 2013


commit 5fd6c4b2d76b6084fe23ea8bc7e1dd1a7be67c3d
Author: Petr Bokoc <pbokoc at redhat.com>
Date:   Fri Dec 13 13:47:01 2013 +0100

    Updating the Boot Options chapter

 en-US/Boot_x86_ppc-variablelist-1.xml |    2 +-
 en-US/Kickstart2.xml                  |    2 +-
 en-US/Ksconfig.xml                    |    2 +-
 en-US/adminoptions.xml                | 1623 ++++++++++++++++++---------------
 en-US/medialess.xml                   |    2 +-
 5 files changed, 888 insertions(+), 743 deletions(-)
---
diff --git a/en-US/Boot_x86_ppc-variablelist-1.xml b/en-US/Boot_x86_ppc-variablelist-1.xml
index 451042b..b69785c 100644
--- a/en-US/Boot_x86_ppc-variablelist-1.xml
+++ b/en-US/Boot_x86_ppc-variablelist-1.xml
@@ -24,7 +24,7 @@
 		<term>Run a memory test</term>
 		<listitem>
 			<para>
-				This option runs an exhaustive test on the memory on your system.  For more information, refer to <xref linkend="sn-memtest"/>.
+				This option runs an exhaustive test on the memory on your system.  For more information, refer to <xref linkend="sect-boot-options-memtest"/>.
 			</para>
 		</listitem>
 	</varlistentry>
diff --git a/en-US/Kickstart2.xml b/en-US/Kickstart2.xml
index c9f547e..581b4e1 100644
--- a/en-US/Kickstart2.xml
+++ b/en-US/Kickstart2.xml
@@ -2719,7 +2719,7 @@ If the <command>selinux</command> option is not present in the kickstart file, S
 					</itemizedlist>
 					<important><title>Important — You must boot with sshd=1</title>
 						<para>
-							By default, the <application>ssh</application> server is not started during installation. To make <systemitem>ssh</systemitem> available during installation, boot the system with the kernel boot option <parameter>sshd=1</parameter>. Refer to <xref linkend="sn-ssh-installation"/> for details of how to specify this kernel option at boot time.
+							By default, the <application>ssh</application> server is not started during installation. To make <systemitem>ssh</systemitem> available during installation, boot the system with the kernel boot option <parameter>sshd=1</parameter>. Refer to <xref linkend="list-boot-options-display"/> for details of how to specify this kernel option at boot time.
 						</para>
 					</important>
 				</listitem>
diff --git a/en-US/Ksconfig.xml b/en-US/Ksconfig.xml
index 4c4b927..2b7da6c 100644
--- a/en-US/Ksconfig.xml
+++ b/en-US/Ksconfig.xml
@@ -187,7 +187,7 @@
 			</listitem>
 			 <listitem>
 				<para>
-					<guilabel>Hard Drive</guilabel> &mdash; Choose this option to install or upgrade from a hard drive. Hard drive installations require the use of ISO images. Be sure to verify that the ISO images are intact before you start the installation. To verify them, use an <command>md5sum</command> program as well as the <command>linux rd.live.check</command> boot option as discussed in <xref linkend="sn-boot-mediacheck" />. Enter the hard drive partition that contains the ISO images (for example, <filename>/dev/hda1</filename>) in the <guilabel>Hard Drive Partition</guilabel> text box. Enter the directory that contains the ISO images in the <guilabel>Hard Drive Directory</guilabel> text box.
+					<guilabel>Hard Drive</guilabel> &mdash; Choose this option to install or upgrade from a hard drive. Hard drive installations require the use of ISO images. Be sure to verify that the ISO images are intact before you start the installation. To verify them, use an <command>md5sum</command> program as well as the <command>linux rd.live.check</command> boot option as discussed in <xref linkend="sect-boot-options-mediacheck" />. Enter the hard drive partition that contains the ISO images (for example, <filename>/dev/hda1</filename>) in the <guilabel>Hard Drive Partition</guilabel> text box. Enter the directory that contains the ISO images in the <guilabel>Hard Drive Directory</guilabel> text box.
 				</para>
 
 			</listitem>
diff --git a/en-US/adminoptions.xml b/en-US/adminoptions.xml
index 899a6c5..723cafe 100644
--- a/en-US/adminoptions.xml
+++ b/en-US/adminoptions.xml
@@ -4,920 +4,1065 @@
 %BOOK_ENTITIES;
 ]>
 <chapter id="ap-admin-options">
-	<!--  $Id:  --> <title>Boot Options</title>
-	 <para>
-		The Fedora installation system includes a range of functions and options for administrators. To use boot options, enter <userinput>linux <replaceable>option</replaceable></userinput> at the <prompt>boot:</prompt> prompt.
-	</para>
-	 <para>
-		To access the <prompt>boot:</prompt> prompt on a system that displays a graphical boot screen, press the <keycap>Esc</keycap> key while the graphical boot screen is displayed.
+	<title>Boot Options</title>
+	
+	<!-- Begin index terms -->
+	<indexterm>
+		<primary>boot options</primary>
+	</indexterm>
+	<indexterm>
+		<primary>boot menu</primary>
+		<secondary>options</secondary>
+	</indexterm>
+	<!-- End index terms -->
+	
+	<para>
+		The &PRODUCT; installation system includes a range of functions and options for administrators. To use boot options, append them to the boot command line. To access the command line on a system that displays a graphical boot screen, press the <keycap>Tab</keycap> key while one of the boot options on the screen is highlighted, or press the <keycap>Esc</keycap> key at any point in the boot menu. Multiple options added to the boot line need to be separated by a single space.
 	</para>
-	 <para>
-		If you specify more than one option, separate each of the options by a single space. For example:
+	<para>
+		Throughout this chapter, some options are presented ending an "equals" sign ('<literal>=</literal>'). These options require a value to be specified. For example, the <option>inst.vncpassword=</option> option must also contain a password &mdash; for example, <option>inst.vncpassword=testpasswd</option>. Other options are presented without the <literal>=</literal> sign; these options are booleans. This means that you either use them without specifying a value, or you can append either <literal>=1</literal> or <literal>=0</literal> to enable or disable them, respectively. For example, the <option>rd.live.check</option> option is the same as <option>rd.live.check=1</option>, and using <option>rd.live.check=0</option> is exactly the same as not using the option at all.
 	</para>
-	
-<screen>
-<userinput>linux <replaceable>option1</replaceable> <replaceable>option2</replaceable> <replaceable>option3</replaceable></userinput></screen>
-
-	<xi:include href="Note-boot-options-live-images.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-	 <note>
-		<title>Anaconda Boot Options</title>
+	<note>
 		 <para>
-			The anaconda installer has many boot options, most are listed on the wiki <ulink url="http://fedoraproject.org/wiki/Anaconda/Options" />.
+			The &PRODUCT; installation can either boot with <firstterm>rescue mode</firstterm>, or load the installation system. For more information on rescue mode, see <xref linkend="sect-boot-options-rescue" />.
 		</para>
 
 	</note>
-	 <note>
-		<title>Kernel Boot Options</title>
-		 <para>
-			The <ulink url="http://fedoraproject.org/wiki/KernelCommonProblems" /> page lists many common kernel boot options. The full list of kernel options is in the file /usr/share/doc/kernel-doc-<replaceable>version</replaceable>/Documentation/kernel-parameters.txt, which is installed with the kernel-doc package.
+	
+	<section id="sn-bootoptions-installer">
+		<title>Configuring the Installation System at the Boot Menu</title>
+		<para>
+			The <prompt>boot:</prompt> prompt always expects the first option to specify the image file to be loaded. When using custom boot options with the Anaconda installer, the <option>linux</option> option will come first in most cases. A valid command in the boot prompt will therefore almost always look like the following:
 		</para>
-
-	</note>
-	 <note>
-		<title>Rescue Mode</title>
-		 <para>
-			The Fedora installation and <firstterm>rescue discs</firstterm> may either boot with <firstterm>rescue mode</firstterm>, or load the installation system. For more information on rescue discs and rescue mode, refer to <xref linkend="sn-mode-rescue" />.
+		<screen><prompt>boot:</prompt><option>linux <replaceable>options</replaceable></option></screen>
+		<para>
+			This only applies to the actual boot prompt, which is accessed by pressing the <keycap>Esc</keycap> key in the boot menu. If you are only modifying an existing set of options (accessed by highliting a choice in the boot menu and pressing the <keycap>Tab</keycap> key), the <option>linux</option> option is not displayed, but it is implied. A valid set of boot options will then be:
 		</para>
-
-	</note>
-	 <section id="sn-bootoptions-installer">
-		<title>Configuring the Installation System at the Boot Menu</title>
-		 <para>
-			You can use the boot menu to specify a number of settings for the installation system, including:
+		<screen><prompt>&gt;</prompt><option><replaceable>options</replaceable></option></screen>
+		<para>
+			In addition to the options described in this chapter, the boot prompt also accepts valid <package>dracut</package> kernel options. A list of these options is available as the <systemitem>dracut.cmdline(7)</systemitem> man page.
 		</para>
-		 <itemizedlist>
-			<listitem>
-				<para>
-					language
-				</para>
-
-			</listitem>
-			 <listitem>
-				<para>
-					display resolution
-				</para>
-
-			</listitem>
-			 <listitem>
-				<para>
-					interface type
-				</para>
-
-			</listitem>
-			 <listitem>
-				<para>
-					Installation method
-				</para>
-
-			</listitem>
-			 <listitem>
-				<para>
-					network settings
-				</para>
-
-			</listitem>
-
-		</itemizedlist>
-		 <section id="sn-boot-options-language">
-			<title>Specifying the Language</title>
-			 <para>
-				To set the language for both the installation process and the final system, specify the ISO code for that language with the <option>lang</option> option. Use the <option>keymap</option> option to configure the correct keyboard layout.
-			</para>
-			 <para>
-				For example, the ISO codes <userinput>el_GR</userinput> and <userinput>gr</userinput> identify the Greek language and the Greek keyboard layout:
+		<note>
+			<para>
+				Boot options specific to the installer always start with <literal>inst.</literal> in this guide. Currently, this prefix is optional, for example, <option>inst.resolution=</option> will work exactly the same as <option>resolution=</option>. However, it is expected that Anaconda will require the <literal>inst.</literal> prefix in future releases.
 			</para>
-			
-<screen>
-<userinput>linux lang=<replaceable>el_GR</replaceable> keymap=<replaceable>gr</replaceable></userinput></screen>
-
-		</section>
+		</note>
 		
-		 <section id="sn-boot-options-interface">
-			<title>Configuring the Interface</title>
-			 <para>
-				To use a specific display resolution, enter <option>resolution=<replaceable>setting</replaceable></option> as a boot option. For example, to set the display resolution to 1024×768, enter:
-			</para>
+		<variablelist id="list-boot-options-source">
+			<title>Specifying the Installation Source</title>
 			
-<screen>
-<userinput>linux resolution=<replaceable>1024x768</replaceable></userinput></screen>
-			 <para>
-				To run the installation process in 
-				<indexterm>
-					<primary>text interface</primary>
-
-				</indexterm>
-				 <option>text</option> mode, enter:
-			</para>
+			<!-- Begin index terms -->
+			<indexterm>
+				<primary>boot options</primary>
+				<secondary>installation source</secondary>
+			</indexterm>
+			<!-- End index terms -->
 			
-<screen>
-<userinput>linux text</userinput></screen>
-			 <para>
-				To enable support for a 
-				<indexterm>
-					<primary>serial console</primary>
-
-				</indexterm>
-				 serial console, enter <option>serial</option> as an additional option.
-			</para>
-			 <para>
-				Use <option>display=<replaceable>ip</replaceable>:0</option> to allow remote display forwarding. In this command, <replaceable>ip</replaceable> should be replaced with the IP address of the system on which you want the display to appear.
-			</para>
-			 <para>
-				On the system you want the display to appear on, you must execute the command <command>xhost +<replaceable>remotehostname</replaceable></command>, where <replaceable>remotehostname</replaceable> is the name of the host from which you are running the original display. Using the command <command>xhost +<replaceable>remotehostname</replaceable></command> limits access to the remote display terminal and does not allow access from anyone or any system not specifically authorized for remote access.
-			</para>
-
-		</section>
+			<varlistentry>
+				<term><option>inst.repo=</option></term>
+				<listitem>
+					<para>
+						Specifies the installation source &mdash; that is, a location where the installer can find the images and packages it needs. For example:
+					</para>
+					<screen><option>inst.repo=cdrom</option></screen>
+					<para>
+						The target must be either:
+					</para>
+					<itemizedlist>
+						<listitem>
+							<para>
+								an installable tree, which is a directory structure containing the installer's images, packages and repodata as well as a valid <filename>.treeinfo</filename> file
+							</para>
+						</listitem>
+						<listitem>
+							<para>
+								a mounted DVD (either a physical DVD in a DVD drive or a loopback-mounted image)
+							</para>
+						</listitem>
+					</itemizedlist>
+					<para>
+						This option allows for the configuration of different installation methods using different formats. The syntax is described in the table below. 
+					</para>
+					<table frame="all" id="tabl-installmethods">
+						<title>Installation Sources</title>
+						<tgroup align="left" cols="2" colsep="1" rowsep="1">
+							<colspec colnum="1" colwidth="1*"></colspec>
+							<colspec colnum="2" colwidth="3*"></colspec>
+							<thead>
+								<row>
+									<entry>
+										Installation source
+									</entry>
+									<entry>
+										Option format
+									</entry>
+								</row>
+							</thead>
+							<tbody>
+								<row>
+									<entry>
+										Any CD/DVD drive
+									</entry>
+									<entry>
+										<option>inst.repo=cdrom</option>
+									</entry>
+								</row>
+								<row>
+									<entry>
+										Specific CD/DVD drive
+									</entry>
+									<entry>
+										<option>inst.repo=cdrom:<replaceable>device</replaceable></option>
+									</entry>
+								</row>
+								<row>
+									<entry>
+										Hard Drive
+									</entry>
+									<entry>
+										<option>inst.repo=hd:<replaceable>device</replaceable>/<replaceable>path</replaceable></option>
+									</entry>
+								</row>
+								<row>
+									<entry>
+										HTTP Server
+									</entry>
+									<entry>
+										<option>inst.repo=http://<replaceable>host</replaceable>/<replaceable>path</replaceable></option>
+									</entry>
+								</row>
+								<row>
+									<entry>
+										HTTPS Server
+									</entry>
+									<entry>
+										<option>inst.repo=https://<replaceable>host</replaceable>/<replaceable>path</replaceable></option>
+									</entry>
+								</row>
+								<row>
+									<entry>
+										FTP Server
+									</entry>
+									<entry>
+										<option>inst.repo=ftp://<replaceable>username</replaceable>:<replaceable>password</replaceable>@<replaceable>host</replaceable>/<replaceable>path</replaceable></option>
+									</entry>
+								</row>
+								<row>
+									<entry>
+										NFS Server
+									</entry>
+									<entry>
+										<option>inst.repo=nfs:[<replaceable>options</replaceable>:]<replaceable>server</replaceable>:/<replaceable>path</replaceable></option>
+										<footnote>
+											<para>
+												This option uses NFS protocol version 3 by default. To use a different version, add <option>+nfsvers=<replaceable>X</replaceable></option> to <replaceable>options</replaceable>.
+											</para>
+										</footnote>
+									</entry>
+								</row>
+							</tbody>
+						</tgroup>
+					</table>
+					
+					<!-- Begin index terms -->
+					<indexterm>
+						<primary>boot options</primary>
+						<secondary>disk device names</secondary>
+					</indexterm>
+					<!-- End index terms -->
+					
+					<para>
+						Disk device names may be specified using the following formats:
+					</para>
+					<itemizedlist>
+						<listitem>
+							<para>
+								Kernel device name, for example <systemitem>/dev/sda1</systemitem> or <systemitem>sdb2</systemitem>
+							</para>
+						</listitem>
+						<listitem>
+							<para>
+								File system label, for example <systemitem>LABEL=Flash</systemitem> or <systemitem>LABEL=RHEL7</systemitem>
+							</para>
+						</listitem>
+						<listitem>
+							<para>
+								File system UUID, for example <systemitem>UUID=8176c7bf-04ff-403a-a832-9557f94e61db</systemitem>
+							</para>
+						</listitem>
+					</itemizedlist>
+					<para>
+						Non-alphanumeric characters must be represented as <literal>\x<replaceable>NN</replaceable></literal>, where <replaceable>NN</replaceable> is the hexadecimal representation of the character. For example, <literal>\x20</literal> is a white space ('<literal> </literal>').
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.stage2=</option></term>
+				<listitem>
+					<!-- Begin index terms -->
+					<indexterm>
+						<primary>boot options</primary>
+						<secondary>installer runtime image</secondary>
+					</indexterm>
+					<!-- End index terms -->
+					<para>
+						Specifies the location of the installer runtime image to be loaded. The syntax is the same as in <xref linkend="list-boot-options-source" />. This option will ignore everything except for the image itself, it is not possible to use it to specify the location of packages.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.dd=</option></term>				
+				<listitem>
+					<!-- Begin index terms -->
+					<indexterm>
+						<primary>boot options</primary>
+						<secondary>driver updates</secondary>
+					</indexterm>
+					<!-- End index terms -->
+					<para>
+						If you need to perform a driver update during the installation, use the <option>inst.dd=</option> option. It can be used multiple times. The location of a driver rpm package can be specified using any of the formats detailed in <xref linkend="list-boot-options-source" />. For example:
+					</para>
+					<screen><option>inst.dd=cdrom</option></screen>
+				</listitem>
+			</varlistentry>
+		</variablelist>
 		
-		 <section id="sn-boot-options-update">
-			<title>Updating anaconda</title>
-			 <para>
-				You can install Fedora with a newer version of the <application>anaconda</application> installation program than the one supplied on your installation media.
-			</para>
-			 <para>
-				The boot option
-			</para>
+		<variablelist id="list-boot-options-kickstart">
+			<title>Kickstart Boot Options</title>
+			<varlistentry>
+				<term><option>inst.ks=</option></term>
+				<listitem>
+					<para>
+						Gives the location of a Kickstart file to be used to automate the installation. Locations can be specified using any of the formats valid for <option>inst.repo</option>. See <xref linkend="list-boot-options-source" /> for details.
+					</para>
+					<para>
+						If you only specify a device and not a path, Anaconda will look for the Kickstart file in <filename>/ks.cfg</filename> on the specified device. If you use this option without specifying a device, the installer will use the following:
+					</para>
+					<screen><option>inst.ks=nfs:<replaceable>next-server</replaceable>:/<replaceable>filename</replaceable></option></screen>
+					<para>
+						In the above example, <replaceable>next-server</replaceable> is the DHCP <literal>next-server</literal> option or the IP address of the DHCP server itself, and <replaceable>filename</replaceable> is the DHCP <literal>filename</literal> option, or <filename>/kickstart/</filename>. If the given file name ends with the <literal>/</literal> character, <literal><replaceable>ip</replaceable>-kickstart</literal> is appended. For example:
+					</para>
+					<table id="tabl-default-kickstart-location">
+						<title>Default Kickstart File Location</title>
+						<tgroup align="left" cols="3" colsep="1" rowsep="1">
+							<colspec colnum="1" colwidth="1*"></colspec>
+							<colspec colnum="2" colwidth="1*"></colspec>
+							<colspec colnum="3" colwidth="3*"></colspec>
+							<thead>
+								<row>
+									<entry>
+										DHCP server address
+									</entry>
+									<entry>
+										Client address
+									</entry>
+									<entry>
+										Kickstart file location
+									</entry>
+								</row>
+							</thead>
+							<tbody>
+								<row>
+									<entry>
+										<systemitem class="ipaddress">192.168.122.1</systemitem>
+									</entry>
+									<entry>
+										<systemitem class="ipaddress">192.168.122.100</systemitem>
+									</entry>
+									<entry>
+										<systemitem class="ipaddress">192.168.122.1</systemitem>:<filename>/kickstart/192.168.122.100-kickstart</filename>
+									</entry>
+								</row>
+							</tbody>
+						</tgroup>
+					</table>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.ks.sendmac</option></term>
+				<listitem>
+					<para>
+						Adds headers to outgoing <systemitem class="protocol">HTTP</systemitem> requests with the MAC addresses of all network interfaces. For example: 
+					</para>
+					<screen><literal>X-RHN-Provisioning-MAC-0: eth0 01:23:45:67:89:ab</literal></screen>
+					<para>
+						This can be useful when using <option>inst.ks=http</option> to provision systems.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.ks.sendsn</option></term>
+				<listitem>
+					<para>
+						Adds a header to outgoing <systemitem class="protocol">HTTP</systemitem> requests. This header will contain the system's serial number, read from <filename>/sys/class/dmi/id/product_serial</filename>. The header has the following syntax:
+					</para>
+					<screen><literal>X-System-Serial-Number: <replaceable>R8VA23D</replaceable></literal></screen>
+				</listitem>
+			</varlistentry>
+		</variablelist>
+		
+		<variablelist id="list-boot-options-display">
+			<title>Console, Environment and Display Options</title>
 			
-<screen>
-  <userinput>linux updates</userinput></screen>
-			 <para>
-				presents you with a prompt that asks you for a disk image containing <application>anaconda</application> updates. You do not need to specify this option if you are performing a network installation and have already placed the updates image contents in <filename>rhupdates/</filename> on the server.
-			</para>
-			 <para>
-				To load the <application>anaconda</application> updates from a network location instead, use:
-			</para>
+			<!-- Begin index terms -->
+			<indexterm>
+				<primary>installation</primary>
+				<secondary>text mode</secondary>
+			</indexterm>
+			<indexterm>
+				<primary>text mode</primary>
+				<secondary>installation</secondary>
+			</indexterm>
+			<indexterm>
+				<primary>boot options</primary>
+				<secondary>text mode</secondary>
+			</indexterm>
+			<indexterm>
+				<primary>boot options</primary>
+				<secondary>console</secondary>
+			</indexterm>
+			<!-- End index terms -->
 			
-<screen>
-  <userinput>linux updates=</userinput></screen>
-			 <para>
-				followed by the URL for the location where the updates are stored.
-			</para>
-
-		</section>
+			<varlistentry>
+				<term><option>console=</option></term>
+				<listitem>
+					<para>
+						This kernel option specifies a device to be used as the primary console. For example, if you want to use a console on the first serial port, use <option>console=ttyS0</option>. Implies the <option>inst.text</option> option.
+					</para>
+					<para>
+						You can use this option multiple times. In that case, the boot message will be displayed on all specified consoles, but only the last one will be used by the installer afterwards. For example, if you specify <option>console=ttyS0 console=ttyS1</option>, the installer will use <literal>ttyS1</literal>.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.lang=</option></term>
+				<listitem>
+					<para>
+						Sets the language to be used during the installation. Language codes are the same as the ones used in the <command>lang</command> Kickstart command as described in <xref linkend="s1-kickstart2-options" />. On systems where the <package>system-config-language</package> package is installed, a list of valid values can also be find in <filename>/usr/share/system-config-language/locale-list</filename>.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.geoloc=</option></term>
+				<listitem>
+					<para>
+						Configures geolocation usage in the installer. Geolocation is used to pre-set the language and time zone. This option takes the following format:
+					</para>
+					<screen><option>inst.geoloc=<replaceable>value</replaceable></option></screen>
+					<para>
+						The <replaceable>value</replaceable> parameter can be any of the following:
+					</para>
+					<table id="tabl-boot-options-geoloc">
+						<title>Valid Values for the inst.geoloc Option</title>
+						<tgroup align="left" cols="2" colsep="1" rowsep="1">
+							<colspec colnum="1" colwidth="1*"></colspec>
+							<colspec colnum="2" colwidth="3*"></colspec>
+							<tbody>
+								<row>
+									<entry>
+										Disable geolocation
+									</entry>
+									<entry>
+										<option>inst.geoloc=0</option>
+									</entry>
+								</row>
+								<row>
+									<entry>
+										Use the Fedora GeoIP API
+									</entry>
+									<entry>
+										<option>inst.geoloc=provider_fedora_geoip</option>
+									</entry>
+								</row>
+								<row>
+									<entry>
+										Use the Hostip.info GeoIP API
+									</entry>
+									<entry>
+										<option>inst.geoloc=provider_hostip</option>
+									</entry>
+								</row>
+							</tbody>
+						</tgroup>
+					</table>
+					<para>
+						If this option is not specified, Anaconda will use <literal>provider_fedora_geoip</literal>.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.keymap=</option></term>
+				<listitem>
+					<para>
+						Specifies the keyboard layout to be used by the installer. Layout codes are the same as the ones used in the <command>keyboard</command> Kickstart command as described in <xref linkend="s1-kickstart2-options" />.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.text</option></term>
+				<listitem>
+					<para>
+						Forces the installer to run in text mode instead of graphical mode. The text user interface is limited, for example, it does not allow you to modify the partition layout or set up LVM. When installing a system on a machine with a limited graphical capabilities, it is recommended to use VNC as described in <xref linkend="list-boot-options-vnc" />. 
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.cmdline</option></term>
+				<listitem>
+					<para>
+						Forces the installer to run in command line mode. This mode does not allow any interaction, all options must be specified in a Kickstart file or on the command line.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.graphical</option></term>
+				<listitem>
+					<para>
+						Forces the installer to run in graphical mode. This mode is the default.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.resolution=</option></term>
+				<listitem>
+					<para>
+						Specifies the screen resolution in graphical mode. The format is <replaceable>N</replaceable>x<replaceable>M</replaceable>, where <replaceable>N</replaceable> is the screen width and <replaceable>M</replaceable> is the screen height (in pixels). The lowest supported resolution is <literal>640x480</literal>. 
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.headless</option></term>
+				<listitem>
+					<para>
+						Specifies that the machine being installed onto does not have any display hardware. In other words, this options prevents the installer from trying to detect a screen.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.xdriver=</option></term>
+				<listitem>
+					<para>
+						Specifies the name of the <systemitem>X</systemitem> driver to be used both during the installation and on the installed system.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.usefbx</option></term>
+				<listitem>
+					<para>
+						Tells the installer to use the frame buffer <systemitem>X</systemitem> driver instead of a hardware-specific driver. This option is equivalent to <option>inst.xdriver=fbdev</option>.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.sshd</option></term>
+				<listitem>
+					<para>
+						Starts the <systemitem class="service">sshd</systemitem> service during the installation, which allows you to connect to the system during the installation using <systemitem class="protocol">SSH</systemitem> and monitor its progress. For more information on SSH, see the <systemitem>ssh(1)</systemitem> man page and the corresponding chapter in the <citetitle>&PRODUCT; System Administrator's Guide</citetitle>.
+					</para>
+					<note>
+						<para>
+							During the installation, the <systemitem class="username">root</systemitem> account has no password by default. You can set a root password to be used during the installation with the <command>sshpw</command> Kickstart command as described in <xref linkend="s1-kickstart2-options" />.
+						</para>
+					</note>
+				</listitem>
+			</varlistentry>
+		</variablelist>
 		
-		 <section id="sn-boot-options-installmethod">
-			<title>Specifying the Installation Method</title>
-			<note>
-			  <title><option>askmethod</option> and <option>asknetwork</option> are deprecated.</title>
-			  <para>The <option>askmethod</option> and <option>asknetwork</option> options are no longer available. Use <option>repo=</option> to specify the installation method, and see <xref linkend="sn-boot-options-network" /> to configure network interfaces.
-			  </para>
-		      </note>
+		<variablelist id="list-boot-options-network">
+			<title>Network Boot Options</title>
+			
+			<!-- Begin index terms -->
+			<indexterm>
+				<primary>boot options</primary>
+				<secondary>network</secondary>
+			</indexterm>
+			<!-- End index terms -->
 			
 			<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.
+				Initial network initialization is handled by <package>dracut</package>. This section only lists some of the more commonly used options; for a complete list, see the <systemitem>dracut.cmdline(7)</systemitem> man page.
 			</para>
-			 <table frame="all" id="tb-installmethods">
-				<title>Installation methods</title>
-				 <tgroup align="left" cols="2" colsep="1" rowsep="1">
-					<colspec colnum="1" colwidth="1*"></colspec>
-					 <colspec colnum="2" colwidth="3*"></colspec>
-					 <thead>
-						<row>
-							<entry>
-								Installation method
-							</entry>
-							 <entry>
-								Option format
-							</entry>
-
-						</row>
-
-					</thead>
-					 <tbody>
-						<row>
-							<entry>
-								DVD drive
-							</entry>
-							 <entry>
-								<option>repo=cdrom:<replaceable>device</replaceable></option>
-							</entry>
-
-						</row>
-						 <row>
-							<entry>
-								Hard Drive
-							</entry>
-							 <entry>
-								<option>repo=hd:<replaceable>device</replaceable>/<replaceable>path</replaceable></option>
-							</entry>
-
-						</row>
-						 <row>
-							<entry>
-								HTTP Server
-							</entry>
-							 <entry>
-								<option>repo=http://<replaceable>host</replaceable>/<replaceable>path</replaceable></option>
-							</entry>
-
-						</row>
-						 <row>
-							<entry>
-								FTP Server
-							</entry>
-							 <entry>
-								<option>repo=ftp://<replaceable>username</replaceable>:<replaceable>password</replaceable>@<replaceable>host</replaceable>/<replaceable>path</replaceable></option>
-							</entry>
-
-						</row>
-						 <row>
-							<entry>
-								NFS Server
-							</entry>
-							 <entry>
-								<option>repo=nfs:<replaceable>server</replaceable>:/<replaceable>path</replaceable></option>
-							</entry>
-
-						</row>
-						 <row>
-							<entry>
-								ISO images on an NFS Server
-							</entry>
-							 <entry>
-								<option>repo=nfsiso:<replaceable>server</replaceable>:/<replaceable>path</replaceable></option>
-							</entry>
-
-						</row>
-
-					</tbody>
-
-				</tgroup>
-
-			</table>
-
-		</section>
+			<varlistentry>
+				<term><option>ip=</option></term>
+				<listitem>
+					<para>
+						Configures one or more network interfaces. To configure multiple interfaces, use the <literal>ip</literal> option multiple times &mdash; once for each interface. If multiple interfaces are configured, you must specify a primary boot interface using the <option>bootdev</option> option described below.
+					</para>
+					<para>
+						This option accepts several different formats. The most common are described in <xref linkend="tabl-boot-options-network-formats" />.
+					</para>
+					<table id="tabl-boot-options-network-formats">
+						<title>Network Interface Configuration Formats</title>
+						<tgroup align="left" cols="2" colsep="1" rowsep="1">
+							<colspec colnum="1" colwidth="1*"></colspec>
+							<colspec colnum="2" colwidth="2*"></colspec>
+							<thead>
+								<row>
+									<entry>
+										Configuration Method
+									</entry>
+									<entry>
+										Option format
+									</entry>
+								</row>
+							</thead>
+							<tbody>
+								<row>
+									<entry>
+										Automatic configuration of any interface
+									</entry>
+									<entry>
+										<option>ip=<replaceable>method</replaceable></option>
+									</entry>
+								</row>
+								<row>
+									<entry>
+										Automatic configuration of a specific interface
+									</entry>
+									<entry>
+										<option>ip=<replaceable>interface</replaceable>:<replaceable>method</replaceable></option>
+									</entry>
+								</row>
+								<row>
+									<entry>
+										Static configuration
+									</entry>
+									<entry>
+										<option>ip=<replaceable>ip</replaceable>::<replaceable>gateway</replaceable>:<replaceable>netmask</replaceable>:<replaceable>hostname</replaceable>:<replaceable>interface</replaceable>:none</option>
+									</entry>
+								</row>
+								<row>
+									<entry>
+										Automatic configuration of a specific interface with an override
+										<footnote>
+											<para>
+												Brings up the specified interface using the specified method of automatic configuration, such as <literal>dhcp</literal>, but overrides the automatically obtained IP address, gateway, netmask, hostname or other specified parameter. All parameters are optional; only specify the ones you wish to override and automatically obtained values will be used for the others.
+											</para>
+										</footnote>
+									</entry>
+									<entry>
+										<option>ip=<replaceable>ip</replaceable>::<replaceable>gateway</replaceable>:<replaceable>netmask</replaceable>:<replaceable>hostname</replaceable>:<replaceable>method</replaceable>:<replaceable>mtu</replaceable></option>
+									</entry>
+								</row>
+							</tbody>
+						</tgroup>
+					</table>
+					<para>
+						The <option>method</option> parameter can be any the following:
+					</para>
+					<table id="tabl-boot-options-network-autoconf">
+						<title>Automatic Interface Configuration Methods</title>
+						<tgroup align="left" cols="2" colsep="1" rowsep="1">
+							<colspec colnum="1" colwidth="2*"></colspec>
+							<colspec colnum="2" colwidth="1*"></colspec>
+							<thead>
+								<row>
+									<entry>
+										Automatic configuration method
+									</entry>
+									<entry>
+										Value
+									</entry>
+								</row>
+							</thead>
+							<tbody>
+								<row>
+									<entry>
+										DHCP
+									</entry>
+									<entry>
+										<literal>dhcp</literal>
+									</entry>
+								</row>
+								<row>
+									<entry>
+										IPv6 DHCP
+									</entry>
+									<entry>
+										<literal>dhcp6</literal>
+									</entry>
+								</row>
+								<row>
+									<entry>
+										IPv6 automatic configuration
+									</entry>
+									<entry>
+										<literal>auto6</literal>
+									</entry>
+								</row>
+								<row>
+									<entry>
+										iBFT (iSCSI Boot Firmware Table)
+									</entry>
+									<entry>
+										<literal>ibft</literal>
+									</entry>
+								</row>
+							</tbody>
+						</tgroup>
+					</table>
+					<note>
+						<para>
+							If you used a boot option which requires network access, such as <option>inst.ks=http://<replaceable>host</replaceable>:/<replaceable>path</replaceable></option> and you did not specify the <option>ip</option> option, the installer will use <option>ip=dhcp</option>.
+						</para>
+					</note>
+					<para>
+						In the above tables, the <replaceable>ip</replaceable> parameter specifies the client's IP address. <systemitem class="protocol">IPv6</systemitem> addresses can be specified by putting them in square brackets, for example, <literal>[2001:DB8::1]</literal>.
+					</para>
+					<para>
+						The <replaceable>gateway</replaceable> parameter is the default gateway. IPv6 addresses are accepted here as well.
+					</para>
+					<para>
+						The <replaceable>netmask</replaceable> parameter is the netmask to be used. This can either be a full netmask (for example <literal>255.255.255.0</literal>) or a prefix (for example <literal>64</literal>).
+					</para>
+					<para>
+						The <replaceable>hostname</replaceable> parameter is the host name of the client system. This parameter is optional. 
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>nameserver=</option></term>
+				<listitem>
+					<para>
+						Specifies the address of the nameserver you want to use. This option can be used multiple times.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>bootdev=</option></term>
+				<listitem>
+					<para>
+						Specifies the boot interface. This option is mandatory if you used more than one <option>ip</option> option.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>ifname=</option></term>
+				<listitem>
+					<para>
+						Assigns a given interface name to a network device with a given MAC address. Can be used multiple times. The syntax <option>ifname=<replaceable>interface</replaceable>:<replaceable>MAC</replaceable></option>. For example:
+					</para>
+					<screen><option>ifname=eth0:01:23:45:67:89:ab</option></screen>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.dhcpclass=</option></term>
+				<listitem>
+					<para>
+						Specifies the DHCP class vendor identifier. The <systemitem class="service">dhcpd</systemitem> service will see this value as <literal>vendor-class-identifier</literal>. The default value is <literal>anaconda-$(uname -srm)</literal>.
+					</para>
+				</listitem>
+			</varlistentry>
+		</variablelist>
 		
-		 <section id="sn-boot-options-network">
-			<title>Specifying the Network Settings</title>
-			 <para>
-			      Normally, <application>anaconda</application> prompts you to configure a network interface if one is needed during installation. However, if your network cannot be configured automatically via DHCP and you need a network connection from the beginning of the installation, you can provide network settings with the <option>ip</option> option at the <prompt>boot:</prompt> prompt. Such a connection may be required if you need to access an <filename>updates.img</filename> or kickstart file over a network, for example.
-			 </para>
-			 
-			 <para>
-			      The syntax of the <option>ip</option> boot option is:
-			 </para>
-			 <screen><userinput>linux ip=<replaceable>&lt;ipaddress&gt;</replaceable>:[<replaceable>&lt;dnsserver&gt;</replaceable>]:<replaceable>&lt;gateway&gt;</replaceable>:<replaceable>&lt;netmask&gt;</replaceable>:<replaceable>&lt;hostname&gt;</replaceable>:<replaceable>&lt;network-interface&gt;</replaceable>:{off|on|dhcp6|auto6}</userinput></screen>
-			 <para>
-			      The final value enables you to set DHCP or automatic network configuration for the installed system, even if such configuration is unavailable or undesired at the start of the installation. The available options are:
-			 </para>
-			 
-			 <variablelist>
-			   <varlistentry>
-			     <term>off</term>
-			     <listitem>
-			       <para>
-			       Specifies static network configuration.
-			     </para>
-			     </listitem>
-			   </varlistentry> 
-			   
-			   <varlistentry>
-			     <term>on</term>
-			     <listitem>
-			       <para>
-			       Specifies DHCP IPv4 configuration.
-			       </para>
-			     </listitem>
-			   </varlistentry> 
-			   
-			   <varlistentry>
-			     <term>dhcp6</term>
-			     <listitem>
-			       <para>
-			       Specifies DHCP IPv6 configuration.
-			       </para>
-			     </listitem>
-			   </varlistentry> 
-			   
-			    <varlistentry>
-			     <term>auto6</term>
-			     <listitem>
-			       <para>
-			       Specifies automatic IPv6 configuration.
-			       </para>
-			     </listitem>
-			   </varlistentry> 
-			  
-			 </variablelist> 
-			 
-			<para>
-				The following example configures static network settings for an installation system that uses the IP address <systemitem class="ipaddress">192.168.1.10</systemitem> and hostname <systemitem>server1</systemitem> for network interface <systemitem>eth0</systemitem> where the gateway is <systemitem>192.168.1.1</systemitem> and the netmask is <systemitem>255.255.255.0</systemitem>:
-			</para>
-<screen><userinput>linux ip=192.168.1.10:192.168.1.1:255.255.255.0:server1:eth0:off</userinput></screen>
-			<para>
-				If you specify the network configuration and network device at the <prompt>boot:</prompt> prompt, these settings are used for the installation process and the <guilabel>Networking Devices</guilabel> and <guilabel>Configure TCP/IP</guilabel> dialogs do not appear.
-			</para>
-
-			 <!--  <note>
-        <title>Configuring the Installed System</title>
-
-        <para>
-          Use the Network Configuration screen to specify the network
-          settings for the new system. Refer to
-          <xref linkend="sn-networkconfig-fedora_manual-configuration"/> for more information on
-          configuring the network settings for the installed system.
-        </para>
-      </note>  -->
-		</section>
+		<variablelist id="list-boot-options-advanced">
+			<title>Advanced Installation Options</title>
+			<varlistentry>
+				<term><option>inst.multilib</option></term>
+				<listitem>
+					<!-- Index terms -->
+					<indexterm>
+						<primary>boot options</primary>
+						<secondary>multilib</secondary>
+					</indexterm>
+					<indexterm>
+						<primary>multilib</primary>
+						<secondary>enabling during installation</secondary>
+					</indexterm>
+					<!-- Index terms -->
+					<para>
+						Configure the system for multilib packages (that is, to allow installing 32-bit packages on a 64-bit x86 system) and install packages specified in this section as such.
+					</para>
+					<para>
+						Normaly, on an AMD64/Intel&nbsp;64 system, only packages for this architecture (marked as <literal>x86_64</literal>) and packages for all architectures (marked as <literal>noarch</literal> would be installed. When you use this option, packages for 32-bit AMD/Intel systems (marked as <literal>i586</literal>, <literal>i686</literal>, etc.) will be automatically installed as well if available. 
+					</para>
+					<para>
+						This only applies to packages directly specified in the <literal>%packages</literal> section. If a package is only installed as a dependency, only the exact specified dependency will be installed. For example, if you are installing package <package>foo</package> which depends on package <package>bar</package>, the former will be installed in multiple variants, while the latter will only be installed in variants specifically required. 
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>gpt</option></term>
+				<listitem>
+					<!-- Index terms -->
+					<indexterm>
+						<primary>boot options</primary>
+						<secondary>gpt</secondary>
+					</indexterm>
+					<indexterm>
+						<primary>boot options</primary>
+						<secondary>GUID Partition Table</secondary>
+					</indexterm>
+					<indexterm>
+						<primary>GUID Partition Table</primary>
+						<secondary>specifying as a boot option</secondary>
+					</indexterm>
+					<!-- Index terms -->
+					<para>
+						Install partition information into a GPT (GUID Partition Table) instead of MBR (Master Boot Record).
+					</para>
+				</listitem>
+			</varlistentry>
+		</variablelist>
 		
-
-	</section>
-	
-	 <section id="sn-remoteaccess-installation">
-		<title>Enabling Remote Access to the Installation System</title>
-		<!--  SE: Note that there is also a "display" option that redirects anaconda's X display to an X server on another system.  --> <indexterm>
-			<primary>VNC (Virtual Network Computing)</primary>
-
-		</indexterm>
-		 <para>
-			You may access a graphical interface for the installation system from any other system. To remotely access the graphical display of an installation system, use client software that supports the VNC (Virtual Network Computing) display protocol.
-		</para>
-		 <note>
-			<title>Installing a VNC Client on Fedora</title>
-			 <para>
-				<indexterm>
-					<primary>VNC (Virtual Network Computing)</primary>
-					 <secondary>installing client</secondary>
-
-				</indexterm>
-				 Fedora includes the VNC client <application>vncviewer</application>. To obtain <application>vncviewer</application>, install the <package>tigervnc</package> package.
-			</para>
-
-		</note>
-		 <para>
-			The installation system supports two methods of establishing a VNC connection. You may start the installation, and manually login to the graphical display with a VNC client on another system. Alternatively, you may configure the installation system to automatically connect to a VNC client on the network that is running in <firstterm>listening mode</firstterm>.
-		</para>
-		 <section id="sn-remoteaccess-installation-vnc">
-			<title>Enabling Remote Access with VNC</title>
-			 <para>
-				<indexterm>
-					<primary>VNC (Virtual Network Computing)</primary>
-					 <secondary>enabling</secondary>
-
-				</indexterm>
-				 To enable remote graphical access to the installation system, enter two options at the prompt:
-			</para>
+		<variablelist id="list-boot-options-vnc">
+			<title>Enabling Remote Access</title>
 			
-<screen>
-<userinput>linux vnc vncpassword=<replaceable>qwerty</replaceable></userinput></screen>
-			 <para>
-				The <option>vnc</option> option enables the VNC service. The <option>vncpassword</option> option sets a password for remote access. The example shown above sets the password as <userinput>qwerty</userinput>.
-			</para>
-			 <note>
-				<title>VNC Passwords</title>
-				 <para>
-					The VNC password must be at least six characters long.
-				</para>
-
-			</note>
-			 <para>
-				Specify the language, keyboard layout and network settings for the installation system with the screens that follow. You may then access the graphical interface through a VNC client. The installation system displays the correct connection setting for the VNC client:
-			</para>
+			<!-- Begin index terms -->
+			<indexterm>
+				<primary>boot options</primary>
+				<secondary>remote access</secondary>
+			</indexterm>
+			<indexterm>
+				<primary>boot options</primary>
+				<secondary>VNC</secondary>
+			</indexterm>
+			<!-- End index terms -->
 			
-<screen>Starting VNC...
-The VNC server is now running.
-Please connect to computer.mydomain.com:1 to begin the install...
-Starting graphical installation...
-Press &lt;enter&gt; for a shell</screen>
-			 <para>
-				You may then login to the installation system with a VNC client. To run the <application>vncviewer</application> client on Fedora, choose <menuchoice> <guimenu>Applications</guimenu> <guisubmenu>Accessories</guisubmenu><guimenuitem>VNC Viewer</guimenuitem></menuchoice>, or type the command <application>vncviewer</application> in a terminal window. Enter the server and display number in the <guilabel>VNC Server</guilabel> dialog. For the example above, the <guilabel>VNC Server</guilabel> is <userinput>computer.mydomain.com:1</userinput>.
-			</para>
-
-		</section>
+			<varlistentry>
+				<term><option>inst.vnc</option></term>
+				<listitem>
+					<para>
+						Specifies that the installer's graphical interface should be run in a <systemitem class="protocol">VNC</systemitem> session. If you specify this option, you will need to connect to the system using a VNC client application to be able to interact with the installer. VNC sharing is enabled, so multiple clients can connect to the system at the same time.
+					</para>
+					<note>
+						<para>
+							A system installed using VNC will start in text mode by default.
+						</para>
+					</note>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.vncpassword=</option></term>
+				<listitem>
+					<para>
+						Sets a password on the VNC server used by the installer. Any VNC client attempting to connecting to the system will have to provide the correct password to gain access. For example, <option>inst.vncpassword=<replaceable>testpasswd</replaceable></option> will set the password to <literal>testpasswd</literal>.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.vncconnect=</option></term>
+				<listitem>
+					<para>
+						Connect to a listening VNC client at a specified host and port once the installation starts. The correct syntax is <option>inst.vncconnect=<replaceable>host</replaceable>:<replaceable>port</replaceable></option>, where <replaceable>host</replaceable> is the address to the VNC client's host, and <replaceable>port</replaceable> specifies which port to use. The <replaceable>port</replaceable> parameter is optional, if you do not specify one, the installer will use <literal>5900</literal>.
+					</para>
+				</listitem>
+			</varlistentry>
+		</variablelist>
 		
-		 <section id="sn-remoteaccess-installation-vnclistener">
-			<title>Connecting the Installation System to a VNC Listener</title>
-			 <para>
-				To have the installation system automatically connect to a VNC client, first start the client in 
-				<indexterm>
-					<primary>VNC (Virtual Network Computing)</primary>
-					 <secondary>listening mode</secondary>
-
-				</indexterm>
-				 listening mode. On Fedora systems, use the <option>-listen</option> option to run <application>vncviewer</application> as a listener. In a terminal window, enter the command:
-			</para>
-			
-<screen>
- <userinput>vncviewer -listen</userinput></screen>
-			 <note>
-				<title>Firewall Reconfiguration Required</title>
-				 <para>
-					By default, <application>vncviewer</application> uses TCP port 5500 when in listening mode. To permit connections to this port from other systems, choose <menuchoice> <guimenu>System</guimenu> <guisubmenu>Administration</guisubmenu> <guimenuitem> Firewall</guimenuitem> </menuchoice>. Select <guilabel>Other ports</guilabel>, and <guibutton>Add</guibutton>. Enter <userinput>5500</userinput> in the <guilabel>Port(s)</guilabel> field, and specify <userinput>tcp</userinput> as the <guilabel>Protocol</guilabel>.
-				</para>
-
-			</note>
-			 <para>
-				Once the listening client is active, start the installation system and set the VNC options at the <prompt>boot:</prompt> prompt. In addition to <option>vnc</option> and <option>vncpassword</option> options, use the <option>vncconnect</option> option to specify the name or IP address of the system that has the listening client. To specify the TCP port for the listener, add a colon and the port number to the name of the system.
-			</para>
-			 <para>
-				For example, to connect to a VNC client on the system <systemitem class="systemname">desktop.mydomain.com</systemitem> on the port 5500, enter the following at the <prompt>boot:</prompt> prompt:
-			</para>
+		<variablelist id="list-boot-options-debug">
+			<title>Debugging and Troubleshooting</title>
 			
-<screen>
-<userinput>linux vnc vncpassword=<replaceable>qwerty</replaceable> vncconnect=<replaceable>desktop.mydomain.com:5500</replaceable></userinput></screen>
-
-		</section>
-		
-		 <section id="sn-ssh-installation">
-			<title>Enabling Remote Access with ssh</title>
-			 <indexterm>
-				<primary>ssh</primary>
-				 <secondary>starting ssh at boot time</secondary>
-
+			<!-- Begin index terms -->
+			<indexterm>
+				<primary>boot options</primary>
+				<secondary>debugging</secondary>
 			</indexterm>
-			 <para>
-				To enable remote access to a text mode installation to monitor and debug the installer, use the <option>sshd=1</option> option at the <prompt>boot:</prompt> prompt:
-			</para>
-			<!-- SE: The "text" option is necessary to stop the installer switching to graphical mode and losing the telnet interface. This is expected behavior.  -->
-<screen>
-<userinput>linux sshd=1</userinput></screen>
-			 <para>
-				You can then connect to the installation system with the <command>ssh</command> utility. The <command>ssh</command> command requires the name or IP address of the installation system, and a password if you specified one (for example, in a kickstart file).
-			</para>
-
-		</section>		
-
-	</section>
-	
-	 <section id="sn-remote-logging">
-		<title>Logging to a Remote System During the Installation</title>
-		 <para>
-			By default, the installation process sends log messages to the console as they are generated. You may specify that these messages go to a remote system that runs a 
 			<indexterm>
-				<primary>syslog</primary>
-
+				<primary>boot options</primary>
+				<secondary>troubleshooting</secondary>
 			</indexterm>
-			 <firstterm>syslog</firstterm> service.
-		</para>
-		 <para>
-			To configure remote logging, add the <option>syslog</option> option. Specify the IP address of the logging system, and the UDP port number of the log service on that system. By default, syslog services that accept remote messages listen on UDP port 514.
-		</para>
-		 <para>
-			For example, to connect to a syslog service on the system <systemitem class="ipaddress">192.168.1.20</systemitem>, enter the following at the <prompt>boot:</prompt> prompt:
-		</para>
-		
-<screen>
-<userinput>linux syslog=<replaceable>192.168.1.20:514</replaceable></userinput></screen>
-		 <section id="sn-remote-logging-logserver">
-			<title>Configuring a Log Server</title>
-			 <para>
-				Fedora uses <command>rsyslog</command> to provide a syslog service. The default configuration of <command>rsyslog</command> rejects messages from remote systems.
-			</para>
-			 <warning>
-				<title>Only Enable Remote Syslog Access on Secured Networks</title>
-				 <para>
-					The <command>rsyslog</command> configuration detailed below does not make use of any of the security measures available in <command>rsyslog</command> Crackers may slow or crash systems that permit access to the logging service, by sending large quantities of false log messages. In addition, hostile users may intercept or falsify messages sent to the logging service over the network.
-				</para>
-
-			</warning>
-			 <para>
-				To configure a Fedora system to accept log messages from other systems on the network, edit the file <filename>/etc/rsyslog.conf</filename>. You must use <systemitem class="username">root</systemitem> privileges to edit the file <filename>/etc/rsyslog.conf</filename>. Uncomment the following lines by removing the hash preceding them:
-			</para>
-			
-<screen><computeroutput>$ModLoad imudp.so</computeroutput>
-	<computeroutput>$UDPServerRun 514</computeroutput></screen>
-			 <para>
-				Restart the <command>rsyslog</command> service to apply the change:
-			</para>
+			<indexterm>
+				<primary>boot options</primary>
+				<secondary>logging</secondary>
+			</indexterm>
+			<!-- End index terms -->
 			
-<screen>
-<userinput>su -c 'systemctl restart rsyslog'</userinput></screen>
-			 <para>
-				Enter the <systemitem class="username">root</systemitem> password when prompted.
-			</para>
-			 <note>
-				<title>Firewall Reconfiguration Required</title>
-				 <para>
-					By default, the syslog service listens on UDP port 514. To permit connections to this port from other systems, choose <menuchoice> <guimenu>System</guimenu> <guisubmenu>Administration</guisubmenu> <guimenuitem> Firewall</guimenuitem> </menuchoice>. Select <guilabel>Other ports</guilabel>, and <guibutton>Add</guibutton>. Enter <userinput>514</userinput> in the <guilabel>Port(s)</guilabel> field, and specify <userinput>udp</userinput> as the <guilabel>Protocol</guilabel>.
-				</para>
-
-			</note>
-
-		</section>
-		
-
-	</section>
-	
-	 <section id="sn-automating-installation">
-		<xi:include href="Automating_installation-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-		 <!--  Automating the Installation with Kickstart  --> <xi:include href="Automating_installation-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-		 <!--  A Kickstart file specifies settings for an installation  --> <note>
-			<xi:include href="Automating_installation-title-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-			 <!--  Every installation produces a Kickstart file  --> <xi:include href="Automating_installation-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-			 <!--  The Fedora installation system automatically writes  -->
-		</note>
-		 <para>
-			Fedora includes a graphical application to create and modify Kickstart files by selecting the options that you require. Use the package <filename>system-config-kickstart</filename> to install this utility. To load the Fedora Kickstart editor, choose <menuchoice> <guimenu>Applications</guimenu> <guisubmenu>System Tools</guisubmenu><guimenuitem>Kickstart</guimenuitem></menuchoice>.
-		</para>
-		 <para>
-			Kickstart files list installation settings in plain text, with one option per line. This format lets you modify your Kickstart files with any text editor, and write scripts or applications that generate custom Kickstart files for your systems.
-		</para>
-		 <para>
-			To automate the installation process with a Kickstart file, use the <option>ks</option> option to specify the name and location of the file:
-		</para>
-		
-<screen>
- <userinput>linux ks=<replaceable>location/kickstart-file.cfg</replaceable></userinput></screen>
-		 <para>
-			You may use Kickstart files that are held on either removable storage, a hard drive, or a network server. Refer to <xref linkend="tb-kssources" /> for the supported Kickstart sources.
-		</para>
-		 <table frame="all" id="tb-kssources">
-			<title>Kickstart sources</title>
-			 <tgroup align="left" cols="2" colsep="1" rowsep="1">
-				<colspec colnum="1" colwidth="1*"></colspec>
-				 <colspec colnum="2" colwidth="3*"></colspec>
-				 <thead>
-					<row>
-						<entry>
-							Kickstart source
-						</entry>
-						 <entry>
-							Option format
-						</entry>
-
-					</row>
-
-				</thead>
-				 <tbody>
-					<row>
-						<entry>
-							DVD drive
-						</entry>
-						 <entry>
-							<option>ks=<replaceable>cdrom:/directory/ks.cfg</replaceable></option>
-						</entry>
-
-					</row>
-					 <row>
-						<entry>
-							Hard Drive
-						</entry>
-						 <entry>
-							<option>ks=<replaceable>hd:device/directory/ks.cfg</replaceable></option>
-						</entry>
-
-					</row>
-					 <row>
-						<entry>
-							Other Device
-						</entry>
-						 <entry>
-							<option>ks=<replaceable>file:/device/directory/ks.cfg</replaceable></option>
-						</entry>
-
-					</row>
-					 <row>
-						<entry>
-							HTTP Server
-						</entry>
-						 <entry>
-							<option>ks=<replaceable>http://server.mydomain.com/directory/ks.cfg</replaceable></option>
-						</entry>
-
-					</row>
-					 <row>
-						<entry>
-							FTP Server
-						</entry>
-						 <entry>
-							<option>ks=<replaceable>ftp://server.mydomain.com/directory/ks.cfg</replaceable></option>
-						</entry>
-
-					</row>
-					 <row>
-						<entry>
-							NFS Server
-						</entry>
-						 <entry>
-							<option>ks=<replaceable>nfs:server.mydomain.com:/directory/ks.cfg</replaceable></option>
-						</entry>
-
-					</row>
-
-				</tbody>
-
-			</tgroup>
-
-		</table>
-		 <para>
-			To obtain a Kickstart file from a script or application on a Web server, specify the URL of the application with the <option>ks=</option> option. If you add the option <option>kssendmac</option>, the request also sends HTTP headers to the Web application. Your application can use these headers to identify the computer. This line sends a request with headers to the application <wordasword>http://server.mydomain.com/kickstart.cgi</wordasword>:
-		</para>
-		
-<screen>
-<userinput>linux ks=http://server.mydomain.com/kickstart.cgi kssendmac</userinput></screen>
-
+			<varlistentry>
+				<term><option>inst.updates=</option></term>
+				<listitem>
+					<para>
+						Specifies the location of the <filename>updates.img</filename> file to be applied to the installer runtime. The syntax is the same as in the <option>inst.repo</option> option &mdash; see <xref linkend="tabl-installmethods" /> for details. In all formats, if you do not specify a file name but only a directory, the installer will look for a file named <filename>updates.img</filename>.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.loglevel=</option></term>
+				<listitem>
+					<para>
+						Specifies the minimum level for messages to be logged on a terminal. This only concerns terminal logging; log files will always contain messages of all levels.
+					</para>
+					<para>
+						Possible values for this option from the lowest to highest level are: <literal>debug</literal>, <literal>info</literal>, <literal>warning</literal>, <literal>error</literal> and <literal>critical</literal>. The default value is <literal>info</literal>, which means that by default, the logging terminal will display messages ranging from <literal>info</literal> to <literal>critical</literal>.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.syslog=</option></term>
+				<listitem>
+					<para>
+						Once the installation starts, this options sends log messages to the syslog process on the specified host. The remote syslog process must be configured to accept incoming connections. For information on how to configure a syslog service to accept incoming connections, see the <citetitle>&PRODUCT; System Administrator's Guide</citetitle>.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>inst.virtiolog=</option></term>
+				<listitem>
+					<para>
+						Specifies a <systemitem>virtio</systemitem> port (a character device at <filename>/dev/virtio-ports/<replaceable>name</replaceable></filename>) to be used for forwarding logs. The default value is <literal>org.fedoraproject.anaconda.log.0</literal>; if this port is present, it will be used.
+					</para>
+				</listitem>
+			</varlistentry>
+		</variablelist>
 	</section>
 	
-	 <section id="sn-bootoptions-hardware">
+	<section id="sn-bootoptions-hardware">
 		<title>Enhancing Hardware Support</title>
-		 <para>
+		<para>
 			By default, Fedora attempts to automatically detect and configure support for all of the components of your computer. Fedora supports the majority of hardware in common use with the software <firstterm>drivers</firstterm> that are included with the operating system. To support other devices you may supply additional drivers during the installation process, or at a later time.
 		</para>
-		 <section id="sn-bootoptions-hwdetection">
+		
+		<section id="sn-bootoptions-hwdetection">
 			<title>Overriding Automatic Hardware Detection</title>
-			 <para>
+			<para>
 				For some models of device automatic hardware configuration may fail, or cause instability. In these cases, you may need to disable automatic configuration for that type of device, and take additional steps to manually configure the device after the installation process is complete.
 			</para>
-			 <note>
+			<note>
 				<title>Check the Release Notes</title>
-				 <para>
+				<para>
 					Refer to the Release Notes for information on known issues with specific devices.
 				</para>
-
 			</note>
-			 <para>
+			<para>
 				To override the automatic hardware detection, use one or more of the following options:
 			</para>
-			 <table frame="all" id="tb-hardwareoptions">
+			<table frame="all" id="tb-hardwareoptions">
 				<title>Hardware Options</title>
-				 <tgroup align="left" cols="2" colsep="1" rowsep="1">
+				<tgroup align="left" cols="2" colsep="1" rowsep="1">
 					<colspec colnum="1" colwidth="3*"></colspec>
-					 <colspec colnum="2" colwidth="2*"></colspec>
-					 <thead>
+					<colspec colnum="2" colwidth="2*"></colspec>
+					<thead>
 						<row>
 							<entry>
 								Compatibility
 							</entry>
-							 <entry>
+							<entry>
 								Option
 							</entry>
-
 						</row>
-
 					</thead>
-					 <tbody>
+					<tbody>
 						<row>
 							<entry>
 								Disable all hardware detection
 							</entry>
-							 <entry>
+							<entry>
 								<option>noprobe</option>
 							</entry>
-
 						</row>
-						 <row>
+						<row>
 							<entry>
 								Disable graphics, keyboard, and mouse detection
 							</entry>
-							 <entry>
+							<entry>
 								<option>headless</option>
 							</entry>
-
 						</row>
-						 <row>
+						<row>
 							<entry>
 								Disable passing keyboard and mouse information to stage 2 of the installation program
 							</entry>
-							 <entry>
+							<entry>
 								<option>nopass</option>
 							</entry>
-
 						</row>
-						 <row>
+						<row>
 							<entry>
 								Use basic VESA driver for video
 							</entry>
-							 <entry>
+							<entry>
 								<option>xdriver=vesa</option>
 							</entry>
-
 						</row>
-						 <row>
+						<row>
 							<entry>
 								Disable shell access on virtual console 2 during installation
 							</entry>
-							 <entry>
+							<entry>
 								<option>noshell</option>
 							</entry>
-
 						</row>
-						 <row>
+						<row>
 							<entry>
 								Disable advanced configuration and power interface (ACPI)
 							</entry>
-							 <entry>
+							<entry>
 								<option>acpi=off</option>
 							</entry>
-
 						</row>
-						 <row>
+						<row>
 							<entry>
 								Disable machine check exception (MCE) CPU self-diagnosis.
 							</entry>
-							 <entry>
+							<entry>
 								<option>nomce</option>
 							</entry>
-
 						</row>
-						 <row>
+						<row>
 							<entry>
 								Disable non-uniform memory access on the AMD64 architecture
 							</entry>
-							 <entry>
+							<entry>
 								<option>numa-off</option>
 							</entry>
-
 						</row>
-						 <row>
+						<row>
 							<entry>
 								Force kernel to detect a specific amount of memory, where <replaceable>xxx</replaceable> is a value in megabytes
 							</entry>
-							 <entry>
+							<entry>
 								<option>mem=<replaceable>xxx</replaceable>m</option>
 							</entry>
-
 						</row>
-						 <row>
+						<row>
 							<entry>
 								Enable DMA only for IDE and SATA drives
 							</entry>
-							 <entry>
+							<entry>
 								<option>libata.dma=1</option>
 							</entry>
-
 						</row>
-						 <row>
+						<row>
 							<entry>
 								Disable BIOS-assisted RAID
 							</entry>
-							 <entry>
+							<entry>
 								<option>nodmraid</option>
 							</entry>
-
 						</row>
-						 <row>
+						<row>
 							<entry>
 								Disable Firewire device detection
 							</entry>
-							 <entry>
+							<entry>
 								<option>nofirewire</option>
 							</entry>
-
 						</row>
-						 <row>
+						<row>
 							<entry>
 								Disable parallel port detection
 							</entry>
-							 <entry>
+							<entry>
 								<option>noparport</option>
 							</entry>
-
 						</row>
-						 <row>
+						<row>
 							<entry>
 								Disable PC Card (PCMCIA) device detection
 							</entry>
-							 <entry>
+							<entry>
 								<option>nopcmcia</option>
 							</entry>
-
 						</row>
-						 <row>
+						<row>
 							<entry>
 								Disable all probing of network hardware
 							</entry>
-							 <entry>
+							<entry>
 								<option>nonet</option>
 							</entry>
-
 						</row>
-
 					</tbody>
-
 				</tgroup>
-
 			</table>
-			 <note>
+			<note>
 				<title>Additional Screen</title>
-				 <para>
+				<para>
 					The <option>isa</option> option causes the system to display an additional text screen at the beginning of the installation process. Use this screen to configure the ISA devices on your computer.
 				</para>
-
 			</note>
-			 <important>
+			<important>
 				<para>
 					Other kernel boot options have no particular meaning for <application>anaconda</application> and do not affect the installation process. However, if you use these options to boot the installation system, <application>anaconda</application> will preserve them in the bootloader configuration.
 				</para>
-
 			</important>
-
 		</section>
 		
-
 	</section>
-	
-	 <section id="sn-boot-modes">
+		
+	<section id="sect-boot-options-maintenance">
 		<title>Using the Maintenance Boot Modes</title>
-		 
-    <section id="sn-memtest">
-      <title>Loading the Memory (RAM) Testing Mode</title>
-
-      <para>
-        Faults in memory modules may cause your system to freeze or
-        crash unpredictably. In some cases, memory faults may only cause
-        errors with particular combinations of software. For this
-        reason, you should test the memory of a computer before you
-        install Fedora for the first time, even if it has previously run
-        other operating systems.
-      </para>
-
-      <para>
-        Fedora includes the <application>Memtest86+</application>
-	memory testing application.  To boot your computer in
-        <indexterm>
-          <primary>memory testing mode</primary>
-        </indexterm> memory testing mode, choose <guimenuitem>Run a memory
-	  test</guimenuitem> at the boot menu. The first test starts
-	immediately. By default, <application>Memtest86+</application>
-	carries out a total of ten tests.
-      </para>
+	
+		<section id="sect-boot-options-memtest">
+			<title>Loading the Memory (RAM) Testing Mode</title>
+			
+			<!-- Begin index terms -->
+			<indexterm>
+				<primary>memory testing mode</primary>
+			</indexterm>
+			<indexterm>
+				<primary>boot options</primary>
+				<secondary>memory testing mode</secondary>
+			</indexterm>
+			<!-- End index terms -->
+			
+			<para>
+				Faults in memory modules may cause your system to freeze or crash unpredictably. In some cases, memory faults may only cause errors with particular combinations of software. For this reason, you should test the memory of a computer before you install &PRODUCT; for the first time, even if it has previously run other operating systems.
+			</para>
+			<para>
+				&PRODUCT; includes the <application>Memtest86+</application> memory testing application.  To boot your computer in memory testing mode, choose <guimenuitem>Memory test</guimenuitem> at the boot menu. The first test starts immediately. By default, <application>Memtest86+</application> carries out a total of ten tests.
+			</para>      
+			<para>
+				In most cases, a single successful pass with <application>Memtest86+</application> is sufficient to verify that your RAM is in good condition. In some rare circumstances, however, errors that went undetected on the first pass might appear on subsequent passes. To perform a thorough test of the RAM on an important system, leave <application>Memtest86+</application> running overnight or for a few days.
+			</para>
+			<para>
+				For more information on using <application>Memtest86+</application>, see the <citetitle>Memtest86+ FAQ</citetitle> available at <ulink url="http://forum.canardpc.com/threads/28864-FAQ-please-read-before-posting"></ulink>.
+			</para>
+			<para>
+				To halt the tests and reboot your computer, enter <keycap>Esc</keycap> at any time.
+			</para>
+			<note>
+				<para>
+					<application>Memtest86+</application> only works on BIOS installations and is not available on UEFI systems.
+				</para>
+			</note>
+		</section>
       
-	<para>
-		In most cases, a single successful pass with <application>Memtest86+</application> is sufficient to verify that your RAM is in good condition. In some rare circumstances, however, errors that went undetected on the first pass might appear on subsequent passes. To perform a thorough test of the RAM on an important system, leave <application>Memtest86+</application> running overnight or for a few days.
-	</para>
-	<para>
-		For more information on using <application>Memtest86+</application>, refer to the <citetitle>Memtest86+ FAQ</citetitle> available at <ulink url="http://forum.canardpc.com/showthread.php?t=28864"></ulink>.
-	</para>
-      <para>
-        To halt the tests and reboot your computer, enter
-        <keycap>Esc</keycap> at any time.
-      </para>
-    </section>
-    <section id="sn-boot-mediacheck">
-			<title>Verifying boot media</title>
-			 <para>
-				You can test the integrity of an ISO-based installation source before using it to install Fedora. These sources include DVD, and ISO images stored on a hard drive or NFS server. Verifying that the ISO images are intact before you attempt an installation helps to avoid problems that are often encountered during installation.
+		<section id="sect-boot-options-mediacheck">
+			<title>Verifying Boot Media</title>
+			
+			<!-- Begin index terms -->
+			<indexterm>
+				<primary>boot options</primary>
+				<secondary>media verification</secondary>
+			</indexterm>
+			<!-- End index terms -->
+			
+			<para>
+				You can test the integrity of an ISO-based installation source before using it to install &PRODUCT;. These sources include DVD, and ISO images stored on a hard drive or NFS server. Verifying that the ISO images are intact before you attempt an installation helps to avoid problems that are often encountered during installation.
 			</para>
-			 <para>
-				Fedora offers you two ways to test installation ISOs:
+			<para>
+				To test the checksum integrity of an ISO image, append the <option>rd.live.check</option> to the boot loader command line. Note that this option is used automatically if you select the default installation option from the boot menu (<guimenuitem>Test this media &amp; install &PRODUCT;</guimenuitem>). 
 			</para>
-			 <itemizedlist>
-				<!--  FIG		    <listitem>
-			    <para>
-				    select the <guilabel>Verify and Boot</guilabel> option on the Fedora Live CD. To access the Live CD boot menu, press any key within ten seconds of the splash screen appearing.
-			    </para>
-		    </listitem>  --> <listitem>
-					<para>
-						select <guilabel>OK</guilabel> at the prompt to test the media before installation when booting from the Fedora DVD
-					</para>
-
-				</listitem>
-				 <listitem>
-					<para>
-						boot Fedora with the <option>rd.live.check</option> option.
-					</para>
-
-				</listitem>
-
-			</itemizedlist>
-
 		</section>
 		
-		 <section id="sn-mode-rescue">
-			<title>Booting Your Computer with the Rescue Mode</title>
-			 <indexterm>
+		<section id="sect-boot-options-rescue">
+			<title>Booting Your Computer in Rescue Mode</title>
+			
+			<!-- Begin index terms -->
+			<indexterm>
 				<primary>rescue mode</primary>
-
 			</indexterm>
-			 <para>
-				You may boot a command-line Linux system from either a 
-				<indexterm>
-					<primary>rescue discs</primary>
-
-				</indexterm>
-				 rescue disc or an installation disc, without installing Fedora on the computer. This enables you to use the utilities and functions of a running Linux system to modify or repair systems that are already installed on your computer.
+			<indexterm>
+				<primary>boot options</primary>
+				<secondary>rescue mode</secondary>
+			</indexterm>
+			<!-- End index terms -->
+			
+			<para>
+				You may boot a command-line Linux system from an installation disc without actually installing &PRODUCT; on the computer. This enables you to use the utilities and functions of a running Linux system to modify or repair systems that are already installed on the system.
 			</para>
-			 <para>
-				The rescue disc starts the rescue mode system by default. To load the rescue system with the installation disc, choose <guimenuitem>Rescue a Fedora system</guimenuitem> from the boot menu.
+			<para>
+				To load the rescue system with the installation disc, choose <guimenuitem>Rescue a &PRODUCT; system</guimenuitem> from the <guisubmenu>Troubleshooting</guisubmenu> submenu in the boot menu, or use the <option>inst.rescue</option> boot option.
 			</para>
-			 <para>
+			<para>
 				Specify the language, keyboard layout and network settings for the rescue system with the screens that follow. The final setup screen configures access to the existing system on your computer.
 			</para>
-			 <para>
+			<para>
 				By default, rescue mode attaches an existing operating system to the rescue system under the directory <filename>/mnt/sysimage/</filename>.
 			</para>
-
 		</section>
-		
-		 <!-- <section id="sn-mode-upgradeany">
-			<title>Upgrading your computer</title>
-			 <para>
-				A previous boot option, <option>upgrade</option>, has been superceded by a stage in the installation process where the installation program prompts you to upgrade or reinstall earlier versions of Fedora that it detects on your system.
-			</para>
-			 <para>
-				However, the installation program may not correctly detect a previous version of Fedora if the contents of the <filename>/etc/redhat-release</filename> file have changed. The boot option <option>upgradeany</option> relaxes the test that the installation program performs and allows you to upgrade a Fedora installation that the installation program has not correctly identified.
-			</para>
-
-		</section> -->
-		
 
 	</section>
 	
-	 <!-- 
-Local variables:
-mode: xml
-fill-column: 72
-End:
- -->
 </chapter>
-
diff --git a/en-US/medialess.xml b/en-US/medialess.xml
index 3883b45..f184d74 100644
--- a/en-US/medialess.xml
+++ b/en-US/medialess.xml
@@ -158,7 +158,7 @@
 	 <section id="sn-medialess-booting">
 		<title>Booting to Installation</title>
 		 <para>
-			Reboot the system. <application>GRUB</application> boots the installation kernel and RAM disk, including any options you set. You may now refer to the appropriate chapter in this guide for the next step. If you chose to install remotely using VNC, refer to <xref linkend="sn-remoteaccess-installation" /> for assistance in connecting to the remote system.
+			Reboot the system. <application>GRUB</application> boots the installation kernel and RAM disk, including any options you set. You may now refer to the appropriate chapter in this guide for the next step. If you chose to install remotely using VNC, refer to <xref linkend="list-boot-options-vnc" /> for assistance in connecting to the remote system.
 		</para>
 
 	</section>


More information about the docs-commits mailing list