--- a/master/struct.html	Tue Jul 31 17:09:07 2012 +0900
+++ b/master/struct.html	Tue Jul 31 17:31:08 2012 +0900
@@ -274,8 +274,7 @@
         <span class="attr-name">'playbackOrder'</span> =
         <span class="attr-value">'forwardOnly'</span> that provides a mechanism
         for seeking backwards in time may result in undefined behavior or a
-        document that is
-        <a href="intro.html#TermInError"><span class="svg-term">in error</span></a>.
+        document that is in error.
       </p>
       <dl>
         <dt><span class="attr-value">'forwardOnly'</span></dt>
@@ -285,8 +284,7 @@
         <dd>Indicates that the document is authored appropriately for seeking in both directions.</dd>
       </dl>
       <p>
-        The <a href="intro.html#TermLacunaValue"><span class="svg-term">lacuna value</span></a>
-        is <span class="attr-value">'all'</span>.
+        The <a>lacuna value</a> is <span class="attr-value">'all'</span>.
       </p>
       <p class="anim-target"><a href="animate.html#Animatable">Animatable</a>: no.</p>
     </dd>
@@ -312,13 +310,12 @@
         <dd>
           The document's timeline starts the moment the
           <a href="interact.html#LoadEvent"><code>load</code></a> event for the
-          <a href="intro.html#TermRootmostSVGElement"><span class="svg-term">rootmost 'svg' element</span></a>
-          is triggered.
+          <a>rootmost 'svg' element</a> is triggered.
         </dd>
         <dt><span class="attr-value">'onStart'</span></dt>
         <dd>
           The document's timeline starts at the moment the
-          <a href="intro.html#TermRootmostSVGElement"><span class="svg-term">rootmost 'svg' element</span></a>'s
+          <a>rootmost 'svg' element</a>'s
           <em>start-tag</em>
           (<a href="http://www.w3.org/TR/2006/REC-xml-20060816/#sec-starttags">as defined in XML 1.0</a>
           ([<a href="refs.html#ref-XML10">XML10</a>], section 3.1),
@@ -328,8 +325,7 @@
         </dd>
       </dl>
       <p>
-        The <a href="intro.html#TermLacunaValue"><span class="svg-term">lacuna value</span></a>
-        is <span class="attr-value">'onLoad'</span>.
+        The <a>lacuna value</a> is <span class="attr-value">'onLoad'</span>.
       </p>
       <p class="anim-target"><a href="animate.html#Animatable">Animatable</a>: no.</p>
     </dd>
@@ -506,7 +502,8 @@
 <p>
   The <a href="#DiscardElement"><span class="element-name">'discard'</span></a>
   element allows authors to specify the time at which particular elements are to
-  be discarded, thereby reducing the resources required by an <a href="intro.html#TermSVGUserAgent"><span class="svg-term">SVG user agent</span></a>.
+  be discarded, thereby reducing the resources required by an <a>SVG user
+  agent</a>.
   This is particularly useful to help SVG viewers conserve memory while
   displaying long-running documents.  This element will not be processed by
   static SVG viewers.
@@ -528,17 +525,18 @@
     </dt>
     <dd>
       <p>
-        An <a href="linking.html#IRIReference"><span class="svg-term">IRI reference</span></a>
+        An <a>IRI reference</a>
         that identifies the <a href="animate.html#TargetElement">target element</a>
         to discard.  See the definition of
         <a href="animate.html#HrefAttribute"><span class="attr-name">'href'</span></a>
-        on <a href="intro.html#TermAnimationElement"><span class="svg-term">animation elements</span></a> for details on identifying a target element.
+        on <a>animation elements</a> for details on identifying a target
+        element.
       </p>
       <p>
         Note that if the target element is not part of the
-        <a href="intro.html#TermCurrentSVGDocumentFragment"><span class="svg-term">current SVG document fragment</span></a>
+        <a>current SVG document fragment</a>
         then whether the target element will be removed or not is defined by the
-        <a href="intro.html#TermHostLanguage"><span class="svg-term">host language</span></a>.
+        host language.
       </p>
       <p>
         If the <a href="#DiscardElementHrefAttribute"><span class="attr-name">'href'</span></a>
@@ -556,10 +554,10 @@
       <p>
         Indicates when the target element will be discarded.  See the definition
         of <a href="animate.html#BeginAttribute"><span class="attr-name">'begin'</span></a>
-        on <a href="intro.html#TermAnimationElement"><span class="svg-term">animation elements</span></a> for details.
+        on <a>animation elements</a> for details.
       </p>
       <p>
-        The <a href="intro.html#TermLacunaValue"><span class="svg-term">lacuna value</span></a>
+        The <a>lacuna value</a>
         is <span class="attr-value">'0s'</span>.  This indicates that
         the <a href="animate.html#TargetElement">target element</a> should be
         discarded immediately once the document begins.
@@ -575,14 +573,14 @@
   <a href="http://www.w3.org/TR/2005/REC-SMIL2-20051213/smil-timing.html#Timing-DefiningSimpleDur">simple duration</a>
   of <span class="attr-value">"indefinite"</span>.  As soon as the element's
   <a href="http://www.w3.org/TR/2005/REC-SMIL2-20051213/smil-timing.html#Timing-ComputingActiveDur">active duration</a>
-  starts, the <a href="intro.html#TermSVGUserAgent"><span class="svg-term">SVG user agent</span></a>
+  starts, the <a>SVG user agent</a>
   discards the element identified by the
   <a href="#DiscardElementHrefAttribute"><span class="attr-name">'href'</span></a>
   attribute ([<a href="refs.html#ref-SMIL21">SMIL21</a>], section 10.4.3).
   The removal operation acts as if the method
   <a href="svgudom.html#dom__Node_removeChild"><code>removeChild</code></a> were
   called on the parent of the target element with the target element as
-  parameter. The <a href="intro.html#TermSVGUserAgent"><span class="svg-term">SVG user agent</span></a>
+  parameter. The <a>SVG user agent</a>
   must remove the target node as well as all of its attributes and descendants.
 </p>
 <p>
@@ -591,8 +589,8 @@
   element is no longer useful. It must also be discarded following the
   target element removal. If the
   <a href="struct.html#DiscardElementHrefAttribute"><span class="attr-name">'xlink:href'</span></a>
-  attribute has an <a href="intro.html#TermInvalidIRIReference"><span class="svg-term">invalid
-    IRI reference</span></a> (the target element did not exist, for example),
+  attribute has an <a>invalid</a> IRI reference
+  (the target element did not exist, for example),
   the <a href="#DiscardElement"><span class="element-name">'discard'</span></a>
   element itself must still be removed following activation.
 </p>
@@ -609,7 +607,7 @@
   The <a href="#DiscardElement"><span class="element-name">'discard'</span></a>
   element itself can be discarded prior to its activation, in which case it will
   never trigger the removal of its own target element.
-  <a href="intro.html#TermSVGUserAgent"><span class="svg-term">SVG user agents</span></a>
+  <a>SVG user agents</a>
   must allow the <a href="#DiscardElement"><span class="element-name">'discard'</span></a>
   element to be the target of another
   <a href="#DiscardElement"><span class="element-name">'discard'</span></a>