[html5] r8126 - [e] (0) Duplicate the <base> content model restrictions into the content model l [...]

whatwg at whatwg.org whatwg at whatwg.org
Mon Aug 5 11:01:18 PDT 2013


Author: ianh
Date: 2013-08-05 11:01:16 -0700 (Mon, 05 Aug 2013)
New Revision: 8126

Modified:
   complete.html
   index
   source
Log:
[e] (0) Duplicate the <base> content model restrictions into the content model line itself, so it's more obvious to readers.
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=22857
Affected topics: HTML

Modified: complete.html
===================================================================
--- complete.html	2013-08-03 16:04:58 UTC (rev 8125)
+++ complete.html	2013-08-05 18:01:16 UTC (rev 8126)
@@ -256,7 +256,7 @@
 
   <header class=head id=head><p><a href=http://www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard — Last Updated 3 August 2013</h2>
+    <h2 class="no-num no-toc">Living Standard — Last Updated 5 August 2013</h2>
    </hgroup><dl><dt><strong>Web developer edition:</strong></dt>
     <dd><strong><a href=http://developers.whatwg.org/>http://developers.whatwg.org/</a></strong></dd>
     <dt>Multiple-page version:</dt>
@@ -12336,8 +12336,8 @@
    <dt><a href=#element-dfn-contexts title=element-dfn-contexts>Contexts in which this element can be used</a>:</dt>
    <dd>As the first element in an <code><a href=#the-html-element>html</a></code> element.</dd>
    <dt><a href=#element-dfn-content-model title=element-dfn-content-model>Content model</a>:</dt>
-   <dd>If the document is <a href=#an-iframe-srcdoc-document>an <code>iframe</code> <code title=attr-iframe-srcdoc>srcdoc</code> document</a> or if title information is available from a higher-level protocol: Zero or more elements of <a href=#metadata-content>metadata content</a>, of which no more than one is a <code><a href=#the-title-element>title</a></code> element.</dd>
-   <dd>Otherwise: One or more elements of <a href=#metadata-content>metadata content</a>, of which exactly one is a <code><a href=#the-title-element>title</a></code> element.</dd>
+   <dd>If the document is <a href=#an-iframe-srcdoc-document>an <code>iframe</code> <code title=attr-iframe-srcdoc>srcdoc</code> document</a> or if title information is available from a higher-level protocol: Zero or more elements of <a href=#metadata-content>metadata content</a>, of which no more than one is a <code><a href=#the-title-element>title</a></code> element and no more than one is a <code><a href=#the-base-element>base</a></code> element.</dd>
+   <dd>Otherwise: One or more elements of <a href=#metadata-content>metadata content</a>, of which exactly one is a <code><a href=#the-title-element>title</a></code> element and no more than one is a <code><a href=#the-base-element>base</a></code> element.</dd>
    <dt><a href=#element-dfn-tag-omission title=element-dfn-tag-omission>Tag omission in text/html</a>:</dt>
    <dd>A <code><a href=#the-head-element>head</a></code> element's <a href=#syntax-start-tag title=syntax-start-tag>start tag</a> can be omitted if
    the element is empty, or if the first thing inside the <code><a href=#the-head-element>head</a></code> element is an

Modified: index
===================================================================
--- index	2013-08-03 16:04:58 UTC (rev 8125)
+++ index	2013-08-05 18:01:16 UTC (rev 8126)
@@ -256,7 +256,7 @@
 
   <header class=head id=head><p><a href=http://www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard — Last Updated 3 August 2013</h2>
+    <h2 class="no-num no-toc">Living Standard — Last Updated 5 August 2013</h2>
    </hgroup><dl><dt><strong>Web developer edition:</strong></dt>
     <dd><strong><a href=http://developers.whatwg.org/>http://developers.whatwg.org/</a></strong></dd>
     <dt>Multiple-page version:</dt>
@@ -12336,8 +12336,8 @@
    <dt><a href=#element-dfn-contexts title=element-dfn-contexts>Contexts in which this element can be used</a>:</dt>
    <dd>As the first element in an <code><a href=#the-html-element>html</a></code> element.</dd>
    <dt><a href=#element-dfn-content-model title=element-dfn-content-model>Content model</a>:</dt>
-   <dd>If the document is <a href=#an-iframe-srcdoc-document>an <code>iframe</code> <code title=attr-iframe-srcdoc>srcdoc</code> document</a> or if title information is available from a higher-level protocol: Zero or more elements of <a href=#metadata-content>metadata content</a>, of which no more than one is a <code><a href=#the-title-element>title</a></code> element.</dd>
-   <dd>Otherwise: One or more elements of <a href=#metadata-content>metadata content</a>, of which exactly one is a <code><a href=#the-title-element>title</a></code> element.</dd>
+   <dd>If the document is <a href=#an-iframe-srcdoc-document>an <code>iframe</code> <code title=attr-iframe-srcdoc>srcdoc</code> document</a> or if title information is available from a higher-level protocol: Zero or more elements of <a href=#metadata-content>metadata content</a>, of which no more than one is a <code><a href=#the-title-element>title</a></code> element and no more than one is a <code><a href=#the-base-element>base</a></code> element.</dd>
+   <dd>Otherwise: One or more elements of <a href=#metadata-content>metadata content</a>, of which exactly one is a <code><a href=#the-title-element>title</a></code> element and no more than one is a <code><a href=#the-base-element>base</a></code> element.</dd>
    <dt><a href=#element-dfn-tag-omission title=element-dfn-tag-omission>Tag omission in text/html</a>:</dt>
    <dd>A <code><a href=#the-head-element>head</a></code> element's <a href=#syntax-start-tag title=syntax-start-tag>start tag</a> can be omitted if
    the element is empty, or if the first thing inside the <code><a href=#the-head-element>head</a></code> element is an

Modified: source
===================================================================
--- source	2013-08-03 16:04:58 UTC (rev 8125)
+++ source	2013-08-05 18:01:16 UTC (rev 8126)
@@ -12572,8 +12572,8 @@
    <dt><span title="element-dfn-contexts">Contexts in which this element can be used</span>:</dt>
    <dd>As the first element in an <code>html</code> element.</dd>
    <dt><span title="element-dfn-content-model">Content model</span>:</dt>
-   <dd>If the document is <span>an <code>iframe</code> <code title="attr-iframe-srcdoc">srcdoc</code> document</span> or if title information is available from a higher-level protocol: Zero or more elements of <span>metadata content</span>, of which no more than one is a <code>title</code> element.</dd>
-   <dd>Otherwise: One or more elements of <span>metadata content</span>, of which exactly one is a <code>title</code> element.</dd>
+   <dd>If the document is <span>an <code>iframe</code> <code title="attr-iframe-srcdoc">srcdoc</code> document</span> or if title information is available from a higher-level protocol: Zero or more elements of <span>metadata content</span>, of which no more than one is a <code>title</code> element and no more than one is a <code>base</code> element.</dd>
+   <dd>Otherwise: One or more elements of <span>metadata content</span>, of which exactly one is a <code>title</code> element and no more than one is a <code>base</code> element.</dd>
    <dt><span title="element-dfn-attributes">Content attributes</span>:</dt>
    <dd><span>Global attributes</span></dd>
    <dt><span title="element-dfn-dom">DOM interface</span>:</dt><!--TOPIC:DOM APIs-->




More information about the Commit-Watchers mailing list