Merge pull request #138 from keberlein/final-errata-02-build

Final errata 02 build
oasis-tcs · May 30, 2018 · 14dae1a · 14dae1a
2 parents 8335082 + 99b413a
commit 14dae1a
Show file tree

Hide file tree

Showing 9 changed files with 144 additions and 116 deletions.
diff --git a/specification/dita-1.3-errata-specification-base.ditamap b/specification/dita-1.3-errata-specification-base.ditamap
@@ -7,8 +7,8 @@
 	<booktitle outputclass="specificationTitles">
 		<mainbooktitle outputclass="specificationTitle">Darwin Information Typing Architecture (DITA)
 			Version 1.3 Part 1: Base Edition <ph rev="errata-02">Plus Errata <keyword keyref="errata-num"/></ph></mainbooktitle>
-		<booktitlealt outputclass="specificationSubtitle1">OASIS Standard Incorporating <keyword
-				keyref="specification-level"/> of Errata 02</booktitlealt>
+		<booktitlealt outputclass="specificationSubtitle1">OASIS Standard <ph rev="errata-02"
+				>Incorporating Approved Errata</ph></booktitlealt>
 		<booktitlealt outputclass="specificationApproved"><keyword keyref="approval-date"
 			/></booktitlealt>
 		<booktitlealt outputclass="specificationShorttitle">DITA Version 1.3

diff --git a/specification/dita-13-key-definitions-common-metadata.ditamap b/specification/dita-13-key-definitions-common-metadata.ditamap
@@ -31,14 +31,15 @@
    <!-- Needs to be changed at every stage of the OASIS publication process? -->
    <topicmeta>
     <keywords>
-     <keyword>csprd</keyword>
+     <keyword>os</keyword>
     </keywords>
    </topicmeta>
   </keydef>
   <keydef keys="revision-num">
+   <!-- KJE 30 May 2018: Set this to empty for the 'os' stage -->
    <topicmeta>
     <keywords>
-     <keyword>01</keyword>
+     <keyword></keyword>
     </keywords>
    </topicmeta>
   </keydef>

diff --git a/specification/dita-13-key-definitions-cover-pages.ditamap b/specification/dita-13-key-definitions-cover-pages.ditamap
@@ -11,7 +11,7 @@
       <!--Use the following format: <day> <month> <year> -->
       <topicmeta>
         <keywords>
-          <keyword>23 January 2018</keyword>
+          <keyword>19 June 2018</keyword>
         </keywords>
       </topicmeta>
     </keydef>
@@ -21,7 +21,7 @@
       <!--Changes at every stage of the OASIS process-->
       <topicmeta>
         <keywords>
-          <keyword>Committee Specification Draft 01 / Public Review Draft 01</keyword>
+          <keyword>OASIS Approved Errata</keyword>
         </keywords>
       </topicmeta>
     </keydef>
@@ -73,7 +73,7 @@
     <!-- Needs to contain the latest OASIS metadata in @href-->
     <!-- KJE 9 May 2017: Need to check with Paul Knight about this -->
     <keydef keys="editions-topic-in-overview"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata01/os/complete/part0-overview/introduction/about-the-dita-specification.html#about-the-dita-specification__editions"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part0-overview/introduction/about-the-dita-specification.html#about-the-dita-specification__editions"
       scope="external" format="html"/>
   </topichead>
 
@@ -83,95 +83,94 @@
     <!-- Use a careful search and replace strategy to change the value of the @href attribute. -->
 
     <!-- Errata document-->
-    <!--    dita-v1.3-errata02-csprd01-part0-overview-complete.html-->
     <keydef keys="this-errata-html" 
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/dita-v1.3-errata02-csprd01.html" 
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/dita-v1.3-errata02-os.html" 
       scope="external" format="html"/>
 
     <keydef keys="this-errata-pdf" 
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/dita-v1.3-errata02-csprd01.pdf" 
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/dita-v1.3-errata02-os.pdf" 
       scope="external" format="pdf"/>
 
     <keydef keys="this-errata-dita"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/dita-v1.3-errata02-csprd01-dita.zip"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/dita-v1.3-errata02-os-dita.zip"
       scope="external" format="zip"/>
 
     <!--Part 0: Overview -->
     <keydef keys="this-part-0-html" 
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part0-overview/dita-v1.3-errata02-csprd01-part0-overview-complete.html" 
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part0-overview/dita-v1.3-errata02-os-part0-overview-complete.html" 
       scope="external" format="html"/>     
 
     <keydef keys="this-part-0-pdf" 
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part0-overview/dita-v1.3-errata02-csprd01-part0-overview-complete.pdf" 
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part0-overview/dita-v1.3-errata02-os-part0-overview-complete.pdf" 
       scope="external" format="pdf"/>
 
     <keydef keys="this-part-0-dita"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part0-overview/dita-v1.3-errata02-csprd01-part0-overview-complete-dita.zip"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part0-overview/dita-v1.3-errata02-os-part0-overview-complete-dita.zip"
       scope="external" format="zip"/>
 
     <!-- Part 1: Base edition-->
     <keydef keys="this-part-1-html"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part1-base/dita-v1.3-errata02-csprd01-part1-base-complete.html"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part1-base/dita-v1.3-errata02-os-part1-base-complete.html"
       scope="external" format="html"/>
 
     <keydef keys="this-part-1-pdf" 
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part1-base/dita-v1.3-errata02-csprd01-part1-base-complete.pdf" 
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part1-base/dita-v1.3-errata02-os-part1-base-complete.pdf" 
       scope="external" format="pdf"/>      
 
     <keydef keys="this-part-1-chm" 
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part1-base/dita-v1.3-errata02-csprd01-part1-base-complete-chm.zip" 
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part1-base/dita-v1.3-errata02-os-part1-base-complete-chm.zip" 
       scope="external" format="zip"/>
 
     <keydef keys="this-part-1-html-zip" 
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part1-base/dita-v1.3-errata02-csprd01-part1-base-complete-html.zip" 
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part1-base/dita-v1.3-errata02-os-part1-base-complete-html.zip" 
       scope="external" format="zip"/>
 
     <keydef keys="this-part-1-grammars" 
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part1-base/dita-v1.3-errata02-csprd01-part1-base-complete-grammars.zip" 
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part1-base/dita-v1.3-errata02-os-part1-base-complete-grammars.zip" 
       scope="external" format="zip"/>
 
     <keydef keys="this-part-1-dita" 
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part1-base/dita-v1.3-errata02-csprd01-part1-base-complete-dita.zip" 
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part1-base/dita-v1.3-errata02-os-part1-base-complete-dita.zip" 
       scope="external" format="zip"/>     
 
     <!-- Part 2: Technical content edition-->
     <keydef keys="this-part-2-html"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part2-tech-content/dita-v1.3-errata02-csprd01-part2-tech-content-complete.html"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part2-tech-content/dita-v1.3-errata02-os-part2-tech-content-complete.html"
       scope="external" format="html"/>
     <keydef keys="this-part-2-pdf"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part2-tech-content/dita-v1.3-errata02-csprd01-part2-tech-content-complete.pdf"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part2-tech-content/dita-v1.3-errata02-os-part2-tech-content-complete.pdf"
       scope="external" format="pdf"/>
     <keydef keys="this-part-2-chm"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part2-tech-content/dita-v1.3-errata02-csprd01-part2-tech-content-complete-chm.zip"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part2-tech-content/dita-v1.3-errata02-os-part2-tech-content-complete-chm.zip"
       scope="external" format="zip"/>
     <keydef keys="this-part-2-html-zip"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part2-tech-content/dita-v1.3-errata02-csprd01-part2-tech-content-complete-html.zip"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part2-tech-content/dita-v1.3-errata02-os-part2-tech-content-complete-html.zip"
       scope="external" format="zip"/>
     <keydef keys="this-part-2-grammars"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part2-tech-content/dita-v1.3-errata02-csprd01-part2-tech-content-complete-grammars.zip"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part2-tech-content/dita-v1.3-errata02-os-part2-tech-content-complete-grammars.zip"
       scope="external" format="zip"/>
     <keydef keys="this-part-2-dita"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part2-tech-content/dita-v1.3-errata02-csprd01-part2-tech-content-complete-dita.zip"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part2-tech-content/dita-v1.3-errata02-os-part2-tech-content-complete-dita.zip"
       scope="external" format="zip"/>
 
     <!-- Part 3: All-inclusive edition-->
     <keydef keys="this-part-3-html"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part3-all-inclusive/dita-v1.3-errata02-csprd01-part3-all-inclusive-complete.html"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part3-all-inclusive/dita-v1.3-errata02-os-part3-all-inclusive-complete.html"
       scope="external" format="html"/>
     <keydef keys="this-part-3-pdf"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part3-all-inclusive/dita-v1.3-errata02-csprd01-part3-all-inclusive-complete.pdf"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part3-all-inclusive/dita-v1.3-errata02-os-part3-all-inclusive-complete.pdf"
       scope="external" format="pdf"/>
     <keydef keys="this-part-3-chm"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part3-all-inclusive/dita-v1.3-errata02-csprd01-part3-all-inclusive-complete-chm.zip"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part3-all-inclusive/dita-v1.3-errata02-os-part3-all-inclusive-complete-chm.zip"
       scope="external" format="zip"/>
     <keydef keys="this-part-3-html-zip"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part3-all-inclusive/dita-v1.3-errata02-csprd01-part3-all-inclusive-complete-html.zip"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part3-all-inclusive/dita-v1.3-errata02-os-part3-all-inclusive-complete-html.zip"
       scope="external" format="zip"/>
     <keydef keys="this-part-3-grammars"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part3-all-inclusive/dita-v1.3-errata02-csprd01-part3-all-inclusive-complete-grammars.zip"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part3-all-inclusive/dita-v1.3-errata02-os-part3-all-inclusive-complete-grammars.zip"
       scope="external" format="zip"/>
     <keydef keys="this-part-3-dita"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part3-all-inclusive/dita-v1.3-errata02-csprd01-part3-all-inclusive-complete-dita.zip"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part3-all-inclusive/dita-v1.3-errata02-os-part3-all-inclusive-complete-dita.zip"
       scope="external" format="zip"/>
   </topichead>
 
@@ -188,28 +187,28 @@
       href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/dita-v1.3-errata02-csprd01.pdf"
       scope="external" format="pdf"/>
     <keydef keys="previous-part-0-html"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part0-overview/dita-v1.3-errata02-csprd01-part0-overview-complete.html"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/os/part0-overview/dita-v1.3-os-part0-overview-complete.html"
       scope="external" format="html"/>
     <keydef keys="previous-part-0-pdf"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part0-overview/dita-v1.3-errata02-csprd01-part0-overview-complete.pdf"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/os/part0-overview/dita-v1.3-os-part0-overview-complete.pdf"
       scope="external" format="pdf"/>
     <keydef keys="previous-part-1-html"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part1-base/dita-v1.3-errata02-csprd01-part1-base-complete.html"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/os/part1-base/dita-v1.3-os-part1-base.html"
       scope="external" format="html"/>
     <keydef keys="previous-part-1-pdf"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part1-base/dita-v1.3-errata02-csprd01-part1-base-complete.pdf"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/os/part1-base/dita-v1.3-os-part1-base.pdf"
       scope="external" format="pdf"/>
     <keydef keys="previous-part-2-html"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part2-tech-content/dita-v1.3-errata02-csprd01-part2-tech-content-complete.html"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/os/part2-tech-content/dita-v1.3-os-part2-tech-content-complete.html"
       scope="external" format="html"/>
     <keydef keys="previous-part-2-pdf"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part2-tech-content/dita-v1.3-errata02-csprd01-part2-tech-content-complete.pdf"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/os/part2-tech-content/dita-v1.3-os-part2-tech-content-complete.pdf"
       scope="external" format="pdf"/>
     <keydef keys="previous-part-3-html"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part3-all-inclusive/dita-v1.3-errata02-csprd01-part3-all-inclusive-complete.html"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/os/part3-all-inclusive/dita-v1.3-os-part3-all-inclusive-complete.html"
       scope="external" format="html"/>
     <keydef keys="previous-part-3-pdf"
-      href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part3-all-inclusive/dita-v1.3-errata02-csprd01-part3-all-inclusive-complete.pdf"
+      href="http://docs.oasis-open.org/dita/dita/v1.3/os/part3-all-inclusive/dita-v1.3-os-part3-all-inclusive-complete.pdf"
       scope="external" format="pdf"/>
   </topichead>
 

diff --git a/specification/errata-02/revision-history.dita b/specification/errata-02/revision-history.dita
@@ -20,27 +20,27 @@
     </strow>
     <strow>
      <stentry>02</stentry>
-     <stentry>09 May 2017</stentry>
+     <stentry>04 December 2017</stentry>
      <stentry>Kristen James Eberlein</stentry>
-     <stentry>Added update to the "Grammar files" topic</stentry>
+     <stentry>Generated Working Draft 01</stentry>
     </strow>
     <strow>
      <stentry>03</stentry>
-     <stentry>13 May 2017</stentry>
+     <stentry>16 January 2018</stentry>
      <stentry>Kristen James Eberlein</stentry>
-     <stentry>Updated "Acknowledgments" and "Revision history"</stentry>
+     <stentry>Updated source based on TC review</stentry>
     </strow>
     <strow>
      <stentry>04</stentry>
-     <stentry>04 December 2017</stentry>
+     <stentry>23 January 2018</stentry>
      <stentry>Kristen James Eberlein</stentry>
-     <stentry>Generated Working Draft 01</stentry>
+     <stentry>Generated Committee Specification/Public Review Draft 01 </stentry>
     </strow>
     <strow>
      <stentry>05</stentry>
-     <stentry>16 January 2018</stentry>
+     <stentry>19 June 2018</stentry>
      <stentry>Kristen James Eberlein</stentry>
-     <stentry>Updated source based on TC review</stentry>
+     <stentry>Generated final version for DITA TC approval</stentry>
     </strow>
 
    </simpletable>

diff --git a/specification/resources/oasis-errata-cover-all-inclusive.dita b/specification/resources/oasis-errata-cover-all-inclusive.dita
@@ -15,9 +15,15 @@
     </section>
     <section platform="dita-tc-publishing">
       <title>Previous version</title>
-      <p>N/A</p>
+      <!--<p>N/A</p>-->
       <!--For the first stage, the content of this section should be "N/A". If the document goes through a later stage, these URLs should be those previously listed in the "This version" section.-->
-      <!--<sl outputclass="no-indent"><sli><xref keyref="previous-part-3-html"><keyword keyref="previous-part-3-html"/></xref> (Authoritative version) </sli><sli> <xref keyref="previous-part-3-pdf"><keyword keyref="previous-part-3-pdf"/></xref> </sli></sl>-->
+      <sl outputclass="no-indent">
+        <sli><xref keyref="previous-part-3-html"><keyword keyref="previous-part-3-html"/></xref>
+          (Authoritative version) </sli>
+        <sli>
+          <xref keyref="previous-part-3-pdf"><keyword keyref="previous-part-3-pdf"/></xref>
+        </sli>
+      </sl>
     </section>
     <section platform="dita-tc-publishing">
       <title>Latest version</title>
@@ -35,18 +41,18 @@
       <p> This prose specification is one component of a work product that also includes: </p>
       <!-- KJE: Uncomment "OASIS Approved Errata" and "OASIS Standard incorporating Approved Errata" for the final publication of an errata release. -->
       <ul>
-        <li><cite><keyword keyref="title-errata"/></cite>.<!-- OASIS Approved Errata.-->
-          <xref keyref="this-errata-html"/></li>
-        <li><cite><keyword keyref="title-part-0"/></cite>.<!-- OASIS Standard incorporating Approved Errata.-->
-          <xref keyref="this-part-0-html"/>. </li>
-        <li><cite><keyword keyref="title-part-1"/></cite>.<!-- OASIS Standard incorporating Approved Errata.-->
-          <xref keyref="this-part-1-html"/>. <ph
+        <li><cite><keyword keyref="title-errata"/></cite>. OASIS Approved Errata. <xref
+            keyref="this-errata-html"/></li>
+        <li><cite><keyword keyref="title-part-0"/></cite>. OASIS Standard incorporating Approved
+          Errata. <xref keyref="this-part-0-html"/>. </li>
+        <li><cite><keyword keyref="title-part-1"/></cite>. OASIS Standard incorporating Approved
+          Errata. <xref keyref="this-part-1-html"/>. <ph
             conref="../common/conref-cover-pages.dita#reuse/base-desc-short"/></li>
-        <li><cite><keyword keyref="title-part-2"/></cite>.<!-- OASIS Standard incorporating Approved Errata.-->
-          <xref keyref="this-part-2-html"/>. <ph
+        <li><cite><keyword keyref="title-part-2"/></cite>. OASIS Standard incorporating Approved
+          Errata. <xref keyref="this-part-2-html"/>. <ph
             conref="../common/conref-cover-pages.dita#reuse/technicalContent-desc-short"/></li>
-        <li><cite><keyword keyref="title-part-3"/></cite> (this document).<!-- OASIS Standard incorporating Approved Errata.-->
-          <xref keyref="this-part-3-html"/>. <ph
+        <li><cite><keyword keyref="title-part-3"/></cite> (this document). OASIS Standard
+          incorporating Approved Errata. <xref keyref="this-part-3-html"/>. <ph
             conref="../common/conref-cover-pages.dita#reuse/allInclusive-desc-short"/></li>
         <li><ph conref="../common/conref-cover-pages.dita#reuse/chm-desc"/>
           <xref keyref="this-part-3-chm"/></li>