- Simplify keyword markup

- Extract related schema definition into own DTD Approved by: doceng (implicit)
svn path=/projects/sgml2xml/; revision=39374
2012-08-13 20:43:41 +00:00 · 2012-08-13 20:43:41 +00:00 · 217c06b0cd · 2020-12-08 03:00:23 +00:00
commit 217c06b0cd
parent 6f0813b25d
136 changed files with 178 additions and 441 deletions
--- a/share/sgml/advisories.xml
+++ b/share/sgml/advisories.xml
@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <advisories>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2012</name>
--- a/share/sgml/catalog.xml
+++ b/share/sgml/catalog.xml
@ -50,6 +50,9 @@
  <public
        publicId="-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
        uri="xslt10-freebsd.dtd" />
+  <public
+	publicId="-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+        uri="cvs.dtd"/>
  <public
        publicId="-//FreeBSD//DTD FreeBSD XML Database for UserGroups//EN"
        uri="usergroups.dtd" />
--- a/share/sgml/commercial.consult.xml
+++ b/share/sgml/commercial.consult.xml
@ -4,11 +4,9 @@
 <!-- $FreeBSD$ -->

 <entries>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <categories>
    <category id="africa">Africa</category>
--- a/share/sgml/commercial.hardware.xml
+++ b/share/sgml/commercial.hardware.xml
@ -4,11 +4,9 @@
 <!-- $FreeBSD$ -->

 <entries>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <entry id="ABMX">
    <name>ABMX Servers</name>
--- a/share/sgml/commercial.isp.xml
+++ b/share/sgml/commercial.isp.xml
@ -4,11 +4,9 @@
 <!-- $FreeBSD$ -->

 <entries>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <entry id="astute">
    <name>Astute Hosting Incorporated</name>
--- a/share/sgml/commercial.misc.xml
+++ b/share/sgml/commercial.misc.xml
@ -4,11 +4,9 @@
 <!-- $FreeBSD$ -->

 <entries>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <entry id="FreeBSDMall">
    <name>FreeBSD Mall</name>
--- a/share/sgml/commercial.software.xml
+++ b/share/sgml/commercial.software.xml
@ -4,11 +4,9 @@
 <!-- $FreeBSD$ -->

 <entries>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <categories>
    <category id="DATABASE">Databases</category>
--- a/share/sgml/cvs.dtd
+++ b/share/sgml/cvs.dtd
@ -0,0 +1,3 @@
+<!ELEMENT cvs:keyword (#PCDATA)>
+<!ATTLIST cvs:keyword xmlns CDATA #IMPLIED>
+<!ATTLIST cvs:keyword xmlns:cvs CDATA #FIXED 'http://www.FreeBSD.org/XML/CVS'>
--- a/share/sgml/events.dtd
+++ b/share/sgml/events.dtd
@ -27,7 +27,7 @@

 <!-- DTD for events.xml on the FreeBSD website. -->

-<!ELEMENT events (cvs:keywords?, event+)>
+<!ELEMENT events (cvs:keyword?, event+)>

 <!ELEMENT event (name?, url?, startdate, enddate, location, description?, link*)>
 <!ATTLIST event id ID #REQUIRED>
@ -74,13 +74,10 @@
 <!ELEMENT link (name, url)>
 <!ATTLIST link type (photos|notes|other) "other">

-<!-- Common CVS tags -->
-<!ELEMENT cvs:keywords (cvs:keyword+)>
-<!ATTLIST cvs:keywords xmlns:cvs CDATA #FIXED 'http://www.FreeBSD.org/XML/CVS'>
-<!ATTLIST cvs:keywords version CDATA #FIXED '1.0'>
-
-<!ELEMENT cvs:keyword (#PCDATA)>
-<!ATTLIST cvs:keyword name CDATA #REQUIRED>
+<!ENTITY % cvs
+ PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+	"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+%cvs;

 <!ENTITY % autogen.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
--- a/share/sgml/events.xml
+++ b/share/sgml/events.xml
@ -8,11 +8,9 @@
 -->

 <events xmlns:xi="http://www.w3.org/2001/XInclude">
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <xi:include
    href="http://www.FreeBSD.org/XML/www/share/sgml/events2013.xml"
--- a/share/sgml/events2003.xml
+++ b/share/sgml/events2003.xml
@ -8,11 +8,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="ccc-20">
    <name>20. Chaos Communication Congress</name>
--- a/share/sgml/events2004.xml
+++ b/share/sgml/events2004.xml
@ -8,11 +8,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="ccc-21">
    <name>21. Chaos Communication Congress</name>
--- a/share/sgml/events2005.xml
+++ b/share/sgml/events2005.xml
@ -8,11 +8,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="guficon-6">
    <name>GUFICon #6</name>
--- a/share/sgml/events2006.xml
+++ b/share/sgml/events2006.xml
@ -8,11 +8,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="chilebsdcon-2006">
    <name>ChileBSDCon 2006</name>
--- a/share/sgml/events2007.xml
+++ b/share/sgml/events2007.xml
@ -8,11 +8,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="meetbsd-2007">
    <name>MeetBSD 2007</name>
--- a/share/sgml/events2008.xml
+++ b/share/sgml/events2008.xml
@ -8,11 +8,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="nllgg-2008">
    <name>NLLGG-bijeenkomst december 2008</name>
--- a/share/sgml/events2009.xml
+++ b/share/sgml/events2009.xml
@ -8,11 +8,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="open-rheinruhr-2009">
    <name>OpenRheinRuhr 2009</name>
--- a/share/sgml/events2010.xml
+++ b/share/sgml/events2010.xml
@ -8,11 +8,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="nllgg-2010">
    <name>NLLGG gathering</name>
--- a/share/sgml/events2011.xml
+++ b/share/sgml/events2011.xml
@ -8,11 +8,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="bsdday-argentina-2011">
    <name>BSDday Argentina 2011</name>
--- a/share/sgml/events2012.xml
+++ b/share/sgml/events2012.xml
@ -8,11 +8,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="chemnitz-linux-days-2012">
    <name>Chemnitz Linux Days 2012</name>
--- a/share/sgml/events2013.xml
+++ b/share/sgml/events2013.xml
@ -8,11 +8,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="bsdcan-2013">
    <name>BSDCan 2013</name>
--- a/share/sgml/gallery.dtd
+++ b/share/sgml/gallery.dtd
@ -1,7 +1,7 @@
 <!-- DTD for commercial gallery entries on the FreeBSD website. -->
 <!-- $FreeBSD$ -->

-<!ELEMENT entries (cvs:keywords?, categories?, entry+)>
+<!ELEMENT entries (cvs:keyword?, categories?, entry+)>

 <!ELEMENT categories (category)+>
 <!ATTLIST categories
@ -40,13 +40,10 @@
 <!ATTLIST img alt CDATA #IMPLIED>
 <!ATTLIST img src CDATA #REQUIRED>

-<!-- common cvs tags -->
-<!ELEMENT cvs:keywords (cvs:keyword+)>
-<!ATTLIST cvs:keywords xmlns:cvs CDATA #FIXED 'http://www.FreeBSD.org/XML/CVS'>
-<!ATTLIST cvs:keywords version CDATA #FIXED '1.0'>
-
-<!ELEMENT cvs:keyword (#PCDATA)>
-<!ATTLIST cvs:keyword name CDATA #REQUIRED>
+<!ENTITY % cvs
+ PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+	"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+%cvs;

 <!ENTITY % autogen.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
--- a/share/sgml/ideas.dtd
+++ b/share/sgml/ideas.dtd
@ -1,13 +1,6 @@
 <!-- $FreeBSD$ -->

-<!ELEMENT ideas (cvs:keywords?, category)+>
-
-<!ELEMENT cvs:keywords (cvs:keyword+)>
-<!ATTLIST cvs:keywords xmlns:cvs CDATA #FIXED 'http://www.FreeBSD.org/XML/CVS'>
-<!ATTLIST cvs:keywords version CDATA #FIXED '1.0'>
-
-<!ELEMENT cvs:keyword (#PCDATA)>
-<!ATTLIST cvs:keyword name CDATA #REQUIRED>
+<!ELEMENT ideas (cvs:keyword?, category)+>

 <!ELEMENT title (#PCDATA)>
 <!ATTLIST title
@ -29,6 +22,11 @@
  id		ID	#IMPLIED
 >

+<!ENTITY % cvs
+ PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+	"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+%cvs;
+
 <!ENTITY % autogen.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
        "http://www.FreeBSD.org/XML/cwd/autogen.ent">
--- a/share/sgml/mirrors.xml
+++ b/share/sgml/mirrors.xml
@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <mirrors>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <entry id="central">
    <country role="primary">Central Servers</country>
--- a/share/sgml/news.dtd
+++ b/share/sgml/news.dtd
@ -3,14 +3,7 @@
 <!ENTITY lists 'http://lists.freebsd.org/pipermail'>
 <!ENTITY lists.stable '&lists;/freebsd-stable'>

-<!ELEMENT news (cvs:keywords?, year)+>
-
-<!ELEMENT cvs:keywords (cvs:keyword+)>
-<!ATTLIST cvs:keywords xmlns:cvs CDATA #FIXED 'http://www.FreeBSD.org/XML/CVS'>
-<!ATTLIST cvs:keywords version CDATA #FIXED '1.0'>
-
-<!ELEMENT cvs:keyword (#PCDATA)>
-<!ATTLIST cvs:keyword name CDATA #REQUIRED>
+<!ELEMENT news (cvs:keyword?, year)+>

 <!ELEMENT name (#PCDATA)>
 <!ATTLIST name
@ -58,6 +51,11 @@
  id		ID	#IMPLIED
 >

+<!ENTITY % cvs
+ PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+	"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+%cvs;
+
 <!ENTITY % autogen.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
        "http://www.FreeBSD.org/XML/cwd/autogen.ent">
--- a/share/sgml/news.xml
+++ b/share/sgml/news.xml
@ -23,11 +23,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2012</name>
--- a/share/sgml/notices.xml
+++ b/share/sgml/notices.xml
@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <advisories>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2012</name>
--- a/share/sgml/press.dtd
+++ b/share/sgml/press.dtd
@ -1,13 +1,6 @@
 <!-- $FreeBSD$ -->

-<!ELEMENT press (cvs:keywords?, year)+>
-
-<!ELEMENT cvs:keywords (cvs:keyword+)>
-<!ATTLIST cvs:keywords xmlns:cvs CDATA #FIXED 'http://www.FreeBSD.org/XML/CVS'>
-<!ATTLIST cvs:keywords version CDATA #FIXED '1.0'>
-
-<!ELEMENT cvs:keyword (#PCDATA)>
-<!ATTLIST cvs:keyword name CDATA #REQUIRED>
+<!ELEMENT press (cvs:keyword?, year)+>

 <!ELEMENT year (name, (month)+)>
 <!ATTLIST year
@ -65,6 +58,11 @@
  href		CDATA	#REQUIRED
 >

+<!ENTITY % cvs
+ PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+	"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+%cvs;
+
 <!ENTITY % autogen.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
        "http://www.FreeBSD.org/XML/cwd/autogen.ent">
--- a/share/sgml/press.xml
+++ b/share/sgml/press.xml
@ -7,11 +7,9 @@
    "freefall:/c/www/bsddoc/press/".
 -->
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2012</name>
--- a/share/sgml/sitemap.dtd
+++ b/share/sgml/sitemap.dtd
@ -11,10 +11,10 @@
 <!ELEMENT text (#PCDATA)>
 <!ELEMENT destination (#PCDATA)>

-<!-- Subversion keyword tag -->
-<!ELEMENT cvs:keyword (#PCDATA)>
-<!ATTLIST cvs:keyword xmlns CDATA #IMPLIED>
-<!ATTLIST cvs:keyword xmlns:cvs CDATA #IMPLIED>
+<!ENTITY % cvs
+ PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+	"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+%cvs;

 <!ENTITY % autogen.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
--- a/share/sgml/transtable.xml
+++ b/share/sgml/transtable.xml
@ -16,11 +16,9 @@
 -->

 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <group id="number-month">
    <word>
--- a/share/sgml/usergroups.xml
+++ b/share/sgml/usergroups.xml
@ -3,11 +3,9 @@
                            "http://www.FreeBSD.org/XML/www/share/sgml/usergoups.dtd">

 <usergroups>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

 <!--

--- a/share/sgml/xhtml10-freebsd.dtd
+++ b/share/sgml/xhtml10-freebsd.dtd
@ -44,10 +44,9 @@
  xmlns	      CDATA          #IMPLIED"
  >

-<!-- Subversion keyword tag -->
-<!ELEMENT cvs:keyword (#PCDATA)>
-<!ATTLIST cvs:keyword xmlns CDATA #IMPLIED>
-<!ATTLIST cvs:keyword xmlns:cvs CDATA #IMPLIED>
+<!ENTITY % cvs PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+%cvs;

 <!ENTITY % head.misc "(cvs:keyword|script|style|meta|link|object|isindex)*">