Be consistent about the codebase we originated from. Always use

"4.4BSD-Lite" (not "4.4 BSD Lite", "BSD 4.4-lite" or some such), this
is what the CSRG people call their release in the red daemon book (and
most of the handbook had it that way).

8 files changed, 21 insertions, 21 deletions

diff --git a/share/doc/handbook/contrib.sgml b/share/doc/handbook/contrib.sgml
index 5318089..1143b2d 100644
--- a/share/doc/handbook/contrib.sgml
+++ b/share/doc/handbook/contrib.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: contrib.sgml,v 1.123 1996/08/16 07:56:45 asami Exp $ -->
+<!-- $Id: contrib.sgml,v 1.124 1996/08/19 12:11:35 asami Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!-- Please try to keep the file 'avail' (from CVSROOT) 
@@ -12,7 +12,7 @@
     <p>This software was originally derived from William
       F. Jolitz's 386BSD release 0.1, though almost none of the
       original 386BSD specific code remains.  This software has
-      been essentially re-implemented from the 4.4 BSD Lite
+      been essentially re-implemented from the 4.4BSD-Lite
       release provided by the Computer Science Research Group
       (CSRG) at the University of California, Berkeley and
       associated academic contributors.
diff --git a/share/doc/handbook/handbook.sgml b/share/doc/handbook/handbook.sgml
index bae1147..0e9dcaa 100644
--- a/share/doc/handbook/handbook.sgml
+++ b/share/doc/handbook/handbook.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: handbook.sgml,v 1.52 1996/07/29 07:15:56 jkh Exp $ -->
+<!-- $Id: handbook.sgml,v 1.53 1996/08/09 15:33:27 jfieber Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
@@ -57,7 +57,7 @@ name="FreeBSD FTP server"> or one of the numerous
     <part><heading>Basics</heading>
 
     <chapt><heading>Introduction</heading>
-      <p>FreeBSD is a 4.4 BSD Lite based operating system for Intel
+      <p>FreeBSD is a 4.4BSD-Lite based operating system for Intel
       architecture (x86) based PCs.  For an overview of FreeBSD, see
       <ref id="nutshell" name="FreeBSD in a nutshell">.  For a
       history of the project, read <ref id="history"
diff --git a/share/doc/handbook/history.sgml b/share/doc/handbook/history.sgml
index b93bf04..a7e8333 100644
--- a/share/doc/handbook/history.sgml
+++ b/share/doc/handbook/history.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: history.sgml,v 1.13 1996/01/31 14:26:07 mpp Exp $ -->
+<!-- $Id: history.sgml,v 1.14 1996/05/16 23:17:59 mpp Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>A brief history of FreeBSD<label id="history"></heading>
@@ -42,7 +42,7 @@ unlikely that FreeBSD would have gotten as far, as fast, as it
 has today.
 
 The first CDROM (and general net-wide) distribution was FreeBSD 1.0,
-released in December of 1993.  This was based on the 4.3 BSD Lite
+released in December of 1993.  This was based on the 4.3BSD-Lite
 ("Net/2") tape from U.C. Berkeley, with many components also provided by
 386BSD and the Free Software Foundation.  It was a fairly reasonable
 success for a first offering, and we followed it with the highly successful
@@ -54,7 +54,7 @@ over the legal status of the Berkeley Net/2 tape.  A condition of that
 settlement was U.C. Berkeley's concession that large parts of Net/2
 were "encumbered" code and the property of Novell, who had in turn acquired
 it from AT&amp;T some time previously.  What Berkeley got in return was
-Novell's "blessing" that the 4.4 Lite release, when it was finally
+Novell's "blessing" that the 4.4BSD-Lite release, when it was finally
 released, would be declared unencumbered and all existing Net/2 users
 would be strongly encouraged to switch.  This included us, and we were
 given until the end of July 1994 to stop shipping our own Net/2 based
@@ -65,7 +65,7 @@ many to be a significant project milestone for stability and general
 performance..
 
 We then set about the arduous task of literally re-inventing ourselves
-with a completely new and rather incomplete set of 4.4 Lite bits.  The
+with a completely new and rather incomplete set of 4.4BSD-Lite bits.  The
 "Lite" releases were light in part because Berkeley's CSRG had removed
 large chunks of code required for actually constructing a bootable running
 system (due to various legal requirements) and the fact that the Intel
diff --git a/share/doc/handbook/kerberos.sgml b/share/doc/handbook/kerberos.sgml
index 3807007..ef9f357 100644
--- a/share/doc/handbook/kerberos.sgml
+++ b/share/doc/handbook/kerberos.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: kerberos.sgml,v 1.6 1996/01/03 13:13:16 gclarkii Exp $ -->
+<!-- $Id: kerberos.sgml,v 1.7 1996/05/16 23:18:02 mpp 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.
diff --git a/share/doc/handbook/kernelconfig.sgml b/share/doc/handbook/kernelconfig.sgml
index 5c228d3..99c419a 100644
--- a/share/doc/handbook/kernelconfig.sgml
+++ b/share/doc/handbook/kernelconfig.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: kernelconfig.sgml,v 1.13 1996/08/15 09:45:30 asami Exp $ -->
+<!-- $Id: kernelconfig.sgml,v 1.14 1996/08/15 11:20:14 asami Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- <!DOCTYPE linuxdoc PUBLIC '-//FreeBSD//DTD linuxdoc//EN'> -->
   <chapt><heading>Configuring the FreeBSD Kernel<label id="kernelconfig"></heading>
@@ -307,7 +307,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.
 
diff --git a/share/doc/handbook/linuxemu.sgml b/share/doc/handbook/linuxemu.sgml
index 2d8ed14..132a964 100644
--- a/share/doc/handbook/linuxemu.sgml
+++ b/share/doc/handbook/linuxemu.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: linuxemu.sgml,v 1.8 1996/05/24 19:33:32 jfieber Exp $ -->
+<!-- $Id: linuxemu.sgml,v 1.9 1996/08/12 11:48:47 peter Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt><heading>Linux Emulation<label id="linuxemu"></heading>
@@ -58,7 +58,7 @@ also add the following.
 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>
diff --git a/share/doc/handbook/nutshell.sgml b/share/doc/handbook/nutshell.sgml
index e9ff625..2ed67b6 100644
--- a/share/doc/handbook/nutshell.sgml
+++ b/share/doc/handbook/nutshell.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: nutshell.sgml,v 1.8 1996/01/31 14:26:12 mpp Exp $ -->
+<!-- $Id: nutshell.sgml,v 1.9 1996/05/16 23:18:07 mpp 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
diff --git a/share/doc/handbook/relnotes.sgml b/share/doc/handbook/relnotes.sgml
index 054e2e6..3f0605b 100644
--- a/share/doc/handbook/relnotes.sgml
+++ b/share/doc/handbook/relnotes.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: relnotes.sgml,v 1.11 1996/05/16 23:18:14 mpp Exp $ -->
+<!-- $Id: relnotes.sgml,v 1.12 1996/05/16 23:25:18 mpp Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
@@ -7,8 +7,8 @@
 -->
       <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
+	<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
@@ -99,8 +99,8 @@
 <![ 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
+	  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