[html5] r4578 - [acgiow] (1) disregard previous change, it was made in a momentary lapse of atte [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2010-01-11 18:46:55 -0800 (Mon, 11 Jan 2010)
New Revision: 4578

Modified:
   complete.html
   index
   source
Log:
[acgiow] (1) disregard previous change, it was made in a momentary lapse of attentoni.

Modified: complete.html
===================================================================
--- complete.html	2010-01-12 02:41:34 UTC (rev 4577)
+++ complete.html	2010-01-12 02:46:55 UTC (rev 4578)
@@ -19657,15 +19657,11 @@
   prevented from targeting other <a href=#browsing-context title="browsing
   context">browsing contexts</a>, and plugins are disabled. The
   <code title=attr-iframe-sandbox-allow-same-origin><a href=#attr-iframe-sandbox-allow-same-origin>allow-same-origin</a></code>
-  keyword allows the content to be treated as being from the same origin
+  token allows the content to be treated as being from the same origin
   instead of forcing it into a unique origin, and the <code title=attr-iframe-sandbox-allow-forms><a href=#attr-iframe-sandbox-allow-forms>allow-forms</a></code> and <code title=attr-iframe-sandbox-allow-scripts><a href=#attr-iframe-sandbox-allow-scripts>allow-scripts</a></code>
-  keywords re-enable forms and scripts respectively (though scripts are
+  tokens re-enable forms and scripts respectively (though scripts are
   still prevented from creating popups).</p>
 
-  <p>The <code title=attr-iframe-sandbox-allow-scripts><a href=#attr-iframe-sandbox-allow-scripts>allow-scripts</a></code> keyword
-  must not be specified if the <code title=attr-iframe-sandbox-allow-same-origin><a href=#attr-iframe-sandbox-allow-same-origin>allow-same-origin</a></code>
-  keyword is specified.</p>
-
   <div class=impl>
 
   <!-- v2: Add a new attribute that enables new restrictions, e.g.:
@@ -19785,7 +19781,6 @@
    the <code title=attr-iframe-sandbox><a href=#attr-iframe-sandbox>sandbox</a></code> attribute's
    value, when <a href=#split-a-string-on-spaces title="split a string on spaces">split on
    spaces</a>, is found to have the <dfn id=attr-iframe-sandbox-allow-scripts title=attr-iframe-sandbox-allow-scripts><code>allow-scripts</code></dfn>
-   keyword set and <em>not </em> to have the <code title=attr-iframe-sandbox-allow-same-origin><a href=#attr-iframe-sandbox-allow-same-origin>allow-same-origin</a></code>
    keyword set</dt>
 
    <dd>
@@ -19800,9 +19795,6 @@
     or elsewhere) will continue to run. Only <em>new</em> scripts will
     be prevented from executing by this flag.</p>
 
-    <p>This keyword is ignored if the <code title=attr-iframe-sandbox-allow-same-origin><a href=#attr-iframe-sandbox-allow-same-origin>allow-same-origin</a></code>
-    keyword is set.</p>
-
    </dd>
 
   </dl><p>These flags must not be set unless the conditions listed above

Modified: index
===================================================================
--- index	2010-01-12 02:41:34 UTC (rev 4577)
+++ index	2010-01-12 02:46:55 UTC (rev 4578)
@@ -19557,15 +19557,11 @@
   prevented from targeting other <a href=#browsing-context title="browsing
   context">browsing contexts</a>, and plugins are disabled. The
   <code title=attr-iframe-sandbox-allow-same-origin><a href=#attr-iframe-sandbox-allow-same-origin>allow-same-origin</a></code>
-  keyword allows the content to be treated as being from the same origin
+  token allows the content to be treated as being from the same origin
   instead of forcing it into a unique origin, and the <code title=attr-iframe-sandbox-allow-forms><a href=#attr-iframe-sandbox-allow-forms>allow-forms</a></code> and <code title=attr-iframe-sandbox-allow-scripts><a href=#attr-iframe-sandbox-allow-scripts>allow-scripts</a></code>
-  keywords re-enable forms and scripts respectively (though scripts are
+  tokens re-enable forms and scripts respectively (though scripts are
   still prevented from creating popups).</p>
 
-  <p>The <code title=attr-iframe-sandbox-allow-scripts><a href=#attr-iframe-sandbox-allow-scripts>allow-scripts</a></code> keyword
-  must not be specified if the <code title=attr-iframe-sandbox-allow-same-origin><a href=#attr-iframe-sandbox-allow-same-origin>allow-same-origin</a></code>
-  keyword is specified.</p>
-
   <div class=impl>
 
   <!-- v2: Add a new attribute that enables new restrictions, e.g.:
@@ -19685,7 +19681,6 @@
    the <code title=attr-iframe-sandbox><a href=#attr-iframe-sandbox>sandbox</a></code> attribute's
    value, when <a href=#split-a-string-on-spaces title="split a string on spaces">split on
    spaces</a>, is found to have the <dfn id=attr-iframe-sandbox-allow-scripts title=attr-iframe-sandbox-allow-scripts><code>allow-scripts</code></dfn>
-   keyword set and <em>not </em> to have the <code title=attr-iframe-sandbox-allow-same-origin><a href=#attr-iframe-sandbox-allow-same-origin>allow-same-origin</a></code>
    keyword set</dt>
 
    <dd>
@@ -19700,9 +19695,6 @@
     or elsewhere) will continue to run. Only <em>new</em> scripts will
     be prevented from executing by this flag.</p>
 
-    <p>This keyword is ignored if the <code title=attr-iframe-sandbox-allow-same-origin><a href=#attr-iframe-sandbox-allow-same-origin>allow-same-origin</a></code>
-    keyword is set.</p>
-
    </dd>
 
   </dl><p>These flags must not be set unless the conditions listed above

Modified: source
===================================================================
--- source	2010-01-12 02:41:34 UTC (rev 4577)
+++ source	2010-01-12 02:46:55 UTC (rev 4578)
@@ -20910,19 +20910,13 @@
   context">browsing contexts</span>, and plugins are disabled. The
   <code
   title="attr-iframe-sandbox-allow-same-origin">allow-same-origin</code>
-  keyword allows the content to be treated as being from the same origin
+  token allows the content to be treated as being from the same origin
   instead of forcing it into a unique origin, and the <code
   title="attr-iframe-sandbox-allow-forms">allow-forms</code> and <code
   title="attr-iframe-sandbox-allow-scripts">allow-scripts</code>
-  keywords re-enable forms and scripts respectively (though scripts are
+  tokens re-enable forms and scripts respectively (though scripts are
   still prevented from creating popups).</p>
 
-  <p>The <code
-  title="attr-iframe-sandbox-allow-scripts">allow-scripts</code> keyword
-  must not be specified if the <code
-  title="attr-iframe-sandbox-allow-same-origin">allow-same-origin</code>
-  keyword is specified.</p>
-
   <div class="impl">
 
   <!-- v2: Add a new attribute that enables new restrictions, e.g.:
@@ -21056,8 +21050,6 @@
    value, when <span title="split a string on spaces">split on
    spaces</span>, is found to have the <dfn
    title="attr-iframe-sandbox-allow-scripts"><code>allow-scripts</code></dfn>
-   keyword set and <em>not </em> to have the <code
-   title="attr-iframe-sandbox-allow-same-origin">allow-same-origin</code>
    keyword set</dt>
 
    <dd>
@@ -21073,10 +21065,6 @@
     or elsewhere) will continue to run. Only <em>new</em> scripts will
     be prevented from executing by this flag.</p>
 
-    <p>This keyword is ignored if the <code
-    title="attr-iframe-sandbox-allow-same-origin">allow-same-origin</code>
-    keyword is set.</p>
-
    </dd>
 
   </dl>