Merge
authorNigel Megitt <nigel.megitt@bbc.co.uk>
Fri, 17 Apr 2015 13:17:32 +0100
changeset 912 67dc33e6da2b
parent 911 170249c159c7 (current diff)
parent 910 13817e26078d (diff)
child 913 edcba2059576
Merge

Hg: --
--- a/ttml-ww-profiles/ttml-ww-profiles.html	Fri Apr 17 12:10:36 2015 +0100
+++ b/ttml-ww-profiles/ttml-ww-profiles.html	Fri Apr 17 13:17:32 2015 +0100
@@ -241,7 +241,7 @@
   </p>
   <h1 class="title p-name" id="title" property="dcterms:title">TTML Text and Image Profiles for Internet Media Subtitles and Captions 1.0</h1>
   
-  <h2 id="w3c-editor-s-draft-09-april-2015"><abbr title="World Wide Web Consortium">W3C</abbr> Editor's Draft <time property="dcterms:issued" class="dt-published" datetime="2015-04-09">09 April 2015</time></h2>
+  <h2 id="w3c-editor-s-draft-10-april-2015"><abbr title="World Wide Web Consortium">W3C</abbr> Editor's Draft <time property="dcterms:issued" class="dt-published" datetime="2015-04-10">10 April 2015</time></h2>
   <dl>
     
       <dt>This version:</dt>
@@ -1881,7 +1881,7 @@
         </tbody>
       </table>
 			
-			<div class="note"><div class="note-title" aria-level="4" role="heading" id="h-note13"><span>Note</span></div><p class="">In constrast to this specification, [<cite><a class="bibref" href="#bib-EBU-TT-D">EBU-TT-D</a></cite>] specifies that the attributes <code>ebutts:linePadding</code> and <code>ebutts:multiRowAlign</code> are constrained to be children of the <code>style</code> element.</p></div>
+			<div class="note"><div class="note-title" aria-level="4" role="heading" id="h-note13"><span>Note</span></div><p class="">In constrast to this specification, [<cite><a class="bibref" href="#bib-EBU-TT-D">EBU-TT-D</a></cite>] specifies that the attributes <code>ebutts:linePadding</code> and <code>ebutts:multiRowAlign</code> are allowed only on the <code>style</code> element.</p></div>
 			
     </section>
   </section>
--- a/ttml-ww-profiles/ttml-ww-profiles.source.html	Fri Apr 17 12:10:36 2015 +0100
+++ b/ttml-ww-profiles/ttml-ww-profiles.source.html	Fri Apr 17 13:17:32 2015 +0100
@@ -1572,7 +1572,7 @@
         </tbody>
       </table>
 			
-			<p class='note'>In constrast to this specification, [[!EBU-TT-D]] specifies that the attributes <code>ebutts:linePadding</code> and <code>ebutts:multiRowAlign</code> are constrained to be children of the <code>style</code> element.</p>
+			<p class='note'>In constrast to this specification, [[!EBU-TT-D]] specifies that the attributes <code>ebutts:linePadding</code> and <code>ebutts:multiRowAlign</code> are allowed only on the <code>style</code> element.</p>
 			
     </section>
   </section>