[e] (0) sync with dom core

Affected topics: DOM APIs git-svn-id: http://svn.whatwg.org/webapps@7145 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jun 26, 2012 · 3eefa51 · 3eefa51
1 parent 079d6f2
commit 3eefa51
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 31 deletions.
diff --git a/complete.html b/complete.html
@@ -240,7 +240,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 23 June 2012</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 26 June 2012</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>
@@ -3931,6 +3931,11 @@ <h4 id=dependencies><span class=secno>2.2.2 </span>Dependencies</h4>
     the number 23, for legacy reasons) and actually throw that object
     as an exception.</p>
 
+    <p>The <span title=concept-document-URL>URL</span> associated
+    with a <code><a href=#document>Document</a></code>, as defined in the DOM Core
+    specification, is referred to in this specification as <a href="#the-document's-address">the
+    document's address</a>.</p>
+
     <p>The following features are defined in the DOM Events
     specification: <a href=#refsDOMEVENTS>[DOMEVENTS]</a></p>
 
@@ -9881,7 +9886,6 @@ <h3 id=documents><span class=secno>3.1 </span>Documents</h3>
 partial interface <dfn id=document>Document</dfn> {
   // <a href=#resource-metadata-management>resource metadata management</a>
   [PutForwards=<a href=#dom-location-href title=dom-location-href>href</a>] readonly attribute <a href=#location>Location</a>? <a href=#dom-document-location title=dom-document-location>location</a>;
-  readonly attribute DOMString <a href=#dom-document-url title=dom-document-URL>URL</a>;
            attribute DOMString <a href=#dom-document-domain title=dom-document-domain>domain</a>;
   readonly attribute DOMString <a href=#dom-document-referrer title=dom-document-referrer>referrer</a>;
            attribute DOMString <a href=#dom-document-cookie title=dom-document-cookie>cookie</a>;
@@ -10003,12 +10007,7 @@ <h4 id=security-document><span class=secno>3.1.2 </span>Security</h4>
 
   <h4 id=resource-metadata-management><span class=secno>3.1.3 </span><dfn>Resource metadata management</dfn></h4>
 
-  <dl class=domintro><dt><var title="">document</var> . <code title=dom-document-URL><a href=#dom-document-url>URL</a></code></dt>
-   <dd>
-    <p>Returns <a href="#the-document's-address">the document's address</a>.</p>
-   </dd>
-
-   <dt><var title="">document</var> . <code title=dom-document-referrer><a href=#dom-document-referrer>referrer</a></code></dt>
+  <dl class=domintro><dt><var title="">document</var> . <code title=dom-document-referrer><a href=#dom-document-referrer>referrer</a></code></dt>
    <dd>
     <p>Returns <a href="#the-document's-current-address" title="the document's current address">the
     address</a> of the <code><a href=#document>Document</a></code> from which the user
@@ -10020,9 +10019,6 @@ <h4 id=resource-metadata-management><span class=secno>3.1.3 </span><dfn>Resource
 
   </dl><div class=impl>
 
-  <p>The <dfn id=dom-document-url title=dom-document-URL><code>URL</code></dfn>
-  attribute must return <a href="#the-document's-address">the document's address</a>.</p>
-
   <p>The <dfn id=dom-document-referrer title=dom-document-referrer><code>referrer</code></dfn> attribute
   must return either the <a href="#the-document's-current-address" title="the document's current
   address">current address</a> of the <a href=#active-document>active document</a>

diff --git a/index b/index
@@ -240,7 +240,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 23 June 2012</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 26 June 2012</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>
@@ -3931,6 +3931,11 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
     the number 23, for legacy reasons) and actually throw that object
     as an exception.</p>
 
+    <p>The <span title=concept-document-URL>URL</span> associated
+    with a <code><a href=#document>Document</a></code>, as defined in the DOM Core
+    specification, is referred to in this specification as <a href="#the-document's-address">the
+    document's address</a>.</p>
+
     <p>The following features are defined in the DOM Events
     specification: <a href=#refsDOMEVENTS>[DOMEVENTS]</a></p>
 
@@ -9881,7 +9886,6 @@ interface <dfn id=transferable>Transferable</dfn> { };</pre>
 partial interface <dfn id=document>Document</dfn> {
   // <a href=#resource-metadata-management>resource metadata management</a>
   [PutForwards=<a href=#dom-location-href title=dom-location-href>href</a>] readonly attribute <a href=#location>Location</a>? <a href=#dom-document-location title=dom-document-location>location</a>;
-  readonly attribute DOMString <a href=#dom-document-url title=dom-document-URL>URL</a>;
            attribute DOMString <a href=#dom-document-domain title=dom-document-domain>domain</a>;
   readonly attribute DOMString <a href=#dom-document-referrer title=dom-document-referrer>referrer</a>;
            attribute DOMString <a href=#dom-document-cookie title=dom-document-cookie>cookie</a>;
@@ -10003,12 +10007,7 @@ partial interface <dfn id=document>Document</dfn> {
 
   <h4 id=resource-metadata-management><span class=secno>3.1.3 </span><dfn>Resource metadata management</dfn></h4>
 
-  <dl class=domintro><dt><var title="">document</var> . <code title=dom-document-URL><a href=#dom-document-url>URL</a></code></dt>
-   <dd>
-    <p>Returns <a href="#the-document's-address">the document's address</a>.</p>
-   </dd>
-
-   <dt><var title="">document</var> . <code title=dom-document-referrer><a href=#dom-document-referrer>referrer</a></code></dt>
+  <dl class=domintro><dt><var title="">document</var> . <code title=dom-document-referrer><a href=#dom-document-referrer>referrer</a></code></dt>
    <dd>
     <p>Returns <a href="#the-document's-current-address" title="the document's current address">the
     address</a> of the <code><a href=#document>Document</a></code> from which the user
@@ -10020,9 +10019,6 @@ partial interface <dfn id=document>Document</dfn> {
 
   </dl><div class=impl>
 
-  <p>The <dfn id=dom-document-url title=dom-document-URL><code>URL</code></dfn>
-  attribute must return <a href="#the-document's-address">the document's address</a>.</p>
-
   <p>The <dfn id=dom-document-referrer title=dom-document-referrer><code>referrer</code></dfn> attribute
   must return either the <a href="#the-document's-current-address" title="the document's current
   address">current address</a> of the <a href=#active-document>active document</a>

diff --git a/source b/source
@@ -2869,6 +2869,11 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
     the number 23, for legacy reasons) and actually throw that object
     as an exception.</p>
 
+    <p>The <span title="concept-document-URL">URL</span> associated
+    with a <code>Document</code>, as defined in the DOM Core
+    specification, is referred to in this specification as <span>the
+    document's address</span>.</p>
+
     <p>The following features are defined in the DOM Events
     specification: <a href="#refsDOMEVENTS">[DOMEVENTS]</a></p>
 
@@ -10077,7 +10082,6 @@ interface <dfn>Transferable</dfn> { };</pre>
 partial interface <dfn>Document</dfn> {
   // <span>resource metadata management</span>
   [PutForwards=<span title="dom-location-href">href</span>] readonly attribute <span>Location</span>? <span title="dom-document-location">location</span>;
-  readonly attribute DOMString <span title="dom-document-URL">URL</span>;
            attribute DOMString <span title="dom-document-domain">domain</span>;
   readonly attribute DOMString <span title="dom-document-referrer">referrer</span>;
            attribute DOMString <span title="dom-document-cookie">cookie</span>;
@@ -10201,11 +10205,6 @@ partial interface <dfn>Document</dfn> {
 
   <dl class="domintro">
 
-   <dt><var title="">document</var> . <code title="dom-document-URL">URL</code></dt>
-   <dd>
-    <p>Returns <span>the document's address</span>.</p>
-   </dd>
-
    <dt><var title="">document</var> . <code title="dom-document-referrer">referrer</code></dt>
    <dd>
     <p>Returns <span title="the document's current address">the
@@ -10220,9 +10219,6 @@ partial interface <dfn>Document</dfn> {
 
   <div class="impl">
 
-  <p>The <dfn title="dom-document-URL"><code>URL</code></dfn>
-  attribute must return <span>the document's address</span>.</p>
-
   <p>The <dfn
   title="dom-document-referrer"><code>referrer</code></dfn> attribute
   must return either the <span title="the document's current