From 2de84f10cb58bc18e5fcf13cb2af9647238ac133 Mon Sep 17 00:00:00 2001
From: "Robert D. Anderson" <robert.dan.anderson@oracle.com>
Date: Tue, 8 Dec 2020 10:46:43 -0600
Subject: [PATCH] Remove mapkeyref attribute #397

---
 doctypes/dtd/base/metaDecl.mod                        |  5 +----
 doctypes/dtd/base/topic.mod                           |  6 ------
 doctypes/rng/base/metaDeclMod.rng                     |  3 ---
 doctypes/rng/base/topicMod.rng                        |  6 ------
 .../langRef/attributes/commonAttributes.dita          | 11 -----------
 specification/langRef/base/linklist.dita              |  3 +--
 specification/langRef/base/linkpool.dita              |  3 +--
 specification/langRef/base/metadata.dita              |  4 +---
 .../quick-reference/base-attributes-a-to-z.dita       |  1 -
 9 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/doctypes/dtd/base/metaDecl.mod b/doctypes/dtd/base/metaDecl.mod
index 23edc7f3..da818e17 100644
--- a/doctypes/dtd/base/metaDecl.mod
+++ b/doctypes/dtd/base/metaDecl.mod
@@ -251,10 +251,7 @@
                           %foreign.unknown.incl;)*)"
 >
 <!ENTITY % metadata.attributes
-              "%univ-atts;
-               mapkeyref
-                          CDATA
-                                    #IMPLIED"
+              "%univ-atts;"
 >
 <!ELEMENT  metadata %metadata.content;>
 <!ATTLIST  metadata %metadata.attributes;>
diff --git a/doctypes/dtd/base/topic.mod b/doctypes/dtd/base/topic.mod
index 283a7410..44118873 100644
--- a/doctypes/dtd/base/topic.mod
+++ b/doctypes/dtd/base/topic.mod
@@ -405,9 +405,6 @@
                            yes |
                            -dita-use-conref-target)
                                     #IMPLIED
-               mapkeyref
-                          CDATA
-                                    #IMPLIED
                %relational-atts;
                %univ-atts;
                spectitle
@@ -447,9 +444,6 @@
                            yes |
                            -dita-use-conref-target)
                                     #IMPLIED
-               mapkeyref
-                          CDATA
-                                    #IMPLIED
                %relational-atts;
                %univ-atts;"
 >
diff --git a/doctypes/rng/base/metaDeclMod.rng b/doctypes/rng/base/metaDeclMod.rng
index dbe06fe5..1c7d0da8 100644
--- a/doctypes/rng/base/metaDeclMod.rng
+++ b/doctypes/rng/base/metaDeclMod.rng
@@ -432,9 +432,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Metadata//EN"
       </define>
       <define name="metadata.attributes">
         <ref name="univ-atts"/>
-        <optional>
-          <attribute name="mapkeyref"/>
-        </optional>
       </define>
       <define name="metadata.element">
         <element name="metadata" dita:longName="Metadata">
diff --git a/doctypes/rng/base/topicMod.rng b/doctypes/rng/base/topicMod.rng
index cd1644d6..bcd971f8 100644
--- a/doctypes/rng/base/topicMod.rng
+++ b/doctypes/rng/base/topicMod.rng
@@ -672,9 +672,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Topic//EN"
               </choice>
             </attribute>
           </optional>
-          <optional>
-            <attribute name="mapkeyref"/>
-          </optional>
           <ref name="relational-atts"/>
           <ref name="univ-atts"/>
           <optional>
@@ -753,9 +750,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Topic//EN"
               </choice>
             </attribute>
           </optional>
-          <optional>
-            <attribute name="mapkeyref"/>
-          </optional>
           <ref name="relational-atts"/>
           <ref name="univ-atts"/>
         </define>
diff --git a/specification/langRef/attributes/commonAttributes.dita b/specification/langRef/attributes/commonAttributes.dita
index fde6abd4..fde68da8 100644
--- a/specification/langRef/attributes/commonAttributes.dita
+++ b/specification/langRef/attributes/commonAttributes.dita
@@ -443,17 +443,6 @@
                 </dlentry>
               </dl></p></dd>
         </dlentry>
-        <dlentry id="mapkeyref" platform="dita">
-          <dt><xmlatt>mapkeyref</xmlatt></dt>
-          <dd>Identifies the map, if any, from which the contained links or metadata are derived.
-            This value <ph>might</ph> be automatically generated by a process that creates the links
-            or metadata based on map context, as a way to identify which map the material came from.
-            If the <xmlelement>linklist</xmlelement>, or <xmlelement>linkpool</xmlelement>, or
-            metadata is manually created by an author, there is no need to use this attribute.
-              <ph>Note that this attribute is not related to the <xmlatt>keyref</xmlatt> attribute,
-              and is not used for key based processing.</ph>
-          </dd>
-        </dlentry>
         <dlentry id="name">
           <dt><xmlatt>name</xmlatt> (data-element attributes)</dt>
           <dd>Defines a unique name for the object.</dd>
diff --git a/specification/langRef/base/linklist.dita b/specification/langRef/base/linklist.dita
index 18cffdf5..fe583f5c 100644
--- a/specification/langRef/base/linklist.dita
+++ b/specification/langRef/base/linklist.dita
@@ -30,8 +30,7 @@
       <title>Attributes</title>
       <p>The following attributes are available on this element: <xref keyref="attributes-universal"
         />, <xref keyref="attributes-common/collection-type"/>, <xref keyref="attributes-role"/>,
-          <xref keyref="attributes-common/spectitle"/>, <xref
-          keyref="attributes-common/mapkeyref"/>, and the attributes defined below. This element
+          <xref keyref="attributes-common/spectitle"/>, and the attributes defined below. This element
         also uses <xmlatt>format</xmlatt>, <xmlatt>scope</xmlatt>, and <xmlatt>type</xmlatt> from
           <xref keyref="attributes-common/linkatts"/>. </p>
       <dl conkeyref="reuse-attributes/linklist-and-linkpool">
diff --git a/specification/langRef/base/linkpool.dita b/specification/langRef/base/linkpool.dita
index c18866f0..52247ea2 100644
--- a/specification/langRef/base/linkpool.dita
+++ b/specification/langRef/base/linkpool.dita
@@ -30,8 +30,7 @@
    <p>The following attributes are available on this element: <xref
           keyref="attributes-universal"/>, <xref
           keyref="attributes-common/collection-type"/>, <xref
-          keyref="attributes-role"/>, <xref
-          keyref="attributes-common/mapkeyref"/>, and the attributes
+          keyref="attributes-role"/>, and the attributes
         defined below. This element also uses <xmlatt>format</xmlatt>, <xmlatt>scope</xmlatt>, and
           <xmlatt>type</xmlatt> from <xref
           keyref="attributes-common/linkatts"/>. </p>
diff --git a/specification/langRef/base/metadata.dita b/specification/langRef/base/metadata.dita
index 5b0c40ea..d439163b 100644
--- a/specification/langRef/base/metadata.dita
+++ b/specification/langRef/base/metadata.dita
@@ -25,9 +25,7 @@
     </section>
     <section id="attributes">
       <title>Attributes</title>
-      <p>The following attributes are available on this element: <xref
-          keyref="attributes-universal"/> and <xref
-          keyref="attributes-common/mapkeyref"/>.</p>
+      <p conkeyref="reuse-attributes/only-universal"/>
     </section>
 <example id="example" otherprops="examples"><title>Example</title>
       <p>The following code sample shows that a topic about jet packs is only intended for advanced
diff --git a/specification/langRef/quick-reference/base-attributes-a-to-z.dita b/specification/langRef/quick-reference/base-attributes-a-to-z.dita
index 9b9b10e8..f01fb3df 100644
--- a/specification/langRef/quick-reference/base-attributes-a-to-z.dita
+++ b/specification/langRef/quick-reference/base-attributes-a-to-z.dita
@@ -55,7 +55,6 @@
                 <sli><xref keyref="attributes-common/keyscope"/></sli>
                 <sli><xref keyref="attributes-keyscope"/></sli>
                 <sli><xref keyref="attributes-common/linking"/></sli>
-                <sli><xref keyref="attributes-common/mapkeyref"/></sli>
                 <sli><xref keyref="attributes-common/name"/></sli>
                 <sli><xref keyref="attributes-universal/otherprops"/></sli>
                 <sli><xref keyref="attributes-universal/outputclass"/></sli>