This file was repo-copied from handbook/policies/chapter.sgml but

changes was done to the original after the repo-copy, so merge in
those changes (v. 1.21-1.28).  Since this file has also been changed
since the repo-copy the changes was merge in by hand, so it is not a
straight merge of the changes.

Note: This chapter seems seriously out-of-date.

en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml

@@ -5,10 +5,19 @@
 -->
 
 <chapter id="policies">
+  <chapterinfo>
+    <authorgroup>
+      <author>
+	<firstname>Poul-Henning</firstname>
+	<surname>Kamp</surname>
+	<contrib>Contributed by </contrib>
+      </author>
+    </authorgroup>
+    <!-- June 1996 -->
+  </chapterinfo>
+
   <title>Source Tree Guidelines and Policies</title>
   
-  <para><emphasis>Contributed by &a.phk;.</emphasis></para>
-  
   <para>This chapter documents various guidelines and policies in force for
     the FreeBSD source tree.</para>
   
@@ -16,8 +25,6 @@
     <title><makevar>MAINTAINER</makevar> on Makefiles</title>
     <indexterm><primary>ports maintainer</primary></indexterm>
     
-    <para>June 1996.</para>
-    
     <para>If a particular portion of the FreeBSD distribution is being
       maintained by a person or group of persons, they can communicate this
       fact to the world by adding a
@@ -48,17 +55,29 @@
   </sect1>
   
   <sect1 id="policies-contributed">
+    <sect1info>
+      <authorgroup>
+	<author>
+	  <firstname>Poul-Henning</firstname>
+	  <surname>Kamp</surname>
+	  <contrib>Contributed by </contrib>
+	</author>
+	<author>
+	  <firstname>David</firstname>
+	  <surname>O'Brien</surname>
+	</author>
+      </authorgroup>
+      <!-- June 1996 -->
+    </sect1info>
+
     <title>Contributed Software</title>
     
     <indexterm><primary>contributed software</primary></indexterm>
-    <para><emphasis>Contributed by &a.phk; and &a.obrien;.  </emphasis></para>
-    
-    <para>June 1996.</para>
     
     <para>Some parts of the FreeBSD distribution consist of software that is
       actively being maintained outside the FreeBSD project.  For historical
       reasons, we call this <emphasis>contributed</emphasis> software.  Some
-      examples are sendmail, gcc and patch.</para>
+      examples are <application>sendmail</application>, <application>gcc</application> and <application>patch</application>.</para>
 
     <para>Over the last couple of years, various methods have been used in
       dealing with this type of software and all have some number of
@@ -102,7 +121,7 @@
       <filename>compat</filename> subdirectories were eliminated before the
       import.</para>
 
-    <para><filename>src/lib/libtcl</filename> contains only a "bmake style"
+    <para><filename>src/lib/libtcl</filename> contains only a <application>bmake</application> style
       <filename>Makefile</filename> that uses the standard
       <filename>bsd.lib.mk</filename> makefile rules to produce the library
       and install the documentation.</para>
@@ -121,7 +140,7 @@
       the rules: it is supposed to contain the sources as distributed (on a
       proper CVS vendor-branch and without RCS keyword expansion) with as few
       FreeBSD-specific changes as possible.  The 'easy-import' tool on
-      freefall will assist in doing the import, but if there are any doubts on
+      <hostid>freefall</hostid> will assist in doing the import, but if there are any doubts on
       how to go about it, it is imperative that you ask first and not blunder
       ahead and hope it <quote>works out</quote>.  CVS is not forgiving of
       import accidents and a fair amount of effort is required to back out
@@ -314,10 +333,26 @@ obrien@FreeBSD.org - 30 March 1997</programlisting>
   </sect1>
   
   <sect1 id="policies-shlib">
+    <sect1info>
+      <authorgroup>
+	<author>
+	  <firstname>Satoshi</firstname>
+	  <surname>Asami</surname>
+	  <contrib>Contributed by </contrib>
+	</author>
+	<author>
+	  <firstname>Peter</firstname>
+	  <surname>Wemm</surname>
+	</author>
+	<author>
+	  <firstname>David</firstname>
+	  <surname>O'Brien</surname>
+	</author>
+      </authorgroup>
+      <!-- 9 Dec 1996 -->
+    </sect1info>
+
     <title>Shared Libraries</title>
-    
-    <para><emphasis>Contributed by &a.asami;, &a.peter;, and &a.obrien;  9 
-        December 1996.</emphasis></para>
 
     <para>If you are adding shared library support to a port or other piece of
       software that does not have one, the version numbers should follow these