hixie: disregard previous change, it was made in a momentary lapse of attentoni. (whatwg r4578)

hixie: disregard previous change, it was made in a momentary lapse of
attentoni. (whatwg r4578)

http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.3653&r2=1.3654&f=h
http://html5.org/tools/web-apps-tracker?from=4577&to=4578

===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.3653
retrieving revision 1.3654
diff -u -d -r1.3653 -r1.3654
--- Overview.html 12 Jan 2010 02:41:42 -0000 1.3653
+++ Overview.html 12 Jan 2010 02:47:05 -0000 1.3654
@@ -16846,12 +16846,10 @@
   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
-  still prevented from creating popups).<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.<div class="impl">
+  tokens re-enable forms and scripts respectively (though scripts are
+  still prevented from creating popups).<div class="impl">
 
   <!-- v2: Add a new attribute that enables new restrictions, e.g.:
        - disallow cross-origin loads of any kind (networking
@@ -16970,7 +16968,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>
@@ -16985,9 +16982,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

Received on Tuesday, 12 January 2010 02:47:44 UTC