From owner-doc-jp@jp.freebsd.org  Sat Oct 26 23:33:42 1996
Received: by jaz.jp.freebsd.org (8.7.3+2.6Wbeta5/8.7.3) id XAA00464
	Sat, 26 Oct 1996 23:33:42 +0900 (JST)
Received: by jaz.jp.freebsd.org (8.7.3+2.6Wbeta5/8.7.3) with SMTP id XAA00428
	for <doc-jp@jp.freebsd.org>; Sat, 26 Oct 1996 23:31:12 +0900 (JST)
Received: from miserver.minet.my (j14.brf22.jaring.my [161.142.2.92]) by relay3.jaring.my (8.6.13/8.6.12) with ESMTP id VAA01359; Sat, 26 Oct 1996 21:31:58 +0800
Message-Id: <199610261331.VAA01359@relay3.jaring.my>
Received: from localhost (localhost.jaring.my [127.0.0.1]) by miserver.minet.my (8.8.2/3.4W3) with ESMTP id VAA18256; Sat, 26 Oct 1996 21:31:49 +0800 (SGT)
To: doc-jp@jp.freebsd.org
Cc: iwasaki@pc.jaring.my
X-Mailer: Mew version 1.06 on Emacs 19.28.1, Mule 2.3
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
	boundary="--Next_Part(Sat_Oct_26_21:31:45_1996)--"
Date: Sat, 26 Oct 1996 21:31:47 +0800
From: Mitsuru IWASAKI <iwasaki@pc.jaring.my>
Reply-To: doc-jp@jp.freebsd.org
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=19]
X-Sequence: doc-jp 1428
Subject: [doc-jp 1428] Japanese Handbook vs. -current
Errors-To: owner-doc-jp@jp.freebsd.org
Sender: owner-doc-jp@jp.freebsd.org

----Next_Part(Sat_Oct_26_21:31:45_1996)--
Content-Type: Text/Plain; charset=iso-2022-jp

$B$$$o$5$-$G$9!#(B

$B8=:_$NF|K\8l%O%s%I%V%C%/$N4p$K$J$C$F$$$k86J8$N%j%S%8%g%s$H(B -current $B$H$N(B
$BP*N%$N>u67$r!"%U%!%$%kKh$K$^$H$a$^$7$?!#(B

# diff $B$bF~$l$F$"$k$N$G7k9=$JJ,NL$G$9!#(B

$B;29M$K$7$F2<$5$$!#(B
                               o
                         [=]   O
                        (.~.)_P
+==================oooO==( )//Oooo=================+
|Mitsuru Iwasaki                                   |
|15A-1-3, Scots Tower, MONT' KIARA CONDOMINIUM,    |
|Jalan 1/70C, Off Bikit Kiara, 50480 Kuala Lumpur  |
|TEL: 03-253-8579                    _/_/_/    _/  |
|FAX: 03-253-8579                   _/_/_/    _/   |
|e-mail: iwasaki@sirim.my(OFFICE)  _/  _/ _/ _/    |
|        iwasaki@pc.jaring.my(HOME)                |
|        JAA03673@niftyserve.or.jp(JAPAN)          |
+==================================================+

----Next_Part(Sat_Oct_26_21:31:45_1996)--
Content-Type: Text/Plain; charset=iso-2022-jp

	    $B!VF|K\8l%O%s%I%V%C%/$H(B -current$B86J8$H$NP*N%>u67!W(B
10$B7n(B26$BF|8=:_(B

o Filename		Japanese	-current

o authors.sgml		1.3.4.6		1.37

o basics.sgml		1.1.1.1.4.4		1.1.1.1.4.4

o bibliography.sgml	1.14		1.14

o boothelp.sgml		1.1.2.1		1.1.2.1

o booting.sgml		1.2.4.5		1.2.4.5

o contrib.sgml		1.145	1.145

o crypt.sgml		1.1		1.1

o ctm.sgml		1.1.1.1.4.5	1.12
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/ctm.sgml,v
retrieving revision 1.1.1.1.4.5
retrieving revision 1.12
diff -u -r1.1.1.1.4.5 -r1.12
--- src/share/doc/handbook/ctm.sgml     1996/06/19 20:27:32     1.1.1.1.4.5
+++ src/share/doc/handbook/ctm.sgml     1996/09/22 15:40:08     1.12
@@ -3,7 +3,7 @@
 #
 # Converted by Ollivier Robert <roberto@FreeBSD.ORG>
 #
-# $Id: ctm.sgml,v 1.1.1.1.4.5 1996/06/19 20:27:32 jkh Exp $
+# $Id: ctm.sgml,v 1.12 1996/09/22 15:40:08 wosch Exp $
 #
 # ----------------------------------------------------------------------------
 # "THE BEER-WARE LICENSE" (Revision 42):
@@ -60,6 +60,8 @@
 
         <url url="ftp://freefall.cdrom.com/pub/CTM">
 
+       or see section <ref id="mirrors-ctm" name="mirrors">.
+
         FTP the relevant directory and fetch the <tt/README/ file,
         starting from there.
 
@@ -185,13 +187,13 @@
     <sect1><heading>Thanks!</heading>
       <p>
         <descrip>
-          <tag/Bruce Evans/
+          <tag/&a.bde;/
             for his pointed pen and invaluable comments.
-          <tag/S&oslash;ren Schmidt/
-            for patience.
+          <tag/&a.sos;/
+           for patience.
           <tag/Stephen McKay/
             wrote <tt/ctm_&lsqb;rs&rsqb;mail/, much appreciated.
-          <tag/Jordan Hubbard/
+          <tag/&a.jkh;/
             for being so stubborn that I had to make it better.
           <tag/All the users/
             I hope you like it...


o current.sgml		1.2.4.6	1.16
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/current.sgml,v
retrieving revision 1.2.4.6
retrieving revision 1.16
diff -u -r1.2.4.6 -r1.16
--- src/share/doc/handbook/current.sgml 1996/07/12 16:33:21     1.2.4.6
+++ src/share/doc/handbook/current.sgml 1996/09/09 23:21:27     1.16
@@ -1,4 +1,4 @@
-<!-- $Id: current.sgml,v 1.2.4.6 1996/07/12 16:33:21 jkh Exp $ -->
+<!-- $Id: current.sgml,v 1.16 1996/09/09 23:21:27 jfieber Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 
@@ -10,7 +10,7 @@
 
                         THE FREEBSD CURRENT POLICY 
 
-Last updated: $Date: 1996/07/12 16:33:21 $
+Last updated: $Date: 1996/09/09 23:21:27 $
 
 This document attempts to explain the rationale behind
 FreeBSD-current, what you should expect should you decide to run it,
@@ -70,15 +70,13 @@
 
         We do our best to help people genuinely in one of the 3
         ``legitimate'' FreeBSD-current categories, but we simply <em>do not
-        have the time</em> to help every person who jumps into FreeBSD-current
-        with more enthusiasm than knowledge of how to deal with
-        experimental system software.  This is not because we are mean and
-        nasty people who do not like helping people out (we would not even be
-        doing FreeBSD if we were),  it is literally because we cannot answer
-        400 messages a day <em>and</em> actually work on FreeBSD!  I am sure
-        that, if given the choice between having us answer lots of questions or
-        continuing to improve FreeBSD, most of you would vote for us
-        improving it.
+        have the time</em> to provide tech support for it.
+        This is not because we are mean and nasty people who do not like
+        helping people out (we would not even be doing FreeBSD if we were),
+        it is literally because we cannot answer 400 messages a day
+        <em>and</em> actually work on FreeBSD!  I am sure that, if given
+        the choice between having us answer lots of questions or continuing to
+        improve FreeBSD, most of you would vote for us improving it.
 </enum>
 
 <sect><heading>Using FreeBSD-current</heading>
@@ -100,8 +98,8 @@
 
         To join these lists, send mail to &a.majordomo and specify:
 <verb>
-            subscribe current
-            subscribe cvs-all
+subscribe freebsd-current
+subscribe cvs-all
 </verb>
         In the body of your message.  Optionally, you can also say `help'
         and Majordomo will send you full help on how to subscribe and
@@ -124,7 +122,7 @@
 
         <item>  Use ftp.  The source tree for FreeBSD-current is always
             "exported" on:
-            <htmlurl url="ftp://ftp.FreeBSD.ORG/pub/FreeBSD/FreeBSD-stable"
+            <htmlurl url="ftp://ftp.FreeBSD.ORG/pub/FreeBSD/FreeBSD-current"
             name="ftp://ftp.FreeBSD.ORG/pub/FreeBSD/FreeBSD-current">
             We also use `wu-ftpd' which allows compressed/tar'd grabbing
             of whole trees.  e.g. you see:
@@ -153,7 +151,7 @@
     <item>  Before compiling current, read the Makefile in /usr/src
        carefully.  You should at least run a `make world' the first time
         through as part of the upgrading process.
-        Reading the &a.hackers will keep you up-to-date on other
+        Reading the &a.current will keep you up-to-date on other
         bootstrapping procedures that sometimes become necessary as we move
         towards        the next release.
 

o cyclades.sgml		1.1		1.1

o development.sgml	NA		1.6

o dialup.sgml		1.13		1.13

o diskless.sgml		1.7		1.7

o dma.sgml		1.1.2.4		1.1.2.4

o eresources.sgml	1.28		1.28

o esdi.sgml		1.2.2.2		1.8
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/esdi.sgml,v
retrieving revision 1.2.2.2
retrieving revision 1.8
diff -u -r1.2.2.2 -r1.8
--- src/share/doc/handbook/esdi.sgml    1996/06/19 20:27:42     1.2.2.2
+++ src/share/doc/handbook/esdi.sgml    1996/10/05 18:36:15     1.8
@@ -1,4 +1,4 @@
-<!-- $Id: esdi.sgml,v 1.2.2.2 1996/06/19 20:27:42 jkh Exp $ -->
+<!-- $Id: esdi.sgml,v 1.8 1996/10/05 18:36:15 wosch Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
@@ -57,7 +57,7 @@
        between all the drives. So, it forms a bus onto which all
        drives are connected.
 
-       The second cable is a a 20 pin flat cable edge connector that
+       The second cable is a 20 pin flat cable edge connector that
        carries the data to and from the drive. This cable is radially
        connected, so each drive has its own direct connection to the
        controller.


o firewalls.sgml	1.1.2.6		1.14		1.8
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/firewalls.sgml,v
retrieving revision 1.1.2.6
retrieving revision 1.14
diff -u -r1.1.2.6 -r1.14
--- src/share/doc/handbook/firewalls.sgml       1996/07/05 11:30:16     1.1.2.6
+++ src/share/doc/handbook/firewalls.sgml       1996/10/04 22:54:01     1.14
@@ -1,4 +1,4 @@
-<!-- $Id: firewalls.sgml,v 1.1.2.6 1996/07/05 11:30:16 jkh Exp $ -->
+<!-- $Id: firewalls.sgml,v 1.14 1996/10/04 22:54:01 wosch Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>Firewalls<label id="firewalls"></heading>
@@ -137,11 +137,11 @@
 specify that packets should be logged in the filter rules, nothing
 will happen.
 
-<tag/options "IPFIREWALL_VERBOSE_LIMIT=10"/ Limits the number of
+<tag/options IPFIREWALL_VERBOSE_LIMIT=10/ Limits the number of
 packets logged through <tt>syslogd(8)</tt> on a per entry basis.
 You may wish to use this option in hostile environments in which
 you want to log firewall activity, but do not want to be open to
-a denial of serivce attack via syslog flooding.
+a denial of service attack via syslog flooding.
 
 <p>When a chain entry reaches the packet limit specified, logging
 is turned off for that particular entry.  To resume logging, you
@@ -188,7 +188,7 @@
 <p>There is one valid flag when using this form of the command:
 
 <descrip>
-<tag/-N/Resolve addresses and service names.
+<tag/-N/Resolve addresses and service names in output.
 </descrip>
 
 The <em>command</em> given can be shortened to the shortest unique
@@ -221,7 +221,8 @@
 <tag/reject/Drop the packet, and send an ICMP host or port
 unreachable (as appropriate) packet to the source.
 
-<tag/allow/Pass the packet on as normal.
+<tag/allow/Pass the packet on as normal. (aliases: <bf>pass</bf> and
+<bf>accept</bf>)
 
 <tag/deny/Drop the packet.  The source is not notified via an ICMP
 message (thus it appears that the packet never arrived at the
@@ -230,9 +231,6 @@
 <tag/count/Update packet counters but do not allow/deny the packet
 based on this rule.  The search continues with the next chain entry.
 
-<tag/reject/Discard the packet, sending an ICMP host/port unreachable
-message back to the source.
-
 </descrip>
 
 <p>Each <em>action</em> will be recognized by the shortest unambiguous
@@ -305,7 +303,7 @@
 
 <descrip>
 
-<tag/frag/Matches if the packet is the first fragment of the datagram.
+<tag/frag/Matches if the packet is not the first fragment of the datagram.
 
 <tag/in/Matches if the packet is on the way in.
 
@@ -360,7 +358,7 @@
 listing is incompatible with the input syntax used by the
 <tt>ipfw(8)</tt> utility.
 
-<tag/-N/Do not attempt to resolve given addresses.
+<tag/-N/Attempt to resolve given addresses and service names.
 
 </descrip>
 
@@ -491,15 +489,9 @@
 
 <itemize>
 
- <item>Block all incoming access to ports below 1000 for TCP. This is
+ <item>Block all incoming access to ports below 1024 for TCP. This is
 where most of the security sensitive services are, like finger, SMTP
 (mail) and telnet.
-
- <item>Block incoming SYN (<bf>setup</bf>) connections to ports
-between 1001 and 1024 (this will allow internal users to rsh/rlogin to
-the outside). If you do not want to allow rsh/rlogin connections from
-the inside to the outside, then extend the above suggestion to cover
-ports 1-1024.
 
  <item>Block <bf>all</bf> incoming UDP traffic. There are very few
 useful services that travel over UDP, and what useful traffic there is


o glossary.sgml		NA		1.1.1.1.4.2

o goals.sgml		1.1.2.1		1.1.2.1

o handbook.sgml		1.58		1.58

o history.sgml		1.15		1.16
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/history.sgml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- src/share/doc/handbook/history.sgml 1996/08/21 07:28:45     1.15
+++ src/share/doc/handbook/history.sgml 1996/09/09 01:56:58     1.16
@@ -1,4 +1,4 @@
-<!-- $Id: history.sgml,v 1.15 1996/08/21 07:28:45 asami Exp $ -->
+<!-- $Id: history.sgml,v 1.16 1996/09/09 01:56:58 jkh Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>A brief history of FreeBSD<label id="history"></heading>
@@ -78,39 +78,16 @@
 
 <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 will 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 1996 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.
-
-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
-centralized 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 hae 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!
+We just released FreeBSD 2.1.5 in August of 1996, and it appears to be
+doing well enough for us that one last release along the -stable
+branch, 2.1.6, is merited.  This is scheduled for release some time in
+November.
+
+2.2, our development branch where long term projects for everything
+from NFS v3 to PCCARD support is currently taking place, will continue
+to have snapshot releases made of it right up until initial 2.2 code
+freeze, which is scheduled for January of 1997.
+
+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 1997 and beyond.


o hw.sgml		1.46		1.46
 
o install.sgml		1.24		1.38
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/install.sgml,v
retrieving revision 1.24
retrieving revision 1.38
diff -u -r1.24 -r1.38
--- src/share/doc/handbook/install.sgml 1996/02/27 15:57:49     1.24
+++ src/share/doc/handbook/install.sgml 1996/10/05 18:36:16     1.38
@@ -1,4 +1,4 @@
-<!-- $Id: install.sgml,v 1.24 1996/02/27 15:57:49 jfieber Exp $ -->
+<!-- $Id: install.sgml,v 1.38 1996/10/05 18:36:16 wosch Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
@@ -41,7 +41,7 @@
          (IRQ) and IO port addresses. </item>
 
       <item>Download the <url
-         url="ftp://ftp.freebsd.org/pub/FreeBSD/2.1.0-RELEASE/floppies/boot.flp"
+         url="ftp://ftp.FreeBSD.ORG/pub/FreeBSD/&rel.current;-RELEASE/floppies/boot.flp"
          name="installation boot disk image"> file to your hard
          drive, and be sure to tell your browser to
          <em>save</em> rather than <em>display</em>.
@@ -53,7 +53,7 @@
        <itemize>
          <item>If you are using MS-DOS download 
            <url 
-url="ftp://ftp.freebsd.org/pub/FreeBSD/tools/dos-tools/rawrite.exe"
+url="ftp://ftp.FreeBSD.ORG/pub/FreeBSD/tools/dos-tools/rawrite.exe"
              name="rawrite.exe">, then run it:
 <tscreen><verb>
 C:\> rawrite
@@ -80,8 +80,8 @@
        computer.  You should get a boot prompt something like this:
        <tscreen>
 &gt;&gt; FreeBSD BOOT ...<newline>
-Use hd(1,a)/kernel to boot sd0 when wd0 is also installed.<newline>
-Usage: &lsqb;&lsqb;hd(1,a)&rsqb;/kernel&rsqb;&lsqb;-abcCdhrsv&rsqb;<newline>
+Usage: &lsqb;&lsqb;&lsqb;0:&rsqb;&lsqb;wd&rsqb;(0,a)&rsqb;/kernel&rsqb;&lsqb;-abcCdhrsv&rsqb;<newline>
+Use 1:sd(0,a)kernel to boot sd0 if it is BIOS drive 1<newline>
 Use ? for file list or press Enter for defaults<newline>
 Boot: 
        </tscreen>
@@ -156,8 +156,8 @@
        configurations, various SCSI controller, network and
        serial cards is also provided.
 
-       A minimum of five megabytes of RAM is required to run FreeBSD.
-       To run the X-window system, eight megabytes of RAM is the
+       A minimum of four megabytes of RAM is required to run FreeBSD.
+       To run the X Window System, eight megabytes of RAM is the
        recommended minimum.
 
        Following is a list of all disk controllers and Ethernet
@@ -181,6 +181,7 @@
            <item>Adaptec 274x/284x/2940/3940
               (Narrow/Wide/Twin)
              series EISA/VLB/PCI SCSI controllers
+           <item>Adaptec AIC7850 on-board SCSI controllers
            <item>Adaptec
              <!-- AIC-6260 and - actually not working, joerg -->
              AIC-6360 based boards,
@@ -254,7 +255,7 @@
 
            <item>DEC EtherWORKS III NICs (DE203, DE204, and DE205)
            <item>DEC EtherWORKS II NICs (DE200, DE201, DE202, and DE422)
-           <item>DEC DC21140/DC21141 based NICs:
+           <item>DEC DC21040/DC21041/DC21140 based NICs:
                <itemize>
                <item>ASUS              PCI-L101-TB
                <item>Accton            ENI1203
@@ -268,14 +269,19 @@
                <item>Mylex             LNP101
                <item>SMC               EtherPower 10/100 (Model 9332)
                <item>SMC               EtherPower (Model 8432)
+               <item>SMC               EtherPower (2)
                <item>Zynx              ZX342
                </itemize>
            <item>DEC FDDI (DEFPA/DEFEA) NICs
 
            <item>Fujitsu FMV-181 and FMV-182
 
+           <item>Fujitsu MB86960A/MB86965A
+
            <item>Intel EtherExpress
 
+           <item>Intel EtherExpress Pro/100B 100Mbit.
+
            <item>Isolan AT 4141-0 (16 bit)
            <item>Isolink 4110     (8 bit)
 
@@ -291,6 +297,10 @@
 
            <item>3Com 3C509, 3C579, 3C589 (PCMCIA) Etherlink III
 
+           <item>3Com 3C590, 3C595 Etherlink III
+
+           <item>HP PC Lan Plus (27247B and 27252A)
+ 
            <item>Toshiba ethernet cards
 
            <item>PCMCIA ethernet cards from IBM and National
@@ -320,16 +330,15 @@
 
            <item>SDL Communications Riscom/8 Serial Board.
 
+           <item>Digiboard Sync/570i high-speed sync serial card.
+
            <item>Adlib, SoundBlaster, SoundBlaster Pro,
              ProAudioSpectrum, Gravis UltraSound, Gravis UltraSound MAX
              and Roland MPU-401 sound cards.
 
          </itemize>
 
-         FreeBSD currently does not support IBM's microchannel
-         (MCA) bus, but support is apparently close to
-         materializing.  Details will be posted as the situation
-         develops.
+         FreeBSD does not currently support IBM's microchannel (MCA) bus.
 
     <sect><heading>Preparing for the installation</heading>
 
@@ -339,18 +348,18 @@
 
       <sect1><heading>Before installing from CDROM</heading>
 
-       <p>If your CDROM is of an unsupported type, such as an
-         IDE CDROM, then please skip to <ref id="install:msdos" 
-          name="MS-DOS Preparation">.
+       <p>If your CDROM is of an unsupported type, 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, though we cannot say for certain
-         as we have no hand or say in how they're created).  You can either
+         as we have no hand or say in how they are 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&lowbar;ide.bat or atapiflp.bat batch files instead].
+         the ``makeflp.bat'' command.  [NOTE:  If you are running
+         FreeBSD 2.1-RELEASE and have an IDE CDROM, use the
+         inst&lowbar;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
@@ -366,11 +375,11 @@
          other types of installation media should be required.
 
          After your system is fully installed and you have rebooted
-         from the hard disk, you can mount the cdrom at any time by
+         from the hard disk, you can mount the CDROM at any time by
          typing: <tt>mount /cdrom</tt>
 
-         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!
+         Before removing the CD again, also note that it is necessary to first
+         type: <tt>umount /cdrom</tt>.  Do not just remove it from the drive!
 
          <quote><bf>Special note:</bf> Before invoking the
            installation, be sure that the CDROM is in the drive
@@ -400,54 +409,59 @@
       <sect1><heading>Before installing from Floppy</heading>
 
        <p>If you must install from floppy disks, either due to
-         unsupported hardware or just because you enjoy doing
+         unsupported hardware or simply because you enjoy doing
          things the hard way, you must first prepare some
          floppies for the install.
 
 
          The first floppy that you will 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 is 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
+         using ordinary DOS or UFS (if you are 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
+         directory.  If you are 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
+         command.  If you are 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
+         of improperly formatted media, which is why I am 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
+         If you are creating the floppies from another FreeBSD machine,
+         a format is still not a bad idea though you do nott 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:
+         as the following sequence of commands (for a 3.5" 1.44MB floppy
+         disk) illustrates:
+
 <tscreen><verb>
-disklabel -w -r fd0 floppy3     (use floppy5 for 1.2MB disks)
-newfs /dev/rfd0
+        fdformat -f 1440 fd0.1440
+        disklabel -w -r fd0.1440 floppy3
+        newfs -t 2 -u 18 -l 1 -i 65536 /dev/rfd0
+        
+(Use "fd0.1200" and "floppy5" for 5.25" 1.2MB disks).
 </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
-         files are split into chunks conveniently sized so that
-         5 of them will fit on a conventional 1.44MB floppy.  Go
-         through all your floppies, packing as many files as
-         will fit on each one, until you have got all the
-         distributions you want packed up in this fashion.  Each
-         distribution should go into a subdirectory on the
+         After you have formatted the floppies, you will need to copy
+         the files onto them.  The distribution files are split into
+         chunks conveniently sized so that 5 of them will fit on a
+         conventional 1.44MB floppy.  Go through all your floppies,
+         packing as many files as will fit on each one, until you have
+         got all the distributions you want packed up in this fashion.
+         Each distribution should go into a subdirectory on the
          floppy, e.g.: <bf>a:&bsol;bin&bsol;bin.aa</bf>,
          <bf>a:&bsol;bin&bsol;bin.ab</bf>, and so on.
 
@@ -567,7 +581,7 @@
          PCMCIA ethernet cards, also be sure that it is plugged
          in <em>before</em> the laptop is powered on!  FreeBSD
          does not, unfortunately, currently support hot
-         insertion of PCMCIA cards.
+         insertion of PCMCIA cards during installation.
 
          You will also need to know your IP address on the
          network, the netmask value for your address class,
@@ -604,7 +618,7 @@
 
            In order for NFS installation to work, the server
            must support subdir mounts, e.g., if your FreeBSD
-           2.1 distribution directory lives on:
+           &rel.current; distribution directory lives on:
            <bf>ziggy:/usr/archive/stuff/FreeBSD</bf> Then ziggy will have
            to allow the direct mounting of
            <bf>/usr/archive/stuff/FreeBSD</bf>, not just <bf>/usr</bf> or
@@ -621,7 +635,7 @@
 
          <p>FTP installation may be done from any mirror site
            containing a reasonably up-to-date version of FreeBSD
-           2.1.  A full menu of reasonable choices from almost
+           &rel.current;.  A full menu of reasonable choices from almost
            anywhere in the world is provided by the FTP site
            menu.
 
@@ -634,7 +648,7 @@
            of a name server:
 
 <tscreen><verb>
-ftp://192.216.222.4/pub/FreeBSD/2.1.0-RELEASE
+ftp://192.216.222.4/pub/FreeBSD/&rel.current;-RELEASE
 </verb></tscreen>
         
            There are two FTP installation modes you can use:
@@ -687,8 +701,8 @@
        documentation you should need to be able to navigate
        through an installation and if it does not then we would
        like to know what you found most confusing.  Send your
-       comments to <htmlurl url="mailto:doc@freebsd.org"
-       name="doc@freebsd.org">.  It is the objective of the
+       comments to the &a.doc;.
+       It is the objective of the
        FreeBSD installation program (sysinstall) to be
        self-documenting enough that painful ``step-by-step''
        guides are no longer necessary.  It may take us a little
@@ -699,7 +713,7 @@
 
        <enum>
          <item>Boot the boot floppy.  After a boot sequence
-           which can take anywhere from from 30 seconds to 3
+           which can take anywhere from 30 seconds to 3
            minutes, depending on your hardware, you should be
            presented with a menu of initial choices.  If the
            floppy does not boot at all, or the boot hangs at some
@@ -714,15 +728,16 @@
          <item>Select the Options item and set any special
            preferences you may have.
 
-         <item>Select a Custom or Express install, depending on
-           whether or not you would like the installation to give
-           you a high degree of control over each step of the
-           installation or simply lead you through it, choosing
-           reasonable defaults when possible.  See details on
-           both installation types below.
+         <item>Select a Novice, Custom or Express install, depending on
+           whether or not you would like the installation to help
+           you through a typical installation, give you a high degree of
+           control over each step of the installation or simply whizz
+           through it (using reasonable defaults when possible) as fast
+           as possible.  If you've never used FreeBSD before then the
+           Novice installation method is most recommended.
 
-         <item>The Configure menu choice allows you to further
-           configure your FreeBSD installation by giving you
+         <item>The final configuration menu choice allows you to
+           further configure your FreeBSD installation by giving you
            menu-driven access to various system defaults.  Some
            items, like networking, may be especially important
            if you did a CDROM/Tape/Floppy installation and have
@@ -732,82 +747,6 @@
            when you first reboot from the hard disk.
        </enum>
 
-      <sect1><heading>Express installation</heading>
-
-       <p>The express installation is not too much different than
-         the Custom one except that it leads you through the
-         required stages in the proper order and presents you
-         with various helpful prompts along the way.
-
-         <enum>
-           <item>The first step is the `Partition Editor', which
-             allows you to chose how your drives will be used
-             for FreeBSD.  If you are dedicating an entire drive
-             to FreeBSD, the `A' command is probably all you
-             need to type here.
-
-           <item>Next, with the `Label Editor', you can specify
-             how the space in any allocated FreeBSD partitions
-             should be used by FreeBSD, or where to mount a
-             non-FreeBSD partition (such as DOS).  If you want
-             the standard layout, simply type `A' here.
-
-           <item>Next, the `Distributions' menu allows you to
-             specify which parts of FreeBSD you wish to load.  A
-             good choice is ``User'' for a small system or
-             ``Developer'' for someone wanting a bit more out of
-             FreeBSD.  If none of the existing collections sound
-             applicable, select Custom.
-
-           <item>Next, the `Media' menu allows you to specify
-             what kind of media you wish to install from.  If a
-             desired media choice is found and configured
-             automatically then this menu will simply return,
-             otherwise you will be asked for additional details on
-             the media device type.
-
-           <item>Finally, you will be prompted to commit all of
-             these actions at once (nothing has been written to
-             your disk so far, nor will it until you give the
-             final confirmation).  All new or changed partition
-             information will be written out, file systems will
-             be created and/or non-destructively labeled
-             (depending on how you set their newfs flags in the
-             Label Editor) and all selected distributions will
-             be extracted.
-         </enum>
-
-         At this point, you are generally done with the
-         sysinstall utility and can select the final `Quit'.  If
-         you are running it as an installer (e.g., before the
-         system is all the way up) then the system will now
-         reboot after you press return one last time.  If you
-         selected the boot manager option, you will see a small
-         boot menu with an `F?' prompt.  Press the function key
-         for BSD (it will be shown) and you should boot up into
-         FreeBSD off the hard disk.
-
-         If this fails to happen for some reason, see the Q&amp;A
-         section of the Hardware Guide for possible clues!
-
-      <sect1><heading>Custom installation</heading>
-
-       <p>You can do anything you like in this menu without
-         altering your system <em>except</em> for ``Commit'',
-         which will perform any requests to alter your system
-         you may have made.  Some of the menu options will also
-         have direct `Write' commands available for committing an
-         operation immediately, but they should only be used if
-         you are absolutely sure it is necessary.  It is generally
-         better to make your changes and then commit them all at
-         once so that you are left with the option of changing
-         your mind up to the very last minute.
-
-         If you are confused at any point, the F1 key usually
-         pulls up the right information for the screen you are
-         in.
-
-
     <sect><heading>MS-DOS user's Questions and Answers</heading>
 
     <p>Many FreeBSD users wish to install FreeBSD on PCs inhabited
@@ -851,27 +790,30 @@
        between MS-DOS and FreeBSD.
 
 
-<!-- XXX  Status???
        <bf>Can I mount my MS-DOS extended partitions?</bf>
 
-       This feature is not in FreeBSD 2.0.5 but should be in 2.1.
-       We have laid all the groundwork for making this happen, now
-       we just need to do the last 1 percent of the work involved.
--->
+       Yes. DOS extended partitions are mapped in at the end of the other
+       ``slices'' in FreeBSD, e.g. your D: drive might be /dev/sd0s5,
+       your E: drive /dev/sd0s6, and so on. This example assumes, of
+       course, that your extended partition is on SCSI drive 0. For IDE drives,
+       substitute ``wd'' for ``sd'' appropriately. You otherwise mount extended
+       partitions exactly like you would mount any other DOS drive, e.g.:
+
+<tscreen><verb>
+mount -t msdos /dev/sd0s5 /dos_d
+</verb></tscreen>
 
        <bf>Can I run MS-DOS binaries under FreeBSD?</bf>
 
        Not yet!  We would like to add support for this someday, but
-       are still lacking anyone to actually do the work.
-       Ongoing work with Linux's DOSEMU utility may bring this
-       much closer to being a reality sometime soon.  Send mail
-       to hackers@freebsd.org if you're interested in joining
+       are still lacking anyone to actually do the work.  BSDI has
+       also donated their DOS emulator to the BSD world and this is slowly
+       being ported to FreeBSD-current.
+
+       Send mail to the &a.emulation if you're interested in joining
        this effort!
 
-       However, there is a nice application available in the
-       <ref id="ports" name="The Ports Collection"> called pcemu,
-       that allows you to run many basic MS-DOS text-mode binaries
+       In the interim, there is a nice application available in the
+       <ref id="ports" name="The Ports Collection"> called pcemu
+       which allows you to run many basic MS-DOS text-mode binaries
        by entirely emulating an 8088 CPU.
-
-
-


o isdn.sgml		1.1.2.2		16
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/isdn.sgml,v
retrieving revision 1.1.2.2
retrieving revision 1.6
diff -c -r1.1.2.2 -r1.6
*** src/share/doc/handbook/isdn.sgml    1996/07/07 23:26:44     1.1.2.2
--- src/share/doc/handbook/isdn.sgml    1996/10/16 12:28:37     1.6
***************
*** 1,21 ****
! <!-- $Id: isdn.sgml,v 1.1.2.2 1996/07/07 23:26:44 jkh Exp $ -->
  <!-- The FreeBSD Documentation Project -->
  
  <sect><heading>ISDN<label id="isdn"></heading>
  
! <p><em>Contributed by &a.hm;.</em>
  
! There is the bisdn ISDN package available from 
! <htmlurl url="ftp://ftp.muc.ditec.de/isdn" name="ftp.muc.ditec.de">
! supporting FreeBSD 2.1R, FreeBSD-current and NetBSD.
  
! Currently all (passive) Teles cards and their clones are supported for the
! EuroISDN (DSS1) and 1TR6 protocols.
  
  The latest source can be found on the above mentioned ftp server under
! directory isdn as file bisdn-096.tar.gz.
  
  A majordomo maintained mailing list is available, to subscribe, send the
  usual majordomo requests to 
  <htmlurl url="mailto:isdn-request@muc.ditec.de"
  name="isdn-request@muc.ditec.de">.
--- 1,219 ----
! <!-- $Id: isdn.sgml,v 1.6 1996/10/16 12:28:37 max Exp $-->
  <!-- The FreeBSD Documentation Project -->
  
  <sect><heading>ISDN<label id="isdn"></heading>
  
! <p><em>Last modicified by &a.wlloyd;</em>.
  
! <p>ISDN for FreeBSD is still largely under developement.  Specifically,
! there are a lack of drivers for PC ISDN cards.
  
! <p>A good resource for information on ISDN technology and hardware is
! <url url="http://alumni.caltech.edu/~dank/isdn/" name="Dan Kegel's
! ISDN Page">.
! 
! A quick simple roadmap to ISDN follows:
! <itemize>
! <item>If you live in Europe I suggest you investigate the ISDN card
! section.
! 
! <item>If you are planning to use ISDN primarily to connect to the
! internet with an Internet Provider on a dialup non-dedicated basis, I
! suggest you look into Terminal Adapters.  This will give you the most
! flexibility, with the fewest problems, if you change providers.
! 
! <item>If you are conecting two lans together, or connecting to the
! internet with a dedicated ISDN connection, I suggest you consider the
! Standalone router/bridge option.
! </itemize>
! 
! <p>Cost is a significant factor in determining what solution you will
! choose.  The following options are listed from least expensive to most
! expensive.
! 
! <sect1><heading>ISDN Cards</heading>
! 
! <p><em>Originally Contribution by &a.hm;.</em>
! 
! <p>This section is really only relevant to European ISDN users.  The
! cards supported are not yet(?) availible for North American ISDN
! standards.
!   
! <p>PC ISDN cards support the full bandwidth of ISDN, 128Kbs.  These
! cards are often the least expensive type of ISDN equipment.  
  
+ <p>There is the bisdn ISDN package available from 
+ <url url="ftp://ftp.muc.ditec.de/isdn" name="ftp.muc.ditec.de">
+ supporting FreeBSD 2.1R, FreeBSD-current and NetBSD.
  The latest source can be found on the above mentioned ftp server under
! directory isdn as file bisdn-097.tar.gz.
! 
! There are drivers for the following cards:
! <itemize>
! <item>Currently all (passive) Teles cards and their clones are supported
! for the EuroISDN (DSS1) and 1TR6 protocols.
! <item>Dr. Neuhaus - Niccy 1016
! </itemize>
! 
! There are several limitations with the bisdn stuff.
! Specifically the following features usually associated with ISDN are not
! supported.
! <itemize>
! <item>No PPP support, only raw hdlc.  This means you cannot connect to a
! some standalone routers, such as a Cisco unit.
! <item>Bridging Control Protocol not supported.
! <item>Multiple cards are not supported.
! <item>No bandwidth on demand.
! <item>No channel bundling.
! </itemize>
  
  A majordomo maintained mailing list is available, to subscribe, send the
  usual majordomo requests to 
  <htmlurl url="mailto:isdn-request@muc.ditec.de"
  name="isdn-request@muc.ditec.de">.
+ 
+ <sect1><heading>ISDN Terminal Adapters</heading>
+ 
+ <p>Terminal adapters(TA), are to ISDN what modems are to regular phone
+ lines.
+ <p>Most TA's use the standard hayes modem AT command set, and can be
+ used as a drop in replacement for a modem.
+ 
+ A TA will operate basically the same as a modem except connection and
+ throughput speeds will be much faster than your old modem.  You will
+ need to configure <ref id="ppp" name="PPP"> exactly the same as for a
+ modem setup.  Make sure you set your serial speed as high as possible.
+ 
+ The main advantage of using a TA to connect to an Internet Provider is
+ that you can do Dynamic PPP.  As IP address space becomes more and more
+ scarce, most providers are not willing to provide you with a static IP
+ anymore.  Most standalone routers are not able to accomidate dynamic IP
+ allocation.
+ 
+ TA's completely rely on the PPP daemon that you are running for their
+ features and stabiliy of connection.  This allows you to upgrade easily
+ from using a modem to ISDN on a FreeBSD machine, if you already have PPP
+ setup.  However, at the same time any problems you experienced with the
+ PPP program and are going to persist.
+ 
+ If you want maximum stability, use the kernel  <ref id="ppp" name="PPP">
+ option, not the user-land <ref id="userppp" name="iijPPP">.  
+ <p>The following TA's are know to work with FreeBSD.
+ 
+ <itemize>
+ <item>Motorola BitSurfer and Bitsurfer Pro
+ <item>Adtran
+ </itemize>
+ 
+ Most other TA's will probably work as well, TA vendors try to make sure
+ their product can accept most of the standard modem AT command set.
+ 
+ The real problam with external TA's is like modems you need a good
+ serial card in your computer.  
+ 
+ You should read the <ref id="uart" name="serial ports"> section in the
+ handbook for a detailed understanding of serial devices, and the
+ differences between asynchronous and synchronous serial ports.
+ 
+ A TA running off a standard PC serial port (asynchronous) limits you to
+ 115.2Kbs, even though you have a 128Kbs connection.  To fully utilize
+ the 128Kbs that ISDN is capable of, you must move the TA to a
+ synchronous serial card. 
+ 
+ Do not be fooled into buying an internal TA and thinking you have
+ avoided the synchronous/asynchronous issue.  Internal TA's simply have a
+ standard PC serial port chip built into them.  All this will do, is save
+ you having to buy another serial cable, and find another empty
+ electrical socket.
+ 
+ A synchronous card with a TA is at least as fast as a standalone router,
+ and with a simple 386 FreeBSD box driving it, probably more flexible.
+ 
+ The choice of sync/TA vs standalone router is largely a religious
+ issue.  There has been some discussion of this in the mailing lists.  I
+ suggest you search the <url url="http://www.freebsd.org/search.html"
+ name="archives"> for the complete discussion.
+ 
+ <sect1><heading>Standalone ISDN Bridges/Routers</heading>
+ 
+ <p>ISDN bridges or routers are not at all specific to FreeBSD or any
+ other operating system.  For a more complete description of routing and
+ bridging technology, please refer to a Networking reference book.
+ 
+ In the context of this page, I will use router and bridge
+ interchangeably.
+ 
+ <p>As the cost of low end ISDN routers/bridges comes down, it will
+ likely become a more and more popular choice.  An ISDN router is a small
+ box that plugs directly into your local ethernet network(or card), and
+ manages it's own connection to the other bridge/router.  It has all the
+ software to do PPP and other protocols built in.
+ 
+ A router will allow you much faster thoughput that a standard TA, since
+ it will be using a full synchronous ISDN connection.
+ 
+ The main problem with ISDN routers and bridges is that interoperability
+ between manufacturers can still be a problem.  If you are planning to
+ connect to an Internet provider, I recommend that you discuss your needs
+ with them.
+ 
+ <p>If you are planning to connect two lan segments together, ie: home
+ lan to the office lan, this is the simplest lowest maintenance
+ solution.  Since you are buying the equipment for both sides of the
+ connection you can be assured that the link will work.
+ 
+ For example to connect a home computer or branch office network to a
+ head office network the following setup could be used.
+ 
+ <em>Branch office or Home network</em>
+ 
+ Network is 10 Base T ethernet.  Connect router to network cable with
+ AUI/10bT transciever if necessary.
+ 
+ <verb>
+ ---Sun workstation     
+ |
+ ---FreeBSD box
+ |
+ ---Windows 95 (Don't admit to owning it)
+ |
+ Standalone router
+    |
+ ISDN BRI line
+ </verb>
+ If your home/branch office is only one computer you can use a twisted
+ pair crossover cable to connect to the standalone router directly.
+ 
+ <em>Head office or other lan</em> 
+ 
+ Network is Twisted Pair ethernet.
+ <verb>
+     -------Novell Server
+     | H       |
+     | ---Sun      
+     | |
+     | U       ---FreeBSD
+     | |
+     | ---Windows 95
+     | B       |
+     |___---Standalone router
+               |
+               ISDN BRI line
+ </verb> 
+ 
+ One large advantage of most routers/bridges is that they allow you to
+ have 2 SEPERATE INDEPENDANT PPP connections to 2 separate sites at the
+ SAME time.  This is not supported on most TA's, except for
+ specific(expensive) models that have two serial ports.  Do not confuse
+ this with channel bonding.
+ 
+ This is a very usefull feature for example if you have an dedicated
+ internet ISDN connection at your office and would like to tap into it,
+ but don't want to get another ISDN line at work.  A router at the office
+ location can manage a dedicated B channel connection (64Kbs) to the
+ internet as well as a use the other B channel for anything else,
+ including dialin or dialout to another location or dynamically bonding
+ it with the internet connection for more bandwidth.
+ 
+ An alternate use of this is to connect to 2 different branch offices at
+ the same time from the same ISDN line at your central office.


o jcontrib.sgml		NA		NA

o jmembers.sgml		NA		NA

o kerberos.sgml		1.7		1.8
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/kerberos.sgml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- src/share/doc/handbook/kerberos.sgml        1996/05/16 23:18:02     1.7
+++ src/share/doc/handbook/kerberos.sgml        1996/08/21 07:28:48     1.8
@@ -1,4 +1,4 @@
-<!-- $Id: kerberos.sgml,v 1.7 1996/05/16 23:18:02 mpp Exp $ -->
+<!-- $Id: kerberos.sgml,v 1.8 1996/08/21 07:28:48 asami Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>Kerberos<label id="kerberos"></heading>
@@ -15,7 +15,7 @@
     set up Kerberos as distributed for FreeBSD. However, you should refer
     to the relevant manual pages for a complete description.
 
-    In FreeBSD, the Kerberos is not that from the original 4.4 BSD,
+    In FreeBSD, the Kerberos is not that from the original 4.4BSD-Lite,
     distribution, but eBones, which had been previously ported to
     FreeBSD 1.1.5.1, and was sourced from outside the USA/Canada,
     and is thus available to system owners outside those countries.


o kernelconfig.sgml	1.9		1.21
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/kernelconfig.sgml,v
retrieving revision 1.9
retrieving revision 1.21
diff -u -r1.9 -r1.21
--- src/share/doc/handbook/kernelconfig.sgml    1996/03/31 18:01:55     1.9
+++ src/share/doc/handbook/kernelconfig.sgml    1996/10/05 18:36:17     1.21
@@ -1,4 +1,4 @@
-<!-- $Id: kernelconfig.sgml,v 1.9 1996/03/31 18:01:55 joerg Exp $ -->
+<!-- $Id: kernelconfig.sgml,v 1.21 1996/10/05 18:36:17 wosch Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- <!DOCTYPE linuxdoc PUBLIC '-//FreeBSD//DTD linuxdoc//EN'> -->
   <chapt><heading>Configuring the FreeBSD Kernel<label id="kernelconfig"></heading>
@@ -44,7 +44,7 @@
 
        </itemize></p>
 
-    <sect><heading>Building and Installing a Custom Kernel</heading>
+    <sect><heading>Building and Installing a Custom Kernel<label id="kernelconfig:building"></heading>
 
       <p>First, let us take a quick tour of the kernel build
        directory.  All directories mentioned will be relative to
@@ -77,7 +77,7 @@
 </verb></tscreen>
        Traditionally, this name is in all capital letters and,
        if you are maintaining multiple FreeBSD machines with
-       different hardware, it's a good idea to name it after
+       different hardware, it is a good idea to name it after
        your machine's hostname.  We will call it MYKERNEL for
        the purpose of this example.
        
@@ -91,11 +91,11 @@
        here, but is covered well in many books in the <ref
        id="bibliography" name="bibliography">.  Feel free to change the
        comment lines at the top to reflect your configuration or the
-       changes you've made to differentiate it from GENERIC.
+       changes you have made to differentiate it from GENERIC.
 
-       If you've build a kernel under SunOS or some other BSD
+       If you have build a kernel under SunOS or some other BSD
        operating system, much of this file will be very familiar
-       to you.  If you're coming from some other operating
+       to you.  If you are coming from some other operating
        system such as DOS, on the other hand, the GENERIC
        configuration file might seem overwhelming to you, so
        follow the descriptions in the <ref
@@ -106,10 +106,10 @@
        older version of FreeBSD, you will probably have to get a new
        version of <tt>config(8)</tt> from the same place you got the new
        kernel sources.  It is located in <tt>/usr/src/usr.sbin</tt>, so
-       you'll need to download those sources as well.  Re-build and install
+       you will need to download those sources as well.  Re-build and install
        it before running the next commands.</quote>
 
-       When you're finished, type the following to compile and
+       When you are finished, type the following to compile and
        install your kernel:
 <tscreen><verb>
 # /usr/sbin/config MYKERNEL
@@ -128,7 +128,7 @@
        to recover in case your new kernel <ref
        id="kernelconfig:noboot" name="does not boot">.
 
-       <quote><em/Note:/ If you've added any new devices (such
+       <quote><em/Note:/ If you have added any new devices (such
        as sound cards) you may have to add some <ref
        id="kernelconfig:nodes" name="device nodes"> to your
        <tt>/dev</tt> directory before you can use them.</quote>
@@ -160,7 +160,7 @@
        be dependant upon an option gets this option out of an
        <tt>opt_<em>foo</em>.h</tt> declaration file created in the
        compile directory by <tt>config</tt>.  The list of valid options
-       for <tt>config</tt> lives in two files: options that don't
+       for <tt>config</tt> lives in two files: options that do not
        depend on the architecture are listed in
        <tt>/sys/conf/options</tt>, architecture-dependant ones
        in <tt>/sys/<em>arch</em>/conf/options.<em>arch</em></tt>,
@@ -194,6 +194,7 @@
                <item>I386_CPU
                <item>I486_CPU 
                <item>I586_CPU
+               <item>I686_CPU
              </itemize>
              and multiple instances of the <tt>cpu</tt> line may
              be present with different values of
@@ -210,7 +211,7 @@
              this from GENERIC to whatever you named your
              kernel, in this example, MYKERNEL.  The value you
              put in <tt>ident</tt> will print when you boot up
-             the kernel, so it's useful to give a kernel a
+             the kernel, so it is useful to give a kernel a
              different name if you want to keep it separate from
              your usual kernel (if you want to build an
              experimental kernel, for example).  Note that, as
@@ -219,7 +220,7 @@
              contains any numbers.
 
              Since this name is passed to the C compiler as a
-             <tt>-D</tt> switch, don't use names like <tt>
+             <tt>-D</tt> switch, do not use names like <tt>
              DEBUG</tt>, or something that could be confused
              with another machine or CPU name, like <tt>vax</tt>.
 
@@ -231,7 +232,7 @@
              you expect to have on your machine.  However, under
              normal circumstances, you will want to set
              <tt>maxusers</tt> to at least four, especially if
-             you're using X Windows or compiling software.  The
+             you are using the X Window System or compiling software.  The
              reason is that the most important table set by
              <tt>maxusers</tt> is the maximum number of
              processes, which is set to <bf><tt>20 + 16 *
@@ -239,7 +240,7 @@
              to one, then you can only have 36 simultaneous
              processes, including the 18 or so that the system
              starts up at boot time, and the 15 or so you will
-             probably create when you start X Windows.  Even a
+             probably create when you start the X Window System.  Even a
              simple task like reading a <tt>man</tt> page will
              start up nine processes to filter, decompress, and
              view it.  Setting <tt>maxusers</tt> to 4 will allow
@@ -307,7 +308,7 @@
 
            <tag>options ``COMPAT_43''</tag> 
 
-           <p>Compatibility with BSD 4.3.  Leave this in; some
+           <p>Compatibility with 4.3BSD.  Leave this in; some
              programs will act strangely if you comment this
              out.
 
@@ -336,7 +337,7 @@
              Windows, which many graphics-intensive programs
              (such as the movie player XAnim, and Linux DOOM)
              will automatically take advantage of for extra
-             speed.  If you use X Windows, you'll definitely
+             speed.  If you use the X Window System, you will definitely
              want to include this.
 
            <tag>options SYSVSEM</tag> 
@@ -352,7 +353,7 @@
              the kernel.
 
              <quote><em/Note:/ The <tt>ipcs(1)</tt> command will
-               tell will list any processes using using each of
+               tell will list any processes using each of
                these System V facilities.</quote>
 
          </descrip>
@@ -505,16 +506,17 @@
              <tt>wdc1</tt> is a secondary IDE controller where
              you might have a third or fourth hard drive, or an
              IDE CD-ROM.  Comment out the lines which do not
-             apply (if you have a SCSI hard drive, you'll
+             apply (if you have a SCSI hard drive, you will
              probably want to comment out all six lines, for
              example).
 
-           <tag>controller wcd0<label id="kernelconfig:atapi"></tag>
+           <tag>device wcd0<label id="kernelconfig:atapi"></tag>
 
              <p>This device
                provides IDE CD-ROM support.  Be sure to leave
-               <tt>wdc1</tt> uncommented if your CD-ROM is on
-               its own controller card.  To use this, you must
+               <tt>wdc0</tt> uncommented, and <tt/wdc1/ if you have
+               more than one IDE controller and your CD-ROM is on
+               the second one card.  To use this, you must
                also include the line <tt>options ATAPI</tt>.
 
            <tag>device npx0 at isa? port ``IO_NPX'' irq 13 vector npxintr</tag>
@@ -616,7 +618,7 @@
 
        <tag>controller ncr0</tag>
 
-       <p>NCR 53C810 and 53C825 PCI SCSI controller
+       <p>NCR 53C810, 53C815, 53C825, 53C860, 53C875 PCI SCSI controller
 
              </descrip>
 
@@ -625,11 +627,11 @@
            <p>This causes the
              kernel to pause 15 seconds before probing each SCSI
              device in your system.  If you only have IDE hard
-             drives, you can ignore this, otherwise you'll
+             drives, you can ignore this, otherwise you will
              probably want to lower this number, perhaps to 5
              seconds, to speed up booting.  Of course if you do
              this, and FreeBSD has trouble recognizing your SCSI
-             devices, you'll have to raise it back up.
+             devices, you will have to raise it back up.
 
            <tag>controller scbus0</tag> 
 
@@ -668,7 +670,7 @@
       <sect1><heading>Console, Bus Mouse, and X Server Support</heading>
 
        <p>You must choose one of these two console types, and, if you plan
-       to use X Windows, enable the XSERVER option and optionally, a bus
+       to use the X Window System, enable the XSERVER option and optionally, a bus
        mouse or PS/2 mouse device.
 
          <descrip>
@@ -797,7 +799,7 @@
 
            <p>The next lines enable support for various Ethernet
              cards.  If you do not have a network card, you can
-             comment out all of these lines.  Otherwise, you'll
+             comment out all of these lines.  Otherwise, you will
              want to leave in support for your particular
              Ethernet card(s):
 
@@ -805,7 +807,16 @@
 
                <tag>device de0</tag>
 
-               <p>Digital Equipment DC21040 PCI Ethernet adapter
+               <p>Ethernet adapters based on Digital Equipment DC21040,
+                  DC21041 or DC21140 chips
+
+               <tag>device fxp0</tag>
+
+               <p>Intel EtherExpress Pro/100B
+
+               <tag>device vx0</tag>
+
+               <p>3Com 3C590 and 3C595 (buggy)
 
                <tag>device cx0 at isa? port 0x240 net irq 15 drq 7 vector cxintr</tag>
 
@@ -814,8 +825,8 @@
 
                <tag>device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 vector edintr</tag>
 
-               <p>Western Digital and SMC 80xx; Novell NE1000
-                 and NE2000; 3Com 3C503
+               <p>Western Digital and SMC 80xx and 8216; Novell NE1000
+                 and NE2000; 3Com 3C503; HP PC Lan Plus (HP27247B and HP27252A)
 
                <tag>device el0 at isa? port 0x300 net irq 9 vector elintr</tag>
 
@@ -869,7 +880,7 @@
              </descrip>
 
              <quote><em/Note:/ With certain cards (notably the
-               NE2000) you'll have to change the port and/or IRQ
+               NE2000) you will have to change the port and/or IRQ
                since there is no ``standard'' location for these
                cards.</quote>
 
@@ -946,7 +957,7 @@
 
        <p>This is the first section containing lines that are
          not in the GENERIC kernel.  To include sound card
-         support, you'll have to copy the appropriate lines from
+         support, you will have to copy the appropriate lines from
          the LINT kernel (which contains support for
          <em>every</em> device) as follows:
 
@@ -1054,7 +1065,7 @@
            <tag>pseudo-device pty <em>number</em><label id="kernelconfig:ptys"></tag>
 
            <p><tt>pty</tt> is a ``pseudo-terminal'' or simulated
-             login port.  It's used by incoming <bf>telnet</bf>
+             login port.  It is used by incoming <bf>telnet</bf>
              and <bf>rlogin</bf> sessions, xterm, and some other
              applications such as emacs.  The <em>number</em>
              indicates the number of <tt>pty</tt>s to create.
@@ -1082,13 +1093,23 @@
              using a file as a swap device (e.g. an MS Windows
              swap file). Optional.
 
+           <tag>pseudo-device ccd <em>number</em></tag>
+
+           <p>Concatenated disks.  This pseudo-device allows you to
+             concatenate multiple disk partitions into one large
+             ``meta''-disk.  The <em>number</em> after ccd is the
+             total number of concatenated disks (not total number of
+             disks that can be concatenated) that can be created.
+             (See <tt>ccd(4)</tt> and <tt>ccdconfig(8)</tt> man pages
+             for more details.)  Optional.
+
          </descrip>
 
       <sect1><heading>Joystick, PC Speaker, Miscellaneous</heading>
 
        <p>This section describes some miscellaneous hardware
          devices supported by FreeBSD.  Note that none of these
-         lines are included in the GENERIC kernel, you'll have
+         lines are included in the GENERIC kernel, you will have
          to copy them from this handbook or the LINT kernel
          (which contains support for <em>every</em> device):
 
@@ -1106,7 +1127,7 @@
              script that plays some simple songs, and
              <tt>/usr/games/piano</tt> which lets you play songs
              using the keyboard as a simple piano (this file
-             only exists if you've installed the <em>games</em>
+             only exists if you have installed the <em>games</em>
              package).  Also, the excellent text role-playing
              game NetHack (in the ports collection) can be
              configured to use this device to play songs when
@@ -1174,7 +1195,7 @@
 
          <p>If the <tt>config</tt>
            command fails when you give it your kernel
-           description, you've probably made a simple error
+           description, you have probably made a simple error
            somewhere.  Fortunately, <tt>config</tt> will print
            the line number that it had trouble with, so you can
            quickly skip to it with <tt>vi</tt>.  For example, if
@@ -1194,9 +1215,7 @@
            kernel description, but not severe enough for
            <tt>config</tt> to catch it.  Again, look over your
            configuration, and if you still cannot resolve the
-           problem, send mail to <tt><htmlurl
-           url="mailto:questions@freebsd.org"
-           name="questions@FreeBSD.ORG"></tt> with your kernel
+           problem, send mail to the &a.questions with your kernel
            configuration, and it should be diagnosed very
            quickly.
 
@@ -1246,7 +1265,7 @@
 
          <tag>Kernel works, but <tt>ps</tt> does not work any more!</tag>
 
-         <p>If you've installed a different version
+         <p>If you have installed a different version
            of the kernel from the one that the system utilities
            have been built with, for example, an experimental
            ``2.2.0'' kernel on a 2.1.0-RELEASE system, many


o kerneldebug.sgml	1.10		1.3.2.4
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/kerneldebug.sgml,v
retrieving revision 1.3.2.4
retrieving revision 1.10
diff -u -r1.3.2.4 -r1.10
--- src/share/doc/handbook/kerneldebug.sgml     1996/06/19 20:28:00     1.3.2.4
+++ src/share/doc/handbook/kerneldebug.sgml     1996/05/16 23:18:04     1.10
@@ -1,4 +1,4 @@
-<!-- $Id: kerneldebug.sgml,v 1.3.2.4 1996/06/19 20:28:00 jkh Exp $ -->
+<!-- $Id: kerneldebug.sgml,v 1.10 1996/05/16 23:18:04 mpp Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt><heading>Kernel Debugging<label id="kerneldebug"></heading>


o linuxemu.sgml		1.8		1.13
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/linuxemu.sgml,v
retrieving revision 1.8
retrieving revision 1.13
diff -u -r1.8 -r1.13
--- src/share/doc/handbook/linuxemu.sgml        1996/05/24 19:33:32     1.8
+++ src/share/doc/handbook/linuxemu.sgml        1996/10/05 18:36:18     1.13
@@ -1,4 +1,4 @@
-<!-- $Id: linuxemu.sgml,v 1.8 1996/05/24 19:33:32 jfieber Exp $ -->
+<!-- $Id: linuxemu.sgml,v 1.13 1996/10/05 18:36:18 wosch Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt><heading>Linux Emulation<label id="linuxemu"></heading>
@@ -38,7 +38,7 @@
 <sect1><heading>Installing Linux Emulation in 2.1-STABLE</heading>
 
 <p>The GENERIC kernel in 2.1-stable is not configured for linux
-compatibility so you you must reconfigure your kernel for it.  There
+compatibility so you must reconfigure your kernel for it.  There
 are two ways to do this: 1. linking the emulator statically in the
 kernel itself and 2. configuring your kernel to dynamically load the
 linux loadable kernel module (LKM).
@@ -47,7 +47,7 @@
 (c.f. /sys/i386/conf/LINT):
 <tscreen>
 <verb>
-options "COMPAT_LINUX"
+options COMPAT_LINUX
 </verb>
 </tscreen>
 If you want to run doom or other applications
@@ -58,7 +58,7 @@
 options SYSVSHM
 </verb>
 </tscreen>
-The linux system calls require 4.3 BSD system call compatibility.  So
+The linux system calls require 4.3BSD system call compatibility.  So
 make sure you have the following.
 <tscreen>
 <verb>
@@ -124,8 +124,8 @@
 
 <sect1><heading>Installing Linux Emulation in 2.2-CURRENT</heading>
 
-<p>In -current it is no longer necessary to specify options "LINUX" 
-or options "COMPAT_LINUX".  Linux emulation is done with an LKM 
+<p>In -current it is no longer necessary to specify ``options LINUX''
+or ``options COMPAT_LINUX''.  Linux emulation is done with an LKM 
 (``Loadable Kernel Module'') so it can be installed on the fly without
 having to reboot.  You will need the following things in your startup files, 
 however:
@@ -368,7 +368,7 @@
 libraries.
 
 On FreeBSD-stable do not install /compat/linux/etc/ld.so.cache or run
-ldconfig becuase in FreeBSD-stable the syscalls are implemented
+ldconfig because in FreeBSD-stable the syscalls are implemented
 differently and ldconfig is not needed or used.
 
 <p>You should now be set up for Linux binaries which only need a
@@ -688,7 +688,7 @@
 </tscreen>
 
 We haven't found the cause for this, but it only affects the
-Notebook's X window front end, not the mathematica engine itself.  So
+Notebook's X Window front end, not the mathematica engine itself.  So
 the command line interface invoked by 'math' is unaffected by this
 bug.

 
o lists.sgml		1.6		1.6

o memoryuse.sgml	1.1.4.4		1.1.4.4

o mirrors.sgml		1.41		1.41

o nfs.sgml		1.1.1.1.4.3	1.1.1.1.4.3

o nutshell.sgml		1.1.4.4		1.10
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/nutshell.sgml,v
retrieving revision 1.1.4.4
retrieving revision 1.10
diff -u -r1.1.4.4 -r1.10
--- src/share/doc/handbook/nutshell.sgml        1996/06/19 20:28:07     1.1.4.4
+++ src/share/doc/handbook/nutshell.sgml        1996/08/21 07:28:54     1.10
@@ -1,4 +1,4 @@
-<!-- $Id: nutshell.sgml,v 1.1.4.4 1996/06/19 20:28:07 jkh Exp $ -->
+<!-- $Id: nutshell.sgml,v 1.10 1996/08/21 07:28:54 asami Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>FreeBSD in a nutshell<label id="nutshell"></heading>
@@ -62,7 +62,7 @@
       <item><bf>And many more!</bf></item>
     </itemize>
 
-      FreeBSD is based on the BSD 4.4-lite release from Computer
+      FreeBSD is based on the 4.4BSD-Lite release from Computer
       Systems Research Group (CSRG) at the University of
       California at Berkeley, and carries on the distinguished
       tradition of BSD systems development.  In addition to the


o pgpkeys.sgml		1.6.2.2		1.9
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/pgpkeys.sgml,v
retrieving revision 1.6.2.2
retrieving revision 1.9
diff -u -r1.6.2.2 -r1.9
--- src/share/doc/handbook/pgpkeys.sgml 1996/07/03 01:39:26     1.6.2.2
+++ src/share/doc/handbook/pgpkeys.sgml 1996/08/14 11:53:52     1.9
@@ -1,4 +1,4 @@
-<!-- $Id: pgpkeys.sgml,v 1.6.2.2 1996/07/03 01:39:26 jkh Exp $ -->
+<!-- $Id: pgpkeys.sgml,v 1.9 1996/08/14 11:53:52 joerg Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt><heading>PGP keys<label id="pgpkeys"></heading>
@@ -114,22 +114,30 @@
 mQCNAzGCFeAAAAEEAKmRBU2Nvc7nZy1Ouid61HunA/5hF4O91cXm71/KPaT7dskz
 q5sFXvPJPpawwvqHPHfEbAK42ZaywyFp59L1GaYj87Pda+PlAYRJyY2DJl5/7JPe
 ziq+7B8MdvbX6D526sdmcR+jPXPbHznASjkx9DPmK+7TgFujyXW7bjh2o/exAAUR
-tCJKb2VyZyBXdW5zY2ggPGpAdXJpYWguaGVlcC5zYXguZGU+iQCVAwUQMalkbHW7
-bjh2o/exAQFwwQP+Pa82QeWpJE0m7f4DXd/DiYAvh/DeXWtub1fXQ9yqAL131n8O
-zsSLMb0PwG/qyZrpK61sT3bAvtVlNftaxmuD7yaf1SUQ3rNmsBq5/oju/3EKEiFc
-4gtuyaXG74y7y1XASIstck/0byfvO2t4z0R7d1RRnKRYeCspMcUjYshsoJeJAJUD
-BRAxpL3UPiAdBSUb0JkBAZg7BACE+mKhsrd39/P6NattCCOSg76Pf2CVgZdvbb7q
-K4SmsVGz+58pi2OWM1M0rcHgNZKTIg9rBy47gui2KOnqOR7ZuyMVJJqyEZZywmWm
-fCy/sR4Ui1PehZNNNBAi09u03ItbozrEH6Msa1oC8mp86XOA70Et8e4DYtj5a9tV
-bjjtJYkAlQMFEDGCUB31FVv7jlQtXQEB5KgD/iIJZe5lFkPr2B/Cr7BKMVBot1/J
-Su05NsHgJZ3uK15w4mVtNPZcFi/dKbn+qRM6LKDFe/GF0HZD/ZD1FJt8yQjzF2w3
-40B+F2GGEOwnClqZDtEAqnIBzM/ECQQqH+6Bi8gpkFZrFgg5eON7ikqmusDnOlYS
-tM/CBfgpSbR8kDmFtCZKb2VyZyBXdW5zY2ggPGpAaW50ZXJmYWNlLWJ1c2luZXNz
-LmRlPokAlQMFEDGpbnd1u244dqP3sQEBJnQD/RVSAzgf4uorv3fpbosI0LE3LUuf
-AYGBSJNJnskeKyudZkNkI5zGGDwVneH/cSkKT4ORooeqcTBxKeMaMuXPVl30Qahg
-NwWjfuTvl5OZ8orsQGGWIn5FhqYXsKkjEGxIOBOfvvlVQ0UbcR0N2+5F6Mb5GqrX
-ZpIesn7jFJpkQKPU
-=46Ab
+tCZKb2VyZyBXdW5zY2ggPGpAaW50ZXJmYWNlLWJ1c2luZXNzLmRlPokAlQMFEDGp
+bnd1u244dqP3sQEBJnQD/RVSAzgf4uorv3fpbosI0LE3LUufAYGBSJNJnskeKyud
+ZkNkI5zGGDwVneH/cSkKT4ORooeqcTBxKeMaMuXPVl30QahgNwWjfuTvl5OZ8ors
+QGGWIn5FhqYXsKkjEGxIOBOfvvlVQ0UbcR0N2+5F6Mb5GqrXZpIesn7jFJpkQKPU
+tC1Kb2VyZyBXdW5zY2ggPGpvZXJnX3d1bnNjaEB1cmlhaC5oZWVwLnNheC5kZT6J
+AJUDBRAyCIWZdbtuOHaj97EBAVMzA/41VIph36l+yO9WGKkEB+NYbYOz2W/kyi74
+kXLvLdTXcRYFaCSZORSsQKPGNMrPZUoLoAKxE25AoCgl5towqr/sCcu0A0MMvJdd
+UvlQ2T+ylSpGmWchqoXCN7FdGyxrZ5zzxzLIvtcio6kaHd76XxyJpltCASupdD53
+nEtxnu8sRrQxSm9lcmcgV3Vuc2NoIDxqb2VyZ193dW5zY2hAaW50ZXJmYWNlLWJ1
+c2luZXNzLmRlPokAlQMFEDIIhfR1u244dqP3sQEBWoID/RhBm+qtW+hu2fqAj9d8
+CVgEKJugrxZIpXuCKFvO+bCgQtogt9EX+TJh4s8UUdcFkyEIu8CT2C3Rrr1grvck
+fxvrTgzSzvtYyv1072X3GkVY+SlUMBMArdl1qNW23oT7Q558ajnsaL065XJ5m7Ha
+cgTTikiofYG8i1s7TrsEeq6PtCJKb2VyZyBXdW5zY2ggPGpAdXJpYWguaGVlcC5z
+YXguZGU+iQCVAwUQMalkbHW7bjh2o/exAQFwwQP+Pa82QeWpJE0m7f4DXd/DiYAv
+h/DeXWtub1fXQ9yqAL131n8OzsSLMb0PwG/qyZrpK61sT3bAvtVlNftaxmuD7yaf
+1SUQ3rNmsBq5/oju/3EKEiFc4gtuyaXG74y7y1XASIstck/0byfvO2t4z0R7d1RR
+nKRYeCspMcUjYshsoJeJAJUDBRAxpL3UPiAdBSUb0JkBAZg7BACE+mKhsrd39/P6
+NattCCOSg76Pf2CVgZdvbb7qK4SmsVGz+58pi2OWM1M0rcHgNZKTIg9rBy47gui2
+KOnqOR7ZuyMVJJqyEZZywmWmfCy/sR4Ui1PehZNNNBAi09u03ItbozrEH6Msa1oC
+8mp86XOA70Et8e4DYtj5a9tVbjjtJYkAlQMFEDGCUB31FVv7jlQtXQEB5KgD/iIJ
+Ze5lFkPr2B/Cr7BKMVBot1/JSu05NsHgJZ3uK15w4mVtNPZcFi/dKbn+qRM6LKDF
+e/GF0HZD/ZD1FJt8yQjzF2w340B+F2GGEOwnClqZDtEAqnIBzM/ECQQqH+6Bi8gp
+kFZrFgg5eON7ikqmusDnOlYStM/CBfgpSbR8kDmF
+=Bz4E
 -----END PGP PUBLIC KEY BLOCK-----
 </verb></tscreen>
 

o policies.sgml		1.3		1.4
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/policies.sgml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- src/share/doc/handbook/policies.sgml        1996/07/22 00:00:36     1.3
+++ src/share/doc/handbook/policies.sgml        1996/10/05 18:36:18     1.4
@@ -1,4 +1,4 @@
-<!-- $Id: policies.sgml,v 1.3 1996/07/22 00:00:36 jraynard Exp $ -->
+<!-- $Id: policies.sgml,v 1.4 1996/10/05 18:36:18 wosch Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt><heading>Source Tree Guidelines and Policies
@@ -107,7 +107,7 @@
 branches, it is required that "official" patches from the vendor
 be applied to the original distributed sources and the result
 re-imported onto the vendor branch again.  Official patches should
-never be patched into the the FreeBSD checked out version and
+never be patched into the FreeBSD checked out version and
 "committed", as this destroys the vendor branch coherency and makes
 importing future versions rather difficult as there will be conflicts.
 

o porting.sgml		1.28		1.31
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/porting.sgml,v
retrieving revision 1.28
retrieving revision 1.31
diff -u -r1.28 -r1.31
--- src/share/doc/handbook/porting.sgml 1996/08/28 06:40:49     1.28
+++ src/share/doc/handbook/porting.sgml 1996/10/05 18:36:19     1.31
@@ -1,4 +1,4 @@
-<!-- $Id: porting.sgml,v 1.28 1996/08/28 06:40:49 asami Exp $ -->
+<!-- $Id: porting.sgml,v 1.31 1996/10/05 18:36:19 wosch Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect1><heading>Porting an existing piece of free software<label id="porting"></heading>
@@ -13,7 +13,7 @@
 into a carefully organized hierarchy know as ``the ports collection''.
 The collection enables a new user to get a quick and complete overview
 of what is available for FreeBSD in an easy-to-compile form.  It also
-saves considerable space by not actually containing the the majority
+saves considerable space by not actually containing the majority
 of the sources being ported, but merely those differences required for
 running under FreeBSD. 
 
@@ -157,7 +157,7 @@
  # Date created:       5 December 1994
  # Whom:               asami
  #
- # $Id: porting.sgml,v 1.28 1996/08/28 06:40:49 asami Exp $
+ # $Id: porting.sgml,v 1.31 1996/10/05 18:36:19 wosch Exp $
  #
  
  DISTNAME=     oneko-1.1b
@@ -174,7 +174,7 @@
       <p>See if you can figure it out.  Do not worry about the contents
        of the <tt>&dollar;Id&dollar;</tt> line, it will be filled in
        automatically by CVS when the port is imported to our main
-       ports tree.  You can find a more detalied example in the <ref
+       ports tree.  You can find a more detailed example in the <ref
        id="porting:samplem" name="sample Makefile"> section.
 
       <sect3>
@@ -410,7 +410,7 @@
        <p>If your port requires some additional `patches' that are
          available on the Internet, fetch them too and put them in
          <tt>&dollar;{DISTDIR}</tt>.  Do not worry if they come from
-         site other than where you got the the main source tarball,
+         site other than where you got the main source tarball,
          we have a way to handle these situations (see the
          description of <ref id="porting:patchfiles"
          name="<tt>&dollar;{PATCHFILES}</tt>"> below).
@@ -560,7 +560,7 @@
        <heading>MASTER_SITES</heading>
 
        <p>Record the directory part of the ftp/http-URL pointing at
-         the the original tarball in <tt>&dollar;{MASTER_SITES}</tt>.
+         the original tarball in <tt>&dollar;{MASTER_SITES}</tt>.
          Do not forget the trailing slash (<tt>/</tt>)!
 
        <p>The make macros will try to use this specification for
@@ -773,7 +773,7 @@
        <enum>
          <item>If the port refers to the Motif library as
            `<tt>-lXm</tt>' in its Makefile or Imakefile, simply
-           substitite `<tt>&dollar;{MOTIFLIB}</tt>' for it.
+           substitute `<tt>&dollar;{MOTIFLIB}</tt>' for it.
 
          <item>If the port uses `<tt>XmClientLibs</tt>' in its
            Imakefile, change it to `<tt>&dollar;{MOTIFLIB}
@@ -1098,7 +1098,7 @@
   person who wrote this Makefile]
  # Whom:                       Satoshi Asami <asami@FreeBSD.ORG>
  #
- # $Id: porting.sgml,v 1.28 1996/08/28 06:40:49 asami Exp $
+ # $Id: porting.sgml,v 1.31 1996/10/05 18:36:19 wosch Exp $
  [ ^^^^ do not worry about this, I know it says "porting.sgml"...it
   will be automatically filled in by CVS when it is committed to our
   repository]
@@ -1221,7 +1221,7 @@
 xmris.4.02     xmris-4.02              ditto
 rdist-1.3alpha rdist-1.3a              no strings like `alpha' allowed
 es-0.9-beta1   es-0.9b1                ditto
-v3.3beta021.src        jpeg-5a                 what the heck was that anyway? ;)
+v3.3beta021.src        tiff-3.3                what the heck was that anyway? ;)
 tvtwm          tvtwm-pl11              version string always required
 piewm          piewm-1.0               ditto
 xvgr-2.10pl1   xvgr-2.10.1             `pl' allowed only when no maj/minor numbers


o ports.sgml		1.2.4.4		1.15
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/ports.sgml,v
retrieving revision 1.2.4.4
retrieving revision 1.15
diff -c -r1.2.4.4 -r1.15
*** src/share/doc/handbook/ports.sgml   1996/06/26 09:24:01     1.2.4.4
--- src/share/doc/handbook/ports.sgml   1996/10/23 09:05:24     1.15
***************
*** 1,4 ****
! <!-- $Id: ports.sgml,v 1.2.4.4 1996/06/26 09:24:01 jkh Exp $ -->
  <!-- The FreeBSD Documentation Project -->
  
  <sect><heading>The Ports collection<label id="ports"></heading>
--- 1,4 ----
! <!-- $Id: ports.sgml,v 1.15 1996/10/23 09:05:24 asami Exp $ -->
  <!-- The FreeBSD Documentation Project -->
  
  <sect><heading>The Ports collection<label id="ports"></heading>
***************
*** 104,110 ****
  see what happens if we try and install a port. I've chose `bash', also
  known as the Bourne-Again Shell, as that seems fairly typical.
  
! <em /Note/ if you're trying this at home, you'll need to be root.
  
  <verb>
   # cd /usr/ports/shells/bash
--- 104,110 ----
  see what happens if we try and install a port. I've chose `bash', also
  known as the Bourne-Again Shell, as that seems fairly typical.
  
! <em>Note</em> if you're trying this at home, you'll need to be root.
  
  <verb>
   # cd /usr/ports/shells/bash
***************
*** 308,314 ****
   # ftp ftp.freebsd.org
   [log in as `ftp' and give your email address when asked for a
   password. Remember to use binary (aka image) mode!]
!  > cd /pub/FreeBSD/ports/databases
   > get databases.tar.gz               [tarballs up the databases directory for us]
   > quit
   # tar xzf databases.tar.gz   [extract all the database skeletons]
--- 308,314 ----
   # ftp ftp.freebsd.org
   [log in as `ftp' and give your email address when asked for a
   password. Remember to use binary (aka image) mode!]
!  > cd /pub/FreeBSD/ports
   > get databases.tar.gz               [tarballs up the databases directory for us]
   > quit
   # tar xzf databases.tar.gz   [extract all the database skeletons]
***************
*** 392,398 ****
  <verb>
   .include <bsd.port.mk> 
  </verb>
! says that the other statements and commmands 
  needed for this port are in a standard file called 
  `bsd.port.mk&quot;. As these are the same for all ports, there is
  no point in duplicating them all over the place, so they are kept in a
--- 392,398 ----
  <verb>
   .include <bsd.port.mk> 
  </verb>
! says that the other statements and commands 
  needed for this port are in a standard file called 
  `bsd.port.mk&quot;. As these are the same for all ports, there is
  no point in duplicating them all over the place, so they are kept in a


o ppp.sgml		1.8		1.8

o printing.sgml		1.2.2.3		1.11
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/printing.sgml,v
retrieving revision 1.2.2.3
retrieving revision 1.11
diff -u -r1.2.2.3 -r1.11
--- src/share/doc/handbook/printing.sgml        1996/07/03 01:39:27     1.2.2.3
+++ src/share/doc/handbook/printing.sgml        1996/10/05 18:36:21     1.11
@@ -1,7 +1,7 @@
 <!-- This is an SGML document in the linuxdoc DTD describing
      Printing with FreeBSD.  By Sean Kelly, 1995.
 
-     $Id: printing.sgml,v 1.2.2.3 1996/07/03 01:39:27 jkh Exp $
+     $Id: printing.sgml,v 1.11 1996/10/05 18:36:21 wosch Exp $
 
      The FreeBSD Documentation Project
 
@@ -988,7 +988,7 @@
 #
 # Simply copies stdin to stdout.  Ignores all filter arguments.
 
-/bin/cat &ero;&ero; exit 0
+/bin/cat &amp;&amp; exit 0
 exit 2
 </code>
              Make the file executable:
@@ -1049,11 +1049,11 @@
              results should look like the following:
 
 <tscreen><verb>
-!"#$%&ero;'()*+,-./01234
-"#$%&ero;'()*+,-./012345
-#$%&ero;'()*+,-./0123456
-$%&ero;'()*+,-./01234567
-%&ero;'()*+,-./012345678
+!"#$%&amp;'()*+,-./01234
+"#$%&amp;'()*+,-./012345
+#$%&amp;'()*+,-./0123456
+$%&amp;'()*+,-./01234567
+%&amp;'()*+,-./012345678
 </verb></tscreen>
 
              To further test the printer, try downloading larger
@@ -1103,7 +1103,7 @@
 # Simply copies stdin to stdout.  Ignores all filter arguments.
 # Writes a form feed character (\f) after printing job.
 
-/bin/cat &ero;&ero; printf "\f" &ero;&ero; exit 0
+/bin/cat &amp;&amp; printf "\f" &amp;&amp; exit 0
 exit 2
 </code>
 
@@ -1111,9 +1111,9 @@
 
                  You got the following on paper:
 <tscreen><verb>
-!"#$%&ero;'()*+,-./01234
-                        "#$%&ero;'()*+,-./012345
-                                                #$%&ero;'()*+,-./0123456
+!"#$%&amp;'()*+,-./01234
+                        "#$%&amp;'()*+,-./012345
+                                                #$%&amp;'()*+,-./0123456
 </verb></tscreen>
                  You have become another victim of the <em/staircase
                  effect/, caused by conflicting interpretations of
@@ -1188,7 +1188,7 @@
 # Tells printer to treat LF as CR+LF. Writes a form feed character
 # after printing job.
 
-printf "\033&ero;k2G" &ero;&ero; cat &ero;&ero; printf "\f" &ero;&ero; exit 0
+printf "\033&amp;k2G" &amp;&amp; cat &amp;&amp; printf "\f" &amp;&amp; exit 0
 exit 2
 </code>
 
@@ -2118,13 +2118,13 @@
    #
    #  PostScript job, print it.
    #
-   echo $first_line &ero;&ero; cat &ero;&ero; printf "\004" &ero;&ero; exit 0
+   echo $first_line &amp;&amp; cat &amp;&amp; printf "\004" &amp;&amp; exit 0
    exit 2
 else
    #
    #  Plain text, convert it, then print it.
    #
-   ( echo $first_line; cat ) | /usr/local/bin/textps &ero;&ero; printf "\004" &ero;&ero; exit 0
+   ( echo $first_line; cat ) | /usr/local/bin/textps &amp;&amp; printf "\004" &amp;&amp; exit 0
    exit 2
 fi
 </code>
@@ -2176,7 +2176,7 @@
 #
 #  Treat LF as CR+LF:
 #
-printf "\033&ero;k2G" || exit 2
+printf "\033&amp;k2G" || exit 2
 
 #
 #  Read first two characters of the file
@@ -2189,14 +2189,14 @@
     #  It is PostScript; use Ghostscript to scan-convert and print it
     #
     /usr/local/bin/gs -dSAFER -dNOPAUSE -q -sDEVICE=djet500 -sOutputFile=- - \
-        &ero;&ero; exit 0
+        &amp;&amp; exit 0
 
 else
     #
     #  Plain text or HP/PCL, so just print it directly; print a form
     #  at the end to eject the last page.
     #
-    echo $first_line &ero;&ero; cat &ero;&ero; printf "\f" &ero;&ero; exit 2
+    echo $first_line &amp;&amp; cat &amp;&amp; printf "\f" &amp;&amp; exit 2
 fi
 
 exit 2
@@ -2301,7 +2301,7 @@
              outside of the base FreeBSD installation, they should
              probably go under <tt>/usr/local</tt>.  The directory
              <tt>/usr/local/libexec</tt> is a popular location, since
-             they they are specialized programs that only LPD will
+             they are specialized programs that only LPD will
              run; regular users should not ever need to run them.
 
              To enable a conversion filter, specify its pathname
@@ -2426,7 +2426,7 @@
 # Installed in /usr/local/libexec/hprf
 #
 
-printf "\033&ero;k2G" &ero;&ero; fpr &ero;&ero; printf "\f" &ero;&ero; exit 0
+printf "\033&amp;k2G" &amp;&amp; fpr &amp;&amp; printf "\f" &amp;&amp; exit 0
 exit 2
 </code>
              And we will add this line to the <tt>/etc/printcap</tt>
@@ -2503,7 +2503,7 @@
 #  job.
 #
 fatal() {
-    echo "$@" 1>&ero;2
+    echo "$@" 1>&amp;2
     cleanup
     exit 2
 }
@@ -2527,7 +2527,7 @@
 #
 #  Make LF = CR+LF
 #
-printf "\033&ero;k2G" || fatal "Cannot initialize printer"
+printf "\033&amp;k2G" || fatal "Cannot initialize printer"
 
 # 
 #  Convert and print.  Return value from dvilj2p does not seem to be
@@ -2714,7 +2714,7 @@
 #  Installed in /usr/local/libexec/hpof
 
 
-printf "\033&ero;k2G" || exit 2
+printf "\033&amp;k2G" || exit 2
 exec /usr/libexec/lpr/lpf
 </code>
            Specify the path to the output filter in the <tt/of/
@@ -2921,7 +2921,7 @@
 #  Check arguments
 #
 if [ $# -ne 3 ]; then
-    echo "Usage: `basename $0` <user> <host> <job>" 1>&ero;2
+    echo "Usage: `basename $0` <user> <host> <job>" 1>&amp;2
     exit 1
 fi
 
@@ -3000,7 +3000,7 @@
 orig_args="$@"
 
 fail() {
-    echo "$@" 1>&ero;2
+    echo "$@" 1>&amp;2
     exit 2
 }
 
@@ -3009,7 +3009,7 @@
         x|y)  ;; # Ignore
        n)    login=$OPTARG ;;
        h)    host=$OPTARG ;; 
-       *)    echo "LPD started `basename $0` wrong." 1>&ero;2
+       *)    echo "LPD started `basename $0` wrong." 1>&amp;2
               exit 2
               ;;
     esac
@@ -3248,9 +3248,9 @@
 ($ignore, $ignore, $ignore, $ignore, $address)
     = gethostbyname($printer_host);
 
-$sockaddr = pack('S n a4 x8', &ero;AF_INET, $printer_port, $address);
+$sockaddr = pack('S n a4 x8', &amp;AF_INET, $printer_port, $address);
 
-socket(PRINTER, &ero;PF_INET, &ero;SOCK_STREAM, $protocol)
+socket(PRINTER, &amp;PF_INET, &amp;SOCK_STREAM, $protocol)
     || die "Can't create TCP/IP stream socket: $!";
 connect(PRINTER, $sockaddr) || die "Can't contact $printer_host: $!";
 while (<STDIN>) { print PRINTER; }
@@ -3733,7 +3733,7 @@
            To compute the dollar amount due, <tt/pac/ uses the
            <tt/pc/ capability in the <tt>/etc/printcap</tt> file
            (default of 200, or 2 cents per page).  Specify, in
-           hundreths of cents, the price per page or per foot you
+           hundredths of cents, the price per page or per foot you
            want to charge for printouts in this capability.  You can
            override this value when you run <tt/pac/ with the <tt/-p/
            option.  The units for the <tt/-p/ option are in dollars,
@@ -3865,7 +3865,7 @@
 
            For providing a plethora of HP filter programs for perusal.
 
-         <tag/Jake Hamby <tt/&lt;jehamby@lightside.com&gt;//
+         <tag/&a.jehamby;/
 
            For the Ghostscript-to-HP filter.
 


o quotas.sgml		1.3		1.3

o relnotes.sgml		1.12		1.15
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/relnotes.sgml,v
retrieving revision 1.12
retrieving revision 1.15
diff -c -r1.12 -r1.15
*** src/share/doc/handbook/relnotes.sgml        1996/05/16 23:25:18     1.12
--- src/share/doc/handbook/relnotes.sgml        1996/10/23 03:15:10     1.15
***************
*** 1,4 ****
! <!-- $Id: relnotes.sgml,v 1.12 1996/05/16 23:25:18 mpp Exp $ -->
  <!-- The FreeBSD Documentation Project -->
  
  <!--
--- 1,4 ----
! <!-- $Id: relnotes.sgml,v 1.15 1996/10/23 03:15:10 jfieber Exp $ -->
  <!-- The FreeBSD Documentation Project -->
  
  <!--
***************
*** 7,14 ****
  -->
        <sect><heading>About the current release<label id="relnotes"></heading>
  
!       <p>FreeBSD is a freely available, full source 4.4 BSD
!         Lite based release for Intel i386/i486/Pentium (or
          compatible) based PC's.  It is based primarily on
          software from U.C. Berkeley's CSRG group, with some
          enhancements from NetBSD, 386BSD, and the Free Software
--- 7,14 ----
  -->
        <sect><heading>About the current release<label id="relnotes"></heading>
  
!       <p>FreeBSD is a freely available, full source 4.4BSD-Lite
!         based release for Intel i386/i486/Pentium (or
          compatible) based PC's.  It is based primarily on
          software from U.C. Berkeley's CSRG group, with some
          enhancements from NetBSD, 386BSD, and the Free Software
***************
*** 67,73 ****
              <htmlurl url="file:/usr/share/doc/handbook/handbook.html">
  
            <tag>The FreeBSD FAQ</tag>
!             <htmlurl url="file:/usr/share/doc/FAQ/freebsd-faq.html">
          </descrip>
  
          You can also visit the master (and most frequently
--- 67,73 ----
              <htmlurl url="file:/usr/share/doc/handbook/handbook.html">
  
            <tag>The FreeBSD FAQ</tag>
!             <htmlurl url="file:/usr/share/doc/FAQ/FAQ.html">
          </descrip>
  
          You can also visit the master (and most frequently
***************
*** 84,90 ****
          anyone.  A freely (from outside the U.S.) exportable
          European distribution of DES for our non-U.S. users
          also exists and is described in the <htmlurl
!         url="../FAQ/freebsd-faq.html" name="FreeBSD FAQ">.
  
          If password security for FreeBSD is all you need, and
          you have no requirement for copying encrypted passwords
--- 84,90 ----
          anyone.  A freely (from outside the U.S.) exportable
          European distribution of DES for our non-U.S. users
          also exists and is described in the <htmlurl
!         url="../FAQ/FAQ.html" name="FreeBSD FAQ">.
  
          If password security for FreeBSD is all you need, and
          you have no requirement for copying encrypted passwords
***************
*** 99,106 ****
  <![ IGNORE [
        <p>Since our first release of FreeBSD 1.0 nearly two
          years ago, FreeBSD has changed dramatically.  Since
!         release 2.0, FreeBSD has been based on the Berkeley BSD
!         4.4-lite code rather than the Net2 code used for
          previous versions.  In addition to clearing the legal
          issues that surrounded the Net2 code, the port to 4.4
          has also brought in numerous new features, filesystems
--- 99,106 ----
  <![ IGNORE [
        <p>Since our first release of FreeBSD 1.0 nearly two
          years ago, FreeBSD has changed dramatically.  Since
!         release 2.0, FreeBSD has been based on the Berkeley
!         4.4BSD-Lite code rather than the Net2 code used for
          previous versions.  In addition to clearing the legal
          issues that surrounded the Net2 code, the port to 4.4
          has also brought in numerous new features, filesystems
***************
*** 199,206 ****
                  a number of more optimal memory allocation
                  strategies that were not possible before.
  
!                 Owner: David Greenman (davidg@FreeBSD.org) and
!                         John Dyson (dyson@implode.root.com)
  
                <tag>Network PCB hash optimization</tag> For
                  systems with a great number of active TCP
--- 199,205 ----
                  a number of more optimal memory allocation
                  strategies that were not possible before.
  
!                 Owner: &a.davidg; and &a.dyson;
  
                <tag>Network PCB hash optimization</tag> For
                  systems with a great number of active TCP
***************
*** 209,215 ****
                  to match an incoming packet up to its
                  associated connection.
  
!                 Owner: David Greenman (davidg@FreeBSD.org)
  
                <tag>Name cache optimization</tag> The name-cache
                  would cache all files of the same name to the
--- 208,214 ----
                  to match an incoming packet up to its
                  associated connection.
  
!                 Owner: &a.davidg;
  
                <tag>Name cache optimization</tag> The name-cache
                  would cache all files of the same name to the
***************
*** 219,226 ****
                  and improved the management of the cache in
                  various other ways while we were at it.
  
!                 Owner: Poul-Henning Kamp (phk@FreeBSD.org)
!                   David Greenman (davidg@FreeBSD.org)
  
                <tag>Less restrictive swap-spaces</tag> The need
                  to compile the names of the swap devices into
--- 218,224 ----
                  and improved the management of the cache in
                  various other ways while we were at it.
  
!                 Owner: &a.phk; and &a.davidg;
  
                <tag>Less restrictive swap-spaces</tag> The need
                  to compile the names of the swap devices into
***************
*** 229,236 ****
                  devices, up to the maximum number of swap
                  devices configured in the kernel.
  
!                 Owner: Poul-Henning Kamp (phk@FreeBSD.org)
!                       David Greenman (davidg@FreeBSD.org)
  
                <tag>Hard Wired SCSI Devices</tag> Prior to
                  2.0.5, FreeBSD performed dynamic assignment of
--- 227,233 ----
                  devices, up to the maximum number of swap
                  devices configured in the kernel.
  
!                 Owner: &a.phk; and &a.davidg;
  
                <tag>Hard Wired SCSI Devices</tag> Prior to
                  2.0.5, FreeBSD performed dynamic assignment of
***************
*** 247,253 ****
                  syntax can be found in the <tt>scsi(4)</tt> man
                  page or the LINT kernel config file.
  
!                 Owner: Peter Dufault (dufault@hda.com) 
  
                    Sources involved: <tt>sys/scsi/*</tt>
                  <tt>usr.sbin/config/*</tt>
--- 244,250 ----
                  syntax can be found in the <tt>scsi(4)</tt> man
                  page or the LINT kernel config file.
  
!                 Owner: &a.dufault;
  
                    Sources involved: <tt>sys/scsi/*</tt>
                  <tt>usr.sbin/config/*</tt>
***************
*** 258,264 ****
                  operating systems.  This support will allow
                  FreeBSD to inhabit DOS extended partitions.
  
!                 Owner: Bruce Evans (bde@FreeBSD.org)
  
                  Sources involved: <tt>sys/disklabel.h</tt>
                  <tt>sys/diskslice.h</tt> <tt>sys/dkbad.h</tt>
--- 255,261 ----
                  operating systems.  This support will allow
                  FreeBSD to inhabit DOS extended partitions.
  
!                 Owner: &a.bde;
  
                  Sources involved: <tt>sys/disklabel.h</tt>
                  <tt>sys/diskslice.h</tt> <tt>sys/dkbad.h</tt>
***************
*** 274,280 ****
                  program on the boot.flp or the Ontrack Disk
                  Manager tool under MS-DOS.
  
!                 Owner: Poul-Henning Kamp (phk@FreeBSD.org)
  
                <tag>Bad144 is back and working</tag> Bad144
                  works again, though the semantics are slightly
--- 271,277 ----
                  program on the boot.flp or the Ontrack Disk
                  Manager tool under MS-DOS.
  
!                 Owner: &a.phk;
  
                <tag>Bad144 is back and working</tag> Bad144
                  works again, though the semantics are slightly
***************
*** 282,289 ****
                  kept relative to the slice rather than absolute
                  on the disk.
  
!                 Owner: Bruce Evans (bde@FreeBSD.org)
!                 Poul-Henning Kamp (phk@FreeBSD.org)
  
              </descrip>
  
--- 279,285 ----
                  kept relative to the slice rather than absolute
                  on the disk.
  
!                 Owner: &a.bde; and &a.phk;
  
              </descrip>
  
***************
*** 302,309 ****
                are supported with the Karoke variable speed
                playback.
  
!               Owner: Frank Durda IV
!               (bsdmail@nemesis.lonestar.org)
  
                Sources involved: <tt>isa/matcd</tt>
  
--- 298,304 ----
                are supported with the Karoke variable speed
                playback.
  
!               Owner: &a.uhclem;
  
                Sources involved: <tt>isa/matcd</tt>
  
***************
*** 321,339 ****
                style copyright making the driver entirely clean
                of the GPL.
  
!               Owner: Justin Gibbs (gibbs@FreeBSD.org)
  
                Sources involved: <tt>isa/aic7770.c</tt> <tt>pci/aic7870.c</tt>
                <tt>i386/scsi/*</tt> <tt>sys/dev/aic7xxx/*</tt>
  
              <tag>NCR5380/NCR53400 SCSI (ProAudio Spectrum) driver</tag>
!                 Owner: core
  
                Submitted by: Serge Vakulenko (vak@cronyx.ru)
  
                Sources involved: <tt>isa/ncr5380.c</tt>
  
!             <tag>Sony CDROM driver</tag> Owner: core
  
                Submitted by: Mikael Hybsch (micke@dynas.se)
  
--- 316,334 ----
                style copyright making the driver entirely clean
                of the GPL.
  
!               Owner: &a.gibbs;
  
                Sources involved: <tt>isa/aic7770.c</tt> <tt>pci/aic7870.c</tt>
                <tt>i386/scsi/*</tt> <tt>sys/dev/aic7xxx/*</tt>
  
              <tag>NCR5380/NCR53400 SCSI (ProAudio Spectrum) driver</tag>
!                 Owner: &a.core;
  
                Submitted by: Serge Vakulenko (vak@cronyx.ru)
  
                Sources involved: <tt>isa/ncr5380.c</tt>
  
!             <tag>Sony CDROM driver</tag> Owner: &a.core;
  
                Submitted by: Mikael Hybsch (micke@dynas.se)
  
***************
*** 346,358 ****
          <p><descrip>
  
              <tag>SDL Communications Riscom/8 Serial Board Driver</tag> 
!               Owner: Andrey Chernov
!               (ache@FreeBSD.org)
  
                Sources involved: <tt>isa/rc.c</tt> <tt>isa/rcreg.h</tt>
  
              <tag>Cyclades Cyclom-y Serial Board Driver</tag>
!               Owner: Bruce Evans (bde@FreeBSD.org)
  
                Submitted by: Andrew Werple
                (andrew@werple.apana.org.au) and Heikki Suonsivu
--- 341,352 ----
          <p><descrip>
  
              <tag>SDL Communications Riscom/8 Serial Board Driver</tag> 
!               Owner: &a.ache;
  
                Sources involved: <tt>isa/rc.c</tt> <tt>isa/rcreg.h</tt>
  
              <tag>Cyclades Cyclom-y Serial Board Driver</tag>
!               Owner: &a.bde;
  
                Submitted by: Andrew Werple
                (andrew@werple.apana.org.au) and Heikki Suonsivu
***************
*** 363,369 ****
                Sources involved: <tt>isa/cy.c</tt>
  
              <tag>Cronyx/Sigma sync/async serial driver</tag>
!               Owner: core
  
                Submitted by: Serge Vakulenko
  
--- 357,363 ----
                Sources involved: <tt>isa/cy.c</tt>
  
              <tag>Cronyx/Sigma sync/async serial driver</tag>
!               Owner: &a.core;
  
                Submitted by: Serge Vakulenko
  
***************
*** 388,401 ****
              DC21140 chipset including the 100Mb DEC DE-500-XA
              and SMC 9332.
  
!             Owner: core
  
              Submitted by: Matt Thomas (thomas@lkg.dec.com)
  
              Sources involved: <tt>pci/if_de.c</tt> <tt>pci/dc21040.h</tt>
  
  
!           <tag>DEC FDDI (DEFPA/DEFEA) driver</tag> Owner: core
  
              Submitted by: Matt Thomas (thomas@lkg.dec.com)
  
--- 382,395 ----
              DC21140 chipset including the 100Mb DEC DE-500-XA
              and SMC 9332.
  
!             Owner: &a.core;
  
              Submitted by: Matt Thomas (thomas@lkg.dec.com)
  
              Sources involved: <tt>pci/if_de.c</tt> <tt>pci/dc21040.h</tt>
  
  
!           <tag>DEC FDDI (DEFPA/DEFEA) driver</tag> Owner: &a.core;
  
              Submitted by: Matt Thomas (thomas@lkg.dec.com)
  
***************
*** 404,410 ****
  
  
            <tag>3Com 3c505 (Etherlink/+) NIC driver</tag> Owner:
!             core
  
              Submitted by: Dean Huxley (dean@fsa.ca)
  
--- 398,404 ----
  
  
            <tag>3Com 3c505 (Etherlink/+) NIC driver</tag> Owner:
!             &a.core;
  
              Submitted by: Dean Huxley (dean@fsa.ca)
  
***************
*** 414,420 ****
  
  
            <tag>Fujitsu MB86960A family of NICs driver</tag>
!             Owner: core
  
              Submitted by: M.S. (seki@sysrap.cs.fujitsu.co.jp)
  
--- 408,414 ----
  
  
            <tag>Fujitsu MB86960A family of NICs driver</tag>
!             Owner: &a.core;
  
              Submitted by: M.S. (seki@sysrap.cs.fujitsu.co.jp)
  
***************
*** 427,433 ****
              Sources involved: <tt>isa/if_ix.c</tt> <tt>isa/if_ixreg.h</tt>
  
  
!           <tag>3Com 3c589 driver</tag> Owner: core
  
              Submitted by: "HOSOKAWA Tatsumi"
              (hosokawa@mt.cs.keio.ac.jp), Seiji Murata
--- 421,427 ----
              Sources involved: <tt>isa/if_ix.c</tt> <tt>isa/if_ixreg.h</tt>
  
  
!           <tag>3Com 3c589 driver</tag> Owner: &a.core;
  
              Submitted by: "HOSOKAWA Tatsumi"
              (hosokawa@mt.cs.keio.ac.jp), Seiji Murata
***************
*** 437,443 ****
              Sources involved: <tt>isa/if_zp.c</tt>
  
  
!           <tag>IBM Credit Card Adapter driver</tag> Owner: core
  
              Submitted by: "HOSOKAWA Tatsumi"
              (hosokawa@mt.cs.keio.ac.jp), 
--- 431,437 ----
              Sources involved: <tt>isa/if_zp.c</tt>
  
  
!           <tag>IBM Credit Card Adapter driver</tag> Owner: &a.core;
  
              Submitted by: "HOSOKAWA Tatsumi"
              (hosokawa@mt.cs.keio.ac.jp), 
***************
*** 446,452 ****
  
  
            <tag>EDSS1 and 1TR6 ISDN interface driver</tag>
!             Owner: core
  
              Submitted by: Dietmar Friede
              (dfriede@drnhh.neuhaus.de) and Juergen Krause
--- 440,446 ----
  
  
            <tag>EDSS1 and 1TR6 ISDN interface driver</tag>
!             Owner: &a.core;
  
              Submitted by: Dietmar Friede
              (dfriede@drnhh.neuhaus.de) and Juergen Krause
***************
*** 460,495 ****
  
        <p><descrip>
  
!           <tag>Joystick driver</tag> Owner: Jean-Marc Zucconi
!             (jmz@FreeBSD.org)
  
              Sources involved: <tt>isa/joy.c</tt>
              
            <tag>National Instruments ``LabPC'' driver</tag> Owner:
!             Peter Dufault (dufault@hda.com)
  
              Sources involved: <tt>isa/labpc.c</tt>
              
            <tag>WD7000 driver</tag> Owner: Olof Johansson
              (offe@ludd.luth.se)
              
!           <tag>Pcvt Console driver</tag> Owner: J&ouml;rg Wunsch
!             (joerg@FreeBSD.org)
  
!             Submitted by: Hellmuth Michaelis
!             (hm@altona.hamburg.com)
  
              Sources involved: <tt>isa/pcvt/*</tt>
  
            <tag>BSD-audio emulator for VAT driver</tag> Owner:
              Amancio Hasty (ahasty@FreeBSD.org) and
!             Paul Traina (pst@FreeBSD.org)
  
              Sources involved: <tt>isa/sound/vat_audio.c</tt>
              <tt>isa/sound/vat_audioio.h</tt>
  
            <tag>National Instruments AT-GPIB and AT-GPIB/TNT GPIB driver</tag>
!               Owner: core
  
              Submitted by: Fred Cawthorne
              (fcawth@delphi.umd.edu)
--- 454,486 ----
  
        <p><descrip>
  
!           <tag>Joystick driver</tag> Owner: &a.jmz;
  
              Sources involved: <tt>isa/joy.c</tt>
              
            <tag>National Instruments ``LabPC'' driver</tag> Owner:
!             &a.dufault;
  
              Sources involved: <tt>isa/labpc.c</tt>
              
            <tag>WD7000 driver</tag> Owner: Olof Johansson
              (offe@ludd.luth.se)
              
!           <tag>Pcvt Console driver</tag> Owner: &a.joerg;
  
!             Submitted by: &a.hm;
  
              Sources involved: <tt>isa/pcvt/*</tt>
  
            <tag>BSD-audio emulator for VAT driver</tag> Owner:
              Amancio Hasty (ahasty@FreeBSD.org) and
!             &a.pst;
  
              Sources involved: <tt>isa/sound/vat_audio.c</tt>
              <tt>isa/sound/vat_audioio.h</tt>
  
            <tag>National Instruments AT-GPIB and AT-GPIB/TNT GPIB driver</tag>
!               Owner: &a.core;
  
              Submitted by: Fred Cawthorne
              (fcawth@delphi.umd.edu)
***************
*** 498,511 ****
              <tt>isa/gpibreg.h</tt>
  
            <tag>Genius GS-4500 hand scanner driver</tag> Owner:
!             core
  
              Submitted by: Gunther Schadow
              (gusw@fub46.zedat.fu-berlin.de)
  
              Sources involved: <tt>isa/gsc.c</tt> <tt>isa/gscreg.h</tt>
  
!           <tag>CORTEX-I Frame Grabber</tag> Owner: core
  
              Submitted by: Paul S. LaFollette, Jr. (
  
--- 489,502 ----
              <tt>isa/gpibreg.h</tt>
  
            <tag>Genius GS-4500 hand scanner driver</tag> Owner:
!             &a.core;
  
              Submitted by: Gunther Schadow
              (gusw@fub46.zedat.fu-berlin.de)
  
              Sources involved: <tt>isa/gsc.c</tt> <tt>isa/gscreg.h</tt>
  
!           <tag>CORTEX-I Frame Grabber</tag> Owner: &a.core;
  
              Submitted by: Paul S. LaFollette, Jr. (
  
***************
*** 540,546 ****
            way for ELF and XOUT loaders, and most of the svr4
            syscall wrappers are written.
  
!           Owner: S&oslash;ren Schmidt (sos) and Sean Eric Fagan (sef)
  
            Sources involved: <tt>sys/i386/ibcs2/*</tt> and misc
            kernel changes.
--- 531,537 ----
            way for ELF and XOUT loaders, and most of the svr4
            syscall wrappers are written.
  
!           Owner: &a.sos; and &a.sef;
  
            Sources involved: <tt>sys/i386/ibcs2/*</tt> and misc
            kernel changes.


o routing.sgml		1.1.2.2		1.1.2.2

o scsi.sgml		1.15		1.19
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/scsi.sgml,v
retrieving revision 1.15
retrieving revision 1.19
diff -u -r1.15 -r1.19
--- src/share/doc/handbook/scsi.sgml    1996/07/07 02:00:48     1.15
+++ src/share/doc/handbook/scsi.sgml    1996/10/04 22:54:14     1.19
@@ -1,4 +1,4 @@
-<!-- $Id: scsi.sgml,v 1.15 1996/07/07 02:00:48 jfieber Exp $ -->
+<!-- $Id: scsi.sgml,v 1.19 1996/10/04 22:54:14 wosch Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
@@ -94,7 +94,7 @@
        stuff when you get that shiny 2Gb disk: I own a system on which a
        pre-SCSI-1 disk, a SCSI-2 QIC tape unit, a SCSI-1 helical scan
        tape unit and 2 SCSI-1 disks work together quite happily. From
-       a performance standpoint you might want to seperate your older
+       a performance standpoint you might want to separate your older
        and newer (=faster) devices however.
 
     <sect2><heading>Components of SCSI</heading>
@@ -237,7 +237,7 @@
            There is nothing that stops you from using differential stuff
            with FreeBSD, as long as you use a controller that has device
            driver support in FreeBSD. As an example, Adaptec marketed the
-           AH1740 as a single ended board, whereas the AH1744 was differential.
+           AHA1740 as a single ended board, whereas the AHA1744 was differential.
            The software interface to the host is identical for both.
 
         <sect3><heading>Terminators</heading>
@@ -637,7 +637,7 @@
           Experience has shown that some devices are slow to respond to INQUIRY 
          commands after a SCSI bus reset (which happens at boot time).
          An INQUIRY command is sent by the kernel on boot to see what
-         kind of device (disk, tape, cdrom etc) is connected to a
+         kind of device (disk, tape, CDROM etc) is connected to a
          specific target ID. This process is called device probing by the way.
 
          To work around the 'slow response' problem, FreeBSD allows a 
@@ -647,7 +647,7 @@
          using a line like:
 
          <verb>
-options         "SCSI_DELAY=15"         #Be pessimistic about Joe SCSI device
+options         SCSI_DELAY=15         #Be pessimistic about Joe SCSI device
          </verb>
          This line sets the delay time to 15 seconds. On my own system I had to
          use 3 seconds minimum to get my trusty old CDROM drive to be recognized.
@@ -667,11 +667,11 @@
          booting. An example for two of my cartridge tape units:
        
         <verb>
-Feb 25 21:03:34 yedi /386bsd: ahb0 targ 5 lun 0: <TANDBERG TDC 3600       -06:>
-Feb 25 21:03:34 yedi /386bsd: st0: Tandberg tdc3600 is a known rogue
+Feb 25 21:03:34 yedi /kernel: ahb0 targ 5 lun 0: <TANDBERG TDC 3600       -06:>
+Feb 25 21:03:34 yedi /kernel: st0: Tandberg tdc3600 is a known rogue
 
-Mar 29 21:16:37 yedi /386bsd: aha0 targ 5 lun 0: <ARCHIVE VIPER 150  21247-005>
-Mar 29 21:16:37 yedi /386bsd: st1: Archive  Viper 150 is a known rogue
+Mar 29 21:16:37 yedi /kernel: aha0 targ 5 lun 0: <ARCHIVE VIPER 150  21247-005>
+Mar 29 21:16:37 yedi /kernel: st1: Archive  Viper 150 is a known rogue
         </verb>
 
          For instance, there are devices that respond to 
@@ -689,7 +689,7 @@
 
          This scheme works fine, but keep in mind that it of course only
          works for devices that are KNOWN to be weird. If you are the first
-          to connect your bogus Mumbletech SCSI cdrom you might be the one
+          to connect your bogus Mumbletech SCSI CDROM you might be the one
          that has to define which workaround is needed.
 
          After you got your Mumbletech working, please send the required
@@ -707,7 +707,7 @@
 
          This means that any devices with LUNs != 0 are not normally
          found during device probe on system boot. To work around this
-         problem you must add an apropriate entry in /sys/scsi/scsiconf.c
+         problem you must add an appropriate entry in /sys/scsi/scsiconf.c
          and rebuild your kernel.
 
          Look for a struct that is initialised like below:


o sections.sgml		1.17		1.17

o sio.sgml		1.3		1.3

o skey.sgml		1.5		1.3.2.2
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/skey.sgml,v
retrieving revision 1.3.2.2
retrieving revision 1.5
diff -u -r1.3.2.2 -r1.5
--- src/share/doc/handbook/skey.sgml    1996/06/19 20:28:19     1.3.2.2
+++ src/share/doc/handbook/skey.sgml    1996/05/16 23:18:17     1.5
@@ -1,4 +1,4 @@
-<!-- $Id: skey.sgml,v 1.3.2.2 1996/06/19 20:28:19 jkh Exp $ -->
+<!-- $Id: skey.sgml,v 1.5 1996/05/16 23:18:17 mpp Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!--
 Copyright 1995 Massachusetts Institute of Technology


o slipc.sgml		1.1.1.1.4.4	1.7
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/slipc.sgml,v
retrieving revision 1.1.1.1.4.4
retrieving revision 1.7
diff -u -r1.1.1.1.4.4 -r1.7
--- src/share/doc/handbook/slipc.sgml   1996/06/19 20:28:20     1.1.1.1.4.4
+++ src/share/doc/handbook/slipc.sgml   1996/08/07 07:46:15     1.7
@@ -1,4 +1,4 @@
-<!-- $Id: slipc.sgml,v 1.1.1.1.4.4 1996/06/19 20:28:20 jkh Exp $ -->
+<!-- $Id: slipc.sgml,v 1.7 1996/08/07 07:46:15 asami Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>Setting up a SLIP client<label id="slipc"></heading>
@@ -161,7 +161,7 @@
   person)
 
 <item>Using "s10" instead of "sl0" (might be hard to see the difference on
-  some fonts.
+  some fonts).
 
 <item>Try "ifconfig sl0" to see your interface status.  I get:
 <verb>


o slips.sgml		1.2.4.5		1.11
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/slips.sgml,v
retrieving revision 1.2.4.5
retrieving revision 1.11
diff -u -r1.2.4.5 -r1.11
--- src/share/doc/handbook/slips.sgml   1996/06/26 09:24:03     1.2.4.5
+++ src/share/doc/handbook/slips.sgml   1996/09/22 15:40:39     1.11
@@ -500,7 +500,8 @@
 Thanks to these people for comments and advice regarding this tutorial:
 
 <descrip>
-<tag/Wilko Bulte/  &lt;wilko@yedi.iaf.nl&gt;
+<tag/&a.wilko;/
+
 <tag/Piero Serini/ &lt;Piero@Strider.Inet.IT&gt;
 </descrip>
 

o stable.sgml		1.6		1.6

o submitters.sgml	1.33		1.33

o sup.sgml		1.18		1.19
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/sup.sgml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- src/share/doc/handbook/sup.sgml     1996/09/14 02:32:30     1.18
+++ src/share/doc/handbook/sup.sgml     1996/10/24 11:23:06     1.19
@@ -1,4 +1,4 @@
-<!-- $Id: sup.sgml,v 1.18 1996/09/14 02:32:30 asami Exp $ -->
+<!-- $Id: sup.sgml,v 1.19 1996/10/24 11:23:06 asami Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 
@@ -110,6 +110,7 @@
 <verb>
 ports-base:      /usr/ports/...        misc files at the top of /usr/ports
 ports-archivers:  /usr/ports/archivers archiving tools
+ports-astro:     /usr/ports/astro      astronomical ports
 ports-audio:     /usr/ports/audio      sound support
 ports-benchmarks: /usr/ports/benchmarks        benchmarks
 ports-cad:       /usr/ports/cad        CAD tools


o synching.sgml		1.3		1.3

o term.sgml		1.3		1.3

o troubleshooting.sgml	1.4		1.1.1.1.4.3
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/troubleshooting.sgml,v
retrieving revision 1.1.1.1.4.3
retrieving revision 1.4
diff -u -r1.1.1.1.4.3 -r1.4
--- src/share/doc/handbook/troubleshooting.sgml 1996/06/19 20:28:28     1.1.1.1.4.3
+++ src/share/doc/handbook/troubleshooting.sgml 1996/05/16 23:18:26     1.4
@@ -1,4 +1,4 @@
-<!-- $Id: troubleshooting.sgml,v 1.1.1.1.4.3 1996/06/19 20:28:28 jkh Exp $ -->
+<!-- $Id: troubleshooting.sgml,v 1.4 1996/05/16 23:18:26 mpp Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt><heading>Troubleshooting<label id="troubleshooting"></heading>


o uart.sgml		1.2		1.3
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/uart.sgml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src/share/doc/handbook/uart.sgml    1996/02/27 15:57:51     1.2
+++ src/share/doc/handbook/uart.sgml    1996/08/21 19:22:04     1.3
@@ -1,4 +1,4 @@
-<!-- $Id: uart.sgml,v 1.2 1996/02/27 15:57:51 jfieber Exp $ -->
+<!-- $Id: uart.sgml,v 1.3 1996/08/21 19:22:04 mpp Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
@@ -33,7 +33,7 @@
        "S" if it supports Synchronous communications.  Both forms are
        described below.
 
-       Some common acryonyms are:
+       Some common acronyms are:
 <quote>UART    Universal Asynchronous Receiver/Transmitter</quote>
 <quote>USART   Universal Synchronous-Asynchronous Receiver/Transmitter</quote>
 
@@ -297,7 +297,7 @@
 
     <sect3><heading>Bits, Baud and Symbols</heading>
 
-       <p>Baud is a measurment of transmission speed in asynchronous
+       <p>Baud is a measurement of transmission speed in asynchronous
        communication.  Because of advances in modem communication
        technology, this term is frequently misused when describing
        the data rates in newer devices.
@@ -505,10 +505,10 @@
        "N"     DIP     (dual inline package) through hole straight lead type
        "V"     LPCC    (lead plastic chip carrier) J lead type</verb>
 
-       The "<em>g</em>" is the product grade field.  If an "I" preceeds
+       The "<em>g</em>" is the product grade field.  If an "I" precedes
        the package-type letter, it indicates an "industrial" grade part,
        which has higher specs than a standard part but not as high as
-       Miltary Specification (Milspec) component.  This is an optional field.
+       Military Specification (Milspec) component.  This is an optional field.
 
        So what we used to call a NS16550AFN (DIP Package) is now called a
        PC16550DN or PC16550DIN.
@@ -526,7 +526,7 @@
        In internal modems, the modem designer will frequently emulate the
        8250A/16450 with the modem microprocessor, and the emulated UART will
        frequently have a hidden buffer consisting of several hundred bytes.
-       Because of the suze of the buffer, these emulations can be as
+       Because of the size of the buffer, these emulations can be as
        reliable as a 16550A in their ability to handle high speed data.
        However, most operating systems will still report that
        the UART is only a 8250A or 16450, and may not make effective use
@@ -638,7 +638,7 @@
        functionality.  COMTEST appears to turn a blind eye to the
        differences within the National product line and reports no errors
        on the National parts (except for the original 16550) even when
-       there are official erattas that describe bugs in the A, B and C 
+       there are official erratas that describe bugs in the A, B and C 
        revisions of the parts, so this bias in COMTEST must be taken into
        account.
 
@@ -948,7 +948,7 @@
                                to DCD.
 
                        Bit 3   OUT 2
-                               An auxillary output that the host
+                               An auxiliary output that the host
                                processor may set high or low.
                                In the IBM PC serial adapter (and most
                                clones), OUT 2 is used to tri-state 
@@ -956,7 +956,7 @@
                                8250/16450/16550 UART.
 
                        Bit 2   OUT 1
-                               An auxillary output that the host
+                               An auxiliary output that the host
                                processor may set high or low.
                                This output is not used on the IBM PC
                                serial adapter.


o userppp.sgml		1.3.2.2		1.10
===================================================================
RCS file: /home/ncvs/src/share/doc/handbook/userppp.sgml,v
retrieving revision 1.3.2.2
retrieving revision 1.10
diff -c -r1.3.2.2 -r1.10
*** src/share/doc/handbook/userppp.sgml 1996/06/19 20:28:30     1.3.2.2
--- src/share/doc/handbook/userppp.sgml 1996/10/14 14:48:02     1.10
***************
*** 1,4 ****
! <!-- $Id: userppp.sgml,v 1.3.2.2 1996/06/19 20:28:30 jkh Exp $ -->
  <!-- The FreeBSD Documentation Project -->
  
  <sect>Setting up user PPP<label id="userppp">
--- 1,4 ----
! <!-- $Id: userppp.sgml,v 1.10 1996/10/14 14:48:02 max Exp $ -->
  <!-- The FreeBSD Documentation Project -->
  
  <sect>Setting up user PPP<label id="userppp">
***************
*** 35,41 ****
    In essence, this means that rather than running a PPP daemon, the ppp
    program can be run as and when desired. No PPP interface needs to be
    compiled into the kernel, as the program can use the generic tunnel
!   device to to get data into and out of the kernel.
  
    From here on out, user ppp will be referred to as simply as ppp unless a
    distinction need to be made be it and any other PPP client/server software.
--- 35,41 ----
    In essence, this means that rather than running a PPP daemon, the ppp
    program can be run as and when desired. No PPP interface needs to be
    compiled into the kernel, as the program can use the generic tunnel
!   device to get data into and out of the kernel.
  
    From here on out, user ppp will be referred to as simply as ppp unless a
    distinction need to be made be it and any other PPP client/server software.
***************
*** 291,297 ****
  <sect1><heading>PPP and Dynamic IP configuration</heading>
  
  <!-- XXX -->
!  <p>If you service provider does not assign static IP numbers,
     <tt>ppp</tt> can be configured to negotiate the local address.  This is
     done by specifying 0 as the local IP address:
  <tscreen><verb>
--- 291,297 ----
  <sect1><heading>PPP and Dynamic IP configuration</heading>
  
  <!-- XXX -->
!  <p>If your service provider does not assign static IP numbers,
     <tt>ppp</tt> can be configured to negotiate the local address.  This is
     done by specifying 0 as the local IP address:
  <tscreen><verb>

----Next_Part(Sat_Oct_26_21:31:45_1996)----
