18 files changed, 88 insertions, 88 deletions

diff --git a/en_US.ISO8859-1/articles/dialup-firewall/article.sgml b/en_US.ISO8859-1/articles/dialup-firewall/article.sgml
index 2916c685b7..c76119415a 100644
--- a/en_US.ISO8859-1/articles/dialup-firewall/article.sgml
+++ b/en_US.ISO8859-1/articles/dialup-firewall/article.sgml
@@ -1,16 +1,16 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/articles/dialup-firewall/article.sgml,v 1.5 2001/01/18 23:43:31 dannyboy Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/articles/dialup-firewall/article.sgml,v 1.6 2001/02/27 12:45:43 jesusr Exp $
 -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
 ]>
 
 <article>
-  <artheader>
+  <articleinfo>
     <title>Dialup firewalling with FreeBSD</title>
 
     <authorgroup>
@@ -24,7 +24,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$Date: 2001-02-27 12:45:43 $</pubdate>
+    <pubdate>$Date: 2001-04-17 15:53:37 $</pubdate>
 
     <abstract>
       <para>This article documents how to setup a firewall using a PPP
@@ -32,7 +32,7 @@
 	a dialup with a dynamically assigned IP address.  This document does
 	not cover setting up your PPP connection in the first place.</para>
     </abstract>
-  </artheader>
+  </articleinfo>
 
   <sect1 id="preface">
     <title>Preface</title>
diff --git a/en_US.ISO8859-1/articles/diskless-x/article.sgml b/en_US.ISO8859-1/articles/diskless-x/article.sgml
index 1ca1a15061..692ea3367f 100644
--- a/en_US.ISO8859-1/articles/diskless-x/article.sgml
+++ b/en_US.ISO8859-1/articles/diskless-x/article.sgml
@@ -1,17 +1,17 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/articles/diskless-x/article.sgml,v 1.2 1999/09/06 06:52:36 peter Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/articles/diskless-x/article.sgml,v 1.3 1999/11/15 22:55:44 phantom Exp $
 -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
 ]>
 
 <article>
-  <artheader>
+  <articleinfo>
     <title>Diskless X Server: a how to guide</title>
     
     <authorgroup>
@@ -49,7 +49,7 @@
       <para>I am sure that there is stuff that needs to be added
 	to this.  Please send me any comments.</para>
     </abstract>
-  </artheader>
+  </articleinfo>
   
   <sect1>
     <title>Creating the boot floppy (On the diskless system)</title>
diff --git a/en_US.ISO8859-1/articles/fonts/article.sgml b/en_US.ISO8859-1/articles/fonts/article.sgml
index d737fedd50..a15a3ef658 100644
--- a/en_US.ISO8859-1/articles/fonts/article.sgml
+++ b/en_US.ISO8859-1/articles/fonts/article.sgml
@@ -1,6 +1,6 @@
-<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/fonts/article.sgml,v 1.12 2001/04/09 09:50:32 murray Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/fonts/article.sgml,v 1.13 2001/04/09 09:59:33 murray Exp $ -->
 <!-- The FreeBSD Documentation Project -->
-<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN" [
+<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
 ]>
@@ -28,7 +28,7 @@
  -->
 
 <article>
-  <artheader>
+  <articleinfo>
     <title>Fonts and FreeBSD</title>
 
     <subtitle>A Tutorial</subtitle>
@@ -56,7 +56,7 @@
 	for switching the syscons display to 80x60 mode, and for using
 	type 1 fonts with the above application programs.</para>
     </abstract>
-  </artheader>
+  </articleinfo>
 
   <sect1>
     <title>Introduction</title>
diff --git a/en_US.ISO8859-1/articles/formatting-media/article.sgml b/en_US.ISO8859-1/articles/formatting-media/article.sgml
index 6708d35396..c6854498eb 100644
--- a/en_US.ISO8859-1/articles/formatting-media/article.sgml
+++ b/en_US.ISO8859-1/articles/formatting-media/article.sgml
@@ -1,10 +1,10 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
 ]>
-<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/formatting-media/article.sgml,v 1.13 1999/10/30 18:10:14 dwhite Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/formatting-media/article.sgml,v 1.14 2000/07/26 18:24:38 jim Exp $ -->
 <article>
-  <artheader>
+  <articleinfo>
     <title>Formatting Media For Use With FreeBSD 2.2-RELEASE</title>
 
     <subtitle>A Tutorial</subtitle>
@@ -31,7 +31,7 @@
 	FreeBSD.  The examples given have been tested under FreeBSD
 	2.2-GAMMA and may work for other releases.</para>
     </abstract>
-  </artheader>
+  </articleinfo>
 
   <sect1>
     <title>Introduction & Definitions</title>
diff --git a/en_US.ISO8859-1/articles/mh/article.sgml b/en_US.ISO8859-1/articles/mh/article.sgml
index fef11739c2..27ff6c8651 100644
--- a/en_US.ISO8859-1/articles/mh/article.sgml
+++ b/en_US.ISO8859-1/articles/mh/article.sgml
@@ -1,9 +1,9 @@
-<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/mh/article.sgml,v 1.7 1999/10/10 20:20:38 jhb Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/mh/article.sgml,v 1.8 2000/07/26 18:24:49 jim Exp $ -->
 <!-- FreeBSD Documentation Project -->
 
-<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN">
+<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN">
 <article>
-  <artheader>
+  <articleinfo>
     <title>An MH Primer</title>
 
     <authorgroup>
@@ -26,7 +26,7 @@
       <para>This document contains an introduction to using MH on
 	FreeBSD</para>
     </abstract>
-  </artheader>
+  </articleinfo>
 
   <sect1 id="mhintro">
     <title>Introduction</title>
diff --git a/en_US.ISO8859-1/articles/multi-os/article.sgml b/en_US.ISO8859-1/articles/multi-os/article.sgml
index f7ee999f88..63394e6f5f 100644
--- a/en_US.ISO8859-1/articles/multi-os/article.sgml
+++ b/en_US.ISO8859-1/articles/multi-os/article.sgml
@@ -1,7 +1,7 @@
-<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/multi-os/article.sgml,v 1.12 2000/05/30 22:48:47 nik Exp $ -->
-<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN">
+<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/multi-os/article.sgml,v 1.13 2000/07/26 18:24:49 jim Exp $ -->
+<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN">
 <article>
-  <artheader>
+  <articleinfo>
     <title>Installing and Using FreeBSD With Other Operating Systems</title>
 
     <authorgroup>
@@ -28,7 +28,7 @@
 	<email>rhh@ct.picker.com</email>, and Jordan K. Hubbard
 	<email>jkh@time.cdrom.com</email></para>
     </abstract>
-  </artheader>
+  </articleinfo>
 
   <sect1>
     <title>Overview</title>
diff --git a/en_US.ISO8859-1/articles/new-users/article.sgml b/en_US.ISO8859-1/articles/new-users/article.sgml
index 78b47e6677..92a862ed06 100644
--- a/en_US.ISO8859-1/articles/new-users/article.sgml
+++ b/en_US.ISO8859-1/articles/new-users/article.sgml
@@ -1,9 +1,9 @@
-<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/new-users/article.sgml,v 1.16 2000/11/21 13:46:23 ben Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/new-users/article.sgml,v 1.17 2001/04/09 00:33:41 dd Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
-<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN">
+<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN">
 <article>
-  <artheader>
+  <articleinfo>
     <title>For People New to Both FreeBSD and Unix</title>
 
     <authorgroup>
@@ -29,13 +29,13 @@
 	(you)&mdash;and you're probably pretty good with DOS/Windows
 	or OS/2.</para>
     </abstract>
-  </artheader>
+  </articleinfo>
 
   <sect1>
     <title>Logging in and Getting Out</title>
 
-    <para>Log in (when you see <systemitem
-	class=prompt>login:</systemitem>) as a user you created during
+    <para>Log in (when you see <prompt
+	>login:</prompt>) as a user you created during
       installation or as <firstterm>root</firstterm>.  (Your FreeBSD
       installation will already have an account for root; root can go
       anywhere and do anything, including deleting essential files, so
@@ -43,8 +43,8 @@
       prompt (yours may be different), with &prompt.user; indicating an ordinary
       user and &prompt.root; indicating root.</para>
 
-    <para>To log out (and get a new <systemitem
-	class=prompt>login:</systemitem> prompt) type</para>
+    <para>To log out (and get a new <prompt
+	>login:</prompt> prompt) type</para>
 
     <informalexample>
       <screen>&prompt.root; <userinput>exit</userinput>
diff --git a/en_US.ISO8859-1/articles/programming-tools/article.sgml b/en_US.ISO8859-1/articles/programming-tools/article.sgml
index e0c0a9c99d..eabcea2da8 100644
--- a/en_US.ISO8859-1/articles/programming-tools/article.sgml
+++ b/en_US.ISO8859-1/articles/programming-tools/article.sgml
@@ -1,9 +1,9 @@
-<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/programming-tools/article.sgml,v 1.13 2000/08/22 20:03:31 marko Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/programming-tools/article.sgml,v 1.14 2001/04/09 00:33:41 dd Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
-<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN">
+<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN">
 <article>
-  <artheader>
+  <articleinfo>
     <title>A User's Guide to FreeBSD Programming Tools</title>
 
     <authorgroup>
@@ -36,7 +36,7 @@
 	programming knowledge, although it is hoped that most
 	programmers will find something of value in it</para>
     </abstract>
-  </artheader>
+  </articleinfo>
 
   <sect1>
     <title>Introduction<anchor id=foo></title>
@@ -784,8 +784,8 @@ int main() {
 	      it to.  Either type <command>./foobar</command>, which
 	      means <quote>run the file called
 		<filename>foobar</filename> in the current
-		directory</quote>, or change your <systemitem
-		class=environvar>PATH</systemitem> environment
+		directory</quote>, or change your <envar
+		>PATH</envar> environment
 	      variable so that it looks something like</para>
 
 	    <informalexample>
@@ -1819,8 +1819,8 @@ else if (pid == 0) {		/* child */
 	    Emacs!
 
 	    <footnote>
-	      <para>Many Emacs users set their <systemitem
-		  class=environvar>EDITOR</systemitem> environment to
+	      <para>Many Emacs users set their <envar
+		  >EDITOR</envar> environment to
 		<literal>emacsclient</literal> so this happens every
 		time they need to edit a file.</para>
 	    </footnote></para>
diff --git a/en_US.ISO8859-1/articles/zip-drive/article.sgml b/en_US.ISO8859-1/articles/zip-drive/article.sgml
index 3a2fe2db78..4e1aeeacaa 100644
--- a/en_US.ISO8859-1/articles/zip-drive/article.sgml
+++ b/en_US.ISO8859-1/articles/zip-drive/article.sgml
@@ -1,12 +1,12 @@
 <!-- $FreeBSD -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
 ]>
 
 <article>
-  <artheader>
+  <articleinfo>
     <title>ZIP Drives</title>
 
     <authorgroup>
@@ -19,7 +19,7 @@
 	</affiliation>
       </author>
     </authorgroup>
-  </artheader>
+  </articleinfo>
 
   <sect1>
     <title>ZIP Drive Basics</title>
diff --git a/en_US.ISO_8859-1/articles/dialup-firewall/article.sgml b/en_US.ISO_8859-1/articles/dialup-firewall/article.sgml
index 2916c685b7..c76119415a 100644
--- a/en_US.ISO_8859-1/articles/dialup-firewall/article.sgml
+++ b/en_US.ISO_8859-1/articles/dialup-firewall/article.sgml
@@ -1,16 +1,16 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/articles/dialup-firewall/article.sgml,v 1.5 2001/01/18 23:43:31 dannyboy Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/articles/dialup-firewall/article.sgml,v 1.6 2001/02/27 12:45:43 jesusr Exp $
 -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
 ]>
 
 <article>
-  <artheader>
+  <articleinfo>
     <title>Dialup firewalling with FreeBSD</title>
 
     <authorgroup>
@@ -24,7 +24,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$Date: 2001-02-27 12:45:43 $</pubdate>
+    <pubdate>$Date: 2001-04-17 15:53:37 $</pubdate>
 
     <abstract>
       <para>This article documents how to setup a firewall using a PPP
@@ -32,7 +32,7 @@
 	a dialup with a dynamically assigned IP address.  This document does
 	not cover setting up your PPP connection in the first place.</para>
     </abstract>
-  </artheader>
+  </articleinfo>
 
   <sect1 id="preface">
     <title>Preface</title>
diff --git a/en_US.ISO_8859-1/articles/diskless-x/article.sgml b/en_US.ISO_8859-1/articles/diskless-x/article.sgml
index 1ca1a15061..692ea3367f 100644
--- a/en_US.ISO_8859-1/articles/diskless-x/article.sgml
+++ b/en_US.ISO_8859-1/articles/diskless-x/article.sgml
@@ -1,17 +1,17 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/articles/diskless-x/article.sgml,v 1.2 1999/09/06 06:52:36 peter Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/articles/diskless-x/article.sgml,v 1.3 1999/11/15 22:55:44 phantom Exp $
 -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
 ]>
 
 <article>
-  <artheader>
+  <articleinfo>
     <title>Diskless X Server: a how to guide</title>
     
     <authorgroup>
@@ -49,7 +49,7 @@
       <para>I am sure that there is stuff that needs to be added
 	to this.  Please send me any comments.</para>
     </abstract>
-  </artheader>
+  </articleinfo>
   
   <sect1>
     <title>Creating the boot floppy (On the diskless system)</title>
diff --git a/en_US.ISO_8859-1/articles/fonts/article.sgml b/en_US.ISO_8859-1/articles/fonts/article.sgml
index d737fedd50..a15a3ef658 100644
--- a/en_US.ISO_8859-1/articles/fonts/article.sgml
+++ b/en_US.ISO_8859-1/articles/fonts/article.sgml
@@ -1,6 +1,6 @@
-<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/fonts/article.sgml,v 1.12 2001/04/09 09:50:32 murray Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/fonts/article.sgml,v 1.13 2001/04/09 09:59:33 murray Exp $ -->
 <!-- The FreeBSD Documentation Project -->
-<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN" [
+<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
 ]>
@@ -28,7 +28,7 @@
  -->
 
 <article>
-  <artheader>
+  <articleinfo>
     <title>Fonts and FreeBSD</title>
 
     <subtitle>A Tutorial</subtitle>
@@ -56,7 +56,7 @@
 	for switching the syscons display to 80x60 mode, and for using
 	type 1 fonts with the above application programs.</para>
     </abstract>
-  </artheader>
+  </articleinfo>
 
   <sect1>
     <title>Introduction</title>
diff --git a/en_US.ISO_8859-1/articles/formatting-media/article.sgml b/en_US.ISO_8859-1/articles/formatting-media/article.sgml
index 6708d35396..c6854498eb 100644
--- a/en_US.ISO_8859-1/articles/formatting-media/article.sgml
+++ b/en_US.ISO_8859-1/articles/formatting-media/article.sgml
@@ -1,10 +1,10 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
 ]>
-<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/formatting-media/article.sgml,v 1.13 1999/10/30 18:10:14 dwhite Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/formatting-media/article.sgml,v 1.14 2000/07/26 18:24:38 jim Exp $ -->
 <article>
-  <artheader>
+  <articleinfo>
     <title>Formatting Media For Use With FreeBSD 2.2-RELEASE</title>
 
     <subtitle>A Tutorial</subtitle>
@@ -31,7 +31,7 @@
 	FreeBSD.  The examples given have been tested under FreeBSD
 	2.2-GAMMA and may work for other releases.</para>
     </abstract>
-  </artheader>
+  </articleinfo>
 
   <sect1>
     <title>Introduction & Definitions</title>
diff --git a/en_US.ISO_8859-1/articles/mh/article.sgml b/en_US.ISO_8859-1/articles/mh/article.sgml
index fef11739c2..27ff6c8651 100644
--- a/en_US.ISO_8859-1/articles/mh/article.sgml
+++ b/en_US.ISO_8859-1/articles/mh/article.sgml
@@ -1,9 +1,9 @@
-<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/mh/article.sgml,v 1.7 1999/10/10 20:20:38 jhb Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/mh/article.sgml,v 1.8 2000/07/26 18:24:49 jim Exp $ -->
 <!-- FreeBSD Documentation Project -->
 
-<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN">
+<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN">
 <article>
-  <artheader>
+  <articleinfo>
     <title>An MH Primer</title>
 
     <authorgroup>
@@ -26,7 +26,7 @@
       <para>This document contains an introduction to using MH on
 	FreeBSD</para>
     </abstract>
-  </artheader>
+  </articleinfo>
 
   <sect1 id="mhintro">
     <title>Introduction</title>
diff --git a/en_US.ISO_8859-1/articles/multi-os/article.sgml b/en_US.ISO_8859-1/articles/multi-os/article.sgml
index f7ee999f88..63394e6f5f 100644
--- a/en_US.ISO_8859-1/articles/multi-os/article.sgml
+++ b/en_US.ISO_8859-1/articles/multi-os/article.sgml
@@ -1,7 +1,7 @@
-<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/multi-os/article.sgml,v 1.12 2000/05/30 22:48:47 nik Exp $ -->
-<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN">
+<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/multi-os/article.sgml,v 1.13 2000/07/26 18:24:49 jim Exp $ -->
+<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN">
 <article>
-  <artheader>
+  <articleinfo>
     <title>Installing and Using FreeBSD With Other Operating Systems</title>
 
     <authorgroup>
@@ -28,7 +28,7 @@
 	<email>rhh@ct.picker.com</email>, and Jordan K. Hubbard
 	<email>jkh@time.cdrom.com</email></para>
     </abstract>
-  </artheader>
+  </articleinfo>
 
   <sect1>
     <title>Overview</title>
diff --git a/en_US.ISO_8859-1/articles/new-users/article.sgml b/en_US.ISO_8859-1/articles/new-users/article.sgml
index 78b47e6677..92a862ed06 100644
--- a/en_US.ISO_8859-1/articles/new-users/article.sgml
+++ b/en_US.ISO_8859-1/articles/new-users/article.sgml
@@ -1,9 +1,9 @@
-<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/new-users/article.sgml,v 1.16 2000/11/21 13:46:23 ben Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/new-users/article.sgml,v 1.17 2001/04/09 00:33:41 dd Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
-<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN">
+<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN">
 <article>
-  <artheader>
+  <articleinfo>
     <title>For People New to Both FreeBSD and Unix</title>
 
     <authorgroup>
@@ -29,13 +29,13 @@
 	(you)&mdash;and you're probably pretty good with DOS/Windows
 	or OS/2.</para>
     </abstract>
-  </artheader>
+  </articleinfo>
 
   <sect1>
     <title>Logging in and Getting Out</title>
 
-    <para>Log in (when you see <systemitem
-	class=prompt>login:</systemitem>) as a user you created during
+    <para>Log in (when you see <prompt
+	>login:</prompt>) as a user you created during
       installation or as <firstterm>root</firstterm>.  (Your FreeBSD
       installation will already have an account for root; root can go
       anywhere and do anything, including deleting essential files, so
@@ -43,8 +43,8 @@
       prompt (yours may be different), with &prompt.user; indicating an ordinary
       user and &prompt.root; indicating root.</para>
 
-    <para>To log out (and get a new <systemitem
-	class=prompt>login:</systemitem> prompt) type</para>
+    <para>To log out (and get a new <prompt
+	>login:</prompt> prompt) type</para>
 
     <informalexample>
       <screen>&prompt.root; <userinput>exit</userinput>
diff --git a/en_US.ISO_8859-1/articles/programming-tools/article.sgml b/en_US.ISO_8859-1/articles/programming-tools/article.sgml
index e0c0a9c99d..eabcea2da8 100644
--- a/en_US.ISO_8859-1/articles/programming-tools/article.sgml
+++ b/en_US.ISO_8859-1/articles/programming-tools/article.sgml
@@ -1,9 +1,9 @@
-<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/programming-tools/article.sgml,v 1.13 2000/08/22 20:03:31 marko Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO_8859-1/articles/programming-tools/article.sgml,v 1.14 2001/04/09 00:33:41 dd Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
-<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN">
+<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN">
 <article>
-  <artheader>
+  <articleinfo>
     <title>A User's Guide to FreeBSD Programming Tools</title>
 
     <authorgroup>
@@ -36,7 +36,7 @@
 	programming knowledge, although it is hoped that most
 	programmers will find something of value in it</para>
     </abstract>
-  </artheader>
+  </articleinfo>
 
   <sect1>
     <title>Introduction<anchor id=foo></title>
@@ -784,8 +784,8 @@ int main() {
 	      it to.  Either type <command>./foobar</command>, which
 	      means <quote>run the file called
 		<filename>foobar</filename> in the current
-		directory</quote>, or change your <systemitem
-		class=environvar>PATH</systemitem> environment
+		directory</quote>, or change your <envar
+		>PATH</envar> environment
 	      variable so that it looks something like</para>
 
 	    <informalexample>
@@ -1819,8 +1819,8 @@ else if (pid == 0) {		/* child */
 	    Emacs!
 
 	    <footnote>
-	      <para>Many Emacs users set their <systemitem
-		  class=environvar>EDITOR</systemitem> environment to
+	      <para>Many Emacs users set their <envar
+		  >EDITOR</envar> environment to
 		<literal>emacsclient</literal> so this happens every
 		time they need to edit a file.</para>
 	    </footnote></para>
diff --git a/en_US.ISO_8859-1/articles/zip-drive/article.sgml b/en_US.ISO_8859-1/articles/zip-drive/article.sgml
index 3a2fe2db78..4e1aeeacaa 100644
--- a/en_US.ISO_8859-1/articles/zip-drive/article.sgml
+++ b/en_US.ISO_8859-1/articles/zip-drive/article.sgml
@@ -1,12 +1,12 @@
 <!-- $FreeBSD -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
 ]>
 
 <article>
-  <artheader>
+  <articleinfo>
     <title>ZIP Drives</title>
 
     <authorgroup>
@@ -19,7 +19,7 @@
 	</affiliation>
       </author>
     </authorgroup>
-  </artheader>
+  </articleinfo>
 
   <sect1>
     <title>ZIP Drive Basics</title>