--- a/spec/ttaf1-dfxp.xml	Mon Jun 01 21:48:06 2009 +0000
+++ b/spec/ttaf1-dfxp.xml	Mon Jun 01 21:55:34 2009 +0000
@@ -6,7 +6,7 @@
 <!ENTITY status SYSTEM "status.xml">
 <!ENTITY document.status "Editors' copy $Date$">
 <!ENTITY title "&title;">
-<!ENTITY prevloc "http://www.w3.org/TR/2006/CR-ttaf1-dfxp-20061116/">
+<!ENTITY prevloc "http://www.w3.org/TR/2009/WD-ttaf1-dfxp-20090602/">
 <!ENTITY versionOfTT "1.0">
 <!ENTITY tbd "<phrase role='tbd'>To Be Defined</phrase>">
 <!ENTITY sp "&#x0020;">
@@ -10412,10 +10412,10 @@
 (3) implements presentation semantics for the following features:</p>
 <ulist>
 <item><p><loc href="#content"><code>#content</code></loc></p></item>
-<item><p><loc href="#core"><code>#core</code></loc></p></item>
-<item><p><loc href="#profile"><code>#profile</code></loc></p></item>
-<item><p><loc href="#structure"><code>#structure</code></loc></p></item>
-<item><p><loc href="#time-offset"><code>#time-offset</code></loc></p></item>
+<item><p><loc href="#feature-core"><code>#core</code></loc></p></item>
+<item><p><loc href="#feature-profile"><code>#profile</code></loc></p></item>
+<item><p><loc href="#feature-structure"><code>#structure</code></loc></p></item>
+<item><p><loc href="#feature-time-offset"><code>#time-offset</code></loc></p></item>
 <item><p><loc href="#timing"><code>#timing</code></loc></p></item>
 </ulist>
 <p>
@@ -10899,10 +10899,10 @@
 (2) implements transformation semantics for the following features:</p>
 <ulist>
 <item><p><loc href="#content"><code>#content</code></loc></p></item>
-<item><p><loc href="#core"><code>#core</code></loc></p></item>
-<item><p><loc href="#profile"><code>#profile</code></loc></p></item>
-<item><p><loc href="#structure"><code>#structure</code></loc></p></item>
-<item><p><loc href="#time-offset"><code>#time-offset</code></loc></p></item>
+<item><p><loc href="#feature-core"><code>#core</code></loc></p></item>
+<item><p><loc href="#feature-profile"><code>#profile</code></loc></p></item>
+<item><p><loc href="#feature-structure"><code>#structure</code></loc></p></item>
+<item><p><loc href="#feature-time-offset"><code>#time-offset</code></loc></p></item>
 <item><p><loc href="#timing"><code>#timing</code></loc></p></item>
 </ulist>
 </div3>
@@ -12040,7 +12040,7 @@
 <titleref
 href="http://www.w3.org/2001/tag/doc/namespaceState-2006-01-09.html">The Disposition
 of Names in an XML Namespace</titleref>, TAG Finding, 9 January 2006. (See
-<xspecref href="http://www.w3.org/2001/tag/doc/namespaceState-2006-01-09.html">http://www.w3.org/tag/doc/namespaceState-2006-01-09</xspecref>.)
+<xspecref href="http://www.w3.org/2001/tag/doc/namespaceState-2006-01-09.html">http://www.w3.org/2001/tag/doc/namespaceState-2006-01-09</xspecref>.)
 </bibl>
 <bibl id="qaf-sg" key="QAF SG">Karl Dubost, et al.,
 <titleref