install-guide fedora-install-guide-adminoptions-en.xml, 1.4, 1.5 fedora-install-guide-en.xml, 1.36, 1.37

[Stuart Ellis (elliss)]

Author: elliss

Update of /cvs/docs/install-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18309

Modified Files:
	fedora-install-guide-adminoptions-en.xml 
	fedora-install-guide-en.xml 
Log Message:
- Minor edits to Boot Options.




Index: fedora-install-guide-adminoptions-en.xml
===================================================================
RCS file: /cvs/docs/install-guide/fedora-install-guide-adminoptions-en.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-install-guide-adminoptions-en.xml	22 Dec 2005 14:54:15 -0000	1.4
+++ fedora-install-guide-adminoptions-en.xml	11 Jan 2006 22:40:26 -0000	1.5
@@ -10,11 +10,6 @@
     <title>Boot Options</title>
 
     <para>
-      <remark role="FIXME">Many of the options listed here have NOT yet been tested. 
-      </remark>
-    </para>
-
-    <para>
       To use boot options, enter <userinput>linux
       <replaceable>option</replaceable></userinput> at the
       <prompt>boot:</prompt>
@@ -26,7 +21,7 @@
       by a single space. For example:
     </para>
 <screen>
-<userinput>linux <replaceable>option1</replaceable> <replaceable>option2</replaceable></userinput>
+<userinput>linux <replaceable>option1</replaceable> <replaceable>option2</replaceable> <replaceable>option3</replaceable></userinput>
 </screen>
     <section id="sn-mode-rescue">
       <title>Booting Your Computer with Rescue Mode</title>
@@ -200,17 +195,18 @@
       </table>
       <para>
         By default, the installation system uses DHCP to obtain the
-        correct network settings. To manually configure one or more
-        network settings, specify the setting at the
+        correct network settings. To override DHCP, specify the settings
+        at the
         <prompt>boot:</prompt>
-        prompt. You may set the <option>ip</option> address,
+        prompt. You may configure the <option>ip</option> address,
         <option>netmask</option>, <option>gateway</option>, and
-        <option>dns</option> servers for the installation system.
+        <option>dns</option> server settings for the installation
+        system.
       </para>
 
       <para>
-        This example configures all of the network settings for an
-        installation system that uses the IP address 192.168.1.10:
+        This example configures the network settings for an installation
+        system that uses the IP address 192.168.1.10:
       </para>
 <screen>
 <userinput>linux ip=<replaceable>192.168.1.10</replaceable> netmask=<replaceable>255.255.255.0</replaceable> gateway=<replaceable>192.168.1.1</replaceable> dns=<replaceable>192.168.1.2,192.168.1.3</replaceable></userinput>
@@ -521,6 +517,18 @@
             <row>
               <entry>
                 <para>
+                  Disable mainboard APIC
+                </para>
+              </entry>
+              <entry>
+                <para>
+                  <option>noapic</option>
+                </para>
+              </entry>
+            </row>
+            <row>
+              <entry>
+                <para>
                   Disable power management (ACPI)
                 </para>
               </entry>


Index: fedora-install-guide-en.xml
===================================================================
RCS file: /cvs/docs/install-guide/fedora-install-guide-en.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- fedora-install-guide-en.xml	9 Jan 2006 23:56:29 -0000	1.36
+++ fedora-install-guide-en.xml	11 Jan 2006 22:40:26 -0000	1.37
@@ -7,7 +7,7 @@
 <!ENTITY DOCNAME "fedora-install-guide">
 <!ENTITY DOCLANG "en">
 <!ENTITY DOCVERSION "1.11">
-<!ENTITY DOCDATE "2006-01-09">
+<!ENTITY DOCDATE "2006-01-11">
 <!ENTITY DOCID "&DOCNAME;-&DOCLANG;-&DOCVERSION; (&DOCDATE;)">
 
 <!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml">
@@ -15,7 +15,7 @@
 <!-- Bugzilla bug number for the draft notice -->
 <!ENTITY BUG-NUM "129911">
 <!ENTITY FCLOCALVER "5">
-<!ENTITY DOCLOCALVER "1.11"> <!-- what's this for again? -->
+<!ENTITY DOCLOCALVER "1.12"> <!-- what's this for again? -->
 
 
 <!ENTITY INTRODUCTION SYSTEM "fedora-install-guide-intro-en.xml">
@@ -226,6 +226,16 @@
           </para>
         </revdescription>
       </revision>
+      <revision>
+        <revnumber>1.12</revnumber>
+        <date>2006-01-11</date>
+        <authorinitials>StuartEllis</authorinitials>
+        <revdescription>
+          <para>
+            Minor fixes to Boot Options.
+          </para>
+        </revdescription>
+      </revision>
     </revhistory>
   </bookinfo>