[html5] r5561 - / images

whatwg at whatwg.org whatwg at whatwg.org
Wed Sep 29 15:28:02 PDT 2010


Author: ianh
Date: 2010-09-29 15:28:00 -0700 (Wed, 29 Sep 2010)
New Revision: 5561

Modified:
   complete.html
   images/content-venn.svg
   index
   source
Log:
[ac] (2) Adding the <s> element to the language.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=9429

Modified: complete.html
===================================================================
--- complete.html	2010-09-29 19:14:31 UTC (rev 5560)
+++ complete.html	2010-09-29 22:28:00 UTC (rev 5561)
@@ -492,27 +492,28 @@
      <li><a href=#the-em-element><span class=secno>4.6.2 </span>The <code>em</code> element</a></li>
      <li><a href=#the-strong-element><span class=secno>4.6.3 </span>The <code>strong</code> element</a></li>
      <li><a href=#the-small-element><span class=secno>4.6.4 </span>The <code>small</code> element</a></li>
-     <li><a href=#the-cite-element><span class=secno>4.6.5 </span>The <code>cite</code> element</a></li>
-     <li><a href=#the-q-element><span class=secno>4.6.6 </span>The <code>q</code> element</a></li>
-     <li><a href=#the-dfn-element><span class=secno>4.6.7 </span>The <code>dfn</code> element</a></li>
-     <li><a href=#the-abbr-element><span class=secno>4.6.8 </span>The <code>abbr</code> element</a></li>
-     <li><a href=#the-time-element><span class=secno>4.6.9 </span>The <code>time</code> element</a></li>
-     <li><a href=#the-code-element><span class=secno>4.6.10 </span>The <code>code</code> element</a></li>
-     <li><a href=#the-var-element><span class=secno>4.6.11 </span>The <code>var</code> element</a></li>
-     <li><a href=#the-samp-element><span class=secno>4.6.12 </span>The <code>samp</code> element</a></li>
-     <li><a href=#the-kbd-element><span class=secno>4.6.13 </span>The <code>kbd</code> element</a></li>
-     <li><a href=#the-sub-and-sup-elements><span class=secno>4.6.14 </span>The <code>sub</code> and <code>sup</code> elements</a></li>
-     <li><a href=#the-i-element><span class=secno>4.6.15 </span>The <code>i</code> element</a></li>
-     <li><a href=#the-b-element><span class=secno>4.6.16 </span>The <code>b</code> element</a></li>
-     <li><a href=#the-mark-element><span class=secno>4.6.17 </span>The <code>mark</code> element</a></li>
-     <li><a href=#the-ruby-element><span class=secno>4.6.18 </span>The <code>ruby</code> element</a></li>
-     <li><a href=#the-rt-element><span class=secno>4.6.19 </span>The <code>rt</code> element</a></li>
-     <li><a href=#the-rp-element><span class=secno>4.6.20 </span>The <code>rp</code> element</a></li>
-     <li><a href=#the-bdo-element><span class=secno>4.6.21 </span>The <code>bdo</code> element</a></li>
-     <li><a href=#the-span-element><span class=secno>4.6.22 </span>The <code>span</code> element</a></li>
-     <li><a href=#the-br-element><span class=secno>4.6.23 </span>The <code>br</code> element</a></li>
-     <li><a href=#the-wbr-element><span class=secno>4.6.24 </span>The <code>wbr</code> element</a></li>
-     <li><a href=#usage-summary><span class=secno>4.6.25 </span>Usage summary</a></ol></li>
+     <li><a href=#the-s-element><span class=secno>4.6.5 </span>The <code>s</code> element</a></li>
+     <li><a href=#the-cite-element><span class=secno>4.6.6 </span>The <code>cite</code> element</a></li>
+     <li><a href=#the-q-element><span class=secno>4.6.7 </span>The <code>q</code> element</a></li>
+     <li><a href=#the-dfn-element><span class=secno>4.6.8 </span>The <code>dfn</code> element</a></li>
+     <li><a href=#the-abbr-element><span class=secno>4.6.9 </span>The <code>abbr</code> element</a></li>
+     <li><a href=#the-time-element><span class=secno>4.6.10 </span>The <code>time</code> element</a></li>
+     <li><a href=#the-code-element><span class=secno>4.6.11 </span>The <code>code</code> element</a></li>
+     <li><a href=#the-var-element><span class=secno>4.6.12 </span>The <code>var</code> element</a></li>
+     <li><a href=#the-samp-element><span class=secno>4.6.13 </span>The <code>samp</code> element</a></li>
+     <li><a href=#the-kbd-element><span class=secno>4.6.14 </span>The <code>kbd</code> element</a></li>
+     <li><a href=#the-sub-and-sup-elements><span class=secno>4.6.15 </span>The <code>sub</code> and <code>sup</code> elements</a></li>
+     <li><a href=#the-i-element><span class=secno>4.6.16 </span>The <code>i</code> element</a></li>
+     <li><a href=#the-b-element><span class=secno>4.6.17 </span>The <code>b</code> element</a></li>
+     <li><a href=#the-mark-element><span class=secno>4.6.18 </span>The <code>mark</code> element</a></li>
+     <li><a href=#the-ruby-element><span class=secno>4.6.19 </span>The <code>ruby</code> element</a></li>
+     <li><a href=#the-rt-element><span class=secno>4.6.20 </span>The <code>rt</code> element</a></li>
+     <li><a href=#the-rp-element><span class=secno>4.6.21 </span>The <code>rp</code> element</a></li>
+     <li><a href=#the-bdo-element><span class=secno>4.6.22 </span>The <code>bdo</code> element</a></li>
+     <li><a href=#the-span-element><span class=secno>4.6.23 </span>The <code>span</code> element</a></li>
+     <li><a href=#the-br-element><span class=secno>4.6.24 </span>The <code>br</code> element</a></li>
+     <li><a href=#the-wbr-element><span class=secno>4.6.25 </span>The <code>wbr</code> element</a></li>
+     <li><a href=#usage-summary><span class=secno>4.6.26 </span>Usage summary</a></ol></li>
    <li><a href=#edits><span class=secno>4.7 </span>Edits</a>
     <ol>
      <li><a href=#the-ins-element><span class=secno>4.7.1 </span>The <code>ins</code> element</a></li>
@@ -2000,10 +2001,10 @@
   likely to be more convenient when the styles apply to multiple
   pages.</p>
 
-  <p>It is also worth noting that four elements that were previously
+  <p>It is also worth noting that some elements that were previously
   presentational have been redefined in this specification to be
   media-independent: <code><a href=#the-b-element>b</a></code>, <code><a href=#the-i-element>i</a></code>, <code><a href=#the-hr-element>hr</a></code>,
-  and <code><a href=#the-small-element>small</a></code>.</p>
+  <code><a href=#the-s-element>s</a></code>, and <code><a href=#the-small-element>small</a></code>.</p>
 
 
   <h4 id=syntax-errors><span class=secno>1.10.2 </span>Syntax errors</h4>
@@ -10211,6 +10212,7 @@
    <li><code><a href=#the-progress-element>progress</a></code></li>
    <li><code><a href=#the-q-element>q</a></code></li>
    <li><code><a href=#the-ruby-element>ruby</a></code></li>
+   <li><code><a href=#the-s-element>s</a></code></li>
    <li><code><a href=#the-samp-element>samp</a></code></li>
    <li><code><a href=#script>script</a></code></li>
    <li><code><a href=#the-section-element>section</a></code></li>
@@ -10327,6 +10329,7 @@
    <li><code><a href=#the-progress-element>progress</a></code></li>
    <li><code><a href=#the-q-element>q</a></code></li>
    <li><code><a href=#the-ruby-element>ruby</a></code></li>
+   <li><code><a href=#the-s-element>s</a></code></li>
    <li><code><a href=#the-samp-element>samp</a></code></li>
    <li><code><a href=#script>script</a></code></li>
    <li><code><a href=#the-select-element>select</a></code></li>
@@ -11137,6 +11140,7 @@
     <code><a href=#the-rp-element>rp</a></code>,
     <code><a href=#the-rt-element>rt</a></code>,
     <code><a href=#the-ruby-element>ruby</a></code>,
+    <code><a href=#the-s-element>s</a></code>,
     <code><a href=#the-samp-element>samp</a></code>,
     <code><a href=#the-small-element>small</a></code>,
     <code><a href=#the-span-element>span</a></code>,
@@ -18414,7 +18418,7 @@
   </div>
 
 
-  <h4 id=the-cite-element><span class=secno>4.6.5 </span>The <dfn><code>cite</code></dfn> element</h4>
+  <h4 id=the-s-element><span class=secno>4.6.5 </span>The <dfn><code>s</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -18427,6 +18431,39 @@
    <dd><a href=#global-attributes>Global attributes</a></dd>
    <dt>DOM interface:</dt>
    <dd>Uses <code><a href=#htmlelement>HTMLElement</a></code>.</dd>
+  </dl><p>The <code><a href=#the-s-element>s</a></code> element <a href=#represents>represents</a> contents that
+  are no longer accurate or no longer relevant.</p>
+
+  <p class=note>The <code><a href=#the-s-element>s</a></code> element is not appropriate when
+  indicating document edits; to mark a span of text as having been
+  removed from a document, use the <code><a href=#the-del-element>del</a></code> element.</p>
+
+  <div class=example>
+
+   <p>In this example a recommended retail price has been marked as no
+   longer relevant as the product in question has a new sale
+   price.</p>
+
+   <pre><p>Buy our Iced Tea and Lemonade!</p>
+<p><s>Recommended retail price: $3.99 per bottle</s></p>
+<p><strong>Now selling for just $2.99 a bottle!</strong></p></pre>
+
+  </div>
+
+
+  <h4 id=the-cite-element><span class=secno>4.6.6 </span>The <dfn><code>cite</code></dfn> element</h4>
+
+  <dl class=element><dt>Categories</dt>
+   <dd><a href=#flow-content>Flow content</a>.</dd>
+   <dd><a href=#phrasing-content>Phrasing content</a>.</dd>
+   <dt>Contexts in which this element can be used:</dt>
+   <dd>Where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
+   <dt>Content model:</dt>
+   <dd><a href=#phrasing-content>Phrasing content</a>.</dd>
+   <dt>Content attributes:</dt>
+   <dd><a href=#global-attributes>Global attributes</a></dd>
+   <dt>DOM interface:</dt>
+   <dd>Uses <code><a href=#htmlelement>HTMLElement</a></code>.</dd>
   </dl><p>The <code><a href=#the-cite-element>cite</a></code> element <a href=#represents>represents</a> the title
   of a work (e.g.
   a book,
@@ -18538,7 +18575,7 @@
 
 
 
-  <h4 id=the-q-element><span class=secno>4.6.6 </span>The <dfn><code>q</code></dfn> element</h4>
+  <h4 id=the-q-element><span class=secno>4.6.7 </span>The <dfn><code>q</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -18637,7 +18674,7 @@
   </div>
 
 
-  <h4 id=the-dfn-element><span class=secno>4.6.7 </span>The <dfn><code>dfn</code></dfn> element</h4>
+  <h4 id=the-dfn-element><span class=secno>4.6.8 </span>The <dfn><code>dfn</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -18705,7 +18742,7 @@
 
 
 
-  <h4 id=the-abbr-element><span class=secno>4.6.8 </span>The <dfn><code>abbr</code></dfn> element</h4>
+  <h4 id=the-abbr-element><span class=secno>4.6.9 </span>The <dfn><code>abbr</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -18820,7 +18857,7 @@
 
 
 
-  <h4 id=the-time-element><span class=secno>4.6.9 </span>The <dfn><code>time</code></dfn> element</h4>
+  <h4 id=the-time-element><span class=secno>4.6.10 </span>The <dfn><code>time</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19106,7 +19143,7 @@
 
 
 
-  <h4 id=the-code-element><span class=secno>4.6.10 </span>The <dfn><code>code</code></dfn> element</h4>
+  <h4 id=the-code-element><span class=secno>4.6.11 </span>The <dfn><code>code</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19168,7 +19205,7 @@
   <p class=note>See the <code><a href=#the-pre-element>pre</a></code> element for more details.</p>
 
 
-  <h4 id=the-var-element><span class=secno>4.6.11 </span>The <dfn><code>var</code></dfn> element</h4>
+  <h4 id=the-var-element><span class=secno>4.6.12 </span>The <dfn><code>var</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19225,7 +19262,7 @@
   </div>
 
 
-  <h4 id=the-samp-element><span class=secno>4.6.12 </span>The <dfn><code>samp</code></dfn> element</h4>
+  <h4 id=the-samp-element><span class=secno>4.6.13 </span>The <dfn><code>samp</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19263,7 +19300,7 @@
   </div>
 
 
-  <h4 id=the-kbd-element><span class=secno>4.6.13 </span>The <dfn><code>kbd</code></dfn> element</h4>
+  <h4 id=the-kbd-element><span class=secno>4.6.14 </span>The <dfn><code>kbd</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19314,7 +19351,7 @@
   </div>
 
 
-  <h4 id=the-sub-and-sup-elements><span class=secno>4.6.14 </span>The <dfn><code>sub</code></dfn> and <dfn><code>sup</code></dfn> elements</h4>
+  <h4 id=the-sub-and-sup-elements><span class=secno>4.6.15 </span>The <dfn><code>sub</code></dfn> and <dfn><code>sup</code></dfn> elements</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19376,7 +19413,7 @@
 
 
 
-  <h4 id=the-i-element><span class=secno>4.6.15 </span>The <dfn><code>i</code></dfn> element</h4>
+  <h4 id=the-i-element><span class=secno>4.6.16 </span>The <dfn><code>i</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19437,7 +19474,7 @@
   necessarily be italicized.</p>
 
 
-  <h4 id=the-b-element><span class=secno>4.6.16 </span>The <dfn><code>b</code></dfn> element</h4>
+  <h4 id=the-b-element><span class=secno>4.6.17 </span>The <dfn><code>b</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19511,7 +19548,7 @@
 
 
 
-  <h4 id=the-mark-element><span class=secno>4.6.17 </span>The <dfn><code>mark</code></dfn> element</h4>
+  <h4 id=the-mark-element><span class=secno>4.6.18 </span>The <dfn><code>mark</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19656,7 +19693,7 @@
   </div>
 
 
-  <h4 id=the-ruby-element><span class=secno>4.6.18 </span>The <dfn><code>ruby</code></dfn> element</h4>
+  <h4 id=the-ruby-element><span class=secno>4.6.19 </span>The <dfn><code>ruby</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19746,7 +19783,7 @@
   <!-- Note: Examples are 32px/16px Stone Sans Sem ITC TT -->
 
 
-  <h4 id=the-rt-element><span class=secno>4.6.19 </span>The <dfn><code>rt</code></dfn> element</h4>
+  <h4 id=the-rt-element><span class=secno>4.6.20 </span>The <dfn><code>rt</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd>None.</dd>
@@ -19776,7 +19813,7 @@
   </div>
 
 
-  <h4 id=the-rp-element><span class=secno>4.6.20 </span>The <dfn><code>rp</code></dfn> element</h4>
+  <h4 id=the-rp-element><span class=secno>4.6.21 </span>The <dfn><code>rp</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd>None.</dd>
@@ -19825,7 +19862,7 @@
   </div>
 
 
-  <h4 id=the-bdo-element><span class=secno>4.6.21 </span>The <dfn><code>bdo</code></dfn> element</h4>
+  <h4 id=the-bdo-element><span class=secno>4.6.22 </span>The <dfn><code>bdo</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19874,7 +19911,7 @@
 
 
 
-  <h4 id=the-span-element><span class=secno>4.6.22 </span>The <dfn><code>span</code></dfn> element</h4>
+  <h4 id=the-span-element><span class=secno>4.6.23 </span>The <dfn><code>span</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19913,7 +19950,7 @@
 
 
 
-  <h4 id=the-br-element><span class=secno>4.6.23 </span>The <dfn><code>br</code></dfn> element</h4>
+  <h4 id=the-br-element><span class=secno>4.6.24 </span>The <dfn><code>br</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19991,7 +20028,7 @@
   </div>
 
 
-  <h4 id=the-wbr-element><span class=secno>4.6.24 </span>The <dfn><code>wbr</code></dfn> element</h4>
+  <h4 id=the-wbr-element><span class=secno>4.6.25 </span>The <dfn><code>wbr</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -20029,7 +20066,7 @@
 
 
 
-  <h4 id=usage-summary><span class=secno>4.6.25 </span>Usage summary</h4>
+  <h4 id=usage-summary><span class=secno>4.6.26 </span>Usage summary</h4>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -20052,6 +20089,10 @@
      <td>Side comments
      <td><pre class=example>These grapes are made into wine. <strong><small>Alcohol is addictive.</small></strong></pre>
 
+    <tr><td><code><a href=#the-s-element>s</a></code>
+     <td>Inaccurate text
+     <td><pre class=example>Price: <strong><s>£4.50</s></strong> £2.00!</pre>
+
     <tr><td><code><a href=#the-cite-element>cite</a></code>
      <td>Titles of works
      <td><pre class=example>The case <strong><cite>Hugo v. Danielle</cite></strong> is relevant here.</pre>
@@ -77486,7 +77527,7 @@
    <a href=#list-of-active-formatting-elements>list of active formatting elements</a>: <code><a href=#the-a-element>a</a></code>,
    <code><a href=#the-b-element>b</a></code>, <code><a href=#big>big</a></code>, <code><a href=#the-code-element>code</a></code>,
    <code><a href=#the-em-element>em</a></code>, <code><a href=#font>font</a></code>, <code><a href=#the-i-element>i</a></code>,
-   <code><a href=#nobr>nobr</a></code>, <code><a href=#s>s</a></code>, <code><a href=#the-small-element>small</a></code>,
+   <code><a href=#nobr>nobr</a></code>, <code><a href=#the-s-element>s</a></code>, <code><a href=#the-small-element>small</a></code>,
    <code><a href=#strike>strike</a></code>, <code><a href=#the-strong-element>strong</a></code>, <code><a href=#tt>tt</a></code>, and
    <code><a href=#u>u</a></code>.</dd>
 
@@ -87985,6 +88026,9 @@
    <dt><dfn id=rb><code>rb</code></dfn></dt>
    <dd><p>Providing the ruby base directly inside the <code><a href=#the-ruby-element>ruby</a></code> element is sufficient; the <code><a href=#rb>rb</a></code> element is unnecessary. Omit it altogether.</dd>
 
+   <dt><dfn id=strike><code>strike</code></dfn></dt>
+   <dd><p>Use <code><a href=#the-del-element>del</a></code> instead if the element is marking an edit, otherwise use <code><a href=#the-s-element>s</a></code> instead.</dd>
+
    <dt><dfn id=basefont><code>basefont</code></dfn></dt>
    <dt><dfn id=big><code>big</code></dfn></dt>
    <dt><dfn id=blink><code>blink</code></dfn></dt>
@@ -87993,9 +88037,7 @@
    <dt><code><a href=#the-marquee-element>marquee</a></code></dt>
    <dt><dfn id=multicol><code>multicol</code></dfn></dt>
    <dt><dfn id=nobr><code>nobr</code></dfn></dt>
-   <dt><dfn id=s><code>s</code></dfn></dt>
    <dt><dfn id=spacer><code>spacer</code></dfn></dt>
-   <dt><dfn id=strike><code>strike</code></dfn></dt>
    <dt><dfn id=tt><code>tt</code></dfn></dt>
    <dt><dfn id=u><code>u</code></dfn></dt>
 
@@ -88003,10 +88045,6 @@
 
     <p>Use appropriate elements and/or CSS instead.</p>
 
-    <p>For the <code><a href=#s>s</a></code> and <code><a href=#strike>strike</a></code> elements, if
-    they are marking up a removal from the element, consider using the
-    <code><a href=#the-del-element>del</a></code> element instead.</p>
-
     <p>Where the <code><a href=#tt>tt</a></code> element would have been used for
     marking up keyboard input, consider the <code><a href=#the-kbd-element>kbd</a></code> element;
     for variables, consider the <code><a href=#the-var-element>var</a></code> element; for computer
@@ -90783,6 +90821,14 @@
          <code><a href=#the-rp-element>rp</a></code> element*</td>
      <td><a href=#global-attributes title="global attributes">globals</a></td>
      <td><code><a href=#htmlelement>HTMLElement</a></code></td>
+    <tr><th><code><a href=#the-s-element>s</a></code></th>
+     <td>Inaccurate text</td>
+     <td><a href=#flow-content title="Flow content">flow</a>;
+         <a href=#phrasing-content title="Phrasing content">phrasing</a></td>
+     <td><a href=#phrasing-content title="Phrasing content">phrasing</a></td>
+     <td><a href=#phrasing-content title="Phrasing content">phrasing</a></td>
+     <td><a href=#global-attributes title="global attributes">globals</a></td>
+     <td><code><a href=#htmlelement>HTMLElement</a></code></td>
     <tr><th><code><a href=#the-samp-element>samp</a></code></th>
      <td>Computer output</td>
      <td><a href=#flow-content title="Flow content">flow</a>;
@@ -91159,6 +91205,7 @@
       <code><a href=#the-progress-element>progress</a></code>;
       <code><a href=#the-q-element>q</a></code>;
       <code><a href=#the-ruby-element>ruby</a></code>;
+      <code><a href=#the-s-element>s</a></code>;
       <code><a href=#the-samp-element>samp</a></code>;
       <code><a href=#script>script</a></code>;
       <code><a href=#the-section-element>section</a></code>;
@@ -91238,6 +91285,7 @@
       <code><a href=#the-progress-element>progress</a></code>;
       <code><a href=#the-q-element>q</a></code>;
       <code><a href=#the-ruby-element>ruby</a></code>;
+      <code><a href=#the-s-element>s</a></code>;
       <code><a href=#the-samp-element>samp</a></code>;
       <code><a href=#script>script</a></code>;
       <code><a href=#the-select-element>select</a></code>;
@@ -92714,6 +92762,9 @@
     <tr><td> <code><a href=#the-ruby-element>ruby</a></code>
      <td> <code><a href=#htmlelement>HTMLElement</a></code>
 
+    <tr><td> <code><a href=#the-s-element>s</a></code>
+     <td> <code><a href=#htmlelement>HTMLElement</a></code>
+
     <tr><td> <code><a href=#the-samp-element>samp</a></code>
      <td> <code><a href=#htmlelement>HTMLElement</a></code>
 

Modified: images/content-venn.svg
===================================================================
--- images/content-venn.svg	2010-09-29 19:14:31 UTC (rev 5560)
+++ images/content-venn.svg	2010-09-29 22:28:00 UTC (rev 5561)
@@ -83,6 +83,7 @@
      <li><code>progress</code></li>
      <li><code>q</code></li>
      <li><code>ruby</code></li>
+     <li><code>s</code></li>
      <li><code>samp</code></li>
      <li><code>script</code></li>
      <li><code>section</code></li>
@@ -230,6 +231,7 @@
      <li><code>progress</code></li>
      <li><code>q</code></li>
      <li><code>ruby</code></li>
+     <li><code>s</code></li>
      <li><code>samp</code></li>
      <li><code>script</code></li>
      <li><code>select</code></li>

Modified: index
===================================================================
--- index	2010-09-29 19:14:31 UTC (rev 5560)
+++ index	2010-09-29 22:28:00 UTC (rev 5561)
@@ -499,27 +499,28 @@
      <li><a href=#the-em-element><span class=secno>4.6.2 </span>The <code>em</code> element</a></li>
      <li><a href=#the-strong-element><span class=secno>4.6.3 </span>The <code>strong</code> element</a></li>
      <li><a href=#the-small-element><span class=secno>4.6.4 </span>The <code>small</code> element</a></li>
-     <li><a href=#the-cite-element><span class=secno>4.6.5 </span>The <code>cite</code> element</a></li>
-     <li><a href=#the-q-element><span class=secno>4.6.6 </span>The <code>q</code> element</a></li>
-     <li><a href=#the-dfn-element><span class=secno>4.6.7 </span>The <code>dfn</code> element</a></li>
-     <li><a href=#the-abbr-element><span class=secno>4.6.8 </span>The <code>abbr</code> element</a></li>
-     <li><a href=#the-time-element><span class=secno>4.6.9 </span>The <code>time</code> element</a></li>
-     <li><a href=#the-code-element><span class=secno>4.6.10 </span>The <code>code</code> element</a></li>
-     <li><a href=#the-var-element><span class=secno>4.6.11 </span>The <code>var</code> element</a></li>
-     <li><a href=#the-samp-element><span class=secno>4.6.12 </span>The <code>samp</code> element</a></li>
-     <li><a href=#the-kbd-element><span class=secno>4.6.13 </span>The <code>kbd</code> element</a></li>
-     <li><a href=#the-sub-and-sup-elements><span class=secno>4.6.14 </span>The <code>sub</code> and <code>sup</code> elements</a></li>
-     <li><a href=#the-i-element><span class=secno>4.6.15 </span>The <code>i</code> element</a></li>
-     <li><a href=#the-b-element><span class=secno>4.6.16 </span>The <code>b</code> element</a></li>
-     <li><a href=#the-mark-element><span class=secno>4.6.17 </span>The <code>mark</code> element</a></li>
-     <li><a href=#the-ruby-element><span class=secno>4.6.18 </span>The <code>ruby</code> element</a></li>
-     <li><a href=#the-rt-element><span class=secno>4.6.19 </span>The <code>rt</code> element</a></li>
-     <li><a href=#the-rp-element><span class=secno>4.6.20 </span>The <code>rp</code> element</a></li>
-     <li><a href=#the-bdo-element><span class=secno>4.6.21 </span>The <code>bdo</code> element</a></li>
-     <li><a href=#the-span-element><span class=secno>4.6.22 </span>The <code>span</code> element</a></li>
-     <li><a href=#the-br-element><span class=secno>4.6.23 </span>The <code>br</code> element</a></li>
-     <li><a href=#the-wbr-element><span class=secno>4.6.24 </span>The <code>wbr</code> element</a></li>
-     <li><a href=#usage-summary><span class=secno>4.6.25 </span>Usage summary</a></ol></li>
+     <li><a href=#the-s-element><span class=secno>4.6.5 </span>The <code>s</code> element</a></li>
+     <li><a href=#the-cite-element><span class=secno>4.6.6 </span>The <code>cite</code> element</a></li>
+     <li><a href=#the-q-element><span class=secno>4.6.7 </span>The <code>q</code> element</a></li>
+     <li><a href=#the-dfn-element><span class=secno>4.6.8 </span>The <code>dfn</code> element</a></li>
+     <li><a href=#the-abbr-element><span class=secno>4.6.9 </span>The <code>abbr</code> element</a></li>
+     <li><a href=#the-time-element><span class=secno>4.6.10 </span>The <code>time</code> element</a></li>
+     <li><a href=#the-code-element><span class=secno>4.6.11 </span>The <code>code</code> element</a></li>
+     <li><a href=#the-var-element><span class=secno>4.6.12 </span>The <code>var</code> element</a></li>
+     <li><a href=#the-samp-element><span class=secno>4.6.13 </span>The <code>samp</code> element</a></li>
+     <li><a href=#the-kbd-element><span class=secno>4.6.14 </span>The <code>kbd</code> element</a></li>
+     <li><a href=#the-sub-and-sup-elements><span class=secno>4.6.15 </span>The <code>sub</code> and <code>sup</code> elements</a></li>
+     <li><a href=#the-i-element><span class=secno>4.6.16 </span>The <code>i</code> element</a></li>
+     <li><a href=#the-b-element><span class=secno>4.6.17 </span>The <code>b</code> element</a></li>
+     <li><a href=#the-mark-element><span class=secno>4.6.18 </span>The <code>mark</code> element</a></li>
+     <li><a href=#the-ruby-element><span class=secno>4.6.19 </span>The <code>ruby</code> element</a></li>
+     <li><a href=#the-rt-element><span class=secno>4.6.20 </span>The <code>rt</code> element</a></li>
+     <li><a href=#the-rp-element><span class=secno>4.6.21 </span>The <code>rp</code> element</a></li>
+     <li><a href=#the-bdo-element><span class=secno>4.6.22 </span>The <code>bdo</code> element</a></li>
+     <li><a href=#the-span-element><span class=secno>4.6.23 </span>The <code>span</code> element</a></li>
+     <li><a href=#the-br-element><span class=secno>4.6.24 </span>The <code>br</code> element</a></li>
+     <li><a href=#the-wbr-element><span class=secno>4.6.25 </span>The <code>wbr</code> element</a></li>
+     <li><a href=#usage-summary><span class=secno>4.6.26 </span>Usage summary</a></ol></li>
    <li><a href=#edits><span class=secno>4.7 </span>Edits</a>
     <ol>
      <li><a href=#the-ins-element><span class=secno>4.7.1 </span>The <code>ins</code> element</a></li>
@@ -1977,10 +1978,10 @@
   likely to be more convenient when the styles apply to multiple
   pages.</p>
 
-  <p>It is also worth noting that four elements that were previously
+  <p>It is also worth noting that some elements that were previously
   presentational have been redefined in this specification to be
   media-independent: <code><a href=#the-b-element>b</a></code>, <code><a href=#the-i-element>i</a></code>, <code><a href=#the-hr-element>hr</a></code>,
-  and <code><a href=#the-small-element>small</a></code>.</p>
+  <code><a href=#the-s-element>s</a></code>, and <code><a href=#the-small-element>small</a></code>.</p>
 
 
   <h4 id=syntax-errors><span class=secno>1.10.2 </span>Syntax errors</h4>
@@ -10188,6 +10189,7 @@
    <li><code><a href=#the-progress-element>progress</a></code></li>
    <li><code><a href=#the-q-element>q</a></code></li>
    <li><code><a href=#the-ruby-element>ruby</a></code></li>
+   <li><code><a href=#the-s-element>s</a></code></li>
    <li><code><a href=#the-samp-element>samp</a></code></li>
    <li><code><a href=#script>script</a></code></li>
    <li><code><a href=#the-section-element>section</a></code></li>
@@ -10304,6 +10306,7 @@
    <li><code><a href=#the-progress-element>progress</a></code></li>
    <li><code><a href=#the-q-element>q</a></code></li>
    <li><code><a href=#the-ruby-element>ruby</a></code></li>
+   <li><code><a href=#the-s-element>s</a></code></li>
    <li><code><a href=#the-samp-element>samp</a></code></li>
    <li><code><a href=#script>script</a></code></li>
    <li><code><a href=#the-select-element>select</a></code></li>
@@ -11114,6 +11117,7 @@
     <code><a href=#the-rp-element>rp</a></code>,
     <code><a href=#the-rt-element>rt</a></code>,
     <code><a href=#the-ruby-element>ruby</a></code>,
+    <code><a href=#the-s-element>s</a></code>,
     <code><a href=#the-samp-element>samp</a></code>,
     <code><a href=#the-small-element>small</a></code>,
     <code><a href=#the-span-element>span</a></code>,
@@ -18391,7 +18395,7 @@
   </div>
 
 
-  <h4 id=the-cite-element><span class=secno>4.6.5 </span>The <dfn><code>cite</code></dfn> element</h4>
+  <h4 id=the-s-element><span class=secno>4.6.5 </span>The <dfn><code>s</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -18404,6 +18408,39 @@
    <dd><a href=#global-attributes>Global attributes</a></dd>
    <dt>DOM interface:</dt>
    <dd>Uses <code><a href=#htmlelement>HTMLElement</a></code>.</dd>
+  </dl><p>The <code><a href=#the-s-element>s</a></code> element <a href=#represents>represents</a> contents that
+  are no longer accurate or no longer relevant.</p>
+
+  <p class=note>The <code><a href=#the-s-element>s</a></code> element is not appropriate when
+  indicating document edits; to mark a span of text as having been
+  removed from a document, use the <code><a href=#the-del-element>del</a></code> element.</p>
+
+  <div class=example>
+
+   <p>In this example a recommended retail price has been marked as no
+   longer relevant as the product in question has a new sale
+   price.</p>
+
+   <pre><p>Buy our Iced Tea and Lemonade!</p>
+<p><s>Recommended retail price: $3.99 per bottle</s></p>
+<p><strong>Now selling for just $2.99 a bottle!</strong></p></pre>
+
+  </div>
+
+
+  <h4 id=the-cite-element><span class=secno>4.6.6 </span>The <dfn><code>cite</code></dfn> element</h4>
+
+  <dl class=element><dt>Categories</dt>
+   <dd><a href=#flow-content>Flow content</a>.</dd>
+   <dd><a href=#phrasing-content>Phrasing content</a>.</dd>
+   <dt>Contexts in which this element can be used:</dt>
+   <dd>Where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
+   <dt>Content model:</dt>
+   <dd><a href=#phrasing-content>Phrasing content</a>.</dd>
+   <dt>Content attributes:</dt>
+   <dd><a href=#global-attributes>Global attributes</a></dd>
+   <dt>DOM interface:</dt>
+   <dd>Uses <code><a href=#htmlelement>HTMLElement</a></code>.</dd>
   </dl><p>The <code><a href=#the-cite-element>cite</a></code> element <a href=#represents>represents</a> the title
   of a work (e.g.
   a book,
@@ -18515,7 +18552,7 @@
 
 
 
-  <h4 id=the-q-element><span class=secno>4.6.6 </span>The <dfn><code>q</code></dfn> element</h4>
+  <h4 id=the-q-element><span class=secno>4.6.7 </span>The <dfn><code>q</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -18614,7 +18651,7 @@
   </div>
 
 
-  <h4 id=the-dfn-element><span class=secno>4.6.7 </span>The <dfn><code>dfn</code></dfn> element</h4>
+  <h4 id=the-dfn-element><span class=secno>4.6.8 </span>The <dfn><code>dfn</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -18682,7 +18719,7 @@
 
 
 
-  <h4 id=the-abbr-element><span class=secno>4.6.8 </span>The <dfn><code>abbr</code></dfn> element</h4>
+  <h4 id=the-abbr-element><span class=secno>4.6.9 </span>The <dfn><code>abbr</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -18797,7 +18834,7 @@
 
 
 
-  <h4 id=the-time-element><span class=secno>4.6.9 </span>The <dfn><code>time</code></dfn> element</h4>
+  <h4 id=the-time-element><span class=secno>4.6.10 </span>The <dfn><code>time</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19083,7 +19120,7 @@
 
 
 
-  <h4 id=the-code-element><span class=secno>4.6.10 </span>The <dfn><code>code</code></dfn> element</h4>
+  <h4 id=the-code-element><span class=secno>4.6.11 </span>The <dfn><code>code</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19145,7 +19182,7 @@
   <p class=note>See the <code><a href=#the-pre-element>pre</a></code> element for more details.</p>
 
 
-  <h4 id=the-var-element><span class=secno>4.6.11 </span>The <dfn><code>var</code></dfn> element</h4>
+  <h4 id=the-var-element><span class=secno>4.6.12 </span>The <dfn><code>var</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19202,7 +19239,7 @@
   </div>
 
 
-  <h4 id=the-samp-element><span class=secno>4.6.12 </span>The <dfn><code>samp</code></dfn> element</h4>
+  <h4 id=the-samp-element><span class=secno>4.6.13 </span>The <dfn><code>samp</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19240,7 +19277,7 @@
   </div>
 
 
-  <h4 id=the-kbd-element><span class=secno>4.6.13 </span>The <dfn><code>kbd</code></dfn> element</h4>
+  <h4 id=the-kbd-element><span class=secno>4.6.14 </span>The <dfn><code>kbd</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19291,7 +19328,7 @@
   </div>
 
 
-  <h4 id=the-sub-and-sup-elements><span class=secno>4.6.14 </span>The <dfn><code>sub</code></dfn> and <dfn><code>sup</code></dfn> elements</h4>
+  <h4 id=the-sub-and-sup-elements><span class=secno>4.6.15 </span>The <dfn><code>sub</code></dfn> and <dfn><code>sup</code></dfn> elements</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19353,7 +19390,7 @@
 
 
 
-  <h4 id=the-i-element><span class=secno>4.6.15 </span>The <dfn><code>i</code></dfn> element</h4>
+  <h4 id=the-i-element><span class=secno>4.6.16 </span>The <dfn><code>i</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19414,7 +19451,7 @@
   necessarily be italicized.</p>
 
 
-  <h4 id=the-b-element><span class=secno>4.6.16 </span>The <dfn><code>b</code></dfn> element</h4>
+  <h4 id=the-b-element><span class=secno>4.6.17 </span>The <dfn><code>b</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19488,7 +19525,7 @@
 
 
 
-  <h4 id=the-mark-element><span class=secno>4.6.17 </span>The <dfn><code>mark</code></dfn> element</h4>
+  <h4 id=the-mark-element><span class=secno>4.6.18 </span>The <dfn><code>mark</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19633,7 +19670,7 @@
   </div>
 
 
-  <h4 id=the-ruby-element><span class=secno>4.6.18 </span>The <dfn><code>ruby</code></dfn> element</h4>
+  <h4 id=the-ruby-element><span class=secno>4.6.19 </span>The <dfn><code>ruby</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19723,7 +19760,7 @@
   <!-- Note: Examples are 32px/16px Stone Sans Sem ITC TT -->
 
 
-  <h4 id=the-rt-element><span class=secno>4.6.19 </span>The <dfn><code>rt</code></dfn> element</h4>
+  <h4 id=the-rt-element><span class=secno>4.6.20 </span>The <dfn><code>rt</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd>None.</dd>
@@ -19753,7 +19790,7 @@
   </div>
 
 
-  <h4 id=the-rp-element><span class=secno>4.6.20 </span>The <dfn><code>rp</code></dfn> element</h4>
+  <h4 id=the-rp-element><span class=secno>4.6.21 </span>The <dfn><code>rp</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd>None.</dd>
@@ -19802,7 +19839,7 @@
   </div>
 
 
-  <h4 id=the-bdo-element><span class=secno>4.6.21 </span>The <dfn><code>bdo</code></dfn> element</h4>
+  <h4 id=the-bdo-element><span class=secno>4.6.22 </span>The <dfn><code>bdo</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19851,7 +19888,7 @@
 
 
 
-  <h4 id=the-span-element><span class=secno>4.6.22 </span>The <dfn><code>span</code></dfn> element</h4>
+  <h4 id=the-span-element><span class=secno>4.6.23 </span>The <dfn><code>span</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19890,7 +19927,7 @@
 
 
 
-  <h4 id=the-br-element><span class=secno>4.6.23 </span>The <dfn><code>br</code></dfn> element</h4>
+  <h4 id=the-br-element><span class=secno>4.6.24 </span>The <dfn><code>br</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -19968,7 +20005,7 @@
   </div>
 
 
-  <h4 id=the-wbr-element><span class=secno>4.6.24 </span>The <dfn><code>wbr</code></dfn> element</h4>
+  <h4 id=the-wbr-element><span class=secno>4.6.25 </span>The <dfn><code>wbr</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -20006,7 +20043,7 @@
 
 
 
-  <h4 id=usage-summary><span class=secno>4.6.25 </span>Usage summary</h4>
+  <h4 id=usage-summary><span class=secno>4.6.26 </span>Usage summary</h4>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -20029,6 +20066,10 @@
      <td>Side comments
      <td><pre class=example>These grapes are made into wine. <strong><small>Alcohol is addictive.</small></strong></pre>
 
+    <tr><td><code><a href=#the-s-element>s</a></code>
+     <td>Inaccurate text
+     <td><pre class=example>Price: <strong><s>£4.50</s></strong> £2.00!</pre>
+
     <tr><td><code><a href=#the-cite-element>cite</a></code>
      <td>Titles of works
      <td><pre class=example>The case <strong><cite>Hugo v. Danielle</cite></strong> is relevant here.</pre>
@@ -73400,7 +73441,7 @@
    <a href=#list-of-active-formatting-elements>list of active formatting elements</a>: <code><a href=#the-a-element>a</a></code>,
    <code><a href=#the-b-element>b</a></code>, <code><a href=#big>big</a></code>, <code><a href=#the-code-element>code</a></code>,
    <code><a href=#the-em-element>em</a></code>, <code><a href=#font>font</a></code>, <code><a href=#the-i-element>i</a></code>,
-   <code><a href=#nobr>nobr</a></code>, <code><a href=#s>s</a></code>, <code><a href=#the-small-element>small</a></code>,
+   <code><a href=#nobr>nobr</a></code>, <code><a href=#the-s-element>s</a></code>, <code><a href=#the-small-element>small</a></code>,
    <code><a href=#strike>strike</a></code>, <code><a href=#the-strong-element>strong</a></code>, <code><a href=#tt>tt</a></code>, and
    <code><a href=#u>u</a></code>.</dd>
 
@@ -83899,6 +83940,9 @@
    <dt><dfn id=rb><code>rb</code></dfn></dt>
    <dd><p>Providing the ruby base directly inside the <code><a href=#the-ruby-element>ruby</a></code> element is sufficient; the <code><a href=#rb>rb</a></code> element is unnecessary. Omit it altogether.</dd>
 
+   <dt><dfn id=strike><code>strike</code></dfn></dt>
+   <dd><p>Use <code><a href=#the-del-element>del</a></code> instead if the element is marking an edit, otherwise use <code><a href=#the-s-element>s</a></code> instead.</dd>
+
    <dt><dfn id=basefont><code>basefont</code></dfn></dt>
    <dt><dfn id=big><code>big</code></dfn></dt>
    <dt><dfn id=blink><code>blink</code></dfn></dt>
@@ -83907,9 +83951,7 @@
    <dt><code><a href=#the-marquee-element>marquee</a></code></dt>
    <dt><dfn id=multicol><code>multicol</code></dfn></dt>
    <dt><dfn id=nobr><code>nobr</code></dfn></dt>
-   <dt><dfn id=s><code>s</code></dfn></dt>
    <dt><dfn id=spacer><code>spacer</code></dfn></dt>
-   <dt><dfn id=strike><code>strike</code></dfn></dt>
    <dt><dfn id=tt><code>tt</code></dfn></dt>
    <dt><dfn id=u><code>u</code></dfn></dt>
 
@@ -83917,10 +83959,6 @@
 
     <p>Use appropriate elements and/or CSS instead.</p>
 
-    <p>For the <code><a href=#s>s</a></code> and <code><a href=#strike>strike</a></code> elements, if
-    they are marking up a removal from the element, consider using the
-    <code><a href=#the-del-element>del</a></code> element instead.</p>
-
     <p>Where the <code><a href=#tt>tt</a></code> element would have been used for
     marking up keyboard input, consider the <code><a href=#the-kbd-element>kbd</a></code> element;
     for variables, consider the <code><a href=#the-var-element>var</a></code> element; for computer
@@ -86697,6 +86735,14 @@
          <code><a href=#the-rp-element>rp</a></code> element*</td>
      <td><a href=#global-attributes title="global attributes">globals</a></td>
      <td><code><a href=#htmlelement>HTMLElement</a></code></td>
+    <tr><th><code><a href=#the-s-element>s</a></code></th>
+     <td>Inaccurate text</td>
+     <td><a href=#flow-content title="Flow content">flow</a>;
+         <a href=#phrasing-content title="Phrasing content">phrasing</a></td>
+     <td><a href=#phrasing-content title="Phrasing content">phrasing</a></td>
+     <td><a href=#phrasing-content title="Phrasing content">phrasing</a></td>
+     <td><a href=#global-attributes title="global attributes">globals</a></td>
+     <td><code><a href=#htmlelement>HTMLElement</a></code></td>
     <tr><th><code><a href=#the-samp-element>samp</a></code></th>
      <td>Computer output</td>
      <td><a href=#flow-content title="Flow content">flow</a>;
@@ -87073,6 +87119,7 @@
       <code><a href=#the-progress-element>progress</a></code>;
       <code><a href=#the-q-element>q</a></code>;
       <code><a href=#the-ruby-element>ruby</a></code>;
+      <code><a href=#the-s-element>s</a></code>;
       <code><a href=#the-samp-element>samp</a></code>;
       <code><a href=#script>script</a></code>;
       <code><a href=#the-section-element>section</a></code>;
@@ -87152,6 +87199,7 @@
       <code><a href=#the-progress-element>progress</a></code>;
       <code><a href=#the-q-element>q</a></code>;
       <code><a href=#the-ruby-element>ruby</a></code>;
+      <code><a href=#the-s-element>s</a></code>;
       <code><a href=#the-samp-element>samp</a></code>;
       <code><a href=#script>script</a></code>;
       <code><a href=#the-select-element>select</a></code>;
@@ -88628,6 +88676,9 @@
     <tr><td> <code><a href=#the-ruby-element>ruby</a></code>
      <td> <code><a href=#htmlelement>HTMLElement</a></code>
 
+    <tr><td> <code><a href=#the-s-element>s</a></code>
+     <td> <code><a href=#htmlelement>HTMLElement</a></code>
+
     <tr><td> <code><a href=#the-samp-element>samp</a></code>
      <td> <code><a href=#htmlelement>HTMLElement</a></code>
 

Modified: source
===================================================================
--- source	2010-09-29 19:14:31 UTC (rev 5560)
+++ source	2010-09-29 22:28:00 UTC (rev 5561)
@@ -9,7 +9,7 @@
  !    - obsolete section
  !    - element, attribute, content model, and interface indexes
  !    - section for the element itself
- !    - adding it to the section with ARIA mappings (whether it has a mapping or not)
+ !    - adding it to the section with ARIA mappings
  !
  !-->
 <!--START validation-->
@@ -869,10 +869,10 @@
   likely to be more convenient when the styles apply to multiple
   pages.</p>
 
-  <p>It is also worth noting that four elements that were previously
+  <p>It is also worth noting that some elements that were previously
   presentational have been redefined in this specification to be
   media-independent: <code>b</code>, <code>i</code>, <code>hr</code>,
-  and <code>small</code>.</p>
+  <code>s</code>, and <code>small</code>.</p>
 
 
   <h4>Syntax errors</h4>
@@ -10407,6 +10407,7 @@
    <li><code>progress</code></li>
    <li><code>q</code></li>
    <li><code>ruby</code></li>
+   <li><code>s</code></li>
    <li><code>samp</code></li>
    <li><code>script</code></li>
    <li><code>section</code></li>
@@ -10536,6 +10537,7 @@
    <li><code>progress</code></li>
    <li><code>q</code></li>
    <li><code>ruby</code></li>
+   <li><code>s</code></li>
    <li><code>samp</code></li>
    <li><code>script</code></li>
    <li><code>select</code></li>
@@ -11503,6 +11505,7 @@
     <code>rp</code>,
     <code>rt</code>,
     <code>ruby</code>,
+    <code>s</code>,
     <code>samp</code>,
     <code>small</code>,
     <code>span</code>,
@@ -19613,6 +19616,42 @@
   </div>
 
 
+  <h4>The <dfn><code>s</code></dfn> element</h4>
+
+  <dl class="element">
+   <dt>Categories</dt>
+   <dd><span>Flow content</span>.</dd>
+   <dd><span>Phrasing content</span>.</dd>
+   <dt>Contexts in which this element can be used:</dt>
+   <dd>Where <span>phrasing content</span> is expected.</dd>
+   <dt>Content model:</dt>
+   <dd><span>Phrasing content</span>.</dd>
+   <dt>Content attributes:</dt>
+   <dd><span>Global attributes</span></dd>
+   <dt>DOM interface:</dt>
+   <dd>Uses <code>HTMLElement</code>.</dd>
+  </dl>
+
+  <p>The <code>s</code> element <span>represents</span> contents that
+  are no longer accurate or no longer relevant.</p>
+
+  <p class="note">The <code>s</code> element is not appropriate when
+  indicating document edits; to mark a span of text as having been
+  removed from a document, use the <code>del</code> element.</p>
+
+  <div class="example">
+
+   <p>In this example a recommended retail price has been marked as no
+   longer relevant as the product in question has a new sale
+   price.</p>
+
+   <pre><p>Buy our Iced Tea and Lemonade!</p>
+<p><s>Recommended retail price: $3.99 per bottle</s></p>
+<p><strong>Now selling for just $2.99 a bottle!</strong></p></pre>
+
+  </div>
+
+
   <h4>The <dfn><code>cite</code></dfn> element</h4>
 
   <dl class="element">
@@ -21383,6 +21422,11 @@
      <td><pre class="example">These grapes are made into wine. <strong><small>Alcohol is addictive.</small></strong></pre>
 
     <tr>
+     <td><code>s</code>
+     <td>Inaccurate text
+     <td><pre class="example">Price: <strong><s>£4.50</s></strong> £2.00!</pre>
+
+    <tr>
      <td><code>cite</code>
      <td>Titles of works
      <td><pre class="example">The case <strong><cite>Hugo v. Danielle</cite></strong> is relevant here.</pre>
@@ -100452,6 +100496,9 @@
    <dt><dfn><code>rb</code></dfn></dt>
    <dd><p>Providing the ruby base directly inside the <code>ruby</code> element is sufficient; the <code>rb</code> element is unnecessary. Omit it altogether.</p></dd>
 
+   <dt><dfn><code>strike</code></dfn></dt>
+   <dd><p>Use <code>del</code> instead if the element is marking an edit, otherwise use <code>s</code> instead.</p></dd>
+
    <dt><dfn><code>basefont</code></dfn></dt>
    <dt><dfn><code>big</code></dfn></dt>
    <dt><dfn><code>blink</code></dfn></dt>
@@ -100460,9 +100507,7 @@
    <dt><code>marquee</code></dt>
    <dt><dfn><code>multicol</code></dfn></dt>
    <dt><dfn><code>nobr</code></dfn></dt>
-   <dt><dfn><code>s</code></dfn></dt>
    <dt><dfn><code>spacer</code></dfn></dt>
-   <dt><dfn><code>strike</code></dfn></dt>
    <dt><dfn><code>tt</code></dfn></dt>
    <dt><dfn><code>u</code></dfn></dt>
 
@@ -100470,10 +100515,6 @@
 
     <p>Use appropriate elements and/or CSS instead.</p>
 
-    <p>For the <code>s</code> and <code>strike</code> elements, if
-    they are marking up a removal from the element, consider using the
-    <code>del</code> element instead.</p>
-
     <p>Where the <code>tt</code> element would have been used for
     marking up keyboard input, consider the <code>kbd</code> element;
     for variables, consider the <code>var</code> element; for computer
@@ -103833,6 +103874,17 @@
     </tr>
 
     <tr>
+     <th><code>s</code></th>
+     <td>Inaccurate text</td>
+     <td><span title="Flow content">flow</span>;
+         <span title="Phrasing content">phrasing</span></td>
+     <td><span title="Phrasing content">phrasing</span></td>
+     <td><span title="Phrasing content">phrasing</span></td>
+     <td><span title="global attributes">globals</span></td>
+     <td><code>HTMLElement</code></td>
+    </tr>
+
+    <tr>
      <th><code>samp</code></th>
      <td>Computer output</td>
      <td><span title="Flow content">flow</span>;
@@ -104298,6 +104350,7 @@
       <code>progress</code>;
       <code>q</code>;
       <code>ruby</code>;
+      <code>s</code>;
       <code>samp</code>;
       <code>script</code>;
       <code>section</code>;
@@ -104380,6 +104433,7 @@
       <code>progress</code>;
       <code>q</code>;
       <code>ruby</code>;
+      <code>s</code>;
       <code>samp</code>;
       <code>script</code>;
       <code>select</code>;
@@ -106174,6 +106228,10 @@
      <td> <code>HTMLElement</code>
 
     <tr>
+     <td> <code>s</code>
+     <td> <code>HTMLElement</code>
+
+    <tr>
      <td> <code>samp</code>
      <td> <code>HTMLElement</code>
 




More information about the Commit-Watchers mailing list