Close PR#1587 and 1586

Submitted-By: "David E. O'Brien" <obrien@Nuxi.cs.ucdavis.edu>

Incorporate new development section, since Satoshi seems to have wandered
off for a bit and I have too much stuff stacking up in my handbook directory.

Submitted-By: asami

7 files changed, 138 insertions, 47 deletions

diff --git a/share/doc/handbook/Makefile b/share/doc/handbook/Makefile
index f62774c50e3a..88f0c4c84c7d 100644
--- a/share/doc/handbook/Makefile
+++ b/share/doc/handbook/Makefile
@@ -1,8 +1,8 @@
-# $Id: Makefile,v 1.15 1996/07/02 23:16:14 wosch Exp $
+# $Id: Makefile,v 1.16 1996/07/29 07:15:54 jkh Exp $
 
 SRCS= authors.sgml basics.sgml bibliography.sgml boothelp.sgml
 SRCS+= booting.sgml contrib.sgml crypt.sgml ctm.sgml current.sgml 
-SRCS+= cyclades.sgml dialup.sgml
+SRCS+= cyclades.sgml development.sgml dialup.sgml
 SRCS+= diskless.sgml dma.sgml eresources.sgml esdi.sgml 
 SRCS+= firewalls.sgml glossary.sgml goals.sgml
 SRCS+= handbook.sgml history.sgml hw.sgml install.sgml isdn.sgml kerberos.sgml
diff --git a/share/doc/handbook/bibliography.sgml b/share/doc/handbook/bibliography.sgml
index c4db245a3a06..ead40df2edd7 100644
--- a/share/doc/handbook/bibliography.sgml
+++ b/share/doc/handbook/bibliography.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: bibliography.sgml,v 1.10 1996/08/18 12:47:33 wosch Exp $ -->
+<!-- $Id: bibliography.sgml,v 1.11 1996/08/21 07:18:30 asami Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
     <chapt>
@@ -9,7 +9,7 @@
 	they are notorious for not illustrating how to put the
 	pieces together to make the whole operating system run
 	smoothly.  For this, there is no substitute for a good
-	book on Unix system administration and a good users'
+	book on UNIX system administration and a good users'
 	manual.
 
       <sect>
@@ -26,7 +26,7 @@
 	    O'Reilly &amp; Associates, Inc., 1994.
 	    <newline>ISBN 1-56592-076-7</item>
 
-	  <item><sl>Unix in a Nutshell</sl>.
+	  <item><sl>UNIX in a Nutshell</sl>.
 	    O'Reilly &amp; Associates, Inc., 1990.
 	    <newline>ISBN 093717520X</item>
 
@@ -64,7 +64,7 @@
                 O'Reilly &amp; Associates, Inc., 1992.  
 		<newline>ISBN 0-937175-82-X</item>
 
-	    <item>Nemeth, Evi. <em>Unix System Administration
+	    <item>Nemeth, Evi. <em>UNIX System Administration
 		Handbook</em>. 2nd ed. Prentice Hall, 1995. 
 		<newline>ISBN 0131510517</item>
 
@@ -226,7 +226,7 @@
 	  </itemize>
 
       <sect>
-	<heading>Unix history</heading>
+	<heading>UNIX history</heading>
 
 	<p><itemize>
 
@@ -239,6 +239,9 @@
 	      IDG Books Worldwide, Inc., 1994.
 	      <newline>ISBN 1-56884-203-1</item>
 
+	    <item>Don Libes, Sandy Ressler  <em>Life with Unix</em> -
+	      special edition.  Prentice-Hall, Inc., 1989</item>
+
 	  </itemize>
 
       <sect>
@@ -249,6 +252,9 @@
 	    <item><em>The C/C++ Users Journal</em>.  R&amp;D Publications
 	      Inc. ISSN 1075-2838</item>
 
+	    <item><em>Sys Admin - The Journal for UNIX System
+	      Administrators</em>.  Miller Freeman, Inc. ISSN 1061-2688</item>
+
 	  </itemize>
 
     </sect>
diff --git a/share/doc/handbook/contrib.sgml b/share/doc/handbook/contrib.sgml
index 2d727c17efd5..2eb50ecfa481 100644
--- a/share/doc/handbook/contrib.sgml
+++ b/share/doc/handbook/contrib.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: contrib.sgml,v 1.128 1996/09/01 14:35:41 alex Exp $ -->
+<!-- $Id: contrib.sgml,v 1.129 1996/09/03 09:35:05 peter Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!-- Please try to keep the file 'avail' (from CVSROOT) 
@@ -81,7 +81,7 @@
 	<item>&a.joerg
       </itemize>
 
-  <sect><heading>The FreeBSD Developers</heading>
+  <sect><heading>The FreeBSD Developers<label id="contrib:committers"></heading>
 
     <p>These are the people who have commit privileges and do the work on
        the FreeBSD source tree.  All core team members are also developers.
@@ -156,7 +156,8 @@
         <tag/XFree86 Project, Inc. Liason/ &a.rich 
       </descrip>
 
-    <sect><heading>Additional FreeBSD contributors</heading>
+    <sect><heading>Additional FreeBSD contributors<label
+	id="contrib:additional"></heading>
 
       <p>(in alphabetical order by first name):
 
diff --git a/share/doc/handbook/development.sgml b/share/doc/handbook/development.sgml
new file mode 100644
index 000000000000..60807b7bbfbc
--- /dev/null
+++ b/share/doc/handbook/development.sgml
@@ -0,0 +1,105 @@
+<!-- $Id $ -->
+<!-- The FreeBSD Documentation Project -->
+
+<sect><heading>The FreeBSD development model<label id="development"></heading>
+
+<p><em>Contributed by &a.asami;</em>.
+
+<p>The development of FreeBSD is a very open and flexible process,
+FreeBSD being literally built from the contributions of hundreds of
+people around the world, as can be seen from our <ref id="contrib"
+name="list of contributors">. We are constantly on the lookout for
+new developers and ideas, and those interested in becoming more
+closely involved with the project need simply contact us at our
+<htmlurl url="mailto:hackers@freebsd.org" name="hackers@freebsd.org">
+mailing list.  Those who prefer to work more independantly are also
+accomodated, and they are free to use our FTP facilities at <htmlurl
+url="ftp://ftp.freebsd.org/pub/FreeBSD/incoming"
+name="ftp.freebsd.org"> to distribute their own patches or work-in-progress
+sources.  Our <htmlurl url="mailto:announce@freebsd.org"
+name="announcements mailing list"> is also available to those wishing
+to make other FreeBSD users aware of major areas of work.
+
+Whether working independantly or more closely with the project, there
+are number of things about how we handle our development which is useful
+to know.  The first and foremost item of importance in our development
+work is:
+
+<descrip>
+<tag>The CVS repository<label id="development:cvs-repository"></tag>
+
+<p>The central source tree for FreeBSD is maintained by <htmlurl
+url="http://www.cyclic.com/cyclic-pages/CVS-sheet.html" name="CVS">
+(Concurrent Version System), a freely available source code control
+tool which comes bundled with FreeBSD.  The primary <htmlurl
+url="http://www.freebsd.org/cgi-bin/cvsweb" name="CVS repository">
+resides on a machine in Concord CA, USA from where it is replicated
+to numerous mirror machines throughout the world.  The CVS tree, as well
+as the <ref id="current" name="-current"> and <ref id="stable"
+name="-stable"> trees which are checked out of it, can be easily
+replicated to your own machine as well.  Please refer to the
+<ref id="synching" name="Syncronizing your source tree">
+section for more information on doing this.
+
+<tag>The committers list<label id="development:committers"></tag>
+<p>The <ref id="contrib:committers" name="committers"> are the people
+who have <em>write</em> access to the CVS tree, and are thus
+authorized to make modifications to the FreeBSD source (the term
+``committer'' comes from the <tt>cvs(1)</tt> ``<tt>commit</tt>''
+command, which is used to bring new changes into the CVS repository).
+The best way of making submissions for review by the committers list
+is to use the <htmlurl url="http://www.freebsd.org/send-pr.html"
+name="send-pr(1)"> command, though if something appears to be jammed
+in the system then you may also reach them by sending mail to <htmlurl
+url="mailto:committers@freebsd.org" name="committers@freebsd.org">.
+
+
+<tag>The FreeBSD core team</tag>
+
+<p>The <ref id="contrib:core" name="FreeBSD core team"> would be
+equivalent to the board of directors if the FreeBSD Project were a
+company.  The primary task of the core team is to make sure the
+project, as a whole, is in good shape and is heading in the right
+directions.  Inviting dedicated and responsible developers to join our
+group of committers is one of the functions of the core team, as is
+the recruitment of new core team members as others move on.  Most
+current members of the core team started as committers who's addiction
+to the project got the better of them.
+
+<p>Some core team members also have specific <ref id="contrib:who"
+name="areas of responsibility">, meaning that they are committed to
+ensuring that some large portion of the system works as advertised.
+Note that most members of the core team are volunteers when it comes
+to FreeBSD development and do not benefit from the project
+financially, so "committment" should also not be misconstrued as
+meaning "guaranteed support."  The ``board of directors'' analogy
+above is not actually very accurate, and it may be more suitable to
+say that these are the people who gave up their lives in favor of
+FreeBSD against their better judgement! <tt>;)</tt>
+
+<tag>Additional contributors</tag>
+
+<p>Last, but definitely not least, the largest group of developers are
+the users themselves who provide feedback and bug-fixes to us on an
+almost constant basis.  Here are <ref id="contrib:additional"
+name="the names"> of the people who contributed something which made
+its way into our source tree.  Why not join this list too by
+contributing something back to FreeBSD? <tt>:-)</tt>
+
+<p>Providing code is not the only way to contribute to the project;
+for a more complete list of things we need, please refer to the <ref
+id="submitters" name="how to contribute"> section in this handbook.
+
+</descrip>
+
+In summary, our development model is organized as a loose set of
+concentric circles.  The centralized 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!  Our desire is to to present a stable
+operating system with a large set of coherent <ref id="ports"
+name="application programs"> that the users can easily install and
+use, and this model works very well in accomplishing that.
+
+All we ask of those who would join us as FreeBSD developers is some of
+the same dedication its current people have to its continued success!
diff --git a/share/doc/handbook/handbook.sgml b/share/doc/handbook/handbook.sgml
index 3e0f5e4d7ec4..2fbe8c1446ca 100644
--- a/share/doc/handbook/handbook.sgml
+++ b/share/doc/handbook/handbook.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: handbook.sgml,v 1.55 1996/08/28 00:43:57 asami Exp $ -->
+<!-- $Id: handbook.sgml,v 1.56 1996/09/08 21:12:54 jfieber Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
@@ -71,6 +71,7 @@ name="FreeBSD FTP server"> or one of the numerous
       &nutshell;
       &history;
       &goals;
+      &development;
       &relnotes;
 
     &install;
diff --git a/share/doc/handbook/history.sgml b/share/doc/handbook/history.sgml
index a7e83333d658..a492e1ad6850 100644
--- a/share/doc/handbook/history.sgml
+++ b/share/doc/handbook/history.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: history.sgml,v 1.14 1996/05/16 23:17:59 mpp Exp $ -->
+<!-- $Id: history.sgml,v 1.15 1996/08/21 07:28:45 asami Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>A brief history of FreeBSD<label id="history"></heading>
@@ -78,39 +78,16 @@ easier to install FreeBSD 2.0.5 release in June of 1995.
 
 <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.
+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.
 
-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.
+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 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 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.
diff --git a/share/doc/handbook/sections.sgml b/share/doc/handbook/sections.sgml
index a289ac1b7a4b..38e246a65158 100644
--- a/share/doc/handbook/sections.sgml
+++ b/share/doc/handbook/sections.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: sections.sgml,v 1.15 1996/07/02 23:16:17 wosch Exp $ -->
+<!-- $Id: sections.sgml,v 1.16 1996/07/29 07:15:57 jkh Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!-- Entities containing all the pieces of the handbook are -->
@@ -12,6 +12,7 @@
 <!ENTITY current SYSTEM "current.sgml">
 <!ENTITY stable SYSTEM "stable.sgml">
 <!ENTITY crypt SYSTEM "crypt.sgml">
+<!ENTITY development SYSTEM "development.sgml">
 <!ENTITY dialup SYSTEM "dialup.sgml">
 <!ENTITY diskless SYSTEM "diskless.sgml">
 <!ENTITY dma SYSTEM "dma.sgml">