Skip to content

Commit 14dae1a

Browse files
authored
Merge pull request #138 from keberlein/final-errata-02-build
Final errata 02 build
2 parents 8335082 + 99b413a commit 14dae1a

9 files changed

+144
-116
lines changed

specification/dita-1.3-errata-specification-base.ditamap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<booktitle outputclass="specificationTitles">
88
<mainbooktitle outputclass="specificationTitle">Darwin Information Typing Architecture (DITA)
99
Version 1.3 Part 1: Base Edition <ph rev="errata-02">Plus Errata <keyword keyref="errata-num"/></ph></mainbooktitle>
10-
<booktitlealt outputclass="specificationSubtitle1">OASIS Standard Incorporating <keyword
11-
keyref="specification-level"/> of Errata 02</booktitlealt>
10+
<booktitlealt outputclass="specificationSubtitle1">OASIS Standard <ph rev="errata-02"
11+
>Incorporating Approved Errata</ph></booktitlealt>
1212
<booktitlealt outputclass="specificationApproved"><keyword keyref="approval-date"
1313
/></booktitlealt>
1414
<booktitlealt outputclass="specificationShorttitle">DITA Version 1.3

specification/dita-13-key-definitions-common-metadata.ditamap

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,15 @@
3131
<!-- Needs to be changed at every stage of the OASIS publication process? -->
3232
<topicmeta>
3333
<keywords>
34-
<keyword>csprd</keyword>
34+
<keyword>os</keyword>
3535
</keywords>
3636
</topicmeta>
3737
</keydef>
3838
<keydef keys="revision-num">
39+
<!-- KJE 30 May 2018: Set this to empty for the 'os' stage -->
3940
<topicmeta>
4041
<keywords>
41-
<keyword>01</keyword>
42+
<keyword></keyword>
4243
</keywords>
4344
</topicmeta>
4445
</keydef>

specification/dita-13-key-definitions-cover-pages.ditamap

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<!--Use the following format: <day> <month> <year> -->
1212
<topicmeta>
1313
<keywords>
14-
<keyword>23 January 2018</keyword>
14+
<keyword>19 June 2018</keyword>
1515
</keywords>
1616
</topicmeta>
1717
</keydef>
@@ -21,7 +21,7 @@
2121
<!--Changes at every stage of the OASIS process-->
2222
<topicmeta>
2323
<keywords>
24-
<keyword>Committee Specification Draft 01 / Public Review Draft 01</keyword>
24+
<keyword>OASIS Approved Errata</keyword>
2525
</keywords>
2626
</topicmeta>
2727
</keydef>
@@ -73,7 +73,7 @@
7373
<!-- Needs to contain the latest OASIS metadata in @href-->
7474
<!-- KJE 9 May 2017: Need to check with Paul Knight about this -->
7575
<keydef keys="editions-topic-in-overview"
76-
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"
76+
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"
7777
scope="external" format="html"/>
7878
</topichead>
7979

@@ -83,95 +83,94 @@
8383
<!-- Use a careful search and replace strategy to change the value of the @href attribute. -->
8484

8585
<!-- Errata document-->
86-
<!-- dita-v1.3-errata02-csprd01-part0-overview-complete.html-->
8786
<keydef keys="this-errata-html"
88-
href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/dita-v1.3-errata02-csprd01.html"
87+
href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/dita-v1.3-errata02-os.html"
8988
scope="external" format="html"/>
9089

9190
<keydef keys="this-errata-pdf"
92-
href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/dita-v1.3-errata02-csprd01.pdf"
91+
href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/dita-v1.3-errata02-os.pdf"
9392
scope="external" format="pdf"/>
9493

9594
<keydef keys="this-errata-dita"
96-
href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/dita-v1.3-errata02-csprd01-dita.zip"
95+
href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/dita-v1.3-errata02-os-dita.zip"
9796
scope="external" format="zip"/>
9897

9998
<!--Part 0: Overview -->
10099
<keydef keys="this-part-0-html"
101-
href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part0-overview/dita-v1.3-errata02-csprd01-part0-overview-complete.html"
100+
href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part0-overview/dita-v1.3-errata02-os-part0-overview-complete.html"
102101
scope="external" format="html"/>
103102

104103
<keydef keys="this-part-0-pdf"
105-
href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part0-overview/dita-v1.3-errata02-csprd01-part0-overview-complete.pdf"
104+
href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part0-overview/dita-v1.3-errata02-os-part0-overview-complete.pdf"
106105
scope="external" format="pdf"/>
107106

108107
<keydef keys="this-part-0-dita"
109-
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"
108+
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"
110109
scope="external" format="zip"/>
111110

112111
<!-- Part 1: Base edition-->
113112
<keydef keys="this-part-1-html"
114-
href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part1-base/dita-v1.3-errata02-csprd01-part1-base-complete.html"
113+
href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part1-base/dita-v1.3-errata02-os-part1-base-complete.html"
115114
scope="external" format="html"/>
116115

117116
<keydef keys="this-part-1-pdf"
118-
href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part1-base/dita-v1.3-errata02-csprd01-part1-base-complete.pdf"
117+
href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/os/complete/part1-base/dita-v1.3-errata02-os-part1-base-complete.pdf"
119118
scope="external" format="pdf"/>
120119

121120
<keydef keys="this-part-1-chm"
122-
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"
121+
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"
123122
scope="external" format="zip"/>
124123

125124
<keydef keys="this-part-1-html-zip"
126-
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"
125+
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"
127126
scope="external" format="zip"/>
128127

129128
<keydef keys="this-part-1-grammars"
130-
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"
129+
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"
131130
scope="external" format="zip"/>
132131

133132
<keydef keys="this-part-1-dita"
134-
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"
133+
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"
135134
scope="external" format="zip"/>
136135

137136
<!-- Part 2: Technical content edition-->
138137
<keydef keys="this-part-2-html"
139-
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"
138+
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"
140139
scope="external" format="html"/>
141140
<keydef keys="this-part-2-pdf"
142-
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"
141+
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"
143142
scope="external" format="pdf"/>
144143
<keydef keys="this-part-2-chm"
145-
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"
144+
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"
146145
scope="external" format="zip"/>
147146
<keydef keys="this-part-2-html-zip"
148-
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"
147+
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"
149148
scope="external" format="zip"/>
150149
<keydef keys="this-part-2-grammars"
151-
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"
150+
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"
152151
scope="external" format="zip"/>
153152
<keydef keys="this-part-2-dita"
154-
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"
153+
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"
155154
scope="external" format="zip"/>
156155

157156
<!-- Part 3: All-inclusive edition-->
158157
<keydef keys="this-part-3-html"
159-
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"
158+
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"
160159
scope="external" format="html"/>
161160
<keydef keys="this-part-3-pdf"
162-
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"
161+
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"
163162
scope="external" format="pdf"/>
164163
<keydef keys="this-part-3-chm"
165-
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"
164+
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"
166165
scope="external" format="zip"/>
167166
<keydef keys="this-part-3-html-zip"
168-
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"
167+
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"
169168
scope="external" format="zip"/>
170169
<keydef keys="this-part-3-grammars"
171-
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"
170+
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"
172171
scope="external" format="zip"/>
173172
<keydef keys="this-part-3-dita"
174-
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"
173+
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"
175174
scope="external" format="zip"/>
176175
</topichead>
177176

@@ -188,28 +187,28 @@
188187
href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/dita-v1.3-errata02-csprd01.pdf"
189188
scope="external" format="pdf"/>
190189
<keydef keys="previous-part-0-html"
191-
href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part0-overview/dita-v1.3-errata02-csprd01-part0-overview-complete.html"
190+
href="http://docs.oasis-open.org/dita/dita/v1.3/os/part0-overview/dita-v1.3-os-part0-overview-complete.html"
192191
scope="external" format="html"/>
193192
<keydef keys="previous-part-0-pdf"
194-
href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part0-overview/dita-v1.3-errata02-csprd01-part0-overview-complete.pdf"
193+
href="http://docs.oasis-open.org/dita/dita/v1.3/os/part0-overview/dita-v1.3-os-part0-overview-complete.pdf"
195194
scope="external" format="pdf"/>
196195
<keydef keys="previous-part-1-html"
197-
href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part1-base/dita-v1.3-errata02-csprd01-part1-base-complete.html"
196+
href="http://docs.oasis-open.org/dita/dita/v1.3/os/part1-base/dita-v1.3-os-part1-base.html"
198197
scope="external" format="html"/>
199198
<keydef keys="previous-part-1-pdf"
200-
href="http://docs.oasis-open.org/dita/dita/v1.3/errata02/csprd01/complete/part1-base/dita-v1.3-errata02-csprd01-part1-base-complete.pdf"
199+
href="http://docs.oasis-open.org/dita/dita/v1.3/os/part1-base/dita-v1.3-os-part1-base.pdf"
201200
scope="external" format="pdf"/>
202201
<keydef keys="previous-part-2-html"
203-
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"
202+
href="http://docs.oasis-open.org/dita/dita/v1.3/os/part2-tech-content/dita-v1.3-os-part2-tech-content-complete.html"
204203
scope="external" format="html"/>
205204
<keydef keys="previous-part-2-pdf"
206-
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"
205+
href="http://docs.oasis-open.org/dita/dita/v1.3/os/part2-tech-content/dita-v1.3-os-part2-tech-content-complete.pdf"
207206
scope="external" format="pdf"/>
208207
<keydef keys="previous-part-3-html"
209-
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"
208+
href="http://docs.oasis-open.org/dita/dita/v1.3/os/part3-all-inclusive/dita-v1.3-os-part3-all-inclusive-complete.html"
210209
scope="external" format="html"/>
211210
<keydef keys="previous-part-3-pdf"
212-
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"
211+
href="http://docs.oasis-open.org/dita/dita/v1.3/os/part3-all-inclusive/dita-v1.3-os-part3-all-inclusive-complete.pdf"
213212
scope="external" format="pdf"/>
214213
</topichead>
215214

specification/errata-02/revision-history.dita

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@
2020
</strow>
2121
<strow>
2222
<stentry>02</stentry>
23-
<stentry>09 May 2017</stentry>
23+
<stentry>04 December 2017</stentry>
2424
<stentry>Kristen James Eberlein</stentry>
25-
<stentry>Added update to the "Grammar files" topic</stentry>
25+
<stentry>Generated Working Draft 01</stentry>
2626
</strow>
2727
<strow>
2828
<stentry>03</stentry>
29-
<stentry>13 May 2017</stentry>
29+
<stentry>16 January 2018</stentry>
3030
<stentry>Kristen James Eberlein</stentry>
31-
<stentry>Updated "Acknowledgments" and "Revision history"</stentry>
31+
<stentry>Updated source based on TC review</stentry>
3232
</strow>
3333
<strow>
3434
<stentry>04</stentry>
35-
<stentry>04 December 2017</stentry>
35+
<stentry>23 January 2018</stentry>
3636
<stentry>Kristen James Eberlein</stentry>
37-
<stentry>Generated Working Draft 01</stentry>
37+
<stentry>Generated Committee Specification/Public Review Draft 01 </stentry>
3838
</strow>
3939
<strow>
4040
<stentry>05</stentry>
41-
<stentry>16 January 2018</stentry>
41+
<stentry>19 June 2018</stentry>
4242
<stentry>Kristen James Eberlein</stentry>
43-
<stentry>Updated source based on TC review</stentry>
43+
<stentry>Generated final version for DITA TC approval</stentry>
4444
</strow>
4545

4646
</simpletable>

specification/resources/oasis-errata-cover-all-inclusive.dita

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,15 @@
1515
</section>
1616
<section platform="dita-tc-publishing">
1717
<title>Previous version</title>
18-
<p>N/A</p>
18+
<!--<p>N/A</p>-->
1919
<!--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.-->
20-
<!--<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>-->
20+
<sl outputclass="no-indent">
21+
<sli><xref keyref="previous-part-3-html"><keyword keyref="previous-part-3-html"/></xref>
22+
(Authoritative version) </sli>
23+
<sli>
24+
<xref keyref="previous-part-3-pdf"><keyword keyref="previous-part-3-pdf"/></xref>
25+
</sli>
26+
</sl>
2127
</section>
2228
<section platform="dita-tc-publishing">
2329
<title>Latest version</title>
@@ -35,18 +41,18 @@
3541
<p> This prose specification is one component of a work product that also includes: </p>
3642
<!-- KJE: Uncomment "OASIS Approved Errata" and "OASIS Standard incorporating Approved Errata" for the final publication of an errata release. -->
3743
<ul>
38-
<li><cite><keyword keyref="title-errata"/></cite>.<!-- OASIS Approved Errata.-->
39-
<xref keyref="this-errata-html"/></li>
40-
<li><cite><keyword keyref="title-part-0"/></cite>.<!-- OASIS Standard incorporating Approved Errata.-->
41-
<xref keyref="this-part-0-html"/>. </li>
42-
<li><cite><keyword keyref="title-part-1"/></cite>.<!-- OASIS Standard incorporating Approved Errata.-->
43-
<xref keyref="this-part-1-html"/>. <ph
44+
<li><cite><keyword keyref="title-errata"/></cite>. OASIS Approved Errata. <xref
45+
keyref="this-errata-html"/></li>
46+
<li><cite><keyword keyref="title-part-0"/></cite>. OASIS Standard incorporating Approved
47+
Errata. <xref keyref="this-part-0-html"/>. </li>
48+
<li><cite><keyword keyref="title-part-1"/></cite>. OASIS Standard incorporating Approved
49+
Errata. <xref keyref="this-part-1-html"/>. <ph
4450
conref="../common/conref-cover-pages.dita#reuse/base-desc-short"/></li>
45-
<li><cite><keyword keyref="title-part-2"/></cite>.<!-- OASIS Standard incorporating Approved Errata.-->
46-
<xref keyref="this-part-2-html"/>. <ph
51+
<li><cite><keyword keyref="title-part-2"/></cite>. OASIS Standard incorporating Approved
52+
Errata. <xref keyref="this-part-2-html"/>. <ph
4753
conref="../common/conref-cover-pages.dita#reuse/technicalContent-desc-short"/></li>
48-
<li><cite><keyword keyref="title-part-3"/></cite> (this document).<!-- OASIS Standard incorporating Approved Errata.-->
49-
<xref keyref="this-part-3-html"/>. <ph
54+
<li><cite><keyword keyref="title-part-3"/></cite> (this document). OASIS Standard
55+
incorporating Approved Errata. <xref keyref="this-part-3-html"/>. <ph
5056
conref="../common/conref-cover-pages.dita#reuse/allInclusive-desc-short"/></li>
5157
<li><ph conref="../common/conref-cover-pages.dita#reuse/chm-desc"/>
5258
<xref keyref="this-part-3-chm"/></li>

0 commit comments

Comments
 (0)