mike: bring the content model for the base element into alignment with the spec (thx=JonathanNeal)

mike: bring the content model for the base element into alignment with
the spec (thx=JonathanNeal)

http://dev.w3.org/cvsweb/html5/markup/spec.html?r1=1.200&r2=1.201&f=h

===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -d -r1.405 -r1.406
--- Overview.html 23 Mar 2010 11:27:03 -0000 1.405
+++ Overview.html 24 Mar 2010 20:46:41 -0000 1.406
@@ -10,7 +10,7 @@
 <div class="head">
 <div><a href="http://www.w3.org/"><img height="48" width="72" alt="W3C" src="http://www.w3.org/Icons/w3c_home"></a></div>
 <h1>HTML: The Markup Language</h1>
-<h2>W3C Editor&#8217;s Draft <em>23 March 2010</em>
+<h2>W3C Editor&#8217;s Draft <em>25 March 2010</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -51,7 +51,7 @@
           reports index</a> at http://www.w3.org/TR/.
       </em></p>
     <p>
-        This document is the 23 March 2010 Editor&#8217;s Draft of 
+        This document is the 25 March 2010 Editor&#8217;s Draft of 
         <cite>HTML: The Markup Language</cite>.
       
       If you&#8217;d like to comment on this document, the preferred

Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- schema.html 7 Mar 2010 11:57:31 -0000 1.14
+++ schema.html 24 Mar 2010 20:47:05 -0000 1.15
@@ -687,8 +687,9 @@
 <div class='define' id='base.attrs-define'>
   <div class='patternname' id='the-base.attrs'><a href='#the-base.attrs'>base.attrs</a> =</div>
   <span class='pattern' id='base.attrs'><a class='ref' href='#common.attrs'>common.attrs</a>
-   <span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#base.attrs.href' title='base.attrs.href'>href</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> 
-   <span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#base.attrs.target' title='base.attrs.target'>target</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> </span>
+   <span class='postfix intermixed'>intermixed with</span>  <span class='agroupof'> <span class='agroupof'><a class='ref' href='#base.attrs.href' title='base.attrs.href'>href</a>
+                                                                                                          <span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#base.attrs.target' title='base.attrs.target'>target</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> </span>
+                                                                                   <span class='postfix or'>or</span> <a class='ref' href='#base.attrs.target' title='base.attrs.target'>target</a></span></span>
 </div>
 <div class='define' id='base.attrs.href-define'>
   <div class='patternname' id='the-base.attrs.href'><a href='#the-base.attrs.href'>href</a> =</div>

Index: area.html
===================================================================
RCS file: /sources/public/html5/markup/area.html,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- area.html 7 Mar 2010 11:57:31 -0000 1.53
+++ area.html 24 Mar 2010 20:46:46 -0000 1.54
@@ -190,7 +190,7 @@
   stringifier attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-area-href" title="dom-area-href">href</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-area-target" title="dom-area-target">target</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-area-rel" title="dom-area-rel">rel</a>;
-  readonly attribute DOMTokenList <a href="http://dev.w3.org/html5/spec/#dom-area-rellist" title="dom-area-relList">relList</a>;
+  readonly attribute <a href="http://dev.w3.org/html5/spec/#domtokenlist" title="">DOMTokenList</a> <a href="http://dev.w3.org/html5/spec/#dom-area-rellist" title="dom-area-relList">relList</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-area-media" title="dom-area-media">media</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-area-hreflang" title="dom-area-hreflang">hreflang</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-area-type" title="dom-area-type">type</a>;

Index: a.html
===================================================================
RCS file: /sources/public/html5/markup/a.html,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- a.html 7 Mar 2010 11:57:31 -0000 1.58
+++ a.html 24 Mar 2010 20:46:44 -0000 1.59
@@ -210,7 +210,7 @@
   stringifier attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-a-href" title="dom-a-href">href</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-a-target" title="dom-a-target">target</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-a-rel" title="dom-a-rel">rel</a>;
-  readonly attribute DOMTokenList <a href="http://dev.w3.org/html5/spec/#dom-a-rellist" title="dom-a-relList">relList</a>;
+  readonly attribute <a href="http://dev.w3.org/html5/spec/#domtokenlist" title="">DOMTokenList</a> <a href="http://dev.w3.org/html5/spec/#dom-a-rellist" title="dom-a-relList">relList</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-a-media" title="dom-a-media">media</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-a-hreflang" title="dom-a-hreflang">hreflang</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-a-type" title="dom-a-type">type</a>;

Index: base.html
===================================================================
RCS file: /sources/public/html5/markup/base.html,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- base.html 7 Mar 2010 11:29:03 -0000 1.43
+++ base.html 24 Mar 2010 20:46:58 -0000 1.44
@@ -39,8 +39,9 @@
 </h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="base.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix intermixed">&amp;</span> <a class="ref" href="base.html#base.attrs.href" title="base.attrs.href">href</a> 
-   <span class="postfix intermixed">&amp;</span> <a class="ref" href="base.html#base.attrs.target" title="base.attrs.target">target</a> </span></p>
+   <span class="postfix intermixed">&amp;</span>  <span class="agroupof"> <span class="agroupof"><a class="ref" href="base.html#base.attrs.href" title="base.attrs.href">href</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                                                                                                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="base.html#base.attrs.target" title="base.attrs.target">target</a> </span>
+                                                                                   <span class="postfix or">or</span> <a class="ref" href="base.html#base.attrs.target" title="base.attrs.target">target</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></span></p>
 </div>
 </div>
       <div class="no-number no-toc" id="base-attributes">

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- spec.html 23 Mar 2010 11:27:03 -0000 1.200
+++ spec.html 24 Mar 2010 20:47:06 -0000 1.201
@@ -10,7 +10,7 @@
 <div class="head">
 <div><a href="http://www.w3.org/"><img height="48" width="72" alt="W3C" src="http://www.w3.org/Icons/w3c_home"></a></div>
 <h1>HTML: The Markup Language</h1>
-<h2>W3C Editor&#8217;s Draft <em>23 March 2010</em>
+<h2>W3C Editor&#8217;s Draft <em>25 March 2010</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -50,7 +50,7 @@
           reports index</a> at http://www.w3.org/TR/.
       </em></p>
     <p>
-        This document is the 23 March 2010 Editor&#8217;s Draft of 
+        This document is the 25 March 2010 Editor&#8217;s Draft of 
         <cite>HTML: The Markup Language</cite>.
       
       If you&#8217;d like to comment on this document, the preferred
@@ -2735,7 +2735,7 @@
   stringifier attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-a-href" title="dom-a-href">href</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-a-target" title="dom-a-target">target</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-a-rel" title="dom-a-rel">rel</a>;
-  readonly attribute DOMTokenList <a href="http://dev.w3.org/html5/spec/#dom-a-rellist" title="dom-a-relList">relList</a>;
+  readonly attribute <a href="http://dev.w3.org/html5/spec/#domtokenlist" title="">DOMTokenList</a> <a href="http://dev.w3.org/html5/spec/#dom-a-rellist" title="dom-a-relList">relList</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-a-media" title="dom-a-media">media</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-a-hreflang" title="dom-a-hreflang">hreflang</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-a-type" title="dom-a-type">type</a>;
@@ -3109,7 +3109,7 @@
   stringifier attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-area-href" title="dom-area-href">href</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-area-target" title="dom-area-target">target</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-area-rel" title="dom-area-rel">rel</a>;
-  readonly attribute DOMTokenList <a href="http://dev.w3.org/html5/spec/#dom-area-rellist" title="dom-area-relList">relList</a>;
+  readonly attribute <a href="http://dev.w3.org/html5/spec/#domtokenlist" title="">DOMTokenList</a> <a href="http://dev.w3.org/html5/spec/#dom-area-rellist" title="dom-area-relList">relList</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-area-media" title="dom-area-media">media</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-area-hreflang" title="dom-area-hreflang">hreflang</a>;
            attribute DOMString <a href="http://dev.w3.org/html5/spec/#dom-area-type" title="dom-area-type">type</a>;
@@ -3522,8 +3522,9 @@
 </h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="base.attrs"><a href="#common-attributes">common attributes</a>
-   <span class="postfix intermixed">&amp;</span> <a class="ref" href="#base.attrs.href" title="base.attrs.href">href</a> 
-   <span class="postfix intermixed">&amp;</span> <a class="ref" href="#base.attrs.target" title="base.attrs.target">target</a> </span></p>
+   <span class="postfix intermixed">&amp;</span>  <span class="agroupof"> <span class="agroupof"><a class="ref" href="#base.attrs.href" title="base.attrs.href">href</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                                                                                                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="#base.attrs.target" title="base.attrs.target">target</a> </span>
+                                                                                   <span class="postfix or">or</span> <a class="ref" href="#base.attrs.target" title="base.attrs.target">target</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></span></p>
 </div>
 </div>
       <div class="no-number no-toc" id="base-attributes">

Received on Wednesday, 24 March 2010 20:48:06 UTC