[e] (0) Clarify how 'document's address' links to DOM

Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=24147 Affected topics: DOM APIs git-svn-id: http://svn.whatwg.org/webapps@8402 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jan 16, 2014 · 0bf89db · 0bf89db
1 parent d62d157
commit 0bf89db
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 25 deletions.
diff --git a/complete.html b/complete.html
@@ -3778,10 +3778,6 @@ <h4 id=dependencies><span class=secno>2.2.2 </span>Dependencies</h4>
     agent would construct a <code><a href=#domexception>DOMException</a></code> object whose type was the string "<code title="">TimeoutError</code>" (and whose code was 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 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>
 
     <ul class=brief><li><dfn id=mouseevent><code>MouseEvent</code></dfn> interface</li>
@@ -8499,10 +8495,12 @@ <h3 id=documents><span class=secno>3.1 </span>Documents</h3>
 
   <p>Every XML and HTML document in an HTML UA is represented by a <code><a href=#document>Document</a></code> object. <a href=#refsDOM>[DOM]</a></p>
 
-  <p><dfn id="the-document's-address">The document's address</dfn> is an <a href=#absolute-url>absolute URL</a> that is initially set when
-  the <code><a href=#document>Document</a></code> is created but that can change during the lifetime of the
-  <code><a href=#document>Document</a></code>, for example when the user <a href=#navigate title=navigate>navigates</a> to a
-  <a href=#scroll-to-fragid title=navigate-fragid>fragment identifier</a> on the page or when the <code title=dom-history-pushState><a href=#dom-history-pushstate>pushState()</a></code> method is called with a new <a href=#url>URL</a>.</p>
+  <p><dfn id="the-document's-address">The document's address</dfn> is the <i title=concept-document-URL>URL associated with a
+  <code><a href=#document>Document</a></code></i> (as defined in the DOM standard). It is initially set when the
+  <code><a href=#document>Document</a></code> is created, but that can change during the lifetime of the
+  <code><a href=#document>Document</a></code>; for example, it changes when the user <a href=#navigate title=navigate>navigates</a> to a <a href=#scroll-to-fragid title=navigate-fragid>fragment identifier</a>
+  on the page and when the <code title=dom-history-pushState><a href=#dom-history-pushstate>pushState()</a></code> method is called
+  with a new <a href=#url>URL</a>. <a href=#refsDOM>[DOM]</a></p>
   <!--
     http://www.hixie.ch/tests/adhoc/dom/level0/history/pushState/002/
     http://www.hixie.ch/tests/adhoc/html/navigation/fragids/016.html

diff --git a/index b/index
@@ -3778,10 +3778,6 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
     agent would construct a <code><a href=#domexception>DOMException</a></code> object whose type was the string "<code title="">TimeoutError</code>" (and whose code was 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 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>
 
     <ul class=brief><li><dfn id=mouseevent><code>MouseEvent</code></dfn> interface</li>
@@ -8499,10 +8495,12 @@ interface <dfn id=transferable>Transferable</dfn> { };
 
   <p>Every XML and HTML document in an HTML UA is represented by a <code><a href=#document>Document</a></code> object. <a href=#refsDOM>[DOM]</a></p>
 
-  <p><dfn id="the-document's-address">The document's address</dfn> is an <a href=#absolute-url>absolute URL</a> that is initially set when
-  the <code><a href=#document>Document</a></code> is created but that can change during the lifetime of the
-  <code><a href=#document>Document</a></code>, for example when the user <a href=#navigate title=navigate>navigates</a> to a
-  <a href=#scroll-to-fragid title=navigate-fragid>fragment identifier</a> on the page or when the <code title=dom-history-pushState><a href=#dom-history-pushstate>pushState()</a></code> method is called with a new <a href=#url>URL</a>.</p>
+  <p><dfn id="the-document's-address">The document's address</dfn> is the <i title=concept-document-URL>URL associated with a
+  <code><a href=#document>Document</a></code></i> (as defined in the DOM standard). It is initially set when the
+  <code><a href=#document>Document</a></code> is created, but that can change during the lifetime of the
+  <code><a href=#document>Document</a></code>; for example, it changes when the user <a href=#navigate title=navigate>navigates</a> to a <a href=#scroll-to-fragid title=navigate-fragid>fragment identifier</a>
+  on the page and when the <code title=dom-history-pushState><a href=#dom-history-pushstate>pushState()</a></code> method is called
+  with a new <a href=#url>URL</a>. <a href=#refsDOM>[DOM]</a></p>
   <!--
     http://www.hixie.ch/tests/adhoc/dom/level0/history/pushState/002/
     http://www.hixie.ch/tests/adhoc/html/navigation/fragids/016.html

diff --git a/source b/source
@@ -2527,10 +2527,6 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
     data-x="">TimeoutError</code>" (and whose code was the number 23, for legacy reasons) and
     actually throw that object as an exception.</p>
 
-    <p>The <span data-x="concept-document-URL">URL</span> associated with a <code>Document</code>, as
-    defined in the DOM 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>
 
@@ -8155,11 +8151,13 @@ interface <dfn>Transferable</dfn> { };
   <p>Every XML and HTML document in an HTML UA is represented by a <code>Document</code> object. <a
   href="#refsDOM">[DOM]</a></p>
 
-  <p><dfn>The document's address</dfn> is an <span>absolute URL</span> that is initially set when
-  the <code>Document</code> is created but that can change during the lifetime of the
-  <code>Document</code>, for example when the user <span data-x="navigate">navigates</span> to a
-  <span data-x="navigate-fragid">fragment identifier</span> on the page or when the <code
-  data-x="dom-history-pushState">pushState()</code> method is called with a new <span>URL</span>.</p>
+  <p><dfn>The document's address</dfn> is the <i data-x="concept-document-URL">URL associated with a
+  <code>Document</code></i> (as defined in the DOM standard). It is initially set when the
+  <code>Document</code> is created, but that can change during the lifetime of the
+  <code>Document</code>; for example, it changes when the user <span
+  data-x="navigate">navigates</span> to a <span data-x="navigate-fragid">fragment identifier</span>
+  on the page and when the <code data-x="dom-history-pushState">pushState()</code> method is called
+  with a new <span>URL</span>. <a href="#refsDOM">[DOM]</a></p>
   <!--
     http://www.hixie.ch/tests/adhoc/dom/level0/history/pushState/002/
     http://www.hixie.ch/tests/adhoc/html/navigation/fragids/016.html