Merge pull request #1192 from w3c/issue-1190-update-to-cr

Update to CR Entities (#1190).

spec/acknowledgements.xml

@@ -12,7 +12,5 @@ Kirby (introductory example document; SMPTE time codes, descriptive metadata; EB
 and example images of style properties), Sean Hayes (advanced profile
 concepts, including applicative timing, HTML/CSS mapping proposal), Erik Hodge (timing),
 Thierry Michel (metadata), and Dave Singer (animation, scrolling).</p>
-<p>The editors also wish to acknowledge the support of the following current and past sponsors of their work
-on this specification: Cox Communications, Microsoft, Netflix, and Samsung Electronics.</p>
 <p>The Working Group dedicates this specification to our colleague David Kirby.</p>
 </inform-div1>

spec/entities.dtd

@@ -1,9 +1,9 @@
 
 <!-- comment / uncomment the appropriate entity -->
-<!ENTITY % sub.entities SYSTEM "entitiesedcopy.dtd" >
+<!-- <!ENTITY % sub.entities SYSTEM "entitiesedcopy.dtd" > -->
 <!-- <!ENTITY % sub.entities SYSTEM "entitieswd.dtd" > -->
 <!-- <!ENTITY % sub.entities SYSTEM "entitiesfpwd.dtd" > -->
-<!-- <!ENTITY % sub.entities SYSTEM "entitiescr.dtd" > -->
+<!ENTITY % sub.entities SYSTEM "entitiescr.dtd" >
 <!-- <!ENTITY % sub.entities SYSTEM "entitiespr.dtd" > -->
 <!-- <!ENTITY % sub.entities SYSTEM "entitiesrec.dtd" > -->
 

spec/entitiescr.dtd

@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='ISO-8859-1' ?>
 
 <!-- Date parameters -->
-<!ENTITY draft.year "2018">
-<!ENTITY draft.month "August">
-<!ENTITY draft.mm "08">
-<!ENTITY draft.day "14">
-<!ENTITY draft.dd "14">
+<!ENTITY draft.year "2020">
+<!ENTITY draft.month "January">
+<!ENTITY draft.mm "01">
+<!ENTITY draft.day "28">
+<!ENTITY draft.dd "28">
 
 <!ENTITY draft.date "&draft.year;&draft.mm;&draft.dd;">
 

spec/status.xml

@@ -2,57 +2,45 @@
 
 <status id="status">
 
-<p><emph>This section describes the status of this document at the
-time of its publication. Other documents may supersede this
-document. A list of current W3C publications and the latest revision
-of this technical report can be found in the <loc
-href="https://www.w3.org/TR/">W3C technical reports index</loc> at
-https://www.w3.org/TR/.</emph></p>
-
-<p>This is the Timed Text Markup Language &versionOfTT; (TTML&versionOfTT;)
-<loc href="https://www.w3.org/2018/Process-20180201/#RecsW3C">W3C Recommendation</loc>,
-produced by the <loc href="https://www.w3.org/AudioVideo/TT/">Timed Text (TT) Working Group</loc>
-as part of the W3C <loc href="http://www.w3.org/2008/WebVideo/">Video in the Web Activity</loc>,
-following the procedures set out for the W3C <loc href="https://www.w3.org/Consortium/Process/">Process</loc>.
-The authors of this document are listed in the header of this document.</p>
-
-<p>An <loc href="https://www.w3.org/wiki/TimedText/TTML2ImplementationReport">implementation
-report</loc> demonstrates that the specification is implementable.
-A cumulative summary of all changes from TTML1, 3rd Edition, <bibref ref="ttml1"/>
-is available at <loc href="ttml2-changes.html">Timed Text Markup Language 2 (TTML2)
-Change Summary</loc>.  An abbreviated list of changes affecting
-language syntax can be found at <specref ref="changes-from-ttml1-vocabulary"/>.</p>
-
-<p>Comments about this document are welcome by filing
-an <loc href="https://github.com/w3c/ttml2/issues">issue on GitHub</loc> or sending email
-to <loc href="mailto:public-tt@w3.org">public-tt@w3.org</loc>
+<p><emph>This section describes the status of this document at the time of its publication. Other documents may supersede this
+document. A list of current W3C publications and the latest revision of this technical report can be found in
+the <loc href="https://www.w3.org/TR/">W3C technical reports index</loc> at https://www.w3.org/TR/.</emph></p>
+
+<p>This is the First <loc href="https://www.w3.org/2019/Process-20190301/#candidate-rec">Candidate Recommendation</loc> (CR1) of
+the Second Edition of the Timed Text Markup Language &versionOfTT; (TTML&versionOfTT;), and is expected to advance to Proposed
+Recommendation no earlier than 17 March 2020.</p>
+
+<p>For this specification to exit CR, the following criterion must be met: for each feature (extension) affected by a substantive
+change introduced by this specification, at least two independent implementations must support the feature (extension) having been
+so affected. No (underlying) feature (extension) has been added or removed by this revision, and, as such, no feature
+(extension) is marked at risk.</p>
+
+<p>An <loc href="https://www.w3.org/wiki/TimedText/TTML2SecondEditionImplementationReport">implementation report</loc>
+will be provided.  A summary of technical changes from TTML2, 1st Edition, is available
+at <loc href="ttml2-changes.html">Timed Text Markup Language 2 (TTML2) Change Summary</loc>.
+Comments about this document are welcome by filing an <loc href="https://github.com/w3c/ttml2/issues">issue on GitHub</loc> or
+sending email to <loc href="mailto:public-tt@w3.org">public-tt@w3.org</loc>
 (<loc href="mailto:public-tt-request@w3.org?subject=subscribe">subscribe</loc>,
 <loc href="http://lists.w3.org/Archives/Public/public-tt/">archives</loc>)
 with a subject line starting with <code>[ttml2]</code>.</p>
 
-<p>This document has been reviewed by W3C Members, by software
-developers, and by other W3C groups and interested parties, and is
-endorsed by the Director as a W3C Recommendation. It is a stable
-document and may be used as reference material or cited from another
-document. W3C's role in making the Recommendation is to draw attention
-to the specification and to promote its widespread deployment. This
-enhances the functionality and interoperability of the Web.</p>
-
-<p>This document was produced by a group operating under the <loc
-href="https://www.w3.org/Consortium/Patent-Policy/">W3C Patent
-Policy</loc>.  W3C maintains a <loc role="disclosure"
-href="https://www.w3.org/2004/01/pp-impl/34314/status#disclosures">public
-list of any patent disclosures</loc> made in connection with the
-deliverables of the group; that page also includes instructions for
-disclosing a patent. An individual who has actual knowledge of a
-patent which the individual believes contains <loc
-href="https://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential
-Claim(s)</loc> must disclose the information in accordance with <loc
-href="https://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section
-6 of the W3C Patent Policy</loc>.</p>
-
-<p>This document is governed by the <loc id="w3c_process_revision"
-href="https://www.w3.org/2018/Process-20180201/">1 February 2018 W3C
-Process Document</loc>.</p>
+<p>This document was produced by the <loc href="https://www.w3.org/AudioVideo/TT/">Timed Text (TT) Working Group</loc>, the
+authors of which are listed in the header of this document. W3C publishes a Candidate Recommendation to indicate that the document
+is believed to be stable and to encourage implementation by the developer community.</p>
+
+<p>Publication as a Candidate Recommendation does not imply endorsement by the W3C Membership. This is a draft document and may be
+updated, replaced or obsoleted by other documents at any time. It is inappropriate to cite this document as other than work in
+progress.</p>
+
+<p>This document was produced by a group operating under the <loc href="https://www.w3.org/Consortium/Patent-Policy/">W3C Patent
+Policy</loc>.  W3C maintains a <loc role="disclosure" href="https://www.w3.org/2004/01/pp-impl/34314/status#disclosures">public
+list of any patent disclosures</loc> made in connection with the deliverables of the group; that page also includes instructions
+for disclosing a patent. An individual who has actual knowledge of a patent which the individual believes
+contains <loc href="https://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential Claim(s)</loc> must disclose
+the information in accordance with <loc href="https://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 6 of
+the W3C Patent Policy</loc>.</p>
+
+<p>This document is governed by the <loc id="w3c_process_revision" href="https://www.w3.org/2019/Process-20190301/">1 March 2019
+W3C Process Document</loc>.</p>
 
 </status>

spec/ttml2.xml

@@ -85,7 +85,7 @@
 <authlist id="editors" role="editor">
 <author w3c-uid="34030">
 <name>Glenn Adams</name>
-<affiliation>Skynav</affiliation>
+<affiliation>Invited Expert</affiliation>
 </author>
 <author>
 <name>Cyril Concolato</name>
@@ -95,7 +95,7 @@
 <authlist id="contributors" role="contributor">
 <author w3c-uid="34030">
 <name>Glenn Adams</name>
-<affiliation>Skynav</affiliation>
+<affiliation>Invited Expert</affiliation>
 </author>
 <author>
 <name>Cyril Concolato</name>
@@ -140,8 +140,8 @@
 </authlist>
 <errataloc href="https://www.w3.org/2018/11/ttml2-errata.html"/>
 <abstract id="abstract">
-<p>This document specifies the Timed Text Markup Language (TTML),
-Version 2, also known as TTML2, in terms of a vocabulary and semantics
+<p>This document specifies the Second Edition of the Timed Text Markup Language (TTML),
+Version 2, also known as TTML2 (2e), in terms of a vocabulary and semantics
 thereof.</p>
 <p>The Timed Text Markup Language is a content type that represents
 timed text media for the purpose of interchange among authoring
@@ -1473,7 +1473,7 @@ either a <loc href="#terms-core-module">core module</loc> or an <loc href="#term
 <p>A module is distinct from (and orthogonal to) a <loc href="#terms-profile">profile</loc> in the sense that the former
 defines functionality (regardless of application of use) while the latter selects functionality (for support by a processor
 or use by a document). Note also that a single specification may define functionality (either explicitly or implicitly) associated
-with a module and also define a profile. For example, this specification defines a collection of <loc href="#terms-internal-module">core modules</loc>
+with a module and also define a profile. For example, this specification defines a collection of <loc href="#terms-core-module">core modules</loc>
 and also defines three <loc href="#terms-profile">profiles</loc>, about which see <specref ref="core-vocabulary-overview"/> and
 <specref ref="standard-profiles"/>, respectively.</p>
 </note>
@@ -3356,7 +3356,7 @@ procedure;</p>
 <def>
 <olist>
 <item>
-<p>initialize inferred processor profile <emph>IPP</emph> to a <loc href="#semantics-profile-state-profile-instance">profile instance</loc> for which its <loc href="#semantics-profile-state-profile-combined-specification-set">combined specification set</loc> is a copy of the <loc href="#semantics-profile-state-empty-combined-specification-set">empty profile specification set</loc>;</p>
+<p>initialize inferred processor profile <emph>IPP</emph> to a <loc href="#semantics-profile-state-profile-instance">profile instance</loc> for which its <loc href="#semantics-profile-state-profile-combined-specification-set">combined specification set</loc> is a copy of the <loc href="#semantics-profile-state-empty-profile-specification-set">empty profile specification set</loc>;</p>
 </item>
 <item>
 <p>for each profile specification, <emph>S</emph>, in the <loc href="#semantics-profile-state-combined-profile-specification-set">combined profile specification set</loc> <emph>CPSS</emph>:</p>

spec/xmlspec-ttml2.xsl

@@ -547,7 +547,7 @@ width: 100%;
       </xsl:when>
       <xsl:otherwise>
         <p class="copyright">
-          <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">
+          <a href="https://www.w3.org/Consortium/Legal/ipr-notice#Copyright">
             <xsl:text>Copyright</xsl:text>
           </a>
           <xsl:text>&#xa0;&#xa9;&#xa0;</xsl:text>
@@ -568,7 +568,7 @@ width: 100%;
           <xsl:text>, </xsl:text>
           <a href="https://www.keio.ac.jp/">Keio</a>
           <xsl:text>, </xsl:text>
-          <a href="http://ev.buaa.edu.cn/">Beihang</a>
+          <a href="https://ev.buaa.edu.cn/">Beihang</a>
           <xsl:text>). W3C </xsl:text>
           <a href="https://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>
           <xsl:text>, </xsl:text>