From fbc9ec2b805730724f698d814fe4d5c0d618be55 Mon Sep 17 00:00:00 2001
From: Ian Hickson <ian@hixie.ch>
Date: Wed, 13 Jan 2010 03:30:28 +0000
Subject: [PATCH] [agiow] (0) Rename text/sandboxed-html to text/html-sandboxed
 so it sorts better in lists of MIME types

git-svn-id: http://svn.whatwg.org/webapps@4585 340c8d12-0b0e-0410-8428-c7bf67bfef74
---
 complete.html | 30 +++++++++++++++---------------
 index         | 30 +++++++++++++++---------------
 source        | 28 ++++++++++++++--------------
 3 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/complete.html b/complete.html
index c94f778cae4..6ab89f53af9 100644
--- a/complete.html
+++ b/complete.html
@@ -1193,7 +1193,7 @@ <h2 class="no-num no-toc" id=contents>Table of contents</h2>
  <li><a href=#iana><span class=secno>15 </span>IANA considerations</a>
   <ol>
    <li><a href=#text/html><span class=secno>15.1 </span><code>text/html</code></a></li>
-   <li><a href=#text/sandboxed-html><span class=secno>15.2 </span><code>text/sandboxed-html</code></a></li>
+   <li><a href=#text/html-sandboxed><span class=secno>15.2 </span><code>text/html-sandboxed</code></a></li>
    <li><a href=#application/xhtml+xml><span class=secno>15.3 </span><code>application/xhtml+xml</code></a></li>
    <li><a href=#text/cache-manifest><span class=secno>15.4 </span><code>text/cache-manifest</code></a></li>
    <li><a href=#text/ping><span class=secno>15.5 </span><code>text/ping</code></a></li>
@@ -1926,7 +1926,7 @@ <h4 id=resources><span class=secno>2.1.1 </span>Resources</h4>
   type and subtype, with no MIME Type parameters. <a href=#refsHTTP>[HTTP]</a></p>
 
   <p>The term <dfn id=html-mime-type>HTML MIME type</dfn> is used to refer to the <a href=#mime-type title="MIME type">MIME types</a> <code><a href=#text/html>text/html</a></code> and
-  <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code>.</p>
+  <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code>.</p>
 
 
   <h4 id=xml><span class=secno>2.1.2 </span>XML</h4>
@@ -19845,7 +19845,7 @@ <h4 id=the-iframe-element><span class=secno>4.8.3 </span>The <dfn><code>iframe</
 
   <p class=note>Potentially hostile files can be served from the
   same server as the file containing the <code><a href=#the-iframe-element>iframe</a></code> element
-  by labeling them as <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code> instead of
+  by labeling them as <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code> instead of
   <code><a href=#text/html>text/html</a></code>. This ensures that scripts in the files are
   unable to attack the site (as if they were actually served from
   another server), even if the user is tricked into visiting those
@@ -50691,7 +50691,7 @@ <h3 id=origin-0><span class=secno>6.4 </span>Origin</h3>
      <code>Document</code> was created</dt>
 
      <dt>If a <code>Document</code> was generated from a resource
-     labeled as <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code></dt>
+     labeled as <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code></dt>
 
      <dd>The <a href=#origin>origin</a> is a globally unique identifier
      assigned when the <code>Document</code> is created.</dd>
@@ -56400,7 +56400,7 @@ <h4 id=navigating-across-documents><span class=secno>6.11.1 </span>Navigating ac
    following list, and process the resource as described there:</p>
 
     <dl class=switch><!-- an <span>HTML MIME type</span> --><dt>"<code><a href=#text/html>text/html</a></code>"</dt>
-     <dt>"<code><a href=#text/sandboxed-html>text/sandboxed-html</a></code>"</dt>
+     <dt>"<code><a href=#text/html-sandboxed>text/html-sandboxed</a></code>"</dt>
      <dd>Follow the steps given in the <a href=#read-html title=navigate-html>HTML document</a> section, and abort
      these steps.</dd>
 
@@ -83704,20 +83704,20 @@ <h3 id=text/html><span class=secno>15.1 </span><dfn><code>text/html</code></dfn>
   refer to <a href=#the-indicated-part-of-the-document>the indicated part of the document</a>.</p>
 
 
-  <h3 id=text/sandboxed-html><span class=secno>15.2 </span><dfn><code>text/sandboxed-html</code></dfn></h3>
+  <h3 id=text/html-sandboxed><span class=secno>15.2 </span><dfn><code>text/html-sandboxed</code></dfn></h3>
 
   <p>This registration is for community review and will be submitted
   to the IESG for review, approval, and registration with IANA.</p>
 
   <!--
    To: ietf-types@iana.org
-   Subject: Registration of media type text/sandboxed-html
+   Subject: Registration of media type text/html-sandboxed
   -->
 
   <dl><dt>Type name:</dt>
    <dd>text</dd>
    <dt>Subtype name:</dt>
-   <dd>sandboxed-html</dd>
+   <dd>html-sandboxed</dd>
    <dt>Required parameters:</dt>
    <dd>No required parameters</dd>
    <dt>Optional parameters:</dt>
@@ -83726,17 +83726,17 @@ <h3 id=text/sandboxed-html><span class=secno>15.2 </span><dfn><code>text/sandbox
    <dd>Same as for <code><a href=#text/html>text/html</a></code></dd>
    <dt>Security considerations:</dt>
    <dd>
-    <p>The purpose of the <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code> MIME type
+    <p>The purpose of the <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code> MIME type
     is to provide a way for content providers to indicate that they
     want the file to be interpreted in a manner that does not give the
     file's contents access to the rest of the site. This is achieved
     by assigning the <code>Document</code> objects generated from
-    resources labeled as <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code> unique
+    resources labeled as <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code> unique
     origins.</p>
     <p>To avoid having legacy user agents treating resources labeled
-    as <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code> as regular
+    as <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code> as regular
     <code><a href=#text/html>text/html</a></code> files, authors should avoid using the <code title="">.html</code> or <code title="">.htm</code> extensions for
-    resources labeled as <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code>.</p>
+    resources labeled as <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code>.</p>
     <p>Beyond this, the type is identical to <code><a href=#text/html>text/html</a></code>,
     and the same considerations apply.</p>
    </dd>
@@ -83745,7 +83745,7 @@ <h3 id=text/sandboxed-html><span class=secno>15.2 </span><dfn><code>text/sandbox
    <dt>Published specification:</dt>
    <dd>
     This document is the relevant specification. Labeling a resource
-    with the <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code> type asserts that the
+    with the <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code> type asserts that the
     resource is an <a href=#html-documents title="HTML documents">HTML document</a>
     using <a href=#syntax>the HTML syntax</a>.
    </dd>
@@ -83754,7 +83754,7 @@ <h3 id=text/sandboxed-html><span class=secno>15.2 </span><dfn><code>text/sandbox
    <dt>Additional information:</dt>
    <dd>
     <dl><dt>Magic number(s):</dt>
-     <dd>Documents labeled as <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code> are
+     <dd>Documents labeled as <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code> are
      heuristically indistinguishable from those labeled as
      <code><a href=#text/html>text/html</a></code>.</dd>
      <dt>File extension(s):</dt>
@@ -83772,7 +83772,7 @@ <h3 id=text/sandboxed-html><span class=secno>15.2 </span><dfn><code>text/sandbox
    <dd>Ian Hickson &lt;ian@hixie.ch&gt;</dd>
    <dt>Change controller:</dt>
    <dd>W3C and WHATWG</dd>
-  </dl><p>Fragment identifiers used with <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code>
+  </dl><p>Fragment identifiers used with <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code>
   resources refer to <a href=#the-indicated-part-of-the-document>the indicated part of the
   document</a>.</p>
 
diff --git a/index b/index
index 7a2bc2045aa..63abc2b9fe0 100644
--- a/index
+++ b/index
@@ -1071,7 +1071,7 @@
  <li><a href=#iana><span class=secno>13 </span>IANA considerations</a>
   <ol>
    <li><a href=#text/html><span class=secno>13.1 </span><code>text/html</code></a></li>
-   <li><a href=#text/sandboxed-html><span class=secno>13.2 </span><code>text/sandboxed-html</code></a></li>
+   <li><a href=#text/html-sandboxed><span class=secno>13.2 </span><code>text/html-sandboxed</code></a></li>
    <li><a href=#application/xhtml+xml><span class=secno>13.3 </span><code>application/xhtml+xml</code></a></li>
    <li><a href=#text/cache-manifest><span class=secno>13.4 </span><code>text/cache-manifest</code></a></li>
    <li><a href=#text/ping><span class=secno>13.5 </span><code>text/ping</code></a></li>
@@ -1826,7 +1826,7 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
   type and subtype, with no MIME Type parameters. <a href=#refsHTTP>[HTTP]</a></p>
 
   <p>The term <dfn id=html-mime-type>HTML MIME type</dfn> is used to refer to the <a href=#mime-type title="MIME type">MIME types</a> <code><a href=#text/html>text/html</a></code> and
-  <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code>.</p>
+  <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code>.</p>
 
 
   <h4 id=xml><span class=secno>2.1.2 </span>XML</h4>
@@ -19745,7 +19745,7 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
 
   <p class=note>Potentially hostile files can be served from the
   same server as the file containing the <code><a href=#the-iframe-element>iframe</a></code> element
-  by labeling them as <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code> instead of
+  by labeling them as <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code> instead of
   <code><a href=#text/html>text/html</a></code>. This ensures that scripts in the files are
   unable to attack the site (as if they were actually served from
   another server), even if the user is tricked into visiting those
@@ -50591,7 +50591,7 @@ interface <dfn id=window>Window</dfn> {
      <code>Document</code> was created</dt>
 
      <dt>If a <code>Document</code> was generated from a resource
-     labeled as <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code></dt>
+     labeled as <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code></dt>
 
      <dd>The <a href=#origin>origin</a> is a globally unique identifier
      assigned when the <code>Document</code> is created.</dd>
@@ -56314,7 +56314,7 @@ State: &lt;OUTPUT NAME=I&gt;1&lt;/OUTPUT&gt; &lt;INPUT VALUE="Increment" TYPE=BU
    following list, and process the resource as described there:</p>
 
     <dl class=switch><!-- an <span>HTML MIME type</span> --><dt>"<code><a href=#text/html>text/html</a></code>"</dt>
-     <dt>"<code><a href=#text/sandboxed-html>text/sandboxed-html</a></code>"</dt>
+     <dt>"<code><a href=#text/html-sandboxed>text/html-sandboxed</a></code>"</dt>
      <dd>Follow the steps given in the <a href=#read-html title=navigate-html>HTML document</a> section, and abort
      these steps.</dd>
 
@@ -78054,20 +78054,20 @@ interface <a href=#htmldocument>HTMLDocument</a> {
   refer to <a href=#the-indicated-part-of-the-document>the indicated part of the document</a>.</p>
 
 
-  <h3 id=text/sandboxed-html><span class=secno>13.2 </span><dfn><code>text/sandboxed-html</code></dfn></h3>
+  <h3 id=text/html-sandboxed><span class=secno>13.2 </span><dfn><code>text/html-sandboxed</code></dfn></h3>
 
   <p>This registration is for community review and will be submitted
   to the IESG for review, approval, and registration with IANA.</p>
 
   <!--
    To: ietf-types@iana.org
-   Subject: Registration of media type text/sandboxed-html
+   Subject: Registration of media type text/html-sandboxed
   -->
 
   <dl><dt>Type name:</dt>
    <dd>text</dd>
    <dt>Subtype name:</dt>
-   <dd>sandboxed-html</dd>
+   <dd>html-sandboxed</dd>
    <dt>Required parameters:</dt>
    <dd>No required parameters</dd>
    <dt>Optional parameters:</dt>
@@ -78076,17 +78076,17 @@ interface <a href=#htmldocument>HTMLDocument</a> {
    <dd>Same as for <code><a href=#text/html>text/html</a></code></dd>
    <dt>Security considerations:</dt>
    <dd>
-    <p>The purpose of the <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code> MIME type
+    <p>The purpose of the <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code> MIME type
     is to provide a way for content providers to indicate that they
     want the file to be interpreted in a manner that does not give the
     file's contents access to the rest of the site. This is achieved
     by assigning the <code>Document</code> objects generated from
-    resources labeled as <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code> unique
+    resources labeled as <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code> unique
     origins.</p>
     <p>To avoid having legacy user agents treating resources labeled
-    as <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code> as regular
+    as <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code> as regular
     <code><a href=#text/html>text/html</a></code> files, authors should avoid using the <code title="">.html</code> or <code title="">.htm</code> extensions for
-    resources labeled as <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code>.</p>
+    resources labeled as <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code>.</p>
     <p>Beyond this, the type is identical to <code><a href=#text/html>text/html</a></code>,
     and the same considerations apply.</p>
    </dd>
@@ -78095,7 +78095,7 @@ interface <a href=#htmldocument>HTMLDocument</a> {
    <dt>Published specification:</dt>
    <dd>
     This document is the relevant specification. Labeling a resource
-    with the <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code> type asserts that the
+    with the <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code> type asserts that the
     resource is an <a href=#html-documents title="HTML documents">HTML document</a>
     using <a href=#syntax>the HTML syntax</a>.
    </dd>
@@ -78104,7 +78104,7 @@ interface <a href=#htmldocument>HTMLDocument</a> {
    <dt>Additional information:</dt>
    <dd>
     <dl><dt>Magic number(s):</dt>
-     <dd>Documents labeled as <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code> are
+     <dd>Documents labeled as <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code> are
      heuristically indistinguishable from those labeled as
      <code><a href=#text/html>text/html</a></code>.</dd>
      <dt>File extension(s):</dt>
@@ -78122,7 +78122,7 @@ interface <a href=#htmldocument>HTMLDocument</a> {
    <dd>Ian Hickson &lt;ian@hixie.ch&gt;</dd>
    <dt>Change controller:</dt>
    <dd>W3C and WHATWG</dd>
-  </dl><p>Fragment identifiers used with <code><a href=#text/sandboxed-html>text/sandboxed-html</a></code>
+  </dl><p>Fragment identifiers used with <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code>
   resources refer to <a href=#the-indicated-part-of-the-document>the indicated part of the
   document</a>.</p>
 
diff --git a/source b/source
index dea6ea50915..a34d93406e0 100644
--- a/source
+++ b/source
@@ -829,7 +829,7 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
 
   <p>The term <dfn>HTML MIME type</dfn> is used to refer to the <span
   title="MIME type">MIME types</span> <code>text/html</code> and
-  <code>text/sandboxed-html</code>.</p>
+  <code>text/html-sandboxed</code>.</p>
 
 
   <h4>XML</h4>
@@ -21123,7 +21123,7 @@ href="?audio">audio&lt;/a> test instead.)&lt;/p></pre>
 
   <p class="note">Potentially hostile files can be served from the
   same server as the file containing the <code>iframe</code> element
-  by labeling them as <code>text/sandboxed-html</code> instead of
+  by labeling them as <code>text/html-sandboxed</code> instead of
   <code>text/html</code>. This ensures that scripts in the files are
   unable to attack the site (as if they were actually served from
   another server), even if the user is tricked into visiting those
@@ -57100,7 +57100,7 @@ interface <dfn>Window</dfn> {
      <code>Document</code> was created</dt>
 
      <dt>If a <code>Document</code> was generated from a resource
-     labeled as <code>text/sandboxed-html</code></dt>
+     labeled as <code>text/html-sandboxed</code></dt>
 
      <dd>The <span>origin</span> is a globally unique identifier
      assigned when the <code>Document</code> is created.</dd>
@@ -63760,7 +63760,7 @@ State: &lt;OUTPUT NAME=I>1&lt;/OUTPUT> &lt;INPUT VALUE="Increment" TYPE=BUTTON O
 
      <!-- an <span>HTML MIME type</span> -->
      <dt>"<code>text/html</code>"</dt>
-     <dt>"<code>text/sandboxed-html</code>"</dt>
+     <dt>"<code>text/html-sandboxed</code>"</dt>
      <dd>Follow the steps given in the <span
      title="navigate-html">HTML document</span> section, and abort
      these steps.</dd>
@@ -93195,21 +93195,21 @@ interface <span>HTMLDocument</span> {
   refer to <span>the indicated part of the document</span>.</p>
 
 
-  <h3><dfn><code>text/sandboxed-html</code></dfn></h3>
+  <h3><dfn><code>text/html-sandboxed</code></dfn></h3>
 
   <p>This registration is for community review and will be submitted
   to the IESG for review, approval, and registration with IANA.</p>
 
   <!--
    To: ietf-types@iana.org
-   Subject: Registration of media type text/sandboxed-html
+   Subject: Registration of media type text/html-sandboxed
   -->
 
   <dl>
    <dt>Type name:</dt>
    <dd>text</dd>
    <dt>Subtype name:</dt>
-   <dd>sandboxed-html</dd>
+   <dd>html-sandboxed</dd>
    <dt>Required parameters:</dt>
    <dd>No required parameters</dd>
    <dt>Optional parameters:</dt>
@@ -93218,18 +93218,18 @@ interface <span>HTMLDocument</span> {
    <dd>Same as for <code>text/html</code></dd>
    <dt>Security considerations:</dt>
    <dd>
-    <p>The purpose of the <code>text/sandboxed-html</code> MIME type
+    <p>The purpose of the <code>text/html-sandboxed</code> MIME type
     is to provide a way for content providers to indicate that they
     want the file to be interpreted in a manner that does not give the
     file's contents access to the rest of the site. This is achieved
     by assigning the <code>Document</code> objects generated from
-    resources labeled as <code>text/sandboxed-html</code> unique
+    resources labeled as <code>text/html-sandboxed</code> unique
     origins.</p>
     <p>To avoid having legacy user agents treating resources labeled
-    as <code>text/sandboxed-html</code> as regular
+    as <code>text/html-sandboxed</code> as regular
     <code>text/html</code> files, authors should avoid using the <code
     title="">.html</code> or <code title="">.htm</code> extensions for
-    resources labeled as <code>text/sandboxed-html</code>.</p>
+    resources labeled as <code>text/html-sandboxed</code>.</p>
     <p>Beyond this, the type is identical to <code>text/html</code>,
     and the same considerations apply.</p>
    </dd>
@@ -93238,7 +93238,7 @@ interface <span>HTMLDocument</span> {
    <dt>Published specification:</dt>
    <dd>
     This document is the relevant specification. Labeling a resource
-    with the <code>text/sandboxed-html</code> type asserts that the
+    with the <code>text/html-sandboxed</code> type asserts that the
     resource is an <span title="HTML documents">HTML document</span>
     using <span>the HTML syntax</span>.
    </dd>
@@ -93248,7 +93248,7 @@ interface <span>HTMLDocument</span> {
    <dd>
     <dl>
      <dt>Magic number(s):</dt>
-     <dd>Documents labeled as <code>text/sandboxed-html</code> are
+     <dd>Documents labeled as <code>text/html-sandboxed</code> are
      heuristically indistinguishable from those labeled as
      <code>text/html</code>.</dd>
      <dt>File extension(s):</dt>
@@ -93269,7 +93269,7 @@ interface <span>HTMLDocument</span> {
    <dd>W3C and WHATWG</dd>
   </dl>
 
-  <p>Fragment identifiers used with <code>text/sandboxed-html</code>
+  <p>Fragment identifiers used with <code>text/html-sandboxed</code>
   resources refer to <span>the indicated part of the
   document</span>.</p>