Try to make some sense out of the mess that used to be INSTALL.TXT.

1.  Bring floppies.sgml section in-line into install.sgml, where it
makes more sense.

2.  Slightly reorganize some sections of Installation section and
do some wordsmithing.

3.  Update distribution layout to reflect RELNOTESng and new compat
distributions.

4.  Update upgrade file list from 4-STABLE.

5.  It's been a long time since 2.2.X; get rid of instructions dealing
with "new" handling of compatability slices and fix up other references
in the text.

6.  Hunt down and kill emoticons with extreme prejudice.  Try to
tone down the use of exclamation points.

7.  Cross-reference new and improved Installation chapter in
Handbook.

8.  Add a proper abstract for this document.

11 files changed, 237 insertions, 248 deletions

diff --git a/release/doc/en_US.ISO8859-1/installation/alpha/Makefile b/release/doc/en_US.ISO8859-1/installation/alpha/Makefile
index 19de1c1..36f855e 100644
--- a/release/doc/en_US.ISO8859-1/installation/alpha/Makefile
+++ b/release/doc/en_US.ISO8859-1/installation/alpha/Makefile
@@ -10,8 +10,8 @@ INSTALL_ONLY_COMPRESSED?=
 # SGML content
 SRCS+=	article.sgml
 SRCS+=	../common/artheader.sgml
+SRCS+=	../common/abstract.sgml
 SRCS+=	../common/install.sgml
-SRCS+=	../common/floppies.sgml
 SRCS+=	../common/layout.sgml
 SRCS+=	../common/trouble.sgml
 SRCS+=	../common/upgrade.sgml
diff --git a/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml b/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml
index c334c28..78df2b2 100644
--- a/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml
@@ -19,9 +19,9 @@
 
 <article>
 &artheader;
+&abstract;
 &sect.install;
 &sect.layout;
-&sect.floppies;
 &sect.upgrade;
 &sect.trouble;
 </article>
diff --git a/release/doc/en_US.ISO8859-1/installation/common/abstract.sgml b/release/doc/en_US.ISO8859-1/installation/common/abstract.sgml
new file mode 100644
index 0000000..60aab09
--- /dev/null
+++ b/release/doc/en_US.ISO8859-1/installation/common/abstract.sgml
@@ -0,0 +1,8 @@
+<!-- $FreeBSD$ -->
+
+<abstract>
+  <para>This article gives some brief instructions on installing
+  &os; &release.current; for the &arch; architecture, with particular
+  emphasis given to obtaining a &os; distribution.  Some notes on
+  troubleshooting and frequently-asked questions are also given.</para>
+</abstract>
diff --git a/release/doc/en_US.ISO8859-1/installation/common/floppies.sgml b/release/doc/en_US.ISO8859-1/installation/common/floppies.sgml
deleted file mode 100644
index 16ce3c2..0000000
--- a/release/doc/en_US.ISO8859-1/installation/common/floppies.sgml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<sect1 id="floppies">
-  <title>Floppy Disk Image Instructions</title>
-
-  <para>For a normal CDROM or network installation, all you need to
-  copy onto actual floppies from the <filename>floppies/</filename> directory are the
-  <filename>kern.flp</filename> and <filename>mfsroot.flp</filename>
-  images (for 1.44MB floppies).</para>
-
-  <para>Getting these images over the network is easy.  simply fetch
-  the
-  <replaceable>release</replaceable><filename>/floppies/kern.flp</filename>
-  and
-  <replaceable>release</replaceable><filename>/floppies/mfsroot.flp</filename>
-  files from <ulink
-  url="ftp://ftp.FreeBSD.org/pub/FreeBSD">ftp://ftp.FreeBSD.org/pub/FreeBSD</ulink>
-  or one of the many mirrors listed at <ulink
-  url="http://www.FreeBSD.org/handbook/mirrors.html">http://www.FreeBSD.org/handbook/mirrors.html</ulink>.
-  </para>
-
-  <para>Get two blank, freshly formatted floppies and image copy
-  <filename>kern.flp</filename> onto one and <filename>mfsroot.flp</filename> onto the other.  These images are
-  <emphasis>not</emphasis> DOS files!  You cannot simply copy them to a DOS or UFS floppy
-  as regular files, you need to <quote>image</quote> copy them to the floppy with
-  <filename>fdimage.exe</filename> under DOS (see the
-  <filename>tools</filename> directory on your CDROM or &os; FTP
-  mirror) or the &man.dd.1; command in UNIX.</para>
-
-  <para>For example, to create the kernel floppy image from DOS, you'd
-  do something like this:</para>
-
-  <screen><prompt>C></prompt> <userinput>fdimage kern.flp a:</userinput></screen>
-
-  <para>Assuming that you'd copied <filename>fdimage.exe</filename> and <filename>kern.flp</filename> into a directory
-  somewhere.  You would do the same for <filename>mfsroot.flp</filename>, of course.</para>
-
-  <para>If you're creating the boot floppy from a UNIX machine, you
-  may find that:</para>
-
-  <screen>&prompt.root; <userinput>dd if=floppies/kern.flp of=/dev/rfd0</userinput></screen>
-
-  <para>or</para>
-
-  <screen>&prompt.root; <userinput>dd if=floppies/kern.flp of=/dev/floppy</userinput></screen>
-
-  <para>work well, depending on your hardware and operating system
-  environment (different versions of UNIX have totally different names
-  for the floppy drive).</para>
-
-  <para arch="alpha">If you're on an alpha machine that can network-boot its
-  floppy images or you have a 2.88MB or LS-120 floppy capable of
-  taking a 2.88MB image on an x86 machine, you may wish to use
-  the older (but now twice as large) <filename>boot.flp</filename> image which we also
-  provide.  That contains the contents of <filename>kern.flp</filename> and <filename>mfsroot.flp</filename> on
-  a single floppy, essentially.  This file should also be used as the
-  boot file for those mastering <quote>El Torito</quote> bootable CD images.  See
-  the &man.mkisofs.8; command for more information.</para>
-
-  <para>Going to two installation boot floppies is a step we
-  definitely would have rather avoided but we simply no longer could
-  due to general code bloat and &os;'s many new device drivers in
-  <filename>GENERIC</filename>.</para>
-
-  <para>One positive side-effect of this new organizational scheme,
-  however, is that it also allows one to easily make one's own
-  <filename>kern.flp</filename> or <filename>mfsroot.flp</filename> floppies
-  should a need to customize some aspect of the installation process
-  or use a custom kernel for an otherwise unsupported piece of
-  hardware arise.  As long as the kernel is compiled with
-  <literal>options MFS</literal> and <literal>options
-  MFS_ROOT</literal>, it will properly look for and boot an
-  <filename>mfsroot.flp</filename> image in memory when run (see how
-  <filename>/boot/loader.rc</filename> in
-  <filename>kern.flp</filename> does its thing).  The
-  <filename>mfsroot.flp</filename> image is also just a gzip'd
-  filesystem image which is used as root, something which can be made
-  rather easily using &man.vnconfig.8;.  If none of that makes any
-  sense to you then don't worry about it - just use the
-  <filename>kern.flp</filename> and <filename>mfsroot.flp</filename>
-  images as described above.</para>
-
-</sect1>
diff --git a/release/doc/en_US.ISO8859-1/installation/common/install.ent b/release/doc/en_US.ISO8859-1/installation/common/install.ent
index 773b7d2..3e6060d 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/install.ent
+++ b/release/doc/en_US.ISO8859-1/installation/common/install.ent
@@ -7,9 +7,9 @@
 <!-- Files to be included -->
 
 <!ENTITY artheader SYSTEM "artheader.sgml">
+<!ENTITY abstract SYSTEM "abstract.sgml">
 <!ENTITY sect.install SYSTEM "install.sgml">
 <!ENTITY sect.layout SYSTEM "layout.sgml">
-<!ENTITY sect.floppies SYSTEM "floppies.sgml">
 <!ENTITY sect.upgrade SYSTEM "upgrade.sgml">
 <!ENTITY sect.trouble SYSTEM "trouble.sgml">
 
diff --git a/release/doc/en_US.ISO8859-1/installation/common/install.sgml b/release/doc/en_US.ISO8859-1/installation/common/install.sgml
index 0d0477a..7ea3a75 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/install.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/common/install.sgml
@@ -12,42 +12,53 @@ from {alpha,i386}/INSTALL.TXT.
 <sect1>
   <title>Installing &os;</title>
 
-  <sect2 id="quickstart">
-    <title>Quick Start</title>
-
-    <para>This manual documents the process of making a new
-    installation of &os; on your machine.  If you are upgrading
-    from a previous release of &os;, please see <xref
-    linkend="upgrading">
-    for important information on upgrading.  If you are
-    not familiar with configuring hardware for &os;, you should
-    also read the <filename>HARDWARE.TXT</filename> file - it contains important
-    information which may save you a lot of grief.</para>
-
-    <para>If you're new to &os; then you should also read
-    <emphasis>everything</emphasis> listed in the Documentation menu
-    of the installer.  It may seem like a lot to read, but the time
-    you spend now reading the documents will be made up many times
-    over because you were adequately prepared. Also, you will know the
-    types of information available should you get stuck later.  Once
-    the system is installed, you can also revisit this menu and use a
-    Web browser to read the installed FAQ (Frequently Asked Questions)
-    and Handbook HTML documentation sets for &os;.  Note that on-line
-    versions of the <ulink
-    url="http://www.FreeBSD.org/faq/">FAQ</ulink> and <ulink
-    url="http://www.FreeBSD.org/handbook/">Handbook</ulink> are also
-    available from the <ulink
-    url="http://www.FreeBSD.org/">FreeBSD Project Web
-    site</ulink>, if you have an Internet connection. See
-    <filename>README.TXT</filename> for more information on the
-    resources available to you.</para>
+  <para>This section documents the process of installing a new
+  distribution of &os;.  These instructions pay particular emphasis to
+  the process of obtaining the &os; &release.current; distribution and
+  to beginning the installation procedure.  The <ulink
+  url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/install.html"><quote>Installing
+  FreeBSD</quote></ulink>
+  chapter of the <ulink
+  url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">FreeBSD
+  Handbook</ulink> provides more in-depth information about the
+  installation program itself, including a guided walkthrough with
+  screenshots.</para>
+
+  <para>If you are upgrading from a previous release
+  of &os;, please see <xref linkend="upgrading"> for instructions on
+  upgrading.</para>
+
+  <sect2 id="getting-started">
+    <title>Getting Started</title>
+
+    <para>Probably the most important pre-installation step that can
+    be taken is that of reading the various instruction documents
+    provided with &os;.  A roadmap of documents pertaining to this
+    release of &os; can be found in <filename>README.TXT</filename>,
+    which can usually be found in the same location as this file; most
+    of these documents, such as the release notes and the hardware
+    compatability list, are also accessible in the Documentation menu
+    of the installer.</para>
+
+    <para>Note that on-line versions of the &os; <ulink
+    url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/">FAQ</ulink> and <ulink
+    url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">Handbook</ulink> are also
+    available from the <ulink url="http://www.FreeBSD.org/">FreeBSD
+    Project Web site</ulink>, if you have an Internet
+    connection.</para>
+
+    <para>This collection of documents may seem daunting, but the time
+    spent reading them will likely be saved many times over.  Being
+    familiar with what resources are available can also be helpful in
+    the event of problems during installation.</para>
 
     <para>The best laid plans sometimes go awry, so if you run into
     trouble take a look at <xref linkend="trouble">, which contains
     valuable troubleshooting information.  You should also read
-    <filename>ERRATA.TXT</filename> before installing and follow the
-    pointers there carefully since this will stop you from falling
-    over any problems which have reported in the interim for your
+    an updated copy of
+    <filename>ERRATA.TXT</filename> before installing,
+    since this will alert you to
+    any problems which have reported in the interim for your
     particular release.</para>
 
     <important>
@@ -55,11 +66,14 @@ from {alpha,i386}/INSTALL.TXT.
       accidental loss of data, it's still more than possible to
       <emphasis>wipe out your entire disk</emphasis>
       with this installation if you make a
-      mistake!  Please do not proceed to the final &os;
+      mistake.  Please do not proceed to the final &os;
       installation menu unless you've adequately backed up any
-      important data first!  We really mean it!</para>
+      important data first.</para>
     </important>
 
+  <sect2>
+    <title>Hardware Requirements</title>
+
     <para arch="i386">&os; for the &arch; requires a 386 or better
     processor to run (sorry, there is no support for 286 processors)
     and at least 5 megs of RAM to install and 4 megs of RAM to
@@ -87,7 +101,82 @@ from {alpha,i386}/INSTALL.TXT.
     necessary to download new firmware from the vendor's Web
     site.</para>
 
-    <sect3>
+    <para>If you are
+    not familiar with configuring hardware for &os;, you should
+    be sure to read the <filename>HARDWARE.TXT</filename> file; 
+    it contains important
+    information on what hardware is supported by &os;.</para>
+  </sect2>
+
+  <sect2 id="floppies">
+  <title>Floppy Disk Image Instructions</title>
+
+  <para>Depending on how you choose to install &os;, you may need to
+  create a set of floppy disks (usually two) to begin the installation
+  process.  This section briefly describes how to create these disks,
+  either from a CDROM installation or from the Internet.  Note that in
+  the common case of installing &os; from CDROM, on a machine that
+  supports bootable CDROMs, the steps outlined in this section will
+  not be needed and can be skipped.</para>
+
+  <para>For a normal CDROM or network installation, all you need to
+  copy onto actual floppies from the <filename>floppies/</filename> directory are the
+  <filename>kern.flp</filename> and <filename>mfsroot.flp</filename>
+  images (for 1.44MB floppies).</para>
+
+  <para>Getting these images over the network is easy.  Simply fetch
+  the
+  <replaceable>release</replaceable><filename>/floppies/kern.flp</filename>
+  and
+  <replaceable>release</replaceable><filename>/floppies/mfsroot.flp</filename>
+  files from <ulink
+  url="&release.url;"></ulink>
+  or one of the many mirrors listed at <ulink
+    url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html">FTP
+    Sites</ulink> section of the Handbook, or on the
+    <ulink url="http://www.freebsdmirrors.org/"></ulink> Web pages.
+  </para>
+
+  <para>Get two blank, freshly formatted floppies and image copy
+  <filename>kern.flp</filename> onto one and <filename>mfsroot.flp</filename> onto the other.  These images are
+  <emphasis>not</emphasis> DOS files.  You cannot simply copy them to a DOS or UFS floppy
+  as regular files, you need to <quote>image</quote> copy them to the floppy with
+  <filename>fdimage.exe</filename> under DOS (see the
+  <filename>tools</filename> directory on your CDROM or &os; FTP
+  mirror) or the &man.dd.1; command in UNIX.</para>
+
+  <para>For example, to create the kernel floppy image from DOS, you'd
+  do something like this:</para>
+
+  <screen><prompt>C></prompt> <userinput>fdimage kern.flp a:</userinput></screen>
+
+  <para>Assuming that you'd copied <filename>fdimage.exe</filename> and <filename>kern.flp</filename> into a directory
+  somewhere.  You would do the same for <filename>mfsroot.flp</filename>, of course.</para>
+
+  <para>If you're creating the boot floppy from a UNIX machine, you
+  may find that:</para>
+
+  <screen>&prompt.root; <userinput>dd if=floppies/kern.flp of=/dev/rfd0</userinput></screen>
+
+  <para>or</para>
+
+  <screen>&prompt.root; <userinput>dd if=floppies/kern.flp of=/dev/floppy</userinput></screen>
+
+  <para>work well, depending on your hardware and operating system
+  environment (different versions of UNIX have different names
+  for the floppy drive).</para>
+
+  <para arch="alpha">If you're on an alpha machine that can network-boot its
+  floppy images or you have a 2.88MB or LS-120 floppy capable of
+  taking a 2.88MB image on an x86 machine, you may wish to use
+  the single (but twice as large) <filename>boot.flp</filename> image.
+  It contains the contents of <filename>kern.flp</filename> and <filename>mfsroot.flp</filename> on
+  a single floppy.  This file should also be used as the
+  boot file for those mastering <quote>El Torito</quote> bootable CD images.  See
+  the &man.mkisofs.8; command for more information.</para>
+  </sect2>
+
+  <sect2 id="start-installation">
       <title>Installing &os; from CDROM or the Internet</title>
 
       <para arch="i386">The easiest type of installation is from
@@ -117,6 +206,19 @@ from {alpha,i386}/INSTALL.TXT.
         </itemizedlist>
       </para>
 
+      <para arch="i386">If you don't have a CDROM (or your computer does not
+      support booting from CDROM) and would like to simply install
+      over the net using PPP, SLIP or a dedicated connection.
+      You should start the installation by building
+      a set of FreeBSD boot floppy from the files
+      <filename>floppies/kern.flp</filename> and
+      <filename>floppies/mfsroot.flp</filename> using the instructions
+      found in <xref linkend="floppies">.  Restart your computer using
+      the <filename>kern.flp</filename> disk; when prompted, insert
+      the <filename>mfsroot.flp</filename> disk.  Then, please go to
+      <xref linkend="ftpnfs"> for additional tips on installing
+      via FTP or NFS.</para>
+
       <para arch="alpha">The easiest type of installation is from
       CDROM.  If you have a supported CDROM drive and a FreeBSD
       installation CDROM, you can boot FreeBSD directly from the
@@ -141,15 +243,6 @@ from {alpha,i386}/INSTALL.TXT.
       <para arch="alpha">Insert the <filename>mfsroot.flp</filename>
       floppy when prompted and you will end up at the first screen of
       the install program.</para>
-
-      <para>If you don't have a CDROM and would like to simply install
-      over the net using PPP, SLIP or a dedicated connection, see
-      <xref linkend="floppies"> for instructions on
-      making boot floppies.  Then please go to
-      <xref linkend="ftpnfs"> for additional tips on installing
-      via FTP or NFS.</para>
-
-    </sect3>
   </sect2>
   <sect2>
     <title>Detail on various installation types</title>
@@ -162,7 +255,7 @@ from {alpha,i386}/INSTALL.TXT.
     general <quote>Usage</quote> instructions on the first menu.</para>
 
     <note>
-      <para>If you get stuck at a screen, hit the <keycap>F1</keycap> key for online
+      <para>If you get stuck at a screen, press the <keycap>F1</keycap> key for online
       documentation relevant to that specific section.</para>
     </note>
 
@@ -221,7 +314,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
       <title>Installing from a Network CDROM</title>
 
       <para>If you simply wish to install from a local CDROM drive
-      then see <xref linkend="quickstart">.  If you don't have a CDROM
+      then see <xref linkend="start-installation">.  If you don't have a CDROM
       drive on your system and wish to use a &os; distribution CD
       in the CDROM drive of another system to which you have network
       connectivity, there are also several ways of going about it:</para>
@@ -299,10 +392,11 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
       use the Windows File Manager format command.</para>
 
       <important>
-        <para>Don't trust <quote>factory preformatted</quote>
-        floppies!  Format them again yourself, just to make sure.
-        Many problems reported by users in the past have resulted
-        from the use of improperly formatted media.</para>
+        <para>Frequently, floppy disks come <quote>factory
+        preformatted</quote>.  While convenient,
+        many problems reported by users in the past have resulted
+        from the use of improperly formatted media.
+        Re-format them yourself, just to make sure.</para>
       </important>
 
       <para>If you're creating the floppies from another &os;
@@ -332,7 +426,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
         when fetching and concatenating the distribution.  When
         putting distributions onto floppies, the
         <filename>distname.inf</filename> file <emphasis>must</emphasis> occupy the first
-        floppy of each distribution set!  This is also covered in
+        floppy of each distribution set.  This is also covered in
         <filename>README.TXT</filename>.</para>
       </important>
 
@@ -350,7 +444,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
       like this:</para>
 
       <screen><prompt>C:\></prompt> <userinput>MD C:\FREEBSD</userinput>
-<prompt>C:\></prompt <userinput>XCOPY /S E:\BIN C:\FREEBSD\BIN</userinput></screen>
+<prompt>C:\></prompt> <userinput>XCOPY /S E:\BIN C:\FREEBSD\BIN</userinput></screen>
 
       <para>Assuming that <devicename>E:</devicename> was where your CD was mounted.</para>
 
@@ -380,7 +474,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
       (which you'll be allowed to choose) to accommodate the <emphasis>full</emphasis>
       contents of the tape you've created.  Due to the non-random
       access nature of tapes, this method of installation requires
-      quite a bit of temporary storage!  You should expect to require
+      quite a bit of temporary storage.  You should expect to require
       as much temporary storage as you have stuff written on tape.</para>
 
       <note>
@@ -389,7 +483,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
         installation <quote>probe</quote> may otherwise fail to find it.</para>
       </note>
 
-      <para>Now create a boot floppy as described in <xref linkend="quickstart"> and
+      <para>Now create a boot floppy as described in <xref linkend="floppies"> and
       proceed with the installation.</para>
     </sect3>
 
@@ -454,13 +548,14 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
       <sect4>
         <title>Ethernet</title>
 
-	<para>&os; supports most common PC Ethernet cards, a table
-        of supported cards (and their required settings) being
-        provided as part of the &os; Hardware Guide (see the
-        Documentation menu on the boot floppy or the top level
+	<para>&os; supports many common Ethernet cards; a table
+        of supported cards is
+        provided as part of the &os; Hardware Notes (see
+        <filename>HARDWARE.TXT</filename> in
+	the Documentation menu on the boot floppy or the top level
         directory of the CDROM).  If you are using one of the
         supported PCMCIA Ethernet cards, also be sure that it's
-        plugged in <emphasis>before</emphasis> the laptop is powered on!  &os; does
+        plugged in <emphasis>before</emphasis> the laptop is powered on.  &os; does
         not, unfortunately, currently support <quote>hot insertion</quote> of
         PCMCIA cards during installation.</para>
 
@@ -478,9 +573,9 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
         <para>If you do not know the answers to these questions then
         you should really probably talk to your system administrator
         <emphasis>first</emphasis> before trying this type of
-        installation!  Using a randomly chosen IP address or netmask
-        on a live network will almost certainly get you shot at
-        dawn.</para>
+        installation.  Using a randomly chosen IP address or netmask
+        on a live network is almost guaranteed not to work, and will
+        probably result in a lecture from said system administrator.</para>
 
         <para>Once you have a network connection of some sort working, the
 	installation can continue over NFS or FTP.</para>
@@ -514,7 +609,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
         <option>-alldirs</option> option.  Other NFS servers may have different
         conventions.  If you are getting <literal>Permission Denied</literal> messages
         from the server then it's likely that you don't have this
-        properly enabled!</para>
+        properly enabled.</para>
       </sect4>
 
       <sect4>
@@ -543,7 +638,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
               not work through most firewalls but will often work best
               with older FTP servers that do not support passive mode.
               If your connection hangs with passive mode, try this
-              one!</para>
+              one.</para>
 	    </listitem>
 	    <listitem>
 	      <para>FTP Passive:  This sets the FTP "Passive" mode
@@ -652,7 +747,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	  actually see that you now have two DOS Primary partitions
 	  where you formerly had one.  Don't be alarmed!  You can
 	  simply delete the extra DOS Primary partition (making sure
-	  it's the right one by examining its size! :)</para>
+	  it's the right one by examining its size).</para>
 
 	  <para><application>FIPS</application> does NOT currently
 	  work with FAT32 or VFAT style partitions as used by newer
@@ -720,7 +815,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	  and indicate that you're interested in joining this ongoing
 	  effort!</para>
 
-	  <para>There is also a neat utility called <filename>pcemu</filename> in the
+	  <para>The <port>emulators/pcemu</port> port/package in the
 	  &os; Ports Collection which emulates an 8088 and enough BIOS
 	  services to run DOS text mode applications.  It requires the
 	  X Window System (XFree86) to operate.</para>
@@ -768,7 +863,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 
 	<answer>
 	  <para>&os; can run Tru64 applications very well using the
-	  <filename>emulators/osf1_base</filename> port/package.</para>
+	  <port>emulators/osf1_base</port> port/package.</para>
 	</answer>
       </qandaentry>
 
diff --git a/release/doc/en_US.ISO8859-1/installation/common/layout.sgml b/release/doc/en_US.ISO8859-1/installation/common/layout.sgml
index f9ce257..e22bc22 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/layout.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/common/layout.sgml
@@ -9,11 +9,11 @@
   <para>A typical &os; distribution directory looks something like this:</para>
 
 <screen>ERRATA.HTM      README.TXT      compat1x        dict            manpages
-ERRATA.TXT      RELNOTES.HTM    compat20        doc             proflibs
-HARDWARE.HTM    RELNOTES.TXT    compat21        docbook.css     src
-HARDWARE.TXT    XF86336         compat22        floppies
-INSTALL.HTM     bin             compat3x        games
-INSTALL.TXT     catpages        compat4x        info
+ERRATA.TXT      RELNOTES.HTM    compat20        doc             packages
+HARDWARE.HTM    RELNOTES.TXT    compat21        docbook.css     ports
+HARDWARE.TXT    XF86336         compat22        floppies        proflibs
+INSTALL.HTM     bin             compat3x        games           src
+INSTALL.TXT     catpages        compat4x        info            tools
 README.HTM      cdrom.inf       crypto          kernel</screen>
 
   <para>If you want to do a CDROM, FTP or NFS installation from this
@@ -31,9 +31,22 @@ README.HTM      cdrom.inf       crypto          kernel</screen>
   is a more thorough description of each item in more detail:
     <orderedlist>
       <listitem>
-	<para>The <filename>*.TXT</filename> files obviously contain
-	documentation (this file is <filename>INSTALL.TXT</filename>) and should be read
-	before starting an installation.</para>
+	<para>The <filename>*.TXT</filename> and
+	<filename>*.HTM</filename> files contain
+	documentation (for example, this document is contained in both
+	<filename>INSTALL.TXT</filename> and
+	<filename>INSTALL.HTM</filename>) and should be read
+	before starting an installation.  The
+	<filename>*.TXT</filename> files are plain text, while the
+	<filename>*.HTM</filename> files are HTML files that can be
+	read by almost any Web browser.  Some distributions may
+	contain documentation in other formats as well, such as PDF or
+	PostScript.</para>
+      </listitem>
+      <listitem>
+        <para><filename>docbook.css</filename> is a Cascading Style
+        Sheet (CSS) file used by some Web browsers for formatting the
+        HTML documentation.
       </listitem>
       <listitem>
 	<para>The <filename>XF86336</filename> directory contains the
@@ -42,14 +55,27 @@ README.HTM      cdrom.inf       crypto          kernel</screen>
 	distribution.</para>
       </listitem>
       <listitem>
-	<para>The <filename>bin</filename>, <filename>dict</filename>, <filename>crypto</filename>, <filename>doc</filename>, <filename>games</filename>, <filename>info</filename>, <filename>manpages</filename>,
-	<filename>proflibs</filename>, and <filename>src</filename> directories contain the primary distribution
+	<para>The <filename>bin</filename>,
+	<filename>catpages</filename>,
+	<filename>crypto</filename>, 
+	<filename>dict</filename>,
+	<filename>doc</filename>,
+	<filename>games</filename>,
+	<filename>info</filename>, 
+	<filename>manpages</filename>,
+	<filename>proflibs</filename>, and 
+	<filename>src</filename> directories contain the primary distribution
 	components of &os; itself and are split into smaller files
 	for easy packing onto floppies (should that be
 	necessary).</para>
       </listitem>
       <listitem>
-	<para>The <filename>compat1x</filename>, <filename>compat20</filename>, <filename>compat21</filename>, <filename>compat22</filename>, and <filename>compat3x</filename>
+	<para>The <filename>compat1x</filename>,
+	<filename>compat20</filename>,
+	<filename>compat21</filename>,
+	<filename>compat22</filename>,
+	<filename>compat3x</filename>, and
+	<filename>compat4x</filename>
 	directories contain distributions for compatibility with older
 	releases and are distributed as single gzip'd tar files - they
 	can be installed during release time or later by running their
@@ -62,7 +88,7 @@ README.HTM      cdrom.inf       crypto          kernel</screen>
       </listitem>
       <listitem>
 	<para>The <filename>packages</filename> and <filename>ports</filename> directories contain the &os;
-	packages and ports collections.  Packages may be installed from
+	Packages and Ports Collections.  Packages may be installed from
 	the packages directory by running the command:</para>
 
 	<screen>&prompt.root;<userinput>/stand/sysinstall configPackages</userinput></screen>
@@ -70,7 +96,7 @@ README.HTM      cdrom.inf       crypto          kernel</screen>
 	<para>Packages can also be installed by feeding individual
 	filenames in <filename>packages</filename>/ to the &man.pkg.add.1; command.</para>
 
-	<para>The ports collection may be installed like any other
+	<para>The Ports Collection may be installed like any other
 	distribution and requires about 100MB unpacked.  More
 	information on the ports collection may be obtained from
 	<ulink url="http://www.FreeBSD.org/ports/">http://www.FreeBSD.org/ports/</ulink> or locally from
@@ -86,8 +112,7 @@ README.HTM      cdrom.inf       crypto          kernel</screen>
     </orderedlist>
   </para>
 
-  <para>A typical distribution (we'll use the <filename>info</filename> distribution as an
-  example) looks like this internally:</para>
+  <para>A typical distribution directory (for example, the <filename>info</filename> distribution) looks like this internally:</para>
 
 <screen>CHECKSUM.MD5    info.ab         info.ad         info.inf        install.sh
 info.aa         info.ac         info.ae         info.mtree</screen>
@@ -126,8 +151,4 @@ info.aa         info.ac         info.ae         info.mtree</screen>
 
   <screen>&prompt.root; <userinput>cd /cdrom/info</userinput>
 &prompt.root; <userinput>sh install.sh</userinput></screen>
-
-  <para>And that's all there is to it!  Each distribution contains its
-  own <filename>install.sh</filename> file for this.</para>
-
 </sect1>
diff --git a/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml b/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml
index a0e148c..de222af 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml
@@ -9,12 +9,13 @@
   <sect2 id="repairing">
     <title>Repairing an Existing &os; Installation</title>
 
-    <para>&os; releases 2.2.1 and later feature a
+    <para>&os; features a
     <quote>Fixit</quote> option in the top menu of the boot floppy.
     To use it, you will also need either a
     <filename>fixit.flp</filename> image floppy, generated in the same
-    fashion as the boot floppy, or the 2nd CDROM from Walnut Creek
-    CDROM's &os; distribution.</para>
+    fashion as the boot floppy, or the <quote>live filesystem</quote>
+    CDROM; typically the second CDROM in a multi-disc &os; 
+    distribution.</para>
 
     <para>To invoke fixit, simply boot the
     <filename>kern.flp</filename> floppy, choose the
@@ -24,7 +25,7 @@
     and <filename>/mnt2/stand</filename> directories) for checking,
     repairing and examining file systems and their contents.  Some
     UNIX administration experience <emphasis>is</emphasis> required to
-    use the fixit option!</para>
+    use the fixit option.</para>
   </sect2>
 
   <sect2>
@@ -227,7 +228,7 @@
 
           <para>Another possibility is that your card is at IRQ 9,
           which is shared by IRQ 2 and frequently a cause of problems
-          (especially when you have a VGA card using IRQ 2! :).  You
+          (especially when you have a VGA card using IRQ 2!).  You
           should not use IRQ 2 or 9 if at all possible.</para>
 	</answer>
       </qandaentry>
diff --git a/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml b/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml
index 0ddf038..e0cc90b 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml
@@ -28,12 +28,8 @@
     this regard is the use of an old copy of &man.sysinstall.8; from
     an existing installation to upgrade to a newer version of
     &os;.  This is <emphasis>not</emphasis> recommended.</para>
-
-    <para>Furthermore, if you are upgrading from &os; 2.2.5 or
-    earlier, see <xref linkend="fstab"> for important details regarding changes
-    to the <filename>/etc/fstab</filename> file required during the upgrade procedure.</para>
   </important>
-  
+
   <sect2>
     <title>Introduction</title>
 
@@ -58,6 +54,7 @@
       restoring the previous version of the following files:</para>
 
       <para><filename>Xaccel.ini</filename>,
+<filename>XF86Config</filename>,
 <filename>adduser.conf</filename>,
 <filename>aliases</filename>,
 <filename>aliases.db</filename>,
@@ -66,9 +63,10 @@
 <filename>csh.cshrc</filename>,
 <filename>csh.login</filename>,
 <filename>csh.logout</filename>,
-<filename>daily</filename>,
+<filename>cvsupfile</filename>,
 <filename>disktab</filename>,
 <filename>dm.conf</filename>,
+<filename>dumpdates</filename>,
 <filename>exports</filename>,
 <filename>fbtab</filename>,
 <filename>fstab</filename>,
@@ -77,51 +75,50 @@
 <filename>gnats</filename>,
 <filename>group</filename>,
 <filename>hosts</filename>,
+<filename>host.conf</filename>,
 <filename>hosts.equiv</filename>,
 <filename>hosts.lpd</filename>,
 <filename>inetd.conf</filename>,
 <filename>kerberosIV</filename>,
 <filename>localtime</filename>,
 <filename>login.access</filename>,
+<filename>login.conf</filename>,
+<filename>mail</filename>,
 <filename>mail.rc</filename>,
 <filename>make.conf</filename>,
 <filename>manpath.config</filename>,
 <filename>master.passwd</filename>,
-<filename>mib.txt</filename>,
 <filename>modems</filename>,
-<filename>monthly</filename>,
 <filename>motd</filename>,
 <filename>namedb</filename>,
 <filename>networks</filename>,
+<filename>newsyslog.conf</filename>,
 <filename>nsswitch.conf</filename>,
+<filename>pam.conf</filename>,
 <filename>passwd</filename>,
-<filename>phones</filename>,
+<filename>periodic</filename>,
 <filename>ppp</filename>,
 <filename>printcap</filename>,
 <filename>profile</filename>,
-<filename>protocols</filename>,
 <filename>pwd.db</filename>,
-<filename>rc</filename>,
+<filename>rc.conf</filename>,
+<filename>rc.conf.local</filename>,
 <filename>rc.firewall</filename>,
-<filename>rc.i386</filename>,
 <filename>rc.local</filename>,
-<filename>rc.network</filename>,
-<filename>rc.conf</filename>,
 <filename>remote</filename>,
 <filename>resolv.conf</filename>,
 <filename>rmt</filename>,
-<filename>security</filename>,
 <filename>sendmail.cf</filename>,
+<filename>sendmail.cw</filename>,
 <filename>services</filename>,
 <filename>shells</filename>,
 <filename>skeykeys</filename>,
 <filename>spwd.db</filename>,
-<filename>supfile,</filename>
+<filename>ssh</filename>,
 <filename>syslog.conf</filename>,
-<filename>termcap</filename>,
 <filename>ttys</filename>,
-<filename>uucp</filename>,
-<filename>weekly</filename></para>
+<filename>uucp</filename>
+</para>
 
       <para>The versions of these files which correspond to the new
       version are moved to <filename>/etc/upgrade/</filename>.  The
@@ -188,56 +185,6 @@
       system configuration is valid.  In particular, the
       <filename>/etc/rc.conf</filename> and
       <filename>/etc/fstab</filename> files should be checked.</para>
-
-      <para>Read the following, but <emphasis>do not</emphasis> update
-      <filename>/etc/fstab</filename> as described below until the new
-      system has booted correctly.  The upgrade procedure replaces the
-      previous &os; kernel with a <filename>GENERIC</filename> kernel,
-      and a custom kernel may need to be generated to suit the local
-      system configuration.</para>
-
-      <important>
-	<para>&os; 2.2.6 introduced a change in the naming of the
-	device from which the root filesystem is mounted.  This
-	change affects all systems, however user intervention is
-	only required for systems undergoing an upgrade installation
-	from a version prior to &os; 2.2.6.</para>
-
-	<para>Previously, the root filesystem was always mounted from
-	the compatibility slice, while other partitions on the same
-	disk were mounted from their true slice.  This might, for
-	example, have resulted in an <filename>/etc/fstab</filename>
-	file like:</para>
-
-<screen># Device      Mountpoint      FStype  Options         Dump    Pass#
-/dev/wd0s2b   none            swap    sw              0       0
-/dev/wd0a     /               ufs     rw              1       1
-/dev/wd0s2f   /local0         ufs     rw              1       1
-/dev/wd0s2e   /usr            ufs     rw              1       1</screen>
-
-        <para>For &os; 2.2.6 and later, this format changes so that
-        the device for <filename>/</filename> is consistent with
-        others.  Also, the driver for the ATA-drives has changed from
-        &man.wd.4; to &man.ad.4;, so the new file could look something
-        like:</para>
-
-<screen># Device      Mountpoint      FStype  Options         Dump    Pass#
-/dev/ad0s2b   none            swap    sw              0       0
-/dev/ad0s2a   /               ufs     rw              1       1
-/dev/ad0s2f   /local0         ufs     rw              1       1
-/dev/ad0s2e   /usr            ufs     rw              1       1</screen>
-
-	<para>If <filename>/etc/fstab</filename> is not updated
-	manually in this case, the system will issue a warning message
-	whenever <filename>/</filename> is mounted (normally at
-	startup) indicating the change that must be made.  In
-	addition, trouble may be experienced if the root filesystem is
-	not correctly unmounted, whereby the root filesystem will not
-	be marked clean at the next reboot.</para>
-
-	<para>This change should be made as soon as the upgraded
-	system has been successfully rebooted.</para>
-      </important>
     </sect3>
   </sect2>
 
diff --git a/release/doc/en_US.ISO8859-1/installation/i386/Makefile b/release/doc/en_US.ISO8859-1/installation/i386/Makefile
index 19de1c1..36f855e 100644
--- a/release/doc/en_US.ISO8859-1/installation/i386/Makefile
+++ b/release/doc/en_US.ISO8859-1/installation/i386/Makefile
@@ -10,8 +10,8 @@ INSTALL_ONLY_COMPRESSED?=
 # SGML content
 SRCS+=	article.sgml
 SRCS+=	../common/artheader.sgml
+SRCS+=	../common/abstract.sgml
 SRCS+=	../common/install.sgml
-SRCS+=	../common/floppies.sgml
 SRCS+=	../common/layout.sgml
 SRCS+=	../common/trouble.sgml
 SRCS+=	../common/upgrade.sgml
diff --git a/release/doc/en_US.ISO8859-1/installation/i386/article.sgml b/release/doc/en_US.ISO8859-1/installation/i386/article.sgml
index 007a794..9a3922e 100644
--- a/release/doc/en_US.ISO8859-1/installation/i386/article.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/i386/article.sgml
@@ -19,9 +19,9 @@
 
 <article>
 &artheader;
+&abstract;
 &sect.install;
 &sect.layout;
-&sect.floppies;
 &sect.upgrade;
 &sect.trouble;
 </article>