From abc87340dc89ed9a45857e69d04d5d3a75cff02d Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 21 Jun 2012 15:40:52 +0000
Subject: [PATCH] - Replace DTD with a DocBook/XML 4.2-based one

Approved by:	doceng (implicit)
---
 share/sgml/freebsd41.dtd | 137 ---------------------------------------
 share/sgml/freebsd42.dtd |  59 +++++++++++++++++
 2 files changed, 59 insertions(+), 137 deletions(-)
 delete mode 100644 share/sgml/freebsd41.dtd
 create mode 100644 share/sgml/freebsd42.dtd

diff --git a/share/sgml/freebsd41.dtd b/share/sgml/freebsd41.dtd
deleted file mode 100644
index 394e919310..0000000000
--- a/share/sgml/freebsd41.dtd
+++ /dev/null
@@ -1,137 +0,0 @@
-<!-- FreeBSD Documentation Project, Extended DocBook DTD
-
-     This DTD builds upon the DocBook 4.1 DTD. It extends it in order to
-     add some new elements.
-
-     The comment style and section headings are drawn from the DocBook DTD.
-
-     The FPI for this DTD is "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN"
-
-     $FreeBSD$
--->
-
-<!-- ..................................................................... -->
-<!-- Parameter entities .................................................. -->
-
-<!-- These parameter entities have specific meanings, and default to 
-     "IGNORE". The SGML parser is free to redefine them to "INCLUDE" to
-     cause special processing.                                             -->
-
-<!ENTITY % output.html  "IGNORE">    <!-- HTML output is being generated   -->
-<!ENTITY % output.html.images "IGNORE"> <!-- HTML with images -->
-<!ENTITY % output.print "IGNORE">    <!-- Print output is being generated  -->
-<!ENTITY % output.print.pdf "IGNORE"> <!-- PDF output -->
-
-<!-- ..................................................................... -->
-<!-- Entities for element classes and mixtures ........................... -->
-
-<!-- Character level classes -->
-<!ENTITY % local.tech.char.class "|HostID|Username|Groupname|Devicename|MakeTarget|MakeVar|SVNref">
-
-<!ENTITY % local.cptr.char.mix "|CO">
-
-<!-- OS Version attributes ...............................................
-
-     Each element has three attributes which specify which version(s) of
-     FreeBSD the element's content applies to.  It is up to the
-     pre-processor to include or exclude elements based on the value of
-     these attributes.                                                     -->
-<!ENTITY % local.common.attrib
-     "OSVersionMin        CDATA        #IMPLIED
-      OSVersionMax        CDATA        #IMPLIED
-      OSVersionIn         CDATA        #IMPLIED">
-
-<!-- Altered general entities ............................................
-
-     The HTML 4.0 DTD includes some new ISO entities. Most browsers don't
-     support them yet. Change the definition of some of these entities to
-     character strings that the browsers will support.
-
-     This does not apply when generating printed output, so these are 
-     contained within a %output.html; marked section.
-
-     As browser technology improves, these definitions can be removed.     -->
-
-<![ %output.html; [
-<!ENTITY bdquo  ",,">
-<!ENTITY ldquo  "``">
-<!ENTITY rdquo  "''">
-<!ENTITY lsquo  "`">
-<!ENTITY rsquo  "'">
-<!ENTITY mdash  "--">
-<!ENTITY ndash  "-">
-<!ENTITY hellip "...">
-<!ENTITY dollar "$">
-]]>
-
-<!ENTITY % filename.element "IGNORE">
-
-<!-- Pull in the original DTD -->
-<!ENTITY % orig-docbook PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-%orig-docbook;
-
-<!-- ...................................................................... -->
-<!-- Inline, link, and ubiquitous elements ................................ -->
-
-<!-- Technical and computer terms ......................................... -->
-
-<!ELEMENT HostID - - ((%cptr.char.mix;)+)>
-<!ATTLIST HostID
-                --
-                Role: More specific information about this hostname.
-                If not specified then the default is 'hostname'.
-                --
-                Role    (Hostname
-                        |Domainname
-                        |FQDN
-                        |IPAddr
-                        |IP6Addr                
-                        |Netmask
-                        |MAC)      #IMPLIED
-                %common.attrib;
->
-
-<!ELEMENT Username - - ((%cptr.char.mix;)+)>
-<!ATTLIST Username
-                %common.attrib;
->
-
-<!ELEMENT Groupname - - ((%cptr.char.mix;)+)>
-<!ATTLIST Groupname
-                %common.attrib;
->
-
-<!ELEMENT Devicename - - ((%cptr.char.mix;)+)>
-<!ATTLIST Devicename
-                %common.attrib;
->
-
-<!ELEMENT MakeTarget - - ((%cptr.char.mix;)+)>
-<!ATTLIST MakeTarget
-                %common.attrib;
->
-
-<!ELEMENT MakeVar - - ((%cptr.char.mix;)+)>
-<!ATTLIST MakeVar
-                %common.attrib;
->
-
-<!ELEMENT SVNRef - - ((%cptr.char.mix;)+)>
-<!ATTLIST SVNRef
-                %common.attrib;
->
-
-<!-- The content model for <filename> was changed between DocBook 3.1 and
-     4.1.  Specifically, <envar> was disallowed.  There's a suggestion from
-     the DocBook maintainers that this may have been a mistake.  In the
-     meantime, explicitly allow it here. 
-
-     In addition, allow our custom addition, <makevar> -->
-<!ELEMENT Filename - - (%smallcptr.char.mix;|Envar|MakeVar)+>
-
-<!-- ...................................................................... -->
-<!-- General entities for reuse ........................................... -->
-
-<!ENTITY prompt.root		"<prompt>#</prompt>">
-<!ENTITY prompt.user		"<prompt>%</prompt>">
-
diff --git a/share/sgml/freebsd42.dtd b/share/sgml/freebsd42.dtd
new file mode 100644
index 0000000000..4855616f49
--- /dev/null
+++ b/share/sgml/freebsd42.dtd
@@ -0,0 +1,59 @@
+<!ENTITY % output.html  "IGNORE">    <!-- HTML output is being generated   -->
+<!ENTITY % output.html.images "IGNORE"> <!-- HTML with images -->
+<!ENTITY % output.print "IGNORE">    <!-- Print output is being generated  -->
+<!ENTITY % output.print.pdf "IGNORE"> <!-- PDF output -->
+
+<!ENTITY % local.tech.char.class "|hostid|username|groupname|devicename|maketarget|makevar|svnref">
+
+<!ENTITY % filename.element "IGNORE">
+
+<!ENTITY % orig-docbook PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+	"/usr/local/share/xml/docbook/4.2/docbookx.dtd">
+%orig-docbook;
+
+<!ELEMENT hostid (%cptr.char.mix;)*>
+<!ATTLIST hostid
+                role    (hostname
+                        |domainname
+                        |fqdn
+                        |ipaddr
+                        |ip6addr                
+                        |netmask
+                        |mac)      #IMPLIED
+                %common.attrib;
+>
+
+<!ELEMENT username (%cptr.char.mix;)*>
+<!ATTLIST username
+                %common.attrib;
+>
+
+<!ELEMENT groupname (%cptr.char.mix;)*>
+<!ATTLIST groupname
+                %common.attrib;
+>
+
+<!ELEMENT devicename (%cptr.char.mix;)*>
+<!ATTLIST devicename
+                %common.attrib;
+>
+
+<!ELEMENT maketarget (%cptr.char.mix;)*>
+<!ATTLIST maketarget
+                %common.attrib;
+>
+
+<!ELEMENT makevar (%cptr.char.mix;)*>
+<!ATTLIST makevar
+                %common.attrib;
+>
+
+<!ELEMENT svnref (%cptr.char.mix;)*>
+<!ATTLIST svnref
+		%common.attrib;
+>
+
+<!ELEMENT filename (%cptr.char.mix;)*>
+
+<!ENTITY prompt.root		"<prompt>#</prompt>">
+<!ENTITY prompt.user		"<prompt>&#x25;</prompt>">