fedora-docs/install-guide fedora-install-guide-abouttoinstall-en.xml, 1.2, 1.3 fedora-install-guide-acknowledgements-en.xml, 1.2, 1.3 fedora-install-guide-bootloader-en.xml, 1.3, 1.4 fedora-install-guide-diskpartitioning-en.xml, 1.2, 1.3 fedora-install-guide-firewallconfig-en.xml, 1.2, 1.3 fedora-install-guide-firstboot-en.xml, 1.2, 1.3 fedora-install-guide-installingpackages-en.xml, 1.2, 1.3 fedora-install-guide-installtypes-en.xml, 1.2, 1.3 fedora-install-guide-networkconfig-en.xml, 1.2, 1.3 fedora-install-guide-nextsteps-en.xml, 1.2, 1.3 fedora-install-guide-other-instmethods-en.xml, 1.2, 1.3 fedora-install-guide-packageselection-en.xml, 1.2, 1.3

fedora-docs-commits at redhat.com fedora-docs-commits at redhat.com
Tue May 3 12:19:46 UTC 2005


Author: pfrields

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

Modified Files:
	fedora-install-guide-abouttoinstall-en.xml 
	fedora-install-guide-acknowledgements-en.xml 
	fedora-install-guide-bootloader-en.xml 
	fedora-install-guide-diskpartitioning-en.xml 
	fedora-install-guide-firewallconfig-en.xml 
	fedora-install-guide-firstboot-en.xml 
	fedora-install-guide-installingpackages-en.xml 
	fedora-install-guide-installtypes-en.xml 
	fedora-install-guide-networkconfig-en.xml 
	fedora-install-guide-nextsteps-en.xml 
	fedora-install-guide-other-instmethods-en.xml 
	fedora-install-guide-packageselection-en.xml 
Log Message:
- Loaded all remaining chapter files into Emacs, filled
- No other editing done; future diffs should be more sane... sorry for the huge diff this time



Index: fedora-install-guide-abouttoinstall-en.xml
===================================================================
RCS file: /cvs/docs/fedora-docs/install-guide/fedora-install-guide-abouttoinstall-en.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-install-guide-abouttoinstall-en.xml	2 May 2005 22:24:28 -0000	1.2
+++ fedora-install-guide-abouttoinstall-en.xml	3 May 2005 12:19:44 -0000	1.3
@@ -1,52 +1,54 @@
 <!-- $Id: -->
 
 <chapter id="ch-abouttoinstall">
-   <title>Ninth Step: About to Install</title>
+  <title>Ninth Step: About to Install</title>
 
- <warning>
-   <title>This is the last point at which you can decide to stop the installation</title>
+  <warning>
+    <title>This is the last point at which you can decide to stop the
+      installation</title>
     <para>
-	No changes will be made to your computer until you click
-	the <guilabel>Next</guilabel> button.  If you abort the installation
-	process after leaving this screen the &FC; system will be incomplete and
-	unusable.
-   </para>
- </warning>
- 
-    <para>
-	You can still return to previous screens to alter any details by
-	selecting <guilabel>Back</guilabel>.
+      No changes will be made to your computer until you click the
+      <guilabel>Next</guilabel> button.  If you abort the installation
+      process after leaving this screen the &FC; system will be
+      incomplete and unusable.
     </para>
-
-    <figure id="fig-about-to-install">
-     <title>About to Install Screen</title>
-      <mediaobject>
-       <imageobject>
+  </warning>
+ 
+  <para>
+    You can still return to previous screens to alter any details by
+    selecting <guilabel>Back</guilabel>.
+  </para>
+
+  <figure id="fig-about-to-install">
+    <title>About to Install Screen</title>
+    <mediaobject>
+      <imageobject>
         <imagedata fileref="./figs/about-to-install.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
+      </imageobject>
+      <imageobject>
         <imagedata fileref="./figs/about-to-install.png" format="PNG"/>
-       </imageobject>
-       <textobject>
+      </imageobject>
+      <textobject>
         <para>
-         About to install... screen.
+	  About to install... screen.
         </para>
-       </textobject>
-      </mediaobject>
-    </figure>
-
-    <para>
-	Click <guilabel>Next</guilabel> to begin the installation.
-    </para>
-
-    <para>
-	If you are installing &FC; from disc then an extra dialog will appear to list
-	all of the discs that you will need in order to complete the
-	installation process.  You should click <guibutton>Continue</guibutton>
-	if you have the discs required.  You are offered the option to
-	<guibutton>Reboot</guibutton>, aborting the installation, in case you do
-	not have all of the necessary discs.
-    </para>
+      </textobject>
+    </mediaobject>
+  </figure>
+
+  <para>
+    Click <guilabel>Next</guilabel> to begin the installation.
+  </para>
+
+  <para>
+    If you are installing &FC; from disc then an extra dialog will
+    appear to list all of the discs that you will need in order to
+    complete the installation process.  You should click
+    <guibutton>Continue</guibutton> if you have the discs required.  You
+    are offered the option to <guibutton>Reboot</guibutton>, aborting
+    the installation, in case you do not have all of the necessary
+    discs.
+  </para>
 
 </chapter>
 


Index: fedora-install-guide-acknowledgements-en.xml
===================================================================
RCS file: /cvs/docs/fedora-docs/install-guide/fedora-install-guide-acknowledgements-en.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-install-guide-acknowledgements-en.xml	2 May 2005 22:24:28 -0000	1.2
+++ fedora-install-guide-acknowledgements-en.xml	3 May 2005 12:19:44 -0000	1.3
@@ -4,12 +4,13 @@
   <title>Acknowledgements</title>
 
   <para>
-    This version of the &IG; was written by Stuart Ellis, with the sections on Disk
-    Partitioning contributed by Paul Frields.
+    This version of the &IG; was written by Stuart Ellis, with the
+    sections on Disk Partitioning contributed by Paul W. Frields.
   </para>
 
   <para>
-    Many useful comments and suggestions were provided by Rahul Sundaram.
+    Many useful comments and suggestions were provided by Rahul
+    Sundaram.
   </para>
 
 </chapter>


Index: fedora-install-guide-bootloader-en.xml
===================================================================
RCS file: /cvs/docs/fedora-docs/install-guide/fedora-install-guide-bootloader-en.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-install-guide-bootloader-en.xml	2 May 2005 22:24:28 -0000	1.3
+++ fedora-install-guide-bootloader-en.xml	3 May 2005 12:19:44 -0000	1.4
@@ -1,32 +1,33 @@
-<!-- $Id:
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!ENTITY BOILERPLATE "This header makes editing XML easier" >
- <!ENTITY FED "Fedora">
-]>   -->
+<!-- $Id: -->
 <chapter id="ch-bootloader">
   <title>Third Step: Boot Loader</title>
 
   <para>
-    A <firstterm>boot loader</firstterm> is a small program that reads the operating system from mass storage and gets it ready to be run in main memory.
-    &FED; defaults to the <application>GRUB</application> boot loader.
+    A <firstterm>boot loader</firstterm> is a small program that reads
+    the operating system from mass storage and gets it ready to be run
+    in main memory. &FED; defaults to the
+    <application>GRUB</application> boot loader.
   </para>
 
   <para>
-    If you are building a multi-boot system, you probably already have a boot loader.
-    While you can continue to use the existing boot loader, it does not recognize the Linux partitions and you will not be able to boot &FED; easily.
-    We recommend that you use <application>GRUB</application> as your boot loader because it boots both Linux and most other operating systems as well.
-    Simply follow the directions in this section and <application>GRUB</application> will replace any existing boot loader.
+    If you are building a multi-boot system, you probably already have a
+    boot loader. While you can continue to use the existing boot loader,
+    it does not recognize the Linux partitions and you will not be able
+    to boot &FED; easily. We recommend that you use
+    <application>GRUB</application> as your boot loader because it boots
+    both Linux and most other operating systems as well. Simply follow
+    the directions in this section and <application>GRUB</application>
+    will replace any existing boot loader.
   </para>
 
   <para>
-      Figure <xref linkend="ch-bootloader-config-fig"/> shows the boot loader configuration choices.
-    </para>
+      Figure <xref linkend="ch-bootloader-config-fig"/> shows the boot
+    loader configuration choices.
+  </para>
   <figure id="ch-bootloader-config-fig">
     <title>
-        Boot loader Configuration Screen
-      </title>
+      Boot loader Configuration Screen
+    </title>
     <mediaobject>
       <imageobject>
         <imagedata align="center" fileref="figs/bootloader-config.eps" format="EPS" width="500"/>
@@ -42,12 +43,17 @@
 
   <section id="ch-bootloader-config-change">
     <title>
-        Keeping Your Existing Boot loader Settings
-      </title>
+      Keeping Your Existing Boot loader Settings
+    </title>
     <para>
-      By default, the boot loader will be installed in the <firstterm>master boot record</firstterm>, or <abbrev>MBR</abbrev> of the device for the root file system.
-      To change the selection, or to decline to install a new boot loader, press the <guibutton>Change boot loader</guibutton>.
-      The pop-up shown in <xref linkend="ch-bootloader-change-fig"/> allows you to avoid installing or changing your existing boot loader settings.
+      By default, the boot loader will be installed in the
+      <firstterm>master boot record</firstterm>, or <abbrev>MBR</abbrev>
+      of the device for the root file system. To change the selection,
+      or to decline to install a new boot loader, press the
+      <guibutton>Change boot loader</guibutton>. The pop-up shown in
+      <xref linkend="ch-bootloader-change-fig"/>
+      allows you to avoid installing or changing your existing boot
+      loader settings.
     </para>
     <figure id="ch-bootloader-change-fig">
       <title>Change Boot Loader</title>
@@ -65,20 +71,27 @@
     </figure>
     <note>
       <para>
-        If you decline to install any boot loader, you will not be able to boot Linux after the installation unless you choose to generate a start-up disk later in the installation process.
+        If you decline to install any boot loader, you will not be able
+	to boot Linux after the installation unless you choose to
+	generate a start-up disk later in the installation process.
       </para>
     </note>
   </section>
 
   <section id="ch-bootloader-others">
     <title>
-        Booting Additional Operating Systems
-      </title>
+      Booting Additional Operating Systems
+    </title>
     <para>
-        If you have other operating systems already installed, &FED; attempts to automatically detect and configure <application>GRUB</application> so that any installed <abbrev>OS</abbrev> can be booted.
-        You can also manually configure any additional operating systems if <application>GRUB</application> does not detect them.
-        To the right of the partition display there are three buttons that allow you to add, remove, or change the detected operating system settings.
-      </para>
+      If you have other operating systems already installed, &FED;
+      attempts to automatically detect and configure
+      <application>GRUB</application> so that any installed
+      <abbrev>OS</abbrev> can be booted. You can also manually configure
+      any additional operating systems if
+      <application>GRUB</application> does not detect them. To the right
+      of the partition display there are three buttons that allow you to
+      add, remove, or change the detected operating system settings.
+    </para>
     <glosslist>
       <glossentry>
         <glossterm>
@@ -86,13 +99,17 @@
         </glossterm>
         <glossdef>
           <para>
-              Pressing the <guibutton>Add</guibutton> button displays the pop-up shown in Figure <xref linkend="ch-bootloader-others-popup-fig"/>.
-            </para>
+              Pressing the <guibutton>Add</guibutton> button displays
+	    the pop-up shown in Figure <xref
+	      linkend="ch-bootloader-others-popup-fig"/>.
+	  </para>
           <para>
-              You must know the disk partition holding the bootable operating system.
-              Select the disk partition holding the bootable operating system from the drop-down list and give the entry a label.
-              The label is shown at boot-time when <application>GRUB</application> presents its boot menu.
-            </para>
+	    You must know the disk partition holding the bootable
+	    operating system. Select the disk partition holding the
+	    bootable operating system from the drop-down list and give
+	    the entry a label. The label is shown at boot-time when
+	    <application>GRUB</application> presents its boot menu.
+	  </para>
         </glossdef>
       </glossentry>
       <glossentry>
@@ -101,8 +118,10 @@
         </glossterm>
         <glossdef>
           <para>
-              You can change an entry shown in the partition list by clicking on the item with the mouse and then pressing the <guibutton>Edit</guibutton> button.
-            </para>
+	    You can change an entry shown in the partition list by
+	    clicking on the item with the mouse and then pressing the
+	    <guibutton>Edit</guibutton> button.
+	  </para>
         </glossdef>
       </glossentry>
       <glossentry>
@@ -111,8 +130,10 @@
         </glossterm>
         <glossdef>
           <para>
-              If you want to remove an entry from the partition list, just click it with the mouse and then press the <guibutton>Delete</guibutton> button.
-            </para>
+	    If you want to remove an entry from the partition list, just
+	    click it with the mouse and then press the
+	    <guibutton>Delete</guibutton> button.
+	  </para>
         </glossdef>
       </glossentry>
     </glosslist>
@@ -137,25 +158,41 @@
       Setting A Boot loader Password
     </title>
     <para>
-      A useful <application>GRUB</application> feature is that it can browse disk files itself on many file system layouts, not relying on any active <abbrev>OS</abbrev>.
-      An operator can interrupt the booting sequence to choose a different image file to boot, or to change the command line arguments passed to the kernel.
-      A system administrator can use the features to recover a system that will not boot.
-    </para>
-    <para>
-      Alas, allowing whom ever happens to be near the system console to type arbitrary commands or to change system parameters during the boot sequence can be a security issue.
-      <application>GRUB</application> can be configured to require that a password be typed before the start parameters can be changed.
-      Any operator with console access can boot the system but only if the correct password is given can the boot settings be changed.
+      A useful <application>GRUB</application> feature is that it can
+      browse disk files itself on many file system layouts, not relying
+      on any active <abbrev>OS</abbrev>. An operator can interrupt the
+      booting sequence to choose a different image file to boot, or to
+      change the command line arguments passed to the kernel. A system
+      administrator can use the features to recover a system that will
+      not boot.
+    </para>
+    <para>
+      Alas, allowing whom ever happens to be near the system console to
+      type arbitrary commands or to change system parameters during the
+      boot sequence can be a security issue.
+      <application>GRUB</application> can be configured to require that
+      a password be typed before the start parameters can be changed.
+      Any operator with console access can boot the system but only if
+      the correct password is given can the boot settings be changed.
     </para>
     <para>
       You do not have to set a <application>GRUB</application> password.
-      If you have trusted operators, or a physically secured system with controlled console access, you probably do not need a boot password.
-      Likewise if you have a single-user system and you do not worry about passers-by rebooting your system and fiddling with it, you can probably dispense with a boot password.
-    </para>
-    <para>
-      If you decide to use a boot password, mark the checkbox beside the <guibutton>Use a boot loader password</guibutton> legend.
-      The <guibutton>Change password</guibutton> button will become un-grayed and selectable.
-      Press the <guibutton>Change password</guibutton> button to display the pop-up shown in Figure <xref linkend="ch-bootloader-password-fig"/>.
-      Carefully type in your desired password and then confirm its correctness by typing it again in the space provided.
+      If you have trusted operators, or a physically secured system with
+      controlled console access, you probably do not need a boot
+      password. Likewise if you have a single-user system and you do not
+      worry about passers-by rebooting your system and fiddling with it,
+      you can probably dispense with a boot password.
+    </para>
+    <para>
+      If you decide to use a boot password, mark the checkbox beside the
+      <guibutton>Use a boot loader password</guibutton> legend. The
+      <guibutton>Change password</guibutton> button will become
+      un-grayed and selectable. Press the <guibutton>Change
+	password</guibutton> button to display the pop-up shown in
+      Figure <xref
+	linkend="ch-bootloader-password-fig"/>. Carefully type in your
+      desired password and then confirm its correctness by typing it
+      again in the space provided.
     </para>
     <figure id="ch-bootloader-password-fig">
       <title>Entering A Boot Password</title>
@@ -173,12 +210,14 @@
     </figure>
     <warning>
       <para>
-        Choose a password that is easy for you to remember but hard for others to guess.
-        The password is stored in encrypted form and <emphasis>cannot</emphasis> be recovered.
+        Choose a password that is easy for you to remember but hard for
+	others to guess. The password is stored in encrypted form and
+	<emphasis>cannot</emphasis> be recovered.
       </para>
       <para>
         If you forget the boot password, "Don't Panic!".
-        All you need do is boot the system normally and then change the password entry in the <filename>/etc/grub.conf</filename> file.
+	All you need do is boot the system normally and then change the
+	password entry in the <filename>/etc/grub.conf</filename> file.
       </para>
     </warning>
   </section>
@@ -188,34 +227,51 @@
       Advanced Boot loader Options
     </title>
     <para>
-      The default boot options are adequate for most situations.
-      The <application>GRUB</application> boot loader will be stored in the <abbrev>MBR</abbrev>, overwriting any existing boot loader.
+      The default boot options are adequate for most situations. The
+      <application>GRUB</application> boot loader will be stored in the
+      <abbrev>MBR</abbrev>, overwriting any existing boot loader.
     </para>
     <para>
-      If you want to keep your current boot loader in the <abbrev>MBR</abbrev>, you must use the advanced settings to place <application>GRUB</application> in the first sector of the partition holding the Linux root file system.
+      If you want to keep your current boot loader in the
+      <abbrev>MBR</abbrev>, you must use the advanced settings to place
+      <application>GRUB</application> in the first sector of the
+      partition holding the Linux root file system.
     </para>
     <para>
-      You may also need the advanced options if your <abbrev>BIOS</abbrev> has numbered your disk devices differently than Linux expects.
-      On some systems, Linux may not configure the disk drive geometry for large disks correctly because of a broken <abbrev>BIOS</abbrev>.
-      As a work around, mark the <guibutton>Force LBA32</guibutton> checkbox.
+      You may also need the advanced options if your
+      <abbrev>BIOS</abbrev> has numbered your disk devices differently
+      than Linux expects. On some systems, Linux may not configure the
+      disk drive geometry for large disks correctly because of a broken
+      <abbrev>BIOS</abbrev>. As a work around, mark the <guibutton>Force
+	LBA32</guibutton> checkbox.
     </para>
     <para>
-      The Linux kernel usually auto-detects its environment correctly, and no additional kernel parameters are needed.
-      However, it is possible to provide any needed kernel parameter using the advanced boot loader options.
+      The Linux kernel usually auto-detects its environment correctly,
+      and no additional kernel parameters are needed. However, it is
+      possible to provide any needed kernel parameter using the advanced
+      boot loader options.
     </para>
     <note>
       <para>
-        For a partial list of the kernel command line parameters, type the following command in a terminal window: <userinput>man bootparam</userinput>.
-        Note that these many not be up to date; refer to the documentation provided in the kernel sources for the authoritative list.
+        For a partial list of the kernel command line parameters, type
+	the following command in a terminal window: <userinput>man
+	  bootparam</userinput>. Note that these many not be up to date;
+	refer to the documentation provided in the kernel sources for
+	the authoritative list.
       </para>
     </note>
     <para>
-      If you need to alter any of these settings, mark the <guibutton>Configure advanced boot loader options</guibutton> checkbox.
-      Then, when you press <guibutton>Next</guibutton>, the menu shown in <xref linkend="ch-bootloader-advanced-fig"/> will appear.
+      If you need to alter any of these settings, mark the
+      <guibutton>Configure advanced boot loader options</guibutton>
+      checkbox. Then, when you press <guibutton>Next</guibutton>, the
+      menu shown
+      in <xref linkend="ch-bootloader-advanced-fig"/> will appear.
     </para>
     <note>
       <para>
-        The following advanced boot options menu will be displayed <emphasis>only</emphasis> if the advanced configuration checkbox, just described, has been selected.
+        The following advanced boot options menu will be displayed
+	<emphasis>only</emphasis> if the advanced configuration
+	checkbox, just described, has been selected.
       </para>
     </note>
     <figure id="ch-bootloader-advanced-fig">
@@ -228,7 +284,8 @@
           <imagedata align="center" fileref="figs/bootloader-advanced.png" format="PNG"/>
         </imageobject>
         <textobject>
-          <phrase>Menu displayed if advanced boot settings are desired</phrase>
+          <phrase>Menu displayed if advanced boot settings are
+	    desired</phrase>
         </textobject>
       </mediaobject>
     </figure>


Index: fedora-install-guide-diskpartitioning-en.xml
===================================================================
RCS file: /cvs/docs/fedora-docs/install-guide/fedora-install-guide-diskpartitioning-en.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-install-guide-diskpartitioning-en.xml	2 May 2005 22:24:28 -0000	1.2
+++ fedora-install-guide-diskpartitioning-en.xml	3 May 2005 12:19:44 -0000	1.3
@@ -1,163 +1,162 @@
 <!-- $Id: -->
-  <chapter id="ch-disk-partitioning">
-    <title>Disk Partitioning</title>
+<chapter id="ch-disk-partitioning">
+  <title>Disk Partitioning</title>
  
-    <para>
-      This section describes how to use the installation program to
-      partition disks attached to your &FED; system.  If you are new to
-      Linux, you may want to simply use the automatic partitioning
-      method.  If you are a more experienced Linux user, you can use the
-      manual partitioning method to have more control over your system
-      configuration.
-    </para>
+  <para>
+    This section describes how to use the installation program to
+    partition disks attached to your &FED; system.  If you are new to
+    Linux, you may want to simply use the automatic partitioning method.
+    If you are a more experienced Linux user, you can use the manual
+    partitioning method to have more control over your system
+    configuration.
+  </para>
 
-    <section id="sn-choosing-partition-method">
-      <title>Choosing a Partitioning Method</title>
+  <section id="sn-choosing-partition-method">
+    <title>Choosing a Partitioning Method</title>
     
-      <section id="sn-automatic-partitioning">
-	<title>Setting Up Partitions Automatically</title>
+    <section id="sn-automatic-partitioning">
+      <title>Setting Up Partitions Automatically</title>
 
-	<para>
-	  Choose <guilabel>Automatic partitioning</guilabel> at the
-	  partitioning menu to have a partition scheme set up for you.
-	  <application>Disk Druid</application> then displays additional
-	  options.  Select <guilabel>Remove all Linux partitions on this
-	    system</guilabel> to remove all <firstterm>ext2</firstterm>,
-	  <firstterm>ext3</firstterm>, or <firstterm>Linux
-	    swap</firstterm> partitions from all hard disks.  Select
-	  <guilabel>Remove all partitions on this system</guilabel> to
-	  remove all partitions from all hard disks.  Select
-	  <guilabel>Keep all partitions and use only existing free
-	    space</guilabel> to use only the unpartitioned space on the
-	  hard disk(s) to install &FC;.
-	</para>
-	<para>
-	  Next, select the drive(s) you wish to use for Linux
-	  partitions. If your system contains only one disk, that disk
-	  will automatically be selected.  If you are confused about the
-	  device names used in this box, consult the Linux
-	  Partition-HOWTO at <ulink
-	    url="http://www.tldp.org/HOWTO/Partition/partition-2.html">http://www.tldp.org/HOWTO/Partition/partition-2.html</ulink>. 
-	  Any drives you select will be used for Linux partitions
-	  according to the option selected above.  The option selection
-	  is global, and you may not select a different option for each
-	  disk.
-	</para>
-	<para>
-	  If you wish to review the automatic partition configuration,
-	  select the <guilabel>Review</guilabel> checkbox.
-	</para>
-	<para>
+      <para>
+	Choose <guilabel>Automatic partitioning</guilabel> at the
+	partitioning menu to have a partition scheme set up for you.
+	<application>Disk Druid</application> then displays additional
+	options.  Select <guilabel>Remove all Linux partitions on this
+	  system</guilabel> to remove all <firstterm>ext2</firstterm>,
+	<firstterm>ext3</firstterm>, or <firstterm>Linux
+	  swap</firstterm> partitions from all hard disks.  Select
+	<guilabel>Remove all partitions on this system</guilabel> to
+	remove all partitions from all hard disks.  Select
+	<guilabel>Keep all partitions and use only existing free
+	  space</guilabel> to use only the unpartitioned space on the
+	hard disk(s) to install &FC;.
+      </para>
+      <para>
+	Next, select the drive(s) you wish to use for Linux partitions.
+	If your system contains only one disk, that disk will
+	automatically be selected.  If you are confused about the device
+	names used in this box, consult the Linux Partition-HOWTO at
+	<ulink
+	  url="http://www.tldp.org/HOWTO/Partition/partition-2.html">http://www.tldp.org/HOWTO/Partition/partition-2.html</ulink>. 
+	Any drives you select will be used for Linux partitions
+	according to the option selected above.  The option selection is
+	global, and you may not select a different option for each disk.
+      </para>
+      <para>
+	If you wish to review the automatic partition configuration,
+	select the <guilabel>Review</guilabel> checkbox.
+      </para>
+      <para>
 	  If you chose to remove any existing partitions, the
-	  installation program will ask you to confirm this choice. Once
-	  you have reviewed and approve of the partition configuration,
-	  select <guibutton>Next</guibutton> to continue to the next
-	  installation step.  Proceed with <xref
+	installation program will ask you to confirm this choice. Once
+	you have reviewed and approve of the partition configuration,
+	select <guibutton>Next</guibutton> to continue to the next
+	installation step.  Proceed with <xref
 	    linkend="ch-bootloader"/>.
-	</para>
+      </para>
 
-      </section>
+    </section>
 
-      <section id="sn-manual-partitioning">
-	<title>Setting Up Partitions Manually</title>
+    <section id="sn-manual-partitioning">
+      <title>Setting Up Partitions Manually</title>
 
-	<para>
+      <para>
 	  If you wish to manually set up all disk partitions, choose
-	  <guilabel>Manually partition with Disk Druid</guilabel>.  You
-	  should choose this method if you require a special partition
-	  configuration.  If you are familiar with how disk partitions
-	  and the Linux file system work, move on to <xref
+	<guilabel>Manually partition with Disk Druid</guilabel>.  You
+	should choose this method if you require a special partition
+	configuration.  If you are familiar with how disk partitions and
+	the Linux file system work, move on to <xref
 	    linkend="sn-disk-druid"/>.  Otherwise, read <xref
 	    linkend="sn-partitioning-general"/>.
-	</para>
-
-      </section>
+      </para>
 
     </section>
+
+  </section>
     
-    <section id="sn-partitioning-general">
-      <title>General Information</title>
+  <section id="sn-partitioning-general">
+    <title>General Information</title>
 
-      <para>
-	A &FC; system should have at least three partitions installed:
-      </para>
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    A data partition mounted at <filename>/boot</filename>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    A data partition mounted at <filename>/</filename>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    A swap partition
-	  </para>
-	</listitem>
-      </itemizedlist>
-      <para>
+    <para>
+      A &FC; system should have at least three partitions installed:
+    </para>
+    <itemizedlist>
+      <listitem>
+	<para>
+	  A data partition mounted at <filename>/boot</filename>
+	</para>
+      </listitem>
+      <listitem>
+	<para>
+	  A data partition mounted at <filename>/</filename>
+	</para>
+      </listitem>
+      <listitem>
+	<para>
+	  A swap partition
+	</para>
+      </listitem>
+    </itemizedlist>
+    <para>
 	Most systems have more partitions than the minimum listed above.
-	Choose partitions based on your particular system needs.  If you
-	are not sure what to choose, use the "Automatic partitioning"
-	method shown in <xref linkend="sn-choosing-partition-method"/>.
-      </para>
-      <para>
-	Every partition must have a <firstterm>partition
-	  type</firstterm>.  The partition type indicates the file system
-	expected on that partition.  The most common partition type for
-	&FED; is <firstterm>ext3</firstterm> or
-	<firstterm>ext2</firstterm>.  The ext3 file system provides more
-	robust features for preventing data loss.  Most &FED;
-	administrators choose this type for data partitions.
-      </para>
-      <para>
-	Most partitions have a <firstterm>mount point</firstterm>.  The
-	mount point indicates the directory whose contents will reside
-	on that partition.  Data that does not reside on any other
-	partition will be in the <filename>/</filename> (or
-	<firstterm>"root"</firstterm>) partition.  In the minimum
-	configuration shown above:
-      </para>
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    All data under the <filename>/boot</filename> directory
-	    resides on the <filename>/boot</filename> partition.  For
-	    example, the file <filename>/boot/grub/grub.conf</filename>
-	    resides on the <filename>/boot</filename> partition.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Any file outside of the <filename>/boot</filename>
-	    partition, such as <filename>/etc/passwd</filename>, resides
-	    on the <filename>/</filename> partition.
-	  </para>
-	</listitem>
-      </itemizedlist>
-      <para>
-	Subdirectories may be assigned to partitions as well.  Some
-	administrators create both <filename>/usr</filename> and
-	<filename>/usr/local</filename> partitions.  In that case, files
-	under <filename>/usr/local</filename>, such as
-	<filename>/usr/local/bin/foo</filename>, will be on the
-	<filename>/usr/local</filename> partition.  Any other files in
-	<filename>/usr</filename>, such as the
-	<filename>/usr/bin</filename> directory, will be in the
-	<filename>/usr</filename> partition.
-      </para>
-      <para>
-	When you create partitions in this manner, as opposed to using
-	one large <filename>/</filename> partition, upgrades may be
-	easier.  See the description of <application>Disk
-	  Druid's</application> <link linkend="disk-druid-edit">Edit
-	  option</link> for more information.
-      </para>
+      Choose partitions based on your particular system needs.  If you
+      are not sure what to choose, use the "Automatic partitioning"
+      method shown in <xref linkend="sn-choosing-partition-method"/>.
+    </para>
+    <para>
+      Every partition must have a <firstterm>partition type</firstterm>.
+      The partition type indicates the file system expected on that
+      partition.  The most common partition type for &FED; is
+      <firstterm>ext3</firstterm> or <firstterm>ext2</firstterm>.  The
+      ext3 file system provides more robust features for preventing data
+      loss.  Most &FED; administrators choose this type for data
+      partitions.
+    </para>
+    <para>
+      Most partitions have a <firstterm>mount point</firstterm>.  The
+      mount point indicates the directory whose contents will reside on
+      that partition.  Data that does not reside on any other partition
+      will be in the <filename>/</filename> (or
+      <firstterm>"root"</firstterm>) partition.  In the minimum
+      configuration shown above:
+    </para>
+    <itemizedlist>
+      <listitem>
+	<para>
+	  All data under the <filename>/boot</filename> directory
+	  resides on the <filename>/boot</filename> partition.  For
+	  example, the file <filename>/boot/grub/grub.conf</filename>
+	  resides on the <filename>/boot</filename> partition.
+	</para>
+      </listitem>
+      <listitem>
+	<para>
+	  Any file outside of the <filename>/boot</filename> partition,
+	  such as <filename>/etc/passwd</filename>, resides on the
+	  <filename>/</filename> partition.
+	</para>
+      </listitem>
+    </itemizedlist>
+    <para>
+      Subdirectories may be assigned to partitions as well.  Some
+      administrators create both <filename>/usr</filename> and
+      <filename>/usr/local</filename> partitions.  In that case, files
+      under <filename>/usr/local</filename>, such as
+      <filename>/usr/local/bin/foo</filename>, will be on the
+      <filename>/usr/local</filename> partition.  Any other files in
+      <filename>/usr</filename>, such as the
+      <filename>/usr/bin</filename> directory, will be in the
+      <filename>/usr</filename> partition.
+    </para>
+    <para>
+      When you create partitions in this manner, as opposed to using one
+      large <filename>/</filename> partition, upgrades may be easier.
+      See the description of <application>Disk Druid's</application>
+      <link linkend="disk-druid-edit">Edit option</link> for more
+      information.
+    </para>
 
-    </section>
+  </section>
 
 <!-- some notes follow:
 
@@ -180,292 +179,290 @@
 
 -->
 
-    <section id="sn-disk-druid">
-      <title>Disk Druid</title>
+  <section id="sn-disk-druid">
+    <title>Disk Druid</title>
 
-      <para>
+    <para>
 	<application><firstterm>Disk Druid</firstterm></application>
 	<indexterm>
-	  <primary>Disk Druid</primary>
+	<primary>Disk Druid</primary>
 	</indexterm> is an interactive program for editing disk
-	partitions.  It is only available within the &FC; installation
-	system.  Disk Druid supports advanced technologies such as
-	<firstterm>RAID</firstterm> and <firstterm>LVM</firstterm>,
-	which provide more extensible and reliable data storage for
-	servers and workstations.
-      </para>
-      <para>
-	<application>Disk Druid</application> displays the following
-	actions in the installation program:
-      </para>
-      <variablelist>
-	<varlistentry id="vle-disk-druid-new">
-	  <term><guilabel>New</guilabel></term>
-	  <listitem>
+      partitions.  It is only available within the &FC; installation
+      system.  Disk Druid supports advanced technologies such as
+      <firstterm>RAID</firstterm> and <firstterm>LVM</firstterm>, which
+      provide more extensible and reliable data storage for servers and
+      workstations.
+    </para>
+    <para>
+      <application>Disk Druid</application> displays the following
+      actions in the installation program:
+    </para>
+    <variablelist>
+      <varlistentry id="vle-disk-druid-new">
+	<term><guilabel>New</guilabel></term>
+	<listitem>
+	  <para>
+	    Select this option to add a partition or LVM physical volume
+	    to the disk.  In the <guilabel>Add partition</guilabel>
+	    dialog, choose a mount point and a partition type.  If you
+	    have more than one disk on the system, choose which disks
+	    the partition may inhabit. Indicate a size in megabytes for
+	    the partition.
+	  </para>
+	  <note>
+	    <title>Some Partitions Not Allowed</title>
 	    <para>
-	      Select this option to add a partition or LVM physical
-	      volume to the disk.  In the <guilabel>Add
-		partition</guilabel> dialog, choose a mount point and a
-	      partition type.  If you have more than one disk on the
-	      system, choose which disks the partition may inhabit.
-	      Indicate a size in megabytes for the partition.
+	      The <filename>/bin</filename>, <filename>/dev</filename>,
+	      <filename>/etc</filename>, <filename>/lib</filename>,
+	      <filename>/proc</filename>, <filename>/root</filename>,
+	      and <filename>/sbin</filename> directories may not be used
+	      for separate partitions in <application>Disk
+		Druid</application>.  These directories reside on the
+	      <filename>/</filename> (root) partition.
+	    </para>
+	  </note>
+	  <important>
+	    <title>Root and <filename>/root</filename></title>
+	    <para>
+	      The <filename>/</filename> (or "root") partition is the
+	      top of the file system.  The <filename>/root</filename>
+	      (or "slash-root") directory is the home directory of the
+	      administrator.
+	    </para>
+	  </important>
+	  <para>
+	    You may also choose from three options for sizing your
+	    partition:
+	  </para>
+	  <variablelist>
+	    <varlistentry>
+	      <term><guilabel>Fixed size</guilabel></term>
+	      <listitem>
+		<para>
+		  Use a fixed size, as close to your entry as possible.
+		</para>
+	      </listitem>
+	    </varlistentry>
+	    <varlistentry>
+	      <term><guilabel>Fill all space up to</guilabel></term>
+	      <listitem>
+		<para>
+		  Grow the partition to a maximum size of your choice.
+		</para>
+	      </listitem>
+	    </varlistentry>
+	    <varlistentry>
+	      <term><guilabel>Fill to maximum allowable
+		  size</guilabel></term>
+	      <listitem>
+		<para>
+		  Grow the partition until it fills the remainder of the
+		  selected disks.
+		</para>
+	      </listitem>
+	    </varlistentry>
+	  </variablelist>
+	  <note>
+	    <title>Partition sizes</title>
+	    <para>
+	      The actual partition on the disk may be slightly smaller
+	      or larger than your choice.  Disk geometry issues cause
+	      this effect, not an error or bug.
 	    </para>
-	    <note>
-	      <title>Some Partitions Not Allowed</title>
+	  </note>
+	  <para>
+	    After you enter the details for your partition, select
+	    <guibutton>OK</guibutton> to continue.
+	  </para>
+	</listitem>
+      </varlistentry>
+      <varlistentry id="disk-druid-edit">
+	<term><guilabel>Edit</guilabel></term>
+	<listitem>
+	  <para>
+	    Select this option to edit an existing partition, LVM volume
+	    group, or a LVM physical volume that is not yet part of a
+	    volume group.  If you need to change the size of a LVM
+	    physical volume partition, you will need to remove it from
+	    any volume groups, which will erase any logical volumes it
+	    contains.
+	  </para>
+	  <para>
+	    Edit a partition to change its size, mount point, or file
+	    system type.  Use this function to:
+	  </para>
+	  <itemizedlist>
+	    <listitem>
 	      <para>
-		The <filename>/bin</filename>,
-		<filename>/dev</filename>, <filename>/etc</filename>,
-		<filename>/lib</filename>, <filename>/proc</filename>,
-		<filename>/root</filename>, and
-		<filename>/sbin</filename> directories may not be used
-		for separate partitions in <application>Disk
-		  Druid</application>.  These directories reside on the
-		<filename>/</filename> (root) partition.
+		correct a mistake in setting up your partitions;
 	      </para>
-	    </note>
-	    <important>
-	      <title>Root and <filename>/root</filename></title>
+	    </listitem>
+	    <listitem>
 	      <para>
-		The <filename>/</filename> (or "root") partition is the
-		top of the file system.  The <filename>/root</filename>
-		(or "slash-root") directory is the home directory of the
-		administrator.
+		migrate Linux partitions if you are upgrading or
+		reinstalling &FC;; or
 	      </para>
-	    </important>
-	    <para>
-	      You may also choose from three options for sizing your
-	      partition:
-	    </para>
-	    <variablelist>
-	      <varlistentry>
-		<term><guilabel>Fixed size</guilabel></term>
-		<listitem>
-		  <para>
-		    Use a fixed size, as close to your entry as
-		    possible.
-		  </para>
-		</listitem>
-	      </varlistentry>
-	      <varlistentry>
-		<term><guilabel>Fill all space up to</guilabel></term>
-		<listitem>
-		  <para>
-		    Grow the partition to a maximum size of your choice.
-		  </para>
-		</listitem>
-	      </varlistentry>
-	      <varlistentry>
-		<term><guilabel>Fill to maximum allowable
-		    size</guilabel></term>
-		<listitem>
-		  <para>
-		    Grow the partition until it fills the remainder of
-		    the selected disks.
-		  </para>
-		</listitem>
-	      </varlistentry>
-	    </variablelist>
-	    <note>
-	      <title>Partition sizes</title>
+	    </listitem>
+	    <listitem>
 	      <para>
-		The actual partition on the disk may be slightly smaller
-		or larger than your choice.  Disk geometry issues cause
-		this effect, not an error or bug.
+		provide a mount point for non-Linux partitions such as
+		those used on some Windows operating systems.
 	      </para>
-	    </note>
-	    <para>
-	      After you enter the details for your partition, select
-	      <guibutton>OK</guibutton> to continue.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry id="disk-druid-edit">
-	  <term><guilabel>Edit</guilabel></term>
-	  <listitem>
-	    <para>
-	      Select this option to edit an existing partition, LVM
-	      volume group, or a LVM physical volume that is not yet
-	      part of a volume group.  If you need to change the size of
-	      a LVM physical volume partition, you will need to remove
-	      it from any volume groups, which will erase any logical
-	      volumes it contains.
-	    </para>
-	    <para>
-	      Edit a partition to change its size, mount point, or file
-	      system type.  Use this function to:
+	    </listitem>
+	  </itemizedlist>
+	  <note>
+	    <title>Windows Partitions</title>
+	    <para>
+	      You may not label Windows partitions that use the NTFS
+	      file system with a mount point in the &FC; installer. You
+	      may label <firstterm>vfat</firstterm> (FAT-16 or FAT-32)
+	      partitions with a mount point.
 	    </para>
-	    <itemizedlist>
+	  </note>
+	  <para>
+	    If you need to make sweeping changes to your partition
+	    configuration, consider starting over.  If your disk
+	    contains data that you need to keep, back it up before you
+	    edit your partitions.  If you edit the sizes of your
+	    partitions, you will likely lose all data on those
+	    partitions.
+	  </para>
+	  <para>
+	    If you have many separate partitions for system and user
+	    data, it will be easier for you to upgrade your system. The
+	    installation program allows you to erase or retain data on
+	    specific partitions.  If your user data is on a separate
+	    <filename>/home</filename> partition, you may retain that
+	    data while erasing system partitions like
+	    <filename>/boot</filename>.  
+	  </para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><guilabel>Delete</guilabel></term>
+	<listitem>
+	  <para>
+	    Select a partition and then this option to erase an existing
+	    partition or LVM physical volume.  To delete a LVM physical
+	    volume, you must first delete any volume groups of which
+	    that physical volume is a member.
+	  </para>
+	  <para>
+	    If you make a mistake, use the <guilabel>Reset</guilabel>
+	    option to abandon all the changes you have made.
+	  </para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><guilabel>Reset</guilabel></term>
+	<listitem>
+	  <para>
+	    Select this option to force <application>Disk
+	      Druid</application> to abandon all changes made to disk
+	    partitions.
+	  </para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><guilabel>RAID</guilabel></term>
+	<listitem>
+	  <para>
+	    Select this button to set up software RAID on your &FED;
+	    system.
+	  </para>
+	  <variablelist>
+	    <varlistentry>
+	      <term><guilabel>Create a software RAID
+		  partition</guilabel></term>
 	      <listitem>
 		<para>
-		  correct a mistake in setting up your partitions;
+		  Choose this option to add a partition for software
+		  RAID.  This option is the only choice available if
+		  your disk contains no software RAID partitions.
 		</para>
 	      </listitem>
+	    </varlistentry>
+	    <varlistentry>
+	      <term><guilabel>Create a RAID device</guilabel></term>
 	      <listitem>
 		<para>
-		  migrate Linux partitions if you are upgrading or
-		  reinstalling &FC;; or
+		  Choose this option to construct a RAID device from two
+		  or more existing software RAID partitions.  This
+		  option is only available if two or more software RAID
+		  partitions have been configured.
 		</para>
 	      </listitem>
+	    </varlistentry>
+	    <varlistentry>
+	      <term><guilabel>Clone a drive to create a RAID
+		  device</guilabel></term>
 	      <listitem>
 		<para>
-		  provide a mount point for non-Linux partitions such as
-		  those used on some Windows operating systems.
+		  Choose this option to set up a RAID
+		  <firstterm>mirror</firstterm> of an existing disk.
+		  This option is only available if two or more disks are
+		  attached to the system.
 		</para>
 	      </listitem>
-	    </itemizedlist>
-	    <note>
-	      <title>Windows Partitions</title>
-	      <para>
-		You may not label Windows partitions that use the NTFS
-		file system with a mount point in the &FC; installer.
-		You may label <firstterm>vfat</firstterm> (FAT-16 or
-		FAT-32) partitions with a mount point.
-	      </para>
-	    </note>
-	    <para>
-	      If you need to make sweeping changes to your partition
-	      configuration, consider starting over.  If your disk
-	      contains data that you need to keep, back it up before you
-	      edit your partitions.  If you edit the sizes of your
-	      partitions, you will likely lose all data on those
-	      partitions.
-	    </para>
-	    <para>
-	      If you have many separate partitions for system and user
-	      data, it will be easier for you to upgrade your system.
-	      The installation program allows you to erase or retain
-	      data on specific partitions.  If your user data is on a
-	      separate <filename>/home</filename> partition, you may
-	      retain that data while erasing system partitions like
-	      <filename>/boot</filename>.  
-	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Delete</guilabel></term>
-	  <listitem>
-	    <para>
-	      Select a partition and then this option to erase an
-	      existing partition or LVM physical volume.  To delete a
-	      LVM physical volume, you must first delete any volume
-	      groups of which that physical volume is a member.
-	    </para>
-	    <para>
-	      If you make a mistake, use the <guilabel>Reset</guilabel>
-	      option to abandon all the changes you have made.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Reset</guilabel></term>
-	  <listitem>
+	    </varlistentry>
+	  </variablelist>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><guilabel>LVM</guilabel></term>
+	<listitem>
+	  <para>
+	    Select this button to set up LVM on your &FED; system.  You
+	    must first create at least one partition or software RAID
+	    device as a LVM physical volume, using the
+	    <guilabel>Add</guilabel> option in the main
+	    <application>Disk Druid</application> dialog.
+	  </para>
+	  <important>
+	    <title>Understanding LVM Components</title>
 	    <para>
-	      Select this option to force <application>Disk
-		Druid</application> to abandon all changes made to disk
+	      In LVM, one or more physical volumes are combined to form
+	      a volume group.  Each volume group's total storage may be
+	      apportioned for one or more logical volumes. Logical
+	      volumes function much like standard data partitions.  They
+	      have a file system type, such as ext3, and a mount point.
+	      An administrator may grow or shrink logical volumes
+	      without disturbing any data, unlike standard disk
 	      partitions.
 	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>RAID</guilabel></term>
-	  <listitem>
-	    <para>
-	      Select this button to set up software RAID on your &FED;
-	      system.
-	    </para>
-	    <variablelist>
-	      <varlistentry>
-		<term><guilabel>Create a software RAID
-		    partition</guilabel></term>
-		<listitem>
-		  <para>
-		    Choose this option to add a partition for software
-		    RAID.  This option is the only choice available if
-		    your disk contains no software RAID partitions.
-		  </para>
-		</listitem>
-	      </varlistentry>
-	      <varlistentry>
-		<term><guilabel>Create a RAID device</guilabel></term>
-		<listitem>
-		  <para>
-		    Choose this option to construct a RAID device from
-		    two or more existing software RAID partitions.  This
-		    option is only available if two or more software
-		    RAID partitions have been configured.
-		  </para>
-		</listitem>
-	      </varlistentry>
-	      <varlistentry>
-		<term><guilabel>Clone a drive to create a RAID
-		    device</guilabel></term>
-		<listitem>
-		  <para>
-		    Choose this option to set up a RAID
-		    <firstterm>mirror</firstterm> of an existing disk.
-		    This option is only available if two or more disks
-		    are attached to the system.
-		  </para>
-		</listitem>
-	      </varlistentry>
-	    </variablelist>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>LVM</guilabel></term>
-	  <listitem>
-	    <para>
-	      Select this button to set up LVM on your &FED; system.  You
-	      must first create at least one partition or software RAID
-	      device as a LVM physical volume, using the
-	      <guilabel>Add</guilabel> option in the main
-	      <application>Disk Druid</application> dialog.
-	    </para>
-	    <important>
-	      <title>Understanding LVM Components</title>
-	      <para>
-		In LVM, one or more physical volumes are combined to
-		form a volume group.  Each volume group's total storage
-		may be apportioned for one or more logical volumes.
-		Logical volumes function much like standard data
-		partitions.  They have a file system type, such as ext3,
-		and a mount point.  An administrator may grow or shrink
-		logical volumes without disturbing any data, unlike
-		standard disk partitions.
-	      </para>
-	    </important>
-	    <para>
-	      To assign one or more physical volumes to a volume group,
-	      first name the volume group.  Then select the physical
-	      volumes to be used in the volume group.  Finally, create
-	      and/or edit logical volumes on any volume groups using the
-	      <guilabel>Add</guilabel>, <guilabel>Edit</guilabel> and
-	      <guilabel>Delete</guilabel> options.
-	    </para>
-	    <para>
-	      You may not remove a physical volume from a volume group
-	      if doing so would leave insufficient space for that
-	      group's logical volumes.  For example, imagine a volume
-	      group made up of two 5 GB LVM physical volume partitions,
-	      which houses a logical volume that is 8 GB in size.  The
-	      installer will not allow you to remove either of the
-	      component physical volumes, since that would leave only 5
-	      GB in the group for an 8 GB logical volume.  If you reduce
-	      the total size of any logical volumes appropriately, you
-	      may then remove a physical volume from the volume group.
-	    </para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-      <para>
-	When you have finished setting up and reviewing your partition
-	configuration, select <guilabel>Next</guilabel> to continue the
-	installation process.
-      </para>
+	  </important>
+	  <para>
+	    To assign one or more physical volumes to a volume group,
+	    first name the volume group.  Then select the physical
+	    volumes to be used in the volume group.  Finally, create
+	    and/or edit logical volumes on any volume groups using the
+	    <guilabel>Add</guilabel>, <guilabel>Edit</guilabel> and
+	    <guilabel>Delete</guilabel> options.
+	  </para>
+	  <para>
+	    You may not remove a physical volume from a volume group if
+	    doing so would leave insufficient space for that group's
+	    logical volumes.  For example, imagine a volume group made
+	    up of two 5 GB LVM physical volume partitions, which houses
+	    a logical volume that is 8 GB in size.  The installer will
+	    not allow you to remove either of the component physical
+	    volumes, since that would leave only 5 GB in the group for
+	    an 8 GB logical volume.  If you reduce the total size of any
+	    logical volumes appropriately, you may then remove a
+	    physical volume from the volume group.
+	  </para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+    <para>
+      When you have finished setting up and reviewing your partition
+      configuration, select <guilabel>Next</guilabel> to continue the
+      installation process.
+    </para>
 
-    </section>
+  </section>
 
-  </chapter>
+</chapter>
   
     
 


Index: fedora-install-guide-firewallconfig-en.xml
===================================================================
RCS file: /cvs/docs/fedora-docs/install-guide/fedora-install-guide-firewallconfig-en.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-install-guide-firewallconfig-en.xml	2 May 2005 22:24:28 -0000	1.2
+++ fedora-install-guide-firewallconfig-en.xml	3 May 2005 12:19:44 -0000	1.3
@@ -4,124 +4,130 @@
   <title>Fifth Step: Firewall Configuration</title>
 
   <para>
-	The default security configuration for &FC; will protect your system
-	without restricting any of the functions of a desktop or laptop
-	computer.  If you are installing a server then you will need to alter
-	the settings in order to enable others to access the system.
+    The default security configuration for &FC; will protect your system
+    without restricting any of the functions of a desktop or laptop
+    computer.  If you are installing a server then you will need to
+    alter the settings in order to enable others to access the system.
   </para>
 
   <para>
-	Click <guibutton>Next</guibutton> to proceed after you have reviewed the
-	security configuration and made any necessary changes.
+    Click <guibutton>Next</guibutton> to proceed after you have reviewed
+    the security configuration and made any necessary changes.
   </para>
 
 
   <sect1 id="s1-firewall-settings">
-   <title>Firewall</title>
+    <title>Firewall</title>
 
-   <para>
-	The firewall built into Linux checks every incoming and outgoing network
-	connection between your machine and another against a set of rules.
-	These rules specify which types of connections are permitted and which
-	are denied.
-   </para>
-
-   <para>
-	By default the firewall is enabled, with a simple set of rules that
-	allow connections to be made from your system to others, but block
-	incoming connections from other systems.  You can then choose to allow access
-	to specific network services on your &FC; system.
+    <para>
+      The firewall built into Linux checks every incoming and outgoing
+      network connection between your machine and another against a set
+      of rules. These rules specify which types of connections are
+      permitted and which are denied.
+    </para>
+
+    <para>
+      By default the firewall is enabled, with a simple set of rules
+      that allow connections to be made from your system to others, but
+      block incoming connections from other systems.  You can then
+      choose to allow access to specific network services on your &FC;
+      system.
     </para>
 
     <para>
-      To enable access to services listed on this screen, click the checkbox next to
-	the name of the service.  After the installation is complete you can
-	enable access to other services as well.
+      To enable access to services listed on this screen, click the
+      checkbox next to the name of the service.  After the installation
+      is complete you can enable access to other services as well.
     </para>
 
 
     <figure id="fig-firewall">
-     <title>Firewall Configuration Screen</title>
+      <title>Firewall Configuration Screen</title>
       <mediaobject>
-       <imageobject>
-        <imagedata fileref="./figs/firewall.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
-        <imagedata fileref="./figs/firewall.png" format="PNG"/>
-       </imageobject>
-       <textobject>
-        <para>
-         Firewall configuration screen.
-        </para>
-       </textobject>
+	<imageobject>
+	  <imagedata fileref="./figs/firewall.eps" format="EPS"/>
+	</imageobject>
+	<imageobject>
+	  <imagedata fileref="./figs/firewall.png" format="PNG"/>
+	</imageobject>
+	<textobject>
+	  <para>
+	    Firewall configuration screen.
+	  </para>
+	</textobject>
       </mediaobject>
     </figure>
 
-  <para>
-	It is recommended that you do not disable the firewall.  If it is
-	necessary to do so, then select <guilabel>No firewall</guilabel>.
-  </para>
-
-  <tip>
-   <title>Changing the firewall settings</title>
     <para>
+      It is recommended that you do not disable the firewall.  If it is
+      necessary to do so, then select <guilabel>No firewall</guilabel>.
+    </para>
+
+    <tip>
+      <title>Changing the firewall settings</title>
+      <para>
 	To change these settings later, use the
-    <application>system-config-securitylevel</application> utility.  From the
-    main menu, choose <menuchoice><guimenu>System
-    Settings</guimenu><guimenuitem>Security Level and Firewall</guimenuitem></menuchoice>.
-    </para>   
-  </tip>
+	<application>system-config-securitylevel</application> utility.
+	From the main menu, choose <menuchoice><guimenu>System
+	    Settings</guimenu><guimenuitem>Security Level and
+	    Firewall</guimenuitem></menuchoice>.
+      </para>   
+    </tip>
 
 
   </sect1>
 
 
   <sect1 id="s1-selinux">
-   <title>&SEL;</title>
+    <title>&SEL;</title>
 
-   <para>
-	The &SEL; (Security Enhanced Linux) framework that is part of &FC;
-	limits the actions of both users and programs by enforcing defined
-	security policies throughout the operating system.  Software bugs or
-	configuration changes can render a system vulnerable, and the
-	restrictions imposed by the &SEL; policies provide an extra line of defense.
-  </para>
-
-  <para>
-	An inflexible set of &SEL; policies could also inhibit many normal
-	activities.  For this reason &FC; uses targeted policies, which only
-	affect specific network services.  These services cannot perform actions
-	that are not part of their normal functions.  This means that &SEL; can
-	be <guilabel>Active</guilabel> without causing users any inconvenience.
-  </para>
+    <para>
+      The &SEL; (Security Enhanced Linux) framework that is part of &FC;
+      limits the actions of both users and programs by enforcing defined
+      security policies throughout the operating system.  Software bugs
+      or configuration changes can render a system vulnerable, and the
+      restrictions imposed by the &SEL; policies provide an extra line
+      of defense.
+    </para>
 
-  <para>
-	As &SEL; is a new technology, a diagnostic mode is provided.  If you set
-	&SEL; to <guilabel>Warn</guilabel> then the system is configured, but
-	any breach of security policies will merely cause an error message to
-	appear.  No activities are actually prohibited when &SEL; is installed
-	in this mode.  You can make &SEL; fully active at a later time.
-  </para>
+    <para>
+      An inflexible set of &SEL; policies could also inhibit many normal
+      activities.  For this reason &FC; uses targeted policies, which
+      only affect specific network services.  These services cannot
+      perform actions that are not part of their normal functions.  This
+      means that &SEL; can be <guilabel>Active</guilabel> without
+      causing users any inconvenience.
+    </para>
 
-  <para>
-	If you choose to have &SEL; <guilabel>Disabled</guilabel> then the
-	access control system will not be configured at all.  To make &SEL;
-	active later you should use the
-	<application>system-config-securitylevel</application> utility.
-  </para>
+    <para>
+      As &SEL; is a new technology, a diagnostic mode is provided.  If
+      you set &SEL; to <guilabel>Warn</guilabel> then the system is
+      configured, but any breach of security policies will merely cause
+      an error message to appear.  No activities are actually prohibited
+      when &SEL; is installed in this mode.  You can make &SEL; fully
+      active at a later time.
+    </para>
 
-  <tip>
-   <title>Changing the &SEL; policy</title>
     <para>
-	&SEL; is unique in that it cannot be bypassed, even by the system
-      administrators.  You can configure the behavior of &SEL; with the
-    <application>system-config-securitylevel</application> utility.  From the
-      main menu, choose <menuchoice><guimenu>System
-      Settings</guimenu><guimenuitem>Security Level and Firewall</guimenuitem></menuchoice>.
+      If you choose to have &SEL; <guilabel>Disabled</guilabel> then the
+      access control system will not be configured at all.  To make
+      &SEL; active later you should use the
+      <application>system-config-securitylevel</application> utility.
     </para>
-  </tip>
 
- </sect1>
+    <tip>
+      <title>Changing the &SEL; policy</title>
+      <para>
+	&SEL; is unique in that it cannot be bypassed, even by the
+	system administrators.  You can configure the behavior of &SEL;
+	with the <application>system-config-securitylevel</application>
+	utility.  From the main menu, choose <menuchoice><guimenu>System
+	    Settings</guimenu><guimenuitem>Security Level and
+	    Firewall</guimenuitem></menuchoice>.
+      </para>
+    </tip>
+
+  </sect1>
 </chapter>
 
 <!--


Index: fedora-install-guide-firstboot-en.xml
===================================================================
RCS file: /cvs/docs/fedora-docs/install-guide/fedora-install-guide-firstboot-en.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-install-guide-firstboot-en.xml	2 May 2005 22:24:28 -0000	1.2
+++ fedora-install-guide-firstboot-en.xml	3 May 2005 12:19:44 -0000	1.3
@@ -3,413 +3,433 @@
 <chapter id="ch-firstboot">
   <title>The Setup Agent</title>
 
-   <para>
-	The first time that you load a new installation of &FC; the Setup Agent
-	will run, enabling you to configure the basic elements of the system.
-   </para>
+  <para>
+    The first time that you load a new installation of &FC; the Setup
+    Agent will run, enabling you to configure the basic elements of the
+    system.
+  </para>
 
-    <figure id="fig-fboot-welcome">
-     <title>Welcome Screen</title>
-      <mediaobject>
-       <imageobject>
+  <figure id="fig-fboot-welcome">
+    <title>Welcome Screen</title>
+    <mediaobject>
+      <imageobject>
         <imagedata fileref="./figs/fboot-welcome.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
+      </imageobject>
+      <imageobject>
         <imagedata fileref="./figs/fboot-welcome.png" format="PNG"/>
-       </imageobject>
-       <textobject>
+      </imageobject>
+      <textobject>
         <para>
-         Welcome screen.
+	  Welcome screen.
         </para>
-       </textobject>
-      </mediaobject>
-    </figure>
+      </textobject>
+    </mediaobject>
+  </figure>
 
-   <para>
-	Click <guibutton>Next</guibutton> to start the Setup Agent.
-   </para>
+  <para>
+    Click <guibutton>Next</guibutton> to start the Setup Agent.
+  </para>
 
-   <note>
+  <note>
     <title>The Setup Agent requires a graphical interface</title>
-     <para>
-      The Setup Agent cannot run if you chose to install a system with no
-      graphical interface.  In this case you must manually configure a user
-      account for yourself, and if necessary, adjust the system date and time.
+    <para>
+      The Setup Agent cannot run if you chose to install a system with
+      no graphical interface.  In this case you must manually configure
+      a user account for yourself, and if necessary, adjust the system
+      date and time.
     </para>
-   </note>
+  </note>
 
 
-<sect1 id="s1-firstboot-licence">
- <title>Licence Agreement</title>
+  <sect1 id="s1-firstboot-licence">
+    <title>Licence Agreement</title>
 
-  <para>
-	This screen displays the overall licencing terms for &FC;.  Individual
-	software packages are covered by their own licences.  Every software
-	product included in &FC; uses a licence that has been
-	approved by the Open Source Initiative (OSI).
-  </para>
+    <para>
+      This screen displays the overall licencing terms for &FC;.
+      Individual software packages are covered by their own licences.
+      Every software product included in &FC; uses a licence that has
+      been approved by the Open Source Initiative (OSI).
+    </para>
 
     <figure id="fig-fboot-licence">
-     <title>Licence Agreement Screen</title>
+      <title>Licence Agreement Screen</title>
       <mediaobject>
-       <imageobject>
-        <imagedata fileref="./figs/fboot-licence.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
-        <imagedata fileref="./figs/fboot-licence.png" format="PNG"/>
-       </imageobject>
-       <textobject>
-        <para>
-         Licence agreement screen.
-        </para>
-       </textobject>
+	<imageobject>
+	  <imagedata fileref="./figs/fboot-licence.eps" format="EPS"/>
+	</imageobject>
+	<imageobject>
+	  <imagedata fileref="./figs/fboot-licence.png" format="PNG"/>
+	</imageobject>
+	<textobject>
+	  <para>
+	    Licence agreement screen.
+	  </para>
+	</textobject>
       </mediaobject>
     </figure>
 
     <para>
-	To proceed, select <guilabel>Yes, I agree to the Licence
+      To proceed, select <guilabel>Yes, I agree to the Licence
 	Agreement</guilabel> and click <guibutton>Next</guibutton>.
     </para>
 
-</sect1>
+  </sect1>
 
 
-<sect1 id="s1-firstboot-datetime">
-  <title>Date and Time</title>
+  <sect1 id="s1-firstboot-datetime">
+    <title>Date and Time</title>
 
-   <para>
-	You can either set the date and time of your system, or use network
-	time servers (NTP).  If possible you should use NTP servers so that
-	your system clock will automatically be kept accurate.
-   </para>
+    <para>
+      You can either set the date and time of your system, or use
+      network time servers (NTP).  If possible you should use NTP
+      servers so that your system clock will automatically be kept
+      accurate.
+    </para>
 
-   <para>
-	The initial display enables you to set the date and time of your system manually:
-   </para>
+    <para>
+      The initial display enables you to set the date and time of your
+      system manually:
+    </para>
 
     <figure id="fig-fboot-time">
-     <title>Date and Time Screen</title>
+      <title>Date and Time Screen</title>
       <mediaobject>
-       <imageobject>
-        <imagedata fileref="./figs/fboot-time.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
-        <imagedata fileref="./figs/fboot-time.png" format="PNG"/>
-       </imageobject>
-       <textobject>
-        <para>
-         Date and time screen.
-        </para>
-       </textobject>
+	<imageobject>
+	  <imagedata fileref="./figs/fboot-time.eps" format="EPS"/>
+	</imageobject>
+	<imageobject>
+	  <imagedata fileref="./figs/fboot-time.png" format="PNG"/>
+	</imageobject>
+	<textobject>
+	  <para>
+	    Date and time screen.
+	  </para>
+	</textobject>
       </mediaobject>
     </figure>
 
-   <para>
-	Select the <guilabel>Network Time Protocol</guilabel> tab to configure
-	your system to use network time servers instead.
-   </para>
-
-   <tip>
-    <title>Changing the clock</title>
-     <para>
-      To change these settings later, use the
-     <application>system-config-date</application> utility.  From the main menu,
-     choose <menuchoice><guimenu>System Settings</guimenu><guimenuitem>Date
-     & Time</guimenuitem></menuchoice>.
+    <para>
+      Select the <guilabel>Network Time Protocol</guilabel> tab to
+      configure your system to use network time servers instead.
     </para>
-   </tip>
 
+    <tip>
+      <title>Changing the clock</title>
+      <para>
+      To change these settings later, use the
+	<application>system-config-date</application> utility.  From the
+	main menu, choose <menuchoice><guimenu>System
+	    Settings</guimenu><guimenuitem>Date &
+	    Time</guimenuitem></menuchoice>.
+      </para>
+    </tip>
 
-  <sect2 id="s2-firstboot-ntp">
-   <title>Network Time Protocol</title>
 
-    <para>
-	To configure your system to use network time servers you must
-	<guilabel>Enable Network Time Protocol</guilabel>.  This disables
-	thesettings on the <guilabel>Date and Time</guilabel> tab and allows you
-	to access to the other settings on this display.
-    </para>
+    <sect2 id="s2-firstboot-ntp">
+      <title>Network Time Protocol</title>
 
-    <figure id="fig-fboot-time-ntp">
-     <title>Date and Time Screen</title>
-      <mediaobject>
-       <imageobject>
-        <imagedata fileref="./figs/fboot-time-ntp.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
-        <imagedata fileref="./figs/fboot-time-ntp.png" format="PNG"/>
-       </imageobject>
-       <textobject>
-        <para>
-         Date and time screen.
-        </para>
-       </textobject>
-      </mediaobject>
-    </figure>
+      <para>
+	To configure your system to use network time servers you must
+	<guilabel>Enable Network Time Protocol</guilabel>.  This
+	disables thesettings on the <guilabel>Date and Time</guilabel>
+	tab and allows you to access to the other settings on this
+	display.
+      </para>
 
-    <para>
-      By default &FC; is configured to use three separate clusters, or pools, of
-      time servers.  Having more than one NTP provider enables your system to choose the
-      most accurate, or switch to using another server for time synchronization
-      if the first becomes unavailable.
-    </para>
+      <figure id="fig-fboot-time-ntp">
+	<title>Date and Time Screen</title>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="./figs/fboot-time-ntp.eps" format="EPS"/>
+	  </imageobject>
+	  <imageobject>
+	    <imagedata fileref="./figs/fboot-time-ntp.png" format="PNG"/>
+	  </imageobject>
+	  <textobject>
+	    <para>
+	      Date and time screen.
+	    </para>
+	  </textobject>
+	</mediaobject>
+      </figure>
 
-    <tip>
-     <title>You do not need to edit the list of NTP servers</title>
       <para>
-      The three server clusters provide a highly reliable method of setting your
-      system clock.  You only need change the list of <guilabel>NTP Servers</guilabel> if your
-      system does not have full access to the Internet.  In this case replace
-      the listed servers with the time servers on your network. 
+	By default &FC; is configured to use three separate clusters, or
+	pools, of time servers.  Having more than one NTP provider
+	enables your system to choose the most accurate, or switch to
+	using another server for time synchronization if the first
+	becomes unavailable.
       </para>
-   </tip>
 
-    <para>	
-	To use an additional time server either select it from the
-	<guilabel>Server</guilabel> drop-down box, or type the DNS name in the box, and
-	<guilabel>Add</guilabel>.  To remove a server or server pool from the
-	list, select the name and click <guilabel>Delete</guilabel>.  The
-	drop-down box already has two listings as examples, which are servers
-	provided by &RH;.
-    </para>
+      <tip>
+	<title>You do not need to edit the list of NTP servers</title>
+	<para>
+	  The three server clusters provide a highly reliable method of
+	  setting your system clock.  You only need change the list of
+	  <guilabel>NTP Servers</guilabel> if your system does not have
+	  full access to the Internet.  In this case replace the listed
+	  servers with the time servers on your network. 
+	</para>
+      </tip>
+
+      <para> To use an additional time server either select it from the
+	<guilabel>Server</guilabel> drop-down box, or type the DNS name
+	in the box, and <guilabel>Add</guilabel>.  To remove a server or
+	server pool from the list, select the name and click
+	<guilabel>Delete</guilabel>.  The drop-down box already has two
+	listings as examples, which are servers provided by &RH;.
+      </para>
 
-    <para>
-	If the hardware clock in your computer is highly inaccurate you may also
-	wish to remove the option to <guilabel>Use Local Time Source</guilabel>,
-	under <guilabel>Show advanced options</guilabel>.  This ensures that the
-	NTP servers take priority over the internal clock.
-    </para>
+      <para>
+	If the hardware clock in your computer is highly inaccurate you
+	may also wish to remove the option to <guilabel>Use Local Time
+	  Source</guilabel>, under <guilabel>Show advanced
+	  options</guilabel>.  This ensures that the NTP servers take
+	priority over the internal clock.
+      </para>
 
-    <para>
-	The <guilabel>Enable NTP Broadcast</guilabel> advanced option causes
-	your system to attempt to automatically locate time servers available on
-	the network.
-    </para>
+      <para>
+	The <guilabel>Enable NTP Broadcast</guilabel> advanced option
+	causes your system to attempt to automatically locate time
+	servers available on the network.
+      </para>
 
-   </sect2>
+    </sect2>
 
   </sect1>
 
 
-<sect1 id="s1-firstboot-systemuser">
-  <title>System User</title>
+  <sect1 id="s1-firstboot-systemuser">
+    <title>System User</title>
 
-  <para>
-	You create a user account for yourself with this screen.  Always use
-	this account to log in to your &FC; system, rather than using the root account.
-  </para>
+    <para>
+      You create a user account for yourself with this screen.  Always
+      use this account to log in to your &FC; system, rather than using
+      the root account.
+    </para>
 
     <figure id="fig-fboot-user">
-     <title>System User Screen</title>
+      <title>System User Screen</title>
       <mediaobject>
-       <imageobject>
-        <imagedata fileref="./figs/fboot-user.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
-        <imagedata fileref="./figs/fboot-user.png" format="PNG"/>
-       </imageobject>
-       <textobject>
-        <para>
-         System user screen.
-        </para>
-       </textobject>
+	<imageobject>
+	  <imagedata fileref="./figs/fboot-user.eps" format="EPS"/>
+	</imageobject>
+	<imageobject>
+	  <imagedata fileref="./figs/fboot-user.png" format="PNG"/>
+	</imageobject>
+	<textobject>
+	  <para>
+	    System user screen.
+	  </para>
+	</textobject>
       </mediaobject>
     </figure>
 
-  <para>
-	Enter a <guilabel>Username</guilabel> and your <guilabel>Full
-	Name</guilabel>, then enter your chosen <guilabel>Password</guilabel>
-	and type it once more in the <guilabel>Confirm Password</guilabel> box
-	to ensure that it is correct.
-  </para>
+    <para>
+      Enter a <guilabel>Username</guilabel> and your <guilabel>Full
+	Name</guilabel>, then enter your chosen
+      <guilabel>Password</guilabel> and type it once more in the
+      <guilabel>Confirm Password</guilabel> box to ensure that it is
+      correct.
+    </para>
 
-  <tip>
-   <title>Creating extra user accounts</title>
-   <para>
-      To add additional user accounts to your system after the installation
-	  is complete, use the <application>system-config-users</application>
-	  utility.  From the main menu, choose <menuchoice><guimenu>System
-	  Settings</guimenu><guimenuitem>Users & Groups</guimenuitem></menuchoice>.
-   </para>
-  </tip>
+    <tip>
+      <title>Creating extra user accounts</title>
+      <para>
+      To add additional user accounts to your system after the
+	installation is complete, use the
+	<application>system-config-users</application> utility.  From
+	the main menu, choose <menuchoice><guimenu>System
+	    Settings</guimenu><guimenuitem>Users &
+	    Groups</guimenuitem></menuchoice>.
+      </para>
+    </tip>
 
-  <para>
-	To configure your system to use network services for authentication or
-	user information, click <guibutton>Use Network Login...</guibutton>.
-	Network authentication is explained in a separate tutorial.
-  </para>
+    <para>
+      To configure your system to use network services for
+      authentication or user information, click <guibutton>Use Network
+	Login...</guibutton>. Network authentication is explained in a
+      separate tutorial.
+    </para>
 
-  <para>
-	When you have configured a login, click <guibutton>Next</guibutton>.
-  </para>
+    <para>
+      When you have configured a login, click
+      <guibutton>Next</guibutton>.
+    </para>
 
-</sect1>
+  </sect1>
 
 
-<sect1 id="s1-firstboot-display">
-  <title>Display</title>
+  <sect1 id="s1-firstboot-display">
+    <title>Display</title>
 
-  <para>
-    The Setup Agent will automatically attempt to identify the graphics hardware
-    and monitor for your computer.  These are used to determine the
-    <guilabel>Resolution</guilabel> and <guilabel>Color Depth</guilabel> settings.
-</para>
+    <para>
+      The Setup Agent will automatically attempt to identify the
+      graphics hardware and monitor for your computer.  These are used
+      to determine the <guilabel>Resolution</guilabel> and
+      <guilabel>Color Depth</guilabel> settings.
+    </para>
 
     <figure id="fig-fboot-display">
-     <title>Display Screen</title>
+      <title>Display Screen</title>
       <mediaobject>
-       <imageobject>
-        <imagedata fileref="./figs/fboot-display.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
-        <imagedata fileref="./figs/fboot-display.png" format="PNG"/>
-       </imageobject>
-       <textobject>
-        <para>
-         Display screen.
-        </para>
-       </textobject>
+	<imageobject>
+	  <imagedata fileref="./figs/fboot-display.eps" format="EPS"/>
+	</imageobject>
+	<imageobject>
+	  <imagedata fileref="./figs/fboot-display.png" format="PNG"/>
+	</imageobject>
+	<textobject>
+	  <para>
+	    Display screen.
+	  </para>
+	</textobject>
       </mediaobject>
     </figure>
 
-  <para>
-	To change the selected monitor, click <guilabel>Configure</guilabel>.  A
-	list of manufacturers will then be displayed.  Find the manufacturer of
-	your monitor on the list and click the disclosure triangle next to the
-	name of the manufacturer to view the models of monitor.  Select the
-	correct model from the list and click <guibutton>OK</guibutton>.  If
-	none of the listed models match your monitor, select the closest match
-	from the <guilabel>Generic CRT Display</guilabel> or <guilabel>Generic
-	LCD Display</guilabel>, as appropriate.
-  </para>
+    <para>
+      To change the selected monitor, click
+      <guilabel>Configure</guilabel>.  A list of manufacturers will then
+      be displayed.  Find the manufacturer of your monitor on the list
+      and click the disclosure triangle next to the name of the
+      manufacturer to view the models of monitor.  Select the correct
+      model from the list and click <guibutton>OK</guibutton>.  If none
+      of the listed models match your monitor, select the closest match
+      from the <guilabel>Generic CRT Display</guilabel> or
+      <guilabel>Generic LCD Display</guilabel>, as appropriate.
+    </para>
 
     <figure id="fig-fboot-display-monitor">
-     <title>Monitor Dialog</title>
+      <title>Monitor Dialog</title>
       <mediaobject>
-       <imageobject>
-        <imagedata fileref="./figs/fboot-display-monitor.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
-        <imagedata fileref="./figs/fboot-display-monitor.png" format="PNG"/>
-       </imageobject>
-       <textobject>
-        <para>
-         Monitor dialog.
-        </para>
-       </textobject>
+	<imageobject>
+	  <imagedata fileref="./figs/fboot-display-monitor.eps" format="EPS"/>
+	</imageobject>
+	<imageobject>
+	  <imagedata fileref="./figs/fboot-display-monitor.png" format="PNG"/>
+	</imageobject>
+	<textobject>
+	  <para>
+	    Monitor dialog.
+	  </para>
+	</textobject>
       </mediaobject>
     </figure>
 
-  <para>
-	You also can select different <guilabel>Resolution</guilabel> and
-	<guilabel>Color Depth</guilabel> settings by choosing them from the
-	drop-down lists.  Only the settings that are valid for the detected
-	hardware will be displayed.
-  </para>
-
-  <tip>
-   <title>Resetting the display</title>
     <para>
-      To reconfigure your system after the installation has completed, use the
-    <application>system-config-display</application> utility.  From the main
-    menu, choose <menuchoice><guimenu>System Settings</guimenu><guimenuitem>Display</guimenuitem></menuchoice>.
-   </para>
-  </tip>
+      You also can select different <guilabel>Resolution</guilabel> and
+      <guilabel>Color Depth</guilabel> settings by choosing them from
+      the drop-down lists.  Only the settings that are valid for the
+      detected hardware will be displayed.
+    </para>
 
-</sect1>
+    <tip>
+      <title>Resetting the display</title>
+      <para>
+      To reconfigure your system after the installation has completed,
+	use the <application>system-config-display</application>
+	utility.  From the main menu, choose <menuchoice><guimenu>System
+	    Settings</guimenu><guimenuitem>Display</guimenuitem></menuchoice>.
+      </para>
+    </tip>
 
+  </sect1>
 
-<sect1 id="s1-firstboot-soundcard">
-  <title>Sound Card</title>
 
-  <para>
-	The Setup Agent will attempt to automatically identify the sound card in
-	your computer.  To confirm that the sound card is configured correctly,
-	click <guibutton>Play Test Sound</guibutton>.  You should then hear a
-	series of three sounds.
-  </para>
+  <sect1 id="s1-firstboot-soundcard">
+    <title>Sound Card</title>
+
+    <para>
+      The Setup Agent will attempt to automatically identify the sound
+      card in your computer.  To confirm that the sound card is
+      configured correctly, click <guibutton>Play Test
+	Sound</guibutton>.  You should then hear a series of three
+      sounds.
+    </para>
 
     <figure id="fig-fboot-sound">
-     <title>Sound Card Screen</title>
+      <title>Sound Card Screen</title>
       <mediaobject>
-       <imageobject>
-        <imagedata fileref="./figs/fboot-sound.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
-        <imagedata fileref="./figs/fboot-sound.png" format="PNG"/>
-       </imageobject>
-       <textobject>
-        <para>
-         Sound card screen.
-        </para>
-       </textobject>
+	<imageobject>
+	  <imagedata fileref="./figs/fboot-sound.eps" format="EPS"/>
+	</imageobject>
+	<imageobject>
+	  <imagedata fileref="./figs/fboot-sound.png" format="PNG"/>
+	</imageobject>
+	<textobject>
+	  <para>
+	    Sound card screen.
+	  </para>
+	</textobject>
       </mediaobject>
     </figure>
  
-  <tip>
-   <title>Changing the sound card</title>
-    <para>
+    <tip>
+      <title>Changing the sound card</title>
+      <para>
       If you have to reconfigure the sound card later, use the
-    <application>system-config-soundcard</application> utility.  From the main
-    menu, choose <menuchoice><guimenu>System
-    Settings</guimenu><guimenuitem>Soundcard Detection</guimenuitem></menuchoice>.
-   </para>
-  </tip>
+	<application>system-config-soundcard</application> utility.
+	From the main menu, choose <menuchoice><guimenu>System
+	    Settings</guimenu><guimenuitem>Soundcard
+	    Detection</guimenuitem></menuchoice>.
+      </para>
+    </tip>
 
-</sect1>
+  </sect1>
 
 
-<sect1 id="s1-firstboot-additional-cds">
-  <title>Additional CDs</title>
+  <sect1 id="s1-firstboot-additional-cds">
+    <title>Additional CDs</title>
 
-  <para>
-	This screen enables you to load prepared discs for installing
-	third-party software.  It cannot be used for installing additional
-	packages from the &FC; discs.
-  </para>
+    <para>
+      This screen enables you to load prepared discs for installing
+      third-party software.  It cannot be used for installing additional
+      packages from the &FC; discs.
+    </para>
 
     <figure id="fig-fboot-cds">
-     <title>Additional CDs Screen</title>
+      <title>Additional CDs Screen</title>
       <mediaobject>
-       <imageobject>
-        <imagedata fileref="./figs/fboot-cds.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
-        <imagedata fileref="./figs/fboot-cds.png" format="PNG"/>
-       </imageobject>
-       <textobject>
-        <para>
-         Additional CDs screen.
-        </para>
-       </textobject>
+	<imageobject>
+	  <imagedata fileref="./figs/fboot-cds.eps" format="EPS"/>
+	</imageobject>
+	<imageobject>
+	  <imagedata fileref="./figs/fboot-cds.png" format="PNG"/>
+	</imageobject>
+	<textobject>
+	  <para>
+	    Additional CDs screen.
+	  </para>
+	</textobject>
       </mediaobject>
     </figure>
 
-  <para>Click <guilabel>Next</guilabel> to move on to the final screen.</para>
+    <para>Click <guilabel>Next</guilabel> to move on to the final
+      screen.</para>
 
     <figure id="fig-fboot-finish">
-     <title>Finish Setup Screen</title>
+      <title>Finish Setup Screen</title>
       <mediaobject>
-       <imageobject>
-        <imagedata fileref="./figs/fboot-finish.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
-        <imagedata fileref="./figs/fboot-finish.png" format="PNG"/>
-       </imageobject>
-       <textobject>
-        <para>
-         Finish setup screen.
-        </para>
-       </textobject>
+	<imageobject>
+	  <imagedata fileref="./figs/fboot-finish.eps" format="EPS"/>
+	</imageobject>
+	<imageobject>
+	  <imagedata fileref="./figs/fboot-finish.png" format="PNG"/>
+	</imageobject>
+	<textobject>
+	  <para>
+	    Finish setup screen.
+	  </para>
+	</textobject>
       </mediaobject>
     </figure>
 
-  <para>
-   After you click <guilabel>Next</guilabel>, the login screen will appear.
-   Your &FC; system is now ready for use.
-  </para>
+    <para>
+      After you click <guilabel>Next</guilabel>, the login screen will
+      appear. Your &FC; system is now ready for use.
+    </para>
 
-</sect1>
+  </sect1>
 
 </chapter>
 


Index: fedora-install-guide-installingpackages-en.xml
===================================================================
RCS file: /cvs/docs/fedora-docs/install-guide/fedora-install-guide-installingpackages-en.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-install-guide-installingpackages-en.xml	2 May 2005 22:24:28 -0000	1.2
+++ fedora-install-guide-installingpackages-en.xml	3 May 2005 12:19:44 -0000	1.3
@@ -1,49 +1,49 @@
 <!-- $Id: -->
 
 <chapter id="ch-installing-packages">
- <title>Installing Packages</title>
+  <title>Installing Packages</title>
 
-    <para>
-	The installation process will now take place.  As the installation is
-	carried out you will see the progress reported on screen.
-    </para>
-
-    <para>
-    If you are using CDs to install &FC; you will be prompted to change discs
-	periodically.  After inserting a disc allow two or three seconds for
-	the CD to be detected before clicking <guibutton>OK</guibutton> to
-	resume the installation.
-    </para>
-
-    <figure id="fig-installing-inprogress">
-     <title>Installing Packages Screen</title>
-      <mediaobject>
-       <imageobject>
+  <para>
+    The installation process will now take place.  As the installation
+    is carried out you will see the progress reported on screen.
+  </para>
+
+  <para>
+    If you are using CDs to install &FC; you will be prompted to change
+    discs periodically.  After inserting a disc allow two or three
+    seconds for the CD to be detected before clicking
+    <guibutton>OK</guibutton> to resume the installation.
+  </para>
+
+  <figure id="fig-installing-inprogress">
+    <title>Installing Packages Screen</title>
+    <mediaobject>
+      <imageobject>
         <imagedata fileref="./figs/installing-inprogress.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
+      </imageobject>
+      <imageobject>
         <imagedata fileref="./figs/installing-inprogress.png" format="PNG"/>
-       </imageobject>
-       <textobject>
+      </imageobject>
+      <textobject>
         <para>
-         Installing packages screen.
+	  Installing packages screen.
         </para>
-       </textobject>
-      </mediaobject>
-    </figure>
+      </textobject>
+    </mediaobject>
+  </figure>
     
-    <para>
-	When the installation has completed you will be prompted to
-	<guibutton>Reboot</guibutton> your computer.  Any installation disc in
-	the CD or DVD drive will automatically be ejected.
-    </para>
-
-    <para>
-	The first time that your computer loads &FC; you will be presented with
-	a <guilabel>Welcome</guilabel> screen and given the opportunity to
-	configure various aspects of your new system.  This process is explained
-	in the next section.
-   </para>
+  <para>
+    When the installation has completed you will be prompted to
+    <guibutton>Reboot</guibutton> your computer.  Any installation disc
+    in the CD or DVD drive will automatically be ejected.
+  </para>
+
+  <para>
+    The first time that your computer loads &FC; you will be presented
+    with a <guilabel>Welcome</guilabel> screen and given the opportunity
+    to configure various aspects of your new system.  This process is
+    explained in the next section.
+  </para>
 
 </chapter>
 


Index: fedora-install-guide-installtypes-en.xml
===================================================================
RCS file: /cvs/docs/fedora-docs/install-guide/fedora-install-guide-installtypes-en.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-install-guide-installtypes-en.xml	2 May 2005 22:24:28 -0000	1.2
+++ fedora-install-guide-installtypes-en.xml	3 May 2005 12:19:44 -0000	1.3
@@ -4,83 +4,88 @@
   <title>First Step: Installation Type</title>
 
   <para>
-	Installation types enable you to ensure that your &FED; system is loaded
-	with the correct software without needing to specify individual
-	packages.  The installation type that you choose determines the
-	suggested software later on in the installation process.  You can
-	customize the package selection at that point if you wish to do so.
+    Installation types enable you to ensure that your &FED; system is
+    loaded with the correct software without needing to specify
+    individual packages.  The installation type that you choose
+    determines the suggested software later on in the installation
+    process.  You can customize the package selection at that point if
+    you wish to do so.
   </para>
 
-    <figure id="fig-install-types">
-     <title>Installation Type Screen</title>
-      <mediaobject>
-       <imageobject>
+  <figure id="fig-install-types">
+    <title>Installation Type Screen</title>
+    <mediaobject>
+      <imageobject>
         <imagedata fileref="./figs/install-types.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
+      </imageobject>
+      <imageobject>
         <imagedata fileref="./figs/install-types.png" format="PNG"/>
-       </imageobject>
-       <textobject>
+      </imageobject>
+      <textobject>
         <para>
-         Installation type screen.
+	  Installation type screen.
         </para>
-       </textobject>
-      </mediaobject>
-    </figure>
+      </textobject>
+    </mediaobject>
+  </figure>
 
   <para>
-	A <guilabel>Personal Desktop</guilabel> installation is the default.  It
-	provides a graphical working environment with an office suite, Internet
-	applications and multimedia software.
+    A <guilabel>Personal Desktop</guilabel> installation is the default.
+    It provides a graphical working environment with an office suite,
+    Internet applications and multimedia software.
   </para>
 
   <para>
-	A <guilabel>Workstation</guilabel> installation includes the same
-	software as a <guilabel>Personal Desktop</guilabel>.  Extra software
-	will also be installed for development and systems administration.
-	Choose this installation type if you will be compiling software from source code.
+    A <guilabel>Workstation</guilabel> installation includes the same
+    software as a <guilabel>Personal Desktop</guilabel>.  Extra software
+    will also be installed for development and systems administration.
+    Choose this installation type if you will be compiling software from
+    source code.
   </para>
 
   <para>
-	A <guilabel>Server</guilabel> installation automatically provides the
-	Apache Web server and the Samba suite of services, along with
-	administration tools.  By default, no graphical environment is included.
+    A <guilabel>Server</guilabel> installation automatically provides
+    the Apache Web server and the Samba suite of services, along with
+    administration tools.  By default, no graphical environment is
+    included.
   </para>
 
   <para>
-	If you choose to perform a <guilabel>Custom</guilabel> installation then
-	you will automatically be presented with the <guilabel>Package Group
-	Selection</guilabel> screen later on in the installation process.
+    If you choose to perform a <guilabel>Custom</guilabel> installation
+    then you will automatically be presented with the <guilabel>Package
+      Group Selection</guilabel> screen later on in the installation
+    process.
   </para>
 
   <note>
-   <title>Default network services</title>
-   <para>
-      All &FC; installations include e-mail (SMTP), file sharing (NFS), printing
-      (CUPS) and remote login (SSH) services.  Various automated processes on
-      your &FED; system use the e-mail service to send reports and messages to
-      the system administrator.  By default the e-mail and printing services do
-      not accept connections from other systems.
-   </para>
+    <title>Default network services</title>
+    <para>
+      All &FC; installations include e-mail (SMTP), file sharing (NFS),
+      printing (CUPS) and remote login (SSH) services.  Various
+      automated processes on your &FED; system use the e-mail service to
+      send reports and messages to the system administrator.  By default
+      the e-mail and printing services do not accept connections from
+      other systems.
+    </para>
   </note>  
 
   <para>
-	Click <guibutton>Next</guibutton> once you have made a selection.
-</para>
+    Click <guibutton>Next</guibutton> once you have made a selection.
+  </para>
 
-   <tip>
+  <tip>
     <title>Minimal installations</title>
-     <para>
+    <para>
       To install a system with the minimum of software choose the
-      <guilabel>Custom</guilabel> installation type.  On the <guilabel>Package
-	Group Selection</guilabel> screen select the
-      <guilabel>Minimal</guilabel> package group.  A small command-line only
-      system will then be installed.  The only services that are included in a
-      <guilabel>Minimal</guilabel> installation are CUPS, NFS, SMTP and SSH.  This
-      type of installation is useful as a basis for preparing
-      specialized systems.
-     </para>
-    </tip>
+      <guilabel>Custom</guilabel> installation type.  On the
+      <guilabel>Package Group Selection</guilabel> screen select the
+      <guilabel>Minimal</guilabel> package group.  A small command-line
+      only system will then be installed.  The only services that are
+      included in a <guilabel>Minimal</guilabel> installation are CUPS,
+      NFS, SMTP and SSH.  This type of installation is useful as a basis
+      for preparing specialized systems.
+    </para>
+  </tip>
 
 </chapter>
 


Index: fedora-install-guide-networkconfig-en.xml
===================================================================
RCS file: /cvs/docs/fedora-docs/install-guide/fedora-install-guide-networkconfig-en.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-install-guide-networkconfig-en.xml	2 May 2005 22:24:28 -0000	1.2
+++ fedora-install-guide-networkconfig-en.xml	3 May 2005 12:19:44 -0000	1.3
@@ -4,150 +4,163 @@
   <title>Fourth Step: Network Configuration</title>
 
   <para>
-	This screen enables you to customize the network settings of the final
-	system.  
+    This screen enables you to customize the network settings of the
+    final system.  
   </para>
 
   <para>
-    It is not necessary to manually configure these settings if your computer
-    will be part of an existing network, or if it is a laptop that will move
-    between networks.    By default, &FC; will activate all of the network
-    interfaces on your computer and configure them to use DHCP.  Most networks
-    have a DHCP service that can automatically supply your system with
-    connection information.
+    It is not necessary to manually configure these settings if your
+    computer will be part of an existing network, or if it is a laptop
+    that will move between networks.    By default, &FC; will activate
+    all of the network interfaces on your computer and configure them to
+    use DHCP.  Most networks have a DHCP service that can automatically
+    supply your system with connection information.
   </para>
 
   <para>
-	Wireless interfaces using DHCP will join an open wireless network once
-	it is in range.  Many wireless networks are restricted, and will only
-	accept systems which also have the correct security credentials.
+    Wireless interfaces using DHCP will join an open wireless network
+    once it is in range.  Many wireless networks are restricted, and
+    will only accept systems which also have the correct security
+    credentials.
   </para>
 
   <para>
-	Click <guibutton>Next</guibutton> once you are satisfied with the
-	network settings for your system.
+    Click <guibutton>Next</guibutton> once you are satisfied with the
+    network settings for your system.
   </para>
 
-    <figure id="fig-net-config-dhcp">
-     <title>Network Configuration Screen</title>
-      <mediaobject>
-       <imageobject>
+  <figure id="fig-net-config-dhcp">
+    <title>Network Configuration Screen</title>
+    <mediaobject>
+      <imageobject>
         <imagedata fileref="./figs/net-config-dhcp.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
+      </imageobject>
+      <imageobject>
         <imagedata fileref="./figs/net-config-dhcp.png" format="PNG"/>
-       </imageobject>
-       <textobject>
+      </imageobject>
+      <textobject>
         <para>
-         Network configuration screen.
+	  Network configuration screen.
         </para>
-       </textobject>
-      </mediaobject>
-    </figure>
+      </textobject>
+    </mediaobject>
+  </figure>
 
 
   <sect1 id="s1-network-devices">
-   <title>Network Devices</title>
+    <title>Network Devices</title>
 
     <para>
-	The list on the screen shows the network interfaces that the
-	installation system has detected on your computer.  Each interface will
-	have a unique address on the network that it is attached to.  This IP
-	address can be assigned by the network DHCP service.
+      The list on the screen shows the network interfaces that the
+      installation system has detected on your computer.  Each interface
+      will have a unique address on the network that it is attached to.
+      This IP address can be assigned by the network DHCP service.
     </para>
 
     <para>
-	To set an IP address yourself, highlight the interface on the
-<guilabel>Network Device</guilabel> list and then
-	click <guibutton>Edit</guibutton>.  This will open a dialog box.  Click
-	the <guilabel>Configure using DHCP</guilabel> checkbox, so that it is empty.
-	Type the correct numbers of the <guilabel>IP Address</guilabel> in the
-	boxes.  You must also set the appropriate <guilabel>Netmask</guilabel>
-	for the interface.  Then click <guibutton>OK</guibutton>.
+      To set an IP address yourself, highlight the interface on the
+      <guilabel>Network Device</guilabel> list and then click
+      <guibutton>Edit</guibutton>.  This will open a dialog box.  Click
+      the <guilabel>Configure using DHCP</guilabel> checkbox, so that it
+      is empty. Type the correct numbers of the <guilabel>IP
+	Address</guilabel> in the boxes.  You must also set the
+      appropriate <guilabel>Netmask</guilabel> for the interface.  Then
+      click <guibutton>OK</guibutton>.
     </para>
 
     <para>
-	You can also choose to set an interface as inactive, so that it will not
-	be enabled as your machine starts.  Interfaces can be activated at any
-	time.  To set an interface to be inactive, click the <guilabel>Active on
-	Boot</guilabel> checkbox next to the name of the interface.
+      You can also choose to set an interface as inactive, so that it
+      will not be enabled as your machine starts.  Interfaces can be
+      activated at any time.  To set an interface to be inactive, click
+      the <guilabel>Active on Boot</guilabel> checkbox next to the name
+      of the interface.
     </para>
 
-  <note>
-   <title>Modems are configured after the installation process</title>
-   <para>
-	Modems are not listed on the <guilabel>Network Configuration</guilabel>
-	screen.  Use either <application>Internet Connection
-	Wizard</application> or <application>system-config-network</application>
-	to set up Internet access on your &FED; system.  The settings for your
-	modem are specific to your particular Internet Service Provider (ISP).
-   </para>
-  </note>
+    <note>
+      <title>Modems are configured after the installation
+	process</title>
+      <para>
+	Modems are not listed on the <guilabel>Network
+	  Configuration</guilabel> screen.  Use either
+	<application>Internet Connection Wizard</application> or
+	<application>system-config-network</application> to set up
+	Internet access on your &FED; system.  The settings for your
+	modem are specific to your particular Internet Service Provider
+	(ISP).
+      </para>
+    </note>
 
- </sect1>
+  </sect1>
 
 
   <sect1 id="s1-computer-hostname">
-   <title>Computer Hostname</title>
+    <title>Computer Hostname</title>
 
     <para>
-	On some networks the DHCP provider will also set the name of the
-	computer itself.  To specify the name of your computer select
-	<guilabel>manual</guilabel> and type the complete name in the box.  A
-	full computer hostname includes both the name of the machine and the
-	name of the DNS domain that it is a member of, e.g. <wordasword>machine1.example.com</wordasword>.
+      On some networks the DHCP provider will also set the name of the
+      computer itself.  To specify the name of your computer select
+      <guilabel>manual</guilabel> and type the complete name in the box.
+      A full computer hostname includes both the name of the machine and
+      the name of the DNS domain that it is a member of, e.g.
+      <wordasword>machine1.example.com</wordasword>.
     </para>
 
     <tip>
-     <title>Valid Hostnames</title>
+      <title>Valid Hostnames</title>
       <para>
-	You can give your system any name that you wish, provided that the full
-      hostname is unique.  The system name may include letters, numbers and
-      hyphens.  You can change the name of your system at any time.
+	You can give your system any name that you wish, provided that
+	the full hostname is unique.  The system name may include
+	letters, numbers and hyphens.  You can change the name of your
+	system at any time.
       </para>
     </tip>
 
- </sect1>
+  </sect1>
 
 
   <sect1 id="s1-network-misc-settings">
-   <title>Miscellaneous Settings</title>
+    <title>Miscellaneous Settings</title>
 
     <para>
-	If you have chosen to manually configure a network interface then you
-	may also wish to determine the other network settings for your computer.
-	All of these settings are the IP addresses of other systems on the network.
+      If you have chosen to manually configure a network interface then
+      you may also wish to determine the other network settings for your
+      computer. All of these settings are the IP addresses of other
+      systems on the network.
     </para>
 
     <para>
-	The <guilabel>Gateway</guilabel> is the device that provides access to
-	other networks.  Gateways are also referred to as routers.
+      The <guilabel>Gateway</guilabel> is the device that provides
+      access to other networks.  Gateways are also referred to as
+      routers.
     </para>
 
     <para>
-	Most software relies on the DNS (Domain Name Service) provider to locate
-	machines and services on the network.  A &FC; system may use more than one DNS
-	server.  If the <guilabel>Primary DNS</guilabel> server does not respond
-	then the query is resubmitted to the <guilabel>Secondary DNS</guilabel>
-	server, and so on.  This screen enables you to specify the IP addresses
-	of up to three DNS servers.
+      Most software relies on the DNS (Domain Name Service) provider to
+      locate machines and services on the network.  A &FC; system may
+      use more than one DNS server.  If the <guilabel>Primary
+	DNS</guilabel> server does not respond then the query is
+      resubmitted to the <guilabel>Secondary DNS</guilabel> server, and
+      so on.  This screen enables you to specify the IP addresses of up
+      to three DNS servers.
     </para>
 
     <para>
-	The <guilabel>Gateway</guilabel> is the device that provides access to
-	other networks.  Gateways are also referred to as routers.
+      The <guilabel>Gateway</guilabel> is the device that provides
+      access to other networks.  Gateways are also referred to as
+      routers.
     </para>
 
     <para>
-	Most software relies on the DNS (Domain Name Service) provider to locate
-	machines and services on the network.  A &FC; system may use more than one DNS
-	server.  If the <guilabel>Primary DNS</guilabel> server does not respond
-	then the query is resubmitted to the <guilabel>Secondary DNS</guilabel>
-	server, and so on.  This screen enables you to specify the IP addresses
-	of up to three DNS servers.
+      Most software relies on the DNS (Domain Name Service) provider to
+      locate machines and services on the network.  A &FC; system may
+      use more than one DNS server.  If the <guilabel>Primary
+	DNS</guilabel> server does not respond then the query is
+      resubmitted to the <guilabel>Secondary DNS</guilabel> server, and
+      so on.  This screen enables you to specify the IP addresses of up
+      to three DNS servers.
     </para>
 
- </sect1>
+  </sect1>
 </chapter>
 
 <!--


Index: fedora-install-guide-nextsteps-en.xml
===================================================================
RCS file: /cvs/docs/fedora-docs/install-guide/fedora-install-guide-nextsteps-en.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-install-guide-nextsteps-en.xml	2 May 2005 22:24:28 -0000	1.2
+++ fedora-install-guide-nextsteps-en.xml	3 May 2005 12:19:44 -0000	1.3
@@ -3,98 +3,107 @@
 <chapter id="ch-next-steps">
   <title>Your Next Steps</title>
 
-   <para>
-	Once you have installed &FC; you have a complete system at your
-	disposal.  This chapter will help you to find your way around this new environment.
-   </para>
-
-   <para>
-	&FED; is a <firstterm>multi-user</firstterm> system that enables many
-	users to be logged in to the same system simultaneously, and the same
-	user to log in more than once.  With network logins there is no limit to
-	the number of these <firstterm>sessions</firstterm>, other than the capacity
-	of your machine.
-    </para>
+  <para>
+    Once you have installed &FC; you have a complete system at your
+    disposal.  This chapter will help you to find your way around this
+    new environment.
+  </para>
+
+  <para>
+    &FED; is a <firstterm>multi-user</firstterm> system that enables
+    many users to be logged in to the same system simultaneously, and
+    the same user to log in more than once.  With network logins there
+    is no limit to the number of these <firstterm>sessions</firstterm>,
+    other than the capacity of your machine.
+  </para>
 
 
- <sect1 id="s1-fedora-desktop">
-   <title>Logging in to the &FED; Desktop</title>
+  <sect1 id="s1-fedora-desktop">
+    <title>Logging in to the &FED; Desktop</title>
 
     <para>
-	Several different graphical environments can be installed on a &FED;
-	system, enabling you to use whichever type of desktop you wish.  If your
-	system has more than one graphical environment available, you can select
-	which one will load from the <guilabel>Session</guilabel> menu on the
-	login screen.  You then login with the same user account, but will see a
-	different environment.
+      Several different graphical environments can be installed on a
+      &FED; system, enabling you to use whichever type of desktop you
+      wish.  If your system has more than one graphical environment
+      available, you can select which one will load from the
+      <guilabel>Session</guilabel> menu on the login screen.  You then
+      login with the same user account, but will see a different
+      environment.
     </para>
 
     <para>
-	By default, the GNOME desktop is installed with &FC;, providing an easy
-	to use graphical environment with a full set of utilities.  GNOME also
-	has the best support for users with special accessibility needs.  
+      By default, the GNOME desktop is installed with &FC;, providing an
+      easy to use graphical environment with a full set of utilities.
+      GNOME also has the best support for users with special
+      accessibility needs.  
     </para>
 
     <para>
-      &FC; also includes the KDE environment, a highly customizable desktop
-      which offers an extensive range of features.  Additional graphical
-      environments are available from &FED; Extras.
+      &FC; also includes the KDE environment, a highly customizable
+      desktop which offers an extensive range of features.  Additional
+      graphical environments are available from &FED; Extras.
     </para>
 
     <note>
-     <title>Applications will run in any graphical environment</title>
+      <title>Applications will run in any graphical environment</title>
       <para>
 	The applications supplied with &FC; are available in all of the
 	graphical environments.
-     </para>
+      </para>
     </note>
 
- </sect1>
+  </sect1>
 
 
   <sect1 id="s1-fedora-commandline">
-   <title>Accessing the Command-line</title>
+    <title>Accessing the Command-line</title>
 
-   <para>
-      There are three methods for accessing the command-line on a &FED; system:
-   </para>
+    <para>
+      There are three methods for accessing the command-line on a &FED;
+      system:
+    </para>
 
     <itemizedlist>
-     <listitem>
-          <para>By running the <application>gnome-terminal</application>
-          application.   From the main menu, choose <menuchoice><guimenu>System
-          Tools</guimenu><guimenuitem>Terminal</guimenuitem></menuchoice>.  A
+      <listitem>
+	<para>By running the <application>gnome-terminal</application>
+	  application.   From the main menu, choose
+	  <menuchoice><guimenu>System
+	      Tools</guimenu><guimenuitem>Terminal</guimenuitem></menuchoice>. 
+	  
+	  A
           terminal window will then appear on your desktop.</para>
-     </listitem>
-     <listitem>
-          <para>By logging in to your system over the network with SSH.</para>
-     </listitem>
-     <listitem>
-          <para>By changing virtual consoles.</para>
-     </listitem>
+      </listitem>
+      <listitem>
+	<para>By logging in to your system over the network with
+	  SSH.</para>
+      </listitem>
+      <listitem>
+	<para>By changing virtual consoles.</para>
+      </listitem>
     </itemizedlist>
 
-   <para>
-      Each of these facilities starts a new session that runs in addition to any
-      graphical desktop sessions that you are using.
-   </para>
-
-
-  <sect2 id="s2-vconsoles">
-    <title>Virtual Consoles</title>
-
-     <para>
-	You can login to your system more than once by switching between the
-	<firstterm>virtual consoles</firstterm>.  By default there are four
-	active virtual consoles that are command-line only.  The graphical login
-	screen is configured as virtual console seven.
-     </para>
+    <para>
+      Each of these facilities starts a new session that runs in
+      addition to any graphical desktop sessions that you are using.
+    </para>
+
+
+    <sect2 id="s2-vconsoles">
+      <title>Virtual Consoles</title>
+
+      <para>
+	You can login to your system more than once by switching between
+	the <firstterm>virtual consoles</firstterm>.  By default there
+	are four active virtual consoles that are command-line only.
+	The graphical login screen is configured as virtual console
+	seven.
+      </para>
 
-     <para>
+      <para>
 	To switch to a different virtual console, press
-	<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap></keycombo> and the
-	Function key that matches the number of that console.  
-     </para>
+	<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap></keycombo>
+	and the Function key that matches the number of that console.  
+      </para>
 
     </sect2>
 
@@ -102,266 +111,287 @@
 
 
   <sect1 id="s1-fedora-management">
-   <title>Managing Your &FED; System</title>
+    <title>Managing Your &FED; System</title>
 
-   <para>
-	<remark role="FIXME">INCOMPLETE - This is where we hook to other
-	tutorials as they are available.  Some of these sections will inevitably
-	be altered or dropped for version 1.0, based on availability of the tutorials.</remark>
-   </para>
+    <para>
+      <remark role="FIXME">INCOMPLETE - This is where we hook to other
+	tutorials as they are available.  Some of these sections will
+	inevitably be altered or dropped for version 1.0, based on
+	availability of the tutorials.</remark>
+    </para>
 
 
     <sect2 id="s2-fedora-admintools">
-     <title>Administration Tools</title> 
+      <title>Administration Tools</title> 
     
-     <para>
-	  <remark role="FIXME">INCOMPLETE - We've got graphical admin tools
-	  under System Settings, plus System Tools and Preferences.  Explain the
-	  difference between a Setting, a Preference and a Tool.</remark>
-     </para>
+      <para>
+	<remark role="FIXME">INCOMPLETE - We've got graphical admin
+	  tools under System Settings, plus System Tools and
+	  Preferences.  Explain the difference between a Setting, a
+	  Preference and a Tool.</remark>
+      </para>
 
     </sect2>
 
     
-   <sect2 id="s2-fedora-rootaccess">
-     <title>Using the Root Account</title> 
+    <sect2 id="s2-fedora-rootaccess">
+      <title>Using the Root Account</title> 
     
-     <para>
-	  <remark role="FIXME">INCOMPLETE - Explain the cryptic stuff in the
-	  Root Password section about using su here.  Link to sudo tutorial with
-	  a Tip if it's available.</remark>
-     </para>
+      <para>
+	<remark role="FIXME">INCOMPLETE - Explain the cryptic stuff in
+	  the Root Password section about using su here.  Link to sudo
+	  tutorial with a Tip if it's available.</remark>
+      </para>
 
     </sect2>
 
 
     <sect2 id="s2-fedora-updating">
-     <title>Updating Your System</title> 
+      <title>Updating Your System</title> 
     
-     <para>
-	<remark role="FIXME">INCOMPLETE - paragraph to link to up2date tutorial.</remark>
-     </para>
+      <para>
+	<remark role="FIXME">INCOMPLETE - paragraph to link to up2date
+	  tutorial.</remark>
+      </para>
 
     </sect2>
 
 
     <sect2 id="s2-fedora-newsoftware">
-     <title>Installing New Software</title> 
+      <title>Installing New Software</title> 
     
-     <para>
-	<remark role="FIXME">INCOMPLETE - paragraph to link to yum tutorial.</remark>
-     </para>
+      <para>
+	<remark role="FIXME">INCOMPLETE - paragraph to link to yum
+	  tutorial.</remark>
+      </para>
 
     </sect2>
 
 
     <sect2 id="s2-fedora-adminmail">
-     <title>Enabling E-mail Reports</title> 
+      <title>Enabling E-mail Reports</title> 
     
-     <para>
-	  <remark role="FIXME">INCOMPLETE - Edit the aliases to point root to a
-	  real e-mail address.  Installers on other distros set this up by default.</remark>
-     </para>
+      <para>
+	<remark role="FIXME">INCOMPLETE - Edit the aliases to point root
+	  to a real e-mail address.  Installers on other distros set
+	  this up by default.</remark>
+      </para>
 
     </sect2>
 
   </sect1>
 
 
- <sect1 id="s1-fedora-remoteaccess">
-  <title>Remote Access to Your &FED; System</title>
+  <sect1 id="s1-fedora-remoteaccess">
+    <title>Remote Access to Your &FED; System</title>
 
-   <para>
-	<remark role="FIXME">INCOMPLETE - This is the real payoff for the
-	sessions paragraph in the top section.   Mention
-	SSH and XDCMP, and name check VNC and desktop sharing.  The Terminal
-	Server Client app provides a universal client.  We can't really explain
-	these things here, but we can provide an overview and Caution the reader
-	not to do something silly with unencrypted connections.  SE has an
-	OpenSSH tutorial that can be Docbooked and linked to.</remark>
-   </para>
+    <para>
+      <remark role="FIXME">INCOMPLETE - This is the real payoff for the
+	sessions paragraph in the top section.   Mention SSH and XDCMP,
+	and name check VNC and desktop sharing.  The Terminal Server
+	Client app provides a universal client.  We can't really explain
+	these things here, but we can provide an overview and Caution
+	the reader not to do something silly with unencrypted
+	connections.  SE has an OpenSSH tutorial that can be Docbooked
+	and linked to.</remark>
+    </para>
 
- </sect1>
+  </sect1>
 
 
- <sect1 id="s1-finding-help">
-   <title>Finding Help</title>
+  <sect1 id="s1-finding-help">
+    <title>Finding Help</title>
 
     <para>
-	Each graphical application has a <guilabel>Help</guilabel> facility.
-	Other types of software also have help systems and documentation that
-	you can access.
+      Each graphical application has a <guilabel>Help</guilabel>
+      facility. Other types of software also have help systems and
+      documentation that you can access.
     </para>
 
 
-  <sect2 id="s2-desktop-help">
-    <title>Desktop Help</title>
+    <sect2 id="s2-desktop-help">
+      <title>Desktop Help</title>
 
-     <para>
+      <para>
 	Select <guilabel>Help</guilabel> from the
-	<guimenu>Desktop</guimenu> menu to read the documentation for the GNOME
-	desktop environment.
-     </para>
+	<guimenu>Desktop</guimenu> menu to read the documentation for
+	the GNOME desktop environment.
+      </para>
 
-  </sect2>
+    </sect2>
 
-  <sect2 id="s2-commandline-help">
-    <title>Help for Command-line Applications</title>
+    <sect2 id="s2-commandline-help">
+      <title>Help for Command-line Applications</title>
 
-    <para>
+      <para>
 	Each command-line application and configuration file has a
-	<command>man</command> page that gives a complete description of all of
-	the functions and options.  These are shown in the <guilabel>Man
-	Pages</guilabel> section within <guilabel>Help</guilabel>.
-    </para>
+	<command>man</command> page that gives a complete description of
+	all of the functions and options.  These are shown in the
+	<guilabel>Man Pages</guilabel> section within
+	<guilabel>Help</guilabel>.
+      </para>
 
-    <para>
-	You can also read the page for an application or file by using the
-	<command>man</command> command in a terminal window.  For example, to
-	read the page for the file <filename>yum.conf</filename> you would type:
-     </para>
+      <para>
+	You can also read the page for an application or file by using
+	the <command>man</command> command in a terminal window.  For
+	example, to read the page for the file
+	<filename>yum.conf</filename> you would type:
+      </para>
 
-     <para>
+      <para>
 	<userinput>man yum.conf</userinput>
-     </para>
+      </para>
 
-     <para>
-	To see the various search options available with <command>man</command>, type:
-     </para>
+      <para>
+	To see the various search options available with
+	<command>man</command>, type:
+      </para>
 
-     <para>
+      <para>
 	<userinput>man man</userinput>
-     </para>
+      </para>
 
-     <para>
+      <para>
 	The utilities supplied by the GNU project have complete manuals
-	organised in a help system, as well as individual <command>man</command>
-	pages.
+	organised in a help system, as well as individual
+	<command>man</command> pages.
       </para>
 
-    <para>
-	Type <command>info</command> in a terminal window to load the GNU help
-	system.  You can open the manual for a specific program by adding the
-	name of the program after <command>info</command>, like this:
-     </para>
+      <para>
+	Type <command>info</command> in a terminal window to load the
+	GNU help system.  You can open the manual for a specific program
+	by adding the name of the program after <command>info</command>,
+	like this:
+      </para>
 
-     <para>
+      <para>
  	<userinput>info chown</userinput>
-     </para>
+      </para>
 
-  </sect2>
+    </sect2>
 
-   <sect2 id="s2-perl-help">
-    <title>Perl Documentation</title>
+    <sect2 id="s2-perl-help">
+      <title>Perl Documentation</title>
 
-     <para>
-	You can also use <command>man</command> to read the documentation for
-	the Perl scripting language.  Each tutorial, reference work and module
-	has a page.  This command displays the page for the
-	<command>Net::Time</command> Perl module:
-     </para>
+      <para>
+	You can also use <command>man</command> to read the
+	documentation for the Perl scripting language.  Each tutorial,
+	reference work and module has a page.  This command displays the
+	page for the <command>Net::Time</command> Perl module:
+      </para>
 
-     <para>
+      <para>
  	<userinput>man Net::Time</userinput>
-     </para>
+      </para>
 
-     <para>
+      <para>
 	The <option>perltoc</option> page gives a complete list of the
 	documentation pages available for Perl: 
-     </para>
+      </para>
 
-     <para>
+      <para>
  	<userinput>man perltoc</userinput>
-     </para>
+      </para>
 
-     <para>
- 	Using <command>man</command> accesses the same documentation as the
- 	<command>perldoc</command> utility supplied with Perl.  You may wish to
- 	use <command>perldoc</command> to carry out specialised searches in the
- 	Perl documentation.  For example, type this command to look up the Perl
- 	function <option>chomp</option>:
-     </para>
+      <para>
+ 	Using <command>man</command> accesses the same documentation as
+	the <command>perldoc</command> utility supplied with Perl.  You
+	may wish to use <command>perldoc</command> to carry out
+	specialised searches in the Perl documentation.  For example,
+	type this command to look up the Perl function
+	<option>chomp</option>:
+      </para>
 
-     <para>
+      <para>
  	<userinput>perldoc -f chomp</userinput>
-     </para>
+      </para>
 
-   </sect2>
+    </sect2>
 
 
-  <sect2 id="s2-packaged-help">
-   <title>Manufacturer Documentation</title>
+    <sect2 id="s2-packaged-help">
+      <title>Manufacturer Documentation</title>
 
-    <para>
-	The software packages provided by the &FP; include the documentation
-	provided by the original developers of the software.   Where
-	developers have provided a large quantity of extra documentation for their
-	product, the &FP; supplies this documentation in a separate package to
-	the software itself.  The developers of the software use the file formats
-	that they consider appropriate, and commonly provide a combination of
-	HTML, PDF and plain-text files, as well as <command>man</command> pages.
-    </para>
+      <para>
+	The software packages provided by the &FP; include the
+	documentation provided by the original developers of the
+	software.   Where developers have provided a large quantity of
+	extra documentation for their product, the &FP; supplies this
+	documentation in a separate package to the software itself.  The
+	developers of the software use the file formats that they
+	consider appropriate, and commonly provide a combination of
+	HTML, PDF and plain-text files, as well as
+	<command>man</command> pages.
+      </para>
 
-    <para>
-	When you install an RPM package containing documentation, a directory
-	with the same name as the package is created in
-	<filename>/usr/share/doc/</filename> to hold the files.  For example,
-	the name of the package for Samba 3.0.8 is
-	<filename>samba-3.0.8-0.pre1.i386.rpm</filename>, and it will place the
-	documentation from the Samba Team in the directory
+      <para>
+	When you install an RPM package containing documentation, a
+	directory with the same name as the package is created in
+	<filename>/usr/share/doc/</filename> to hold the files.  For
+	example, the name of the package for Samba 3.0.8 is
+	<filename>samba-3.0.8-0.pre1.i386.rpm</filename>, and it will
+	place the documentation from the Samba Team in the directory
 	<filename>/usr/share/doc/samba-3.0.8/</filename> when installed.
-    </para>
+      </para>
 
-    <para>
+      <para>
 	The Apache Web server is an exception, and uses the directory
-	<filename>/var/www/manual/</filename> to store the main manual, which is
-	written in HTML.  This enables you to access the manual through the
-	server itself by opening the virtual directory
-	<filename>/manual/</filename>.  For example, you could read the manual
-	on the server <wordasword>myserver.mydomain.com</wordasword> by entering
-	the URL <wordasword>http://myserver.mydomain.com/manual/</wordasword> in
+	<filename>/var/www/manual/</filename> to store the main manual,
+	which is written in HTML.  This enables you to access the manual
+	through the server itself by opening the virtual directory
+	<filename>/manual/</filename>.  For example, you could read the
+	manual on the server
+	<wordasword>myserver.mydomain.com</wordasword> by entering the
+	URL
+	<wordasword>http://myserver.mydomain.com/manual/</wordasword> in
 	your Web browser.
-    </para>
+      </para>
 
-  </sect2>
+    </sect2>
 
 
-  <sect2 id="s2-online-help">
-    <title>Help on the Web</title>
+    <sect2 id="s2-online-help">
+      <title>Help on the Web</title>
 
-     <para>
-	The official documentation for &FC; is available from the &FP; Website:
-     </para>
+      <para>
+	The official documentation for &FC; is available from the &FP;
+	Website:
+      </para>
 
-     <para>
-	 <ulink url="http://fedora.redhat.com/docs/">http://fedora.redhat.com/docs/</ulink>
-     </para>
+      <para>
+	<ulink
+	  url="http://fedora.redhat.com/docs/">http://fedora.redhat.com/docs/</ulink>
+      </para>
 
-     <para>
-	The &FED; community provides support through mailing lists and Web forums.
-     </para>
+      <para>
+	The &FED; community provides support through mailing lists and
+	Web forums.
+      </para>
 
-     <para>
+      <para>
 	The Website for the official forums is:
       </para>
 
-     <para>
-	 <ulink url="http://forums.fedoraforum.org/">http://forums.fedoraforum.org/</ulink>
-     </para>
-
-     <para>
-	Many other organisations and individuals also provide tutorials and
-	HOWTOs for &FED; on their Websites.  You can locate information on any
-	topic by querying the Linux search facility provided by Google:
-     </para>
-
-     <para>
-	 <ulink url="http://www.google.com/linux/">http://www.google.com/linux/</ulink>
-     </para>
+      <para>
+	<ulink
+	  url="http://forums.fedoraforum.org/">http://forums.fedoraforum.org/</ulink>
+      </para>
 
-  </sect2>
+      <para>
+	Many other organisations and individuals also provide tutorials
+	and HOWTOs for &FED; on their Websites.  You can locate
+	information on any topic by querying the Linux search facility
+	provided by Google:
+      </para>
 
- </sect1>
+      <para>
+	<ulink
+	  url="http://www.google.com/linux/">http://www.google.com/linux/</ulink>
+      </para>
+
+    </sect2>
+
+  </sect1>
 
 
 </chapter>


Index: fedora-install-guide-other-instmethods-en.xml
===================================================================
RCS file: /cvs/docs/fedora-docs/install-guide/fedora-install-guide-other-instmethods-en.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-install-guide-other-instmethods-en.xml	2 May 2005 22:24:28 -0000	1.2
+++ fedora-install-guide-other-instmethods-en.xml	3 May 2005 12:19:44 -0000	1.3
@@ -3,204 +3,213 @@
 <chapter id="ch-other-install-methods">
   <title>Other Installation Methods</title>
 
-    <para>
-	If you have booted from removable media or PXE then you will see some
-	additional screens.  The first of these screens enables you to specify
-	where the main installation program and packages are held.  This screen
-	will also appear if you started the boot process with the
-	<userinput>linux askmethod</userinput> option.
-    </para>
+  <para>
+    If you have booted from removable media or PXE then you will see
+    some additional screens.  The first of these screens enables you to
+    specify where the main installation program and packages are held.
+    This screen will also appear if you started the boot process with
+    the <userinput>linux askmethod</userinput> option.
+  </para>
 
-    <figure id="fig-install-method">
-     <title>Installation Method Screen</title>
-      <mediaobject>
-       <imageobject>
+  <figure id="fig-install-method">
+    <title>Installation Method Screen</title>
+    <mediaobject>
+      <imageobject>
         <imagedata fileref="./figs/install-method.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
+      </imageobject>
+      <imageobject>
         <imagedata fileref="./figs/install-method.png" format="PNG"/>
-       </imageobject>
-       <textobject>
+      </imageobject>
+      <textobject>
         <para>
-         Installation method screen.
+	  Installation method screen.
         </para>
-       </textobject>
-      </mediaobject>
-    </figure>
+      </textobject>
+    </mediaobject>
+  </figure>
 
   <para>
-	Highlight the appropriate installation method on the list, and select
-	<guibutton>OK</guibutton>.
+    Highlight the appropriate installation method on the list, and
+    select <guibutton>OK</guibutton>.
   </para>
 
   <note>
-  <title>Discs override manual selection</title>
-   <para>
-	If a &FED; disc is detected in the drive of your computer then it will
-	automatically be used to perform the installation.  This will override
-	any installation method that you configure manually.
-   </para>
+    <title>Discs override manual selection</title>
+    <para>
+      If a &FED; disc is detected in the drive of your computer then it
+      will automatically be used to perform the installation.  This will
+      override any installation method that you configure manually.
+    </para>
   </note>
 
 
   <sect1 id="s1-install-method-server">
-   <title>Installing from a Network Server with FTP, HTTP or NFS</title>
+    <title>Installing from a Network Server with FTP, HTTP or
+      NFS</title>
 
     <para>
-	These installation methods require a server to be configured first.
-	Setting up an installation server is detailed in a separate tutorial.
+      These installation methods require a server to be configured
+      first. Setting up an installation server is detailed in a separate
+      tutorial.
     </para>
 
 
-<sect2 id="s2-installer-tcpip">
-   <title>Configuring TCP/IP</title>
+    <sect2 id="s2-installer-tcpip">
+      <title>Configuring TCP/IP</title>
+
+      <para>
+	The default option is to use DHCP to automatically provide the
+	network settings.  If this is incorrect, click <guibutton>Use
+	  dynamic IP configuration</guibutton> to empty the checkbox and
+	fill in the settingsmanually.  Select <guibutton>OK</guibutton>
+	to move to the next screen.
+      </para>
+
+      <figure id="fig-inst-ipsetup">
+	<title>Configure TCP/IP Screen</title>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="./figs/inst-ipsetup.eps" format="EPS"/>
+	  </imageobject>
+	  <imageobject>
+	    <imagedata fileref="./figs/inst-ipsetup.png" format="PNG"/>
+	  </imageobject>
+	  <textobject>
+	    <para>
+	      TCP/IP configuration screen.
+	    </para>
+	  </textobject>
+	</mediaobject>
+      </figure>
+
+      <para>
+	This settings on this screen only apply during the installation
+	process. You configure the network settings for the final system
+	on a later screen.
+      </para>
 
-  <para>
-	The default option is to use DHCP to automatically provide the network
-	settings.  If this is incorrect, click <guibutton>Use dynamic IP
-	configuration</guibutton> to empty the checkbox and fill in the
-	settingsmanually.  Select <guibutton>OK</guibutton> to move to the next screen.
-  </para>
+    </sect2>
 
-    <figure id="fig-inst-ipsetup">
-     <title>Configure TCP/IP Screen</title>
-      <mediaobject>
-       <imageobject>
-        <imagedata fileref="./figs/inst-ipsetup.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
-        <imagedata fileref="./figs/inst-ipsetup.png" format="PNG"/>
-       </imageobject>
-       <textobject>
-        <para>
-         TCP/IP configuration screen.
-        </para>
-       </textobject>
-      </mediaobject>
-    </figure>
 
-  <para>
-	This settings on this screen only apply during the installation process.
-	You configure the network settings for the final system on a later screen.
-  </para>
+    <sect2 id="s2-installer-service-settings">
+      <title>Network Service Setup</title>
 
-  </sect2>
-
-
-  <sect2 id="s2-installer-service-settings">
-   <title>Network Service Setup</title>
-
-  <para>
+      <para>
 	The <guilabel>FTP Setup</guilabel> screen is shown below.  The
-	    <guilabel>NFS image</guilabel> and <guilabel>HTTP</guilabel> screens
-	    have the same layout, but do not have a checkbox for non-anonymous FTP.
-  </para>
+	<guilabel>NFS image</guilabel> and <guilabel>HTTP</guilabel>
+	screens have the same layout, but do not have a checkbox for
+	non-anonymous FTP.
+      </para>
+
+      <para>
+	The <guilabel>site name</guilabel> is the name or IP address of
+	the server.  The <guilabel>&FC; directory</guilabel> is the name
+	that the installation tree is shared as.  Selecting
+	<guilabel>non-anonymous FTP</guilabel> means that you will use a
+	named account with a password to access the server.
+      </para>
+
+      <figure id="fig-ftp-setup">
+	<title>FTP Setup Screen</title>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="./figs/ftp-setup.eps" format="EPS"/>
+	  </imageobject>
+	  <imageobject>
+	    <imagedata fileref="./figs/ftp-setup.png" format="PNG"/>
+	  </imageobject>
+	  <textobject>
+	    <para>
+	      FTP setup screen.
+	    </para>
+	  </textobject>
+	</mediaobject>
+      </figure>
+
+    </sect2>
+
+
+    <sect2 id="s2-installer-ftp-furthersettings">
+      <title>Further FTP Setup</title>
+
+      <para>
+	If you selected the option for non-anonymous FTP, then you will
+	be presented with this screen.  Fill in the account name and
+	password for the server, and then select
+	<guibutton>OK</guibutton> to continue.
+      </para>
+
+      <figure id="fig-ftp-setup-further">
+	<title>Further FTP Setup Screen</title>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="./figs/ftp-setup-further.eps" format="EPS"/>
+	  </imageobject>
+	  <imageobject>
+	    <imagedata fileref="./figs/ftp-setup-further.png" format="PNG"/>
+	  </imageobject>
+	  <textobject>
+	    <para>
+	      Further FTP setup screen.
+	    </para>
+	  </textobject>
+	</mediaobject>
+      </figure>
 
-  <para>
-	The <guilabel>site name</guilabel> is the name or IP address of the
-	server.  The <guilabel>&FC; directory</guilabel> is the name that the
-	installation tree is shared as.  Selecting <guilabel>non-anonymous
-	FTP</guilabel> means that you will use a named account with a password
-	to access the server.
-  </para>
-
-    <figure id="fig-ftp-setup">
-     <title>FTP Setup Screen</title>
-      <mediaobject>
-       <imageobject>
-        <imagedata fileref="./figs/ftp-setup.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
-        <imagedata fileref="./figs/ftp-setup.png" format="PNG"/>
-       </imageobject>
-       <textobject>
-        <para>
-         FTP setup screen.
-        </para>
-       </textobject>
-      </mediaobject>
-    </figure>
-
-  </sect2>
-
-
-  <sect2 id="s2-installer-ftp-furthersettings">
-   <title>Further FTP Setup</title>
-
-  <para>
-	If you selected the option for non-anonymous FTP, then you will be
-	presented with this screen.  Fill in the account name and password for
-	the server, and then select <guibutton>OK</guibutton> to continue.
-  </para>
-
-    <figure id="fig-ftp-setup-further">
-     <title>Further FTP Setup Screen</title>
-      <mediaobject>
-       <imageobject>
-        <imagedata fileref="./figs/ftp-setup-further.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
-        <imagedata fileref="./figs/ftp-setup-further.png" format="PNG"/>
-       </imageobject>
-       <textobject>
-        <para>
-         Further FTP setup screen.
-        </para>
-       </textobject>
-      </mediaobject>
-    </figure>
-
-  </sect2>
+    </sect2>
 
   </sect1>
 
 
   <sect1 id="s1-installing-from-harddrive">
-   <title>Installing from a Hard Drive</title>
+    <title>Installing from a Hard Drive</title>
 
     <para>
-	You will need a hard drive containing the ISO image files for the &FED;
-	discs.  The hard drive can be either internal to the computer, or
-	attached by USB.  The partition on the hard drive holding the ISO files
-	must be formatted with either ext2, ext3 or the FAT file system.
-	External hard drives are supplied formatted as FAT.
+      You will need a hard drive containing the ISO image files for the
+      &FED; discs.  The hard drive can be either internal to the
+      computer, or attached by USB.  The partition on the hard drive
+      holding the ISO files must be formatted with either ext2, ext3 or
+      the FAT file system. External hard drives are supplied formatted
+      as FAT.
     </para>
 
     <para>
-	If you chose the option to install from a hard drive, this screen will appear:
+      If you chose the option to install from a hard drive, this screen
+      will appear:
     </para>
 
     <figure id="fig-hdd-instmethod">
-     <title>Select Partition Screen</title>
+      <title>Select Partition Screen</title>
       <mediaobject>
-       <imageobject>
-        <imagedata fileref="./figs/hdd-instmethod.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
-        <imagedata fileref="./figs/hdd-instmethod.png" format="PNG"/>
-       </imageobject>
-       <textobject>
-        <para>
-         Select partition screen.
-        </para>
-       </textobject>
+	<imageobject>
+	  <imagedata fileref="./figs/hdd-instmethod.eps" format="EPS"/>
+	</imageobject>
+	<imageobject>
+	  <imagedata fileref="./figs/hdd-instmethod.png" format="PNG"/>
+	</imageobject>
+	<textobject>
+	  <para>
+	    Select partition screen.
+	  </para>
+	</textobject>
       </mediaobject>
     </figure>
 
     <para>
-	Select the partition containing the ISO files from the list of available
-	partitions.  Each drive is assigned a unique letter.  Each partition on
-	a drive is numbered sequentially.  Internal IDE drives are prefixed
-	with <filename>/dev/hd</filename>.  SCSI or USB drives are prefixed with
-	<filename>/dev/sd</filename>.
+      Select the partition containing the ISO files from the list of
+      available partitions.  Each drive is assigned a unique letter.
+      Each partition on a drive is numbered sequentially.  Internal IDE
+      drives are prefixed with <filename>/dev/hd</filename>.  SCSI or
+      USB drives are prefixed with <filename>/dev/sd</filename>.
     </para>
 
     <para>
-	You must also specify the <guilabel>Directory holding images</guilabel>.
+      You must also specify the <guilabel>Directory holding
+	images</guilabel>.
     </para>
 
     <para>
-	Select <guibutton>OK</guibutton> to continue.
+      Select <guibutton>OK</guibutton> to continue.
     </para>
 
   </sect1>


Index: fedora-install-guide-packageselection-en.xml
===================================================================
RCS file: /cvs/docs/fedora-docs/install-guide/fedora-install-guide-packageselection-en.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-install-guide-packageselection-en.xml	2 May 2005 22:24:28 -0000	1.2
+++ fedora-install-guide-packageselection-en.xml	3 May 2005 12:19:44 -0000	1.3
@@ -4,132 +4,138 @@
   <title>Eighth Step: Package Selection</title>
 
   <para>
-	The installation type that you chose earlier in the process is used to
-	select a set of software packages for your final system.  You can simply
-	accept this default set of packages, or customize it to fit your preferences.
+    The installation type that you chose earlier in the process is used
+    to select a set of software packages for your final system.  You can
+    simply accept this default set of packages, or customize it to fit
+    your preferences.
   </para>
 
   <para>
-	Package selection does not impose any restrictions after the
-	installation process has completed.  You can use the management
-	utilities supplied with &FC; to install or remove any available software
-	from the system at any time.
+    Package selection does not impose any restrictions after the
+    installation process has completed.  You can use the management
+    utilities supplied with &FC; to install or remove any available
+    software from the system at any time.
   </para>
 
 
   <sect1 id="s1-defaultpackages">
-   <title>Package Installation Defaults</title>
+    <title>Package Installation Defaults</title>
 
     <para>
-	A summary of the default package selection will be displayed for your approval.
+      A summary of the default package selection will be displayed for
+      your approval.
     </para>
 
     <figure id="fig-package-default">
-     <title>Package Installation Defaults Screen</title>
+      <title>Package Installation Defaults Screen</title>
       <mediaobject>
-       <imageobject>
-        <imagedata fileref="./figs/package-default.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
-        <imagedata fileref="./figs/package-default.png" format="PNG"/>
-       </imageobject>
-       <textobject>
-        <para>
-         Package installation defaults screen.
-        </para>
-       </textobject>
+	<imageobject>
+	  <imagedata fileref="./figs/package-default.eps" format="EPS"/>
+	</imageobject>
+	<imageobject>
+	  <imagedata fileref="./figs/package-default.png" format="PNG"/>
+	</imageobject>
+	<textobject>
+	  <para>
+	    Package installation defaults screen.
+	  </para>
+	</textobject>
       </mediaobject>
     </figure>
 
     <para>
-	To accept the default package selection, select <guilabel>Install the
-	default software packages</guilabel>.
+      To accept the default package selection, select <guilabel>Install
+	the default software packages</guilabel>.
     </para>
 
     <para>
-	To view or change the packages, select <guilabel>Customize software
-	packages to be installed</guilabel>.  This option will take you to the
-	<guilabel>Package Group Selection</guilabel> screen.
+      To view or change the packages, select <guilabel>Customize
+	software packages to be installed</guilabel>.  This option will
+      take you to the <guilabel>Package Group Selection</guilabel>
+      screen.
     </para>
 
     <para>
-	Click <guilabel>Next</guilabel> to proceed.
+      Click <guilabel>Next</guilabel> to proceed.
     </para>
 
     <para>
-	If you chose the Custom installation type then the screen for
-	<guilabel>Package Group Selection</guilabel> will automatically be shown
-	at this point instead.
+      If you chose the Custom installation type then the screen for
+      <guilabel>Package Group Selection</guilabel> will automatically be
+      shown at this point instead.
     </para>
 
   </sect1>
 
 
   <sect1 id="s1-packagegroups">
-   <title>Package Group Selection</title>
+    <title>Package Group Selection</title>
 
     <para>
-	Software is managed in groups.  Each group includes packages for a
-	particular system or function.
+      Software is managed in groups.  Each group includes packages for a
+      particular system or function.
     </para>
 
-  <para>
-	These package groups are listed under headings to increase the
-	readability of the screen:
-  </para>
+    <para>
+      These package groups are listed under headings to increase the
+      readability of the screen:
+    </para>
 
     <figure id="fig-package-selection">
-     <title>Package Group Selection Screen</title>
+      <title>Package Group Selection Screen</title>
       <mediaobject>
-       <imageobject>
-        <imagedata fileref="./figs/package-selection.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
-        <imagedata fileref="./figs/package-selection.png" format="PNG"/>
-       </imageobject>
-       <textobject>
-        <para>
-         Package group selection screen.
-        </para>
-       </textobject>
+	<imageobject>
+	  <imagedata fileref="./figs/package-selection.eps" format="EPS"/>
+	</imageobject>
+	<imageobject>
+	  <imagedata fileref="./figs/package-selection.png" format="PNG"/>
+	</imageobject>
+	<textobject>
+	  <para>
+	    Package group selection screen.
+	  </para>
+	</textobject>
       </mediaobject>
     </figure>
 
-  <para>
-	Against each group is listed the number of packages within the group
-	that will be installed, and the total number of packages in that group.
-  </para>
+    <para>
+      Against each group is listed the number of packages within the
+      group that will be installed, and the total number of packages in
+      that group.
+    </para>
 
-  <para>
-      The groups required for the installation type that you chose are ticked.
-      You can select or remove any group of packages at this point, including
-      those for the installation type.
-  </para>
+    <para>
+      The groups required for the installation type that you chose are
+      ticked. You can select or remove any group of packages at this
+      point, including those for the installation type.
+    </para>
 
-  <para>
-	No packages from a group will be installed unless the checkbox next to
-	the group is ticked. To change which packages from a selected group will
-	be installed, click the <guilabel>Details</guilabel> link next to the
-	name of the group.The <guilabel>Base Packages</guilabel> of a group will
-	automatically be installed if the group has been selected.
-	<guilabel>Optional Packages</guilabel> can be selected or deselected by
-	clicking the checkbox next to the name of the individual package.
-  </para>
+    <para>
+      No packages from a group will be installed unless the checkbox
+      next to the group is ticked. To change which packages from a
+      selected group will be installed, click the
+      <guilabel>Details</guilabel> link next to the name of the
+      group.The <guilabel>Base Packages</guilabel> of a group will
+      automatically be installed if the group has been selected.
+      <guilabel>Optional Packages</guilabel> can be selected or
+      deselected by clicking the checkbox next to the name of the
+      individual package.
+    </para>
 
     <figure id="fig-package-selection-details">
-     <title>Package Group Details Dialog</title>
+      <title>Package Group Details Dialog</title>
       <mediaobject>
-       <imageobject>
-        <imagedata fileref="./figs/package-selection-details.eps" format="EPS"/>
-       </imageobject>
-       <imageobject>
-        <imagedata fileref="./figs/package-selection-details.png" format="PNG"/>
-       </imageobject>
-       <textobject>
-        <para>
-         Package group details dialog.
-        </para>
-       </textobject>
+	<imageobject>
+	  <imagedata fileref="./figs/package-selection-details.eps" format="EPS"/>
+	</imageobject>
+	<imageobject>
+	  <imagedata fileref="./figs/package-selection-details.png" format="PNG"/>
+	</imageobject>
+	<textobject>
+	  <para>
+	    Package group details dialog.
+	  </para>
+	</textobject>
       </mediaobject>
     </figure>
 
@@ -137,60 +143,65 @@
 
 
   <sect1 id="s1-lang-packages">
-   <title>Selecting Support for Additional Languages</title>
+    <title>Selecting Support for Additional Languages</title>
 
-   <para>
+    <para>
       Your &FED; system will automatically support the language that you
-      selected at the start of the installation process.  To include support for
-      additional languages, select the packages for those languages from the
-      <guilabel>Language Support</guilabel> package group.
+      selected at the start of the installation process.  To include
+      support for additional languages, select the packages for those
+      languages from the <guilabel>Language Support</guilabel> package
+      group.
     </para>
 
     <para>
-      There is no limit to the number of languages that a &FED; system can support.
+      There is no limit to the number of languages that a &FED; system
+      can support.
     </para>
 
   </sect1>
 
 
   <sect1 id="s1-extreme-packagegroups">
-   <title>Everything or Minimal Installations</title>
+    <title>Everything or Minimal Installations</title>
 
     <para>
-	Two of the groups under the heading of <guilabel>Miscellaneous</guilabel> are
-	not compatible with the others.  For this reason, selecting either of
-	these groups will prevent you from using all of the other groups on the list.
+      Two of the groups under the heading of
+      <guilabel>Miscellaneous</guilabel> are not compatible with the
+      others.  For this reason, selecting either of these groups will
+      prevent you from using all of the other groups on the list.
     </para>
 
     <para>
-	If you select <guilabel>Everything</guilabel> then all of the packages
-	provided with &FC; will be installed.  Note that many network services
-	are not automatically enabled on installation.  This option is useful
-	for testing and development.
+      If you select <guilabel>Everything</guilabel> then all of the
+      packages provided with &FC; will be installed.  Note that many
+      network services are not automatically enabled on installation.
+      This option is useful for testing and development.
     </para>
 
     <caution>
-     <title><guilabel>Everything</guilabel> requires 7Gb of free disk space</title>
-     <para>
-      The <guilabel>Everything</guilabel> installation fills 6.9Gb of free disk
-      space, and temporarily requires an additional 175Mb of disk space during the
-      installation process.  See the Release Notes for more information about
-      storage requirements.
-     </para>
+      <title><guilabel>Everything</guilabel> requires 7Gb of free disk
+	space</title>
+      <para>
+	The <guilabel>Everything</guilabel> installation fills 6.9Gb of
+	free disk space, and temporarily requires an additional 175Mb of
+	disk space during the installation process.  See the Release
+	Notes for more information about storage requirements.
+      </para>
     </caution>
 
     <para>
-	The <guilabel>Minimal</guilabel> package group provides only the
-	essential packages to create a bootable system.  No graphical interface
-	is installed with this option.
+      The <guilabel>Minimal</guilabel> package group provides only the
+      essential packages to create a bootable system.  No graphical
+      interface is installed with this option.
     </para>
 
     <para>
-	When you are satisfied with the packages selected for installation,
-	click <guilabel>Next</guilabel>.  The installation system will then
-	check your selection and automatically resolve inconsistencies by adding
-	any other packages needed to support the software that you have chosen.
-	You will then move on to the next screen.
+      When you are satisfied with the packages selected for
+      installation, click <guilabel>Next</guilabel>.  The installation
+      system will then check your selection and automatically resolve
+      inconsistencies by adding any other packages needed to support the
+      software that you have chosen. You will then move on to the next
+      screen.
     </para>
 
   </sect1>




More information about the Fedora-docs-commits mailing list