Merge pull request #900 from robander/dropclassify

Remove classification domain from 2.0 #647
oasis-tcs · Apr 6, 2023 · e00bc8a · e00bc8a
2 parents 2010d66 + eb622d9
commit e00bc8a
Show file tree

Hide file tree

Showing 19 changed files with 2 additions and 1,436 deletions.
diff --git a/doctypes/dtd/subjectScheme/catalog.xml b/doctypes/dtd/subjectScheme/catalog.xml
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-<!--DITA Subject Classification Domain-->
+<!--DITA Subject Scheme maps-->
 
-   <public publicId="-//OASIS//ELEMENTS DITA 2.0 Subject Classification Domain//EN"
-           uri="classifyDomain.mod"/>
-   <public publicId="-//OASIS//ELEMENTS DITA 2.x Subject Classification Domain//EN"
-                uri="classifyDomain.mod"/>
-   <public publicId="-//OASIS//ENTITIES DITA 2.0 Subject Classification Domain//EN"
-           uri="classifyDomain.ent"/>
-   <public publicId="-//OASIS//ENTITIES DITA 2.x Subject Classification Domain//EN"
-           uri="classifyDomain.ent"/>
    <public publicId="-//OASIS//DTD DITA 2.0 Subject Scheme Map//EN"
            uri="subjectScheme.dtd"/>
    <public publicId="-//OASIS//DTD DITA 2.x Subject Scheme Map//EN"

diff --git a/doctypes/dtd/subjectScheme/classifyDomain.ent b/doctypes/dtd/subjectScheme/classifyDomain.ent
diff --git a/doctypes/dtd/subjectScheme/classifyDomain.mod b/doctypes/dtd/subjectScheme/classifyDomain.mod
diff --git a/doctypes/rng/subjectScheme/catalog.xml b/doctypes/rng/subjectScheme/catalog.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-<!--DITA Subject Classification Domain-->
+<!--DITA Subject Scheme maps-->
 
    <group><!-- System ID (URL) catalog entries -->
-      <system systemId="urn:pubid:oasis:names:tc:dita:spec:classification:rng:classifyDomain.rng:2.0"
-              uri="classifyDomain.rng"/>
-      <system systemId="urn:pubid:oasis:names:tc:dita:spec:classification:rng:classifyDomain.rng:2.x"
-              uri="classifyDomain.rng"/>
       <system systemId="urn:pubid:oasis:names:tc:dita:spec:classification:rng:subjectScheme.rng:2.0"
               uri="subjectScheme.rng"/>
       <system systemId="urn:pubid:oasis:names:tc:dita:spec:classification:rng:subjectScheme.rng:2.x"
@@ -17,10 +13,6 @@
               uri="subjectSchemeMod.rng"/>
    </group>
    <group><!-- Public ID (URN) catalog entries -->
-      <uri name="urn:pubid:oasis:names:tc:dita:spec:classification:rng:classifyDomain.rng:2.0"
-           uri="classifyDomain.rng"/>
-      <uri name="urn:pubid:oasis:names:tc:dita:spec:classification:rng:classifyDomain.rng:2.x"
-           uri="classifyDomain.rng"/>
       <uri name="urn:pubid:oasis:names:tc:dita:spec:classification:rng:subjectScheme.rng:2.0"
            uri="subjectScheme.rng"/>
       <uri name="urn:pubid:oasis:names:tc:dita:spec:classification:rng:subjectScheme.rng:2.x"