install-guide fedora-install-guide-intro-en.xml, 1.7, 1.8 fedora-install-guide-networkconfig-en.xml, 1.9, 1.10

["Paul W. Frields" (pfrields) <fedora-docs-commits redhat com>]

Author: pfrields

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

Modified Files:
	fedora-install-guide-intro-en.xml 
	fedora-install-guide-networkconfig-en.xml 
Log Message:
Remove/reduce unnecessary text; move network stuff to logical place


Index: fedora-install-guide-intro-en.xml
===================================================================
RCS file: /cvs/docs/install-guide/fedora-install-guide-intro-en.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-install-guide-intro-en.xml	16 May 2005 20:57:32 -0000	1.7
+++ fedora-install-guide-intro-en.xml	17 May 2005 22:32:26 -0000	1.8
@@ -21,33 +21,12 @@
   <para>
     This manual helps you to install &FC; on desktops, laptops and
     servers.  The installation system is flexible enough to use even if
-    you have no previous knowledge of Linux or computer networks.  Even
-    if you only select default options, &FC; provides a complete desktop
-    operating system, including:
+    you have no previous knowledge of Linux or computer networks.  If
+    you select default options, &FC; provides a complete desktop
+    operating system, including productivity applications, Internet
+    utilities, and desktop tools.
   </para>
 
-  <itemizedlist>
-    <listitem>
-      <para>
-	full-featured productivity applications such as a word
-	processor, spreadsheet manager, and presentation manager
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-	Internet utilities such as a Web browser, email client, Internet
-	Relay Chat client, and instant messaging client
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-	desktop tools to catalog and edit digital photographs, create
-	sophisticated computer graphics, create and copy compact discs,
-	and play media files
-      </para>
-    </listitem>
-  </itemizedlist>
-
   <para>
     This document does not detail all of the features of the
     installation system.  <!-- Automating the installation process and
@@ -80,6 +59,8 @@
 	url="http://fedora.redhat.com/";>&FP-URL;</ulink>.  Refer to
       <ulink
 	url="http://www.opensource.org/";>http://www.opensource.org/</ulink> 
+      and <ulink
+	url="http://www.gnu.org/philosophy/free-sw.html";>http://www.gnu.org/philosophy/free-sw.html</ulink> 
       for more information about open source software.
     </para>
 
@@ -149,7 +130,7 @@
 
     <para>
       The Release Notes specify the hardware requirements for the
-      version of &FC; that you are about to install.  They also provide
+      version of &FC; which you are about to install.  They also provide
       advice on any known problems with particular hardware and software
       configurations.
     </para>
@@ -165,52 +146,47 @@
       <title>Networking</title>
 
       <para>
-	By default, &FC; systems will attempt to discover correct
-	connection settings for the attached network using
-	<firstterm>DHCP</firstterm> (Dynamic Host Control Protocol).
-	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.
+	By default, &FC; systems attempt to discover correct connection
+	settings for the attached network using <indexterm>
+	  <primary>DHCP (Dynamic Host Control Protocol)</primary>
+	</indexterm> <firstterm>DHCP</firstterm> (Dynamic Host Control
+	Protocol). 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 some information
-	about your network during the installation process.  Refer to
-	the sections below for more information.
+	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, use the utilities provided with
-	  &FC; to configure the dialing settings after you have
-	  completed the installation.
+	  your computer has a modem, configure the dialing settings
+	  after you complete the installation and reboot.
 	</para>
       </note>
 
     </section>
-
+    
     <section id="sn-installing-asaserver">
       <title>Installing &FC; as a Server</title>
-
+      
       <para>
-	  &FC; includes software for a complete range of network
-	services.  To install a system with the most common network
-	services, select the <guilabel>Server</guilabel> installation
-	type during the installation.  Refer to <xref
-	    linkend="ch-installtypes"/> for more information.  You may
+	&FC; includes software for a complete range of network services.
+	To install a system with the most common network services,
+	select the <guilabel>Server</guilabel> installation type during
+	the installation.  Refer to <xref
+	  linkend="ch-installtypes"/> for more information.  You may
 	also select individual software packages during installation, or
 	install them later.
       </para>
 
-      <para>
-	If your computer will be acting as a server, manually configure
-	both a name and an IP address instead of using DHCP.
-      </para> <!-- Maybe this should move to the Installation Types
-	  chapter, since it makes no sense at this point to the
-	  reader. - PWF. -->
-      
     </section>
 
 
@@ -248,16 +224,16 @@
 	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.
+	  PXE server for other computers.
       </para>
 
       <para>
-	  Booting your computer is explained in the next section, <xref
-	    linkend="ch-beginninginstallation"/>.
+	Booting your computer is explained in the next section, <xref
+	  linkend="ch-beginninginstallation"/>.
       </para>
       
     </section>
-
+    
 
     <section id="sn-installing-managed-network">
       <title>Installing &FC; on a Managed Network</title>


Index: fedora-install-guide-networkconfig-en.xml
===================================================================
RCS file: /cvs/docs/install-guide/fedora-install-guide-networkconfig-en.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-install-guide-networkconfig-en.xml	14 May 2005 21:57:38 -0000	1.9
+++ fedora-install-guide-networkconfig-en.xml	17 May 2005 22:32:26 -0000	1.10
@@ -68,6 +68,13 @@
     </para>
 
     <para>
+      If your computer will be acting as a server, do not use DHCP.
+      Manually configure networking instead.  A manual network
+      configuration assures that your server will join the local network
+      even if the DHCP provider is down.
+    </para>
+      
+    <para>
       Specify whether an interface should be automatically activated at
       boot time with the <guilabel>Active on Boot</guilabel> checkbox
       for that device. You may manually activate a network interfaces at