Index: source
===================================================================
--- source	(revision 1708)
+++ source	(revision 1709)
@@ -5195,11 +5195,11 @@
    <dd><code title="handler-onunload">onunload</code></dd>
   </dl>
 
-  <p>Also, any attribute starting with the string "<code
-  title="attr-data-*">data-</code>" can be specified on any <span>HTML
+  <p>Also, <span title="custom data attribute">custom data
+  attributes</span> (e.g. <code title="">data-foldername</code> or
+  <code title="">data-msgid</code>) can be specified on any <span>HTML
   element</span>, to store custom data specific to the page.</p>
 
-
   <p>In <span>HTML documents</span>, the <code>html</code> element,
   and any other elements in the <span>HTML namespace</span> whose
   parent element is not in the <span>HTML namespace</span>, may have
@@ -5523,15 +5523,20 @@
 
   <h4><dfn>Embedding custom non-visible data</dfn></h4>
 
-  <p>Every <span title="HTML elements">HTML element</span> may have
-  any number of attributes starting with the string "<dfn
-  title="attr-data-*"><code>data-</code></dfn>" specified, with any
-  value.</p>
+  <p>A <dfn>custom data attribute</dfn> is an attribute whose name
+  starts with the string "<dfn
+  title="attr-data-*"><code>data-</code></dfn>" and has at least one
+  character after the hyphen.</p>
 
-  <p>These are intended to store custom data private to the page or
+  <p><span title="custom data attribute">Custom data attributes</span>
+  are intended to store custom data private to the page or
   application, for which there are no more appropriate attributes or
   elements.</p>
 
+  <p>Every <span title="HTML elements">HTML element</span> may have
+  any number of <span title="custom data attribute">custom data
+  attributes</span> specified, with any value.</p>
+
   <p>The <dfn title="dom-dataset"><code>dataset</code></dfn> DOM
   attribute provides convenient accessors for all the <code
   title="attr-data-*">data-*</code> attributes on an element.  On
@@ -5629,8 +5634,6 @@
   these attributes or values. Specifications intended for user agents
   must not define these attributes to have any meaningful values.</p>
 
-  <p class="big-issue">So here we're saying that microformats
-  shouldn't use this... is that what we want?</p>
 
 
   <h3><dfn>Interaction</dfn></h3>