install-guide/devel/en_US other-instmethods.xml,1.16,1.17

[Paul W. Frields (pfrields)]

Author: pfrields

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

Modified Files:
	other-instmethods.xml 
Log Message:
Condense HTTP and FTP install methods and make some corrections for
consistency.  No reason to use "HTTP" jargon when most people
understand "Web."



Index: other-instmethods.xml
===================================================================
RCS file: /cvs/docs/install-guide/devel/en_US/other-instmethods.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- other-instmethods.xml	19 Apr 2008 19:41:28 -0000	1.16
+++ other-instmethods.xml	10 May 2008 16:26:21 -0000	1.17
@@ -52,21 +52,22 @@
 	<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
+	    CD/DVD</guilabel>, and proceed to <xref
 	  linkend="ch-welcome"/>.
 	</para>
       </listitem>
       <listitem>
 	<para>
-	To install from ISO images on a hard disk, select <guilabel>Hard
+	  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"/>.
+	  To install from a NFS server or other network location, such
+	  as a Web or FTP server, proceed to <xref
+	  linkend="sn-install-tcpip-config"/>.
 	</para>
       </listitem>
     </itemizedlist>
@@ -180,8 +181,8 @@
       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>
+	<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.
@@ -228,7 +229,7 @@
     </para>
 
     <para>
-      The &FP; maintains a list of HTTP and FTP public mirrors, sorted
+      The &FP; maintains a list of Web and FTP public mirrors, sorted
       by region, at <ulink
 	url="http://fedoraproject.org/wiki/Mirrors"/>. To determine the
       complete directory path for the installation files, add
@@ -246,14 +247,8 @@
       </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"/>.
+	  If you are installing via Web or FTP, proceed to <xref
+	    linkend="sn-url-install-settings"/>.
 	</para>
       </listitem>
     </itemizedlist>
@@ -282,47 +277,14 @@
 
   </section>
 
-  <section id="sn-ftp-install-settings">
-    <title>FTP Installation Setup</title>
+  <section id="sn-url-install-settings">
+    <title>Web and 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>. Enter the name or IP address of the FTP
-      server and the directory where the installation files reside.
-    </para>
-    <para>
-      Select <guibutton>OK</guibutton> to continue.  If you are using the
-      default, anonymous FTP service, continue with <xref
-	linkend="ch-welcome"/>.
-    </para>
-    <section id="sn-ftp-non-anonymous">
-      <title>Non-Anonymous FTP Setup</title>
-      <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>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>
-
-  <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>.
-    </para>
-    <para>
-      Enter the name or IP address of the Web server and the directory
-      where the installation files reside.  Select
-      <guilabel>OK</guilabel> to continue.  Proceed with <xref
-	linkend="ch-welcome"/>.
+      Enter the name or IP address of the network server and the
+      directory where the installation files reside.  Select
+      <guibutton>OK</guibutton> to continue.  Proceed with <xref
+      linkend="ch-welcome"/>.
     </para>
   </section>