svn commit: r39080 - projects/sgml2xml/share/sgml

[Gabor Kovesdan]

Author: gabor
Date: Thu Jun 21 15:42:34 2012
New Revision: 39080
URL: http://svn.freebsd.org/changeset/doc/39080

Log:
  - Replace DTD entry to reflect the change
  - Merge some entity sets
  
  Approved by:	doceng (implicit)

Added:
  projects/sgml2xml/share/sgml/entities.ent
     - copied unchanged from r39076, projects/sgml2xml/share/sgml/books.ent
Deleted:
  projects/sgml2xml/share/sgml/articles.ent
  projects/sgml2xml/share/sgml/books.ent
Modified:
  projects/sgml2xml/share/sgml/catalog
  projects/sgml2xml/share/sgml/catalog.xml
  projects/sgml2xml/share/sgml/freebsd.ent

Modified: projects/sgml2xml/share/sgml/catalog
==============================================================================
--- projects/sgml2xml/share/sgml/catalog	Thu Jun 21 15:40:52 2012	(r39079)
+++ projects/sgml2xml/share/sgml/catalog	Thu Jun 21 15:42:34 2012	(r39080)
@@ -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 Com
 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"

Modified: projects/sgml2xml/share/sgml/catalog.xml
==============================================================================
--- projects/sgml2xml/share/sgml/catalog.xml	Thu Jun 21 15:40:52 2012	(r39079)
+++ projects/sgml2xml/share/sgml/catalog.xml	Thu Jun 21 15:42:34 2012	(r39080)
@@ -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"

Copied: projects/sgml2xml/share/sgml/entities.ent (from r39076, projects/sgml2xml/share/sgml/books.ent)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sgml2xml/share/sgml/entities.ent	Thu Jun 21 15:42:34 2012	(r39080, copy of r39076, projects/sgml2xml/share/sgml/books.ent)
@@ -0,0 +1,24 @@
+<!-- $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 % bookinfo PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN">
+%bookinfo;
+<!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;

Modified: projects/sgml2xml/share/sgml/freebsd.ent
==============================================================================
--- projects/sgml2xml/share/sgml/freebsd.ent	Thu Jun 21 15:40:52 2012	(r39079)
+++ projects/sgml2xml/share/sgml/freebsd.ent	Thu Jun 21 15:42:34 2012	(r39080)
@@ -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. -->