--- a/ttml-ww-profiles/ttml-ww-profiles.html	Thu Apr 30 08:49:44 2015 -0700
+++ b/ttml-ww-profiles/ttml-ww-profiles.html	Sat May 02 11:25:34 2015 -0700
@@ -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-30-april-2015"><abbr title="World Wide Web Consortium">W3C</abbr> Editor's Draft <time property="dcterms:issued" class="dt-published" datetime="2015-04-30">30 April 2015</time></h2>
+  <h2 id="w3c-editor-s-draft-02-may-2015"><abbr title="World Wide Web Consortium">W3C</abbr> Editor's Draft <time property="dcterms:issued" class="dt-published" datetime="2015-05-02">02 May 2015</time></h2>
   <dl>
     
       <dt>This version:</dt>
@@ -1168,8 +1168,10 @@
           <tr>
             <td><code>#frameRate</code></td>
 
-            <td>If the document includes any time expression that uses the <em>frames</em> term, the <code>ttp:frameRate</code>
-            attribute <em class="rfc2119" title="SHALL">SHALL</em> be present on the <code>tt</code> element.</td>
+            <td><em class="rfc2119" title="MAY">MAY</em> be used, with the following additional constraints:<ul><li>If the document
+includes any clock time expression that uses the <code>frames</code> term or any offset
+time expression that uses the <code>f</code> metric, the <code>ttp:frameRate</code> attribute <em class="rfc2119" title="SHALL">SHALL</em>
+be present on the <code>tt</code> element.</li></ul></td>
           </tr>
 
           <tr>
@@ -1344,7 +1346,7 @@
             <td><code>#tickRate</code></td>
 
             <td><em class="rfc2119" title="MAY">MAY</em> be used, with the following additional constraints:<ul><li><code>ttp:tickRate</code> <em class="rfc2119" title="SHALL">SHALL</em> be present on the <code>tt</code> element if the
-            #time-offset-with-ticks feature is used in the document.</li></ul></td>
+             document contains any time expression that uses the <code>t</code> metric.</li></ul></td>
           </tr>
 
           <tr>
@@ -1408,9 +1410,9 @@
 
             <td><em class="rfc2119" title="MAY">MAY</em> be used, with the following additional constraints:
 						
-						<ul><li>All time expressions within a <a href="#dfn-document-instance" class="internalDFN">Document Instance</a> <em class="rfc2119" title="SHOULD">SHOULD</em> use the same syntax, either <code>clock-time</code> or <code>offset-time</code>; and</li>
+						<ul><li>all time expressions within a <a href="#dfn-document-instance" class="internalDFN">Document Instance</a> <em class="rfc2119" title="SHOULD">SHOULD</em> use the same syntax, either <code>clock-time</code> or <code>offset-time</code>; and</li>
 						
-						<li><code>begin</code> and  <code>end</code> attributes <em class="rfc2119" title="SHOULD">SHOULD</em> be specified on either <code>div</code>, <code>p</code> or <code>span</code> elements.</li></ul>
+						<li>for any content element that contains <code>br</code> elements or text nodes or a <code>smpte:backgroundImage</code> attribute, the <code>begin</code> and  <code>end</code> attributes <em class="rfc2119" title="SHOULD">SHOULD</em> be specified on the content element or at least one of its ancestors.</li></ul>
 						</td>
           </tr>
 

--- a/ttml-ww-profiles/ttml-ww-profiles.source.html	Thu Apr 30 08:49:44 2015 -0700
+++ b/ttml-ww-profiles/ttml-ww-profiles.source.html	Sat May 02 11:25:34 2015 -0700
@@ -858,8 +858,10 @@
           <tr>
             <td><code>#frameRate</code></td>
 
-            <td>If the document includes any time expression that uses the <em>frames</em> term, the <code>ttp:frameRate</code>
-            attribute SHALL be present on the <code>tt</code> element.</td>
+            <td>MAY be used, with the following additional constraints:<ul><li>If the document
+includes any clock time expression that uses the <code>frames</code> term or any offset
+time expression that uses the <code>f</code> metric, the <code>ttp:frameRate</code> attribute SHALL
+be present on the <code>tt</code> element.</li></ul></td>
           </tr>
 
           <tr>
@@ -1034,7 +1036,7 @@
             <td><code>#tickRate</code></td>
 
             <td>MAY be used, with the following additional constraints:<ul><li><code>ttp:tickRate</code> SHALL be present on the <code>tt</code> element if the
-            #time-offset-with-ticks feature is used in the document.</li></ul></td>
+             document contains any time expression that uses the <code>t</code> metric.</li></ul></td>
           </tr>
 
           <tr>
@@ -1098,9 +1100,9 @@
 
             <td>MAY be used, with the following additional constraints:
 						
-						<ul><li>All time expressions within a <a>Document Instance</a> SHOULD use the same syntax, either <code>clock-time</code> or <code>offset-time</code>; and</li>
+						<ul><li>all time expressions within a <a>Document Instance</a> SHOULD use the same syntax, either <code>clock-time</code> or <code>offset-time</code>; and</li>
 						
-						<li><code>begin</code> and  <code>end</code> attributes SHOULD be specified on either <code>div</code>, <code>p</code> or <code>span</code> elements.</li></ul>
+						<li>for any content element that contains <code>br</code> elements or text nodes or a <code>smpte:backgroundImage</code> attribute, the <code>begin</code> and <code>end</code> attributes SHOULD be specified on the content element or at least one of its ancestors.</li></ul>
 						</td>
           </tr>