- XMLify English articles

Approved by:	doceng (implicit)

en_US.ISO8859-1/articles/5-roadmap/article.sgml

@@ -1,6 +1,8 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 
 <!ENTITY t.releng.3 "<literal>RELENG_3</literal>">
 <!ENTITY t.releng.4 "<literal>RELENG_4</literal>">
@@ -11,7 +13,7 @@
 <!ENTITY t.releng.head "<literal>HEAD</literal>">
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>The Road Map for 5-STABLE</title>
 
@@ -19,8 +21,6 @@
       <corpauthor>The &os; Release Engineering Team</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <copyright>
       <year>2003</year>
       <holder role="mailto:re@FreeBSD.org">The &os; Release
@@ -37,6 +37,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para> This document is now mostly of historical value.  It
 	presented a roadmap for the development of &os;'s &t.releng.5;
@@ -286,7 +290,7 @@
           each package.</para>
 
         <para>
-          <table id=KSETable>
+          <table id="KSETable">
             <title>KSE Status</title>
             <tgroup cols="4">
               <thead>
@@ -337,7 +341,7 @@
             </tgroup>
           </table>
 
-          <table id=THRTable>
+          <table id="THRTable">
             <title>THR Status</title>
             <tgroup cols="4">
               <thead>
@@ -413,8 +417,8 @@
   <sect1 id="goals">
     <title>Requirements for 5-STABLE</title>
 
-    <para>The &t.releng.5 branch must offer users the same stability and
+    <para>The &t.releng.5; branch must offer users the same stability and
-      performance that is currently enjoyed in the &t.releng.4 branch.
+      performance that is currently enjoyed in the &t.releng.4; branch.
       While the goal of SMPng is to allow performance to far exceed what
       is found in &t.releng.4; and its sibling BSDs, regaining performance
       to the basic level is of the utmost importance.  The branch must also

en_US.ISO8859-1/articles/bsdl-gpl/article.sgml

@@ -1,13 +1,11 @@
-<!--
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-     The FreeBSD Documentation Project
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
--->
+	"../../../share/sgml/freebsd42.dtd" [
-
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+%entities;
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
 ]>
 
-<article>
+<article lang='en'>
   <title>Why you should use a BSD style license for your Open Source Project</title>
   <articleinfo>
 
@@ -23,8 +21,6 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.cvsup;
@@ -32,6 +28,9 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
   </articleinfo>
 
 <sect1 id="intro">

en_US.ISO8859-1/articles/building-products/article.sgml

@@ -1,9 +1,11 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Building Products with FreeBSD</title>
     <authorgroup>
@@ -17,13 +19,15 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <title>Abstract</title>
 
@@ -55,7 +59,7 @@
       network routers, firewalls, and storage devices, to personal
       computers.  Portions of FreeBSD have also been used in
       commercial shrink-wrapped software (see
-      <xref linkend="freebsd-intro">).</para>
+      <xref linkend="freebsd-intro"/>).</para>
 
     <para>In this article we look at the <ulink
         url="&url.base;/">FreeBSD project</ulink> as a software
@@ -147,19 +151,19 @@
       <para>The rest of the article is structured as follows:</para>
       <itemizedlist>
         <listitem>
-          <simpara><xref linkend="freebsd-intro"> introduces the
+          <simpara><xref linkend="freebsd-intro"/> introduces the
             FreeBSD project, explores its organizational structure,
             key technologies and release engineering
             processes.</simpara>
         </listitem>
         <listitem>
-          <simpara><xref linkend="freebsd-collaboration"> describes
+          <simpara><xref linkend="freebsd-collaboration"/> describes
             ways to collaborate with the FreeBSD project.  It examines
             common pitfalls encountered by corporates working with
             voluntary projects like FreeBSD.</simpara>
         </listitem>
         <listitem>
-          <simpara><xref linkend="conclusion"> concludes.</simpara>
+          <simpara><xref linkend="conclusion"/> concludes.</simpara>
         </listitem>
       </itemizedlist>
     </sect2>
@@ -391,7 +395,7 @@
         <title>FreeBSD Organization</title>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="freebsd-organization" format="PIC">
+            <imagedata fileref="freebsd-organization" format="PIC"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -417,7 +421,7 @@
       <para>FreeBSD's release engineering processes play a major role
         in ensuring that its released versions are of a high quality.
         At any point of time, FreeBSD's volunteers support multiple
-        code lines (<xref linkend="fig-freebsd-branches">):</para>
+        code lines (<xref linkend="fig-freebsd-branches"/>):</para>
 
       <itemizedlist>
         <listitem>
@@ -444,7 +448,7 @@
         <title>FreeBSD Release Branches</title>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="freebsd-branches" format="EPS">
+            <imagedata fileref="freebsd-branches" format="EPS"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -504,17 +508,17 @@
       </listitem>
       <listitem>
         <simpara>The goals of the FreeBSD project are
-          <citation>Hub1994</citation>:
+          <citation>Hub1994</citation>:</simpara>
-        <itemizedlist spacing="compact">
+	  <itemizedlist spacing="compact">
-          <listitem>
+	    <listitem>
-            <simpara>To develop a high-quality operating system for
+	      <simpara>To develop a high-quality operating system for
-              popular computer hardware, and,</simpara>
+		popular computer hardware, and,</simpara>
-          </listitem>
+	    </listitem>
-          <listitem>
+	    <listitem>
-            <simpara>To make our work available to all under a liberal
+	      <simpara>To make our work available to all under a liberal
-              license.</simpara>
+		license.</simpara>
-          </listitem>
+	    </listitem>
-        </itemizedlist>
+	  </itemizedlist>
       </listitem>
       <listitem>
         <simpara>FreeBSD enjoys an open and transparent working
@@ -586,7 +590,7 @@
 
       <para>Formal specifications and design documents are seldom used
         in the project.  Clear and well-written code and well-written
-        change logs (<xref linkend="fig-change-log">) are used in
+        change logs (<xref linkend="fig-change-log"/>) are used in
         their place.  FreeBSD development happens by <quote>rough
           consensus and running code</quote>
         <citation>Carp1996</citation>.</para>
@@ -656,9 +660,9 @@ bde         2005-10-29 16:34:50 UTC
                 easily merge changes between the upstream FreeBSD code
                 base and your own in-house code.</para>
             </formalpara>
-            <para><xref linkend="fig-cvs-annotate"> shows a portion of
+            <para><xref linkend="fig-cvs-annotate"/> shows a portion of
               an annotated listing of the file referenced by the
-              change log in <xref linkend="fig-change-log">.  The
+              change log in <xref linkend="fig-change-log"/>.  The
               ancestry of each line of the source is clearly visible.
               Annotated listings showing the history of every file
               that is part of FreeBSD are <ulink
@@ -667,6 +671,7 @@ bde         2005-10-29 16:34:50 UTC
             <figure id="fig-cvs-annotate">
               <title>An annotated source listing generated using <command>cvs annotate</command></title>
               <programlisting>
+<![CDATA[
 #LINE #REV         #WHO      #DATE       #TEXT
 
 62    1.1          (jkh      19-Aug-94):      int32_t __ieee754_rem_pio2f(float x, float *y)
@@ -693,6 +698,7 @@ bde         2005-10-29 16:34:50 UTC
 83    1.15         (bde      06-Nov-05):          return n;
 84    1.15         (bde      06-Nov-05):      }
 85    1.15         (bde      06-Nov-05):      if(ix<0x407b53d1) {  /* |x| < 5*pi/4, special case with n=+-2 */
+]]>
               </programlisting>
             </figure>
 

en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml

@@ -1,13 +1,11 @@
-<!--
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-     The FreeBSD Documentation Project
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
--->
+	"../../../share/sgml/freebsd42.dtd" [
-
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+%entities;
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
 ]>
 
-<article>
+<article lang='en'>
   <title>Argentina.com : A Case Study</title>
   <articleinfo>
 
@@ -22,8 +20,6 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.cvsup;
@@ -32,6 +28,9 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
   </articleinfo>
 
 <sect1 id="overview">

en_US.ISO8859-1/articles/checkpoint/article.sgml

@@ -1,3 +1,10 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!-- Copyright (c) 2001 The FreeBSD Documentation Project
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -28,13 +35,7 @@
      POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<article lang='en'>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-<!ENTITY legalnotice SYSTEM "../../share/sgml/legalnotice.sgml">
-]>
-
-<article>
   <articleinfo>
     <title>Integration of Check Point <trademark class='registered'>VPN-1</trademark>/<trademark class='registered'>Firewall-1</trademark> and FreeBSD IPsec</title>
 
@@ -58,8 +59,6 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <copyright>
       <year>2001</year>
       <year>2002</year>
@@ -75,6 +74,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This document explains how to configure a <acronym>VPN</acronym>
 	tunnel between FreeBSD and Check Point's
@@ -95,7 +98,7 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="networks">
+        <imagedata fileref="networks"/>
       </imageobject>
 
       <textobject>

en_US.ISO8859-1/articles/committers-guide/article.sgml

@@ -1,16 +1,16 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Committer's Guide</title>
 
     <corpauthor>The &os; Documentation Project</corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <copyright>
       <year>1999</year>
       <year>2000</year>
@@ -39,6 +39,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This document provides information for the FreeBSD
 	committer community.  All new committers should read this
@@ -50,7 +54,7 @@
 	of the information here applies to them as well.  (For
 	instance, some people only have rights to work with the
 	Problem Report database).  Please see <xref
-	  linkend="non-committers"> for more information.</para>
+	  linkend="non-committers"/> for more information.</para>
 
       <para>This document may also be of interest to members of the
 	FreeBSD community who want to learn more about how the project
@@ -63,8 +67,8 @@
 
     <informaltable frame="none" orient="port" pgwide="1">
       <tgroup cols="2">
-	<colspec colwidth="20*">
+	<colspec colwidth="20*"/>
-	<colspec colwidth="80*">
+	<colspec colwidth="80*"/>
 	<tbody>
 	  <row>
 	    <entry><emphasis>Login Methods</emphasis></entry>
@@ -83,7 +87,7 @@
 	    <entry>
 	      <literal>svn+ssh://</literal><hostid
 		role="fqdn">svn.FreeBSD.org</hostid><filename>/base</filename>
-	      (see also <xref linkend="subversion-primer">).</entry>
+	      (see also <xref linkend="subversion-primer"/>).</entry>
 	  </row>
 	  <row>
 	    <entry><emphasis><literal>doc/</literal> Subversion
@@ -91,7 +95,7 @@
 	    <entry>
 	      <literal>svn+ssh://</literal><hostid
 		role="fqdn">svn.FreeBSD.org</hostid><filename>/doc</filename>
-	      (see also <xref linkend="subversion-primer">).</entry>
+	      (see also <xref linkend="subversion-primer"/>).</entry>
 	  </row>
 
 	  <row>
@@ -99,7 +103,7 @@
 	    <entry>
 	      <hostid
 		  role="fqdn">pcvs.FreeBSD.org</hostid><literal>:</literal><filename>/home/pcvs</filename>
-	      (see also <xref linkend="vcs.operations">).</entry>
+	      (see also <xref linkend="vcs.operations"/>).</entry>
 	  </row>
 
 	  <row>
@@ -155,7 +159,7 @@
       to connect to the project hosts.
       If you do
       not know anything about &man.ssh.1;, please see
-      <xref linkend="ssh.guide">.</para>
+      <xref linkend="ssh.guide"/>.</para>
 
     <para>Useful links:</para>
 
@@ -272,7 +276,7 @@
       this was CVS.  Subversion is used for the <literal>src</literal>
       tree as of May 2008 and the <literal>doc/www</literal> tree as
       of May 2012.  Subversion is covered in <xref
-	linkend="subversion-primer">.</para>
+	linkend="subversion-primer"/>.</para>
 
     <para>The &a.cvsadm; are the <quote>owners</quote> of the
       repository and are responsible for direct modification of it for
@@ -286,7 +290,7 @@
       <emphasis>not</emphasis> contact the &a.cvsadm; for repocopies
       or other things that the more specific teams can handle.</para>
 
-    <para><anchor id="repomeisters">The only ones able to directly
+    <para><anchor id="repomeisters"/>The only ones able to directly
       fiddle the repository bits on the repository hosts are the
       repomeisters.  To enforce this, there are no login shells
       available on the repository machines, except to the
@@ -436,7 +440,7 @@ alias projcvs cvs -d <replaceable>user</replaceable>@projcvs.FreeBSD.org:/home/p
 	  <title>Useful <command>cvs checkout</command>
 	    options</title>
 
-	  <tgroup cols=2>
+	  <tgroup cols="2">
 	    <tbody>
 	      <row>
 		<entry><option>-P</option></entry>
@@ -558,7 +562,7 @@ alias projcvs cvs -d <replaceable>user</replaceable>@projcvs.FreeBSD.org:/home/p
 	  status is given as one of:</para>
 
 	<informaltable frame="none" pgwide="1">
-	  <tgroup cols=2>
+	  <tgroup cols="2">
 	    <tbody>
 	      <row>
 		<entry>Up-to-date</entry>
@@ -616,7 +620,7 @@ alias projcvs cvs -d <replaceable>user</replaceable>@projcvs.FreeBSD.org:/home/p
 	  <command>checkout</command>:</para>
 
 	<informaltable frame="none" pgwide="1">
-	  <tgroup cols=2>
+	  <tgroup cols="2">
 	    <tbody>
 	      <row>
 		<entry><option>-d</option></entry>
@@ -672,7 +676,7 @@ alias projcvs cvs -d <replaceable>user</replaceable>@projcvs.FreeBSD.org:/home/p
 	  it:</para>
 
 	<informaltable frame="none" pgwide="1">
-	  <tgroup cols=2>
+	  <tgroup cols="2">
 	    <tbody>
 	      <row>
 		<entry><literal>U</literal></entry>
@@ -748,7 +752,7 @@ alias projcvs cvs -d <replaceable>user</replaceable>@projcvs.FreeBSD.org:/home/p
 	<table frame="none">
 	  <title>Useful <command>cvs diff</command> options</title>
 
-	  <tgroup cols=2>
+	  <tgroup cols="2">
 	    <tbody>
 	      <row>
 		<entry><option>-u</option></entry>
@@ -867,7 +871,7 @@ alias projcvs cvs -d <replaceable>user</replaceable>@projcvs.FreeBSD.org:/home/p
 	<table frame="none">
 	  <title>Useful <command>cvs commit</command> options</title>
 
-	  <tgroup cols=2>
+	  <tgroup cols="2">
 	    <tbody>
 	      <row>
 		<entry><option>-f</option></entry>
@@ -886,7 +890,7 @@ alias projcvs cvs -d <replaceable>user</replaceable>@projcvs.FreeBSD.org:/home/p
 	<para>The following are some Subversion examples related to
 	  the src repository.  More (in-depth) information can be
 	  found in the Subversion Primer at <xref
-	    linkend="subversion-primer"> and <ulink
+	    linkend="subversion-primer"/> and <ulink
 	     url="http://wiki.freebsd.org/SubversionMissing">List of
 	   things missing in Subversion when compared to CVS</ulink>.
 	  The notes at <ulink
@@ -2803,7 +2807,7 @@ $target - head/$source:$P,$Q,$R</screen>
 	    <literal>FreeBSD=%H</literal> <command>svn:keywords</command>
 	    property will be rejected when attempting to commit them to the
 	    repository.  Be sure to read <xref
-	      linkend="subversion-primer-add-remove">
+	      linkend="subversion-primer-add-remove"/>
 	    regarding adding and removing files, in addition
 	    to verifying that <filename>~/.subversion/config</filename>
 	    contains the necessary &quot;auto-props&quot;
@@ -3411,7 +3415,7 @@ $target - head/$source:$P,$Q,$R</screen>
     <title>&coverity.prevent; Availability for &os; Committers</title>
 
     <para>In January 2006, the &os;&nbsp;Foundation obtained a license for
-      &coverity.prevent; from &coverity&nbsp;Ltd.  With this donation, all
+      &coverity.prevent; from &coverity;&nbsp;Ltd.  With this donation, all
       &os; developers can obtain access to <application>Coverity
         Prevent</application> analysis results of all &os; Project
       software.</para>
@@ -3649,7 +3653,7 @@ $target - head/$source:$P,$Q,$R</screen>
 	    many contributions before you became a committer.  Always
 	    remember that.  </para>
 
-	  <para>Consider the points raised under <xref linkend="respect">
+	  <para>Consider the points raised under <xref linkend="respect"/>
 	    and apply them also to contributors.</para>
 	</listitem>
 
@@ -4541,7 +4545,7 @@ $target - head/$source:$P,$Q,$R</screen>
 
 	    <para>For more information on the background and
 	      policies surrounding a ports freeze, see the
-	      <ulink url="&url.base/portmgr/qa.html">Portmgr
+	      <ulink url="&url.base;/portmgr/qa.html">Portmgr
 		Quality Assurance page</ulink>.</para>
 	  </answer>
 	</qandaentry>
@@ -4603,7 +4607,7 @@ $target - head/$source:$P,$Q,$R</screen>
 
 	    <para>Not everything is allowed to be committed during
 	      a freeze.  Please see the <ulink
-		url="&url.base/portmgr/qa.html">Portmgr Quality
+		url="&url.base;/portmgr/qa.html">Portmgr Quality
 		Assurance page</ulink> for more information.
 	    </para>
 
@@ -5051,7 +5055,7 @@ bak/packages  packages from last complete &lt;major_version&gt; run on &lt;arch&
       <listitem>
 	<para>
 	  <link linkend="rules">The FreeBSD Committers' Big List of Rules</link>
-	<para>
+	</para>
       </listitem>
     </itemizedlist>
 

en_US.ISO8859-1/articles/compiz-fusion/article.sgml

@@ -1,14 +1,8 @@
-<!--
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-  Installing and Using compiz-fusion in FreeBSD
+	"../../../share/sgml/freebsd42.dtd" [
-
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
-  The FreeBSD Documentation Project
+%entities;
-
--->
-
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
 ]>
 
 <article lang="en">
@@ -28,6 +22,8 @@
       <holder role="mailto:manolis@FreeBSD.org">Manolis Kiagias</holder>
     </copyright>
 
+    <pubdate>$FreeBSD$</pubdate>
+
     <releaseinfo>$FreeBSD$</releaseinfo>
 
     <legalnotice id="trademarks" role="trademarks">
@@ -300,8 +296,8 @@ Load           "glx"
     <para>When the installation is finished, start your graphic desktop and
       at a terminal, enter the following commands (as a normal user):</para>
 
-    <screen>&prompt.user; <userinput>compiz --replace --sm-disable --ignore-desktop-hints ccp &</userinput>
+    <screen>&prompt.user; <userinput>compiz --replace --sm-disable --ignore-desktop-hints ccp &amp;</userinput>
-&prompt.user; <userinput>emerald --replace &</userinput></screen>
+&prompt.user; <userinput>emerald --replace &amp;</userinput></screen>
 
     <para>Your screen will flicker for a few seconds, as your window manager
       (e.g. <application>Metacity</application> if you are using
@@ -316,8 +312,8 @@ Load           "glx"
       a <application>GNOME</application> desktop):</para>
 
     <programlisting>#! /bin/sh
-compiz --replace --sm-disable --ignore-desktop-hints ccp &
+compiz --replace --sm-disable --ignore-desktop-hints ccp &amp;
-emerald --replace &</programlisting>
+emerald --replace &amp;</programlisting>
 
     <para>Save this in your home directory as, for example,
       <filename>start-compiz</filename> and make it executable:</para>

en_US.ISO8859-1/articles/console-server/article.sgml

@@ -1,9 +1,11 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Console Server</title>
 
@@ -16,8 +18,6 @@
       </affiliation>
     </author>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.cisco;
@@ -29,6 +29,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This document describes how you can use &os;
         to set up a <quote>console server</quote>.  A console server is
@@ -280,7 +284,7 @@
       </listitem>
 
       <listitem>
-	<para>By patching the &solaris; servers (see <xref linkend="solaris">),
+	<para>By patching the &solaris; servers (see <xref linkend="solaris"/>),
 	  we can avoid pranging the whole computer room when the console
 	  server PC crashes (or the power supply fails, or whatever).</para>
       </listitem>
@@ -356,7 +360,7 @@
 
       <para>Run a command like:
 
-      <screen>&prompt.root; <userinput>cd /dev/ && sh MAKEDEV cuaE0</userinput></screen>
+      <screen>&prompt.root; <userinput>cd /dev/ &amp;&amp; sh MAKEDEV cuaE0</userinput></screen>
 
       to create dial-out devices for the first Stallion card.  See the
       comments in <filename>MAKEDEV</filename> and the &man.stl.4; man page
@@ -368,7 +372,7 @@
 
       <note>
 	<para>See the section on <application>conserver</application> versions 
-	  <xref linkend="conserver-versions">; the version I use is
+	  <xref linkend="conserver-versions"/>; the version I use is
 	  available in the &os; ports collection; however, it is not the only
 	  one.)</para>
       </note>
@@ -457,9 +461,9 @@
       <para>Our config file looks like this:</para>
 
       <programlisting>LOGDIR=/var/log/consoles
-gallows:/dev/cuaE0:9600p:&:
+gallows:/dev/cuaE0:9600p:&amp;:
-roo:/dev/cuaE1:9600p:&:
+roo:/dev/cuaE1:9600p:&amp;:
-kanga:/dev/cuaE2:9600p:&:
+kanga:/dev/cuaE2:9600p:&amp;:
 %%
 allow:  itga.com.au
 trusted:        127.0.0.1 buzz</programlisting>
@@ -601,12 +605,12 @@ case "$1" in
                 TTY=/dev/cuaE7
                 conserver -d > $TTY
                 # get NL->CR+NL mapping so msgs look right
-                stty < /dev/cuaE7 opost onlcr
+                stty &lt; /dev/cuaE7 opost onlcr
 		echo -n ' conserver'
                 ;;
 
         'stop')
-		kill `cat /var/run/conserver.pid` && echo -n ' conserver'
+		kill `cat /var/run/conserver.pid` &amp;&amp; echo -n ' conserver'
                 ;;
 
         *)
@@ -782,7 +786,7 @@ exit 0</programlisting>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="tk0231-9-1.png">
+	  <imagedata fileref="tk0231-9-1.png"/>
 	</imageobject>
 
 	<textobject>
@@ -1200,7 +1204,7 @@ exit 0</programlisting>
 	      </tgroup>
 	    </table>
 
-	    <para>See <xref linkend="freebsd"> for tips on configuring &os;
+	    <para>See <xref linkend="freebsd"/> for tips on configuring &os;
 	      to use a serial console.</para>
 	  </listitem>
 	</varlistentry>

en_US.ISO8859-1/articles/contributing-ports/article.sgml

@@ -1,14 +1,14 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
-<!ENTITY % not.published "IGNORE">
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
-<article>
+
+<article lang='en'>
   <articleinfo>
     <title>Contributing to the FreeBSD Ports Collection</title>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <abstract>
       <title>Abstract</title>
 
@@ -31,6 +31,10 @@
       &tm-attrib.freebsd;
       &tm-attrib.general;
     </legalnotice>
+
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
   </articleinfo>
 
   <indexterm><primary>contributing to ports</primary></indexterm>

en_US.ISO8859-1/articles/contributing/article.sgml

@@ -1,15 +1,14 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
-<!ENTITY % not.published "IGNORE">
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Contributing to FreeBSD</title>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <abstract>
       <para>This article describes the different ways in which an
 	individual or organization may contribute to the FreeBSD
@@ -30,6 +29,9 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
   </articleinfo>
 
   <indexterm><primary>contributing</primary></indexterm>
@@ -185,7 +187,7 @@
 	  <para>Get copies of formal standards like &posix;.  You can
 	    get some links about these standards at the <ulink
 	    url="&url.base;/projects/c99/index.html">FreeBSD
-	    C99 & POSIX Standards Conformance Project</ulink> web
+	    C99 &amp; POSIX Standards Conformance Project</ulink> web
 	    site.  Compare FreeBSD's behavior to that required by the
 	    standard.  If the behavior differs, particularly in subtle
 	    or obscure corners of the specification, send in a PR
@@ -429,8 +431,9 @@
 	copyrights for code included in FreeBSD are:</para>
 
       <orderedlist>
-	<indexterm><primary>BSD copyright</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>BSD copyright</primary></indexterm>
+
 	  <para>The BSD copyright.  This copyright is most preferred
 	    due to its <quote>no strings attached</quote> nature and
 	    general attractiveness to commercial enterprises.  Far
@@ -440,13 +443,16 @@
 	    something of their own into FreeBSD.</para>
 	</listitem>
 
-	<indexterm>
-	  <primary>GPL</primary><see>GNU General Public License</see>
-	</indexterm>
-	<indexterm>
-	  <primary>GNU General Public License</primary>
-	</indexterm>
 	<listitem>
+	  <indexterm>
+	    <primary>GPL</primary>
+	    <see>GNU General Public License</see>
+	  </indexterm>
+
+	  <indexterm>
+	    <primary>GNU General Public License</primary>
+	  </indexterm>
+
 	  <para>The GNU General Public License, or <quote>GPL</quote>.
 	    This license is not quite as popular with us due to the
 	    amount of extra effort demanded of anyone using the code
@@ -517,7 +523,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	items ourselves.</para>
 
       <sect3>
-	<title><anchor id="donations">Donating Funds</title>
+	<title><anchor id="donations"/>Donating Funds</title>
 
 	<para>The FreeBSD Foundation is a non-profit, tax-exempt
 	  foundation established to further the goals of the FreeBSD

en_US.ISO8859-1/articles/contributors/article.sgml

@@ -1,17 +1,18 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
+
 <!ENTITY % contrib.ent SYSTEM "contrib.ent">
 %contrib.ent;
 <!ENTITY % not.published "IGNORE">
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Contributors to FreeBSD</title>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.cvsup;
@@ -19,6 +20,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This article lists individuals and organizations who have
       made a contribution to FreeBSD.</para>

en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
 <!-- $FreeBSD$ -->
 
   <itemizedlist>

en_US.ISO8859-1/articles/contributors/contrib.additional.sgml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
 <!-- $FreeBSD$ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
@@ -471,8 +472,9 @@
     <listitem>
       <para>Alexandros Kosiaris
 	<email>akosiaris+ports@gmail.com</email></para>
-    <listitem>
+    </listitem>
 
+    <listitem>
       <para>Alexey Illarionov
 	<email>littlesavage@rambler.ru</email></para>
     </listitem>
@@ -6640,6 +6642,7 @@
     <listitem>
       <para>Maxim Ignatenko
 	<email>gelraen.ua@gmail.com</email></para>
+    </listitem>
 
     <listitem>
       <para>Maxim Loginov

en_US.ISO8859-1/articles/contributors/contrib.committers.sgml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
 <!-- $FreeBSD$ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in

en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
 <!-- $FreeBSD$ -->
 
   <itemizedlist>

en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml

@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
+
 <!-- $FreeBSD$ -->
   <itemizedlist>
     <listitem>

en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.sgml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
 <!-- $FreeBSD$ -->
 
   <itemizedlist>

en_US.ISO8859-1/articles/cups/article.sgml

@@ -1,13 +1,13 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
-<!ENTITY % not.published "IGNORE">
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>CUPS on FreeBSD</title>
-    <pubdate>$FreeBSD$</pubdate>
     <authorgroup>
       <author>
 	<firstname>Chess</firstname>
@@ -23,6 +23,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>An article about configuring CUPS on &os;.</para>
     </abstract>
@@ -65,7 +69,7 @@
       <application>CUPS</application> from ports, issue the following
       command from a root terminal:</para>
 
-    <screen>&prompt.root; <userinput>cd /usr/ports/print/cups && make install clean</userinput></screen>
+    <screen>&prompt.root; <userinput>cd /usr/ports/print/cups &amp;&amp; make install clean</userinput></screen>
 
     <para>To install <application>CUPS</application> using a precompiled
       binary, issue the following command from a root terminal:</para>

en_US.ISO8859-1/articles/custom-gcc/article.sgml

@@ -1,9 +1,11 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Using newer version of <application>GCC</application> and
       <application>binutils</application> with the &os; Ports
@@ -17,8 +19,6 @@
       </affiliation>
     </author>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.general;
@@ -29,6 +29,10 @@
       <holder>The &os; Documentation Project</holder>
     </copyright>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This article describes how to use newer versions of the
 	<application>GCC</application> compilers and
@@ -100,7 +104,7 @@
 
     <para>Additional system configuration is required in order to use
       custom version of <application>GCC</application> installed from
-      the &os; ports tree.<para>
+      the &os; ports tree.</para>
 
     <sect2 id="adjusting-make.conf">
       <title>Adjusting <filename>make.conf</filename></title>

en_US.ISO8859-1/articles/cvs-freebsd/article.sgml

@@ -1,9 +1,11 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Setting up a CVS repository - the FreeBSD way</title>
 
@@ -22,6 +24,8 @@
       <holder role="mailto:stijn@win.tue.nl">Stijn Hoop</holder>
     </copyright>
 
+    <pubdate>$FreeBSD$</pubdate>
+
     <releaseinfo>$FreeBSD$</releaseinfo>
 
     <legalnotice id="trademarks" role="trademarks">

en_US.ISO8859-1/articles/cvsup-advanced/article.sgml

@@ -1,13 +1,11 @@
-<!--
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-     The FreeBSD Documentation Project
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
--->
+	"../../../share/sgml/freebsd42.dtd" [
-
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+%entities;
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>CVSup Advanced Points</title>
 
@@ -22,14 +20,16 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.cvsup;
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>The present article assumes a basic understanding of <application>CVSup</application>
         operation. It documents several delicate issues connected with 

en_US.ISO8859-1/articles/dialup-firewall/article.sgml

@@ -1,13 +1,11 @@
-<!--
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-     The FreeBSD Documentation Project
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
--->
+	"../../../share/sgml/freebsd42.dtd" [
-
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+%entities;
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Dialup firewalling with FreeBSD</title>
 
@@ -22,13 +20,15 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This article documents how to set up a firewall using a PPP
 	dialup with FreeBSD and IPFW, and specifically with firewalling over

en_US.ISO8859-1/articles/diskless-x/article.sgml

@@ -1,15 +1,17 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
      The FreeBSD Documentation Project
 
      $FreeBSD$
 -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<article lang='en'>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
-
-<article>
   <articleinfo>
     <title>Diskless X Server: a how to guide</title>
     
@@ -25,6 +27,8 @@
       </author></authorgroup>
     
     <pubdate>28-December-1996</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
     
     <copyright>
       <year>1996</year>
@@ -336,7 +340,7 @@ export PATH
 # mount the /usr filesystem via NFS
 /sbin/mount antares:/DiskLess/usr /usr
 #
-/usr/X11R6/bin/XF86_SVGA -query antares -xf86config /etc/XF86Config.altair > /dev/null 2>&1
+/usr/X11R6/bin/XF86_SVGA -query antares -xf86config /etc/XF86Config.altair > /dev/null 2>&amp;1
 #
 # Reboot after X exits
 /sbin/reboot

en_US.ISO8859-1/articles/euro/article.sgml

@@ -1,9 +1,11 @@
-<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ 
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>The Euro symbol on 
       <systemitem class="osname">FreeBSD</systemitem></title>
@@ -28,13 +30,15 @@
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
     
-    <pubdate role="rcs">$FreeBSD$</pubdate>
-    
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This document will try to help you in getting started with the new
 	<keycap>Euro</keycap> Symbol on your new keyboard that you had to buy
@@ -176,11 +180,11 @@ font8x8="iso15-8x8.fnt"</programlisting>
       <screen>&prompt.user; <userinput>vidcontrol -f <replaceable>iso15-8x16.fnt</replaceable></userinput></screen>
 
       <para>To check if the font has been selected execute the following short
-	<command><anchor  id="awk-test">awk</command> script:</para>
+	<command><anchor id="awk-test"/>awk</command> script:</para>
 
       <programlisting>#!/usr/bin/awk -f
 BEGIN {
-        for(i=160;i<180;i++)
+        for(i = 160; i &lt; 180 ; i++)
                 printf"%3d %c\n",i,i
 }</programlisting>
 

en_US.ISO8859-1/articles/explaining-bsd/article.sgml

@@ -1,12 +1,14 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Documentation Project -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<article lang='en'>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
-
-<article>
   <articleinfo>
     <title>Explaining BSD</title>
 
@@ -32,6 +34,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>In the open source world, the word <quote>Linux</quote> is almost
 	synonymous with <quote>Operating System</quote>, but it is not the only
@@ -229,7 +235,7 @@
       <listitem>
 	<para>There is a perception that the BSD projects are fragmented and
 	  belligerent.  The
-	  <ulink url="http://interactive.wsj.com/bin/login?Tag=/&amp;URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&">Wall Street
+	  <ulink url="http://interactive.wsj.com/bin/login?Tag=/&amp;URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&amp;">Wall Street
 	    Journal</ulink> spoke of <quote>balkanization</quote> of the
 	  BSD projects.  Like the law suit, this perception bases mainly
 	  on ancient history.</para>

en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml

@@ -1,10 +1,12 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 <!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>FreeBSD From Scratch</title>
 
@@ -20,13 +22,15 @@
       <holder>Jens Schweikhardt</holder>
     </copyright>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
   	  &tm-attrib.freebsd;
   	  &tm-attrib.adobe;
   	  &tm-attrib.general;
   	</legalnotice>
+
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
   </articleinfo>
 
     <abstract>
@@ -379,7 +383,7 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
       which you need to modify substantially.  The comments give you
       enough information what to change.</para>
 
-<programlisting><inlinegraphic fileref="stage_1.conf.default" format="linespecific"></programlisting>
+<programlisting><inlinegraphic fileref="stage_1.conf.default" format="linespecific"/></programlisting>
 
     <para>Download <ulink
         url="stage_1.conf.default"><filename>stage_1.conf.default</filename>
@@ -452,9 +456,9 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
     <para>In fact you can specify arbitrary shell commands, so you are
       not restricted to simple <command>make</command> invocations:</para>
 
-    <programlisting>java jdk16            echo true > files/license.sh; make install BATCH=yes < /dev/null
+    <programlisting>java jdk16            echo true > files/license.sh; make install BATCH=yes &lt; /dev/null
 print acroread8       yes accept | make install PAGER=ls
-x11-fonts gnu-unifont make install && mkfontdir /usr/local/lib/X11/fonts/local
+x11-fonts gnu-unifont make install &amp;&amp; mkfontdir /usr/local/lib/X11/fonts/local
 news inn-stable       CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews" make install</programlisting>
 
     <para>The first two lines are examples how you can handle ports
@@ -483,7 +487,7 @@ news inn-stable       CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews"
       <filename>LOGDIR/category+port</filename> is created for each port
       it actually installs.</para>
 
-<programlisting><inlinegraphic fileref="stage_2.conf.default" format="linespecific"></programlisting>
+<programlisting><inlinegraphic fileref="stage_2.conf.default" format="linespecific"/></programlisting>
 
     <para>Download <ulink
         url="stage_2.conf.default"><filename>stage_2.conf.default</filename></ulink>.</para>
@@ -527,7 +531,7 @@ news inn-stable       CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews"
       where exactly the interactive command is located and deal with it
       appropriately.  See the examples above for
       <filename role="package">print/acroread8</filename> and
-      <filename role="package">java/jdk16</filename>.
+      <filename role="package">java/jdk16</filename>.</para>
 
     <para>You should also be aware of upgrade issues for config files.
       In general you do not know when and if the format or contents of a
@@ -584,7 +588,7 @@ fi
         url="stage_1.sh"><filename>stage_1.sh</filename></ulink>
       script, which you should not need to modify.</para>
 
-<programlisting><inlinegraphic fileref="stage_1.sh" format="linespecific"></programlisting>
+<programlisting><inlinegraphic fileref="stage_1.sh" format="linespecific"/></programlisting>
 
     <para>Download <ulink
         url="stage_1.sh"><filename>stage_1.sh</filename></ulink>.</para>
@@ -594,7 +598,7 @@ fi
       script.  You may want to modify the variables at the
       beginning.</para>
 
-<programlisting><inlinegraphic fileref="stage_2.sh" format="linespecific"></programlisting>
+<programlisting><inlinegraphic fileref="stage_2.sh" format="linespecific"/></programlisting>
 
     <para>Download <ulink
         url="stage_2.sh"><filename>stage_2.sh</filename></ulink>.</para>
@@ -603,7 +607,7 @@ fi
         url="stage_3.mk"><filename>stage_3.mk</filename></ulink> to
       give you an idea how to automate all reconfiguration.</para>
 
-<programlisting><inlinegraphic fileref="stage_3.mk" format="linespecific"></programlisting>
+<programlisting><inlinegraphic fileref="stage_3.mk" format="linespecific"/></programlisting>
 
     <para>Download <ulink
         url="stage_3.mk"><filename>stage_3.mk</filename></ulink>.</para>

en_US.ISO8859-1/articles/filtering-bridges/article.sgml

@@ -1,9 +1,11 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Filtering Bridges</title>
 
@@ -17,8 +19,6 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.3com;
@@ -26,6 +26,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>Often it is useful to divide one physical network (like an
 	Ethernet) into two separate segments without having to create subnets,

en_US.ISO8859-1/articles/fonts/article.sgml

@@ -1,9 +1,12 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Documentation Project -->
-<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
 
 <!-- Recently, I wanted to figure out how to use some additional fonts that
      I had accumulated.  I finally figured out *how to do it* from the various
@@ -27,7 +30,7 @@
      files by Mark Ovens <mark@ukug.uk.FreeBSD.org> 27/5/00
  -->
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Fonts and FreeBSD</title>
 
@@ -49,6 +52,8 @@
 
     <pubdate>Wed Aug  7, 1996</pubdate>
 
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.adobe;
@@ -396,9 +401,9 @@ end readonly def
 	<term>Slant</term>
 
 	<listitem>
-	  <para><emphasis remap=bf>r</emphasis>oman, <emphasis
+	  <para><emphasis remap="bf">r</emphasis>oman, <emphasis
-	      remap=bf>i</emphasis>talic, <emphasis
+	      remap="bf">i</emphasis>talic, <emphasis
-	      remap=bf>o</emphasis>blique, etc.  Since the
+	      remap="bf">o</emphasis>blique, etc.  Since the
 	    <emphasis>ItalicAngle</emphasis> is zero,
 	    <emphasis>roman</emphasis> will be used.</para>
 	</listitem>

en_US.ISO8859-1/articles/formatting-media/article.sgml

@@ -1,9 +1,13 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
+
 <!-- $FreeBSD$ -->
-<article>
+
+<article lang='en'>
   <articleinfo>
     <title>Formatting Media For Use With FreeBSD</title>
 
@@ -25,6 +29,8 @@
 
     <pubdate>March 1997</pubdate>
 
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.iomega;
@@ -42,7 +48,7 @@
   </articleinfo>
 
   <sect1>
-    <title>Introduction & Definitions</title>
+    <title>Introduction &amp; Definitions</title>
 
     <sect2>
       <title>Overview</title>
@@ -158,7 +164,7 @@ now. -->
     </sect2>
 
     <sect2>
-      <title>Warnings & Pitfalls</title>
+      <title>Warnings &amp; Pitfalls</title>
 
       <para>Building disks is not something to take lightly.  It is
 	quite possible to destroy the contents of other disks in your

en_US.ISO8859-1/articles/freebsd-questions/article.sgml

@@ -1,9 +1,11 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>How to get best results from the FreeBSD-questions mailing
       list</title>
@@ -17,8 +19,6 @@
       </affiliation>
     </author>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.microsoft;
@@ -28,6 +28,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This document provides useful information for people looking to
 	prepare an e-mail to the FreeBSD-questions mailing list.  Advice and

en_US.ISO8859-1/articles/freebsd-update-server/article.sgml

@@ -1,9 +1,12 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+        "../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 <!ENTITY fbus.ap "<application>FreeBSD Update Server</application>">
 ]>
-<article>
+
+<article lang="en">
   <articleinfo>
     <title>Build Your Own &os; Update Server</title>
 
@@ -22,14 +25,16 @@
       <holder role="mailto:jhelfman@experts-exchange.com">Jason Helfman</holder>
     </copyright>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.general;
       &tm-attrib.intel;
       &tm-attrib.amd;
     </legalnotice>
+
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
   </articleinfo>
 
   <abstract>
@@ -135,22 +140,22 @@
 # the scripts tree.
 
 # Location from which to fetch releases
-export FTP=ftp://ftp2.freebsd.org/pub/FreeBSD/releases<co id="ftp-id">
+export FTP=ftp://ftp2.freebsd.org/pub/FreeBSD/releases<co id="ftp-id"/>
 
 # Host platform
 export HOSTPLATFORM=`uname -m`
 
 # Host name to use inside jails
-export BUILDHOSTNAME=${HOSTPLATFORM}-builder.daemonology.net<co id="buildhost-id">
+export BUILDHOSTNAME=${HOSTPLATFORM}-builder.daemonology.net<co id="buildhost-id"/>
 
 # Location of SSH key
-export SSHKEY=/root/.ssh/id_dsa<co id="sshkey-id">
+export SSHKEY=/root/.ssh/id_dsa<co id="sshkey-id"/>
 
 # SSH account into which files are uploaded
-MASTERACCT=builder@wadham.daemonology.net<co id="mstacct-id">
+MASTERACCT=builder@wadham.daemonology.net<co id="mstacct-id"/>
 
 # Directory into which files are uploaded
-MASTERDIR=update-master.freebsd.org<co id="mstdir-id"></programlisting>
+MASTERDIR=update-master.freebsd.org<co id="mstdir-id"/></programlisting>
     </informalexample>
 
     <para>Parameters for consideration would be:</para>
@@ -226,7 +231,7 @@ MASTERDIR=update-master.freebsd.org<co id="mstdir-id"></programlisting>
 
 	<informalexample>
 	<programlisting># SHA256 hash of RELEASE disc1.iso image.
-export RELH=1ea1f6f652d7c5f5eab7ef9f8edbed50cb664b08ed761850f95f48e86cc71ef5<co id="sha256-id">
+export RELH=1ea1f6f652d7c5f5eab7ef9f8edbed50cb664b08ed761850f95f48e86cc71ef5<co id="sha256-id"/>
 
 # Components of the world, source, and kernels
 export WORLDPARTS="base catpages dict doc games info manpages proflibs lib32"
@@ -236,7 +241,7 @@ export SOURCEPARTS="base bin contrib crypto etc games gnu include krb5  \
 export KERNELPARTS="generic"
 
 # EOL date
-export EOL=1275289200<co id="eol-id"></programlisting>
+export EOL=1275289200<co id="eol-id"/></programlisting>
 	</informalexample>
 
 	<calloutlist>

en_US.ISO8859-1/articles/geom-class/article.sgml

@@ -1,13 +1,11 @@
-<!--
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-     The FreeBSD Documentation Project
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
--->
+	"../../../share/sgml/freebsd42.dtd" [
-
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+%entities;
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
 ]>
 
-<article>
+<article lang='en'>
   <title>Writing a GEOM Class</title>
   <articleinfo>
 
@@ -22,8 +20,6 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.cvsup;
@@ -31,6 +27,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
 
       <para>This text documents some starting points in developing

en_US.ISO8859-1/articles/gjournal-desktop/article.sgml

@@ -1,14 +1,8 @@
-<!--
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-  Implementing UFS Journaling on a desktop PC
+	"../../../share/sgml/freebsd42.dtd" [
-
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
-  The FreeBSD Documentation Project
+%entities;
-
--->
-
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
 ]>
 
 <article lang="en">
@@ -28,6 +22,8 @@
       <holder role="mailto:manolis@FreeBSD.org">Manolis Kiagias</holder>
     </copyright>
 
+    <pubdate>$FreeBSD$</pubdate>
+
     <releaseinfo>$FreeBSD$</releaseinfo>
 
     <legalnotice id="trademarks" role="trademarks">
@@ -228,7 +224,7 @@
      
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="disklabel1.png">
+	  <imagedata fileref="disklabel1.png"/>
 	</imageobject>
       </mediaobject>
 
@@ -290,7 +286,7 @@
 	
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="disklabel2.png">
+	  <imagedata fileref="disklabel2.png"/>
 	</imageobject>
       </mediaobject>
 
@@ -311,19 +307,20 @@
 	  </row>
 	</thead>
 
-	<tbody>
+	  <tbody>
-	  <row>
+	    <row>
-	    <entry>ad0s1d</entry>
+	      <entry>ad0s1d</entry>
-	    <entry>/var</entry>
+	      <entry>/var</entry>
-	    <entry>ad0s1h</entry>
+	      <entry>ad0s1h</entry>
-	  </row>
+	    </row>
 
-	  <row>
+	    <row>
-	    <entry>ad0s1f</entry>
+	      <entry>ad0s1f</entry>
-	    <entry>/usr</entry>
+	      <entry>/usr</entry>
-	    <entry>ad0s1g</entry>
+	      <entry>ad0s1g</entry>
-	  </row>
+	    </row>
-	</tbody>
+	  </tbody>
+	</tgroup>
       </table>
 
       <para>Continue the installation as you would normally do.  We would
@@ -344,6 +341,7 @@
       <para>When the system comes up again, we will be ready to configure
 	journaling.</para>
     </sect2>
+  </sect1>
 
   <sect1 id="configure-journal">
     <title>Setting Up Journaling</title>
@@ -585,7 +583,7 @@ GEOM_JOURNAL: Journal ad0s1f clean.
 	<answer>
 	  <para>Sure. Use the following procedure, which reverses the
 	    changes.  The partitions you created for the journal providers
-	    can then be used for other purposes, if you so wish.<para>
+	    can then be used for other purposes, if you so wish.</para>
 
 	  <para>Login as <username>root</username> and switch to single user mode:</para>
 	

en_US.ISO8859-1/articles/hats/article.sgml

@@ -1,9 +1,11 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Working with Hats</title>
 
@@ -15,13 +17,15 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <copyright>
       <year>2002</year>
       <year>2003</year>
       <holder role="mailto:imp@FreeBSD.org">Warner Losh</holder>
     </copyright>
+
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
   </articleinfo>
 
   <note>

en_US.ISO8859-1/articles/hubs/article.sgml

@@ -1,13 +1,13 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
-<!ENTITY % not.published "IGNORE">
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Mirroring FreeBSD</title>
-    <pubdate>$FreeBSD$</pubdate>
     <authorgroup>
       <author>
         <firstname>Jun</firstname>
@@ -45,6 +45,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>An in-progress article on how to mirror FreeBSD, aimed at
         hub administrators.</para>
@@ -447,7 +451,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
           You can install the port <filename role="package">net/rsync</filename> and then use
           rsync to sync with your upstream host.
           <application>rsync</application> is already mentioned
-          in <xref linkend="mirror-serv-rsync">.
+          in <xref linkend="mirror-serv-rsync"/>.
           Since <application>rsync</application> access is not
           required, your preferred upstream site may not allow it.
           You may need to hunt around a little bit to find a site
@@ -484,7 +488,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
           even offer <application>CVSup</application> to mirror the contents of
           the FTP space. You need to install a <application>CVSup</application>
           client, preferably from the port <filename role="package">net/cvsup</filename>.
-          (Also reread <xref linkend="mirror-serv-cvsup">.)
+          (Also reread <xref linkend="mirror-serv-cvsup"/>.)
           A sample <filename>supfile</filename> suitable for <hostid role="fqdn">ftp-master.FreeBSD.org</hostid>
           looks like this:</para>
           <programlisting>
@@ -525,7 +529,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
         <title>Using CVSup</title>
         <para>
           <application>CVSup</application> is described in some
-          detail in <xref linkend="mirror-serv-cvsup"> and <xref linkend="mirror-ftp-cvsup">.
+          detail in <xref linkend="mirror-serv-cvsup"/> and <xref linkend="mirror-ftp-cvsup"/>.
         </para>
         <para>It is very easy to setup a
            <application>CVSup</application> mirror. Installing
@@ -754,7 +758,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
         are <emphasis>Tier-2</emphasis>, etc.
         Official sites are encouraged to be of a low <emphasis>tier</emphasis>,
         but the lower the tier the higher the requirements in
-        terms as described in <xref linkend="mirror-requirements">.
+        terms as described in <xref linkend="mirror-requirements"/>.
         Also access to low-tier-mirrors may be restricted, and
         access to master sites is definitely restricted.
         The <emphasis>tier</emphasis>-hierarchy is not reflected
@@ -777,7 +781,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
         <title>I just want to mirror from somewhere!</title>
         <para>
           If you have no special intentions or
-          requirements, the statement in <xref linkend="mirror-where-where">
+          requirements, the statement in <xref linkend="mirror-where-where"/>
           applies.  This means:
         </para>
         <procedure>
@@ -814,12 +818,12 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
       <sect3 id="mirror-where-official">
         <title>I am an official mirror, what is the right site for me?</title>
         <para>
-          In general the description in <xref linkend="mirror-where-simple">
+          In general the description in <xref linkend="mirror-where-simple"/>
           still applies. Of course you may want to put some
           weight on the fact that your upstream should be of
           a low tier.
           There are some other considerations about <emphasis>official</emphasis>
-          mirrors that are described in <xref linkend="mirror-official">.
+          mirrors that are described in <xref linkend="mirror-official"/>.
         </para>
       </sect3>
       <sect3 id="mirror-where-master">
@@ -856,8 +860,8 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
             <hostid>ftp-master.FreeBSD.org</hostid> provides
             <application>rsync</application> and <application>CVSup</application>
             access, in addition to FTP.
-            Refer to <xref linkend="mirror-ftp-rsync"> and
+            Refer to <xref linkend="mirror-ftp-rsync"/> and
-            <xref linkend="mirror-ftp-cvsup"> how to access
+            <xref linkend="mirror-ftp-cvsup"/> how to access
             via these protocols.
           </para>
           <para>
@@ -874,7 +878,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
           <para>
             <hostid>cvsup-master.FreeBSD.org</hostid> provides
             <application>CVSup</application> access only.
-            See <xref linkend="mirror-cvs-cvsup"> for details.
+            See <xref linkend="mirror-cvs-cvsup"/> for details.
           </para>
           <para>
             To get access, you need to contact the &a.cvsup-master;.
@@ -1000,7 +1004,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
             <email>hostmaster@CC.FreeBSD.org</email>, where
             <emphasis>CC</emphasis> is your country code/TLD.
             Your DNS entry will be as described
-            in <xref linkend="mirror-where-organization">.
+            in <xref linkend="mirror-where-organization"/>.
           </para>
           <para>
             If there is no subdomain set up for your

en_US.ISO8859-1/articles/ipsec-must/article.sgml

@@ -1,15 +1,17 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
     The FreeBSD Documentation Project
 
     $FreeBSD$
 -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<article lang='en'>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
-
-<article>
   <articleinfo>
     <title>Independent Verification of IPsec Functionality in FreeBSD</title>
 
@@ -30,6 +32,8 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>You installed IPsec and it seems to be working. How do you
         know?  I describe a method for experimentally verifying that IPsec is
@@ -299,7 +303,7 @@ char **argv;
     iproduct = 1;
 
     if (run)
-      for (i = Q; run && i &lt; Q + K; i++) {
+      for (i = Q; run &amp;&amp; i &lt; Q + K; i++) {
         j = i;
         b = fgetc(fptr);
 

en_US.ISO8859-1/articles/laptop/article.sgml

@@ -1,14 +1,14 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>FreeBSD on Laptops</title>
 
-    <pubdate>$FreeBSD$</pubdate>
-   
     <abstract>
       <para>FreeBSD works fine on most laptops, with a few caveats.
         Some issues specific to running FreeBSD on laptops, relating
@@ -22,6 +22,10 @@
       &tm-attrib.microsoft;
       &tm-attrib.general;
     </legalnotice>
+
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
   </articleinfo>
 
     <para>FreeBSD is often thought of as a server operating system, but
@@ -239,7 +243,7 @@
 
 apm_event USERSUSPENDREQ {
  exec "vidcontrol -s 1 &lt; /dev/console";
- exec "sync && sync && sync";
+ exec "sync &amp;&amp; sync &amp;&amp; sync";
  exec "sleep 1";
  exec "apm -z";
 }

en_US.ISO8859-1/articles/ldap-auth/article.sgml

@@ -1,6 +1,8 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
 <article lang="en">
@@ -17,8 +19,6 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <copyright>
       <year>2007</year>
       <year>2008</year>
@@ -30,6 +30,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This document is intended as a guide for the configuration
 	of an LDAP server (principally an <application>OpenLDAP</application>
@@ -218,7 +222,7 @@ Getting Private key</screen>
 	  <filename>cacert.crt</filename> are the same file.  If you are
 	  going to use many <application>OpenLDAP</application> servers
 	  (for replication via <literal>slurpd</literal>) you will want to
-	  see <xref linkend="ssl-ca"> to generate a CA key and use it to
+	  see <xref linkend="ssl-ca"/> to generate a CA key and use it to
 	  sign individual server certificates.</para>
 
 	<para>Once this is done, put the following in
@@ -378,7 +382,7 @@ cn: tuser</programlisting>
 
     <para>The client should already have
       <application>OpenLDAP</application> libraries from <xref
-	linkend="ldap-connect-client">, but if you are installing several
+	linkend="ldap-connect-client"/>, but if you are installing several
       client machines you will need to install <filename
 	role="package">net/openldap24-client</filename> on each of
       them.</para>
@@ -570,7 +574,7 @@ passwd: files ldap</programlisting>
 	themselves.  I provide some examples here.  Note that if you write
 	your own password change script, there are some security issues
 	you should be made aware of; see <xref
-	  linkend="security-passwd"></para>
+	  linkend="security-passwd"/></para>
 
       <example id="chpw-shell">
 	<title>Shell script for changing passwords</title>

en_US.ISO8859-1/articles/linux-comparison/article.sgml

@@ -1,3 +1,10 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
 Copyright (c) 2005 Dru Lavigne
 
@@ -31,13 +38,7 @@ Copyright (c) 2005 Dru Lavigne
      $FreeBSD$
 -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<article lang='en'>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-<!ENTITY legalnotice SYSTEM "../../share/sgml/legalnotice.sgml">
-]>
-
-<article>
   <articleinfo>
     <title>FreeBSD: An Open Source Alternative to Linux</title>
 
@@ -54,6 +55,8 @@ Copyright (c) 2005 Dru Lavigne
       <holder role="mailto:dru@isecom.org">Dru Lavigne</holder>
     </copyright>
 
+    <pubdate>$FreeBSD$</pubdate>
+
     <releaseinfo>$FreeBSD$</releaseinfo>
 
     <legalnotice id="trademarks" role="trademarks">

en_US.ISO8859-1/articles/linux-emulation/article.sgml

@@ -1,12 +1,14 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Documentation Project -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<article lang='en'>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
-
-<article>
   <articleinfo>
     <title>&linux; emulation in &os;</title>
 
@@ -31,6 +33,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This masters thesis deals with updating the &linux; emulation layer
 	(the so called <firstterm>Linuxulator</firstterm>).  The task was to update the layer to match
@@ -84,7 +90,7 @@
       stuff. We also describe the way they understand common &unix;
       primitives like what a PID is, what a thread is, etc.  In the third
       subsection we talk about how &unix; on &unix; emulation could be done
-      in general.<para>
+      in general.</para>
 
     <sect2 id="what-is-unix">
       <title>What is &unix;</title>
@@ -117,7 +123,7 @@
 	lifetime in the user space.  The kernel is where the management of the
 	processes, hardware, and low-level details take place.  The kernel
 	provides a standard unified &unix; API to the user space.  The most
-	important ones are covered below.<para>
+	important ones are covered below.</para>
 
       <sect3 id="kern-proc-comm">
 	<title>Communication between kernel and user space process</title>
@@ -212,6 +218,7 @@
 	    <para>- cannot utilize more than one CPU</para>
 	  </listitem>
 	</itemizedlist>
+      </sect3>
     </sect2>
 
     <sect2 id="what-is-freebsd">
@@ -822,6 +829,7 @@
 	    noting that atomic operations (and memory barriers as well) should
 	    ideally only be used for building front-ending locks (as
 	    mutexes).</para>
+	</sect4>
 
 	<sect4 id="freebsd-refcounts">
 	  <title>Refcounts</title>
@@ -1472,7 +1480,7 @@ translate_traps(int signal, int trap_code)
 	  the emulated version.  This is done via &man.sysctl.8;, namely
 	  <literal>compat.linux.osrelease</literal>, which is set to 2.4.2 by
 	  default (as of April 2007) and with all &linux; versions up to 2.6
-	  it just determined what &man.uname.1 outputs.  It is different with
+	  it just determined what &man.uname.1; outputs.  It is different with
 	  2.6 emulation where setting this &man.sysctl.8; affects runtime
 	  behaviour of the emulation layer.  When set to 2.6.x it sets the
 	  value of <literal>linux_use_linux26</literal> while setting to

en_US.ISO8859-1/articles/linux-users/article.sgml

@@ -1,9 +1,11 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>FreeBSD Quickstart Guide for &linux; Users</title>
 
@@ -19,6 +21,8 @@
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
+    <pubdate>$FreeBSD$</pubdate>
+
     <releaseinfo>$FreeBSD$</releaseinfo>
 
     <legalnotice id="trademarks" role="trademarks">
@@ -311,7 +315,7 @@ apache22_flags="-DSSL"</programlisting>
       <para>Instead of a generic <emphasis>ethX</emphasis> identifier that
 	&linux; uses to identify a network interface, &os; uses the driver
 	name followed by a number as the identifier.  The following output
-	from &man.ifconfig.8; shows two &intel&nbsp;Pro&nbsp;1000 network
+	from &man.ifconfig.8; shows two &intel;&nbsp;Pro&nbsp;1000 network
 	interfaces (em0 and em1):</para>
 
       <screen>&prompt.user; <userinput>ifconfig</userinput>

en_US.ISO8859-1/articles/mailing-list-faq/article.sgml

@@ -1,12 +1,14 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Documentation Project -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<article lang='en'>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
-
-<article>
   <articleinfo>
     <title>Frequently Asked Questions About The &os; Mailing Lists</title>
 
@@ -16,14 +18,16 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <copyright>
       <year>2004</year>
       <year>2005</year>
       <holder>The &os; Documentation Project</holder>
     </copyright>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This is the FAQ for the &os; mailing lists.  If you are
 	interested in helping with this project, send email to the &a.doc;.

en_US.ISO8859-1/articles/mh/article.sgml

@@ -1,11 +1,14 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!-- $FreeBSD$ -->
 <!-- FreeBSD Documentation Project -->
 
-<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<article lang='en'>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
-<article>
   <articleinfo>
     <title>An <application>MH</application> Primer</title>
 
@@ -31,6 +34,8 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This document contains an introduction to using
 	<application>MH</application> on FreeBSD</para>
@@ -149,7 +154,7 @@
       </informalexample>
 
       <para>This is the same thing you will see from a
-	<command>scan</command> (see <xref linkend="scan">). If you just run
+	<command>scan</command> (see <xref linkend="scan"/>). If you just run
 	<command>inc</command> with no arguments it will look on your
 	computer for email that is supposed to be coming to
 	you.</para>
@@ -794,11 +799,11 @@ X-Home-Page: http://www.FreeBSD.org/
 	original message. So that might be translated this way:</para>
 
       <informalexample>
-	<screen>%&lt;<emphasis remap=bf>if</emphasis> {reply-to} <emphasis remap=bf>the original message has a reply-to</emphasis> 
+	<screen>%&lt;<emphasis remap="bf">if</emphasis> {reply-to} <emphasis remap="bf">the original message has a reply-to</emphasis> 
-then give that to formataddr, %? <emphasis remap=bf>else</emphasis> {from} <emphasis remap=bf>take the
+then give that to formataddr, %? <emphasis remap="bf">else</emphasis> {from} <emphasis remap="bf">take the
-from address</emphasis>, %? <emphasis remap=bf>else</emphasis> {sender} <emphasis remap=bf>take the sender address</emphasis>, %?
+from address</emphasis>, %? <emphasis remap="bf">else</emphasis> {sender} <emphasis remap="bf">take the sender address</emphasis>, %?
-<emphasis remap=bf>else</emphasis> {return-path} <emphasis remap=bf>take the return-path from the original
+<emphasis remap="bf">else</emphasis> {return-path} <emphasis remap="bf">take the return-path from the original
-message</emphasis>, %&gt; <emphasis remap=bf>endif</emphasis>.</screen>
+message</emphasis>, %&gt; <emphasis remap="bf">endif</emphasis>.</screen>
       </informalexample>
   
       <para>As you can tell <application>MH</application> formatting

en_US.ISO8859-1/articles/multi-os/article.sgml

@@ -1,11 +1,13 @@
-<!-- $FreeBSD$ -->
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+	"../../../share/sgml/freebsd42.dtd" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
-%articles.ent;
+%entities;
 ]>
 
-<article>
+<!-- $FreeBSD$ -->
+
+<article lang='en'>
   <articleinfo>
     <title>Installing and Using FreeBSD With Other Operating Systems</title>
 
@@ -34,6 +36,8 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This document discusses how to make FreeBSD coexist nicely
 	with other popular operating systems such as Linux, &ms-dos;,
@@ -50,7 +54,7 @@
       comfortably without having a larger hard disk, so special
       information on large EIDE drives is included.  Because there are
       so many combinations of possible operating systems and hard disk
-      configurations, the <xref linkend="ch5"> section may be of the
+      configurations, the <xref linkend="ch5"/> section may be of the
       most use to you.  It contains descriptions of specific working
       computer setups that use multiple operating systems.</para>
 
@@ -185,7 +189,7 @@
       <step>
 	<para>The next thing I do is install Linux.  I am not sure
 	  about all the distributions of Linux, but <ulink url="http://www.slackware.com">Slackware</ulink> includes
-	  LILO (see <xref linkend="ch2">).  When I am partitioning out
+	  LILO (see <xref linkend="ch2"/>).  When I am partitioning out
 	  my hard disk with Linux <command>fdisk</command>, I would
 	  put all of Linux on the first drive (maybe 300&nbsp;MB for a
 	  nice root partition and some swap space).</para>
@@ -244,7 +248,7 @@ Press Esc to continue
 
 ---------------------------------------------------------------------</screen>
 	  ** May say FAT16 or FAT32 if you are using the OEM SR2
-	  update.  See <xref linkend="ch2">.</para>
+	  update.  See <xref linkend="ch2"/>.</para>
       </step>
 
       <step>
@@ -300,7 +304,7 @@ Press Esc to continue
     <para>Please keep in mind that &os2; can read FAT and HPFS
       partitions, but not FFS (FreeBSD) or EXT2 (Linux) partitions.
       Likewise, &windows; 95 can only read and write to FAT and FAT32
-      (see <xref linkend="ch2">) partitions.  FreeBSD can read most
+      (see <xref linkend="ch2"/>) partitions.  FreeBSD can read most
       filesystems, but currently cannot read HPFS partitions.  Linux
       can read HPFS partitions, but can not write to them.  Recent
       versions of the Linux kernel (2.x) can read and write to &windows;
@@ -318,7 +322,7 @@ Press Esc to continue
     <para>FreeBSD + &windows; 95:  If you installed FreeBSD after &windows; 95,
       you should see <literal>DOS</literal> on the Boot Easy menu.  This is
       &windows; 95.  If you installed &windows; 95 after FreeBSD, read
-      <xref linkend="ch4"> above.  As long as your hard disk does not
+      <xref linkend="ch4"/> above.  As long as your hard disk does not
       have 1024 cylinders you should not have a problem booting.  If
       one of your partitions goes beyond the 1024th cylinder however,
       and you get messages like <errorname>invalid system disk</errorname>
@@ -338,7 +342,7 @@ Press Esc to continue
     <para>FreeBSD + Linux: You can also use Boot Easy to boot both
       operating systems.</para>
 
-    <para>FreeBSD + Linux + &windows; 95:  (see <xref linkend="ch3">)</para>
+    <para>FreeBSD + Linux + &windows; 95:  (see <xref linkend="ch3"/>)</para>
   </sect1>
 
   <sect1 id="sources">
@@ -427,7 +431,7 @@ Press Esc to continue
 	disks using ATAID or other programs off the net.  Your hard
 	disk probably came with this information as well.  Be careful
 	though: if you are using BIOS LBA (see <xref
-	  linkend="limits">), you can not use just any program to get
+	  linkend="limits"/>), you can not use just any program to get
 	the physical geometry.  This is because many programs (e.g.
 	<filename>MSD.EXE</filename> or FreeBSD fdisk) do not identify the
 	physical disk geometry; they instead report the
@@ -447,7 +451,7 @@ Press Esc to continue
 	<literal>boot sector</literal> or <literal>master boot record</literal>.
 	Among the useful info you will find are Hale Landis's
 	<citetitle>How It Works</citetitle> document pack.  See the <xref
-	  linkend="sources"> section for a few pointers to this
+	  linkend="sources"/> section for a few pointers to this
 	pack.</para>
 
       <para>Ok, enough terminology.  We are talking about booting
@@ -469,7 +473,7 @@ Press Esc to continue
 	  ID</firstterm>, a <firstterm>Start Cylinder/Head/Sector</firstterm>, and an
 	<firstterm>End Cylinder/Head/Sector</firstterm>.  The Partition ID
 	tells what type of partition it is (what OS) and the Start/End
-	tells where it is.  <xref linkend="tbl-pid"> lists a
+	tells where it is.  <xref linkend="tbl-pid"/> lists a
 	smattering of some common Partition IDs.</para>
 
       <table id="tbl-pid">
@@ -657,7 +661,7 @@ Press Esc to continue
 	  from having to reinstall one or more of your OSs.</para>
 
 	<para>If you followed the discussion in <xref
-	    linkend="booting"> about the Master Boot Sector (where the
+	    linkend="booting"/> about the Master Boot Sector (where the
 	  MBR is), Partition Boot Sectors, and the booting process,
 	  you may have been wondering just exactly where on your hard
 	  disk that nifty boot manager is going to live.  Well, some

en_US.ISO8859-1/articles/nanobsd/article.sgml

@@ -1,9 +1,11 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Introduction to NanoBSD</title>
 
@@ -15,8 +17,6 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <copyright>
       <year>2006</year>
       <holder>The FreeBSD Documentation Project</holder>
@@ -27,6 +27,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This document provides information about
 	the <application>NanoBSD</application> tools, which can be used to
@@ -162,10 +166,10 @@
       <para>The necessary commands to build a
 	<application>NanoBSD</application> image are:</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/src/tools/tools/nanobsd</userinput> <co id="nbsd-cd">
+      <screen>&prompt.root; <userinput>cd /usr/src/tools/tools/nanobsd</userinput> <co id="nbsd-cd"/>
-&prompt.root; <userinput>sh nanobsd.sh</userinput> <co id="nbsd-sh">
+&prompt.root; <userinput>sh nanobsd.sh</userinput> <co id="nbsd-sh"/>
-&prompt.root; <userinput>cd /usr/obj/nanobsd.full</userinput> <co id="nbsd-cd2">
+&prompt.root; <userinput>cd /usr/obj/nanobsd.full</userinput> <co id="nbsd-cd2"/>
-&prompt.root; <userinput>dd if=_.disk.full of=/dev/da0 bs=64k</userinput> <co id="nbsd-dd"></screen>
+&prompt.root; <userinput>dd if=_.disk.full of=/dev/da0 bs=64k</userinput> <co id="nbsd-dd"/></screen>
 
       <calloutlist>
 	<callout arearefs="nbsd-cd">

en_US.ISO8859-1/articles/new-users/article.sgml

@@ -1,12 +1,14 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Documentation Project -->
 
-<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<article lang='en'>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
-
-<article>
   <articleinfo>
     <title>For People New to Both FreeBSD and &unix;</title>
 
@@ -33,6 +35,8 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>Congratulations on installing FreeBSD! This introduction
 	is for people new to both FreeBSD <emphasis>and</emphasis>

en_US.ISO8859-1/articles/p4-primer/article.sgml

@@ -1,13 +1,11 @@
-<!--
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-     The FreeBSD Documentation Project
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
--->
+	"../../../share/sgml/freebsd42.dtd" [
-
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+%entities;
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
 ]>
 
-<article>
+<article lang='en'>
   <title>Perforce in &os; Development</title>
 
   <articleinfo>
@@ -23,13 +21,15 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.cvsup;
       &tm-attrib.general;
     </legalnotice>
+
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
   </articleinfo>
 
 <sect1 id="intro">
@@ -267,7 +267,7 @@
   <para>Existing clients can be listed via the <command>p4
     clients</command> command.  They can be viewed without being
     modified via the <command>p4 client -o
-    <replaceable>clientname</replaceable></command> command.
+    <replaceable>clientname</replaceable></command> command.</para>
 
   <para>Whenever you are interacting with files in
     <application>Perforce</application>, the <envar>P4CLIENT</envar>
@@ -281,6 +281,7 @@
     allows multiple people to access and modify the same parts of the
     repository, allowing a team of people to work together on the same
     code.</para>
+</sect1>
 
 <sect1 id="syncing">
   <title>Syncing</title>
@@ -315,6 +316,7 @@
 
   <para>Specifying a local relative path works for many other
     <command>p4</command> commands.</para>
+</sect1>
 
 <sect1 id="branches">
   <title>Branches</title>
@@ -409,6 +411,7 @@
 
   <para>The next step is to run the <command>p4 integrate</command>
     command, as described in the next section.</para>
+</sect1>
 
 <sect1 id="Integrations">
   <title>Integrations</title>
@@ -845,7 +848,7 @@
     has no open files and is fully synced before going offline.  Then
     when editing a file, manually change the permissions to
     read-write.  When you get back online, run the commands listed in
-    the <xref linkend="working-with-diffs"> to automatically identify
+    the <xref linkend="working-with-diffs"/> to automatically identify
     files that have been edited, added, and removed.  It is quite
     common to be surprised by <application>Perforce</application>
     overwriting a locally changed file that was not opened for edit,

en_US.ISO8859-1/articles/pam/article.sgml

@@ -1,6 +1,8 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
 <!--
@@ -37,12 +39,10 @@
   - SUCH DAMAGE.
   -->
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Pluggable Authentication Modules</title>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <abstract>
       <para>This article describes the underlying principles and
 	mechanisms of the Pluggable Authentication Modules (PAM)
@@ -80,6 +80,8 @@
       &tm-attrib.sun;
       &tm-attrib.general;
     </legalnotice>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
   </articleinfo>
 
   <section id="pam-intro">
@@ -895,10 +897,10 @@ sshd	password	required	pam_permit.so</programlisting>
       <table>
 	<title>PAM chain execution summary</title>
 	<tgroup cols="4">
-	  <colspec colwidth="1*" colname="type">
+	  <colspec colwidth="1*" colname="type"/>
-	  <colspec colwidth="1*" colname="success">
+	  <colspec colwidth="1*" colname="success"/>
-	  <colspec colwidth="1*" colname="ignore">
+	  <colspec colwidth="1*" colname="ignore"/>
-	  <colspec colwidth="1*" colname="other">
+	  <colspec colwidth="1*" colname="other"/>
 	  <thead>
 	    <row>
 	      <entry colname="type"></entry>
@@ -1236,7 +1238,7 @@ sshd	password	required	pam_permit.so</programlisting>
       applications.</para>
 
 <programlisting><inlinegraphic fileref="pam_app.c"
-  format="linespecific"></programlisting>
+  format="linespecific"/></programlisting>
   </appendix>
 
   <appendix id="pam-sample-module">
@@ -1250,7 +1252,7 @@ sshd	password	required	pam_permit.so</programlisting>
       the user for a password.</para>
 
 <programlisting><inlinegraphic fileref="pam_module.c"
-  format="linespecific"></programlisting>
+  format="linespecific"/></programlisting>
   </appendix>
 
   <appendix id="pam-sample-conv">
@@ -1267,7 +1269,7 @@ sshd	password	required	pam_permit.so</programlisting>
       conversation function can reasonably get.</para>
 
 <programlisting><inlinegraphic fileref="pam_conv.c"
-  format="linespecific"></programlisting>
+  format="linespecific"/></programlisting>
   </appendix>
 
   <bibliography id="pam-further">

en_US.ISO8859-1/articles/port-mentor-guidelines/article.sgml

@@ -1,9 +1,11 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+        "../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang="en">
   <articleinfo>
     <title>Port Mentor Guidelines</title>
 
@@ -13,6 +15,8 @@
 
     <pubdate>$FreeBSD$</pubdate>
 
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <copyright>
       <year>2011</year>
       <holder role="mailto:tabthorpe@FreeBSD.org">Thomas Abthorpe</holder>

en_US.ISO8859-1/articles/portbuild/article.sgml

@@ -1,9 +1,11 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Package Building Procedures</title>
 
@@ -11,8 +13,6 @@
       <corpauthor>The &os; Ports Management Team</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <copyright>
       <year>2003</year>
       <year>2004</year>
@@ -34,6 +34,10 @@
       &tm-attrib.sparc;
       &tm-attrib.general;
     </legalnotice>
+
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
   </articleinfo>
 
   <sect1 id="intro">
@@ -701,6 +705,7 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
 
     <para>Hint: it us usually best to run the <command>dopackages</command>
       command inside of <command>screen(1)</command>.</para>
+    </sect3>
     </sect2>
 
     <sect2 id="build-command">
@@ -907,7 +912,7 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
 
     <para>To free up resources, you will need to clean up client machines by
       running <command>build cleanup</command> command.  For example:
-      <screen>&prompt.user; <userinput>/var/portbuild/scripts/build cleanup i386 8-exp 20080714120411 -full</userinput></screen>
+      <screen>&prompt.user; <userinput>/var/portbuild/scripts/build cleanup i386 8-exp 20080714120411 -full</userinput></screen></para>
 
     <para>If you forget to do this, then the old build
       <literal>chroot</literal>s will not be cleaned up for 24 hours, and no
@@ -987,8 +992,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
 	<listitem>
 	  <para><literal>build upload <replaceable>arch</replaceable>
 	    <replaceable>branch</replaceable></literal> - not yet
-	    implemented.
+	    implemented.</para>
-	  </para>
 	</listitem>
       </itemizedlist>
 
@@ -1579,7 +1583,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
 	    packages for <literal>-current</literal>, the kernel it
 	    runs should be reasonably up-to-date with the
 	    <literal>bindist</literal> that will be exported
-	    by our scripts.)
+	    by our scripts.)</para>
 	</step>
 
 	<step>
@@ -1594,7 +1598,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
 	<step>
 	  <para>If you are cross-building, export
 	    <literal>TARGET_ARCH</literal>=<replaceable>${arch}</replaceable>.
-	  <para>
+	  </para>
 	  <note>
 	    <para>The procedure for cross-building ports is not yet
 	      defined.</para>
@@ -1687,8 +1691,8 @@ options         NFSSERVER               # Network Filesystem Server</screen>
 
 	    <listitem>
 	      <para>Also add the following users:<screen>
-squid:*:100:100::0:0:User &:/usr/local/squid:/bin/sh
+squid:*:100:100::0:0:User &amp;:/usr/local/squid:/bin/sh
-ganglia:*:102:102::0:0:User &:/usr/local/ganglia:/bin/sh</screen>
+ganglia:*:102:102::0:0:User &amp;:/usr/local/ganglia:/bin/sh</screen>
 	      </para>
 	      <para>Add them to <filename>etc/group</filename> as well.</para>
 	    </listitem>
@@ -1999,6 +2003,7 @@ touch /tmp/.boot_finished</screen>
 <userinput>mkdir squid/logs</userinput>
 <userinput>chown -R squid:squid squid</userinput></screen>
 	  </para>
+	</step>
 
 	<!-- XXX MCL adapted literally from krismail; I do not understand it -->
 	<step>
@@ -2204,7 +2209,7 @@ ssh_cmd="/usr/local/bin/ssh"
 	    </command></para>
 	</step>
       </procedure>
-
+    </sect2>
   </sect1>
 
   <sect1 id="new-branch">
@@ -2282,7 +2287,7 @@ ssh_cmd="/usr/local/bin/ssh"
         <para>(Only necessary for old codebase):
 	  Add a link from
 	  <filename>/var/portbuild/scripts/dopackages</filename> to
-	  <filename>/var/portbuild/scripts/dopackages.<replaceable>branch</replaceable></filename>.
+	  <filename>/var/portbuild/scripts/dopackages.<replaceable>branch</replaceable></filename>.</para>
       </listitem>
 
       <listitem>
@@ -2314,7 +2319,7 @@ ln -s ../<replaceable>arch</replaceable>/<replaceable>branch</replaceable>/build
 
       <listitem>
 	<para>Kick-start the build for the branch with
-	  <screen>build create <replaceable>arch</replaceable> <replaceable>branch</replaceable></screen>
+	  <screen>build create <replaceable>arch</replaceable> <replaceable>branch</replaceable></screen></para>
       </listitem>
 
       <listitem>
@@ -2627,7 +2632,7 @@ ln -s ../<replaceable>arch</replaceable>/<replaceable>branch</replaceable>/build
 	  In that
 	  directory, create two more links for the webserver:<screen>
 ln -s ../<replaceable>arch</replaceable>/archive/buildlogs <replaceable>arch</replaceable>-buildlogs
-ln -s ../<replaceable>arch</replaceable>/archive/errorlogs <replaceable>arch</replaceable>-errorlogs</screen>
+ln -s ../<replaceable>arch</replaceable>/archive/errorlogs <replaceable>arch</replaceable>-errorlogs</screen></para>
       </listitem>
     </itemizedlist>
 
@@ -2644,7 +2649,7 @@ ln -s ../<replaceable>arch</replaceable>/archive/errorlogs <replaceable>arch</re
 	<itemizedlist>
 	  <listitem>
 	    <para>Kick-start the build for the branch with
-	      <screen>build create <replaceable>arch</replaceable> <replaceable>branch</replaceable></screen>
+	      <screen>build create <replaceable>arch</replaceable> <replaceable>branch</replaceable></screen></para>
 	  </listitem>
 
 	  <listitem>
@@ -2674,6 +2679,7 @@ ln -s ../<replaceable>arch</replaceable>/archive/errorlogs <replaceable>arch</re
 	  <filename>/var/portbuild/scripts/dologs</filename> to the root
 	  <filename>crontab</filename>.  (This is a hack and should go away.)
 	</para>
+      </listitem>
     </itemizedlist>
   </sect1>
 

en_US.ISO8859-1/articles/pr-guidelines/article.sgml

@@ -1,28 +1,27 @@
-<!--
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-	Problem Report Handling Guidelines
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	The FreeBSD Project - http://www.FreeBSD.org
+	"../../../share/sgml/freebsd42.dtd" [
--->
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
-
+%entities;
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY man.edit-pr.1 "<citerefentry><refentrytitle>edit-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!ENTITY man.query-pr.1 "<citerefentry><refentrytitle>query-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
-%articles.ent;
-<!ENTITY man.edit-pr.1 "<citerefentry/<refentrytitle/edit-pr/<manvolnum/1//">
-<!ENTITY man.query-pr.1 "<citerefentry/<refentrytitle/query-pr/<manvolnum/1//">
 ]>
 
-<article>
+<article lang='en'>
   <!-- :START of Article Metadata -->
   <articleinfo>
     <title>Problem Report Handling Guidelines</title>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.opengroup;
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>These guidelines describe recommended handling practices
 	for FreeBSD Problem Reports (PRs).  Whilst developed for the
@@ -272,7 +271,7 @@
 	specific &os; mailing list.  Here is the current list, with
 	the most common ones listed first:</para>
 
-      <table id=default-assignees-common>
+      <table id="default-assignees-common">
 	<title>Default Assignees &mdash; most common</title>
 	<tgroup cols="3">
 	  <thead>
@@ -314,9 +313,10 @@
 	      <entry>freebsd-www</entry>
 	    </row>
 	  </tbody>
+        </tgroup>
       </table>
 
-      <table id=default-assignees-other>
+      <table id="default-assignees-other">
 	<title>Default Assignees &mdash; other</title>
 	<tgroup cols="3">
 	  <thead>
@@ -358,6 +358,7 @@
 	      <entry>freebsd-usb</entry>
 	    </row>
 	  </tbody>
+        </tgroup>
       </table>
 
       <para>Do not be surprised to find that the submitter of the
@@ -390,7 +391,7 @@
 	<para>Here is a sample list of such entities; it is probably
 	  not complete.</para>
 
-      <table id=common-assignees-base>
+      <table id="common-assignees-base">
 	<title>Common Assignees &mdash; base system</title>
 	<tgroup cols="4">
 	  <thead>
@@ -565,9 +566,10 @@
 	      <entry>mailing list</entry>
 	    </row>
 	  </tbody>
+        </tgroup>
       </table>
 
-      <table id=common-assignees-ports>
+      <table id="common-assignees-ports">
 	<title>Common Assignees &mdash; Ports Collection</title>
 	<tgroup cols="4">
 	  <thead>
@@ -715,6 +717,7 @@
 	      <entry>mailing list</entry>
 	    </row>
 	  </tbody>
+        </tgroup>
       </table>
 
       <para>Ports PRs which have a maintainer who is a ports committer
@@ -730,7 +733,7 @@
 	because everyone assumes that the assignee is already working
 	on it.</para>
 
-      <table id=common-assignees-other>
+      <table id="common-assignees-other">
 	<title>Common Assignees &mdash; Other</title>
 	<tgroup cols="4">
 	  <thead>
@@ -757,6 +760,7 @@
 	      <entry>alias</entry>
 	    </row>
 	  </tbody>
+	</tgroup>
       </table>
 
     </section>

en_US.ISO8859-1/articles/problem-reports/article.sgml

@@ -1,14 +1,14 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Writing &os; Problem Reports</title>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.cvsup;
@@ -19,6 +19,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This article describes how to best formulate and submit a
 	problem report to the &os; Project.</para>

en_US.ISO8859-1/articles/pxe/article.sgml

@@ -1,9 +1,11 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>FreeBSD Jumpstart Guide</title>
 
@@ -18,14 +20,16 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.intel;
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This article details the method used to allow machines to install
         FreeBSD using the &intel; PXE method of booting a machine over a network.

en_US.ISO8859-1/articles/rc-scripting/article.sgml

@@ -1,9 +1,11 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Practical rc.d scripting in BSD</title>
 
@@ -25,14 +27,16 @@
       <holder>The FreeBSD Project</holder>
     </copyright>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.netbsd;
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>Beginners may find it difficult to relate the
 	facts from the formal documentation on the BSD
@@ -199,21 +203,21 @@
       system boots up:</para>
 
     <informalexample>
-      <programlisting>#!/bin/sh<co id="rcng-dummy-shebang">
+      <programlisting>#!/bin/sh<co id="rcng-dummy-shebang"/>
 
-. /etc/rc.subr<co id="rcng-dummy-include">
+. /etc/rc.subr<co id="rcng-dummy-include"/>
 
-name="dummy"<co id="rcng-dummy-name">
+name="dummy"<co id="rcng-dummy-name"/>
-start_cmd="${name}_start"<co id="rcng-dummy-startcmd">
+start_cmd="${name}_start"<co id="rcng-dummy-startcmd"/>
-stop_cmd=":"<co id="rcng-dummy-stopcmd">
+stop_cmd=":"<co id="rcng-dummy-stopcmd"/>
 
-dummy_start()<co id="rcng-dummy-startfn">
+dummy_start()<co id="rcng-dummy-startfn"/>
 {
 	echo "Nothing started."
 }
 
-load_rc_config $name<co id="rcng-dummy-loadconfig">
+load_rc_config $name<co id="rcng-dummy-loadconfig"/>
-run_rc_command "$1"<co id="rcng-dummy-runcommand"></programlisting>
+run_rc_command "$1"<co id="rcng-dummy-runcommand"/></programlisting>
     </informalexample>
 
     <para>Things to note are:</para>
@@ -282,7 +286,7 @@ run_rc_command "$1"<co id="rcng-dummy-runcommand"></programlisting>
       </callout>
 
       <callout arearefs="rcng-dummy-name">
-	<para><anchor id="name-var">The mandatory variable
+	<para><anchor id="name-var"/>The mandatory variable
 	  <envar>name</envar> specifies the name of our script.  It
 	  is required by &man.rc.subr.8;.  That is, each
 	  <filename>rc.d</filename> script <emphasis>must</emphasis>
@@ -390,18 +394,18 @@ run_rc_command "$1"<co id="rcng-dummy-runcommand"></programlisting>
 . /etc/rc.subr
 
 name=dummy
-rcvar=dummy_enable<co id="rcng-confdummy-rcvar">
+rcvar=dummy_enable<co id="rcng-confdummy-rcvar"/>
 
 start_cmd="${name}_start"
 stop_cmd=":"
 
-load_rc_config $name<co id="rcng-confdummy-loadconfig">
+load_rc_config $name<co id="rcng-confdummy-loadconfig"/>
-eval "${rcvar}=\${${rcvar}:-'NO'}"<co id="rcng-confdummy-enable">
+eval "${rcvar}=\${${rcvar}:-'NO'}"<co id="rcng-confdummy-enable"/>
-dummy_msg=${dummy_msg:-"Nothing started."}<co id="rcng-confdummy-opt">
+dummy_msg=${dummy_msg:-"Nothing started."}<co id="rcng-confdummy-opt"/>
 
 dummy_start()
 {
-	echo "$dummy_msg"<co id="rcng-confdummy-msg">
+	echo "$dummy_msg"<co id="rcng-confdummy-msg"/>
 }
 
 run_rc_command "$1"</programlisting>
@@ -531,7 +535,7 @@ run_rc_command "$1"</programlisting>
 name=mumbled
 rcvar=mumbled_enable
 
-command="/usr/sbin/${name}"<co id="rcng-daemon-basic-cmd">
+command="/usr/sbin/${name}"<co id="rcng-daemon-basic-cmd"/>
 
 load_rc_config $name
 run_rc_command "$1"</programlisting>
@@ -625,26 +629,26 @@ name=mumbled
 rcvar=mumbled_enable
 
 command="/usr/sbin/${name}"
-command_args="mock arguments &gt; /dev/null 2&gt;&amp;1"<co id="rcng-daemon-adv-args">
+command_args="mock arguments &gt; /dev/null 2&gt;&amp;1"<co id="rcng-daemon-adv-args"/>
 
-pidfile="/var/run/${name}.pid"<co id="rcng-daemon-adv-pid">
+pidfile="/var/run/${name}.pid"<co id="rcng-daemon-adv-pid"/>
 
-required_files="/etc/${name}.conf /usr/share/misc/${name}.rules"<co id="rcng-daemon-adv-reqfiles">
+required_files="/etc/${name}.conf /usr/share/misc/${name}.rules"<co id="rcng-daemon-adv-reqfiles"/>
 
-sig_reload="USR1"<co id="rcng-daemon-adv-sig">
+sig_reload="USR1"<co id="rcng-daemon-adv-sig"/>
 
-start_precmd="${name}_prestart"<co id="rcng-daemon-adv-precmd">
+start_precmd="${name}_prestart"<co id="rcng-daemon-adv-precmd"/>
-stop_postcmd="echo Bye-bye"<co id="rcng-daemon-adv-postcmd">
+stop_postcmd="echo Bye-bye"<co id="rcng-daemon-adv-postcmd"/>
 
-extra_commands="reload plugh xyzzy"<co id="rcng-daemon-adv-extra">
+extra_commands="reload plugh xyzzy"<co id="rcng-daemon-adv-extra"/>
 
-plugh_cmd="mumbled_plugh"<co id="rcng-daemon-adv-methods">
+plugh_cmd="mumbled_plugh"<co id="rcng-daemon-adv-methods"/>
 xyzzy_cmd="echo 'Nothing happens.'"
 
 mumbled_prestart()
 {
-	if checkyesno mumbled_smart; then<co id="rcng-daemon-adv-yn">
+	if checkyesno mumbled_smart; then<co id="rcng-daemon-adv-yn"/>
-		rc_flags="-o smart ${rc_flags}"<co id="rcng-daemon-adv-rcflags">
+		rc_flags="-o smart ${rc_flags}"<co id="rcng-daemon-adv-rcflags"/>
 	fi
 	case "$mumbled_mode" in
 	foo)
@@ -654,15 +658,15 @@ mumbled_prestart()
 		rc_flags="-baz ${rc_flags}"
 		;;
 	*)
-		warn "Invalid value for mumbled_mode"<co id="rcng-daemon-adv-warn">
+		warn "Invalid value for mumbled_mode"<co id="rcng-daemon-adv-warn"/>
-		return 1<co id="rcng-daemon-adv-preret">
+		return 1<co id="rcng-daemon-adv-preret"/>
 		;;
 	esac
-	run_rc_command xyzzy<co id="rcng-daemon-adv-run">
+	run_rc_command xyzzy<co id="rcng-daemon-adv-run"/>
 	return 0
 }
 
-mumbled_plugh()<co id="rcng-daemon-adv-plugh">
+mumbled_plugh()<co id="rcng-daemon-adv-plugh"/>
 {
 	echo 'A hollow voice says "plugh".'
 }
@@ -886,7 +890,7 @@ fi</programlisting>
       </callout>
 
       <callout arearefs="rcng-daemon-adv-rcflags">
-	<para><anchor id="rc-flags">We can affect the flags to be
+	<para><anchor id="rc-flags"/>We can affect the flags to be
 	  passed to <envar>$command</envar> by modifying
 	  <envar>rc_flags</envar> in <envar>$start_precmd</envar>.</para>
       </callout>
@@ -999,10 +1003,10 @@ fi</programlisting>
     <informalexample>
       <programlisting>#!/bin/sh
 
-# PROVIDE: mumbled oldmumble <co id="rcng-hookup-provide">
+# PROVIDE: mumbled oldmumble <co id="rcng-hookup-provide"/>
-# REQUIRE: DAEMON cleanvar frotz<co id="rcng-hookup-require">
+# REQUIRE: DAEMON cleanvar frotz<co id="rcng-hookup-require"/>
-# BEFORE:  LOGIN<co id="rcng-hookup-before">
+# BEFORE:  LOGIN<co id="rcng-hookup-before"/>
-# KEYWORD: nojail shutdown<co id="rcng-hookup-keyword">
+# KEYWORD: nojail shutdown<co id="rcng-hookup-keyword"/>
 
 . /etc/rc.subr
 
@@ -1014,9 +1018,9 @@ start_precmd="${name}_prestart"
 
 mumbled_prestart()
 {
-	if ! checkyesno frotz_enable && \
+	if ! checkyesno frotz_enable &amp;&amp; \
-	    ! /etc/rc.d/frotz forcestatus 1>/dev/null 2>&1; then
+	    ! /etc/rc.d/frotz forcestatus 1>/dev/null 2>&amp;1; then
-		force_depend frotz || return 1<co id="rcng-hookup-force">
+		force_depend frotz || return 1<co id="rcng-hookup-force"/>
 	fi
 	return 0
 }
@@ -1090,7 +1094,7 @@ run_rc_command "$1"</programlisting>
       </callout>
 
       <callout arearefs="rcng-hookup-keyword">
-	<para><anchor id="keywords">As we remember from the above text,
+	<para><anchor id="keywords"/>As we remember from the above text,
 	  &man.rcorder.8; keywords can be used to select or leave
 	  out some scripts.  Namely any &man.rcorder.8; consumer
 	  can specify through <option>-k</option> and <option>-s</option>
@@ -1177,7 +1181,7 @@ run_rc_command "$1"</programlisting>
       </callout>
 
       <callout arearefs="rcng-hookup-force">
-	<para><anchor id="forcedep">To begin with,
+	<para><anchor id="forcedep"/>To begin with,
 	  <function>force_depend</function> should be used with
 	  much care.  It is generally better to revise the hierarchy
 	  of configuration variables for your <filename>rc.d</filename>
@@ -1265,7 +1269,7 @@ extra_commands="kiss"
 
 dummy_start()
 {
-        if [ $# -gt 0 ]; then<co id="rcng-args-start">
+        if [ $# -gt 0 ]; then<co id="rcng-args-start"/>
                 echo "Greeting message: $*"
         else
                 echo "Nothing started."
@@ -1275,7 +1279,7 @@ dummy_start()
 dummy_kiss()
 {
         echo -n "A ghost gives you a kiss"
-        if [ $# -gt 0 ]; then<co id="rcng-args-kiss">
+        if [ $# -gt 0 ]; then<co id="rcng-args-kiss"/>
                 echo -n " and whispers: $*"
         fi
         case "$*" in
@@ -1289,7 +1293,7 @@ dummy_kiss()
 }
 
 load_rc_config $name
-run_rc_command "$@"<co id="rcng-args-all"></programlisting>
+run_rc_command "$@"<co id="rcng-args-all"/></programlisting>
     </informalexample>
 
     <para>What essential changes can we notice in the script?</para>
@@ -1354,7 +1358,7 @@ A ghost gives you a kiss and whispers: Once I was Etaoin Shrdlu...</screen>
   <sect1 id="rcng-furthur">
     <title>Further reading</title>
 
-    <para><anchor id="lukem"><ulink
+    <para><anchor id="lukem"/><ulink
       url="http://www.mewburn.net/luke/papers/rc.d.pdf">The original
       article by Luke Mewburn</ulink> offers a general overview of
       <filename>rc.d</filename> and detailed rationale for its
@@ -1362,7 +1366,7 @@ A ghost gives you a kiss and whispers: Once I was Etaoin Shrdlu...</screen>
       <filename>rc.d</filename> framework and its place in a modern
       BSD operating system.</para>
 
-    <para><anchor id="manpages">The manual pages &man.rc.8;,
+    <para><anchor id="manpages"/>The manual pages &man.rc.8;,
       &man.rc.subr.8;, and &man.rcorder.8; document the
       <filename>rc.d</filename> components in great detail.  You
       cannot fully use the <filename>rc.d</filename> power without

en_US.ISO8859-1/articles/relaydelay/article.sgml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
+<!ENTITY % not.published "IGNORE">
+]>
+
 <!--
     $FreeBSD$
 -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<article lang='en'>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-<!ENTITY % not.published "IGNORE">
-]>
-
-<article>
   <articleinfo>
     <title>Using Greylist with &os;</title>
 
@@ -25,6 +27,10 @@
       <holder>The &os; Documentation Project</holder>
     </copyright>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>An article written for the sole purpose of explaining
         the relaydelay system on a &os; mail server.  A relaydelay

en_US.ISO8859-1/articles/releng-packages/article.sgml

@@ -1,13 +1,11 @@
-<!--
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-     The FreeBSD Documentation Project
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
--->
+	"../../../share/sgml/freebsd42.dtd" [
-
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+%entities;
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
 ]>
 
-<article>
+<article lang='en'>
   <title>FreeBSD Release Engineering for Third Party Software
     Packages</title>
   <articleinfo>
@@ -21,8 +19,6 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.intel;
@@ -30,6 +26,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This paper describes the approach used by the FreeBSD
         ports management team to produce a high quality package set

en_US.ISO8859-1/articles/releng/article.sgml

@@ -1,14 +1,12 @@
-<!--
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-     The FreeBSD Documentation Project
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
--->
+	"../../../share/sgml/freebsd42.dtd" [
-
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+%entities;
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
 <!ENTITY art.re.pkgs '<ulink url="&url.articles.releng-packages;/article.html">The Release Engineering of Third Party Packages</ulink>'>
 ]>
 
-<article>
+<article lang='en'>
   <title>&os; Release Engineering</title>
   <articleinfo>
 
@@ -37,8 +35,6 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.cvsup;
@@ -46,6 +42,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This paper describes the approach used by the &os;
         release engineering team to make production quality releases
@@ -137,7 +137,7 @@
 
     <variablelist>
       <varlistentry>
-	<term><xref linkend="release-proc"></term>
+	<term><xref linkend="release-proc"/></term>
 
 	<listitem>
 	  <para>The different phases of the release engineering process
@@ -146,7 +146,7 @@
       </varlistentry>
 
       <varlistentry>
-	<term><xref linkend="release-build"></term>
+	<term><xref linkend="release-build"/></term>
 
 	<listitem>
 	  <para>The actual build process.</para>
@@ -154,7 +154,7 @@
       </varlistentry>
 
       <varlistentry>
-	<term><xref linkend="extensibility"></term>
+	<term><xref linkend="extensibility"/></term>
 
 	<listitem>
 	  <para>How the base release may be extended by third parties.</para>
@@ -162,7 +162,7 @@
       </varlistentry>
 
       <varlistentry>
-	<term><xref linkend="lessons-learned"></term>
+	<term><xref linkend="lessons-learned"/></term>
 
 	<listitem>
 	  <para>Some of the lessons learned through the release of &os;&nbsp;4.4.</para>
@@ -170,7 +170,7 @@
       </varlistentry>
 
       <varlistentry>
-	<term><xref linkend="future"></term>
+	<term><xref linkend="future"/></term>
 
 	<listitem>
 	  <para>Future directions of development.</para>
@@ -292,7 +292,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="branches-head" align="center">
+          <imagedata fileref="branches-head" align="center"/>
         </imageobject>
 
         <textobject>
@@ -302,7 +302,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="branches-releng3" align="center">
+          <imagedata fileref="branches-releng3" align="center"/>
         </imageobject>
 
         <textobject>
@@ -312,7 +312,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="branches-releng4" align="center">
+          <imagedata fileref="branches-releng4" align="center"/>
         </imageobject>
 
         <textobject>
@@ -322,7 +322,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="branches-releng5" align="center">
+          <imagedata fileref="branches-releng5" align="center"/>
         </imageobject>
 
         <textobject>
@@ -332,7 +332,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="branches-releng6" align="center">
+          <imagedata fileref="branches-releng6" align="center"/>
         </imageobject>
 
         <textobject>
@@ -342,7 +342,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="branches-releng7" align="center">
+          <imagedata fileref="branches-releng7" align="center"/>
         </imageobject>
 
         <textobject>
@@ -352,7 +352,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="branches-releng8" align="center">
+          <imagedata fileref="branches-releng8" align="center"/>
         </imageobject>
 
         <textobject>
@@ -362,7 +362,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="branches-releng9" align="center">
+          <imagedata fileref="branches-releng9" align="center"/>
         </imageobject>
 
         <textobject>

en_US.ISO8859-1/articles/remote-install/article.sgml

@@ -1,9 +1,11 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Remote Installation of the &os; Operating System without a
       Remote Console</title>
@@ -17,8 +19,6 @@
       <!-- 11 April 2008 -->
     </author>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.general;
@@ -29,6 +29,10 @@
       <holder>The &os; Documentation Project</holder>
     </copyright>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This article documents the remote installation of the &os;
 	operating system when the console of the remote system is
@@ -331,17 +335,17 @@ ifconfig_re0="inet 192.168.0.2 netmask 255.255.255.0"</programlisting>
 	create a <application>UFS2</application> file system in each
 	mirrored partition:</para>
 
-      <screen>&prompt.root; <userinput>fdisk -BI /dev/ad0</userinput> <co id="fdisk">
+      <screen>&prompt.root; <userinput>fdisk -BI /dev/ad0</userinput> <co id="fdisk"/>
 &prompt.root; <userinput>fdisk -BI /dev/ad1</userinput>
-&prompt.root; <userinput>bsdlabel -wB /dev/ad0s1</userinput> <co id="bsdlabel-writing">
+&prompt.root; <userinput>bsdlabel -wB /dev/ad0s1</userinput> <co id="bsdlabel-writing"/>
 &prompt.root; <userinput>bsdlabel -wB /dev/ad1s1</userinput>
-&prompt.root; <userinput>bsdlabel -e /dev/ad0s1</userinput> <co id="bsdlabel-editing">
+&prompt.root; <userinput>bsdlabel -e /dev/ad0s1</userinput> <co id="bsdlabel-editing"/>
-&prompt.root; <userinput>bsdlabel /dev/ad0s1 > /tmp/bsdlabel.txt && bsdlabel -R /dev/ad1s1 /tmp/bsdlabel.txt</userinput> <co id="bsdlabel-restore">
+&prompt.root; <userinput>bsdlabel /dev/ad0s1 > /tmp/bsdlabel.txt &amp;&amp; bsdlabel -R /dev/ad1s1 /tmp/bsdlabel.txt</userinput> <co id="bsdlabel-restore"/>
-&prompt.root; <userinput>gmirror label root /dev/ad[01]s1a</userinput> <co id="gmirror1">
+&prompt.root; <userinput>gmirror label root /dev/ad[01]s1a</userinput> <co id="gmirror1"/>
 &prompt.root; <userinput>gmirror label var /dev/ad[01]s1d</userinput>
 &prompt.root; <userinput>gmirror label usr /dev/ad[01]s1e</userinput>
-&prompt.root; <userinput>gmirror label -F swap /dev/ad[01]s1b</userinput> <co id="gmirror2">
+&prompt.root; <userinput>gmirror label -F swap /dev/ad[01]s1b</userinput> <co id="gmirror2"/>
-&prompt.root; <userinput>newfs /dev/mirror/root</userinput> <co id="newfs">
+&prompt.root; <userinput>newfs /dev/mirror/root</userinput> <co id="newfs"/>
 &prompt.root; <userinput>newfs /dev/mirror/var</userinput>
 &prompt.root; <userinput>newfs /dev/mirror/usr</userinput></screen>
 

en_US.ISO8859-1/articles/serial-uart/article.sgml

@@ -1,9 +1,11 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Serial and UART Tutorial</title>
     
@@ -18,14 +20,16 @@
       </author>
     </authorgroup>
     
-    <pubdate>$FreeBSD$</pubdate>
-    
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.microsoft;
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This article talks about using serial hardware with FreeBSD.</para>
     </abstract>
@@ -1220,9 +1224,9 @@
 		<entry>+0x01</entry>
 		<entry>write/read (DLAB==0)</entry>
 		<entrytbl cols="2">
-		  <colspec colnum="1" colname="col1">
+		  <colspec colnum="1" colname="col1"/>
-		  <colspec colnum="2" colname="col2">
+		  <colspec colnum="2" colname="col2"/>
-		  <spanspec namest="col1" nameend="col2" spanname="1to2">
+		  <spanspec namest="col1" nameend="col2" spanname="1to2"/>
 
 		  <tbody>
 		    <row>
@@ -1304,12 +1308,12 @@
 		<entry>+0x02</entry>
 		<entry>write</entry>
 		<entrytbl cols="4">
-		  <colspec colnum="1" colname="col1">
+		  <colspec colnum="1" colname="col1"/>
-		  <colspec colnum="2" colname="col2">
+		  <colspec colnum="2" colname="col2"/>
-		  <colspec colnum="3" colname="col3">
+		  <colspec colnum="3" colname="col3"/>
-		  <colspec colnum="4" colname="col4">
+		  <colspec colnum="4" colname="col4"/>
-		  <spanspec namest="col1" nameend="col4" spanname="1to4">
+		  <spanspec namest="col1" nameend="col4" spanname="1to4"/>
-		  <spanspec namest="col2" nameend="col4" spanname="2to4">
+		  <spanspec namest="col2" nameend="col4" spanname="2to4"/>
 		   
 		  <tbody>
 		    <row>
@@ -1414,14 +1418,14 @@
 		<entry>+0x02</entry>
 		<entry>read</entry>
 		<entrytbl cols="6">
-		  <colspec colnum="1" colname="col1">
+		  <colspec colnum="1" colname="col1"/>
-		  <colspec colnum="2" colname="col2">
+		  <colspec colnum="2" colname="col2"/>
-		  <colspec colnum="3" colname="col3">
+		  <colspec colnum="3" colname="col3"/>
-		  <colspec colnum="4" colname="col4">
+		  <colspec colnum="4" colname="col4"/>
-		  <colspec colnum="5" colname="col5">
+		  <colspec colnum="5" colname="col5"/>
-		  <colspec colnum="6" colname="col6">
+		  <colspec colnum="6" colname="col6"/>
-		  <spanspec namest="col1" nameend="col6" spanname="1to6">
+		  <spanspec namest="col1" nameend="col6" spanname="1to6"/>
-		  <spanspec namest="col2" nameend="col6" spanname="2to6">
+		  <spanspec namest="col2" nameend="col6" spanname="2to6"/>
 
 		  <tbody>
 		    <row>
@@ -1544,14 +1548,14 @@
 		  <entry>+0x03</entry>
 		  <entry>write/read</entry>
 		  <entrytbl cols="5">
-		    <colspec colnum="1" colname="col1">
+		    <colspec colnum="1" colname="col1"/>
-		    <colspec colnum="2" colname="col2">
+		    <colspec colnum="2" colname="col2"/>
-		    <colspec colnum="3" colname="col3">
+		    <colspec colnum="3" colname="col3"/>
-		    <colspec colnum="4" colname="col4">
+		    <colspec colnum="4" colname="col4"/>
-		    <colspec colnum="5" colname="col5">
+		    <colspec colnum="5" colname="col5"/>
-		    <spanspec namest="col1" nameend="col5" spanname="1to5">
+		    <spanspec namest="col1" nameend="col5" spanname="1to5"/>
-		    <spanspec namest="col2" nameend="col5" spanname="2to5">
+		    <spanspec namest="col2" nameend="col5" spanname="2to5"/>
-		    <spanspec namest="col4" nameend="col5" spanname="4to5">
+		    <spanspec namest="col4" nameend="col5" spanname="4to5"/>
 
 		    <tbody>
 		      <row>
@@ -1674,9 +1678,9 @@
 		  <entry>+0x04</entry>
 		  <entry>write/read</entry>
 		  <entrytbl cols="2">
-		    <colspec colnum="1" colname="col1">
+		    <colspec colnum="1" colname="col1"/>
-		    <colspec colnum="2" colname="col2">
+		    <colspec colnum="2" colname="col2"/>
-		    <spanspec namest="col1" nameend="col2" spanname="1to2">
+		    <spanspec namest="col1" nameend="col2" spanname="1to2"/>
 
 		    <tbody>
 		      <row>
@@ -1748,9 +1752,9 @@
 		  <entry>+0x05</entry>
 		  <entry>write/read</entry>
 		  <entrytbl cols="2">
-		    <colspec colnum="1" colname="col1">
+		    <colspec colnum="1" colname="col1"/>
-		    <colspec colnum="2" colname="col2">
+		    <colspec colnum="2" colname="col2"/>
-		    <spanspec namest="col1" nameend="col2" spanname="1to2">
+		    <spanspec namest="col1" nameend="col2" spanname="1to2"/>
 
 		    <tbody>
 		      <row>
@@ -1829,9 +1833,9 @@
 		  <entry>+0x06</entry>
 		  <entry>write/read</entry>
 		  <entrytbl cols="2">
-		    <colspec colnum="1" colname="col1">
+		    <colspec colnum="1" colname="col1"/>
-		    <colspec colnum="2" colname="col2">
+		    <colspec colnum="2" colname="col2"/>
-		    <spanspec namest="col1" nameend="col2" spanname="1to2">
+		    <spanspec namest="col1" nameend="col2" spanname="1to2"/>
 
 		    <tbody>
 		      <row>

en_US.ISO8859-1/articles/solid-state/article.sgml

@@ -1,3 +1,10 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!-- Copyright (c) 2001 The FreeBSD Documentation Project
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -30,13 +37,7 @@
      $FreeBSD$
 -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<article lang='en'>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-<!ENTITY legalnotice SYSTEM "../../share/sgml/legalnotice.sgml">
-]>
-
-<article>
   <articleinfo>
     <title>&os; and Solid State Devices</title>
 
@@ -51,8 +52,6 @@
       </author>
     </authorgroup>
     
-    <pubdate>$FreeBSD$</pubdate>
-
     <copyright>
       <year>2001</year>
       <year>2009</year>
@@ -65,6 +64,10 @@
     </legalnotice>
 
     &legalnotice;
+
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
     
     <abstract>
       <para>This article covers the use of solid state disk devices in &os;
@@ -170,7 +173,7 @@ pseudo-device   md              # memory disk</programlisting>
       is a read-write filesystem is an important
       distinction, as the <filename>/</filename> partition (and any other
       partitions you may have on your flash media) should be mounted
-      read-only.  Remember that in <xref linkend="intro"> we detailed the
+      read-only.  Remember that in <xref linkend="intro"/> we detailed the
       limitations of flash memory - specifically the limited write capability.
       The importance of not mounting filesystems on flash media read-write,
       and the importance of not using a swap file, cannot be overstated.  A
@@ -194,7 +197,7 @@ pseudo-device   md              # memory disk</programlisting>
       <filename>/etc/rc.d/var</filename> has created.  These are only
       temporary problems though, and are addressed, along with solutions to
       the execution of other common software packages in
-      <xref linkend="strategies">.</para>
+      <xref linkend="strategies"/>.</para>
 
     <para>An important thing to remember is that a filesystem that was mounted
       read-only with <filename>/etc/fstab</filename> can be made read-write at
@@ -333,7 +336,7 @@ pseudo-device   md              # memory disk</programlisting>
   <sect1 id="strategies">
     <title>System Strategies for Small and Read Only Environments</title>
 
-    <para>In <xref linkend="ro-fs">, it was pointed out that the
+    <para>In <xref linkend="ro-fs"/>, it was pointed out that the
       <filename>/var</filename> filesystem constructed by
       <filename>/etc/rc.d/var</filename> and the presence of a read-only
       root filesystem causes problems with many common software packages used
@@ -389,7 +392,7 @@ pseudo-device   md              # memory disk</programlisting>
 	ports tree, a reminder is necessary regarding the read-only nature of
 	your filesystems on the flash media.  Since they are read-only, you
 	will need to temporarily mount them read-write using the mount syntax
-	shown in <xref linkend="ro-fs">.  You should always remount those
+	shown in <xref linkend="ro-fs"/>.  You should always remount those
 	filesystems read-only when you are done with any maintenance -
 	unnecessary writes to the flash media could considerably shorten its
 	lifespan.</para>

en_US.ISO8859-1/articles/storage-devices/article.sgml

@@ -1,9 +1,11 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-%articles.ent;
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
-<article>
+<article lang='en'>
   <articleinfo>
     <title>Storage Devices</title>
     
@@ -18,14 +20,15 @@
       </author>
     </authorgroup>
     
-    <pubdate>$FreeBSD$</pubdate>
-    
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>This article talks about storage devices with FreeBSD.</para>
     </abstract>

en_US.ISO8859-1/articles/version-guide/article.sgml

@@ -1,17 +1,12 @@
-<!--
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-     The FreeBSD Documentation Project
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
--->
+	"../../../share/sgml/freebsd42.dtd" [
-
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+%entities;
 <!ENTITY % freebsd.urls.absolute "INCLUDE">
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-<!--
-<!ENTITY art.re.pkgs '<ulink url="&url.articles.releng-packages;/article.html">The Release Engineering of Third Party Packages</ulink>'>
--->
 ]>
 
-<article>
+<article lang='en'>
   <title>Choosing the FreeBSD Version That Is Right For You</title>
  
   <articleinfo>
@@ -21,8 +16,6 @@
       </author>
     </authorgroup>
   
-    <pubdate>$FreeBSD$</pubdate>
-  
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
     </legalnotice>
@@ -31,6 +24,10 @@
       <year>2005</year>
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
+
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
   
     <abstract>
       <para>So you have chosen to install &os;.  Welcome!  This

en_US.ISO8859-1/articles/vinum/article.sgml

@@ -1,14 +1,15 @@
-<!-- $FreeBSD$ -->
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!-- FreeBSD Documentation Project -->
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-
+	"../../../share/sgml/freebsd42.dtd" [
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%entities;
-%articles.ent;
-
 <!ENTITY vinum.ap "<application>Vinum</application>">
 ]>
 
-<article>
+<!-- $FreeBSD$ -->
+<!-- FreeBSD Documentation Project -->
+
+<article lang='en'>
   <articleinfo>
     <title>
       Bootstrapping Vinum: A Foundation for Reliable Servers
@@ -21,8 +22,10 @@
       <year>2001</year>
       <holder>Robert A. Van Valzah</holder>
     </copyright>
-    <pubdate>$Date: 2012-03-20 08:56:30 $ GMT</pubdate>
+
-    <releaseinfo>$Id: article.sgml,v 1.17 2012-03-20 08:56:30 pluknet Exp $</releaseinfo>
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.general;
@@ -117,7 +120,7 @@
 
       <para><application>Vinum</application>
 	defines a hierarchy of four objects that it uses to manage storage
-	(see <xref linkend="arch">).
+	(see <xref linkend="arch"/>).
 	Different combinations of these objects are used to achieve
 	failure resilience, performance, and/or extra capacity.
 	I will give a whirlwind tour of the objects here--see the
@@ -129,7 +132,7 @@
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="arch" format="EPS">
+	    <imagedata fileref="arch" format="EPS"/>
 	  </imageobject>
 
 	  <textobject>
@@ -205,12 +208,12 @@
 	can manage any number of spindles,
 	I will only cover scenarios with two spindles here
 	for simplification.
-	See <xref linkend=OrgCompare> to see how
+	See <xref linkend="OrgCompare"/> to see how
 	two spindles organized with <application>Vinum</application>
 	compare to two spindles without <application>Vinum</application>.</para>
 
       <para>
-	<table id=OrgCompare frame=all>
+	<table id="OrgCompare" frame="all">
 	  <title>Characteristics of Two Spindles Organized with Vinum</title>
 
 	  <tgroup cols="5">
@@ -250,7 +253,7 @@
 	</table>
       </para>
 
-      <para><xref linkend=OrgCompare> shows that striping yields
+      <para><xref linkend="OrgCompare"/> shows that striping yields
 	the same capacity and lack of failure resilience
 	as concatenation, but it has better peak read and write performance.
 	Hence we will not be using concatenation in any of the examples here.
@@ -440,7 +443,7 @@
 	mode so there is as little production impact
 	from failures as possible.</para>
 
-      <para>I give the instructions in <xref linkend=Failures> needed to
+      <para>I give the instructions in <xref linkend="Failures"/> needed to
 	configure the server for degraded mode operation
 	in those cases where <application>Vinum</application>
 	cannot do it automatically.
@@ -455,7 +458,7 @@
 	a failure even when your hardware is working well.
 	Even a minimum <application>Vinum</application>
 	system as described in
-	<xref linkend="HW">
+	<xref linkend="HW"/>
 	below can be a good place to experiment with
 	recovery techniques without impacting production equipment.</para>
     </section>
@@ -869,7 +872,7 @@
 
 	</section>
 
-	<section id=AssignSmall>
+	<section id="AssignSmall">
 	  <title>Assigning Partitions on the Root Spindle</title>
 
 	  <para>We will allocate 200,000 blocks (about 93 MB)
@@ -907,10 +910,10 @@
 	    for <filename>/home</filename>, and the remaining
 	    2,724,408 blocks (about 1,330 MB) for
 	    <filename>/usr</filename>.
-	    See <xref linkend=ad0b4aft> below to see this graphically.</para>
+	    See <xref linkend="ad0b4aft"/> below to see this graphically.</para>
 
 	  <para>The left-hand side of
-	    <xref linkend="ad0b4aft"> below shows what spindle ad0 will
+	    <xref linkend="ad0b4aft"/> below shows what spindle ad0 will
 	    look like at the end of phase 2.
 	    The right-hand side shows what it will look like at the
 	    end of phase 3.</para>
@@ -920,27 +923,27 @@
 
 	    <mediaobject>
 	      <imageobject>
-		<imagedata fileref="ad0b4aft" format="EPS">
+		<imagedata fileref="ad0b4aft" format="EPS"/>
 	      </imageobject>
 
 	      <textobject>
 		<literallayout class="monospaced">    ad0 Before Vinum    Offset (blocks)    ad0 After Vinum
-+----------------------+ <--      0--> +----------------------+
++----------------------+ &lt;--      0--&gt; +----------------------+
 |        root          |               |        root          |
 |     /dev/ad0s1a      |               |     /dev/ad0s1a      |
-+----------------------+ <-- 200000--> +----------------------+
++----------------------+ &lt;-- 200000--&gt; +----------------------+
 |        swap          |               |        swap          |
 |     /dev/ad0s1b      |               |     /dev/ad0s1b      |
-|                      |     400000--> +----------------------+
+|                      |     400000--&gt; +----------------------+
 |                      |               | Vinum drive YouCrazy |
 |                      |               |     /dev/ad0s1h      |
-+----------------------+ <-- 400265--> +-----------------+    |
++----------------------+ &lt;-- 400265--&gt; +-----------------+    |
 |        /home         |               |    Vinum sd     |    |
 |     /dev/ad0s1e      |               |    home.p0.s0   |    |
-+----------------------+ <--1400265--> +-----------------+    |
++----------------------+ &lt;--1400265--&gt; +-----------------+    |
 |        /usr          |               |    Vinum sd     |    |
 |     /dev/ad0s1f      |               |    usr.p0.s0    |    |
-+----------------------+ <--4124673--> +-----------------+----+
++----------------------+ &lt;--4124673--&gt; +-----------------+----+
 Not to scale</literallayout>
 	      </textobject>
 
@@ -952,7 +955,7 @@ Not to scale</literallayout>
 
 	</section>
 
-	<section id=AssignLarge>
+	<section id="AssignLarge">
 	  <title>Assigning Partitions on the Rootback Spindle</title>
 
 	  <para>The <filename>/rootback</filename> and swap partition sizes
@@ -965,10 +968,10 @@ Not to scale</literallayout>
 	    the root spindle.
 	    That will leave an extra 2 GB or so that we can deal
 	    with later.
-	    See <xref linkend=ad2b4aft> below to see this graphically.</para>
+	    See <xref linkend="ad2b4aft"/> below to see this graphically.</para>
 
 	  <para>The left-hand side of
-	    <xref linkend="ad2b4aft"> below shows what spindle ad2 will
+	    <xref linkend="ad2b4aft"/> below shows what spindle ad2 will
 	    look like at the beginning of phase 4.
 	    The right-hand side shows what it will look like at the end.</para>
 
@@ -977,30 +980,30 @@ Not to scale</literallayout>
 
 	    <mediaobject>
 	      <imageobject>
-		<imagedata fileref="ad2b4aft" format="EPS">
+		<imagedata fileref="ad2b4aft" format="EPS"/>
 	      </imageobject>
 
 	      <textobject>
 		<literallayout class="monospaced">    ad2 Before Vinum    Offset (blocks)    ad2 After Vinum
-+----------------------+ <--      0--> +----------------------+
++----------------------+ &lt;--      0--&gt; +----------------------+
 |      /rootback       |               |      /rootback       |
 |     /dev/ad2s1e      |               |     /dev/ad2s1a      |
-+----------------------+ <-- 200000--> +----------------------+
++----------------------+ &lt;-- 200000--&gt; +----------------------+
 |        swap          |               |        swap          |
 |     /dev/ad2s1b      |               |     /dev/ad2s1b      |
-|                      |     400000--> +----------------------+
+|                      |     400000--&gt; +----------------------+
 |                      |               | Vinum drive UpWindow |
 |                      |               |     /dev/ad2s1h      |
-+----------------------+ <-- 400265--> +-----------------+    |
++----------------------+ &lt;-- 400265--&gt; +-----------------+    |
 |      /NOFUTURE       |               |    Vinum sd     |    |
 |     /dev/ad2s1f      |               |    home.p1.s0   |    |
-|                      |    1400265--> +-----------------+    |
+|                      |    1400265--&gt; +-----------------+    |
 |                      |               |    Vinum sd     |    |
 |                      |               |    usr.p1.s0    |    |
-|                      |    4124673--> +-----------------+    |
+|                      |    4124673--&gt; +-----------------+    |
 |                      |               |    Vinum sd     |    |
 |                      |               |    hope.p0.s0   |    |
-+----------------------+ <--8420769--> +-----------------+----+
++----------------------+ &lt;--8420769--&gt; +-----------------+----+
 Not to scale</literallayout>
 	      </textobject>
 
@@ -1012,11 +1015,11 @@ Not to scale</literallayout>
 
 	</section>
 
-	<section id=floppy>
+	<section id="floppy">
 	  <title>Preparation of Tools</title>
 
 	  <para>The <literal>bootvinum</literal> Perl script given below in
-	    <xref linkend=Perl> will make the
+	    <xref linkend="Perl"/> will make the
 	    <application>Vinum</application> bootstrapping process much
 	    easier if you can run it on the machine being bootstrapped.
 	    It is over 200 lines and you would not want to type it in.
@@ -1069,7 +1072,7 @@ Not to scale</literallayout>
 
 	  <step>
 	    <para>Partition the root spindle with appropriate block
-	      allocations as described above in <xref linkend=AssignSmall>.
+	      allocations as described above in <xref linkend="AssignSmall"/>.
 	      For this example on a 2 GB spindle, I will use
 	      200,000 blocks for root, 200,265 blocks for swap,
 	      1,000,000 blocks for <filename>/home</filename>, and 
@@ -1091,7 +1094,7 @@ Not to scale</literallayout>
 
 	  <step>
 	    <para>Partition the rootback spindle with the appropriate block
-	      allocations as described above in <xref linkend=AssignLarge>.
+	      allocations as described above in <xref linkend="AssignLarge"/>.
 	      For this example on a 4 GB spindle, I will use
 	      200,000 blocks for <filename>/rootback</filename>,
 	      200,265 blocks for swap, and
@@ -1112,7 +1115,7 @@ Not to scale</literallayout>
 		Mount point names beginning with <literal>NOFUTURE</literal>
 		and <literal>rootback</literal>
 		serve as sentinels to the bootstrapping
-		script presented in <xref linkend=Perl> below.</para></note>
+		script presented in <xref linkend="Perl"/> below.</para></note>
 	  </step>
 
 	  <step>
@@ -1138,8 +1141,8 @@ Not to scale</literallayout>
 	  </step>
 	</procedure>
 
-	<para>The left-hand side of <xref linkend=ad0b4aft> above
+	<para>The left-hand side of <xref linkend="ad0b4aft"/> above
-	  and the left-hand side of <xref linkend=ad2b4aft> above
+	  and the left-hand side of <xref linkend="ad2b4aft"/> above
 	  show how the disks will look at this point.</para>
       </section>
     </section>
@@ -1188,7 +1191,7 @@ Not to scale</literallayout>
 	      floppy disk, tape, network, or any convenient means and
 	      then run it.
 	      (If you cannot get this script copied onto the machine being
-	      bootstrapped, then see <xref linkend=ManualBoot>
+	      bootstrapped, then see <xref linkend="ManualBoot"/>
 	      below for a manual alternative.)</para>
 
 	    <screen>&prompt.root; <userinput>cp /mnt/bootvinum .</userinput>
@@ -1539,8 +1542,8 @@ expected next file 492, got 491</screen>
 	</procedure>
 
 	<para>At this point, the reliable server foundation is complete.
-	  The right-hand side of <xref linkend=ad0b4aft> above
+	  The right-hand side of <xref linkend="ad0b4aft"/> above
-	  and the right-hand side of <xref linkend=ad2b4aft> above
+	  and the right-hand side of <xref linkend="ad2b4aft"/> above
 	  show how the disks will look.</para>
 
 	<para>You may want to do a quick reboot to multi-user and give it
@@ -1738,7 +1741,7 @@ ok <userinput>boot -as</userinput></screen>
 	      bad root filesystem.</para>
 
 	    <tip>
-	      <para>If you used the <literal>bootvinum</literal> Perl script from <xref linkend=Perl>
+	      <para>If you used the <literal>bootvinum</literal> Perl script from <xref linkend="Perl"/>
 		below, then these commands should configure your server for
 		degraded mode.</para>
 
@@ -1810,7 +1813,7 @@ ok <userinput>boot -as</userinput></screen>
 
 	<para>This kind of failure can be simulated by shutting down to
 	  single-user mode and then booting as shown above in 
-	  <xref linkend=enter1>.</para>
+	  <xref linkend="enter1"/>.</para>
       </section>
     </section>
 
@@ -1840,7 +1843,7 @@ ok <userinput>boot -s</userinput></screen>
 	  <step>
 	    <para>Change
 	      <filename>/etc/fstab</filename> to avoid the bad drive.
-	      If you used the <literal>bootvinum</literal> Perl script from <xref linkend=Perl>
+	      If you used the <literal>bootvinum</literal> Perl script from <xref linkend="Perl"/>
 	      below, then
 	      these commands should configure your server for
 	      degraded mode.</para>
@@ -1868,7 +1871,7 @@ ok <userinput>boot -s</userinput></screen>
 	</procedure>
       </section>
 
-      <section id=ad2Recov>
+      <section id="ad2Recov">
 	<title>Recovery</title>
 	<procedure>
 
@@ -2065,7 +2068,7 @@ ok <userinput>boot -s</userinput></screen>
 	install <filename>/etc/fstab_only_have_ad2s1</filename> as
 	<filename>/etc/fstab</filename>.
 	You would then have to adapt the <filename>/dev/ad2</filename>
-	failure recovery instructions from <xref linkend=ad2Recov> above.</para>
+	failure recovery instructions from <xref linkend="ad2Recov"/> above.</para>
 
       <para>If your BIOS can only boot from drive one, then you will have to
 	unplug drive <literal>YouCrazy</literal> from the controller for
@@ -2073,7 +2076,7 @@ ok <userinput>boot -s</userinput></screen>
 	into the controller for <devicename>/dev/ad0</devicename>.
 	Then continue with the instructions for
 	<devicename>/dev/ad2</devicename> failure recovery
-	in <xref linkend=ad2Recov> above.</para>
+	in <xref linkend="ad2Recov"/> above.</para>
     </section>
   </section>
 
@@ -2154,7 +2157,7 @@ while (&lt;FSIN>) {
     next;
   }
   # Move non-root filesystems on smallest spindle into Vinum
-  if (defined($rsp) && $dev =~ /^\/dev\/$rsp/ && $dev =~ /[d-h]$/) {
+  if (defined($rsp) &amp;&amp; $dev =~ /^\/dev\/$rsp/ &amp;&amp; $dev =~ /[d-h]$/) {
     $pass = $nxtpas++;
     print FSOUT "/dev/vinum$mnt\t\t$mnt\t\t$fstyp\t$opt\t\t$dump\t$pass\n";
     $vols{$dev}->{mnt} = substr($mnt, 1);
@@ -2177,12 +2180,12 @@ die("Didn't find a /rootback partition!\n") if !defined($rbsp);
 my @DM = (
   { cm1 => "When we only have $rsp, comment out lines using $rbsp",
     fn  => "/etc/fstab_only_have_$rsp",
-    xpr => "s:^/dev/$rbsp:#\$&:",
+    xpr => "s:^/dev/$rbsp:#\$&amp;:",
   },
   { cm1 => "When we only have $rbsp, comment out lines using $rsp and",
     cm2 => "rootback becomes root",
     fn  => "/etc/fstab_only_have_$rbsp",
-    xpr => "s:^/dev/$rsp:#\$&: || s:/rootback:/\t:",
+    xpr => "s:^/dev/$rsp:#\$&amp;: || s:/rootback:/\t:",
   },
   { cm1 => "When only $rsp root is bad, /rootback becomes root and",
     cm2 => "root becomes /rootbad",
@@ -2236,20 +2239,20 @@ foreach my $i (0..$#spndl) {
     print DLB4 $_;
     my ($part, $siz, $off, $fstyp, $fsiz, $bsiz, $bps) = split;
 
-    if ($part && $part eq 'a:' && $spndl[$i] eq $rsp) {
+    if ($part &amp;&amp; $part eq 'a:' &amp;&amp; $spndl[$i] eq $rsp) {
 	$rootsiz = $siz;
     }
-    if ($part && $part eq 'e:' && $spndl[$i] eq $rbsp) {
+    if ($part &amp;&amp; $part eq 'e:' &amp;&amp; $spndl[$i] eq $rbsp) {
       if ($rootsiz != $siz) {
 	die("Rootback size ($siz) != root size ($rootsiz)\n");
       }
     }
-    if ($part && $part eq 'c:') {
+    if ($part &amp;&amp; $part eq 'c:') {
       $rspsiz  = $siz if $spndl[$i] eq $rsp;
       $rbspsiz = $siz if $spndl[$i] eq $rbsp;
     }
     # Make swap partition $cfgsiz sectors smaller
-    if ($part && $part eq 'b:') {
+    if ($part &amp;&amp; $part eq 'b:') {
       if ($spndl[$i] eq $rsp) {
 	$swapsiz = $siz;
       } else {
@@ -2262,14 +2265,14 @@ foreach my $i (0..$#spndl) {
       next;
     }
     # Move rootback spindle e partitions to a
-    if ($part && $part eq 'e:' && $spndl[$i] eq $rbsp) {
+    if ($part &amp;&amp; $part eq 'e:' &amp;&amp; $spndl[$i] eq $rbsp) {
       printf DLOUT "%4s%9d%9d%10s%9d%6d%6d\n", 'a:', $siz, $off, $fstyp,
 	$fsiz, $bsiz, $bps;
       next;
     }
     # Delete non-root, non-swap, non-c partitions but note their minimum
     # offset and total size that're needed below.
-    if ($part && $part =~ /^[d-h]:$/) {
+    if ($part &amp;&amp; $part =~ /^[d-h]:$/) {
       $minoff = $off unless $minoff;
       $minoff = $off if $off &lt; $minoff;
       $totsiz += $siz;
@@ -2319,10 +2322,10 @@ EOF
 }</programlisting>
   </appendix>
 
-  <appendix id=ManualBoot>
+  <appendix id="ManualBoot">
     <title>Manual Vinum Bootstrapping</title>
 
-    <para>The <literal>bootvinum</literal> Perl script in <xref linkend=Perl> makes life easier, but
+    <para>The <literal>bootvinum</literal> Perl script in <xref linkend="Perl"/> makes life easier, but
       it may be necessary to manually perform some or all of the steps that
       it automates.
       This appendix describes how you would manually mimic the script.</para>

en_US.ISO8859-1/articles/vm-design/article.sgml

@@ -1,12 +1,14 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!-- $FreeBSD$ -->
 <!-- FreeBSD Documentation Project -->
 
-<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<article lang='en'>
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
-
-<article>
   <articleinfo>
     <title>Design elements of the &os; VM system</title>
 
@@ -32,6 +34,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>The title is really just a fancy way of saying that I am going to
 	attempt to describe the whole VM enchilada, hopefully in a way that
@@ -182,7 +188,7 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="fig1" format="EPS">
+        <imagedata fileref="fig1" format="EPS"/>
       </imageobject>
 	
       <textobject>
@@ -204,7 +210,7 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="fig2" format="EPS">
+        <imagedata fileref="fig2" format="EPS"/>
       </imageobject>
 
       <textobject>
@@ -224,7 +230,7 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="fig3" format="EPS">
+        <imagedata fileref="fig3" format="EPS"/>
       </imageobject>
       
       <textobject>
@@ -254,7 +260,7 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="fig4" format="EPS">
+        <imagedata fileref="fig4" format="EPS"/>
       </imageobject>
 
       <textobject>

en_US.ISO8859-1/articles/wp-toolbox/article.sgml

@@ -1,20 +1,16 @@
-<!--
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-     The FreeBSD Documentation Project
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
--->
+	"../../../share/sgml/freebsd42.dtd" [
-
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+%entities;
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-
 <!ENTITY ports		"Ports Collection">
 <!ENTITY os.ports	"&os; &ports;">
 <!ENTITY frisbee	"<application>Frisbee</application>">
 <!ENTITY ghost		"<application>Ghost</application>">
 <!ENTITY nessus		"<application>Nessus</application>">
-
 ]>
 
-<article>
+<article lang='en'>
   <title>Creating a Software Testing Environment Using &os;</title>
   <articleinfo>
 
@@ -28,8 +24,6 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.cvsup;
@@ -39,6 +33,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract><para>A slightly altered version of this paper was first
       published in the Pacific Northwest Software Quality Conference
       Proceedings, 2005.</para></abstract>

en_US.ISO8859-1/articles/zip-drive/article.sgml

@@ -1,11 +1,13 @@
-<!-- $FreeBSD$ -->
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+	"../../../share/sgml/freebsd42.dtd" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
-%articles.ent;
+%entities;
 ]>
 
-<article>
+<!-- $FreeBSD$ -->
+
+<article lang='en'>
   <articleinfo>
     <title>&iomegazip; Drives</title>
 
@@ -28,6 +30,10 @@
       &tm-attrib.opengroup;
       &tm-attrib.general;
     </legalnotice>
+
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
   </articleinfo>
 
   <sect1>
@@ -229,7 +235,7 @@
 
 	<screen>&prompt.root; <userinput>/usr/sbin/config MYKERNEL</userinput>
 &prompt.root; <userinput>cd ../../compile/MYKERNEL</userinput>
-&prompt.root; <userinput>make clean depend && make all install</userinput></screen>
+&prompt.root; <userinput>make clean depend &amp;&amp; make all install</userinput></screen>
       </listitem>
     </orderedlist>