Merge from head, sans hw.sgml which still needs more work.

8 files changed, 79 insertions, 21 deletions

diff --git a/handbook/Makefile b/handbook/Makefile
index 5f8d4942f3..9b12e2b13b 100644
--- a/handbook/Makefile
+++ b/handbook/Makefile
@@ -1,15 +1,16 @@
-# $Id: Makefile,v 1.1.2.2 1995-10-14 21:55:29 jfieber Exp $
+# $Id: Makefile,v 1.1.2.3 1996-07-03 01:39:21 jkh Exp $
 
 SRCS= authors.sgml basics.sgml bibliography.sgml boothelp.sgml
-SRCS+= booting.sgml contrib.sgml crypt.sgml ctm.sgml current.sgml dialup.sgml
+SRCS+= booting.sgml contrib.sgml crypt.sgml ctm.sgml current.sgml 
+SRCS+= cyclades.sgml dialup.sgml
 SRCS+= diskless.sgml dma.sgml eresources.sgml esdi.sgml 
-SRCS+= firewalls.sgml glossary.sgml
-SRCS+= handbook.sgml history.sgml hw.sgml install.sgml kerberos.sgml
+SRCS+= firewalls.sgml glossary.sgml goals.sgml
+SRCS+= handbook.sgml history.sgml hw.sgml install.sgml isdn.sgml kerberos.sgml
 SRCS+= kernelconfig.sgml kerneldebug.sgml memoryuse.sgml
-SRCS+= mirrors.sgml nfs.sgml nutshell.sgml 
-SRCS+= porting.sgml ports.sgml ppp.sgml printing.sgml relnotes.sgml 
-SRCS+= routing.sgml scsi.sgml sections.sgml
-SRCS+= skey.sgml slipc.sgml slips.sgml submitters.sgml sup.sgml
-SRCS+= troubleshooting.sgml userppp.sgml
+SRCS+= mirrors.sgml nfs.sgml nutshell.sgml pgpkeys.sgml policies.sgml
+SRCS+= porting.sgml ports.sgml ppp.sgml printing.sgml quotas.sgml relnotes.sgml 
+SRCS+= routing.sgml scsi.sgml sections.sgml sio.sgml
+SRCS+= skey.sgml slipc.sgml slips.sgml stable.sgml submitters.sgml sup.sgml
+SRCS+= synching.sgml troubleshooting.sgml userppp.sgml uart.sgml linuxemu.sgml
 
 .include <bsd.sgml.mk>
diff --git a/handbook/authors.sgml b/handbook/authors.sgml
index 9f027318a6..11576ed7e9 100644
--- a/handbook/authors.sgml
+++ b/handbook/authors.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: authors.sgml,v 1.3.4.5 1996-06-26 09:23:54 jkh Exp $ -->
+<!-- $Id: authors.sgml,v 1.3.4.6 1996-07-03 01:39:22 jkh Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!-- 
@@ -39,6 +39,18 @@ and double quotes.
   <tt><htmlurl url='mailto:ghelmer@alpha.dsu.edu' 
   name='&lt;ghelmer@alpha.dsu.edu&gt;'></tt>">
 
+<!ENTITY a.smpatel "Sujal Patel
+  <tt><htmlurl url='mailto:smpatel@FreeBSD.ORG' 
+  name='&lt;smpatel@FreeBSD.ORG&gt;'></tt>">
+
+<!ENTITY a.scrappy "Marc G. Fournier 
+  <tt><htmlurl url='mailto:scrappy@FreeBSD.ORG' 
+  name='&lt;scrappy@FreeBSD.ORG&gt;'></tt>">
+
+<!ENTITY a.andreas "Andreas Klemm 
+  <tt><htmlurl url='mailto:andreas@FreeBSD.ORG' 
+  name='&lt;andreas@FreeBSD.ORG&gt;'></tt>">
+
 <!ENTITY a.gpalmer "Gary Palmer 
   <tt><htmlurl url='mailto:gpalmer@FreeBSD.ORG' 
   name='&lt;gpalmer@FreeBSD.ORG&gt;'></tt>">
@@ -306,3 +318,7 @@ and double quotes.
 <!ENTITY a.alex "Alex Nash
   <tt><htmlurl url='mailto:alex@freebsd.org'
   name='&lt;alex@freebsd.org&gt;'></tt>">
+
+<!ENTITY a.hm "Hellmuth Michaelis
+  <tt><htmlurl url='mailto:hm@kts.org'
+  name='&lt;hm@kts.org&gt;'></tt>">
diff --git a/handbook/contrib.sgml b/handbook/contrib.sgml
index 2c65213d0f..85a28af23e 100644
--- a/handbook/contrib.sgml
+++ b/handbook/contrib.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: contrib.sgml,v 1.15.2.9 1996-06-26 09:23:56 jkh Exp $ -->
+<!-- $Id: contrib.sgml,v 1.15.2.10 1996-07-03 01:39:23 jkh Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt><heading>FreeBSD contributor list<label id="contrib"></heading>
@@ -80,7 +80,7 @@
   <sect><heading>The FreeBSD Developers</heading>
 
     <p>These are the people who have commit privileges and do the work on
-       FreeBSD source tree.  All core team members are also developers.
+       the FreeBSD source tree.  All core team members are also developers.
 
       <itemize>
         <item>&a.torstenb;
@@ -93,6 +93,7 @@
         <item>&a.se;  
         <item>&a.fenner;
         <item>&a.jfieber;
+	<item>&a.scrappy;
 	<item>&a.jhay;
         <item>&a.lars;
         <item>&a.tg;
@@ -101,14 +102,15 @@
         <item>&a.hsu;
         <item>&a.ugen;
         <item>&a.gj;
+	<item>&a.andreas;
         <item>&a.ljo;
         <item>&a.erich;
         <item>&a.smace;
         <item>&a.amurai;
         <item>&a.markm;
         <item>&a.alex;
-        <item>&a.olah;
         <item>&a.wpaul; 
+	<item>&a.smpatel;
         <item>&a.jmacd; 
         <item>&a.jdp;
         <item>&a.mpp;
@@ -218,6 +220,7 @@
 	  <item>Janusz Kokot &lt;janek@gaja.ipan.lublin.pl&gt;
 	  <item>Javier Martin Rueda &lt;jmrueda@diatel.upm.es&gt;
 	  <item>Jian-Da Li &lt;jdli@FreeBSD.csie.NCTU.edu.tw&gt;
+	  <item>Jim Lowe &lt;james@miller.cs.uwm.edu&gt;
 	  <item>Jim Wilson &lt;wilson@moria.cygnus.com&gt;
 	  <item>John Capo &lt;jc@irbs.com&gt;
           <item>John Perry &lt;perry@vishnu.alias.net&gt;
diff --git a/handbook/handbook.sgml b/handbook/handbook.sgml
index b340eff994..6594f4fbe6 100644
--- a/handbook/handbook.sgml
+++ b/handbook/handbook.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: handbook.sgml,v 1.7.4.7 1996-06-19 20:27:46 jkh Exp $ -->
+<!-- $Id: handbook.sgml,v 1.7.4.8 1996-07-03 01:39:24 jkh Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
@@ -129,7 +129,7 @@ name="FreeBSD FTP server"> or one of the numerous
       &nfs;
       &diskless;
       <sect><heading>* Yellow Pages/NIS</heading>
-      <sect><heading>* ISDN</heading>
+      &isdn;	
 
     <chapt><heading>* Mail</heading>
 
@@ -159,6 +159,7 @@ name="FreeBSD FTP server"> or one of the numerous
     &bibliography;
     &eresources;
     &contrib;
+    &policies;
     &pgpkeys;
 
 <!--    &glossary; -->
diff --git a/handbook/mirrors.sgml b/handbook/mirrors.sgml
index 0119e60181..6fb129114e 100644
--- a/handbook/mirrors.sgml
+++ b/handbook/mirrors.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: mirrors.sgml,v 1.1.2.6 1996-06-19 20:28:04 jkh Exp $ -->
+<!-- $Id: mirrors.sgml,v 1.1.2.7 1996-07-03 01:39:25 jkh Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
@@ -333,6 +333,9 @@ for this domain.
 <item>
 <htmlurl url="ftp://ftp2.za.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp2.za.FreeBSD.ORG/pub/FreeBSD"><newline>
+<item>
+<htmlurl url="ftp://ftp3.za.FreeBSD.ORG/FreeBSD"
+	name="ftp://ftp3.za.FreeBSD.ORG/FreeBSD"><newline>
 
 </itemize>
 
diff --git a/handbook/pgpkeys.sgml b/handbook/pgpkeys.sgml
index ce3fde233a..241a2a491f 100644
--- a/handbook/pgpkeys.sgml
+++ b/handbook/pgpkeys.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: pgpkeys.sgml,v 1.6.2.1 1996-06-26 09:24:00 jkh Exp $ -->
+<!-- $Id: pgpkeys.sgml,v 1.6.2.2 1996-07-03 01:39:26 jkh Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt><heading>PGP keys<label id="pgpkeys"></heading>
@@ -202,3 +202,35 @@ Sb97WRLEYDi686osaGfsuKNA87Rm+q5F+jxeUV4w4szoqp60gGvCbD0KCB2hWraP
 =QoiM
 -----END PGP PUBLIC KEY BLOCK-----
 </verb></tscreen>
+
+  <sect1><heading>&a.peter</heading><p>
+
+<tscreen><verb>
+Peter Wemm &lt;peter@FreeBSD.org&gt;
+Fingerprint = 47 05 04 CA 4C EE F8 93  F6 DB 02 92 6D F5 58 8A
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: 2.6.3ia
+
+mQCNAy9/FJwAAAEEALxs9dE9tFd0Ru1TXdq301KfEoe5uYKKuldHRBOacG2Wny6/
+W3Ill57hOi2+xmq5X/mHkapywxvy4cyLdt31i4GEKDvxpDvEzAYcy2n9dIup/eg2
+kEhRBX9G5k/LKM4NQsRIieaIEGGgCZRm0lINqw495aZYrPpO4EqGN2HYnOMZAAUT
+tCVQZXRlciBXZW1tIDxwZXRlckBoYXl3aXJlLmRpYWxpeC5jb20+iQCVAwUQMbET
+6kqGN2HYnOMZAQG1iwP/atRXZ55OLp6RkLBt9UG7a+AM2kA+ZvyRyOIEZkpm4+pb
+iTIDRt36TtOhnf2e7scgiQfKU7LdmvAv5YzmGcVk/ubks5EF3jIuXGHCNbGW1KZB
+7Zqj1utt4a9Twd2SwNUyHE20FvjcybMUNT3OlxvXxpE/Vl0Ft14XrQD/o7lUwIS0
+JVBldGVyIFdlbW0gPHBldGVyQHBlcnRoLmRpYWxpeC5vei5hdT6JAJUDBRAxsRQh
+SoY3Ydic4xkBAel5A/9hzsH7ha50FLXcBT1JILRKjXkq+uI0NzGs/MYBLW2sP8pt
+T24WwpN9dVFkKuPos2RNsZLR0xQpSX2jJ8VSH26D8rokhffSh4lp3/xrKXrdEu5v
+/kVyMGYtakqrwGp8TIgO5CoBUgpnIc2rPE0HMslx7Z/4Jfb9JISZG/3790dtG7Qe
+UGV0ZXIgV2VtbSA8cGV0ZXJARnJlZUJTRC5vcmc+iQCVAwUQMbESXUqGN2HYnOMZ
+AQGSVAP+IvzVh8+SyB/0eCBf91dy5XhcjBa+RDxWNP+JnL9r/o7vYG6zhDP8XeC5
+T68dV6j3me+CUOivZh0euEYSke2SSfQPtdsq+XVaooXvddSsiymm/eKmVB2It+lk
+LtlbSxp8P7fCYOOH0Es2wReavYk83HzTmIUZEg9wXQ6wt5ZcsDu0JVBldGVyIFdl
+bW0gPHBldGVyQHNwaW5uZXIuZGlhbGl4LmNvbT6JAJUDBRAxsRItSoY3Ydic4xkB
+AXQOBACpjRZY/ERfR0LKCN1Gm572KgFjecAsBAeLvmX/M6ujh4nNt086CtUj5Zkn
+QRNXV10Bkumog5C0/sTnXnsDbO531CHB/wwY0rpJQDicypYlz0FuxJLijcMuHquW
+5fo9xwdu4vlgV4Z+jmjTUGOu+CxmkeNRBquOFqOQE3CInIoP8w==
+=iB1t
+-----END PGP PUBLIC KEY BLOCK-----
+</verb></tscreen>
diff --git a/handbook/printing.sgml b/handbook/printing.sgml
index a555258933..d60165eff9 100644
--- a/handbook/printing.sgml
+++ b/handbook/printing.sgml
@@ -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.2 1996-06-19 20:28:12 jkh Exp $
+     $Id: printing.sgml,v 1.2.2.3 1996-07-03 01:39:27 jkh Exp $
 
      The FreeBSD Documentation Project
 
@@ -26,7 +26,7 @@
 
         In order to use printers with FreeBSD, you will need to set
 	them up to work with the Berkeley line printer spooling
-	system, also known as the LPD spooling system.  It iss the
+	system, also known as the LPD spooling system.  It is the
 	standard printer control system in FreeBSD.  This section
 	introduces the LPD spooling system, often simply called LPD.
 
@@ -2455,7 +2455,7 @@ exit 2
 
 	      <tt/dvilj2p/ makes the filter <tt/hpdf/ quite complex
 	      since <tt/dvilj2p/ cannot read from standard input.  It
-	      wants to work with a filename.  What iss worse, the
+	      wants to work with a filename.  What is worse, the
 	      filename has to end in <tt/.dvi/ so using
 	      <tt>/dev/fd/0</tt> for standard input is problematic.
 	      We can get around that problem by linking (symbolically)
diff --git a/handbook/sections.sgml b/handbook/sections.sgml
index ef1bcd31de..cf691ed32d 100644
--- a/handbook/sections.sgml
+++ b/handbook/sections.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: sections.sgml,v 1.1.2.3 1996-06-19 20:28:18 jkh Exp $ -->
+<!-- $Id: sections.sgml,v 1.1.2.4 1996-07-03 01:39:28 jkh Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!-- Entities containing all the pieces of the handbook are -->
@@ -23,6 +23,7 @@
 <!ENTITY history SYSTEM "history.sgml">
 <!ENTITY hw SYSTEM "hw.sgml">
 <!ENTITY install SYSTEM "install.sgml">
+<!ENTITY isdn SYSTEM "isdn.sgml">
 <!ENTITY kerberos SYSTEM "kerberos.sgml">
 <!ENTITY kernelconfig SYSTEM "kernelconfig.sgml">
 <!ENTITY kerneldebug SYSTEM "kerneldebug.sgml">
@@ -32,6 +33,7 @@
 <!ENTITY nfs SYSTEM "nfs.sgml">
 <!ENTITY nutshell SYSTEM "nutshell.sgml">
 <!ENTITY pgpkeys SYSTEM "pgpkeys.sgml">
+<!ENTITY policies SYSTEM "policies.sgml">
 <!ENTITY porting SYSTEM "porting.sgml">
 <!ENTITY ports SYSTEM "ports.sgml">
 <!ENTITY ppp SYSTEM "ppp.sgml">