dfn img-alt and img-src; mention usemap in img and object definitions

git-svn-id: http://svn.whatwg.org/webapps@249 340c8d12-0b0e-0410-8428-c7bf67bfef74

index

@@ -9468,11 +9468,11 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
 
    <dt>Element-specific attributes:
 
-   <dd><code title=attr-img-alt>alt</code> (required)
+   <dd><code title=attr-img-alt><a href="#alt">alt</a></code> (required)
 
-   <dd><code title=attr-img-src>src</code> (required)
+   <dd><code title=attr-img-src><a href="#src">src</a></code> (required)
 
-   <dd><code title=attr-img-usemap>usemap</code>
+   <dd><code title=attr-hyperlink-usemap>usemap</code>
 
    <dd><code title=attr-img-ismap>ismap</code>
 
@@ -9496,9 +9496,10 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
 
   <p>The <code><a href="#img0">img</a></code> element represents a piece of
    text with an alternate graphical representation. The text is given by the
-   <code>alt</code> attribute, which must be present, and the URI to the
-   graphical representation of that text is given by the <code>src</code>
-   attribute.
+   <dfn id=alt title=attr-img-alt><code>alt</code></dfn> attribute, which
+   must be present, and the URI to the graphical representation of that text
+   is given in the <dfn id=src title=attr-img-src><code>src</code></dfn>
+   attribute, which must also be present.
 
   <p class=big-issue>This section is (obviously) incomplete.
 
@@ -9511,6 +9512,10 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
   <!-- usemap is special-cased when it starts with a "#".
        does any browser support it when it doesn't? -->
 
+  <p>The <code title=attr-hyperlink-usemap>usemap</code> attribute, if
+   present, can indicate that the image has an associated <a
+   href="#image0">image map</a>.
+
   <h4 id=the-iframe><span class=secno>3.12.2. </span>The <dfn
    id=iframe0><code>iframe</code></dfn> element</h4>
 
@@ -9611,7 +9616,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
 
    <dd><code title=attr-object-type>type</code>
 
-   <dd><code title=attr-object-usemap>usemap</code>
+   <dd><code title=attr-hyperlink-usemap>usemap</code>
 
    <dd><code title=attr-object-height>height</code>
 
@@ -9637,6 +9642,10 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
      the Window Object specification. <a href="#refsWINDOW">[WINDOW]</a></p>
   </dl>
 
+  <p>The <code title=attr-hyperlink-usemap>usemap</code> attribute, if
+   present, can indicate that the object has an associated <a
+   href="#image0">image map</a>.
+
   <h4 id=the-param><span class=secno>3.12.5. </span>The <dfn
    id=param0><code>param</code></dfn> element</h4>
 
@@ -9716,7 +9725,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
 
    <dt>Element-specific attributes:
 
-   <dd><code title=attr-area-alt><a href="#alt">alt</a></code> (required)
+   <dd><code title=attr-area-alt><a href="#alt0">alt</a></code> (required)
 
    <dd><code title=attr-area-coords>coords</code>
 
@@ -9740,7 +9749,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
    <dd>
     <pre
      class=idl>interface <dfn id=htmlareaelement>HTMLAreaElement</dfn> : <a href="#htmlelement">HTMLElement</a> {
-           attribute DOMString <a href="#alt0" title=dom-area-alt>alt</a>;
+           attribute DOMString <a href="#alt1" title=dom-area-alt>alt</a>;
            attribute DOMString <a href="#coords" title=dom-area-coords>coords</a>;
            attribute DOMString <a href="#shape" title=dom-area-shape>shape</a>;
            attribute DOMString <a href="#href4" title=dom-area-href>href</a>;
@@ -9754,7 +9763,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
 
   <p>The <code><a href="#area0">area</a></code> elements represents some text
    with corresponding to an area on an <a href="#image0">image map</a>. The
-   <dfn id=alt title=attr-area-alt><code>alt</code></dfn> attribute, which
+   <dfn id=alt0 title=attr-area-alt><code>alt</code></dfn> attribute, which
    must be present, specifies the text, and the <code
    title=attr-area-coords>coords</code> and <code
    title=attr-area-shape>shape</code> attributes specify the area.
@@ -9781,7 +9790,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
    be used to indicate to the user the likely nature of the target resource
    before the user follows the link.
 
-  <p>The DOM attributes <dfn id=alt0
+  <p>The DOM attributes <dfn id=alt1
    title=dom-area-alt><code>alt</code></dfn>, <dfn id=coords
    title=dom-area-coords><code>coords</code></dfn>, <dfn id=shape
    title=dom-area-shape><code>shape</code></dfn>, <dfn id=href4
@@ -9837,21 +9846,23 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
    <dt>Content model:
 
    <dd>If there is no <code title=attr-script-src><a
-    href="#src">src</a></code> attribute, depends on the value of the <code
+    href="#src0">src</a></code> attribute, depends on the value of the <code
     title=attr-script-type><a href="#type5">type</a></code> attribute.
 
    <dd>If there <em>is</em> a <code title=attr-script-src><a
-    href="#src">src</a></code> attribute, the element must be empty.
+    href="#src0">src</a></code> attribute, the element must be empty.
 
    <dt>Element-specific attributes:
 
-   <dd><code title=attr-script-src><a href="#src">src</a></code>
+   <dd><code title=attr-script-src><a href="#src0">src</a></code>
 
    <dd><code title=attr-script-defer>defer</code> (if the <code
-    title=attr-script-src><a href="#src">src</a></code> attribute is present)
+    title=attr-script-src><a href="#src0">src</a></code> attribute is
+    present)
 
    <dd><code title=attr-script-async>async</code> (if the <code
-    title=attr-script-src><a href="#src">src</a></code> attribute is present)
+    title=attr-script-src><a href="#src0">src</a></code> attribute is
+    present)
 
    <dd><code title=attr-script-type><a href="#type5">type</a></code>
 
@@ -9860,7 +9871,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
    <dd>
     <pre
      class=idl>interface <dfn id=htmlscriptelement>HTMLScriptElement</dfn> : <a href="#htmlelement">HTMLElement</a> {
-           attribute DOMString <code title=dom-script-src><a href="#src0">src</a></code>;
+           attribute DOMString <code title=dom-script-src><a href="#src1">src</a></code>;
            attribute boolean <code title=dom-script-defer><a href="#defer">defer</a></code>;
            attribute boolean <code title=dom-script-async><a href="#async">async</a></code>;
            attribute DOMString <code title=dom-script-type><a href="#type6">type</a></code>;
@@ -9871,11 +9882,11 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
   <p>The <code><a href="#script2">script</a></code> element allows authors to
    include dynamic script in their documents.
 
-  <p>When the <dfn id=src title=attr-script-src><code>src</code></dfn>
+  <p>When the <dfn id=src0 title=attr-script-src><code>src</code></dfn>
    attribute is set, the <code><a href="#script2">script</a></code> element
    refers to an external file. The value of the attribute must be a URI.
 
-  <p>If the <code title=attr-script-src><a href="#src">src</a></code>
+  <p>If the <code title=attr-script-src><a href="#src0">src</a></code>
    attribute is not set, then the script is given by the contents of the
    element.
 
@@ -9889,7 +9900,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
   <p class=big-issue>Do we really want this attribute to be called async=""?
    Anyone have a better name?
 
-  <p>Changing the <code title=attr-script-src><a href="#src">src</a></code>,
+  <p>Changing the <code title=attr-script-src><a href="#src0">src</a></code>,
    <code title=attr-script-type><a href="#type5">type</a></code>, <code
    title=attr-script-defer>defer</code> and <code
    title=attr-script-async>async</code> attributes dynamically has no direct
@@ -9927,7 +9938,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
 
    <li>
     <p>If the element has a <code title=attr-script-src><a
-     href="#src">src</a></code> attribute, then a load for the specified
+     href="#src0">src</a></code> attribute, then a load for the specified
      content must be started.</p>
 
     <p class=note>Later, once the load has completed, the user agent will
@@ -9939,7 +9950,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
      be inserted into the document. Either way, once the element is inserted
      into the document, the load must have started. If the UA performs such
      prefetching, but the element is never inserted in the document, or the
-     <code title=attr-script-src><a href="#src">src</a></code> attribute is
+     <code title=attr-script-src><a href="#src0">src</a></code> attribute is
      dynamically changed, then the user agent will not execute the script,
      and the load will have been effectively wasted.</p>
 
@@ -9967,7 +9978,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
 
      <dt>If the element has an <code title=attr-script-async>async</code>
       attribute and a <code title=attr-script-src><a
-      href="#src">src</a></code> attribute
+      href="#src0">src</a></code> attribute
 
      <dd>The element must be added to the end of the <a href="#list-of0">list
       of scripts that will execute asynchronously</a>. The user agent must
@@ -9976,22 +9987,22 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
 
      <dt>If the element has an <code title=attr-script-async>async</code>
       attribute but no <code title=attr-script-src><a
-      href="#src">src</a></code> attribute, and the <a href="#list-of0">list
+      href="#src0">src</a></code> attribute, and the <a href="#list-of0">list
       of scripts that will execute asynchronously</a> is not empty
 
      <dd>The element must be added to the end of the <a href="#list-of0">list
       of scripts that will execute asynchronously</a>.
 
      <dt>If the element has a <code title=attr-script-src><a
-      href="#src">src</a></code> attribute and has been flagged as <a
+      href="#src0">src</a></code> attribute and has been flagged as <a
       href="#parser-inserted">"parser-inserted"</a>
 
      <dd>The element is <a href="#the-script">the script that will execute as
       soon as the parser resumes</a>. (There can only be one such script at a
       time.)
 
      <dt>If the element has a <code title=attr-script-src><a
-      href="#src">src</a></code> attribute
+      href="#src0">src</a></code> attribute
 
      <dd>The element must be added to the end of the <a href="#list-of1">list
       of scripts that will execute as soon as possible</a>. The user agent
@@ -10058,8 +10069,8 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
      <li>
       <p>If there are any more scripts in the list, and the element now at
        the head of the list had no <code title=attr-script-src><a
-       href="#src">src</a></code> attribute when it was added to the list, or
-       had one, but its associated script has finished loading, then jump
+       href="#src0">src</a></code> attribute when it was added to the list,
+       or had one, but its associated script has finished loading, then jump
        back to step two to execute the script associated with this element.</p>
     </ol>
 
@@ -10119,7 +10130,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
    href="#script2">script</a></code> element is first inserted into the
    document matter.
 
-  <p>The DOM attributes <dfn id=src0
+  <p>The DOM attributes <dfn id=src1
    title=dom-script-src><code>src</code></dfn>, <dfn id=type6
    title=dom-script-type><code>type</code></dfn>, <dfn id=defer
    title=dom-script-defer><code>defer</code></dfn>, <dfn id=async

source

@@ -8080,7 +8080,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
    <dt>Element-specific attributes:</dt>
    <dd><code title="attr-img-alt">alt</code> (required)</dd>
    <dd><code title="attr-img-src">src</code> (required)</dd>
-   <dd><code title="attr-img-usemap">usemap</code></dd>
+   <dd><code title="attr-hyperlink-usemap">usemap</code></dd>
    <dd><code title="attr-img-ismap">ismap</code></dd>
    <dd><code title="attr-img-height">height</code></dd>
    <dd><code title="attr-img-width">width</code></dd>
@@ -8098,10 +8098,11 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
   </dl>
 
   <p>The <code>img</code> element represents a piece of text with an
-  alternate graphical representation. The text is given by the
-  <code>alt</code> attribute, which must be present, and the URI to
-  the graphical representation of that text is given by the
-  <code>src</code> attribute.</p>
+  alternate graphical representation. The text is given by the <dfn
+  title="attr-img-alt"><code>alt</code></dfn> attribute, which must be
+  present, and the URI to the graphical representation of that text is
+  given in the <dfn title="attr-img-src"><code>src</code></dfn>
+  attribute, which must also be present.</p>
 
   <p class="big-issue">This section is (obviously) incomplete.</p>
 
@@ -8116,6 +8117,10 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
   <!-- usemap is special-cased when it starts with a "#".
        does any browser support it when it doesn't? -->
 
+  <p>The <code title="attr-hyperlink-usemap">usemap</code> attribute,
+  if present, can indicate that the image has an associated
+  <span>image map</span>.</p>
+
 
   <h4>The <dfn><code>iframe</code></dfn> element</h4>
 
@@ -8186,7 +8191,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
    <dt>Element-specific attributes:</dt>
    <dd><code title="attr-object-data">data</code> (required)</dd>
    <dd><code title="attr-object-type">type</code></dd>
-   <dd><code title="attr-object-usemap">usemap</code></dd>
+   <dd><code title="attr-hyperlink-usemap">usemap</code></dd>
    <dd><code title="attr-object-height">height</code></dd>
    <dd><code title="attr-object-width">width</code></dd>
    <dt>DOM interface:</dt>
@@ -8207,6 +8212,10 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
    </dd>
   </dl>
 
+  <p>The <code title="attr-hyperlink-usemap">usemap</code> attribute,
+  if present, can indicate that the object has an associated
+  <span>image map</span>.</p>
+
 
   <h4>The <dfn><code>param</code></dfn> element</h4>