[acgiow] (1) disregard previous change, it was made in a momentary la…

…pse of attentoni. git-svn-id: http://svn.whatwg.org/webapps@4578 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jan 12, 2010 · 5493c94 · 5493c94
1 parent a1b52d9
commit 5493c94
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 34 deletions.
diff --git a/complete.html b/complete.html
@@ -19657,15 +19657,11 @@ <h4 id=the-iframe-element><span class=secno>4.8.3 </span>The <dfn><code>iframe</
   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 @@ <h4 id=the-iframe-element><span class=secno>4.8.3 </span>The <dfn><code>iframe</
    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 @@ <h4 id=the-iframe-element><span class=secno>4.8.3 </span>The <dfn><code>iframe</
     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

diff --git a/index b/index
@@ -19557,15 +19557,11 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
   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 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
    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 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
     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

diff --git a/source b/source
@@ -20910,19 +20910,13 @@ href="?audio">audio&lt;/a> test instead.)&lt;/p></pre>
   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 @@ href="?audio">audio&lt;/a> test instead.)&lt;/p></pre>
    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 @@ href="?audio">audio&lt;/a> test instead.)&lt;/p></pre>
     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>