Various tweaks to things I noticed while reading these docs.

4 files changed, 124 insertions, 100 deletions

diff --git a/share/doc/FAQ/freebsd-faq.sgml b/share/doc/FAQ/freebsd-faq.sgml
index 52dc652..630eaad 100644
--- a/share/doc/FAQ/freebsd-faq.sgml
+++ b/share/doc/FAQ/freebsd-faq.sgml
@@ -4,7 +4,7 @@
 
 <title>Frequently Asked Questions for FreeBSD 2.X
 <author>The FreeBSD FAQ Team, <tt/FAQ@FreeBSD.ORG/
-<date> $Id: freebsd-faq.sgml,v 1.20 1995/11/20 22:32:13 roberto Exp $
+<date> $Id: freebsd-faq.sgml,v 1.21 1995/11/20 22:51:01 roberto Exp $
 <abstract>
 This is the FAQ for FreeBSD systems version 2.X  All entries are
 assumed to be relevant to FreeBSD 2.0.5+, unless otherwise noted.
@@ -296,11 +296,13 @@ Any entries with a &lt;XXX&gt; are under construction.
           This is, I believe, one of the most fundamental goals of Free
           Software and one that we enthusiastically support.
 
-          Our GNU code does make for some strings, which we dislike and
-          endevour to replace whenver possible, but at least those strings
-          are in the direction of greater, rather than lesser, "openness"
-          in how the code is shared and distributed and so is a string we
-          can reasonably live with.
+          That code in our source tree which falls under the GNU Public License
+          (GPL) or GNU Library Public License (GLPL) comes with slightly more
+          strings attached, though at least on the side of enforced
+          access rather than the usual opposite.  Due to the additional
+          complexities that can evolve in the commercial use of GPL software,
+          we do, however, endevor to replace such software with submissions
+          under the more relaxed BSD copyright whenever possible.
 
     <sect>
       <heading>Installation</heading>
diff --git a/share/doc/handbook/eresources.sgml b/share/doc/handbook/eresources.sgml
index 2bd3555..87e31a0 100644
--- a/share/doc/handbook/eresources.sgml
+++ b/share/doc/handbook/eresources.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: eresources.sgml,v 1.2.4.3 1995/11/07 18:24:44 jfieber Exp $ -->
+<!-- $Id: eresources.sgml,v 1.15 1995/11/20 01:10:16 jfieber Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt>
@@ -34,7 +34,7 @@ keep the signal to noise ratio of the lists high, especially in
 the technical lists.
 
 Archives are kept for all of the mailing lists and can be searched
-using the the <url url="http://www.freebsd.org/"
+using the the <url url="http://www.freebsd.org/search.html"
 name="FreeBSD World Wide Web server">.  The keyword searchable archive
 offers an excellent way to find answers to frequently asked questions
 and should be consulted before posting a question.
@@ -50,7 +50,7 @@ freebsd-announce         Important events / milestones
 freebsd-bugs             Bug reports
 freebsd-chat             Non technical items related to the community
 freebsd-current          Discussions about the use of FreeBSD-current
-freebsd-isp              Issues for ISP's using FreeBSD
+freebsd-isp              Issues for Internet Service Providers using FreeBSD
 freebsd-policy           Policy issues and suggestions
 freebsd-questions        User questions
 </verb>
@@ -61,7 +61,7 @@ your e-mail within the scope of the guidelines.
 <verb>
 List                     Purpose
 ----------------------------------------------------------------------
-freebsd-doc              Documentation project
+freebsd-doc              The FreeBSD Documentation project
 freebsd-fs               Filesystems
 freebsd-hackers          General Technical discussions
 freebsd-hardware         General discussion of FreeBSD hardware
@@ -182,7 +182,7 @@ submitted using "send-pr".
                               community</em><newline>
 This list contains the overflow from the other lists about
 non-technical, social information.  It includes discussion about
-whether Jordan looks like a tune ferret or not, whether or not to
+whether Jordan looks like a toon ferret or not, whether or not to
 type in capitals, who is drinking too much coffee, where the best
 beer is brewed, who is brewing beer in their basement, and so on.
 Occasional announcements of important events (such as upcoming
diff --git a/share/doc/handbook/history.sgml b/share/doc/handbook/history.sgml
index 5b8582c..169328e 100644
--- a/share/doc/handbook/history.sgml
+++ b/share/doc/handbook/history.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: history.sgml,v 1.9 1995/11/14 13:54:06 jkh Exp $ -->
+<!-- $Id: history.sgml,v 1.10 1995/11/15 07:44:56 jkh Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>A brief history of FreeBSD<label id="history"></heading>
@@ -76,31 +76,41 @@ more than a little rough around the edges, the release was a
 significant success and has since been followed by the more robust and
 easier to install FreeBSD 2.0.5 release in June of 1995.
 
-Where to from here?  Well, we intend to release FreeBSD 2.1 sometime
-in November of 1995 and have reasonable expectations that it will
-meet or exceed all of the standards for quality we set with FreeBSD
-1.1.5.1 back in July of 1994.  From there, we'll probably continue our now
-two-track scheme of a "stable" branch of FreeBSD and a "current"
-branch, where development can continue at its usually rapid pace without
-penalizing those who just want a working system without too much excitement.
+<em>Where to from here?</em>
+
+We just released FreeBSD 2.1.0 on November 19th, 1995 and, by all
+accounts, people are pretty happy with it.  We'll therefore continue
+with the 2.1-STABLE branch of FreeBSD (which actually began with 2.0.5)
+well into Q1 of 1996 with at least one additional release:
+FreeBSD 2.1.1.
+
+A 2.1.2 release may follow 2.1.1, though this will depend heavily on the
+status of FreeBSD 2.2 in Q2 of 1996.  2.2 is our development branch,
+where long term projects for everything from NFS v3 to PCCARD support
+are currently taking place.  Preliminary timelines suggest that development
+in 2.2 will begin slowing down and early release engineering simulations
+(2.2 SNAPshots) started in Q1 of 1996.  Given a favorable prognosis for 2.2's
+general health, a migration to 2.2 will then begin in early Q2 of '96 and
+a new 2.3 branch created for next-generation development.  Around the
+time that 2.2-RELEASE is produced (late Q2 1996), the 2.1.x lineage will
+also be phased out.
+
 We also intend to focus on any remaining areas of weakness, like documentation
 or missing drivers, and steadily increase the overall quality and feature set
 of the system well into 1996 and beyond.
 
-It should also be noted that the development of FreeBSD is <em>not</em> a closed
-process, despite some popular misconceptions to the contrary, and anyone
-is free to contribute code or ideas.  Once a contributor has established
-a reasonable track record for reliability, we generally even give them direct
-access to the central source tree (kept under CVS) where their changes will
-propagate automatically to all users of FreeBSD.  Our centralised development
-model is designed for the convenience of the <em>users</em> of FreeBSD, who
-are thus provided with an easy way of tracking one central code base, not
-to keep potential contributors out!  Anyone and everyone is free to
-contribute, and people who've shown a consistent and significant dedication
-to the project are generally asked to join the FreeBSD core team to 
-help in setting the project's overall directions and goals.  No part of the
-project is closed to additional members, and all we ask of those wishing for
-closer ties to the project is the same dedication its current members have
+Now might also be a good time to note that the development of FreeBSD is
+<em>not</em> a closed process, despite some popular misconceptions to the
+contrary, and anyone is free to contribute code or ideas.  Once a contributor
+has established a reasonable track record for reliability, we generally, in
+fact, give them write access to the project's CVS repository, where their
+changes can propagate automatically to other users of FreeBSD.  Our
+centralised development model is designed for the convenience of the
+<em>users</em> of FreeBSD, who are thereby provided with an easy way of
+tracking one central code base, not to keep potential contributors out!
+Individuals who've shown a consistent and significant dedication to the project
+are even often asked to join the FreeBSD core team to help in setting
+the project's overall directions and goals, so truly no part of the project
+is closed to additional members.  All we ask of those wishing for closer
+ties to this project is some of the same dedication its current members have
 to its continued success!
-
-					Jordan
diff --git a/share/doc/handbook/install.sgml b/share/doc/handbook/install.sgml
index 7b68e4d..db30d99 100644
--- a/share/doc/handbook/install.sgml
+++ b/share/doc/handbook/install.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: install.sgml,v 1.9.2.5 1995/10/30 17:48:19 jfieber Exp $ -->
+<!-- $Id: install.sgml,v 1.16 1995/11/20 01:10:23 jfieber Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
@@ -156,7 +156,7 @@ Boot:
 	configurations, various SCSI controller, network and
 	serial cards is also provided.
 
-	A minimum of four megabytes of RAM is required to run FreeBSD.
+	A minimum of five megabytes of RAM is required to run FreeBSD.
 	To run the X-window system, eight megabytes of RAM is the
 	recommended minimum.
 
@@ -200,18 +200,18 @@ Boot:
 	      more details.
 
 	    <item>Buslogic 545S &amp; 545c
-		<bf>Note:</bf> that Buslogic was formerly known as "Bustec".
+		<bf>Note:</bf> that Buslogic was formerly known as "Bustek".
 	    <item>Buslogic 445S/445c VLB SCSI controller
-	    <item>Buslogic 742A, 747S, 747c EISA SCSI controller.
+	    <item>Buslogic 742A/747S/747c EISA SCSI controller.
 	    <item>Buslogic 946c PCI SCSI controller
 	    <item>Buslogic 956c PCI SCSI controller
 
-	    <item>NCR 53C810 and 53C825 PCI SCSI controller.
+            <item>NCR 53C810/53C815/53C825/53C860/53C875 PCI SCSI controller.
 	    <item>NCR5380/NCR53400 (``ProAudio Spectrum'') SCSI controller. 
 
 	    <item>DTC 3290 EISA SCSI controller in 1542 emulation mode.
 
-	    <item>UltraStor 14F, 24F and 34F SCSI controllers.
+	    <item>UltraStor 14F/24F/34F SCSI controllers.
 
 	    <item>Seagate ST01/02 SCSI controllers.
 
@@ -254,7 +254,21 @@ Boot:
 
 	    <item>DEC EtherWORKS III NICs (DE203, DE204, and DE205)
 	    <item>DEC EtherWORKS II NICs (DE200, DE201, DE202, and DE422)
-	    <item>DEC DC21140 based NICs (SMC???? DE???)
+	    <item>DEC DC21140/DC21141 based NICs:
+		<itemize>
+		<item>ASUS		PCI-L101-TB
+		<item>Accton		ENI1203
+		<item>Cogent		EM960PCI
+		<item>D-Link		DE-530
+		<item>DEC		DE435
+		<item>Danpex		EN-9400P3
+		<item>JCIS		Condor JC1260
+		<item>Linksys		EtherPCI
+		<item>Mylex		LNP101
+		<item>SMC		EtherPower 10/100 (Model 9332)
+		<item>SMC		EtherPower (Model 8432)
+		<item>Zynx		ZX342
+		</itemize>
 	    <item>DEC FDDI (DEFPA/DEFEA) NICs
 
 	    <item>Fujitsu FMV-181 and FMV-182
@@ -284,7 +298,8 @@ Boot:
 
         <p><em>Note:</em> FreeBSD does not currently suppport
           PnP (plug-n-play) features present on some ethernet
-          cards.  If your card has PnP, it should be disabled.
+          cards.  If your card has PnP and is giving you problems,
+          try disabling its PnP features.
 
       <sect1><heading>Miscellaneous devices</heading>
 
@@ -305,8 +320,8 @@ Boot:
 	    <item>SDL Communications Riscom/8 Serial Board.
 
 	    <item>Adlib, SoundBlaster, SoundBlaster Pro,
-	      ProAudioSpectrum, Gravis UltraSound and Roland
-	      MPU-401 sound cards.
+	      ProAudioSpectrum, Gravis UltraSound, Gravis UltraSound MAX
+	      and Roland MPU-401 sound cards.
 
 	  </itemize>
 
@@ -327,14 +342,14 @@ Boot:
 	  IDE CDROM, then please skip to <ref id="install:msdos" 
           name="MS-DOS Preparation">.
 
-	  There is not a lot of preparatory work that needs to be
-	  done to successfully install from one of Walnut Creek's
-	  FreeBSD CDROMs (other CDROM distributions may work as
-	  well, we simply cannot say as we have no hand or say in
-	  their creation).  You can either boot into the CD
-	  installation directly from DOS using Walnut Creek's
-	  supplied ``install.bat'' batch file or you can make a
-	  boot floppy with the ``makeflp.bat'' command.
+	  There is not a lot of preparatory work that needs to be done to
+	  successfully install from one of Walnut Creek's FreeBSD CDROMs (other
+	  CDROM distributions may work as well, though we cannot say for certain
+	  as we have no hand or say in how they're created).  You can either
+	  boot into the CD installation directly from DOS using Walnut Creek's
+	  supplied ``install.bat'' batch file or you can make a boot floppy with
+	  the ``makeflp.bat'' command [NOTE: If you're using an IDE CDROM, use
+	  the inst_ide.bat or atapiflp.bat batch files instead].
 
 	  For the easiest interface of all (from DOS), type
 	  ``view''.  This will bring up a DOS menu utility that
@@ -349,27 +364,12 @@ Boot:
 	  menu and load the entire distribution from CDROM.  No
 	  other types of installation media should be required.
 
-	  After your system is fully installed and you have
-	  rebooted from the hard disk, you should find the CD
-	  mounted on the directory <bf>/cdrom</bf>.  A utility
-	  called `lndir' comes with the XFree86 distribution
-	  which you may also find useful: It allows you to create
-	  "link tree" directories to things on Read-Only media
-	  like CDROM.  One example might be something like this:
+	  After your system is fully installed and you have rebooted
+	  from the hard disk, you can mount the cdrom at any time by
+	  typing: <tt>mount /cdrom</tt>
 
-<tscreen><verb>
-mkdir /usr/ports
-lndir /cdrom/ports /usr/ports
-</verb></tscreen>
-
-	  Which would allow you to then ``cd /usr/ports; make''
-	  and get all the sources from the CD, but yet create all
-	  the intermediate files in <bf>/usr/ports</bf>, which is
-	  presumably on a more writable media.
-
-	  This is, in fact, what the Ports entry in the
-	  Configuration menu does at installation time if you
-	  select it.
+	  Before removing the CD again, also note that it's necessary to first
+	  type: <tt>umount /cdrom</tt>.  Don't just remove it from the drive!
 
 	  <quote><bf>Special note:</bf> Before invoking the
 	    installation, be sure that the CDROM is in the drive
@@ -377,9 +377,8 @@ lndir /cdrom/ports /usr/ports
 	    true if you wish the CDROM to be added to the default
 	    system configuration automatically during the install
 	    (whether or not you actually use it as the
-	    installation media). <!-- XXX This will be fixed for
-	    2.1, but for now this simple work-around will ensure
-	    that your CDROM is detected properly. --></quote>
+	    installation media).
+	  </quote>
 
 	  Finally, if you would like people to be able to FTP
 	  install FreeBSD directly from the CDROM in your
@@ -392,8 +391,8 @@ lndir /cdrom/ports /usr/ports
 ftp:*:99:99::0:0:FTP:/cdrom:/nonexistent
 </verb></tscreen>
 
-	  No further work is necessary.  The other installers
-	  will now be able to chose a Media type of FTP and type
+	  Anyone with network connectivity to your machine (and permission
+	  to log into it) can now chose a Media type of FTP and type
 	  in: <tt>ftp://<em>your machine</em></tt> after picking ``Other''
 	  in the ftp sites menu.
 
@@ -404,28 +403,41 @@ ftp:*:99:99::0:0:FTP:/cdrom:/nonexistent
 	  things the hard way, you must first prepare some
 	  floppies for the install.
 
-	  The first floppy you will need is ``floppies/root.flp'',
-	  which is somewhat special in that it is not a DOS
-	  filesystem floppy at all, but rather an ``image''
-	  floppy (it is actually a gzip'd cpio file).  You can use
-	  the rawrite.exe program to do this under DOS, or dd to
-	  do it on a UNIX Workstation.  See <ref id="install"
-	  name="the beginning of this guide"> for examples. of
-	  how to create the boot floppy.  Once this floppy is
-	  made, go on to make the distribution set floppies:
-
-	  You will need, at minimum, as many 1.44MB or 1.2MB
-	  floppies as it takes to hold all files in the bin
-	  (binary distribution) directory.  These floppies
-	  <em>must</em> be formatted using MS-DOS, using the
-	  FORMAT command in MS-DOS or the File Manager format
-	  command in Microsoft Windows(tm).  Do <em>not</em>
-	  trust Factory Preformatted floppies.  Format them again
-	  yourself, just to make sure.
-
-	  Many problems reported by our users in the past have
-	  resulted from the use of improperly formatted media, so
-	  we simply take special care to mention it here!
+
+	  The first floppy you'll need in addition to the boot.flp image is
+	  ``floppies/root.flp'', which is somewhat special in that it's not a
+	  DOS filesystem floppy at all, but rather a floppy "image" (it's
+	  actually a gzip'd cpio file).  You can create this floppy in the same
+	  way that you created the boot floppy <ref id="install"
+	    name="the beginning of this guide">.  Once this floppy is
+	  made, you can go on to make the distribution set floppies
+	  using ordinary DOS or UFS (if you're preparing the floppies on
+	  another FreeBSD machine) formatted diskettes.
+
+	  You will need, at minimum, as many 1.44MB or 1.2MB floppies as
+	  it takes to hold all files in the bin (binary distribution)
+	  directory.  If you're preparing these floppies under DOS, then
+	  THESE floppies *must* be formatted using the MS-DOS FORMAT
+	  command.  If you're using Windows, use the Windows File
+	  Manager format command.
+
+	  Do <em>not</em> trust Factory Preformatted floppies!  Format
+	  them again yourself, just to make sure.  Many problems
+	  reported by our users in the past have resulted from the use
+	  of improperly formatted media, which is why I'm taking such
+	  special care to mention it here!
+
+	  If you're creating the floppies from another FreeBSD machine,
+	  a format is still not a bad idea though you don't need to put
+	  a DOS filesystem on each floppy.  You can use the `disklabel'
+	  and `newfs' commands to put a UFS filesystem on them instead,
+	  like so:
+<tscreen><verb>
+disklabel -w -r fd0 floppy3     (use floppy5 for 1.2MB disks)
+newfs /dev/rfd0
+</verb></tscreen>
+	  Then you can mount and write to them like any other file
+	  system.
 
 	  After you have DOS formatted the floppies, you will
 	  need to copy the files onto them.  The distribution