* Changed the media type from application/ttaf+xml to application/ttml+xml
authorPhilippe Le Hégaret <plh@w3.org>
Thu, 29 Oct 2009 13:19:11 +0000
changeset 173 777041be8a1e
parent 172 4999fb0c572b
child 174 edadfb910e5b
* Changed the media type from application/ttaf+xml to application/ttml+xml
* Changed the namespace base to http://www.w3.org/ns/ttml
* Changed the title of the document
* Some replacement of DFXP by TTML (not ideal :-/)
spec/ttaf1-dfxp.xml
--- a/spec/ttaf1-dfxp.xml	Thu Oct 29 12:21:38 2009 +0000
+++ b/spec/ttaf1-dfxp.xml	Thu Oct 29 13:19:11 2009 +0000
@@ -130,19 +130,18 @@
 </author>
 </authlist>
 <abstract id="abstract">
-<p>This document specifies the distribution format exchange profile
-(DFXP) of the timed text authoring format (TT AF) in terms of a
+<p>This document specifies the timed text markup language (TTML) in terms of a
 vocabulary and semantics thereof.</p>
-<p>The timed text authoring format is a content type that represents
+<p>The timed text markup language is a content type that represents
 timed text media for the purpose of interchange among authoring
 systems. Timed text is textual information that is intrinsically or
 extrinsically associated with timing information.</p>
-<p>The Distribution Format Exchange Profile is intended to be used
+<p>It is intended to be used
 for the purpose of transcoding or exchanging timed text information
 among legacy distribution content formats presently in use for
 subtitling and captioning functions.</p>
 <p>In addition to being used for interchange among legacy distribution content
-formats, DFXP content may be used directly as a distribution format,
+formats, TTML content may be used directly as a distribution format,
 for example, providing a standard content format to reference from a <el>&lt;text&gt;</el> or 
 <el>&lt;textstream&gt;</el> media object element in a <bibref
 ref="smil21"/> document.</p>
@@ -155,42 +154,42 @@
 <div1 id="intro">
 <head>Introduction</head>
 <p><emph>Unless specified otherwise, this section and its sub-sections are non-normative.</emph></p>
-<p>The Timed Text Authoring Format (TT AF) Distribution Format Exchange Profile (DFXP)
+<p>The Timed Text Markup Language (TTML) 1.0
 provides a standardized representation of a particular subset of
 textual information with which stylistic, layout, and timing semantics are associated by
 an author or an authoring system for the purpose of interchange and potential presentation.</p>
-<p>DFXP is expressly designed to meet only a limited set of requirements
+<p>TTML is expressly designed to meet only a limited set of requirements
 established by <bibref ref="ttaf1-req"/>, and summarized in <specref
 ref="requirements"/>. In particular, only those requirements which service the
 need of performing interchange with existing, legacy distribution systems are
 satisfied.</p>
 <p>In addition to being used for interchange among legacy distribution content
-formats, DFXP content may be used directly as a distribution format, providing, for
+formats, TTML content may be used directly as a distribution format, providing, for
 example, a standard content format to reference from a <el>&lt;text&gt;</el> or 
 <el>&lt;textstream&gt;</el> media object element in a <bibref
-ref="smil21"/> document. Certain properties of DFXP support
+ref="smil21"/> document. Certain properties of TTML support
 streamability of content, as described in <specref ref="streaming"/>.</p>
 <note>
-<p>While DFXP was not expressly designed for direct (embedded) integration into a
+<p>While TTML was not expressly designed for direct (embedded) integration into a
 SMIL document instance, such integration is not precluded.</p>
 </note>
 <note>
 <p>In some contexts of use, it may be appropriate to employ
 animated content to depict sign language representations of the same content
 as expressed by a Timed Text document instance. This use case is not
-explicitly addressed by DFXP mechanisms, but may be addressed by some
+explicitly addressed by TTML mechanisms, but may be addressed by some
 external multimedia integration technology, such as SMIL.</p>
 </note>
 <div2 id="model">
 <head>System Model</head>
-<p>Use of DFXP is intended to function in a wider context of Timed Text
+<p>Use of TTML is intended to function in a wider context of Timed Text
 Authoring and Distribution mechanisms that are based upon a system
-model, depicted in <specref ref="model-graphic"/>, wherein the timed text authoring format
+model, depicted in <specref ref="model-graphic"/>, wherein the timed text makrup language
 serves as a bidirectional interchange format among a heterogeneous collection of
 authoring systems, and as a unidirectional interchange format to a
 heterogeneous collection of distribution formats after undergoing transcoding
 or compilation to the target distribution formats as required, and where one
-particular distribution format is DFXP.</p>
+particular distribution format is TTML.</p>
 <table id="model-graphic" role="example-images">
 <caption>Figure 1 &ndash; System Model</caption>
 <tbody>
@@ -212,7 +211,7 @@
 <tr>
 <td>
 <eg xml:space="preserve">
-&lt;tt xml:lang="" xmlns="http://www.w3.org/2006/10/ttaf1"&gt;
+&lt;tt xml:lang="" xmlns="http://www.w3.org/ns/ttml"&gt;
   &lt;head&gt;
     &lt;metadata/&gt;
     &lt;styling/&gt;
@@ -233,7 +232,7 @@
 <tr>
 <td>
 <eg xml:space="preserve">
-&lt;metadata xmlns:ttm="http://www.w3.org/2006/10/ttaf1#metadata"&gt;
+&lt;metadata xmlns:ttm="http://www.w3.org/ns/ttml#metadata"&gt;
   &lt;ttm:title&gt;Timed Text DFXP Example&lt;/ttm:title&gt;
   &lt;ttm:copyright&gt;The Authors (c) 2006&lt;/ttm:copyright&gt;
 &lt;/metadata&gt;
@@ -252,7 +251,7 @@
 <tr>
 <td>
 <eg xml:space="preserve">
-&lt;styling xmlns:tts="http://www.w3.org/2006/10/ttaf1#styling"&gt;
+&lt;styling xmlns:tts="http://www.w3.org/ns/ttml#styling"&gt;
   &lt;!-- s1 specifies default color, font, and text alignment --&gt;
   &lt;style xml:id="s1"
     tts:color="white"
@@ -287,7 +286,7 @@
 <tr>
 <td>
 <eg xml:space="preserve">
-&lt;layout xmlns:tts="http://www.w3.org/2006/10/ttaf1#styling"&gt;
+&lt;layout xmlns:tts="http://www.w3.org/ns/ttml#styling"&gt;
   &lt;region xml:id="subtitleArea"
     style="s1"
     tts:extent="560px 62px"
@@ -622,7 +621,7 @@
 <label>Processor Profile</label>
 <def>
 <p>A collection of features and extensions that must or may be implemented (supported) by
-<phrase diff="del">by </phrase>a content processor.</p>
+a content processor.</p>
 </def>
 </gitem>
 <gitem>
@@ -742,7 +741,7 @@
 own illustration.</p>
 <p>All content of this specification that is not explicitly marked as
 non-normative is considered to be normative. If a section or appendix
-header contains the <phrase diff="del">the </phrase>expression "Non-Normative", then the entirety
+header contains the expression "Non-Normative", then the entirety
 of the section or appendix is considered non-normative.</p>
 <p>All paragraphs marked as a <phrase role="strong">Note</phrase> are considered non-normative.</p>
 <p>Example code fragments are depicted with a light blue-green
@@ -754,7 +753,7 @@
 <tr>
 <td>
 <eg xml:space="preserve">
-&lt;tt xml:lang="" xmlns="http://www.w3.org/2006/10/ttaf1"&gt;
+&lt;tt xml:lang="" xmlns="http://www.w3.org/ns/ttml"&gt;
   &lt;head&gt;
     &lt;metadata/&gt;
     &lt;styling/&gt;
@@ -782,7 +781,7 @@
 <p>When transporting a document instance in a context in which a MIME
 Media Type <bibref ref="mime-media"/> identifies the content type of the interchanged document
 instance, then the specified media type is
-<code>application/ttaf+xml</code> in conformance with <bibref
+<code>application/ttml+xml</code> in conformance with <bibref
 ref="rfc3023"/> &sect; 7, with which an optional
 <code>profile</code> parameter may appear, the value of which
 conforms to
@@ -975,12 +974,11 @@
 <p>The schemas included in this specification do not validate all syntactic constraints
 defined by this specification. In particular, performing validation with one of the above
 referenced schemas may result in a <emph>false positive</emph> indication of validity.
-However,
-<phrase diff="add">with one exception, </phrase>their
+However, with one exception, their
 use will not produce a <emph>false negative</emph> indication of validity
 when used with a compliant validating
 processor.</p>
-<p diff="add">In exception to the above statement about false negatives,
+<p>In exception to the above statement about false negatives,
 if the Relax NG schema included in this specification is used to validate a
 TT AF Document containing elements in a foreign namespace and the <att>xml:id</att>
 attribute is used with any of those (foreign) elements,
@@ -1029,37 +1027,37 @@
 <tr>
 <td>TT</td>
 <td><code>tt:</code></td>
-<td><code>http://www.w3.org/2006/10/ttaf1</code></td>
+<td><code>http://www.w3.org/ns/ttml</code></td>
 </tr>
 <tr>
 <td>TT Parameter</td>
 <td><code>ttp:</code></td>
-<td><code>http://www.w3.org/2006/10/ttaf1#parameter</code></td>
+<td><code>http://www.w3.org/ns/ttml#parameter</code></td>
 </tr>
 <tr>
 <td>TT Style</td>
 <td><code>tts:</code></td>
-<td><code>http://www.w3.org/2006/10/ttaf1#styling</code></td>
+<td><code>http://www.w3.org/ns/ttml#styling</code></td>
 </tr>
 <tr>
 <td>TT Metadata</td>
 <td><code>ttm:</code></td>
-<td><code>http://www.w3.org/2006/10/ttaf1#metadata</code></td>
+<td><code>http://www.w3.org/ns/ttml#metadata</code></td>
 </tr>
 <tr>
 <td>TT Profile</td>
 <td><emph>none</emph></td>
-<td><code>http://www.w3.org/2006/10/ttaf1/profile<phrase diff="add">/</phrase></code></td>
+<td><code>http://www.w3.org/ns/ttml/profile/</code></td>
 </tr>
 <tr>
 <td>TT Feature</td>
 <td><emph>none</emph></td>
-<td><code>http://www.w3.org/2006/10/ttaf1/feature<phrase diff="add">/</phrase></code></td>
+<td><code>http://www.w3.org/ns/ttml/feature/</code></td>
 </tr>
 <tr>
 <td>TT Extension</td>
 <td><emph>none</emph></td>
-<td><code>http://www.w3.org/2006/10/ttaf1/extension<phrase diff="add">/</phrase></code></td>
+<td><code>http://www.w3.org/ns/ttml/extension/</code></td>
 </tr>
 </tbody>
 </table>
@@ -1101,15 +1099,15 @@
 </tr>
 <tr>
 <td>DFXP Transformation</td>
-<td><code>http://www.w3.org/2006/10/ttaf1/profile/dfxp-transformation</code></td>
+<td><code>http://www.w3.org/ns/ttml/profile/dfxp-transformation</code></td>
 </tr>
 <tr>
 <td>DFXP Presentation</td>
-<td><code>http://www.w3.org/2006/10/ttaf1/profile/dfxp-presentation</code></td>
+<td><code>http://www.w3.org/ns/ttml/profile/dfxp-presentation</code></td>
 </tr>
 <tr>
 <td>DFXP Full</td>
-<td><code>http://www.w3.org/2006/10/ttaf1/profile/dfxp-full</code></td>
+<td><code>http://www.w3.org/ns/ttml/profile/dfxp-full</code></td>
 </tr>
 </tbody>
 </table>
@@ -1123,7 +1121,7 @@
 <p>For example, if a profile designator is expressed as
 <code>dfxp-presentation</code>, then the absolutized profile designator
 would be
-<code>http://www.w3.org/2006/10/ttaf1/profile/dfxp-presentation</code>.</p>
+<code>http://www.w3.org/ns/ttml/profile/dfxp-presentation</code>.</p>
 </note>
 <p>A profile designator is not restricted to the set of designators enumerated
 in <specref ref="profile-vocab-table"/>, but may be any URI that
@@ -1226,10 +1224,10 @@
 <tr>
 <td>
 <eg xml:space="preserve">
-&lt;tt xml:lang="" xmlns="http://www.w3.org/2006/10/ttaf1"&gt;
+&lt;tt xml:lang="" xmlns="http://www.w3.org/ns/ttml"&gt;
  &lt;head&gt;
-   &lt;profile use="dfxp-presentation" xmlns="http://www.w3.org/2006/10/ttaf1#parameter"&gt;
-     &lt;features xml:base="http://www.w3.org/2006/10/ttaf1/feature<phrase diff="add">/</phrase>"&gt;
+   &lt;profile use="dfxp-presentation" xmlns="http://www.w3.org/ns/ttml#parameter"&gt;
+     &lt;features xml:base="http://www.w3.org/ns/ttml/feature/"&gt;
        &lt;feature value="required"&gt;#fontStyle-italic&lt;/feature&gt;
      &lt;/features&gt;
    &lt;/profile&gt;
@@ -1476,7 +1474,7 @@
 <td>
 <loc href="#parameter-attribute-cellResolution">ttp:cellResolution</loc>,
 <loc href="#parameter-attribute-clockMode">ttp:clockMode</loc>,
-<loc href="#parameter-attribute-dropMode">ttp:<phrase diff="chg">dropMode</phrase></loc>,
+<loc href="#parameter-attribute-dropMode">ttp:dropMode</loc>,
 <loc href="#parameter-attribute-frameRate">ttp:frameRate</loc>,
 <loc href="#parameter-attribute-frameRateMultiplier">ttp:frameRateMultipler</loc>,
 <loc href="#parameter-attribute-markerMode">ttp:markerMode</loc>,
@@ -1600,7 +1598,7 @@
 extensions.</p>
 <note role="clarification">
 <p>The difference between a <emph>feature</emph> and an
-<emph>extension</emph> is where it is defined an<phrase diff="add">d</phrase> how it is labeled:
+<emph>extension</emph> is where it is defined and how it is labeled:
 if defined in this specification (or a future revision thereof) and
 labeled with a feature designation in <specref ref="features"/>, then
 it is considered to be a feature; if defined in another specification
@@ -1711,7 +1709,7 @@
 <td>
 <eg xml:space="preserve">
 &lt;ttp:profile use="dfxp-presentation"&gt;
-  &lt;ttp:features xml:base="http://www.w3.org/2006/10/ttaf1/feature<phrase diff="add">/</phrase>"&gt;
+  &lt;ttp:features xml:base="http://www.w3.org/ns/ttml/feature/"&gt;
     &lt;ttp:feature&gt;#rollUp&lt;/ttp:feature&gt;
   &lt;/ttp:features&gt;
 &lt;/ttp:profile&gt;
@@ -1851,8 +1849,8 @@
 <tr>
 <td>
 <eg xml:space="preserve">
-&lt;ttp:profile use="http://www.w3.org/2006/10/ttaf1/profile/dfxp-presentation"&gt;
-  &lt;ttp:features xml:base="http://www.w3.org/2006/10/ttaf1/feature<phrase diff="add">/</phrase>"&gt;
+&lt;ttp:profile use="http://www.w3.org/ns/ttml/profile/dfxp-presentation"&gt;
+  &lt;ttp:features xml:base="http://www.w3.org/ns/ttml/feature/"&gt;
     <phrase role="strong">&lt;ttp:feature value="required"&gt;#fontStyle-italic&lt;/ttp:feature&gt;</phrase>
     <phrase role="strong">&lt;ttp:feature value="required"&gt;#textDecoration-under&lt;/ttp:feature&gt;</phrase>
   &lt;/ttp:features&gt;
@@ -2003,8 +2001,8 @@
 <tr>
 <td>
 <eg xml:space="preserve">
-&lt;ttp:profile use="http://www.w3.org/2006/10/ttaf1/profile/dfxp-transformation"&gt;
-  &lt;ttp:extensions xml:base="http://foo.bar.example.org/ttaf1/extension<phrase diff="add">/</phrase>"&gt;
+&lt;ttp:profile use="http://www.w3.org/ns/ttml/profile/dfxp-transformation"&gt;
+  &lt;ttp:extensions xml:base="http://foo.bar.example.org/ttaf1/extension/"&gt;
     <phrase role="strong">&lt;ttp:extension value="use"&gt;#prefilter-by-language&lt;/ttp:extension&gt;</phrase>
   &lt;/ttp:extensions&gt;
 &lt;/ttp:profile&gt;
@@ -2137,20 +2135,20 @@
 when specified on the <el>tt</el> element.</p>
 </div3>
 <div3 id="parameter-attribute-dropMode">
-<head>ttp:<phrase diff="chg">dropMode</phrase></head>
-<p>The <att>ttp:<phrase diff="chg">dropMode</phrase></att> attribute is used to specify
+<head>ttp:dropMode</head>
+<p>The <att>ttp:dropMode</att> attribute is used to specify
 constraints on the interpretation and use of frame counts
 that correspond with <bibref ref="smpte12m"/> time coordinates when operating
 with time base of <code>smpte</code> as defined by
 <specref ref="parameter-attribute-timeBase"/>.</p>
 <p>If specified, the value of this attribute must adhere to the following syntax:</p>
 <table id="parameter-attribute-dropMode-syntax" role="syntax">
-<caption>Syntax Representation &ndash; ttp:<phrase diff="chg">dropMode</phrase></caption>
-<tbody>
-<tr>
-<td>
-<eg xml:space="preserve">
-ttp:<phrase diff="chg">dropMode</phrase>
+<caption>Syntax Representation &ndash; ttp:dropMode</caption>
+<tbody>
+<tr>
+<td>
+<eg xml:space="preserve">
+ttp:dropMode
   : "dropNTSC"
   | "dropPAL"
   | "nonDrop"
@@ -2214,7 +2212,7 @@
 frames/second. The M/PAL system is used primarily in Brazil.</p>
 </note>
 <p>If not specified, then <code>nonDrop</code> must be assumed to apply.</p>
-<p>A <att>ttp:<phrase diff="chg">dropMode</phrase></att> attribute is considered to be significant only
+<p>A <att>ttp:dropMode</att> attribute is considered to be significant only
 when specified on the <el>tt</el> element.</p>
 </div3>
 <div3 id="parameter-attribute-frameRate">
@@ -2265,7 +2263,7 @@
 <td>
 <eg xml:space="preserve">
 ttp:frameRateMultiplier
-  : <phrase diff="chg">numerator denominator</phrase>                   // <phrase diff="add"><emph>numerator</emph> != 0; </phrase><emph>denominator</emph> != 0
+  : numerator denominator                   // <emph>numerator</emph> != 0; <emph>denominator</emph> != 0
 
 numerator | denominator
   : <loc href="#style-value-digit">&lt;digit&gt;</loc>+
@@ -2277,7 +2275,7 @@
 <p>A frame rate multiplier is used when the desired frame rate cannot
 be expressed as an integral number of frames per second.</p>
 <p>If not specified, the frame rate multiplier must be considered to be equal to one (1:1).
-<phrase diff="chg">Both numerator and denominator must be non-zero.</phrase></p>
+Both numerator and denominator must be non-zero.</p>
 <p>A <att>ttp:frameRateMultiplier</att> attribute is considered to be significant only
 when specified on the <el>tt</el> element.</p>
 <note role="example">
@@ -2333,7 +2331,7 @@
 expressions must not be converted to either media time or real time
 coordinates, arithmetical operators (addition, multiplication) are not
 defined on time expressions, and, consequently, any expression of a
-duration must be <phrase diff="chg">considered to be invalid</phrase>.</p>
+duration must be considered to be invalid.</p>
 <note role="explanation">
 <p>When operating with <code>smpte</code> time base and
 <code>discontinuous</code> marker mode, there is no effective time coordinate
@@ -2352,8 +2350,8 @@
 <note role="explanation">
 <p>The notion of marker discontinuity as captured by this parameter
 is logically independent from the method used to count frames as
-expressed by the <att>ttp:<phrase diff="chg">dropMode</phrase></att> parameter. In particular,
-even if the <att>ttp:<phrase diff="chg">dropMode</phrase></att> parameter is specified as
+expressed by the <att>ttp:dropMode</att> parameter. In particular,
+even if the <att>ttp:dropMode</att> parameter is specified as
 <code>dropNTSC</code> or <code>dropPAL</code>, the marker mode may be
 specified as <code>continuous</code>, even in the presence of frame count
 discontinuities induced by the frame counting method, unless there
@@ -2376,7 +2374,7 @@
 <td>
 <eg xml:space="preserve">
 ttp:pixelAspectRatio
-  : <phrase diff="chg">width height</phrase>                            // <emph>width</emph> != 0; <emph>height</emph> != 0
+  : width height                            // <emph>width</emph> != 0; <emph>height</emph> != 0
 
 width | height
   : <loc href="#style-value-digit">&lt;digit&gt;</loc>+
@@ -2386,7 +2384,7 @@
 </tbody>
 </table>
 <p>If not specified, then square pixels (i.e., aspect ratio 1:1) must be assumed to apply.
-If specified, <phrase diff="chg">then both width and height must be non-zero</phrase>.</p>
+If specified, then both width and height must be non-zero.</p>
 <p>A <att>ttp:pixelAspectRatio</att> attribute is considered to be significant only
 when specified on the <el>tt</el> element.</p>
 <note role="explanation">
@@ -2528,7 +2526,7 @@
 then a time expression denotes a <bibref ref="smpte12m"/> time
 coordinate with which the content of a document instance is to
 be synchronized.  In this case, the value of the <att>ttp:markerMode</att> 
-and <att>ttp:<phrase diff="chg">dropMode</phrase></att> parameters apply, as defined by <specref
+and <att>ttp:dropMode</att> parameters apply, as defined by <specref
 ref="parameter-attribute-markerMode"/> and <specref
 ref="parameter-attribute-dropMode"/>, respectively.</p>
 <p>If the time base is designated as <code>clock</code>, then the time
@@ -2553,7 +2551,7 @@
 given document instance, the interpretation of time expressions
 is uniform throughout the document instance.</p>
 </note>
-<p diff="add">When operating with the <code>clock</code> time base,
+<p>When operating with the <code>clock</code> time base,
 the expression <emph>media time</emph> as used in this specification is
 to be interpreted as the real-time clock selected by
 <specref ref="parameter-attribute-clockMode"/>.</p>
@@ -2617,8 +2615,8 @@
 which content regions are located and presented. If no <att>tts:extent</att>
 attribute is specified, then the spatial extent of the root container region is
 considered to be determined by the external authoring or presentation
-context.<phrase diff="add"> The root container origin is determined by the external
-authoring context.</phrase></p>
+context. The root container origin is determined by the external
+authoring context.</p>
 <p>An <att>xml:lang</att> attribute must be specified on the <el>tt</el> element.
 If the attribute value is empty, it signifies that there is no default language that applies
 to the text contained within the document instance.</p>
@@ -3210,7 +3208,7 @@
 element type independently of whether the property applies to that
 element type. This capability permits the expression of an inheritable
 style property on ancestor elements to which the property
-<phrase diff="del">property </phrase>does not apply.</p>
+does not apply.</p>
 </note>
 <div3 id="style-attribute-style">
 <head>style</head>
@@ -3672,7 +3670,7 @@
 </tr>
 <tr>
 <td><emph>Inherited:</emph></td>
-<td><phrase diff="chg">no</phrase></td>
+<td>no</td>
 </tr>
 <tr>
 <td><emph>Percentages:</emph></td>
@@ -3812,10 +3810,10 @@
 <p>If the value of this attribute contains a single <loc
 href="#style-value-flowFunction">&lt;flowFunction&gt;</loc>, then that
 flow function applies equally to <emph>fill into</emph> and <emph>clear
-from</emph> dynamic flow operations.<phrase diff="add"> Multiple
+from</emph> dynamic flow operations. Multiple
 instances of the same <loc
 href="#style-value-flowFunction">&lt;flowFunction&gt;</loc>
-must not appear in the value of this attribute.</phrase></p>
+must not appear in the value of this attribute.</p>
 <p>If either <code>fill()</code> or
 <code>clear()</code> <loc
 href="#style-value-flowIntervalFunction">&lt;flowIntervalFunction&gt;</loc>
@@ -3846,7 +3844,7 @@
   &lt;style tts:fontFamily="proportionalSansSerif"/&gt;
   &lt;style tts:fontSize="18px"/&gt;
   &lt;style <phrase role="strong">tts:overflow="dynamic"</phrase>/&gt;
-  &lt;style <phrase role="strong">tts:dynamicFlow="in(word,jump) fill(1.0s) out(line,smooth) clear(<phrase diff="add">break,</phrase>0.3s)"</phrase>/&gt;
+  &lt;style <phrase role="strong">tts:dynamicFlow="in(word,jump) fill(1.0s) out(line,smooth) clear(break,</phrase>0.3s)"/&gt;
 &lt;/region&gt;
 ...
 &lt;p region="r1"&gt;
@@ -4173,7 +4171,7 @@
 <p>If a specified value of this attribute is not supported,
 then a presentation processor must interpret the attribute as if the
 value <code>1c</code> were specified.</p>
-<note role="elaboration" diff="add">
+<note role="elaboration">
 <p>The expression <code>1c</code> means one cell, where <code>'c'</code> expresses
 the <emph>cell</emph> length unit as defined by <specref ref="style-value-length"/>.</p>
 </note>
@@ -4518,7 +4516,7 @@
 <div3 id="style-attribute-opacity">
 <head>tts:opacity</head>
 <p>The <att>tts:opacity</att> attribute is used to specify a style property that
-defines the opacity (or <phrase diff="add">conversely, the </phrase>transparency)
+defines the opacity (or conversely, the transparency)
 of marks associated with a region.</p>
 <p>When presented onto a visual medium, the opacity of the region is applied uniformly and on a linear scale
 to all marks produced by content targeted to the
@@ -4679,8 +4677,7 @@
 is the <emph>x</emph> coordinate, and the second specification is the <emph>y</emph> coordinate.</p>
 <p>If the value of this attribute is <code>auto</code>, then the initial value
 of the style property must be considered to be the same as the root container
-origin.<phrase diff="del"> The root container origin is determined by the external
-authoring context.</phrase></p>
+origin.</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>
@@ -6158,7 +6155,7 @@
 is smoothly transitioned by means of pixel based exposure, movement,
 or hiding, respectively.</p>
 <p>If a presentation processor that supports dynamic flow
-does not <phrase diff="add">support </phrase>the <code>smooth</code>
+does not support the <code>smooth</code>
 flow style, then this flow style must
 be interpreted as if the <code>jump</code> flow style were
 specified.</p>
@@ -6177,20 +6174,20 @@
   : "fill(" flowIntervalArguments ")"
   | "clear(" flowIntervalArguments ")"
 
-flowIntervalArguments<phrase diff="add">
+flowIntervalArguments
   : flowInterval [ "," flowStyleDuration ]
 
-flowInterval</phrase>
-  : "auto"<phrase diff="add">
-  | "break"</phrase>
+flowInterval
+  : "auto"
+  | "break"
   | <loc href="#style-value-duration">&lt;duration&gt;</loc>
   | flowIntervalRate
 
 flowIntervalRate
-  : <loc href="#style-value-digit">&lt;digit&gt;</loc>+ ( "." <loc href="#style-value-digit">&lt;digit&gt;</loc>+ )?<phrase diff="add">
+  : <loc href="#style-value-digit">&lt;digit&gt;</loc>+ ( "." <loc href="#style-value-digit">&lt;digit&gt;</loc>+ )?
 
 flowStyleDuration
-  : <loc href="#style-value-duration">&lt;duration&gt;</loc></phrase>
+  : <loc href="#style-value-duration">&lt;duration&gt;</loc>
 </eg>
 </td>
 </tr>
@@ -6208,10 +6205,10 @@
 duration of time between clear
 timer events, as specified by <specref ref="flowTimerClear"/>, which in turn,
 limits the dynamic flowed content retention period.</p>
-<p diff="add">If the value <code>auto</code> is specified as
+<p>If the value <code>auto</code> is specified as
 the flow interval argument to a flow interval function, then an
 implied flow interval is computed dynamically.</p>
-<p diff="add">If the value <code>break</code> is specified as
+<p>If the value <code>break</code> is specified as
 the flow interval argument to a flow interval function, then
 the flow interval is variable, and depends upon the time at
 which a content unit is appended to the flow buffer or whose
@@ -6220,22 +6217,21 @@
 line break element.</p>
 <p>If a <loc href="#style-value-duration">&lt;duration&gt;</loc> is
 specified as
-<phrase diff="chg">the flow interval argument to</phrase>
+the flow interval argument to
 a flow interval function, then it is
 considered to represent a <emph>definite duration</emph>.
 If a flow interval rate is
-specified<phrase diff="del"> as an argument to a flow interval
-function</phrase>, then it is
+specified, then it is
 considered to represent a <emph>definite rate</emph> in units per
 second, where the applicable unit is determined in the context of
 whether the rate is used with an <code>fill()</code> or
 <code>clear()</code> flow interval function.</p>
-<note role="elaboration" diff="chg">
+<note role="elaboration">
 <p>See <specref ref="dynamicFlowIntervalTimingCalculation"/> for further
 information on how the computed fill and clear interval values are
 determined from &lt;flowIntervalFunction&gt; expressions.</p>
 </note>
-<p diff="add">If a <loc href="#style-value-duration">&lt;duration&gt;</loc> is
+<p>If a <loc href="#style-value-duration">&lt;duration&gt;</loc> is
 specified as the flow style duration argument to a flow interval function,
 then it is considered to represent the <emph>definite duration</emph>
 during which time the applicable flow style is to be applied in those cases
@@ -6243,7 +6239,7 @@
 flow style duration argument is specified and the applicable flow style
 has intrinsic duration semantics, then the duration must be considered to
 be equal to zero.</p>
-<note role="example" diff="add"><p>In the current version of this
+<note role="example"><p>In the current version of this
 specification, only the <code>smooth</code> flow style has intrinsic
 duration semantcs.</p></note>
 </div3>
@@ -6380,7 +6376,7 @@
 identical to that defined by <bibref ref="xsl11"/>, &sect; 5.9.13;
 however, when specified relative to a font whose size is expressed as
 two length measures of non-equal lengths, then one <code>em</code> is
-equal to the inline progression dimension of the <phrase diff="chg">anamorphically</phrase>
+equal to the inline progression dimension of the anamorphically
 scaled font when used to specify lengths in the inline progression
 direction and equal to the block progression dimension of the scaled
 font when used to specify lengths in the block progression direction.</p>
@@ -6857,7 +6853,7 @@
 <td>
 <eg xml:space="preserve">
 [
-  ["http://www.w3.org/2006/10/ttaf1#styling", "color"],
+  ["http://www.w3.org/ns/ttml#styling", "color"],
   ["specified", <emph>color</emph>, "red"]
 ]
 </eg>
@@ -6886,19 +6882,19 @@
 <eg xml:space="preserve">
 {
   [
-    ["http://www.w3.org/2006/10/ttaf1#styling", "backgroundColor"],
+    ["http://www.w3.org/ns/ttml#styling", "backgroundColor"],
     ["specified", <emph>color</emph>, 0x00FF00 ]
   ],
   [
-    ["http://www.w3.org/2006/10/ttaf1#styling", "color"],
+    ["http://www.w3.org/ns/ttml#styling", "color"],
     ["specified", <emph>color</emph>, "red" ]
   ],
   [
-    ["http://www.w3.org/2006/10/ttaf1#styling", "fontSize"],
+    ["http://www.w3.org/ns/ttml#styling", "fontSize"],
     ["specified", <emph>length</emph>, "1c" ]
   ],
   [
-    ["http://www.w3.org/2006/10/ttaf1#styling", "lineHeight"],
+    ["http://www.w3.org/ns/ttml#styling", "lineHeight"],
     ["specified", <emph>length</emph>, "117%" ]
   ]
 }
@@ -6918,19 +6914,19 @@
 <eg xml:space="preserve">
 {
   [
-    ["http://www.w3.org/2006/10/ttaf1#styling", "backgroundColor"],
+    ["http://www.w3.org/ns/ttml#styling", "backgroundColor"],
     ["specified", <emph>color</emph>, 0x00FF00 ]
   ],
   [
-    ["http://www.w3.org/2006/10/ttaf1#styling", "color"],
+    ["http://www.w3.org/ns/ttml#styling", "color"],
     ["computed", <emph>color</emph>, 0xFF0000 ]
   ],
   [
-    ["http://www.w3.org/2006/10/ttaf1#styling", "fontSize"],
+    ["http://www.w3.org/ns/ttml#styling", "fontSize"],
     ["computed", <emph>length</emph>, "24px" ]
   ],
   [
-    ["http://www.w3.org/2006/10/ttaf1#styling", "lineHeight"],
+    ["http://www.w3.org/ns/ttml#styling", "lineHeight"],
     ["computed", <emph>length</emph>, "28px" ]
   ]
 }
@@ -7214,7 +7210,7 @@
 <p>For example, an author may wish a region that is otherwise empty, but
 may have a visible background color to be presented starting at some time and
 continuing over the region's duration.  The simple duration of the region serves
-additional<phrase diff="add">l</phrase>y to scope the presentation effects of content that is targeted to the
+additionally to scope the presentation effects of content that is targeted to the
 region. An author may also wish to move a region within the root container
 extent or change a region's background color by means of animation effects. In
 both of these cases, it is necessary to posit an active time interval for a
@@ -7313,7 +7309,7 @@
 <tr>
 <td>
 <eg>
-&lt;tt xml:lang="" xmlns="http://www.w3.org/2006/10/ttaf1"&gt;
+&lt;tt xml:lang="" xmlns="http://www.w3.org/ns/ttml"&gt;
   &lt;head&gt;
     <phrase role="strong">&lt;layout&gt;
       &lt;region xml:id="anonymous"/&gt;
@@ -7725,19 +7721,19 @@
 the value of a <att>dur</att> attribute must adhere to a
 &lt;timeExpression&gt; specification as defined by <specref
 ref="timing-value-timeExpression"/>.</p>
-<note role="clarification" diff="add">
+<note role="clarification">
 <p>When the <code>clock-time</code> form of a &lt;timeExpression&gt; specification
 is used with a <att>dur</att> attribute, it is intended to be interpreted as
 a difference between two implied clock time expressions.</p>
 </note>
-<p diff="chg">When a TT AF document instance specifies the use of the
+<p>When a TT AF document instance specifies the use of the
 <code>smpte</code> time base and <code>discontinuous</code> marker
 mode, the <att>dur</att> attribute must not be specified on any
 element.</p>
 <p>The semantics of the <att>dur</att> attribute are those defined
 by <bibref ref="smil21"/>, &sect; 10.4.1,
 while taking into account any overriding semantics defined by this specification.</p>
-<note role="elaboration" diff="add">
+<note role="elaboration">
 <p>In the context of the subset of <bibref ref="smil21"/> semantics supported by
 this specification, the active duration of an element that specifies both
 <att>end</att> and <att>dur</att> attributes is equal to the lesser of the value of
@@ -7868,14 +7864,13 @@
 <emph>clock-time</emph> and a <emph>frames</emph> term is specified,
 then the value of this term must be constrained to the interval
 [0&hellip;<emph>F-1</emph>], where <emph>F</emph> is the frame rate
-determined by the <phrase diff="del">the </phrase><att>ttp:frameRate</att> parameter as defined
+determined by the <att>ttp:frameRate</att> parameter as defined
 by <specref ref="parameter-attribute-frameRate"/>.</p>
 <p>If a &lt;timeExpression&gt; is expressed in terms of a
 <emph>clock-time</emph> and a <emph>sub-frames</emph> term is
 specified, then the value of this term must be constrained to the
 interval [0&hellip;<emph>S-1</emph>], where <emph>S</emph> is the
-sub-frame rate determined by the <phrase diff="del">the
-</phrase><att>ttp:subFrameRate</att> parameter as defined by <specref
+sub-frame rate determined by the <att>ttp:subFrameRate</att> parameter as defined by <specref
 ref="parameter-attribute-subFrameRate"/>.</p>
 </div3>
 </div2>
@@ -7921,9 +7916,9 @@
 <p>If the governing time mode is <code>media</code> or
 <code>smpte</code> with mode <code>continuous</code>, then time
 expressions must be interpreted as
-<phrase diff="chg">equivalent to offset based timing
+equivalent to offset based timing
 in <bibref ref="smil21"/>, namely, as offsets from an implicit
-syncbase</phrase>.</p>
+syncbase.</p>
 </item>
 <item>
 <p>If the governing time mode is <code>smpte</code> with mode
@@ -8024,9 +8019,9 @@
 <tr>
 <td>
 <eg xml:space="preserve">
-&lt;tt xml:lang="" xmlns="http://www.w3.org/2006/10/ttaf1"
-    xmlns:ttp="http://www.w3.org/2006/10/ttaf1#parameter"
-    xmlns:tts="http://www.w3.org/2006/10/ttaf1#styling"
+&lt;tt xml:lang="" xmlns="http://www.w3.org/ns/ttml"
+    xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
+    xmlns:tts="http://www.w3.org/ns/ttml#styling"
     ttp:cellResolution="40 16"&gt;
     &lt;head&gt;
       &lt;layout&gt;
@@ -8144,7 +8139,7 @@
 <eg xml:space="preserve">
 ...
 &lt;head&gt;
-  &lt;metadata xmlns:ttm="http://www.w3.org/2006/10/ttaf1#metadata"&gt;
+  &lt;metadata xmlns:ttm="http://www.w3.org/ns/ttml#metadata"&gt;
     &lt;ttm:title&gt;Document Metadata Example&lt;/ttm:title&gt;
     &lt;ttm:desc&gt;This document employs document metadata.&lt;/ttm:desc&gt;
   &lt;/metadata&gt;
@@ -8165,7 +8160,7 @@
 <eg xml:space="preserve">
 ...
 &lt;div&gt;
-  &lt;metadata xmlns:ttm="http://www.w3.org/2006/10/ttaf1#metadata"&gt;
+  &lt;metadata xmlns:ttm="http://www.w3.org/ns/ttml#metadata"&gt;
     &lt;ttm:title&gt;Chapter 6 &ndash; Sherlock Holmes Gives a Demonstration&lt;/ttm:title&gt;
     &lt;ttm:desc&gt;Holmes shows Watson how the murderer entered the window.&lt;/ttm:desc&gt;
   &lt;/metadata&gt;
@@ -8180,7 +8175,7 @@
 
 <p>The use of metadata attribute items is illustrated by the following example.</p>
 <table id="metadata-vocabulary-metadata-example-3" role="example">
-<caption>Example Fragment &ndash; <phrase diff="add">Foreign </phrase>Metadata Attribute Items</caption>
+<caption>Example Fragment &ndash; Foreign Metadata Attribute Items</caption>
 <tbody>
 <tr>
 <td>
@@ -8205,29 +8200,29 @@
 elements.</p>
 </note>
 <p/>
-<p diff="add">The use of foreign element metadata is illustrated by the following example.</p>
+<p>The use of foreign element metadata is illustrated by the following example.</p>
 <table id="metadata-vocabulary-metadata-example-4" role="example">
-<caption><phrase diff="add">Example Fragment &ndash; Foreign Element Metadata</phrase></caption>
-<tbody>
-<tr>
-<td>
-<eg xml:space="preserve">
-<phrase diff="add">...
+<caption>Example Fragment &ndash; Foreign Element Metadata</caption>
+<tbody>
+<tr>
+<td>
+<eg xml:space="preserve">
+...
 &lt;metadata
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:dcterms="http://purl.org/dc/terms/"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
   &lt;dc:title&gt;Foreign Element Metadata Example&lt;/dc:title&gt;
   &lt;dc:description&gt;Express metadata using elements in foreign namespace.&lt;/dc:description&gt;
-  &lt;dc:format xsi:type="dcterms:IMT"&gt;application/ttaf+xml&lt;/dc:format&gt;
+  &lt;dc:format xsi:type="dcterms:IMT"&gt;application/ttml+xml&lt;/dc:format&gt;
 &lt;/metadata&gt;
-...</phrase>
-</eg>
-</td>
-</tr>
-</tbody>
-</table>
-<note role="explanation" diff="add">
+...
+</eg>
+</td>
+</tr>
+</tbody>
+</table>
+<note role="explanation">
 <p>In the above example, a number of elements defined by the Dublin
 Core metadata vocabulary are used to express document level metadata.</p>
 </note>
@@ -8258,7 +8253,7 @@
 <note role="elaboration">
 <p>No specific use of the <el>ttm:title</el> element is defined by this specification.</p>
 </note>
-<p>Examples of the <att>ttm:<phrase diff="chg">title</phrase></att> element are shown above in
+<p>Examples of the <att>ttm:title</att> element are shown above in
 <specref ref="metadata-vocabulary-metadata-example-1"/> and
 <specref ref="metadata-vocabulary-metadata-example-2"/>.</p>
 </div3>
@@ -8378,7 +8373,7 @@
 <td>
 <eg xml:space="preserve">
 
-&lt;tt xml:lang="en" xmlns="http://www.w3.org/2006/10/ttaf1" xmlns:ttm="http://www.w3.org/2006/10/ttaf1#metadata"&gt;
+&lt;tt xml:lang="en" xmlns="http://www.w3.org/ns/ttml" xmlns:ttm="http://www.w3.org/2006/10/ttaf1#metadata"&gt;
   &lt;head&gt;
     <phrase role="strong">&lt;ttm:agent xml:id="connery" type="person"&gt;</phrase>
       &lt;ttm:name type="family"&gt;Connery&lt;/ttm:name&gt;
@@ -8700,7 +8695,7 @@
 <head>Flow Buffer</head>
 <p>Each region which is assigned a <att>tts:overflow</att> property
 with the value <code>dynamic</code> is associated with a <emph>flow
-buffer</emph>, <phrase diff="chg">the implementation of which</phrase>
+buffer</emph>, the implementation of which
 is not defined by this specification.</p>
 <p>The content of a flow buffer is defined to be equivalent (in form) to the
 content of an <el>fo:block-container</el> element produced by
@@ -8776,12 +8771,12 @@
 clear timers to their inactive state.</p></item>
 <item><p>If using automatic flow interval timing, then re-perform the process
 described in <specref ref="dynamicFlowIntervalTimingCalculation"/>.</p></item>
-<item><p>If the fill timer is not active<phrase diff="add"> and
+<item><p>If the fill timer is not active and
 if the current value of the 
-numeric value</phrase>, then
+numeric value, then
 reset the fill timer to the current value of the <emph>computed
 fill interval</emph>;</p></item>
-<item><p diff="add">If the fill timer is not active, if the
+<item><p>If the fill timer is not active, if the
 current value of the <emph>computed fill interval</emph> is the
 token value <code>break</code>, and if the flow buffer contains
 a retained line break, then simulate the effects of fill timer
@@ -8890,7 +8885,7 @@
 inverse
 of the specified rate (in fill units per second);</p></item>
 <item><p>otherwise, if the value of the <emph>fill interval</emph>
-<phrase diff="add">parameter </phrase>is
+parameter is
 <code>auto</code>, then the computed fill interval is equal to the
 difference between the time coordinate associated with the most
 temporally prior beginning point of an active duration of some content
@@ -8901,7 +8896,7 @@
 <code>T<sub>k</sub></code> divided by the number of fill
 units currently available in the flow buffer at
 time <code>T<sub>k</sub></code>;</p></item>
-<item><p diff="add">otherwise, if the value of the
+<item><p>otherwise, if the value of the
 <emph>fill interval</emph> parameter is <code>break</code>, then the
 computed fill interval is the special token value <code>break</code>.</p>
 </item>
@@ -8922,7 +8917,7 @@
 parameter is a definite rate, then the computed clear interval is
 equal to the specified rate (in clear units per second);</p></item>
 <item><p>otherwise, if the value of the <emph>clear interval</emph>
-<phrase diff="add">parameter </phrase>is
+parameter is
 <code>auto</code>, then the computed clear interval is equal to the
 difference between the time coordinate associated with the most
 temporally prior beginning point of an active duration of some content
@@ -8933,7 +8928,7 @@
 <code>T<sub>k</sub></code> divided by the number of clear
 units currently available in the presentation region
 at time <code>T<sub>k</sub></code>;</p></item>
-<item><p diff="add">otherwise, if the value of the
+<item><p>otherwise, if the value of the
 <emph>clear interval</emph> parameter is <code>break</code>, then the
 computed clear interval is the special token value <code>break</code>.</p>
 </item>
@@ -9019,12 +9014,12 @@
 areas;</p></item>
 <item><p>cause the newly appended areas to be made visible according
 to the <emph>fill style</emph> state parameter in force;</p></item>
-<item><p>if the clear timer is not active<phrase diff="add"> and
+<item><p>if the clear timer is not active and
 the current value of the <emph>computed clear interval</emph> is a
-numeric value</phrase>, then reset the
+numeric value, then reset the
 clear timer to the current value of the <emph>computed clear interval</emph>;</p></item>
-<item><p><phrase diff="add">if the current value of the <emph>computed
-fill interval</emph> is a numeric value, then </phrase>reset the
+<item><p>if the current value of the <emph>computed
+fill interval</emph> is a numeric value, then reset the
 fill timer to the
 current value of the <emph>computed fill interval</emph>.</p></item>
 </olist>
@@ -9148,10 +9143,10 @@
 <head>Fill Timer</head>
 <p>The fill timer is used to pace the addition of formatted content to the
 presentation region undergoing dynamic flow processing
-<phrase diff="add">when the current value of the <emph>computed fill
+when the current value of the <emph>computed fill
 interval</emph> is a numeric value; however, if it is not a numeric value,
-then the fill timer remains inactive</phrase>.</p>
-<note role="elaboration" diff="add">
+then the fill timer remains inactive.</p>
+<note role="elaboration">
 <p>Although the fill timer is inactive when the value of the
 <emph>computed fill interval</emph> is non-numeric, the effects of
 fill timer expiration may nevertheless be simulated by certain
@@ -9161,7 +9156,7 @@
 performed:</p>
 <olist>
 <item><p>acquire <emph>dynamic flow lock</emph>;</p></item>
-<item><p diff="add">if the current value of the <emph>computed clear
+<item><p>if the current value of the <emph>computed clear
 interval</emph> is the token value <code>break</code> and the most
 temporally prior unfilled content in the flow buffer, i.e., the next
 available content available for a fill operation at the beginning of
@@ -9170,9 +9165,9 @@
 <specref ref="flowOperationCombined"/>, i.e., perform the
 clear and reflow steps of the combined flow operation;</p></item>
 <item><p>if
-<phrase diff="add">(1) the current value of the computed fill interval is
-non-numeric or (2) </phrase>the difference between the current value of the flow
-timers<phrase diff="add">'</phrase> timeline and the <emph>last fill time</emph> is greater than or
+(1) the current value of the computed fill interval is
+non-numeric or (2) the difference between the current value of the flow
+timers' timeline and the <emph>last fill time</emph> is greater than or
 equal to the current value of the computed fill interval, then perform
 the following ordered sub-steps:</p>
 <olist>
@@ -9187,22 +9182,22 @@
 <item><p>if the clear timer is not active, then reset the clear timer
 to the current value of the computed clear interval;</p></item>
 <item><p>if the fill timer is not
-active<phrase diff="chg">, </phrase>the flow
-buffer is empty<phrase diff="add">, and the current value of
-the computed fill interval is a numeric value</phrase>,
+active, the flow
+buffer is empty, and the current value of
+the computed fill interval is a numeric value,
 then reset the fill timer to the current value of the
 computed fill interval.</p></item>
 </olist>
 </item>
 </olist>
 </item>
-<item><p>otherwise (<phrase diff="add">the current value of
-the computed fill interval is numeric and </phrase>the
+<item><p>otherwise (the current value of
+the computed fill interval is numeric and the
 difference between the current value of the flow
-timers<phrase diff="add">'</phrase> timeline and the <emph>last fill time</emph> is less than
+timers' timeline and the <emph>last fill time</emph> is less than
 the current value of the computed fill interval), reset the fill timer
 to the difference between the current value of the computed fill interval
-and the current value of the flow timers<phrase diff="add">'</phrase> timeline;</p></item>
+and the current value of the flow timers' timeline;</p></item>
 <item><p>release <emph>dynamic flow lock</emph>.</p></item>
 </olist>
 </div3>
@@ -9210,10 +9205,10 @@
 <head>Clear Timer</head>
 <p>The clear timer is used to pace the removal of formatted content from the
 presentation region undergoing dynamic flow processing
-<phrase diff="add">when the current value of the <emph>computed clear
+when the current value of the <emph>computed clear
 interval</emph> is a numeric value; however, if it is not a numeric value,
-then the clear timer remains inactive</phrase>.</p>
-<note role="elaboration" diff="add">
+then the clear timer remains inactive.</p>
+<note role="elaboration">
 <p>Although the clear timer is inactive when the value of the
 <emph>computed clear interval</emph> is non-numeric, the effects of
 clear timer expiration may nevertheless be simulated by certain
@@ -9223,11 +9218,11 @@
 performed:</p>
 <olist>
 <item><p>acquire <emph>dynamic flow lock</emph>;</p></item>
-<item><p><phrase diff="add">(1) the current value of the computed fill interval
-is non-numeric or (2) </phrase>if the difference between the current value of
-the flow timers<phrase diff="add">'</phrase> timeline and the
-<emph>last <phrase diff="chg">clear</phrase> time</emph> is greater than or
-equal to the current value of the computed <phrase diff="chg">clear</phrase>
+<item><p>(1) the current value of the computed fill interval
+is non-numeric or (2) if the difference between the current value of
+the flow timers' timeline and the
+<emph>last clear time</emph> is greater than or
+equal to the current value of the computed clear
 interval, then perform the following ordered sub-steps:</p>
 <olist>
 <item><p>if the <emph>presentation region</emph> is non-empty and
@@ -9238,17 +9233,17 @@
 in <specref ref="flowOperationCombined"/>;</p></item>
 </olist>
 </item>
-<item><p>otherwise (<phrase diff="add">the current value of the
-computed clear interval is numeric and </phrase>the
+<item><p>otherwise (the current value of the
+computed clear interval is numeric and the
 difference between the current value of the flow
-timers<phrase diff="add">'</phrase> timeline and the <emph>last clear time</emph> is less than
+timers' timeline and the <emph>last clear time</emph> is less than
 the current value of the computed clear interval), reset the clear timer
 to the difference between the current value of the computed clear interval
-and the current value of the flow timers<phrase diff="add">'</phrase> timeline;</p></item>
+and the current value of the flow timers' timeline;</p></item>
 <item><p>release <emph>dynamic flow lock</emph>.</p></item>
 </olist>
 </div3>
-<div3 id="flowTimersTimingExample" diff="add">
+<div3 id="flowTimersTimingExample">
 <head>Timing Example</head>
 <p><emph>This section is non-normative.</emph></p>
 <p>An example of the timing of fill and clear timers is
@@ -9456,7 +9451,7 @@
 <head>Media Type Registration</head>
 <p><emph>This appendix is normative.</emph></p>
 <p>This appendix registers a new MIME media type,
-"application/ttaf+xml" in conformance with
+"application/ttml+xml" in conformance with
 <loc href="http://www.ietf.org/rfc/rfc4288.txt">BCP 13</loc> and
 <loc
 href="http://www.w3.org/2002/06/registering-mediatype.html">W3CRegMedia</loc>.
@@ -9473,7 +9468,7 @@
 <gitem>
 <label>MIME subtype name:</label>
 <def>
-<p>ttaf+xml</p>
+<p>ttml+xml</p>
 </def>
 </gitem>
 <gitem>
@@ -9521,7 +9516,7 @@
 can be used to consume large amounts of memory, which may cause XML
 processors in constrained environments to fail.</p>
 <p>In addition, because of the extensibility features for TT AF and of XML
-in general, it is possible that "application/ttaf+xml" may describe content
+in general, it is possible that "application/ttml+xml" may describe content
 that has security implications beyond those described here. However,
 if the processor follows only the normative semantics of the published
 specification, this content will be outside TT AF namespaces and
@@ -9539,7 +9534,7 @@
 behavior that must be followed when dealing with, among other things,
 unrecognized elements and attributes, both in TT AF namespaces and in
 other namespaces.</p>
-<p>Because TT AF is extensible, conformant "application/ttaf+xml" processors must
+<p>Because TT AF is extensible, conformant "application/ttml+xml" processors must
 expect that content received is well-formed XML, but it cannot be
 guaranteed that the content is valid to a particular DTD or Schema or
 that the processor will recognize all of the elements and attributes
@@ -9551,8 +9546,7 @@
 <def>
 <p>This media type registration is extracted from Appendix <specref
 ref="media-type-registration"/> of the <loc
-href="http://www.w3.org/TR/ttaf1-dfxp/">Timed Text (TT) Authoring
-Format 1.0 - Distribution Format Exchange Profile (DFXP)</loc>
+href="http://www.w3.org/TR/ttml/">Timed Text Markup Language (TTML) 1.0</loc>
 specification.</p>
 </def>
 </gitem>
@@ -9600,7 +9594,7 @@
   : feature-namespace designation
 
 feature-namespace
-  : <emph>TT Feature Namespace</emph>                    // http://www.w3.org/2006/10/ttaf1/feature<phrase diff="add">/</phrase>
+  : <emph>TT Feature Namespace</emph>                    // http://www.w3.org/ns/ttml/feature/
 
 designation
   : "#" token-char+
@@ -9735,7 +9729,7 @@
 href="#parameter-attribute-clockMode"><att>ttp:clockMode</att></loc>
 attribute.</p>
 </div3>
-<div3 id="feature-clockMode-gps" diff="add">
+<div3 id="feature-clockMode-gps">
 <head>#clockMode-gps</head>
 <p>A TT AF transformation processor supports the
 <code>#clockMode-gps</code> feature if it recognizes and is capable of
@@ -9748,7 +9742,7 @@
 href="#parameter-attribute-clockMode"><att>ttp:clockMode</att></loc>
 attribute.</p>
 </div3>
-<div3 id="feature-clockMode-local" diff="add">
+<div3 id="feature-clockMode-local">
 <head>#clockMode-local</head>
 <p>A TT AF transformation processor supports the
 <code>#clockMode-local</code> feature if it recognizes and is capable of
@@ -9761,7 +9755,7 @@
 href="#parameter-attribute-clockMode"><att>ttp:clockMode</att></loc>
 attribute.</p>
 </div3>
-<div3 id="feature-clockMode-utc" diff="add">
+<div3 id="feature-clockMode-utc">
 <head>#clockMode-utc</head>
 <p>A TT AF transformation processor supports the
 <code>#clockMode-utc</code> feature if it recognizes and is capable of
@@ -9905,19 +9899,19 @@
 attribute.</p>
 </div3>
 <div3 id="feature-dropMode">
-<head>#<phrase diff="chg">dropMode</phrase></head>
-<p>A TT AF transformation processor supports the
-<code>#<phrase diff="chg">dropMode</phrase></code> feature if it recognizes and is capable of
+<head>#dropMode</head>
+<p>A TT AF transformation processor supports the
+<code>#dropMode</code> feature if it recognizes and is capable of
 transforming the <loc
-href="#parameter-attribute-dropMode"><att>ttp:<phrase diff="chg">dropMode</phrase></att></loc>
-attribute.</p>
-<p>A TT AF presentation processor supports the
-<code>#<phrase diff="chg">dropMode</phrase></code> feature if it implements presentation semantic support
+href="#parameter-attribute-dropMode"><att>ttp:dropMode</att></loc>
+attribute.</p>
+<p>A TT AF presentation processor supports the
+<code>#dropMode</code> feature if it implements presentation semantic support
 for the <loc
-href="#parameter-attribute-dropMode"><att>ttp:<phrase diff="chg">dropMode</phrase></att></loc>
-attribute.</p>
-</div3>
-<div3 id="feature-dropMode-dropNTSC" diff="add">
+href="#parameter-attribute-dropMode"><att>ttp:dropMode</att></loc>
+attribute.</p>
+</div3>
+<div3 id="feature-dropMode-dropNTSC">
 <head>#dropMode-dropNTSC</head>
 <p>A TT AF transformation processor supports the
 <code>#dropMode-dropNTSC</code> feature if it recognizes and is capable of
@@ -9930,7 +9924,7 @@
 href="#parameter-attribute-dropMode"><att>ttp:dropMode</att></loc>
 attribute.</p>
 </div3>
-<div3 id="feature-dropMode-dropPAL" diff="add">
+<div3 id="feature-dropMode-dropPAL">
 <head>#dropMode-dropPAL</head>
 <p>A TT AF transformation processor supports the
 <code>#dropMode-dropPAL</code> feature if it recognizes and is capable of
@@ -9943,7 +9937,7 @@
 href="#parameter-attribute-dropMode"><att>ttp:dropMode</att></loc>
 attribute.</p>
 </div3>
-<div3 id="feature-dropMode-nonDrop" diff="add">
+<div3 id="feature-dropMode-nonDrop">
 <head>#dropMode-nonDrop</head>
 <p>A TT AF transformation processor supports the
 <code>#dropMode-nonDrop</code> feature if it recognizes and is capable of
@@ -10063,22 +10057,22 @@
 <head>#dynamicFlow-line</head>
 <p>A TT AF transformation processor supports the
 <code>#dynamicFlow-line</code> feature if it recognizes and
-is capable of transforming <phrase diff="add">(1) </phrase>the flow unit
+is capable of transforming (1) the flow unit
 <code>line</code> as
 defined by <specref ref="style-value-flowFunction"/> when used with the
 <loc href="#style-attribute-dynamicFlow"><att>tts:dynamicFlow</att></loc>
-attribute<phrase diff="add"> and (2) the flow interval argument
+attribute and (2) the flow interval argument
 <code>break</code> as defined by
-<specref ref="style-value-flowIntervalFunction"/></phrase>.</p>
+<specref ref="style-value-flowIntervalFunction"/>.</p>
 <p>A TT AF presentation processor supports the
 <code>#dynamicFlow-line</code> feature if it implements
-presentation semantic support for <phrase diff="add">(1) </phrase>the
+presentation semantic support for (1) the
 flow unit <code>line</code> as
 defined by <specref ref="style-value-flowFunction"/> when used with the
 <loc href="#style-attribute-dynamicFlow"><att>tts:dynamicFlow</att></loc>
-attribute<phrase diff="add"> and (2) the flow interval argument
+attribute and (2) the flow interval argument
 <code>break</code> as defined by
-<specref ref="style-value-flowIntervalFunction"/></phrase>.</p>
+<specref ref="style-value-flowIntervalFunction"/>.</p>
 </div3>
 <div3 id="feature-dynamicFlow-out">
 <head>#dynamicFlow-out</head>
@@ -10165,7 +10159,7 @@
 href="#style-attribute-extent"><att>tts:extent</att></loc>
 attribute.</p>
 </div3>
-<div3 id="feature-extent-region" diff="add">
+<div3 id="feature-extent-region">
 <head>#extent-region</head>
 <p>A TT AF transformation processor supports the
 <code>#extent-region</code> feature if it recognizes and is capable of
@@ -10180,7 +10174,7 @@
 attribute when applied to a <loc
 href="#layout-vocabulary-region"><el>region</el></loc> element.</p>
 </div3>
-<div3 id="feature-extent-root" diff="add">
+<div3 id="feature-extent-root">
 <head>#extent-root</head>
 <p>A TT AF transformation processor supports the
 <code>#extent-root</code> feature if it recognizes and is capable of
@@ -10256,15 +10250,15 @@
 attribute.</p>
 </div3>
 <div3 id="feature-fontSize-anamorphic">
-<head>#fontSize-<phrase diff="chg">anamorphic</phrase></head>
-<p>A TT AF transformation processor supports the
-<code>#fontSize-<phrase diff="chg">anamorphic</phrase></code> feature if it recognizes and is
+<head>#fontSize-anamorphic</head>
+<p>A TT AF transformation processor supports the
+<code>#fontSize-anamorphic</code> feature if it recognizes and is
 capable of transforming values of the <loc
 href="#style-attribute-fontSize"><att>tts:fontSize</att></loc>
 attribute that consist of two <loc
 href="#style-value-length">&lt;length&gt;</loc> specifications.</p>
 <p>A TT AF presentation processor supports the
-<code>#fontSize-<phrase diff="chg">anamorphic</phrase></code> feature if it implements presentation semantic
+<code>#fontSize-anamorphic</code> feature if it implements presentation semantic
 support for defined values of the <loc
 href="#style-attribute-fontSize"><att>tts:fontSize</att></loc>
 attribute that consist of two <loc
@@ -10311,7 +10305,7 @@
 href="#style-attribute-fontStyle"><att>tts:fontStyle</att></loc>
 attribute.</p>
 </div3>
-<div3 id="feature-fontStyle-oblique" diff="add">
+<div3 id="feature-fontStyle-oblique">
 <head>#fontStyle-oblique</head>
 <p>A TT AF transformation processor supports the
 <code>#fontStyle-oblique</code> feature if it recognizes and is
@@ -10324,7 +10318,7 @@
 href="#style-attribute-fontStyle"><att>tts:fontStyle</att></loc>
 attribute.</p>
 </div3>
-<div3 id="feature-fontStyle-reverseOblique" diff="add">
+<div3 id="feature-fontStyle-reverseOblique">
 <head>#fontStyle-reverseOblique</head>
 <p>A TT AF transformation processor supports the
 <code>#fontStyle-reverseOblique</code> feature if it recognizes and is
@@ -10567,7 +10561,7 @@
 href="#parameter-attribute-markerMode"><att>ttp:markerMode</att></loc>
 attribute.</p>
 </div3>
-<div3 id="feature-markerMode-continuous" diff="add">
+<div3 id="feature-markerMode-continuous">
 <head>#markerMode-continuous</head>
 <p>A TT AF transformation processor supports the
 <code>#markerMode-continuous</code> feature if it recognizes and is capable of
@@ -10580,7 +10574,7 @@
 href="#parameter-attribute-markerMode"><att>ttp:markerMode</att></loc>
 attribute.</p>
 </div3>
-<div3 id="feature-markerMode-discontinuous" diff="add">
+<div3 id="feature-markerMode-discontinuous">
 <head>#markerMode-discontinuous</head>
 <p>A TT AF transformation processor supports the
 <code>#markerMode-discontinuous</code> feature if it recognizes and is capable of
@@ -10690,7 +10684,7 @@
 href="#style-attribute-overflow"><att>tts:overflow</att></loc>
 attribute.</p>
 </div3>
-<div3 id="feature-overflow-visible" diff="add">
+<div3 id="feature-overflow-visible">
 <head>#overflow-visible</head>
 <p>A TT AF transformation processor supports the
 <code>#overflow-visible</code> feature if it recognizes and is capable of
@@ -11079,7 +11073,7 @@
 href="#style-attribute-textOutline"><att>tts:textOutline</att></loc>
 attribute.</p>
 </div3>
-<div3 id="feature-textOutline-blurred" diff="chg">
+<div3 id="feature-textOutline-blurred">
 <head>#textOutline-blurred</head>
 <p>A TT AF transformation processor supports the
 <code>#textOutline-blurred</code> feature if it recognizes and is capable of
@@ -11092,7 +11086,7 @@
 href="#style-attribute-textOutline"><att>tts:textOutline</att></loc>
 attribute that includes a blur radius specification.</p>
 </div3>
-<div3 id="feature-textOutline-unblurred" diff="add">
+<div3 id="feature-textOutline-unblurred">
 <head>#textOutline-unblurred</head>
 <p>A TT AF transformation processor supports the
 <code>#textOutline-unblurred</code> feature if it recognizes and is capable of
@@ -11153,13 +11147,13 @@
 of transforming the <code>smpte</code> value of the <loc
 href="#parameter-attribute-timeBase"><att>ttp:timeBase</att></loc>
 attribute and if it supports the <loc
-href="#feature-dropMode"><code>#<phrase diff="chg">dropMode</phrase></code></loc> feature.</p>
+href="#feature-dropMode"><code>#dropMode</code></loc> feature.</p>
 <p>A TT AF presentation processor supports the
 <code>#timeBase-smpte</code> feature if it implements presentation
 semantic support for the <code>smpte</code> value of the <loc
 href="#parameter-attribute-timeBase"><att>ttp:timeBase</att></loc>
 attribute and if it supports the <loc
-href="#feature-dropMode"><code>#<phrase diff="chg">dropMode</phrase></code></loc> feature.</p>
+href="#feature-dropMode"><code>#dropMode</code></loc> feature.</p>
 </div3>
 <div3 id="feature-timeContainer">
 <head>#timeContainer</head>
@@ -11521,19 +11515,19 @@
 <td>O</td>
 </tr>
 <tr>
-<td><phrase diff="add"><loc href="#feature-clockMode-gps"><code>#clockMode-gps</code></loc></phrase></td>
-<td><phrase diff="add">O</phrase></td>
-<td><phrase diff="add">O</phrase></td>
-</tr>
-<tr>
-<td><phrase diff="add"><loc href="#feature-clockMode-local"><code>#clockMode-local</code></loc></phrase></td>
-<td><phrase diff="add">O</phrase></td>
-<td><phrase diff="add">O</phrase></td>
-</tr>
-<tr>
-<td><phrase diff="add"><loc href="#feature-clockMode-utc"><code>#clockMode-utc</code></loc></phrase></td>
-<td><phrase diff="add">O</phrase></td>
-<td><phrase diff="add">O</phrase></td>
+<td><loc href="#feature-clockMode-gps"><code>#clockMode-gps</code></loc></td>
+<td>O</td>
+<td>O</td>
+</tr>
+<tr>
+<td><loc href="#feature-clockMode-local"><code>#clockMode-local</code></loc></td>
+<td>O</td>
+<td>O</td>
+</tr>
+<tr>
+<td><loc href="#feature-clockMode-utc"><code>#clockMode-utc</code></loc></td>
+<td>O</td>
+<td>O</td>
 </tr>
 <tr>
 <td><loc href="#feature-color"><code>#color</code></loc></td>
@@ -11581,24 +11575,24 @@
 <td>O</td>
 </tr>
 <tr>
-<td><loc href="#feature-dropMode"><code>#<phrase diff="chg">dropMode</phrase></code></loc></td>
-<td>O</td>
-<td>O</td>
-</tr>
-<tr>
-<td><phrase diff="add"><loc href="#feature-dropMode-dropNTSC"><code>#dropMode-dropNTSC</code></loc></phrase></td>
-<td><phrase diff="add">O</phrase></td>
-<td><phrase diff="add">O</phrase></td>
-</tr>
-<tr>
-<td><phrase diff="add"><loc href="#feature-dropMode-dropPAL"><code>#dropMode-dropPAL</code></loc></phrase></td>
-<td><phrase diff="add">O</phrase></td>
-<td><phrase diff="add">O</phrase></td>
-</tr>
-<tr>
-<td><phrase diff="add"><loc href="#feature-dropMode-nonDrop"><code>#dropMode-nonDrop</code></loc></phrase></td>
-<td><phrase diff="add">O</phrase></td>
-<td><phrase diff="add">O</phrase></td>
+<td><loc href="#feature-dropMode"><code>#dropMode</code></loc></td>
+<td>O</td>
+<td>O</td>
+</tr>
+<tr>
+<td><loc href="#feature-dropMode-dropNTSC"><code>#dropMode-dropNTSC</code></loc></td>
+<td>O</td>
+<td>O</td>
+</tr>
+<tr>
+<td><loc href="#feature-dropMode-dropPAL"><code>#dropMode-dropPAL</code></loc></td>
+<td>O</td>
+<td>O</td>
+</tr>
+<tr>
+<td><loc href="#feature-dropMode-nonDrop"><code>#dropMode-nonDrop</code></loc></td>
+<td>O</td>
+<td>O</td>
 </tr>
 <tr>
 <td><loc href="#feature-dynamicFlow"><code>#dynamicFlow</code></loc></td>
@@ -11671,14 +11665,14 @@
 <td>O</td>
 </tr>
 <tr>
-<td><phrase diff="add"><loc href="#feature-extent-region"><code>#extent-region</code></loc></phrase></td>
-<td><phrase diff="add">O</phrase></td>
-<td><phrase diff="add">O</phrase></td>
-</tr>
-<tr>
-<td><phrase diff="add"><loc href="#feature-extent-root"><code>#extent-root</code></loc></phrase></td>
-<td><phrase diff="add">O</phrase></td>
-<td><phrase diff="add">O</phrase></td>
+<td><loc href="#feature-extent-region"><code>#extent-region</code></loc></td>
+<td>O</td>
+<td>O</td>
+</tr>
+<tr>
+<td><loc href="#feature-extent-root"><code>#extent-root</code></loc></td>
+<td>O</td>
+<td>O</td>
 </tr>
 <tr>
 <td><loc href="#feature-fontFamily"><code>#fontFamily</code></loc></td>
@@ -11701,7 +11695,7 @@
 <td>O</td>
 </tr>
 <tr>
-<td><loc href="#feature-fontSize-anamorphic"><code>#fontSize-<phrase diff="chg">anamorphic</phrase></code></loc></td>
+<td><loc href="#feature-fontSize-anamorphic"><code>#fontSize-anamorphic</code></loc></td>
 <td>O</td>
 <td>O</td>
 </tr>
@@ -11721,14 +11715,14 @@
 <td>O</td>
 </tr>
 <tr>
-<td><phrase diff="add"><loc href="#feature-fontStyle-oblique"><code>#fontStyle-oblique</code></loc></phrase></td>
-<td><phrase diff="add">O</phrase></td>
-<td><phrase diff="add">O</phrase></td>
-</tr>
-<tr>
-<td><phrase diff="add"><loc href="#feature-fontStyle-reverseOblique"><code>#fontStyle-reverseOblique</code></loc></phrase></td>
-<td><phrase diff="add">O</phrase></td>
-<td><phrase diff="add">O</phrase></td>
+<td><loc href="#feature-fontStyle-oblique"><code>#fontStyle-oblique</code></loc></td>
+<td>O</td>
+<td>O</td>
+</tr>
+<tr>
+<td><loc href="#feature-fontStyle-reverseOblique"><code>#fontStyle-reverseOblique</code></loc></td>
+<td>O</td>
+<td>O</td>
 </tr>
 <tr>
 <td><loc href="#feature-fontWeight"><code>#fontWeight</code></loc></td>
@@ -11816,14 +11810,14 @@
 <td>O</td>
 </tr>
 <tr>
-<td><phrase diff="add"><loc href="#feature-markerMode-continuous"><code>#markerMode-continuous</code></loc></phrase></td>
-<td><phrase diff="add">O</phrase></td>
-<td><phrase diff="add">O</phrase></td>
-</tr>
-<tr>
-<td><phrase diff="add"><loc href="#feature-markerMode-discontinuous"><code>#markerMode-discontinuous</code></loc></phrase></td>
-<td><phrase diff="add">O</phrase></td>
-<td><phrase diff="add">O</phrase></td>
+<td><loc href="#feature-markerMode-continuous"><code>#markerMode-continuous</code></loc></td>
+<td>O</td>
+<td>O</td>
+</tr>
+<tr>
+<td><loc href="#feature-markerMode-discontinuous"><code>#markerMode-discontinuous</code></loc></td>
+<td>O</td>
+<td>O</td>
 </tr>
 <tr>
 <td><loc href="#feature-metadata"><code>#metadata</code></loc></td>
@@ -11861,9 +11855,9 @@
 <td>O</td>
 </tr>
 <tr>
-<td><phrase diff="add"><loc href="#feature-overflow-visible"><code>#overflow-visible</code></loc></phrase></td>
-<td><phrase diff="add">O</phrase></td>
-<td><phrase diff="add">O</phrase></td>
+<td><loc href="#feature-overflow-visible"><code>#overflow-visible</code></loc></td>
+<td>O</td>
+<td>O</td>
 </tr>
 <tr>
 <td><loc href="#feature-padding"><code>#padding</code></loc></td>
@@ -12001,14 +11995,14 @@
 <td>O</td>
 </tr>
 <tr>
-<td><phrase diff="chg"><loc href="#feature-textOutline-blurred"><code>#textOutline-blurred</code></loc></phrase></td>
-<td>O</td>
-<td>O</td>
-</tr>
-<tr>
-<td><phrase diff="add"><loc href="#feature-textOutline-unblurred"><code>#textOutline-unblurred</code></loc></phrase></td>
-<td><phrase diff="add">O</phrase></td>
-<td><phrase diff="add">O</phrase></td>
+<td><loc href="#feature-textOutline-blurred"><code>#textOutline-blurred</code></loc></td>
+<td>O</td>
+<td>O</td>
+</tr>
+<tr>
+<td><loc href="#feature-textOutline-unblurred"><code>#textOutline-unblurred</code></loc></td>
+<td>O</td>
+<td>O</td>
 </tr>
 <tr>
 <td><loc href="#feature-tickRate"><code>#tickRate</code></loc></td>
@@ -12278,7 +12272,7 @@
   : extension-namespace designation
 
 extension-namespace
-  : <emph>TT Extension Namespace</emph>                  // http://www.w3.org/2006/10/ttaf1/extension<phrase diff="add">/</phrase>
+  : <emph>TT Extension Namespace</emph>                  // http://www.w3.org/ns/ttml/extension/
   | <emph>Other Extension Namespace</emph>               // expressed as an absolute URI
 
 designation
@@ -12311,19 +12305,19 @@
 <p>Each TT AF profile is defined in terms of a TT AF Profile Definition Document,
 which is expressed as an XML document wherein the root element adheres to
 <specref ref="parameter-vocabulary-profile"/>.</p>
-<div2 id="profile-dfxp-transformation" diff="chg">
+<div2 id="profile-dfxp-transformation">
 <head>DFXP Transformation Profile</head>
 <p>The DFXP Transformation Profile is intended to be used to
 express minimum compliance for transformation processing.</p>
 <eg xml:space="preserve">&profile-dfxp-transformation;</eg>
 </div2>
-<div2 id="profile-dfxp-presentation" diff="chg">
+<div2 id="profile-dfxp-presentation">
 <head>DFXP Presentation Profile</head>
 <p>The DFXP Presentation Profile is intended to be used to
 express minimum compliance for presentation processing.</p>
 <eg xml:space="preserve">&profile-dfxp-presentation;</eg>
 </div2>
-<div2 id="profile-dfxp-full" diff="chg">
+<div2 id="profile-dfxp-full">
 <head>DFXP Full Profile</head>
 <p>The DFXP Full Profile is intended to be used to
 express maximum compliance for both transformation and presentation processing.</p>
@@ -13415,7 +13409,7 @@
 <td></td>
 </tr>
 <tr>
-<td><loc href="#parameter-attribute-dropMode"><code>ttp:<phrase diff="chg">dropMode</phrase></code></loc></td>
+<td><loc href="#parameter-attribute-dropMode"><code>ttp:dropMode</code></loc></td>
 <td><emph>none</emph></td>
 <td></td>
 <td>expresses frame counting (drop) modes</td>
@@ -13679,7 +13673,7 @@
 Interpretation of time expression is further constrained by
 parameters expressed by
 <att>ttp:clockMode</att>,
-<att>ttp:<phrase diff="chg">dropMode</phrase></att>,
+<att>ttp:dropMode</att>,
 <att>ttp:frameRate</att>,
 <att>ttp:frameRateMultiplier</att>,
 <att>ttp:markerMode</att>,
@@ -14535,7 +14529,7 @@
 
 </eg>
 </div2>
-<div2 id="change-history-lc3-to-cr2" diff="add">
+<div2 id="change-history-lc3-to-cr2">
 <head>Changes from Third Last Call Working Draft to Second Candidate Recommendation</head>
 <eg xml:space="preserve">
 <phrase role="strong">Technical Changes</phrase>
@@ -14590,6 +14584,16 @@
 
 </eg>
 </div2>
+<div2 id="change-history-cr2-to-pr1">
+<head>Changes from Second Candidate Recommendation to Proposed Recommendation</head>
+<eg xml:space="preserve">
+<phrase role="strong">Technical Changes</phrase>
+
+* Changed the media type from application/ttaf+xml to application/ttml+xml
+* Changed the namespace base to http://www.w3.org/ns/ttml
+* Changed the title of the document
+</eg>
+</div2>
 </inform-div1>
 </back>
 </spec>