From dceceeb5c2bf5e67dba835f80aeaee6cc5a14756 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 21 Jun 2012 15:42:34 +0000
Subject: [PATCH] - Replace DTD entry to reflect the change - Merge some entity
 sets

Approved by:	doceng (implicit)
---
 share/sgml/articles.ent                | 22 ----------------------
 share/sgml/catalog                     | 16 +++++-----------
 share/sgml/catalog.xml                 |  4 ++++
 share/sgml/{books.ent => entities.ent} |  0
 share/sgml/freebsd.ent                 |  5 +++++
 5 files changed, 14 insertions(+), 33 deletions(-)
 delete mode 100644 share/sgml/articles.ent
 rename share/sgml/{books.ent => entities.ent} (100%)

diff --git a/share/sgml/articles.ent b/share/sgml/articles.ent
deleted file mode 100644
index e02fd438f9..0000000000
--- a/share/sgml/articles.ent
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
-%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
-%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
diff --git a/share/sgml/catalog b/share/sgml/catalog
index c9ac1d0750..69b0787ff9 100644
--- a/share/sgml/catalog
+++ b/share/sgml/catalog
@@ -11,11 +11,8 @@
      documentation, even though the listed language is "EN"
   --
 
-PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN" 
-       "freebsd.dtd"
-
-PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN"
-	"freebsd41.dtd"
+PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"freebsd42.dtd"
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
@@ -41,14 +38,11 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Common Stylesheet//EN"
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Common Lanugage Neutral Stylesheet//EN"
 	"freebsd-common.dsl"
 
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN" 
-       "articles.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN" 
-       "books.ent"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+	"entities.ent"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN" 
-       "man-refs.ent"
+	"man-refs.ent"
 
 PUBLIC	"-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"freebsd.ent"
diff --git a/share/sgml/catalog.xml b/share/sgml/catalog.xml
index c8c64936a1..932a30fd45 100644
--- a/share/sgml/catalog.xml
+++ b/share/sgml/catalog.xml
@@ -10,6 +10,10 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/"
               rewritePrefix="../../"/>
 
+  <public
+	publicId="-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	uri="freebsd42.dtd"/>
+
 <!--
   <public
         publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Developers Entities//EN"
diff --git a/share/sgml/books.ent b/share/sgml/entities.ent
similarity index 100%
rename from share/sgml/books.ent
rename to share/sgml/entities.ent
diff --git a/share/sgml/freebsd.ent b/share/sgml/freebsd.ent
index 55fed92479..3c0bec09f9 100644
--- a/share/sgml/freebsd.ent
+++ b/share/sgml/freebsd.ent
@@ -9,6 +9,11 @@ used in both environments.
 
 -->
 
+<!-- These are used in screen elements -->
+
+<!ENTITY prompt.root "<prompt>#</prompt>">
+<!ENTITY prompt.user "<prompt>&#37;</prompt>">
+
 <!-- These will almost certainly remain the same, but are here for
      consistency and in case we ever want to make hyperlinks out of
      some of them. -->