--- a/ttml10/spec/entities.dtd	Thu Mar 01 01:47:03 2012 -0700
+++ b/ttml10/spec/entities.dtd	Wed Mar 07 22:48:01 2012 -0700
@@ -6,7 +6,7 @@
 %sub.entities;
 
 <!-- Titles -->
-<!ENTITY title "Timed Text Markup Language (TTML) 1.0">
+<!ENTITY title "Timed Text Markup Language (TTML) 1.0 (Second Edition)" >
 
 <!-- XML Namespaces used in the drafts -->
 <!ENTITY nsuri "http://www.w3.org/ns/ttml" >

--- a/ttml10/spec/profiles/dfxp-full.xml	Thu Mar 01 01:47:03 2012 -0700
+++ b/ttml10/spec/profiles/dfxp-full.xml	Wed Mar 07 22:48:01 2012 -0700
@@ -46,6 +46,7 @@
     <feature value="required">#layout</feature>
     <feature value="required">#length-cell</feature>
     <feature value="required">#length-em</feature>
+    <feature value="required">#length-integer</feature>
     <feature value="required">#length-negative</feature>
     <feature value="required">#length-percentage</feature>
     <feature value="required">#length-pixel</feature>
@@ -57,13 +58,11 @@
     <feature value="required">#markerMode-continuous</feature>
     <feature value="required">#markerMode-discontinuous</feature>
     <feature value="required">#markerMode</feature>
-    <feature value="required">#metadata-foreign</feature>
     <feature value="required">#metadata</feature>
     <feature value="required">#nested-div</feature>
     <feature value="required">#nested-span</feature>
     <feature value="required">#opacity</feature>
     <feature value="required">#origin</feature>
-    <feature value="required">#overflow-scroll</feature>
     <feature value="required">#overflow-visible</feature>
     <feature value="required">#overflow</feature>
     <feature value="required">#padding-1</feature>

--- a/ttml10/spec/profiles/dfxp-presentation.xml	Thu Mar 01 01:47:03 2012 -0700
+++ b/ttml10/spec/profiles/dfxp-presentation.xml	Wed Mar 07 22:48:01 2012 -0700
@@ -52,6 +52,7 @@
     <feature value="optional">#layout</feature>
     <feature value="optional">#length-cell</feature>
     <feature value="optional">#length-em</feature>
+    <feature value="optional">#length-integer</feature>
     <feature value="optional">#length-negative</feature>
     <feature value="optional">#length-percentage</feature>
     <feature value="optional">#length-pixel</feature>
@@ -63,13 +64,11 @@
     <feature value="optional">#markerMode-continuous</feature>
     <feature value="optional">#markerMode-discontinuous</feature>
     <feature value="optional">#markerMode</feature>
-    <feature value="optional">#metadata-foreign</feature>
     <feature value="optional">#metadata</feature>
     <feature value="optional">#nested-div</feature>
     <feature value="optional">#nested-span</feature>
     <feature value="optional">#opacity</feature>
     <feature value="optional">#origin</feature>
-    <feature value="optional">#overflow-scroll</feature>
     <feature value="optional">#overflow-visible</feature>
     <feature value="optional">#overflow</feature>
     <feature value="optional">#padding-1</feature>

--- a/ttml10/spec/profiles/dfxp-transformation.xml	Thu Mar 01 01:47:03 2012 -0700
+++ b/ttml10/spec/profiles/dfxp-transformation.xml	Wed Mar 07 22:48:01 2012 -0700
@@ -52,6 +52,7 @@
     <feature value="optional">#layout</feature>
     <feature value="optional">#length-cell</feature>
     <feature value="optional">#length-em</feature>
+    <feature value="optional">#length-integer</feature>
     <feature value="optional">#length-negative</feature>
     <feature value="optional">#length-percentage</feature>
     <feature value="optional">#length-pixel</feature>
@@ -63,13 +64,11 @@
     <feature value="optional">#markerMode-continuous</feature>
     <feature value="optional">#markerMode-discontinuous</feature>
     <feature value="optional">#markerMode</feature>
-    <feature value="optional">#metadata-foreign</feature>
     <feature value="optional">#metadata</feature>
     <feature value="optional">#nested-div</feature>
     <feature value="optional">#nested-span</feature>
     <feature value="optional">#opacity</feature>
     <feature value="optional">#origin</feature>
-    <feature value="optional">#overflow-scroll</feature>
     <feature value="optional">#overflow-visible</feature>
     <feature value="optional">#overflow</feature>
     <feature value="optional">#padding-1</feature>

--- a/ttml10/spec/ttaf1-dfxp.html	Thu Mar 01 01:47:03 2012 -0700
+++ b/ttml10/spec/ttaf1-dfxp.html	Wed Mar 07 22:48:01 2012 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html
   PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us"><head><meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8"/><title>Timed Text Markup Language (TTML) 1.0 -- (Editors' copy)</title><style type="text/css">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us"><head><meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8"/><title>Timed Text Markup Language (TTML) 1.0 (Second Edition) -- (Editors' copy)</title><style type="text/css">
 code           { font-family: monospace; }
 
 div.constraint,
@@ -70,8 +70,8 @@
 .diff-del  { color: red; text-decoration: line-through; background-color: #99FF99; }
 .diff-chg  { background-color: #99FF99; }
 q.diff-off  {}
-</style><link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/base.css"/></head><body>Last Modified: $Date$<div id="revisions"/><div class="head">
-<h1><a name="title" id="title"/>Timed Text Markup Language (TTML) 1.0</h1>
+</style><link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/W3C-ED.css"/></head><body>Last Modified: $Date$<div id="revisions"/><div class="head">
+<h1><a name="title" id="title"/>Timed Text Markup Language (TTML) 1.0 (Second Edition)</h1>
 <h2><a name="w3c-doctype" id="w3c-doctype"/>Editors' copy $Date$ @@ @@@@ @@@@</h2><dl><dt>This version:</dt><dd>
 <a href="ttaf1-dfxp.html">ttaf1-dfxp.html</a>
 </dd><dt>Latest version:</dt><dd><a href="http://dvcs.w3.org/hg/ttml/raw-file/tip/ttml10/spec/ttaf1-dfxp.html?content-type=text/html;charset=utf-8">http://dvcs.w3.org/hg/ttml/raw-file/tip/ttml10/spec/ttaf1-dfxp.html?content-type=text/html;charset=utf-8</a></dd><dt>Previous version:</dt><dd>
@@ -3052,7 +3052,7 @@
 rendered over area(s) generated by lexically prior elements, where lexical
 order is defined as the postorder traversal of a document
 instance.</p><p>The semantics of the value <code>auto</code> are those defined by
-<a href="#xsl11">[XSL 1.1]</a>, § 7.28.9, where the <code>tt</code> element
+<a href="#xsl11">[XSL 1.1]</a>, § 7.30.18, where the <code>tt</code> element
 is considered to establish the root stacking context.</p><p>If a specified value of this attribute is not supported,
 then a presentation processor must interpret the attribute as if the
 value <code>auto</code> were specified.</p><p>The <code>tts:zIndex</code> style is illustrated by the following example.</p><table summary="HTML Table" id="style-attribute-zIndex-example-1" class="example"><caption>Example Fragment – Z Index</caption><tbody><tr><td>
@@ -4243,7 +4243,7 @@
 element instance.</p><p>Each time container is considered to constitute an independent time base, i.e.,
 time coordinate system.</p><p>If a <code>timeContainer</code> attribute is not specified on an element that
 has time container semantics, then <code>par</code> time container semantics must apply.</p><p>Time container semantics applies only to the following element types:</p><ul><li><p><a href="#document-structure-vocabulary-body"><code>body</code></a></p></li><li><p><a href="#content-vocabulary-div"><code>div</code></a></p></li><li><p><a href="#content-vocabulary-p"><code>p</code></a></p></li><li><p><a href="#layout-vocabulary-region"><code>region</code></a></p></li><li><p><a href="#content-vocabulary-span"><code>span</code></a></p></li></ul><p>The semantics of parallel and sequential time
-containment are those defined by <a href="#smil21">[SMIL 2.1]</a>, § 10.3.2,
+containment are those defined by <a href="#smil21">[SMIL 2.1]</a>, § 10.4.2,
 while taking into account any overriding semantics defined by this specification.</p></div></div><div class="div2">
 <h3><a name="timing-time-value-expressions" id="timing-time-value-expressions"/>10.3 Time Value Expressions</h3><p>Timing attribute values include the use of the following expressions:</p><ul><li><p><a href="#timing-value-timeExpression"><b>10.3.1 &lt;timeExpression&gt;</b></a></p></li></ul><div class="div3">
 <h4><a name="timing-value-timeExpression" id="timing-value-timeExpression"/>10.3.1 &lt;timeExpression&gt;</h4><p>A &lt;timeExpression&gt; is used to specify a coordinate along
@@ -4411,7 +4411,7 @@
 create an effect of moving the region, which may be desirable so as
 to avoid obscuring characters in an underlying video with captions.</p></div><div class="note"><p class="prefix"><b>Note:</b></p><p>The semantics of the <code>set</code> element
 are based upon that defined by <a href="#smil21">[SMIL 2.1]</a>,
-§ 3.5.2.</p></div></div></div><div class="div2">
+§ 3.6.2.</p></div></div></div><div class="div2">
 <h3><a name="animation-attribute-vocabulary" id="animation-attribute-vocabulary"/>11.2 Animation Attribute Vocabulary</h3><p>No animation related attribute vocabulary is defined for use in the
 core vocabulary catalog.</p></div></div><div class="div1">
 <h2><a name="metadata" id="metadata"/>12 Metadata</h2><p>This section specifies the <em>metadata</em> matter of the core
@@ -7815,6 +7815,7 @@
     &lt;feature value="optional"&gt;#layout&lt;/feature&gt;
     &lt;feature value="optional"&gt;#length-cell&lt;/feature&gt;
     &lt;feature value="optional"&gt;#length-em&lt;/feature&gt;
+    &lt;feature value="optional"&gt;#length-integer&lt;/feature&gt;
     &lt;feature value="optional"&gt;#length-negative&lt;/feature&gt;
     &lt;feature value="optional"&gt;#length-percentage&lt;/feature&gt;
     &lt;feature value="optional"&gt;#length-pixel&lt;/feature&gt;
@@ -7826,13 +7827,11 @@
     &lt;feature value="optional"&gt;#markerMode-continuous&lt;/feature&gt;
     &lt;feature value="optional"&gt;#markerMode-discontinuous&lt;/feature&gt;
     &lt;feature value="optional"&gt;#markerMode&lt;/feature&gt;
-    &lt;feature value="optional"&gt;#metadata-foreign&lt;/feature&gt;
     &lt;feature value="optional"&gt;#metadata&lt;/feature&gt;
     &lt;feature value="optional"&gt;#nested-div&lt;/feature&gt;
     &lt;feature value="optional"&gt;#nested-span&lt;/feature&gt;
     &lt;feature value="optional"&gt;#opacity&lt;/feature&gt;
     &lt;feature value="optional"&gt;#origin&lt;/feature&gt;
-    &lt;feature value="optional"&gt;#overflow-scroll&lt;/feature&gt;
     &lt;feature value="optional"&gt;#overflow-visible&lt;/feature&gt;
     &lt;feature value="optional"&gt;#overflow&lt;/feature&gt;
     &lt;feature value="optional"&gt;#padding-1&lt;/feature&gt;
@@ -7945,6 +7944,7 @@
     &lt;feature value="optional"&gt;#layout&lt;/feature&gt;
     &lt;feature value="optional"&gt;#length-cell&lt;/feature&gt;
     &lt;feature value="optional"&gt;#length-em&lt;/feature&gt;
+    &lt;feature value="optional"&gt;#length-integer&lt;/feature&gt;
     &lt;feature value="optional"&gt;#length-negative&lt;/feature&gt;
     &lt;feature value="optional"&gt;#length-percentage&lt;/feature&gt;
     &lt;feature value="optional"&gt;#length-pixel&lt;/feature&gt;
@@ -7956,13 +7956,11 @@
     &lt;feature value="optional"&gt;#markerMode-continuous&lt;/feature&gt;
     &lt;feature value="optional"&gt;#markerMode-discontinuous&lt;/feature&gt;
     &lt;feature value="optional"&gt;#markerMode&lt;/feature&gt;
-    &lt;feature value="optional"&gt;#metadata-foreign&lt;/feature&gt;
     &lt;feature value="optional"&gt;#metadata&lt;/feature&gt;
     &lt;feature value="optional"&gt;#nested-div&lt;/feature&gt;
     &lt;feature value="optional"&gt;#nested-span&lt;/feature&gt;
     &lt;feature value="optional"&gt;#opacity&lt;/feature&gt;
     &lt;feature value="optional"&gt;#origin&lt;/feature&gt;
-    &lt;feature value="optional"&gt;#overflow-scroll&lt;/feature&gt;
     &lt;feature value="optional"&gt;#overflow-visible&lt;/feature&gt;
     &lt;feature value="optional"&gt;#overflow&lt;/feature&gt;
     &lt;feature value="optional"&gt;#padding-1&lt;/feature&gt;
@@ -8069,6 +8067,7 @@
     &lt;feature value="required"&gt;#layout&lt;/feature&gt;
     &lt;feature value="required"&gt;#length-cell&lt;/feature&gt;
     &lt;feature value="required"&gt;#length-em&lt;/feature&gt;
+    &lt;feature value="required"&gt;#length-integer&lt;/feature&gt;
     &lt;feature value="required"&gt;#length-negative&lt;/feature&gt;
     &lt;feature value="required"&gt;#length-percentage&lt;/feature&gt;
     &lt;feature value="required"&gt;#length-pixel&lt;/feature&gt;
@@ -8080,13 +8079,11 @@
     &lt;feature value="required"&gt;#markerMode-continuous&lt;/feature&gt;
     &lt;feature value="required"&gt;#markerMode-discontinuous&lt;/feature&gt;
     &lt;feature value="required"&gt;#markerMode&lt;/feature&gt;
-    &lt;feature value="required"&gt;#metadata-foreign&lt;/feature&gt;
     &lt;feature value="required"&gt;#metadata&lt;/feature&gt;
     &lt;feature value="required"&gt;#nested-div&lt;/feature&gt;
     &lt;feature value="required"&gt;#nested-span&lt;/feature&gt;
     &lt;feature value="required"&gt;#opacity&lt;/feature&gt;
     &lt;feature value="required"&gt;#origin&lt;/feature&gt;
-    &lt;feature value="required"&gt;#overflow-scroll&lt;/feature&gt;
     &lt;feature value="required"&gt;#overflow-visible&lt;/feature&gt;
     &lt;feature value="required"&gt;#overflow&lt;/feature&gt;
     &lt;feature value="required"&gt;#padding-1&lt;/feature&gt;

--- a/ttml10/spec/ttaf1-dfxp.xml	Thu Mar 01 01:47:03 2012 -0700
+++ b/ttml10/spec/ttaf1-dfxp.xml	Wed Mar 07 22:48:01 2012 -0700
@@ -5732,7 +5732,7 @@
 order is defined as the postorder traversal of a document
 instance.</p>
 <p>The semantics of the value <code>auto</code> are those defined by
-<bibref ref="xsl11"/>, &sect; 7.28.9, where the <el>tt</el> element
+<bibref ref="xsl11"/>, &sect; 7.30.18, where the <el>tt</el> element
 is considered to establish the root stacking context.</p>
 <p>If a specified value of this attribute is not supported,
 then a presentation processor must interpret the attribute as if the
@@ -7570,7 +7570,7 @@
 <item><p><loc href="#content-vocabulary-span"><el>span</el></loc></p></item>
 </ulist>
 <p>The semantics of parallel and sequential time
-containment are those defined by <bibref ref="smil21"/>, &sect; 10.3.2,
+containment are those defined by <bibref ref="smil21"/>, &sect; 10.4.2,
 while taking into account any overriding semantics defined by this specification.</p>
 </div3>
 </div2>
@@ -7847,7 +7847,7 @@
 <note role="derivation">
 <p>The semantics of the <el>set</el> element
 are based upon that defined by <bibref ref="smil21"/>,
-&sect; 3.5.2.</p>
+&sect; 3.6.2.</p>
 </note>
 </div3>
 </div2>

--- a/ttml10/spec/xmlspec.xsl	Thu Mar 01 01:47:03 2012 -0700
+++ b/ttml10/spec/xmlspec.xsl	Wed Mar 07 22:48:01 2012 -0700
@@ -2681,11 +2681,11 @@
       <xsl:attribute name="href">
         <xsl:text>http://www.w3.org/StyleSheets/TR/</xsl:text>
         <xsl:choose>
-          <xsl:when test="/spec/@role='editors-copy'">base</xsl:when>
+          <xsl:when test="/spec/@role='editors-copy'">W3C-ED</xsl:when>
           <xsl:otherwise>
             <xsl:choose>
 	      <!-- Editor's review drafts are a special case. -->
-              <xsl:when test="/spec/@w3c-doctype='review'          or contains(/spec/header/w3c-doctype, 'Editor')">base</xsl:when>
+              <xsl:when test="/spec/@w3c-doctype='review'          or contains(/spec/header/w3c-doctype, 'Editor')">W3C-ED</xsl:when>
               <xsl:when test="/spec/@w3c-doctype='wd'">W3C-WD</xsl:when>
               <xsl:when test="/spec/@w3c-doctype='rec'">W3C-REC</xsl:when>
               <xsl:when test="/spec/@w3c-doctype='pr'">W3C-PR</xsl:when>