install-guide/devel/en_US background.xml, NONE, 1.1 before-begin.xml, NONE, 1.1 hwarchitecture.xml, NONE, 1.1 preparing-media.xml, NONE, 1.1 welcome.xml, NONE, 1.1 entities.xml, 1.4, 1.5 fedora-install-guide.xml, 1.2, 1.3 intro.xml, 1.1, 1.2 locale.xml, 1.1, 1.2 networkconfig.xml, 1.1, 1.2 other-instmethods.xml, 1.1, 1.2 packageselection.xml, 1.1, 1.2 rpm-info.xml, 1.3, 1.4

Paul W. Frields (pfrields) fedora-docs-commits at redhat.com
Sun Aug 27 18:36:42 UTC 2006


Author: pfrields

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

Modified Files:
	entities.xml fedora-install-guide.xml intro.xml locale.xml 
	networkconfig.xml other-instmethods.xml packageselection.xml 
	rpm-info.xml 
Added Files:
	background.xml before-begin.xml hwarchitecture.xml 
	preparing-media.xml welcome.xml 
Log Message:
Major reorganization for better workflow


--- NEW FILE background.xml ---
<?xml version="1.0" encoding="utf-8"?>

<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [

<!ENTITY % FEDORA-ENTITIES SYSTEM "fdp-entities.ent">
%FEDORA-ENTITIES;

<!ENTITY % DOC-ENTITIES SYSTEM "entities.ent">
%DOC-ENTITIES;

]>

<chapter id="ch-background">
  <title>Background</title>

  <para>
      The &FP;, which produces and maintains &FC;, is a collaboration between
    &FORMAL-RHI; and the
      <indexterm>
      <primary>free software</primary>
      <see>FOSS</see>
      </indexterm>
      <indexterm>
      <primary>open source</primary>
      <see>FOSS</see>
      </indexterm>
      <indexterm>
      <primary>FOSS (free and open source software)</primary>
      </indexterm> <firstterm>free and open source software</firstterm> (FOSS)
    community. The &FP; also provides &FEX;, additional software packaged for
    installation on a &FC; system.
  </para>

  <para>
    For more information about the &FP;, please visit &FP-URL;. Refer to <ulink
      url="http://www.opensource.org/"/> and <ulink
      url="http://www.gnu.org/philosophy/free-sw.html"/> for more information
    about open source software.
  </para>
</chapter>


--- NEW FILE before-begin.xml ---
<?xml version="1.0" encoding="utf-8"?>

<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [

<!ENTITY % FEDORA-ENTITIES SYSTEM "fdp-entities.ent">
%FEDORA-ENTITIES;

<!ENTITY % DOC-ENTITIES SYSTEM "entities.ent">
%DOC-ENTITIES;

]>

<chapter id="ch-before-begin">
  <title>Before You Begin</title>

  <para>
    Before you install &FC;, you need access to:
  </para>

  <itemizedlist>
    <listitem>
      <para>
          boot or installation media (refer to
          <xref
	  linkend="ch-preparing-media"/> for more information)
      </para>
    </listitem>
    <listitem>
      <para>
	information about your network configuration
      </para>
    </listitem>
    <listitem>
      <para>
	a copy of this &IG; and the Release Notes for this version of &FC;
      </para>
    </listitem>
  </itemizedlist>

  <para>
    The Release Notes specify the hardware requirements for &FC; &FCLOCALVER;.
    They also provide advice on any known problems with particular hardware and
    software configurations.
  </para>

  <para>
    The Release Notes are available on the first disc in HTML and plain text
    format. The latest versions of this &IG; and the Release Notes are available
    at &FDPDOCS-URL;.
  </para>

  <section id="sn-installing-storage-configurations">
    <title>Storage</title>
<!-- SE: There may also be additional considerations when installing on machines backed by a SAN. -->
    <para>
      A &FED; system requires a minimum of 700 MB storage for a command-line
      system. A desktop system with the default applications requires at least 3
      GB of storage. You may install multiple copies of &FED; on the same
      computer.
    </para>

    <para>
      Configure any RAID functions provided by the mainboard of your computer,
      or attached controller cards, before you begin the installation process.
      &FED; can automatically detect many RAID devices and use any storage they
      provide.
    </para>
  </section>

  <section id="sn-installing-network-configurations">
    <title>Networking</title>

    <para>
        By default, &FC; systems attempt to discover correct connection settings
      for the attached network using
        <indexterm>
	<primary>DHCP (Dynamic Host Configuration Protocol)</primary>
        </indexterm> <firstterm>Dynamic Host Control Protocol</firstterm>, or
      <firstterm><acronym>DHCP</acronym></firstterm>. Your network may include a
      DHCP provider which delivers settings to other systems on demand. The DHCP
      provider may be a router or wireless access point for the network, or a
      server.
    </para>

    <para>
        In some circumstances you may need to provide information about your
      network during the installation process. Refer to
        <xref
	linkend="sn-installing-networkinstallation" /> and
        <xref
	linkend="sn-installing-managed-network" /> for more information.
    </para>

    <note>
      <title>Modem Configuration</title>

      <para>
	The installation system for &FC; does not configure modems. If your
	computer has a modem, configure the dialing settings after you complete
	the installation and reboot.
      </para>
    </note>
  </section>

  <section id="sn-installing-networkinstallation">
    <title>Installing from a Server or Web Site</title>

    <para>
      You may install &FC; using a <firstterm>mirror</firstterm>, a Web site or
      network server that provide a copy of the necessary files. To use a
      mirror, you need to know:
    </para>

    <itemizedlist>
      <listitem>
	<para>
	  the name of the server
	</para>
      </listitem>
      <listitem>
	<para>
	  the network protocol used for installation (FTP, HTTP, or NFS)
	</para>
      </listitem>
      <listitem>
	<para>
	  the path to the installation files on the server
	</para>
      </listitem>
    </itemizedlist>

    <para>
      You may install &FC; from your own private mirror, or use one of the
      public mirrors maintained by members of the community. To ensure that the
      connection is as fast and reliable as possible, use a server that is close
      to your own geographical location.
    </para>

    <para>
      The &FP; maintains a list of HTTP and FTP public mirrors, sorted by
      region, at <ulink url="http://fedora.redhat.com/download/mirrors.html"/>.
      To determine the complete directory path for the installation files, add
      <filename>/&FCLOCALVER;/<replaceable>architecture</replaceable>/os/</filename> 
      to the path shown on the web page.  If your computer uses the
      <systemitem>ppc</systemitem> architecture, for instance, add <filename
	class="directory">/&FCLOCALVER;/ppc/os/</filename> to the path shown.
    </para>
    <tip>
      <title>Building Your Own Mirror</title>
      <para>
	Refer to <ulink url="http://fedora.redhat.com/docs/mirror/"/> for
	information on how to create your own &FED; mirror for either public or
	private use.
      </para>
    </tip>
    <para>
        To use a mirror, boot your computer with &FED; boot media, and follow
      the instructions in
        <xref linkend="ch-other-install-methods"/>. Refer to
        <xref
	linkend="ch-preparing-media"/> for more information on creating the boot
      media.
    </para>

    <note>
      <title>Using the Installation Discs</title>

      <para>
	If you boot your computer with either an installation DVD, or the first
	installation CD, enter <userinput>linux askmethod</userinput> at the
	<prompt>boot:</prompt> prompt to access the server installation options.
      </para>
    </note>

    <para>
      If your network includes a server, you may also use
      <firstterm>PXE</firstterm> (Pre-boot eXecution Environment) to boot your
      computer. PXE (also referred to as <firstterm>netboot</firstterm>) is a
      standard that enables PCs to use files on a server as a boot device. &FC;
      includes utilities that allow it to function as a PXE server for other
      computers. You can use this option to install &FC; on a PXE-enabled
      computer entirely over the network connection, using no physical media at
      all.
    </para>
  </section>

  <section id="sn-installing-managed-network">
    <title>Installing &FC; on a Managed Network</title>

    <para>
      Some corporate networks include a <firstterm>directory service</firstterm>
      that manages user accounts for the organization. &FC; systems can join a
      Kerberos, NIS, Hesiod, or <trademark
	class="registered">Microsoft</trademark> <trademark
	class="registered">Windows</trademark> domain as part of the
      installation process. &FC; can also use LDAP directories.
    </para>

<!--
	
	<para>
	  The process of configuring your &FC; system to use network
	  authentication services is explained in a separate tutorial.
	</para>

	[When this tutorial exists, remove these comments.]

-->

    <caution>
      <title>Consult Network Administrators</title>

      <para>
	Always consult the administrators before you install a &FC; system on an
	existing network owned by someone besides yourself. They can provide
	correct network and authentication settings, and guidance on specific
	organizational policies and requirements.
      </para>
    </caution>
  </section>
</chapter>


--- NEW FILE hwarchitecture.xml ---
<?xml version="1.0" encoding="utf-8"?>

<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [

<!ENTITY % FEDORA-ENTITIES SYSTEM "fdp-entities.ent">
%FEDORA-ENTITIES;

<!ENTITY % DOC-ENTITIES SYSTEM "entities.ent">
%DOC-ENTITIES;

]>

<chapter id="ch-hwarchitecture">
  <title>Understanding i386 and Other Computer Architectures</title>

  <para>
    The &FP; provides distributions of &FC; for several different types of
    computer systems.  Each distribution of &FC; is built for computers based on
    a specific <firstterm>architecture</firstterm>. The architecture describes
    the processor on which the computer is built.  Most computers come with
    identifying marks and literature describing the processor inside the
    computer.  Refer to your computer's marks or literature and find its
    architecture in the list below:
  </para>

  <variablelist>
    <varlistentry>
      <term>i386</term>
      <listitem>
	<para>
	  Intel x86-compatible processors, including Intel Pentium and
	  Pentium-MMX, Pentium Pro, Pentium-II, Pentium-III, Celeron, Pentium 4,
	  Xeon, Core Duo, and Centrino/Centrino Duo; VIA C3/C3-m and
	  Eden/Eden-N; and AMD Athlon, AthlonXP, Duron, AthlonMP, Sempron, and
	  Turion
	</para>
      </listitem>
    </varlistentry>

    <varlistentry>
      <term>ppc</term>
      <listitem>
	<para>
	  PowerPC processors, such as those found in Apple Power Macintosh, G3,
	  G4, and G5, and IBM pSeries systems
	</para>
      </listitem>
    </varlistentry>

    <varlistentry>
      <term>x86_64</term>
      <listitem>
	<para>
	  64-bit AMD processors such as Athlon64/FX/X2, Turion64, Opteron; and
	  Intel 64-bit processors such as EM64T
	</para>
      </listitem>
    </varlistentry>
  </variablelist>
</chapter>


--- NEW FILE preparing-media.xml ---
<?xml version="1.0" encoding="utf-8"?>

<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [

<!ENTITY % FEDORA-ENTITIES SYSTEM "fdp-entities.ent">
%FEDORA-ENTITIES;

<!ENTITY % DOC-ENTITIES SYSTEM "entities.ent">
%DOC-ENTITIES;

]>

<chapter id="ch-preparing-media">
  <title>Preparing Media</title>

  <para>
    To install &FC; from discs, you need five installation CDs, or the
    installation DVD. There are separate disc sets for each supported
    architecture.
  </para>

  <para>
      For instructions to download and prepare this CD or DVD installation
    media, refer to <ulink url="http://fedora.redhat.com/download/"/>. If you
    already have the full set of &FC; installation media, skip to
      <xref
      linkend="sn-booting-from-disc"/>.
  </para>

  <important>
    <title>Architecture-Specific Distributions</title>

    <para>
        To install &FC;, you must use the boot and installation media that is
      particular to your architecture.  Refer to <xref
        linkend="ch-hwarchitecture"/> for information on hardware architectures
      and how to determine the right one for your computer.
    </para>
  </important>

  <para>
    You may use the first CD or DVD installation disc from the complete &FC;
    distribution to boot your computer. The &FC; distribution also includes
    <firstterm>image files</firstterm> for boot-only CD or DVD media and USB
    media.  You can convert these files into bootable media using standard Linux
    utilities or third-party programs on other operating systems.
  </para>

  <para>
    You may boot your computer with boot-only media, and load the installation
    system from another source to continue the process. The types of
    installation source for &FED; include:
  </para>

  <itemizedlist>
    <listitem>
      <para>
	CD or DVD media installation discs
      </para>
    </listitem>
    <listitem>
      <para>
	hard drive, either attached by USB, or internal to the computer
      </para>
    </listitem>
    <listitem>
      <para>
	network installation server, using either HTTP, FTP, or NFS
      </para>
    </listitem>
  </itemizedlist>

  <para>
    You can use this facility to install &FC; on machines without using
    installation discs. For example, you may install &FC; on a laptop with no CD
    or DVD drive by booting the machine with a USB pen drive, and then using a
    hard drive as an installation source.
  </para>

  <para>
    The supported boot media for &FED; include:
  </para>

  <itemizedlist>
    <listitem>
      <para>
	CD or DVD media (either installation disc #1 or a special boot-only
	disc)
      </para>
    </listitem>
    <listitem>
      <para>
	USB media
      </para>
    </listitem>
    <listitem>
      <para>
	network interface (via PXE)
      </para>
    </listitem>
  </itemizedlist>

  <note>
    <title>Installation from Diskettes</title>

    <para>
      There is no option to either boot or install &FC; from diskettes.
    </para>
  </note>

  <section id="sn-preparing-cd-or-dvd-media">
    <title>Preparing CD or DVD Media</title>

    <para>
      The <filename>images/boot.iso</filename> file on the first &FC;
      installation disc is a boot image designed for CD and DVD media. This file
      also appears on FTP and Web sites providing &FC;. You can also find this
      file on mirror sites in the &FC; distribution directory for your
      particular architecture.
    </para>

    <para>
      The &FC; distribution is also downloadable as a set of CD-sized ISO image
      files or a single DVD-sized ISO image file. You can record these files to
      CD or DVD using a CD or DVD burning program on your current operating
      system:
    </para>

    <variablelist>
      <varlistentry>
	<term>Windows operating systems</term>
	<listitem>
	  <para>
	    Burn an ISO image to disc using your installed CD or DVD burning
	    software. Most software has an option labeled <guilabel>Burn image
	      file to disc</guilabel> or <guilabel>Make disc from ISO
	      image</guilabel>. If your software offers a choice of image
	    formats, choose "ISO image" as the file type. If several ISO formats
	    are offered, choose the closest match to "Mode 1, 2048-byte blocks."
	  </para>
	</listitem>
      </varlistentry>

      <varlistentry>
	<term>Apple MacOS X</term>
	<listitem>
	  <para>
              Open the <guilabel>Disk Copy</guilabel> application, found in the
	    <filename>/Applications/Utilities</filename> folder. From the menu,
	    select <menuchoice>
	      <guimenu>Image</guimenu> <guimenuitem>Burn Image...</guimenuitem>
	    </menuchoice>. Select the CD image to burn, check that the burn
	    options are correct, and select the <guilabel>Burn</guilabel>
	    button.
	  </para>
	</listitem>
      </varlistentry>

      <varlistentry>
	<term>Linux operating systems</term>
	<listitem>
	  <para>
              If you are using a recent version of the GNOME desktop
	    environment, right-click the ISO image file and choose
	    <guilabel>Write to disc</guilabel>. If you are using a recent
	    version of the KDE desktop environment, use
	    <application>K3B</application> and select <menuchoice>
	      <guimenu>Tools</guimenu> <guimenuitem>Burn CD Image</guimenuitem>
	    </menuchoice>, or <menuchoice>
	      <guimenu>Tools</guimenu> <guimenuitem>Burn DVD ISO
		Image</guimenuitem> </menuchoice> if appropriate. The following
	    command line works for many other environments:
	  </para>
	  <screen>
	    <userinput>cdrecord
	      --device=<replaceable>cdwriter-device</replaceable> -tao -eject
	      <replaceable>image-file.iso</replaceable></userinput>
	  </screen>
	</listitem>
      </varlistentry>
    </variablelist>

    <note>
      <title>System-Specific Instructions</title>

      <para>
          Unfortunately this guide cannot offer specific instructions for every
	possible combination of hardware and software.  You can find more
	information at <ulink
	  url="http://fedoraproject.org/wiki/Docs/Drafts/BurningDiscs"/>.
	Consult your operating system's documentation and online support
	services, and <xref linkend="sn-web-help"/> for additional help if
	needed.
      </para>
    </note>
  </section>

  <section id="sn-preparing-usb-media">
    <title>Preparing USB Boot Media</title>

    <warning>
      <title>Data Loss</title>

      <para>
	<emphasis>This procedure destroys data on the media.</emphasis> Back up
	any important information before you begin. Some models of USB media use
	additional partitions or software to provide functions such as
	encryption. This procedure may make it difficult or impossible to access
	these special areas on your boot media.
      </para>
    </warning>

    <para>
      The <filename>images/diskboot.img</filename> file on the first &FC;
      installation disc is a boot image designed for USB media. This file also
      appears on FTP and Web sites providing &FC;.
    </para>

    <para>
      Several software utilities are available for Windows and Linux that can
      write image files to a device. Linux includes the <command>dd</command>
      command for this purpose.
    </para>

    <para>
      The <command>dd</command> utility requires you to specify the device file
      that corresponds to the physical media. The name of the device file
      matches the name assigned to the device by your system. All device files
      appear in the directory <filename>/dev/</filename>. For example,
      <filename>/dev/sda</filename> denotes the first USB or SCSI device that is
      attached to the system.
    </para>

    <para>
      To learn the name that your system assigns to the media:
    </para>
    <procedure>
      <step>
	<para>
            Open a terminal window. On a &FED; system, choose
	  <menuchoice><guimenu>Applications</guimenu>
	    <guisubmenu>Accessories</guisubmenu>
	    <guimenuitem>Terminal</guimenuitem> </menuchoice> to start a
	  terminal.
	</para>
      </step>
      <step>
	<para>
	  Attach or insert the media.
	</para>
      </step>
      <step>
	<para>
	  In the terminal window, type the following command:
	</para>
	<screen>
	  <userinput>dmesg</userinput>
	</screen>
	<para>
	  Look for the items in the <command>dmesg</command> output that relate
	  to the detection of a new SCSI device. Linux systems treat USB media
	  as forms of SCSI device.
	</para>
      </step>
      <step>
	<para>
	  Unmount the media. On a &FED; system, right-click the icon that
	  corresponds to the media, and select <guimenuitem>Unmount
	    Volume</guimenuitem>. Alternatively, enter this command in a
	  terminal window:
	</para>
	<screen>
	  <userinput>umount <replaceable>/dev/sda</replaceable></userinput>
	</screen>
	<para>
	  Replace <filename>/dev/sda</filename> with the name of the correct
	  device file for the media.
	</para>
      </step>
    </procedure>
    <para>
      To write an image file to boot media with <command>dd</command> on a
      current version of &FC;, carry out the following steps:
    </para>
    <procedure>
      <step>
	<para>
	  Locate the image file.
	</para>
      </step>
      <step>
	<para>
	  Attach or insert the media.
	</para>
      </step>
      <step>
	<para>
	  Your system may automatically detect and open the media. If that
	  happens, close or unmount the media before continuing.
	</para>
      </step>
      <step>
	<para>
	  Open a terminal window.
	</para>
      </step>
      <step>
	<para>
	  In the terminal window, type the following command:
	</para>
	<screen>
	  <userinput>dd if=diskboot.img
	    of=<replaceable>/dev/sda</replaceable></userinput>
	</screen>
	<para>
	  Replace <filename>/dev/sda</filename> with the name of the correct
	  device file for the media.
	</para>
      </step>
    </procedure>
  </section>
</chapter>
  


--- NEW FILE welcome.xml ---
<?xml version="1.0" encoding="utf-8"?>

<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [

<!ENTITY % FEDORA-ENTITIES SYSTEM "fdp-entities.ent">
%FEDORA-ENTITIES;

<!ENTITY % DOC-ENTITIES SYSTEM "entities.ent">
%DOC-ENTITIES;

]>

<chapter id="ch-welcome">
  <title>Welcome Dialog</title>

  <para>
    After the installation program loads its next stage, the following
    dialog appears:
  </para>

  <figure id="fig-welcome">
    <title>Welcome Screen</title>
    <mediaobject>
      <imageobject>
	<imagedata align="center" fileref="./figs/welcome.eps"
	  format="EPS"/>
      </imageobject>
      <imageobject>
	<imagedata align="center" fileref="./figs/welcome.png"
	  format="PNG"/>
      </imageobject>
      <textobject>
	<phrase>Welcome dialog.</phrase>
      </textobject>
    </mediaobject>
  </figure>

  <note>
    <title>Installation Screens May Differ</title>
    <para>
      The installation program may continue in text mode if:
    </para>
    <itemizedlist>
      <listitem>
	<para>your computer has 128 MB of memory or less</para>
      </listitem>
      <listitem>
	<para>you booted with the <option>text</option> option</para>
      </listitem>
    </itemizedlist>
    <para>
      The screens shown in the following chapters are based on a default
      graphical installation.  However, most functions are similar
      regardless of the installation mode.
    </para>
  </note>
  <para>
    Select <guilabel>Next</guilabel> to continue.
  </para>
</chapter>

<!--
Local variables:
mode: xml
fill-column: 72
End:
-->



Index: entities.xml
===================================================================
RCS file: /cvs/docs/install-guide/devel/en_US/entities.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- entities.xml	20 Aug 2006 21:12:59 -0000	1.4
+++ entities.xml	27 Aug 2006 18:36:39 -0000	1.5
@@ -14,11 +14,11 @@
     </entity>
     <entity name="DOCVERSION">
       <comment>Document version</comment>
-      <text>1.33</text>
+      <text>1.34</text>
     </entity>
     <entity name="DOCDATE">
       <comment>Document date</comment>
-      <text>2006-08-20</text>
+      <text>2006-08-27</text>
     </entity>
     <entity name="DOCID">
       <comment>Document ID string</comment>


Index: fedora-install-guide.xml
===================================================================
RCS file: /cvs/docs/install-guide/devel/en_US/fedora-install-guide.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-install-guide.xml	21 Aug 2006 12:05:30 -0000	1.2
+++ fedora-install-guide.xml	27 Aug 2006 18:36:39 -0000	1.3
@@ -16,11 +16,21 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="./intro.xml" xpointer="element(ch-intro)"
   xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="./background.xml" xpointer="element(ch-background)"
+  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="./hwarchitecture.xml" xpointer="element(ch-hwarchitecture)"
+  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="./before-begin.xml" xpointer="element(ch-before-begin)"
+  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="./preparing-media.xml" xpointer="element(ch-preparing-media)"
+  xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="./beginninginstallation.xml" xpointer="element(ch-beginninginstallation)"
   xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="./locale.xml" xpointer="element(ch-installer-locale)"
+  xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="./other-instmethods.xml" xpointer="element(ch-other-install-methods)"
   xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="./locale.xml" xpointer="element(ch-installer-locale)"
+  <xi:include href="./welcome.xml" xpointer="element(ch-welcome)"
   xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="./upgrading.xml" xpointer="element(ch-upgrading-system)"
   xmlns:xi="http://www.w3.org/2001/XInclude"/>


Index: intro.xml
===================================================================
RCS file: /cvs/docs/install-guide/devel/en_US/intro.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- intro.xml	21 Aug 2006 12:05:30 -0000	1.1
+++ intro.xml	27 Aug 2006 18:36:39 -0000	1.2
@@ -43,622 +43,6 @@
 
   &BUG-REPORTING;
 
-  <section id="sn-background">
-    <title>Background</title>
-
-    <para>
-      The &FP;, which produces and maintains &FC;, is a collaboration
-      between &FORMAL-RHI; and the
-      <indexterm>
-        <primary>free software</primary>
-        <see>FOSS</see>
-      </indexterm>
-      <indexterm>
-        <primary>open source</primary>
-        <see>FOSS</see>
-      </indexterm>
-      <indexterm>
-        <primary>FOSS (free and open source software)</primary>
-      </indexterm>
-      <firstterm>free and open source software</firstterm> (FOSS)
-      community. The &FP; also provides &FEX;, additional software
-      packaged for installation on a &FC; system.
-    </para>
-
-    <para>
-      For more information about the &FP;, please visit &FP-URL;. Refer
-      to <ulink url="http://www.opensource.org/"/> and <ulink
-	url="http://www.gnu.org/philosophy/free-sw.html"/> for more
-      information about open source software.
-    </para>
-  </section>
-  <section id="sn-hwarchitecture">
-    <title>Understanding i386 and Other Computer Architectures</title>
-
-    <para>
-      The &FP; provides distributions of &FC; for several different
-      types of computer systems.  Each distribution of &FC; is built for
-      computers based on a specific <firstterm>architecture</firstterm>.
-      The architecture describes the processor on which the computer is
-      built.  Most computers come with identifying marks and literature
-      describing the processor inside the computer.  Refer to your
-      computer's marks or literature and find its architecture in the
-      list below:
-    </para>
-
-    <variablelist>
-      <varlistentry>
-        <term>i386</term>
-        <listitem>
-          <para>
-            Intel x86-compatible processors, including Intel Pentium and
-	    Pentium-MMX, Pentium Pro, Pentium-II, Pentium-III, Celeron,
-	    Pentium 4, Xeon, Core Duo, and Centrino/Centrino Duo; VIA
-	    C3/C3-m and Eden/Eden-N; and AMD Athlon, AthlonXP, Duron,
-	    AthlonMP, Sempron, and Turion
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>ppc</term>
-        <listitem>
-          <para>
-            PowerPC processors, such as those found in Apple Power
-            Macintosh, G3, G4, and G5, and IBM pSeries systems
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>x86_64</term>
-        <listitem>
-          <para>
-            64-bit AMD processors such as Athlon64/FX/X2, Turion64,
-	    Opteron; and Intel 64-bit processors such as EM64T
-          </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </section>
-  <section id="sn-before-begin">
-    <title>Before You Begin</title>
-
-    <para>
-      Before you install &FC;, you need access to:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          boot or installation media (refer to
-          <xref
-	  linkend="sn-preparing-media"/> for more information)
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          information about your network configuration
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          a copy of this &IG; and the Release Notes for this version of
-          &FC;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      The Release Notes specify the hardware requirements for &FC;
-      &FCLOCALVER;. They also provide advice on any known problems with
-      particular hardware and software configurations.
-    </para>
-
-    <para>
-      The Release Notes are available on the first disc in HTML and
-      plain text format. The latest versions of this &IG; and the
-      Release Notes are available at &FDPDOCS-URL;.
-    </para>
-
-    <section id="sn-installing-storage-configurations">
-      <title>Storage</title>
-<!-- SE: There may also be additional considerations when installing on machines backed by a SAN. -->
-      <para>
-        A &FED; system requires a minimum of 700 MB storage for a
-        command-line system. A desktop system with the default
-        applications requires at least 3 GB of storage. You may install
-        multiple copies of &FED; on the same computer.
-      </para>
-
-      <para>
-        Configure any RAID functions provided by the mainboard of your
-        computer, or attached controller cards, before you begin the
-        installation process. &FED; can automatically detect many RAID
-        devices and use any storage they provide.
-      </para>
-    </section>
-
-    <section id="sn-installing-network-configurations">
-      <title>Networking</title>
-
-      <para>
-        By default, &FC; systems attempt to discover correct connection
-	settings for the attached network using
-        <indexterm>
-          <primary>DHCP (Dynamic Host Configuration Protocol)</primary>
-        </indexterm> <firstterm>Dynamic Host Control
-	  Protocol</firstterm>, or
-	<firstterm><acronym>DHCP</acronym></firstterm>. Your network may
-	include a DHCP provider which delivers settings to other systems
-	on demand. The DHCP provider may be a router or wireless access
-	point for the network, or a server.
-      </para>
-
-      <para>
-        In some circumstances you may need to provide information about
-        your network during the installation process. Refer to
-        <xref
-	linkend="sn-installing-networkinstallation" /> and
-        <xref
-	linkend="sn-installing-managed-network" /> for more
-        information.
-      </para>
-
-      <note>
-        <title>Modem Configuration</title>
-
-        <para>
-          The installation system for &FC; does not configure modems. If
-          your computer has a modem, configure the dialing settings
-          after you complete the installation and reboot.
-        </para>
-      </note>
-    </section>
-
-    <section id="sn-installing-networkinstallation">
-      <title>Installing from a Server or Web Site</title>
-
-      <para>
-        You may install &FC; using a <firstterm>mirror</firstterm>, a
-        Web site or network server that provide a copy of the necessary
-        files. To use a mirror, you need to know:
-      </para>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            the name of the server
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            the network protocol used for installation (FTP, HTTP, or
-            NFS)
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            the path to the installation files on the server
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para>
-        You may install &FC; from your own private mirror, or use one of
-        the public mirrors maintained by members of the community. To
-        ensure that the connection is as fast and reliable as possible,
-        use a server that is close to your own geographical location.
-      </para>
-
-      <para>
-        The &FP; maintains a list of HTTP and FTP public mirrors, sorted
-	by region, at <ulink
-	  url="http://fedora.redhat.com/download/mirrors.html"/>. To
-	determine the complete directory path for the installation
-	files, add
-	<filename>/&FCLOCALVER;/<replaceable>architecture</replaceable>/os/</filename> 
-	to the path shown on the web page.  If your computer uses the
-	<systemitem>ppc</systemitem> architecture, for instance, add
-	<filename class="directory">/&FCLOCALVER;/ppc/os/</filename> to
-	the path shown.
-      </para>
-      <tip>
-        <title>Building Your Own Mirror</title>
-        <para>
-          Refer to <ulink url="http://fedora.redhat.com/docs/mirror/"/>
-          for information on how to create your own &FED; mirror for
-          either public or private use.
-        </para>
-      </tip>
-      <para>
-        To use a mirror, boot your computer with &FED; boot media, and
-        follow the instructions in
-        <xref linkend="ch-other-install-methods"/>. Refer to
-        <xref
-	linkend="sn-preparing-media"/> for more information on
-        creating the boot media.
-      </para>
-
-      <note>
-        <title>Using the Installation Discs</title>
-
-        <para>
-          If you boot your computer with either an installation DVD, or
-          the first installation CD, enter <userinput>linux
-          askmethod</userinput> at the
-          <prompt>boot:</prompt>
-          prompt to access the server installation options.
-        </para>
-      </note>
-
-      <para>
-        If your network includes a server, you may also use
-        <firstterm>PXE</firstterm> (Pre-boot eXecution Environment) to
-        boot your computer. PXE (also referred to as
-        <firstterm>netboot</firstterm>) is a standard that enables PCs
-        to use files on a server as a boot device. &FC; includes
-        utilities that allow it to function as a PXE server for other
-        computers. You can use this option to install &FC; on a
-        PXE-enabled computer entirely over the network connection, using
-        no physical media at all.
-      </para>
-    </section>
-
-    <section id="sn-installing-managed-network">
-      <title>Installing &FC; on a Managed Network</title>
-
-      <para>
-        Some corporate networks include a <firstterm>directory
-        service</firstterm> that manages user accounts for the
-        organization. &FC; systems can join a Kerberos, NIS, Hesiod, or
-        <trademark class="registered">Microsoft</trademark>
-        <trademark
-	  class="registered">Windows</trademark> domain as
-        part of the installation process. &FC; can also use LDAP
-        directories.
-      </para>
-
-<!--
-	
-	<para>
-	  The process of configuring your &FC; system to use network
-	  authentication services is explained in a separate tutorial.
-	</para>
-
-	[When this tutorial exists, remove these comments.]
-
--->
-
-      <caution>
-        <title>Consult Network Administrators</title>
-
-        <para>
-          Always consult the administrators before you install a &FC;
-	  system on an existing network owned by someone besides
-	  yourself. They can provide correct network and authentication
-	  settings, and guidance on specific organizational policies and
-	  requirements.
-        </para>
-      </caution>
-    </section>
-  </section>
-  <section id="sn-preparing-media">
-    <title>Preparing Media</title>
-
-    <para>
-      To install &FC; from discs, you need five installation CDs, or the
-      installation DVD. There are separate disc sets for each supported
-      architecture.
-    </para>
-
-    <para>
-      For instructions to download and prepare this CD or DVD
-      installation media, refer to
-      <ulink url="http://fedora.redhat.com/download/"/>. If you already
-      have the full set of &FC; installation media, skip to
-      <xref
-      linkend="sn-booting-from-disc"/>.
-    </para>
-
-    <important>
-      <title>Architecture-Specific Distributions</title>
-
-      <para>
-        To install &FC;, you must use the boot and installation media
-	that is particular to your architecture.  Refer to <xref
-        linkend="sn-hwarchitecture"/> for information on hardware
-	architectures and how to determine the right one for your
-	computer.
-      </para>
-    </important>
-
-    <para>
-      You may use the first CD or DVD installation disc from the
-      complete &FC; distribution to boot your computer. The &FC;
-      distribution also includes <firstterm>image files</firstterm> for
-      boot-only CD or DVD media and USB media.  You can convert these
-      files into bootable media using standard Linux utilities or
-      third-party programs on other operating systems.
-    </para>
-
-    <para>
-      You may boot your computer with boot-only media, and load the
-      installation system from another source to continue the process.
-      The types of installation source for &FED; include:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          CD or DVD media installation discs
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          hard drive, either attached by USB, or internal to the
-          computer
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          network installation server, using either HTTP, FTP, or NFS
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      You can use this facility to install &FC; on machines without
-      using installation discs. For example, you may install &FC; on a
-      laptop with no CD or DVD drive by booting the machine with a USB
-      pen drive, and then using a hard drive as an installation source.
-    </para>
-
-    <para>
-      The supported boot media for &FED; include:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          CD or DVD media (either installation disc #1 or a special
-          boot-only disc)
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          USB media
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          network interface (via PXE)
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <title>Installation from Diskettes</title>
-
-      <para>
-        There is no option to either boot or install &FC; from
-        diskettes.
-      </para>
-    </note>
-
-    <section id="sn-preparing-cd-or-dvd-media">
-      <title>Preparing CD or DVD Media</title>
-
-      <para>
-        The <filename>images/boot.iso</filename> file on the first &FC;
-        installation disc is a boot image designed for CD and DVD media.
-        This file also appears on FTP and Web sites providing &FC;. You
-        can also find this file on mirror sites in the &FC; distribution
-        directory for your particular architecture.
-      </para>
-
-      <para>
-        The &FC; distribution is also downloadable as a set of CD-sized
-        ISO image files or a single DVD-sized ISO image file. You can
-        record these files to CD or DVD using a CD or DVD burning
-        program on your current operating system:
-      </para>
-
-      <variablelist>
-        <varlistentry>
-          <term>Windows operating systems</term>
-          <listitem>
-            <para>
-              Burn an ISO image to disc using your installed CD or DVD
-              burning software. Most software has an option labeled
-              <guilabel>Burn image file to disc</guilabel> or
-              <guilabel>Make disc from ISO image</guilabel>. If your
-              software offers a choice of image formats, choose "ISO
-              image" as the file type. If several ISO formats are
-              offered, choose the closest match to "Mode 1, 2048-byte
-              blocks."
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>Apple MacOS X</term>
-          <listitem>
-            <para>
-              Open the <guilabel>Disk Copy</guilabel> application, found
-              in the <filename>/Applications/Utilities</filename>
-              folder. From the menu, select <menuchoice>
-              <guimenu>Image</guimenu> <guimenuitem>Burn
-              Image...</guimenuitem> </menuchoice>. Select the CD image
-              to burn, check that the burn options are correct, and
-              select the <guilabel>Burn</guilabel> button.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>Linux operating systems</term>
-          <listitem>
-            <para>
-              If you are using a recent version of the GNOME desktop
-              environment, right-click the ISO image file and choose
-              <guilabel>Write to disc</guilabel>. If you are using a
-              recent version of the KDE desktop environment, use
-              <application>K3B</application> and select <menuchoice>
-              <guimenu>Tools</guimenu> <guimenuitem>Burn CD
-              Image</guimenuitem> </menuchoice>, or <menuchoice>
-              <guimenu>Tools</guimenu> <guimenuitem>Burn DVD ISO
-              Image</guimenuitem> </menuchoice> if appropriate. The
-              following command line works for many other environments:
-            </para>
-<screen>
-<userinput>cdrecord --device=<replaceable>cdwriter-device</replaceable> -tao -eject <replaceable>image-file.iso</replaceable></userinput>
-</screen>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-
-      <note>
-        <title>System-Specific Instructions</title>
-
-        <para>
-          Unfortunately this guide cannot offer specific instructions
-	  for every possible combination of hardware and software.  You
-	  can find more information at <ulink
-	    url="http://fedoraproject.org/wiki/Docs/Drafts/BurningDiscs"/>. 
-	  Consult your operating system's documentation and online
-	  support services, and <xref linkend="sn-web-help"/> for
-	  additional help if needed.
-        </para>
-      </note>
-    </section>
-
-    <section id="sn-preparing-usb-media">
-      <title>Preparing USB Boot Media</title>
-
-      <warning>
-        <title>Data Loss</title>
-
-        <para>
-          <emphasis>This procedure destroys data on the
-          media.</emphasis> Back up any important information before you
-          begin. Some models of USB media use additional partitions or
-          software to provide functions such as encryption. This
-          procedure may make it difficult or impossible to access these
-          special areas on your boot media.
-        </para>
-      </warning>
-
-      <para>
-        The <filename>images/diskboot.img</filename> file on the first
-        &FC; installation disc is a boot image designed for USB media.
-        This file also appears on FTP and Web sites providing &FC;.
-      </para>
-
-      <para>
-        Several software utilities are available for Windows and Linux
-        that can write image files to a device. Linux includes the
-        <command>dd</command> command for this purpose.
-      </para>
-
-      <para>
-        The <command>dd</command> utility requires you to specify the
-        device file that corresponds to the physical media. The name of
-        the device file matches the name assigned to the device by your
-        system. All device files appear in the directory
-        <filename>/dev/</filename>. For example,
-        <filename>/dev/sda</filename> denotes the first USB or SCSI
-        device that is attached to the system.
-      </para>
-
-      <para>
-        To learn the name that your system assigns to the media:
-      </para>
-      <procedure>
-        <step>
-          <para>
-            Open a terminal window. On a &FED; system, choose
-            <menuchoice><guimenu>Applications</guimenu>
-            <guisubmenu>Accessories</guisubmenu>
-            <guimenuitem>Terminal</guimenuitem> </menuchoice> to start a
-            terminal.
-          </para>
-        </step>
-        <step>
-          <para>
-            Attach or insert the media.
-          </para>
-        </step>
-        <step>
-          <para>
-            In the terminal window, type the following command:
-          </para>
-<screen>
-<userinput>dmesg</userinput>
-</screen>
-          <para>
-            Look for the items in the <command>dmesg</command> output
-            that relate to the detection of a new SCSI device. Linux
-            systems treat USB media as forms of SCSI device.
-          </para>
-        </step>
-        <step>
-          <para>
-            Unmount the media. On a &FED; system, right-click the icon
-            that corresponds to the media, and select
-            <guimenuitem>Unmount Volume</guimenuitem>. Alternatively,
-            enter this command in a terminal window:
-          </para>
-<screen>
-<userinput>umount <replaceable>/dev/sda</replaceable></userinput>
-</screen>
-          <para>
-            Replace <filename>/dev/sda</filename> with the name of the
-            correct device file for the media.
-          </para>
-        </step>
-      </procedure>
-      <para>
-        To write an image file to boot media with <command>dd</command>
-        on a current version of &FC;, carry out the following steps:
-      </para>
-      <procedure>
-        <step>
-          <para>
-            Locate the image file.
-          </para>
-        </step>
-        <step>
-          <para>
-            Attach or insert the media.
-          </para>
-        </step>
-        <step>
-          <para>
-            Your system may automatically detect and open the media. If
-            that happens, close or unmount the media before continuing.
-          </para>
-        </step>
-        <step>
-          <para>
-            Open a terminal window.
-          </para>
-        </step>
-        <step>
-          <para>
-            In the terminal window, type the following command:
-          </para>
-<screen>
-<userinput>dd if=diskboot.img of=<replaceable>/dev/sda</replaceable></userinput>
-</screen>
-          <para>
-            Replace <filename>/dev/sda</filename> with the name of the
-            correct device file for the media.
-          </para>
-        </step>
-      </procedure>
-    </section>
-  </section>
 </preface>
 
 <!--


Index: locale.xml
===================================================================
RCS file: /cvs/docs/install-guide/devel/en_US/locale.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locale.xml	21 Aug 2006 12:05:30 -0000	1.1
+++ locale.xml	27 Aug 2006 18:36:39 -0000	1.2
@@ -22,14 +22,6 @@
     the standard screens. Later in the installation process you can
     manually specify your display hardware.
   </para>
-  <important>
-    <title>Network Installations</title>
-
-    <para>
-      Network installations with HTTP and FTP always use text screens on
-      systems with less than 128Mb of memory.
-    </para>
-  </important>
   <section id="sn-installer-language">
     <title>Language Selection</title>
 
@@ -101,7 +93,6 @@
 <!--
 Local variables:
 mode: xml
-sgml-parent-document:("fedora-install-guide.xml" "book" "chapter")
 fill-column: 72
 End:
 -->


Index: networkconfig.xml
===================================================================
RCS file: /cvs/docs/install-guide/devel/en_US/networkconfig.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- networkconfig.xml	21 Aug 2006 12:05:30 -0000	1.1
+++ networkconfig.xml	27 Aug 2006 18:36:39 -0000	1.2
@@ -180,7 +180,6 @@
 <!--
 Local variables:
 mode: xml
-sgml-parent-document:("fedora-install-guide.xml" "book" "chapter")
 fill-column: 72
 End:
 -->


Index: other-instmethods.xml
===================================================================
RCS file: /cvs/docs/install-guide/devel/en_US/other-instmethods.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- other-instmethods.xml	21 Aug 2006 12:05:30 -0000	1.1
+++ other-instmethods.xml	27 Aug 2006 18:36:39 -0000	1.2
@@ -14,164 +14,104 @@
 <!-- $Id: -->
 
 <chapter id="ch-other-install-methods">
-  <title>Alternative Installation Methods</title>
+  <title>Installation Methods</title>
   <para>
-    The installation method screen below appears if one of the following
-    is true:
+    You can install &FC; using any of several different methods.  You
+    can install from CD or DVD media burned from downloaded ISO images,
+    from the ISO images stored on hard disk, or from a network using
+    NFS, FTP, or HTTP methods.
   </para>
-  <orderedlist>
-    <listitem>
-      <para>
-        You booted with PXE, USB media, or boot-only CD or DVD media.
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        You entered the <option>askmethod</option> option at the
-        <prompt>boot:</prompt>
-        prompt.
-      </para>
-    </listitem>
-  </orderedlist>
-  <figure id="fig-install-method">
-    <title>Installation Method Screen</title>
-    <mediaobject>
-      <imageobject>
-        <imagedata align="center" fileref="./figs/askinstallmethod.eps" format="EPS"/>
-      </imageobject>
-      <imageobject>
-        <imagedata align="center" fileref="./figs/askinstallmethod.png" format="PNG"/>
-      </imageobject>
-      <textobject>
-        <phrase>
-	  Installation method screen.
-        </phrase>
-      </textobject>
-    </mediaobject>
-  </figure>
   <para>
-    Highlight the appropriate installation method on the list, and
-    select <guibutton>OK</guibutton>.
+    If you booted a &FC; DVD, or the first installation CD, without the
+    <option>askmethod</option> option, proceed to <xref
+    linkend="sn-install-default-method"/>.  Otherwise, proceed to <xref
+    linkend="sn-alt-install-method"/>.
   </para>
-  <note>
-    <title>CD/DVD Activity</title>
-
+  <section id="sn-install-default-method">
+    <title>Default Installation Method</title>
     <para>
-      If the first &FC; distribution installation disc is in your
-      computer's CD or DVD drive, the installation program loads its
-      next stage from that disc. The installation program still
-      downloads <emphasis>package data</emphasis> from the source you
-      choose.
+      A default installation runs directly from CD or DVD installation
+      media.  The next stage loads automatically from the installation
+      media.  Proceed to <xref linkend="ch-welcome"/>.
     </para>
-  </note>
-  <section id="sn-install-method-server">
-    <title>Installation from a Network Server</title>
-
+  </section>
+  <section id="sn-alt-install-method">
+    <title>Alternative Installation Methods</title>
     <para>
-      You may install &FC; from a network server using FTP, HTTP, or
-      <indexterm>
-        <primary>NFS (Network File System)</primary>
-        <secondary>install from</secondary>
-      </indexterm>
-      NFS protocols. Refer to
-      <xref linkend="sn-installing-networkinstallation"/> for
-      information on installation servers.
+      The installation method screen below appears if one of the
+      following is true:
     </para>
+    <orderedlist>
+      <listitem>
+	<para>
+	  You started the installation with boot-only PXE, USB, CD, or
+	  DVD media.
+	</para>
+      </listitem>
+      <listitem>
+	<para>
+	  You entered the <option>askmethod</option> option at the
+	  <prompt>boot:</prompt> prompt.
+	</para>
+      </listitem>
+    </orderedlist>
+    <figure id="fig-install-method">
+      <title>Installation Method Screen</title>
+      <mediaobject>
+	<imageobject>
+	  <imagedata align="center" fileref="./figs/askinstallmethod.eps" format="EPS"/>
+	</imageobject>
+	<imageobject>
+	  <imagedata align="center" fileref="./figs/askinstallmethod.png" format="PNG"/>
+	</imageobject>
+	<textobject>
+	  <phrase>
+	    Installation method screen.
+	  </phrase>
+	</textobject>
+      </mediaobject>
+    </figure>
+    <note>
+      <title>CD/DVD Activity</title>
 
-    <section id="sn-installer-tcpip">
-      <title>TCP/IP Configuration</title>
-
-      <para>
-        By default, the installation program uses DHCP to automatically
-        provide the network settings. If your network has no DHCP
-        server, clear the check box labeled <guibutton>Use dynamic IP
-        configuration</guibutton> and enter the settings manually.
-        Select <guibutton>OK</guibutton> to continue.
-      </para>
-      <figure id="fig-inst-ipsetup">
-        <title>Configure TCP/IP Dialog</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/anaipsetup.eps" format="EPS"/>
-          </imageobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/anaipsetup.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>
-	      TCP/IP configuration dialog.
-	    </phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>
-        These settings apply only during the installation process. The
-        installation program allows you to configure the final network
-        configuration later.
-      </para>
-    </section>
-
-    <section id="sn-installer-service-settings">
-      <title>Network Service Setup</title>
-
-      <para>
-        The FTP, HTTP, and NFS service setup dialogs are very similar.
-        Each requires the name or IP address of the server, and a
-        directory where the installation files reside. To use a public
-        server, or mirror website, refer to
-        <xref linkend="sn-installing-networkinstallation"/> for
-        information on valid server names and directory paths.
-      </para>
-      <figure id="fig-ftp-setup">
-        <title>FTP Setup Dialog</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/ftpsetup.eps" format="EPS"/>
-          </imageobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/ftpsetup.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>
-	      FTP setup dialog.
-	    </phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
       <para>
-        The FTP service setup dialog also has an option for
-        <guilabel>non-anonymous FTP</guilabel>. If your FTP server does
-        not provide anonymous access, select this check box, and provide
-        an account name and password in the following dialog. Select
-        <guibutton>OK</guibutton> to continue.
+	If you booted with &FC; installation Disc 1, the installation
+	program loads its next stage from that disc.  This happens
+	regardless of which installation method you choose, unless you
+	eject the disc before you proceed.  The installation program
+	still downloads <emphasis>package data</emphasis> from the
+	source you choose.
       </para>
-      <figure id="fig-ftp-setup-further">
-        <title>Non-anonymous FTP Account Dialog</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/ftpsetupfurther.eps" format="EPS"/>
-          </imageobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/ftpsetupfurther.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>
-	      Non-anonymous FTP account dialog.
-	    </phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <note>
-        <title>Large Download</title>
-
-        <para>
-          Network installations download the main installation program
-          from the server that you specify. The graphical installation
-          program is over 60 Mb in size. Computers with a slow network
-          connection may take several minutes to download this file.
-        </para>
-      </note>
-    </section>
+    </note>
+    <para>
+      Even if you booted from alternative media, you can still install
+      &FC; from CD or DVD media.  Alternately, you can install from ISO
+      images stored on your computer's hard disk, or from a network
+      server.
+    </para>
+    <itemizedlist>
+      <listitem>
+	<para>
+	  To install from CD or DVD media, insert a &FC; DVD or the
+	  first installation CD, select <guilabel>Local
+	    CDROM</guilabel>, and proceed to <xref
+	  linkend="ch-welcome"/>.
+	</para>
+      </listitem>
+      <listitem>
+	<para>
+	To install from ISO images on a hard disk, select <guilabel>Hard
+	    drive</guilabel> and proceed to <xref
+	  linkend="sn-installing-from-harddrive"/>.
+	</para>
+      </listitem>
+      <listitem>
+	<para>
+	To install from a network, using NFS, FTP, or HTTP, proceed to
+	<xref linkend="sn-install-tcpip-config"/>.
+	</para>
+      </listitem>
+    </itemizedlist>
   </section>
   <section id="sn-installing-from-harddrive">
     <title>Installation from a Hard Drive</title>
@@ -195,8 +135,7 @@
       <indexterm>
         <primary>file systems</primary>
         <secondary>ext2</secondary>
-      </indexterm>
-      <firstterm>ext2</firstterm>,
+      </indexterm> <firstterm>ext2</firstterm>,
       <indexterm>
         <primary>ext3</primary>
         <see>file systems</see>
@@ -204,8 +143,7 @@
       <indexterm>
         <primary>file systems</primary>
         <secondary>ext3</secondary>
-      </indexterm>
-      <firstterm>ext3</firstterm> or
+      </indexterm> <firstterm>ext3</firstterm> or
       <indexterm>
         <primary>vfat</primary>
         <see>file systems</see>
@@ -213,39 +151,30 @@
       <indexterm>
         <primary>file systems</primary>
         <secondary>vfat</secondary>
-      </indexterm>
-      <firstterm>vfat</firstterm> file system. In &FED;,
+      </indexterm> <firstterm>vfat</firstterm> file system. In &FED;,
       <systemitem class="filesystem">vfat</systemitem> includes a range
       of file systems, such as FAT-16 and FAT-32, found on most
-      removable media. External hard drives usually contain
-      <systemitem
-	class="filesystem">vfat</systemitem> (FAT-32) file
-      systems. Some Microsoft Windows systems also use
-      <systemitem
-	class="filesystem">vfat</systemitem> file systems on
-      internal hard disk partitions.
+      removable media. External hard drives usually contain <systemitem
+	class="filesystem">vfat</systemitem> (FAT-32) file systems. Some
+      Microsoft Windows systems also use <systemitem
+	class="filesystem">vfat</systemitem> file systems on internal
+      hard disk partitions.
     </para>
 
-    <note>
-      <title>FAT-16, FAT-32, and <systemitem
-	  class="filesystem">vfat</systemitem></title>
-
-      <para>
-        Before you begin installation from a hard drive, check the
-        partition type to ensure that &FED; can read it. To check a
-        partition's file system under Windows, use the <application>Disk
-        Management</application> tool. To check a partition's file
-        system under Linux, use the <command>fdisk</command> utility.
-      </para>
-    </note>
-
     <para>
-      You cannot use ISO files on partitions controlled by LVM (Logical
-      Volume Management). Refer to
-      <xref
-	linkend="sn-partitioning-general" /> for more information
-      about file systems.
+      Before you begin installation from a hard drive, check the
+      partition type to ensure that &FED; can read it. To check a
+      partition's file system under Windows, use the <application>Disk
+	Management</application> tool. To check a partition's file
+      system under Linux, use the <command>fdisk</command> utility.
     </para>
+    <important>
+      <title>Cannot Install from LVM Partitions</title>
+      <para>
+	You cannot use ISO files on partitions controlled by LVM
+	(Logical Volume Management).
+      </para>
+    </important>
 
     <para>
       If you choose this option, the following screen appears:
@@ -269,11 +198,11 @@
     <para>
       Select the partition containing the ISO files from the list of
       available partitions. Internal IDE drive device names begin with
-      <filename>/dev/hd</filename>. SCSI or USB drive device names begin
-      with <filename>/dev/sd</filename>. Each individual drive has its
-      own letter, for example <filename>/dev/hda</filename>. Each
-      partition on a drive is numbered, for example
-      <filename>/dev/sda1</filename>.
+      <filename>/dev/hd</filename>. SATA, SCSI, and USB drive device
+      names begin with <filename>/dev/sd</filename>. Each individual
+      drive has its own letter, for example
+      <filename>/dev/hda</filename>. Each partition on a drive is
+      numbered, for example <filename>/dev/sda1</filename>.
     </para>
 
     <para>
@@ -283,15 +212,271 @@
     </para>
 
     <para>
-      Select <guibutton>OK</guibutton> to continue.
+      Select <guibutton>OK</guibutton> to continue.  Proceed with <xref
+	linkend="ch-welcome"/>.
+    </para>
+  </section>
+  <section id="sn-install-tcpip-config">
+    <title>Installation TCP/IP Configuration</title>
+
+    <para>
+      The installation program is network-aware and can use network
+      settings for a number of functions.  For instance, you can install
+      &FC; from a network server using FTP, HTTP, or
+      <indexterm>
+        <primary>NFS (Network File System)</primary>
+        <secondary>install from</secondary>
+      </indexterm> NFS protocols.  You can also instruct the
+      installation program to consult additional software repositories
+      later in the process.
+    </para>
+
+    <para>
+      By default, the installation program uses DHCP to automatically
+      provide network settings.  If you use a cable or DSL modem,
+      router, firewall, or other network hardware to communicate with
+      the Internet, DHCP is a suitable option.  In a business
+      environment, consult with your network administrators for
+      appropriate settings.  If your network has no DHCP server, clear
+      the check box labeled <guilabel>Use dynamic IP configuration
+	(DHCP)</guilabel>.
+    </para>
+    <para>
+      The installation program supports both IPv4 and IPv6.  If you are
+      not sure which addressing scheme your network uses, it is safe to
+      leave both options selected.
+    </para>
+    <note>
+      <title>DHCP Responses Take Time</title>
+      <para>
+	If you select both IPv4 and IPv6 options, it may take additional
+	time to receive network settings from the DHCP server.
+      </para>
+    </note>
+    <para>
+      If you choose a network-based installation, the following screen
+      appears:
+    </para>
+    <figure id="fig-inst-ipsetup">
+      <title>Configure TCP/IP Dialog</title>
+      <mediaobject>
+	<imageobject>
+	  <imagedata align="center" fileref="./figs/anaipsetup.eps" format="EPS"/>
+	</imageobject>
+	<imageobject>
+	  <imagedata align="center" fileref="./figs/anaipsetup.png" format="PNG"/>
+	</imageobject>
+	<textobject>
+	  <phrase>
+	    TCP/IP configuration dialog.
+	  </phrase>
+	</textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      These settings apply only during the installation process. The
+      installation program allows you to configure the final network
+      configuration later.
+    </para>
+
+    <para>
+      You can install from a Web, FTP, or NFS server either on your
+      local network or, if you are connected, on the Internet.  To use a
+      public server, or mirror website, refer to <xref
+      linkend="sn-installing-networkinstallation"/> for information on
+      valid server names and directory paths.
+    </para>
+    <note>
+      <title>Large Download</title>
+
+      <para>
+	If you are not booting from a &FC; DVD or installation CD, a
+	network installation downloads the main installation program
+	from the network. The graphical installation program is over 75
+	MB in size.
+      </para>
+    </note>
+    <itemizedlist>
+      <listitem>
+	<para>
+	  If you are installing via NFS, proceed to <xref
+	    linkend="sn-nfs-install-settings"/>.
+	</para>
+      </listitem>
+      <listitem>
+	<para>
+	  If you are installing via FTP, proceed to <xref
+	    linkend="sn-ftp-install-settings"/>.
+	</para>
+      </listitem>
+      <listitem>
+	<para>
+	  If you are installing via HTTP, proceed to <xref
+	    linkend="sn-http-install-settings"/>.
+	</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section id="sn-nfs-install-settings">
+    <title>NFS Installation Setup</title>
+    <para>
+      To install from a NFS server, select <guilabel>NFS</guilabel> from
+      the <guilabel>Installation Method</guilabel> menu and select
+      <guilabel>OK</guilabel>.  The following screen appears:
+    </para>
+
+    <figure id="fig-nfs-setup">
+      <title>NFS Setup Dialog</title>
+      <mediaobject>
+	<imageobject>
+	  <imagedata align="center" fileref="./figs/nfssetup.eps"
+	      format="EPS"/>
+	</imageobject>
+	<imageobject>
+	  <imagedata align="center" fileref="./figs/nfssetup.png"
+	      format="PNG"/>
+	</imageobject>
+	<textobject>
+	  <phrase>NFS setup dialog.</phrase>
+	</textobject>
+      </mediaobject>
+    </figure>
+
+    <para>
+      Enter the name or IP address of the NFS server and the directory
+      where the installation files reside.
+    </para>
+    <note>
+      <title>NFS Mirror Availability</title>
+      <para>
+	Public NFS mirrors are rare due to security concerns with NFS
+	that do not necessarily apply to FTP or HTTP servers.  The &FP;
+	does not maintain a list of public NFS mirrors for &FC;.
+      </para>
+    </note>
+    <para>
+      Select <guilabel>OK</guilabel> to continue.  Proceed with <xref
+	linkend="ch-welcome"/>.
+    </para>
+
+  </section>
+
+  <section id="sn-ftp-install-settings">
+    <title> FTP Installation Setup</title>
+
+    <para>
+      To install from a FTP server, select <guilabel>FTP</guilabel> from
+      the <guilabel>Installation Method</guilabel> menu and select
+      <guilabel>OK</guilabel>.  The following screen appears:
+    </para>
+
+    <figure id="fig-ftp-setup">
+      <title>FTP Setup Dialog</title>
+      <mediaobject>
+	<imageobject>
+	  <imagedata align="center" fileref="./figs/ftpsetup.eps"
+	      format="EPS"/>
+	</imageobject>
+	<imageobject>
+	  <imagedata align="center" fileref="./figs/ftpsetup.png"
+	      format="PNG"/>
+	</imageobject>
+	<textobject>
+	  <phrase>
+	    FTP setup dialog.
+	  </phrase>
+	</textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      Enter the name or IP address of the FTP server and the directory
+      where the installation files reside.  Refer to <xref
+      linkend="sn-installing-networkinstallation"/> for information on
+      how to locate a FTP mirror and enter its information here.
+    </para>
+    <para>
+      The FTP service setup dialog also has a <guilabel>Use
+	non-anonymous ftp</guilabel> option. If your FTP server does not
+      provide anonymous access, select this check box.  You must have an
+      account on the FTP server to use this option.
+    </para>
+    <para>
+      Select <guibutton>OK</guibutton> to continue.  If you are using the
+      default, anonymous FTP service, continue with <xref
+	linkend="ch-welcome"/>.
+    </para>
+    <para>
+      If you are using a non-anonymous FTP login, the following dialog
+      appears:
+    </para>
+    <figure id="fig-ftp-setup-further">
+      <title>Non-anonymous FTP Account Dialog</title>
+      <mediaobject>
+	<imageobject>
+	  <imagedata align="center" fileref="./figs/ftpsetupfurther.eps" format="EPS"/>
+	</imageobject>
+	<imageobject>
+	  <imagedata align="center" fileref="./figs/ftpsetupfurther.png" format="PNG"/>
+	</imageobject>
+	<textobject>
+	  <phrase>
+	    Non-anonymous FTP account dialog.
+	  </phrase>
+	</textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      Enter your username and password in the spaces provided.  Then
+      select <guilabel>OK</guilabel> to continue.  Proceed with <xref
+	linkend="ch-welcome"/>.
+    </para>
+  </section>
+
+  <section id="sn-http-install-settings">
+    <title>HTTP Installation Setup</title>
+
+    <para>
+      To install from a Web (HTTP) server, select
+      <guilabel>HTTP</guilabel> from the <guilabel>Installation
+	Method</guilabel> menu and select <guilabel>OK</guilabel>.  The
+      following screen appears:
+    </para>
+
+    <figure id="fig-http-setup">
+      <title>HTTP Setup Dialog</title>
+      <mediaobject>
+	<imageobject>
+	  <imagedata align="center" fileref="./figs/httpsetup.eps"
+	      format="EPS"/>
+	</imageobject>
+	<imageobject>
+	  <imagedata align="center" fileref="./figs/httpsetup.png"
+	      format="PNG"/>
+	</imageobject>
+	<textobject>
+	  <phrase>HTTP setup dialog.</phrase>
+	</textobject>
+      </mediaobject>
+    </figure>
+
+    <para>
+      Enter the name or IP address of the Web server and the directory
+      where the installation files reside.  Refer to <xref
+      linkend="sn-installing-networkinstallation"/> for information on
+      how to locate a Web mirror and enter its information here.
+    </para>
+    <para>
+      Select <guilabel>OK</guilabel> to continue.  Proceed with <xref
+	linkend="ch-welcome"/>.
     </para>
   </section>
+
 </chapter>
 
 <!--
 Local variables:
 mode: xml
-sgml-parent-document:("fedora-install-guide.xml" "book" "chapter")
 fill-column: 72
 End:
 -->


Index: packageselection.xml
===================================================================
RCS file: /cvs/docs/install-guide/devel/en_US/packageselection.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- packageselection.xml	21 Aug 2006 12:05:30 -0000	1.1
+++ packageselection.xml	27 Aug 2006 18:36:39 -0000	1.2
@@ -171,7 +171,7 @@
 	dialog.  Visit the URL for a list of actual repository
 	locations.  If you see the text <literal>$ARCH</literal> in the
 	URL, substitute your system's architecture.  See <xref
-	  linkend="sn-hwarchitecture"/> for more information on
+	  linkend="ch-hwarchitecture"/> for more information on
 	architectures.
       </para>
     </important>


Index: rpm-info.xml
===================================================================
RCS file: /cvs/docs/install-guide/devel/en_US/rpm-info.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpm-info.xml	20 Aug 2006 21:12:59 -0000	1.3
+++ rpm-info.xml	27 Aug 2006 18:36:39 -0000	1.4
@@ -22,6 +22,10 @@
   <title>Fedora Core 6 Installation Guide</title>
   <desc>Provides documentation for the installation process.</desc>
   <changelog order="newest-first">
+    <revision date="2006-08-27" number="1.34" role="doc">
+      <author worker="PaulWFrields"/>
+      <details>Major reorganization for better workflow</details>
+    </revision>
     <revision date="2006-08-20" number="1.33" role="doc">
       <author worker="PaulWFrields"/>
       <details>Added information on additional repos and other fixes.</details>




More information about the docs-commits mailing list