[html5] r4962 - [e] (0) try to make things clearer and more consistent Fixing http://www.w3.org/ [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2010-04-02 19:45:21 -0700 (Fri, 02 Apr 2010)
New Revision: 4962

Modified:
   complete.html
   index
   source
Log:
[e] (0) try to make things clearer and more consistent
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=9383

Modified: complete.html
===================================================================
--- complete.html	2010-04-03 01:59:09 UTC (rev 4961)
+++ complete.html	2010-04-03 02:45:21 UTC (rev 4962)
@@ -13401,8 +13401,9 @@
   <p>The <dfn id=attr-script-async title=attr-script-async><code>async</code></dfn> and
   <dfn id=attr-script-defer title=attr-script-defer><code>defer</code></dfn> attributes
   are <a href=#boolean-attribute title="boolean attribute">boolean attributes</a> that
-  indicate how the script should be executed. These attributes must
-  not be specified when the element is used to include data blocks.</p>
+  indicate how the script should be executed. The <code title=attr-script-defer><a href=#attr-script-defer>defer</a></code> and <code title=attr-script-async><a href=#attr-script-async>async</a></code> attributes must not be
+  specified if the <code title=attr-script-src><a href=#attr-script-src>src</a></code> attribute
+  is not present.</p>
 
   <p>There are three possible modes that can be selected using these
   attributes. If the <code title=attr-script-async><a href=#attr-script-async>async</a></code>
@@ -13430,10 +13431,6 @@
   support <code title=attr-script-defer><a href=#attr-script-defer>defer</a></code> (and not <code title=attr-script-async><a href=#attr-script-async>async</a></code>) to fall back to the <code title=attr-script-defer><a href=#attr-script-defer>defer</a></code> behavior instead of the
   synchronous blocking behavior that is the default.</p>
 
-  <p>If one or both of the <code title=attr-script-defer><a href=#attr-script-defer>defer</a></code> and <code title=attr-script-async><a href=#attr-script-async>async</a></code> attributes are specified, the
-  <code title=attr-script-src><a href=#attr-script-src>src</a></code> attribute must also be
-  specified.</p>
-
   <p>Changing the <code title=attr-script-src><a href=#attr-script-src>src</a></code>, <code title=attr-script-type><a href=#attr-script-type>type</a></code>, <code title=attr-script-charset><a href=#attr-script-charset>charset</a></code>, <code title=attr-script-async><a href=#attr-script-async>async</a></code>, and <code title=attr-script-defer><a href=#attr-script-defer>defer</a></code> attributes dynamically has no
   direct effect; these attribute are only used at specific times
   described below.</p> <!-- by implication, changes to the base URL

Modified: index
===================================================================
--- index	2010-04-03 01:59:09 UTC (rev 4961)
+++ index	2010-04-03 02:45:21 UTC (rev 4962)
@@ -13299,8 +13299,9 @@
   <p>The <dfn id=attr-script-async title=attr-script-async><code>async</code></dfn> and
   <dfn id=attr-script-defer title=attr-script-defer><code>defer</code></dfn> attributes
   are <a href=#boolean-attribute title="boolean attribute">boolean attributes</a> that
-  indicate how the script should be executed. These attributes must
-  not be specified when the element is used to include data blocks.</p>
+  indicate how the script should be executed. The <code title=attr-script-defer><a href=#attr-script-defer>defer</a></code> and <code title=attr-script-async><a href=#attr-script-async>async</a></code> attributes must not be
+  specified if the <code title=attr-script-src><a href=#attr-script-src>src</a></code> attribute
+  is not present.</p>
 
   <p>There are three possible modes that can be selected using these
   attributes. If the <code title=attr-script-async><a href=#attr-script-async>async</a></code>
@@ -13328,10 +13329,6 @@
   support <code title=attr-script-defer><a href=#attr-script-defer>defer</a></code> (and not <code title=attr-script-async><a href=#attr-script-async>async</a></code>) to fall back to the <code title=attr-script-defer><a href=#attr-script-defer>defer</a></code> behavior instead of the
   synchronous blocking behavior that is the default.</p>
 
-  <p>If one or both of the <code title=attr-script-defer><a href=#attr-script-defer>defer</a></code> and <code title=attr-script-async><a href=#attr-script-async>async</a></code> attributes are specified, the
-  <code title=attr-script-src><a href=#attr-script-src>src</a></code> attribute must also be
-  specified.</p>
-
   <p>Changing the <code title=attr-script-src><a href=#attr-script-src>src</a></code>, <code title=attr-script-type><a href=#attr-script-type>type</a></code>, <code title=attr-script-charset><a href=#attr-script-charset>charset</a></code>, <code title=attr-script-async><a href=#attr-script-async>async</a></code>, and <code title=attr-script-defer><a href=#attr-script-defer>defer</a></code> attributes dynamically has no
   direct effect; these attribute are only used at specific times
   described below.</p> <!-- by implication, changes to the base URL

Modified: source
===================================================================
--- source	2010-04-03 01:59:09 UTC (rev 4961)
+++ source	2010-04-03 02:45:21 UTC (rev 4962)
@@ -14034,8 +14034,11 @@
   <p>The <dfn title="attr-script-async"><code>async</code></dfn> and
   <dfn title="attr-script-defer"><code>defer</code></dfn> attributes
   are <span title="boolean attribute">boolean attributes</span> that
-  indicate how the script should be executed. These attributes must
-  not be specified when the element is used to include data blocks.</p>
+  indicate how the script should be executed. The <code
+  title="attr-script-defer">defer</code> and <code
+  title="attr-script-async">async</code> attributes must not be
+  specified if the <code title="attr-script-src">src</code> attribute
+  is not present.</p>
 
   <p>There are three possible modes that can be selected using these
   attributes. If the <code title="attr-script-async">async</code>
@@ -14069,12 +14072,6 @@
   title="attr-script-defer">defer</code> behavior instead of the
   synchronous blocking behavior that is the default.</p>
 
-  <p>If one or both of the <code
-  title="attr-script-defer">defer</code> and <code
-  title="attr-script-async">async</code> attributes are specified, the
-  <code title="attr-script-src">src</code> attribute must also be
-  specified.</p>
-
   <p>Changing the <code title="attr-script-src">src</code>, <code
   title="attr-script-type">type</code>, <code
   title="attr-script-charset">charset</code>, <code