Replace all manual links to #Terms with <a>term</a> shorthands.
authorCameron McCormack <cam@mcc.id.au>
Thu, 10 May 2012 11:54:52 +0200
changeset 63 d8fd4e78da6f
parent 62 2b88abf7bc98
child 64 406ba8599f43
Replace all manual links to #Terms with <a>term</a> shorthands.
master/animate.html
master/coords.html
master/definitions.xml
master/interact.html
master/intro.html
master/linking.html
master/masking.html
master/painting.html
master/propidx.html
master/pservers.html
master/shapes.html
master/struct.html
master/styling.html
master/text.html
--- a/master/animate.html	Thu May 10 11:27:20 2012 +0200
+++ b/master/animate.html	Thu May 10 11:54:52 2012 +0200
@@ -283,12 +283,11 @@
         <dt id="HrefAttribute"><span class="adef">xlink:href</span> = "<span
         class="attr-value"><a
         href="types.html#DataTypeIRI">&lt;iri&gt;</a></span>"</dt>
-        <dd><p>An <a href="intro.html#TermIRIReference">IRI
+        <dd><p>An <a>IRI
         reference</a> to the element which is the target of this
         animation and which therefore will be modified over
         time.</p>
-        <p>The target element must be part of the <a
-        href="intro.html#TermCurrentSVGDocumentFragment">current
+        <p>The target element must be part of the <a>current
         SVG document fragment</a>.</p>
         <p>&lt;iri&gt; must point to exactly one target element which
         is capable of being the target of the given animation. If
@@ -525,7 +524,7 @@
       If <span class='attr-value'>calcMode="paced"</span> is used on an
       animation of an attribute or property whose type is not one of
       those listed above, the animation effect is undefined.
-      <a href="intro.html#TermSVGUserAgent"><span class='svg-term'>SVG user agents</span></a> may choose to
+      <a>SVG user agents</a> may choose to
       perform the animation as if <span class='attr-value'>calcMode="linear"</span>,
       but this is not required.  Authors are recommended not to specify
       paced animation on types not listed above.
@@ -1604,7 +1603,7 @@
         class="adef">xlink:href</span> = "<span
         class="attr-value"><a
         href="types.html#DataTypeIRI">&lt;iri&gt;</a></span>"</dt>
-        <dd>An <a href="intro.html#TermIRIReference">IRI
+        <dd>An <a>IRI
         reference</a> to the <a>'path element'</a> element which
         defines the motion path.<br />
          <span class="anim-target"><a
--- a/master/coords.html	Thu May 10 11:27:20 2012 +0200
+++ b/master/coords.html	Thu May 10 11:54:52 2012 +0200
@@ -129,8 +129,7 @@
     establishes the viewport's height.</p>
     <p>If the <a>'svg/width'</a> or <a>'svg/height'</a>
      attributes on the <a>outermost svg element</a>
-    are in <a
-    href="intro.html#TermUserUnits">user units</a> (i.e., no unit
+    are in <a>user units</a> (i.e., no unit
     identifier has been provided), then the value is assumed to be
     equivalent to the same number of "px" units (see <a
     href="coords.html#Units">Units</a>).</p>
@@ -1224,8 +1223,7 @@
     </table>
     <p>In the discussion that follows, the term <em>applicable element</em>
     is the element to which the given effect applies. For gradients and
-    patterns, the applicable element is the <a
-    href="intro.html#TermGraphicsElement">graphics element</a>
+    patterns, the applicable element is the <a>graphics element</a>
     which has its <a>'fill'</a> or <a>'stroke'</a> property referencing the
     given gradient or pattern. (See <a
     href="painting.html#InheritanceOfPaintingProperties">Inheritance
@@ -1233,10 +1231,8 @@
     href="text.html">text elements</a>, see the discussion of <a
     href="text.html#ObjectBoundingBoxUnitsTextObjects">object
     bounding box units and text elements</a>.) For clipping paths,
-    masks and filters, the applicable element can be either a <a
-    href="intro.html#TermContainerElement">container element</a> or
-    a <a href="intro.html#TermGraphicsElement">graphics
-    element</a>.</p>
+    masks and filters, the applicable element can be either a
+    <a>container element</a> or a <a>graphics element</a>.</p>
     <p>When keyword <span
     class="attr-value">objectBoundingBox</span> is used, then the
     effect is as if a supplemental transformation matrix were
@@ -1305,7 +1301,7 @@
 <h2 id="IntrinsicSizing">Intrinsic sizing properties of the viewport of SVG content</h2>
 <p>SVG needs to specify how to calculate some intrinsic sizing properties  to
 enable inclusion within other languages. The intrinsic width and height
-of the <a href="intro.html#TermViewport"><span class="svg-term">viewport</span></a> of SVG content must be determined from the <a href="struct.html#SVGElementWidthAttribute"><span class="attr-name">'width'</span></a> and <a href="struct.html#SVGElementHeightAttribute"><span
+of the <a>viewport</a> of SVG content must be determined from the <a href="struct.html#SVGElementWidthAttribute"><span class="attr-name">'width'</span></a> and <a href="struct.html#SVGElementHeightAttribute"><span
 class="attr-name">'height'</span></a>
     attributes. If either of these are not specified, a
     value of <span class="attr-value">'100%'</span> must
@@ -1314,7 +1310,7 @@
  attributes are <em>not the same</em> as the CSS width and height properties. Specifically, percentage values <em>do not
 provide an intrinsic width or height, and do not indicate a percentage of the containing block</em>. Rather, once the viewport is established, they indicate the portion of the viewport that is actually covered by image data.</p>
 
-<p>The intrinsic aspect ratio of the <a href="intro.html#TermViewport"><span class="svg-term">viewport</span></a> of SVG content is necessary
+<p>The intrinsic aspect ratio of the <a>viewport</a> of SVG content is necessary
 for example, when including SVG from an <span class="element-name">'object'</span> element in HTML styled with
 CSS.  It is possible (indeed, common) for an SVG graphic to have an intrinsic aspect ratio but not to have an intrinsic width or height.
 The intrinsic aspect ratio must be calculated based upon the
@@ -1323,14 +1319,14 @@
 <li><p>The aspect ratio is calculated by dividing a width by a height.</p></li>
 <li><p>If the <a href="struct.html#SVGElementWidthAttribute"><span class="attr-name">'width'</span></a> and <a href="struct.html#SVGElementHeightAttribute"><span
 class="attr-name">'height'</span></a> of the <a>rootmost 'svg' element</a> are both specified with 
-unit identifiers (in, mm, cm, pt, pc, px, em, ex) or in <a href="intro.html#TermUserUnits"><span class="svg-term">user units</span></a>, then the aspect ratio is
+unit identifiers (in, mm, cm, pt, pc, px, em, ex) or in <a>user units</a>, then the aspect ratio is
 calculated from the <a href="struct.html#SVGElementWidthAttribute"><span class="attr-name">'width'</span></a> and <a href="struct.html#SVGElementHeightAttribute"><span
 class="attr-name">'height'</span></a> attributes after resolving both values to user units.</p></li>
 <li><p>If either/both of the <a href="struct.html#SVGElementWidthAttribute"><span class="attr-name">'width'</span></a> and <a href="struct.html#SVGElementHeightAttribute"><span
 class="attr-name">'height'</span></a> of the <a>rootmost 'svg' element</a> are in
 percentage units (or omitted), the aspect ratio is calculated from the width and
 height values of the <a href="coords.html#ViewBoxAttribute"><span
-    class="attr-name">'viewBox'</span></a> specified for the <a href="intro.html#TermCurrentSVGDocumentFragment"><span class="svg-term">current SVG document fragment</span></a>. If the <a href="coords.html#ViewBoxAttribute"><span
+    class="attr-name">'viewBox'</span></a> specified for the <a>current SVG document fragment</a>. If the <a href="coords.html#ViewBoxAttribute"><span
     class="attr-name">'viewBox'</span></a> is not correctly specified, or set to <span class="attr-value">'none'</span>,
 the intrinsic aspect ratio cannot be calculated and is considered unspecified.</p></li>
 </ul>
@@ -1350,7 +1346,7 @@
 </div>
 </div>
 
-<p>In this example the intrinsic aspect ratio of the <a href="intro.html#TermViewport"><span class="svg-term">viewport</span></a> is 2:1. The
+<p>In this example the intrinsic aspect ratio of the <a>viewport</a> is 2:1. The
 intrinsic width is 10cm and the intrinsic height is 5cm.</p>
 
 <div class="example">
@@ -1366,7 +1362,7 @@
 </div>
 </div>
 
-<p>In this example the intrinsic aspect ratio of the rootmost <a href="intro.html#TermViewport"><span class="svg-term">viewport</span></a> is
+<p>In this example the intrinsic aspect ratio of the rootmost <a>viewport</a> is
 1:1. An aspect ratio calculation in this case allows embedding in an
 object within a containing block that is only constrained in one direction.</p>
 
--- a/master/definitions.xml	Thu May 10 11:27:20 2012 +0200
+++ b/master/definitions.xml	Thu May 10 11:54:52 2012 +0200
@@ -1531,6 +1531,8 @@
   <term name='basic shapes' href='intro.html#TermBasicShapeElement'/>
   <term name='descriptive element' href='intro.html#TermDescriptiveElement'/>
   <term name='descriptive elements' href='intro.html#TermDescriptiveElement'/>
+  <term name='filter primitive' href='intro.html#TermFilterPrimitiveElement'/>
+  <term name='filter primitives' href='intro.html#TermFilterPrimitiveElement'/>
   <term name='filter primitive element' href='intro.html#TermFilterPrimitiveElement'/>
   <term name='filter primitive elements' href='intro.html#TermFilterPrimitiveElement'/>
   <term name='fill' href='intro.html#TermFill'/>
@@ -1550,8 +1552,7 @@
   <term name='stroke' href='intro.html#TermStroke'/>
   <term name='stroked' href='intro.html#TermStroke'/>
   <term name='structural elements' href='intro.html#TermStructuralElement'/>
-  <term name='SVG canvas' href='intro.html#TermSVGCanvas'/>
-  <term name='SVG viewport' href='intro.html#TermSVGViewport'/>
+  <term name='text content block element' href='intro.html#TermTextContentBlockElement'/>
   <term name='text content element' href='intro.html#TermTextContentElement'/>
   <term name='text content elements' href='intro.html#TermTextContentElement'/>
   <term name='text content child element' href='intro.html#TermTextContentChildElement'/>
@@ -1584,6 +1585,7 @@
   <term name='properties' href='intro.html#TermProperty'/>
   <!-- ... references ... -->
   <term name='IRI' href='intro.html#TermIRIReference'/>
+  <term name='IRIs' href='intro.html#TermIRIReference'/>
   <term name='IRI reference' href='intro.html#TermIRIReference'/>
   <term name='IRI references' href='intro.html#TermIRIReference'/>
   <term name='local IRI reference' href='intro.html#TermLocalIRIReference'/>
@@ -1592,8 +1594,11 @@
   <term name='non-local IRI references' href='intro.html#TermNonLocalIRIReference'/>
   <!-- ... other, defined in intro.html ... -->
   <term name='bounding box' href='intro.html#TermBoundingBox'/>
+  <term name='canvas' href='intro.html#TermCanvas'/>
+  <term name='current SVG document fragment' href='intro.html#TermCurrentSVGDocumentFragment'/>
   <term name='CTM' href='intro.html#TermCTM'/>
   <term name='current transformation matrix' href='intro.html#TermCurrentTransformationMatrix'/>
+  <term name='font' href='intro.html#TermFont'/>
   <term name='glyph' href='intro.html#TermGlyph'/>
   <term name='glyphs' href='intro.html#TermGlyph'/>
   <term name='hit-test' href='intro.html#TermHitTesting'/>
@@ -1601,12 +1606,17 @@
   <term name='Lacuna value' href='intro.html#TermLacunaValue'/>
   <term name='Paint' href='intro.html#TermPaint'/>
   <term name='paint' href='intro.html#TermPaint'/>
+  <term name='painting' href='intro.html#TermPaint'/>
+  <term name='SVG canvas' href='intro.html#TermSVGCanvas'/>
+  <term name='SVG context' href='intro.html#TermSVGContext'/>
   <term name='SVG document' href='intro.html#TermSVGDocumentFragment'/>
   <term name='SVG documents' href='intro.html#TermSVGDocumentFragment'/>
   <term name='SVG document fragment' href='intro.html#TermSVGDocumentFragment'/>
   <term name='SVG document fragments' href='intro.html#TermSVGDocumentFragment'/>
   <term name='SVG user agent' href='intro.html#TermUserAgent'/>
   <term name='SVG user agents' href='intro.html#TermUserAgent'/>
+  <term name='SVG canvas' href='intro.html#TermSVGCanvas'/>
+  <term name='SVG viewport' href='intro.html#TermSVGViewport'/>
   <term name='transformation' href='intro.html#TermTransformation'/>
   <term name='transformations' href='intro.html#TermTransformation'/>
   <term name='transformation matrix' href='intro.html#TermTransformationMatrix'/>
@@ -1614,7 +1624,8 @@
   <term name='user agent' href='intro.html#TermUserAgent'/>
   <term name='user agents' href='intro.html#TermUserAgent'/>
   <term name='user coordinate system' href='intro.html#TermUserCoordinateSystem'/>
-  <term name='user space' href='intro.html#TermViewportSpace'/>
+  <term name='user space' href='intro.html#TermUserSpace'/>
+  <term name='user units' href='intro.html#TermUserUnits'/>
   <term name='viewport' href='intro.html#TermViewport'/>
   <term name='viewport coordinate system' href='intro.html#TermViewportCoordinateSystem'/>
   <term name='viewport space' href='intro.html#TermViewportSpace'/>
--- a/master/interact.html	Thu May 10 11:27:20 2012 +0200
+++ b/master/interact.html	Thu May 10 11:54:52 2012 +0200
@@ -709,8 +709,7 @@
             </tr>
             <tr>
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermGraphicsElement">graphics
-              elements</a></td>
+              <td><a>graphics elements</a></td>
             </tr>
             <tr>
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -1038,11 +1037,8 @@
             </tr>
             <tr>
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a
-              href="intro.html#TermContainerElement">container
-              elements</a> and <a
-              href="intro.html#TermGraphicsElement">graphics
-              elements</a></td>
+              <td><a>container elements</a> and
+	      <a>graphics elements</a></td>
             </tr>
             <tr>
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
--- a/master/intro.html	Thu May 10 11:27:20 2012 +0200
+++ b/master/intro.html	Thu May 10 11:54:52 2012 +0200
@@ -277,7 +277,7 @@
 
   <dt id="TermClippingPath">clipping path</dt>
   <dd>A combination of <a>'path'</a>, <a>'text'</a>
-  and <a href="#TermBasicShape">basic shapes</a> which serve as the
+  and <a>basic shapes</a> which serve as the
   outline of a (in the absence of anti-aliasing) 1-bit mask,
   where everything on the "inside" of the outline is allowed to
   show through but everything on the outside is masked out. See
@@ -341,9 +341,8 @@
   is specified.  See <a href="script.html#EventAttributes">Event attributes</a>.</dd>
 
   <dt id="TermFill">fill</dt>
-  <dd>The operation of <a
-  href="intro.html#TermPaint">painting</a> the interior of a <a
-  href="intro.html#TermShape">shape</a> or the interior of the
+  <dd>The operation of <a>painting</a> the interior of a
+  <a>shape</a> or the interior of the
   character glyphs in a text string.</dd>
 
   <dt id="TermFilterPrimitiveAttributes">filter primitive attributes</dt>
@@ -359,8 +358,8 @@
   <edit:elementcategory name='filter primitive'/>.</dd>
 
   <dt id="TermFont">font</dt>
-  <dd>A font represents an organized collection of <a
-  href="intro.html#TermGlyph">glyphs</a> in which the various
+  <dd>A font represents an organized collection of <a>glyphs</a>
+  in which the various
   glyph representations will share a common look or styling
   such that, when a string of characters is rendered together,
   the result is highly legible, conveys a particular artistic
@@ -368,15 +367,15 @@
   spacing.</dd>
 
   <dt id="TermGlyph">glyph</dt>
-  <dd>A glyph represents a unit of rendered content within a <a
-  href="intro.html#TermFont">font</a>. Often, there is a
+  <dd>A glyph represents a unit of rendered content within a
+  <a>font</a>. Often, there is a
   one-to-one correspondence between characters to be drawn and
   corresponding glyphs (e.g., often, the character "A" is
   rendered using a single glyph), but other times multiple
   glyphs are used to render a single character (e.g., use of
   accents) or a single glyph can be used to render multiple
   characters (e.g., ligatures). Typically, a glyph is defined
-  by one or more <a href="intro.html#TermShape">shapes</a> such
+  by one or more <a>shapes</a> such
   as a <a href="paths.html">path</a>, possibly with additional
   information such as rendering hints that help a font engine
   to produce legible text in small sizes.</dd>
@@ -447,8 +446,8 @@
   <span class="element-name">'defs'</span> element</a>.</dd>
 
   <dt id="TermMask">mask</dt>
-  <dd>A <a href="intro.html#TermContainerElement">container element</a>
-  which can contain <a href="intro.html#TermGraphicsElement">graphics elements</a>
+  <dd>A <a>container element</a>
+  which can contain <a>graphics elements</a>
   or other container elements which define a set of graphics
   that is to be used as a semi-transparent mask for compositing
   foreground objects into the current background. See <a
@@ -465,7 +464,7 @@
 
   <dt id="TermOutermostSVGElement">outermost svg element</dt>
   <dd>The furthest <a>'svg'</a> ancestor element that remains in the
-  <a href="#TermCurrentSVGDocumentFragment">current SVG document fragment</a>.</dd>
+  <a>current SVG document fragment</a>.</dd>
 
   <dt id="TermPaint">paint</dt>
   <dd>A paint represents a way of putting color values onto the
@@ -488,7 +487,7 @@
 
   <dt id="TermPresentationAttribute">presentation attribute</dt>
   <dd>An XML attribute on an SVG element which specifies a
-  value for a given <a href="intro.html#TermProperty">property</a>
+  value for a given <a>property</a>
   for that element. See <a href="styling.html">Styling</a>. Note that
   although any property may be <em>specified</em> on any element,
   not all properties will <em>apply to</em> (affect the rendering of)
@@ -500,7 +499,7 @@
   rendered. A complete list of SVG's properties can be found in
   <a href="propidx.html">Property Index</a>. Properties are
   assigned to elements in the SVG language either by
-  <a href="intro.html#TermPresentationAttribute">presentation attributes</a>
+  <a>presentation attributes</a>
   on elements in the SVG language or by using a styling language such as CSS
   [<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/">CSS2</a>]. See
   <a href="styling.html">Styling</a>.</dd>
@@ -508,8 +507,8 @@
   <dt id="TermRootmostSVGElement">rootmost <span class="element-name">'svg'</span> element</dt>
   <dd>The rootmost <a>'svg'</a> element is the furthest
   <a>'svg'</a> ancestor element that does not exit an
-  <a href="intro.html#TermSVGContext"><span class="svg-term">SVG context</span></a>.
-  See also <a href="intro.html#TermSVGDocumentFragment"><span class="svg-term">SVG document fragment</span></a>.</dd>
+  <a>SVG context</a>.
+  See also <a>SVG document fragment</a>.</dd>
 
   <dt id="TermShapeElement">shape</dt>
   <dd>A graphics element that is defined by some combination of
@@ -523,8 +522,8 @@
   <a>'polygon'</a>.</dd>
 
   <dt id="TermStroke">stroke</dt>
-  <dd>The operation of <a href="intro.html#TermPaint">painting</a> the outline
-  of a <a href="intro.html#TermShape">shape</a> or the outline of
+  <dd>The operation of <a>painting</a> the outline
+  of a <a>shape</a> or the outline of
   character glyphs in a text string.</dd>
 
   <dt id="TermStructuralElement">structural element</dt>
@@ -534,7 +533,7 @@
   <edit:elementcategory name='structural'/>.</dd>
 
   <dt id="TermSVGCanvas">SVG canvas</dt>
-  <dd>The <a href="#TermCanvas">canvas</a> onto which the SVG
+  <dd>The <a>canvas</a> onto which the SVG
   content is rendered. See the discussion of the
   <a href="coords.html#SVGCanvas">SVG canvas</a> in the chapter on
   <a href="coords.html">Coordinate Systems, Transformations and Units</a>.</dd>
@@ -543,7 +542,7 @@
   <dd>
     <p>An SVG context is a document fragment where all elements within the
     fragment must be subject to processing by an
-    <a href="intro.html#TermSVGUserAgent"><span class="svg-term">SVG user agent</span></a> according
+    <a>SVG user agent</a> according
     to the rules in this specification.</p>
 
     <p>If SVG content is embedded inline within parent XML (such as XHTML),
@@ -567,10 +566,10 @@
   render SVG content.</dd>
 
   <dt id="TermSVGViewport">SVG viewport</dt>
-  <dd>The <a href="#TermViewport">viewport</a> within the
-  <a href="#TermSVGCanvas">SVG canvas</a> which defines the rectangular region
+  <dd>The <a>viewport</a> within the
+  <a>SVG canvas</a> which defines the rectangular region
   into which SVG content is rendered. See the discussion of the
-  <a href="coords.html#SVGViewport">SVG viewport</a> in the chapter on
+  <a>SVG viewport</a> in the chapter on
   <a href="coords.html">Coordinate Systems, Transformations and Units</a>.</dd>
 
   <dt id="TermTextContentElement">text content element</dt>
@@ -592,18 +591,13 @@
   <!--SVG Tiny 1.2 defines two text content block elements:
     <a href="text.html#TextElement"><span class="element-name">'text'</span></a>
     and <a href="text.html#TextAreaElement"><span class="element-name">'textArea'</span></a>-->
-  <p class='issue'>SVG Tiny 1.2 defined the "text content block element" category
-  to mean <a>'text'</a> and <span class='element-name'>textArea</span> elements.
-  Since we won't be adding <span class='element-name'>textArea</span> to SVG 2.0,
-  perhaps this definition can be removed.</p>
-  <edit:elementcategory name='text block'/></dd>
+  SVG 2.0 defines a single text content block element: <a>'text'</a>.</dd>
 
   <dt id="TermTransformation">transformation</dt>
-  <dd>A modification of the <a href="#TermCurrentTransformationMatrix">current
-  transformation matrix (CTM)</a> by providing a supplemental
+  <dd>A modification of the <a>current transformation matrix</a> by providing a supplemental
   transformation in the form of a set of simple transformations
   specifications (such as scaling, rotation or translation)
-  and/or one or more <a href="#TermTransformationMatrix">transformation matrices</a>.
+  and/or one or more <a>transformation matrices</a>.
   See <a href="coords.html#EstablishingANewUserSpace">Coordinate system
   transformations</a>.</dd>
 
@@ -611,7 +605,7 @@
   <dd>Transformation matrices define the mathematical mapping
   from one coordinate system into another using a 3x3 matrix
   using the equation <span class="code-fragment">[x' y' 1] = [x y 1] * matrix</span>.
-  See <a href="#TermCurrentTransformationMatrix">current transformation matrix (CTM)</a>
+  See <a>current transformation matrix</a>
   and <a href="coords.html#EstablishingANewUserSpace">Coordinate system transformations</a>.</dd>
 
   <dt id="TermUserAgent">user agent</dt>
@@ -635,57 +629,54 @@
 
   <dt id="TermUserCoordinateSystem">user coordinate system</dt>
   <dd>In general, a coordinate system defines locations and
-  distances on the current <a href="#TermCanvas">canvas</a>.
+  distances on the current <a>canvas</a>.
   The current user coordinate system is the coordinate system that is currently
   active and which is used to define how coordinates and
   lengths are located and computed, respectively, on the
-  current <a href="#TermCanvas">canvas</a>. See
+  current <a>canvas</a>. See
   <a href="coords.html#SVGInitialUserCoordinateSystem">initial user coordinate
   system</a> and <a href="coords.html#EstablishingANewUserSpace">Coordinate
   system transformations</a>.</dd>
 
   <dt id="TermUserSpace">user space</dt>
-  <dd>A synonym for <a href="#TermUserCoordinateSystem">user coordinate system</a>.</dd>
+  <dd>A synonym for <a>user coordinate system</a>.</dd>
 
   <dt id="TermUserUnits">user units</dt>
   <dd>A coordinate value or length expressed in user units
   represents a coordinate value or length in the current
-  <a href="#TermUserCoordinateSystem">user coordinate system</a>.
+  <a>user coordinate system</a>.
   Thus, 10 user units represents a length of 10 units in the
   current user coordinate system.</dd>
 
   <dt id="TermViewport">viewport</dt>
   <dd>A rectangular region within the current
-  <a href="#TermCanvas">canvas</a> onto which <a
-  href="#TermGraphicsElement">graphics elements</a> are to be
+  <a>canvas</a> onto which <a>graphics elements</a> are to be
   rendered. See the discussion of the
-  <a href="coords.html#SVGViewport">SVG viewport</a> in the
+  <a>SVG viewport</a> in the
   chapter on <a href="coords.html">Coordinate Systems,
   Transformations and Units</a>.</dd>
 
   <dt id="TermViewportCoordinateSystem">viewport coordinate system</dt>
   <dd>In general, a coordinate system defines locations and
-  distances on the current <a href="#TermCanvas">canvas</a>.
+  distances on the current <a>canvas</a>.
   The viewport coordinate system is the coordinate system that is active at the
   start of processing of an <a>'svg'</a> element, before
   processing the optional <a>'viewBox'</a> attribute. In the
   case of an SVG document fragment that is embedded within a
   parent document which uses CSS to manage its layout, then the
   viewport coordinate system will have the same orientation and
-  lengths as in CSS, with the origin at the top-left on the <a
-  href="#TermViewport">viewport</a>. See
-  <a href="coords.html#ViewportSpace">The initial viewport</a> and
+  lengths as in CSS, with the origin at the top-left on the
+  <a>viewport</a>. See <a href="coords.html#ViewportSpace">The initial viewport</a> and
   <a href="coords.html#EstablishingANewViewport">Establishing a
   new viewport</a>.</dd>
 
   <dt id="TermViewportSpace">viewport space</dt>
-  <dd>A synonym for <a href="#TermViewportCoordinateSystem">viewport coordinate
-  system</a>.</dd>
+  <dd>A synonym for <a>viewport coordinate system</a>.</dd>
 
   <dt id="TermViewportUnits">viewport units</dt>
   <dd>A coordinate value or length expressed in viewport units
   represents a coordinate value or length in the
-  <a href="#TermViewportCoordinateSystem">viewport coordinate system</a>.
+  <a>viewport coordinate system</a>.
   Thus, 10 viewport units represents a length of 10 units in the viewport
   coordinate system.</dd>
 
--- a/master/linking.html	Thu May 10 11:27:20 2012 +0200
+++ b/master/linking.html	Thu May 10 11:54:52 2012 +0200
@@ -17,19 +17,19 @@
     <h2 id="IRIReference">References</h2>
     <h3 id="HeadOverview">Overview</h3>
 
-    <p>On the Internet, resources are identified using <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a>s
+    <p>On the Internet, resources are identified using <a>IRIs</a>
     (Internationalized Resource Identifiers). For
     example, an SVG file called someDrawing.svg located at
-    http://example.com might have the following <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a>:</p>
+    http://example.com might have the following <a>IRI</a>:</p>
 <pre>
 http://example.com/someDrawing.svg
 </pre>
-    <p>An <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> can also address a particular element within an XML
-    document by including an <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> fragment
-    identifier as part of the <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a>. An <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> which includes an
-    <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> fragment identifier consists of an optional base <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a>, followed by a "#" character,
-    followed by the <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> fragment identifier. For example, the
-    following <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> can be used to specify the element whose ID is
+    <p>An <a>IRI</a> can also address a particular element within an XML
+    document by including an <a>IRI</a> fragment
+    identifier as part of the <a>IRI</a>. An <a>IRI</a> which includes an
+    <a>IRI</a> fragment identifier consists of an optional base <a>IRI</a>, followed by a "#" character,
+    followed by the <a>IRI</a> fragment identifier. For example, the
+    following <a>IRI</a> can be used to specify the element whose ID is
     "Lamppost" within file someDrawing.svg:</p>
 <pre>
 http://example.com/someDrawing.svg#Lamppost
@@ -53,26 +53,26 @@
 
     <h3 id="IRIandURI">IRIs and URIs</h3>
     <p>Internationalized
-      Resource Identifiers (<a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a>s) are a more generalized complement to Uniform Resource
-      Identifiers (URIs). An <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> is a sequence of characters from the
+      Resource Identifiers (<a>IRIs</a>) are a more generalized complement to Uniform Resource
+      Identifiers (URIs). An <a>IRI</a> is a sequence of characters from the
       Universal Character Set [<a href="refs.html#ref-UNICODE">UNICODE</a>].  A URI is constructed from a much
-      more restricted set of characters. All URIs are already conformant <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a>s. A mapping from <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a>s to
-      URIs is defined by the <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> specification, which means that IRIs can be used instead of URIs
-      in XML documents,  to identify resources. <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a>s can be converted to URIs for resolution
-      on a network, if the protocol does not support <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a>s directly.</p>
+      more restricted set of characters. All URIs are already conformant <a>IRIs</a>. A mapping from <a>IRIs</a> to
+      URIs is defined by the <a>IRI</a> specification, which means that IRIs can be used instead of URIs
+      in XML documents,  to identify resources. <a>IRIs</a> can be converted to URIs for resolution
+      on a network, if the protocol does not support <a>IRIs</a> directly.</p>
     <p>Previous versions of SVG, following XLink, defined an IRI reference type
       as a URI <em>or as a sequence of characters which must result in an IRI after a
         particular escaping procedure was applied</em>. The escaping procedure was repeated in the
       XLink 1.0 specification [<a href="refs.html#ref-XLINK">XLINK</a>], and in the W3C
       XML Schema Part 2: Datatypes specification [<a href="refs.html#ref-SCHEMA2">SCHEMA2</a>]. This copying introduced the
-      possibility of error and divergence, but was done because the <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> specification was not
+      possibility of error and divergence, but was done because the <a>IRI</a> specification was not
       yet standardized.</p>
-    <p>In this specification, the correct term <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> is used for this "URI or sequence of characters
+    <p>In this specification, the correct term <a>IRI</a> is used for this "URI or sequence of characters
       plus an algorithm" and the escaping method, which turns IRIs into URIs, is defined by reference to the <a href="http://www.ietf.org/rfc/rfc3987.txt">IRI
         specification</a> [<a href="refs.html#ref-RFC3987">RFC3987</a>], which
       has since become an IETF Proposed Standard. Other W3C
       specifications are expected to be revised over time to remove these duplicate
-      descriptions of the escaping procedure and to refer to <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> directly.</p>
+      descriptions of the escaping procedure and to refer to <a>IRI</a> directly.</p>
 
     <h3 id="IRIforms">Syntactic forms: IRI and FuncIRI</h3>
     
@@ -83,10 +83,10 @@
      .</p>
     
 
-    <p>SVG makes extensive use of <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a>
+    <p>SVG makes extensive use of <a>IRI</a>
       references, both absolute and relative, to other
-      objects. For example, to <a href="intro.html#TermFill"><span class="svg-term">fill</span></a> a rectangle with a linear
-      gradient, you first define a <a href="pservers.html#LinearGradients"><span class="element-name">'linearGradient'</span></a> element and give
+      objects. For example, to <a>fill</a> a rectangle with a linear
+      gradient, you first define a <a>'linearGradient'</a> element and give
       it an ID, as in:</p>
     <edit:example href="images/linking/05_07.xml" image="no" link="no">
     </edit:example><p>You then reference the linear gradient as the value of the
@@ -212,7 +212,7 @@
 
 <h3 id="xlinkRefAttrs">IRI reference attributes</h3>
 
-    <p id="xlinkRefAttrsEmbed"><a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> references are normally specified with an <span
+    <p id="xlinkRefAttrsEmbed"><a>IRI references</a> are normally specified with an <span
       class="attr-name">'href'</span> attribute in the XLink [<a
         href="http://www.w3.org/TR/xlink/">XLink</a>] namespace. For example,
       if the
@@ -225,15 +225,15 @@
       attribute must be an <a href="types.html#DataTypeIRI"><span 
         class="svg-term">Internationalized Resource Identifier</span></a>.</p>
 
-    <p>If the protocol, such as HTTP, does not support <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a>s directly,
-      the <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> is converted to a URI by the SVG implementation, as described
+    <p>If the protocol, such as HTTP, does not support <a>IRIs</a> directly,
+      the <a>IRI</a> is converted to a URI by the SVG implementation, as described
       in section 3.1 of the <a href="http://www.ietf.org/rfc/rfc3987.txt">IRI specification</a> [<a href="refs.html#ref-RFC3987">RFC3987</a>.</p>
     <p>Because it is impractical for any application to check that
-      a value is an <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> reference, this specification follows the lead
+      a value is an <a>IRI reference</a>, this specification follows the lead
       of the <a href="http://www.ietf.org/rfc/rfc3986.txt">IRI Specification</a>
       in this matter and imposes no such conformance testing
       requirement on SVG applications.</p>
-    <p>If the <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> reference is relative, its absolute version must be computed by the method described in
+    <p>If the <a>IRI reference</a> is relative, its absolute version must be computed by the method described in
       <a href="http://www.w3.org/TR/xmlbase/">XML Base</a> before use [<a href="refs.html#ref-XML-BASE">XML-BASE</a>].</p>
 
     <div class="adef-list">
@@ -257,12 +257,12 @@
             class="adef">xlink:role</span> = "<span
               class="attr-value"><a
                 href="types.html#DataTypeIRI">&lt;IRI&gt;</a></span>"</dt>
-        <dd><p>An optional <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> reference that identifies some resource that describes
-          the intended property. The value must be an <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> reference as
+        <dd><p>An optional <a>IRI reference</a> that identifies some resource that describes
+          the intended property. The value must be an <a>IRI reference</a> as
           defined in [<a
             href="http://www.ietf.org/rfc/rfc3987.txt">RFC3987</a>],
-          except that if the <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> scheme used is allowed to have
-          absolute and relative forms, the <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> portion must be
+          except that if the <a>IRI</a> scheme used is allowed to have
+          absolute and relative forms, the <a>IRI</a> portion must be
           absolute. When no value is supplied, no particular role
           value shall be inferred.
           Refer to the <a href="http://www.w3.org/TR/xlink/">XML Linking Language (XLink)</a> [<a href="refs.html#ref-XLINK">XLINK</a>].</p>
@@ -274,12 +274,12 @@
             class="adef">xlink:arcrole</span> = "<span
               class="attr-value"><a
                 href="types.html#DataTypeIRI">&lt;IRI&gt;</a></span>"</dt>
-        <dd><p>An optional <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> reference that identifies some resource that describes
-          the intended property. The value must be an <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> reference as
+        <dd><p>An optional <a>IRI reference</a> that identifies some resource that describes
+          the intended property. The value must be an <a>IRI reference</a> as
           defined in [<a
             href="http://www.ietf.org/rfc/rfc3987.txt">RFC3987</a>],
-          except that if the <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> scheme used is allowed to have
-          absolute and relative forms, the <a href="intro.html#TermIRIReference"><span class="svg-term">IRI</span></a> portion must be
+          except that if the <a>IRI</a> scheme used is allowed to have
+          absolute and relative forms, the <a>IRI</a> portion must be
           absolute. When no value is supplied, no particular role
           value shall be inferred.  The arcrole
           attribute corresponds to the [<a
@@ -444,7 +444,7 @@
         no.</p></dd>
         <dt id="AElementXLinkHrefAttribute"><span
           class="adef">xlink:href</span> = "<span class="attr-value"><a href="types.html#DataTypeIRI">&lt;IRI&gt;</a></span>"</dt>
-        <dd><p>The location of the referenced object, expressed as an <a href="intro.html#TermIRIReference"><span class="svg-term">IRI reference</span></a>.</p>
+        <dd><p>The location of the referenced object, expressed as an <a>IRI reference</a>.</p>
          <p class="anim-target"><a href="animate.html#Animatable">Animatable</a>: yes.</p>
         </dd>
         <dt id="AElementTargetAttribute"><span
--- a/master/masking.html	Thu May 10 11:27:20 2012 +0200
+++ b/master/masking.html	Thu May 10 11:54:52 2012 +0200
@@ -28,8 +28,8 @@
   masked out</li>
 
   <li><a href="#Masking">masks</a>, which are
-  <a href="intro.html#TermContainerElement">container elements</a>
-  which can contain <a href="intro.html#TermGraphicsElement">graphics elements</a>
+  <a>container elements</a>
+  which can contain <a>graphics elements</a>
   or other container elements which define a set of graphics
   that is to be used as a semi-transparent mask for compositing
   foreground objects into the current background.</li>
@@ -413,11 +413,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a
-              href="intro.html#TermContainerElement">container
-              elements</a>, <a
-              href="intro.html#TermGraphicsElement">graphics
-              elements</a>
+              <td><a>container elements</a>, <a>graphics elements</a>
               and <a>'clipPath'</a></td>
             </tr>
             <tr valign="baseline">
@@ -560,7 +556,7 @@
 used/referenced using the <a>'mask property'</a> property.</p>
 
 <p>A <a>'mask element'</a> can contain any graphical elements or
-<a href="intro.html#TermContainerElement">container elements</a> such as
+<a>container elements</a> such as
 a <a>'g'</a>.</p>
 
 <p>It is an error if the <a>'mask property'</a> property references a
@@ -787,11 +783,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a
-              href="intro.html#TermContainerElement">container
-              elements</a> and <a
-              href="intro.html#TermGraphicsElement">graphics
-              elements</a></td>
+              <td><a>container elements</a> and <a>graphics elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -867,11 +859,8 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a
-                href="intro.html#TermContainerElement">container
-              elements</a> (except <a>'mask element'</a>) and <a
-              href="intro.html#TermGraphicsElement">graphics
-              elements</a></td>
+              <td><a>container elements</a> (except <a>'mask element'</a>) and
+	      <a>graphics elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
--- a/master/painting.html	Thu May 10 11:27:20 2012 +0200
+++ b/master/painting.html	Thu May 10 11:54:52 2012 +0200
@@ -167,9 +167,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermShape">shapes</a> and <a
-              href="intro.html#TermTextContentElement">text content
-              elements</a></td>
+              <td><a>shapes</a> and <a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -227,9 +225,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermShape">shapes</a> and <a
-              href="intro.html#TermTextContentElement">text content
-              elements</a></td>
+              <td><a>shapes</a> and <a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -325,9 +321,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermShape">shapes</a> and <a
-              href="intro.html#TermTextContentElement">text content
-              elements</a></td>
+              <td><a>shapes</a> and <a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -410,9 +404,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermShape">shapes</a> and <a
-              href="intro.html#TermTextContentElement">text content
-              elements</a></td>
+              <td><a>shapes</a> and <a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -555,9 +547,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermShape">shapes</a> and <a
-              href="intro.html#TermTextContentElement">text content
-              elements</a></td>
+              <td><a>shapes</a> and <a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -606,9 +596,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermShape">shapes</a> and <a
-              href="intro.html#TermTextContentElement">text content
-              elements</a></td>
+              <td><a>shapes</a> and <a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -666,9 +654,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermShape">shapes</a> and <a
-              href="intro.html#TermTextContentElement">text content
-              elements</a></td>
+              <td><a>shapes</a> and <a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -726,9 +712,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermShape">shapes</a> and <a
-              href="intro.html#TermTextContentElement">text content
-              elements</a></td>
+              <td><a>shapes</a> and <a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -801,9 +785,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermShape">shapes</a> and <a
-              href="intro.html#TermTextContentElement">text content
-              elements</a></td>
+              <td><a>shapes</a> and <a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -883,9 +865,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermShape">shapes</a> and <a
-              href="intro.html#TermTextContentElement">text content
-              elements</a></td>
+              <td><a>shapes</a> and <a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -936,9 +916,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermShape">shapes</a> and <a
-              href="intro.html#TermTextContentElement">text content
-              elements</a></td>
+              <td><a>shapes</a> and <a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -1790,8 +1768,7 @@
       </tr>
       <tr>
         <td><a href="masking.html#SimpleAlphaBlending">alpha
-        compositing</a> of <a
-        href="intro.html#TermGraphicsElement">graphics elements</a>
+        compositing</a> of <a>graphics elements</a>
         into the current background</td>
         <td><a>'color-interpolation'</a></td>
       </tr>
@@ -1854,11 +1831,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a
-              href="intro.html#TermContainerElement">container
-              elements</a>, <a
-              href="intro.html#TermGraphicsElement">graphics
-              elements</a>, <a>'animate'</a> and <a>'animateColor'</a></td>
+              <td><a>container elements</a>, <a>graphics elements</a>, <a>'animate'</a> and <a>'animateColor'</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -1953,11 +1926,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a
-              href="intro.html#TermContainerElement">container
-              elements</a>, <a
-              href="intro.html#TermGraphicsElement">graphics
-              elements</a>, <a>'animate'</a> and <a>'animateColor'</a></td>
+              <td><a>container elements</a>, <a>graphics elements</a>, <a>'animate'</a> and <a>'animateColor'</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -2026,7 +1995,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermShape">shapes</a></td>
+              <td><a>shapes</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -2262,8 +2231,8 @@
 
 <p>The values of any of the painting properties described in this chapter can
 be inherited from a given object's parent.  Painting, however, is always done
-on each <a href="intro.html#TermGraphicsElement">graphics element</a>
-individually, never at the <a href="intro.html#TermContainerElement">container element</a>
+on each <a>graphics element</a>
+individually, never at the <a>container element</a>
 (e.g., a <a>'g'</a>) level. Thus, for the following SVG, even though the
 gradient fill is specified on the <a>'g'</a>, the gradient is simply inherited
 through the <a>'g'</a> element down into each rectangle, each of which is
@@ -2275,7 +2244,7 @@
 
 <p>Any painting properties defined in terms of the
 <a href="coords.html#ObjectBoundingBoxUnits">object's bounding box</a> use the
-bounding box of the <a href="intro.html#TermGraphicsElement">graphics element</a>
+bounding box of the <a>graphics element</a>
 to which the operation applies. Note that <a href="text.html">text elements</a>
 are defined such that any painting operations defined in terms of the
 <a href="coords.html#ObjectBoundingBoxUnits">object's bounding box</a> use the
--- a/master/propidx.html	Thu May 10 11:27:20 2012 +0200
+++ b/master/propidx.html	Thu May 10 11:54:52 2012 +0200
@@ -96,10 +96,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>none</td>
-          <td><a href="intro.html#TermContainerElement">container
-          elements</a> and <a
-          href="intro.html#TermGraphicsElement">graphics
-          elements</a></td>
+          <td><a>container elements</a> and <a>graphics elements</a></td>
           <td>no</td>
           <td>N/A</td>
           <td><a
@@ -155,10 +152,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>sRGB</td>
-          <td><a href="intro.html#TermContainerElement">container
-          elements</a>, <a
-          href="intro.html#TermGraphicsElement">graphics
-          elements</a> and <a>'animateColor'</a></td>
+          <td><a>container elements</a>, <a>graphics elements</a> and <a>'animateColor'</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -173,8 +167,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>linearRGB</td>
-          <td><a href="filters.html#TermFilterPrimitive">filter
-          primitives</a></td>
+          <td><a>filter primitives</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -208,10 +201,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>auto</td>
-          <td><a href="intro.html#TermContainerElement">container
-          elements</a>, <a
-          href="intro.html#TermGraphicsElement">graphics
-          elements</a> and <a>'animateColor'</a></td>
+          <td><a>container elements</a>, <a>graphics elements</a> and <a>'animateColor'</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -230,10 +220,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>auto</td>
-          <td><a href="intro.html#TermContainerElement">container
-          elements</a> and <a
-          href="intro.html#TermGraphicsElement">graphics
-          elements</a></td>
+          <td><a>container elements</a> and <a>graphics elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -250,8 +237,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>ltr</td>
-          <td><a href="intro.html#TermTextContentElement">text
-          content elements</a></td>
+          <td><a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -290,8 +276,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>auto</td>
-          <td><a href="intro.html#TermTextContentElement">text
-          content elements</a></td>
+          <td><a>text content elements</a></td>
           <td>no</td>
           <td>N/A</td>
           <td><a
@@ -307,8 +292,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>accumulate</td>
-          <td><a href="intro.html#TermContainerElement">container
-          elements</a></td>
+          <td><a>container elements</a></td>
           <td>no</td>
           <td>N/A</td>
           <td><a
@@ -322,9 +306,7 @@
           href="painting.html#SpecifyingPaint">Specifying
           paint</a>)</td>
           <td>black</td>
-          <td><a href="intro.html#TermShape">shapes</a> and <a
-          href="intro.html#TermTextContentElement">text content
-          elements</a></td>
+          <td><a>shapes</a> and <a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -339,9 +321,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>1</td>
-          <td><a href="intro.html#TermShape">shapes</a> and <a
-          href="intro.html#TermTextContentElement">text content
-          elements</a></td>
+          <td><a>shapes</a> and <a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -356,9 +336,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>nonzero</td>
-          <td><a href="intro.html#TermShape">shapes</a> and <a
-          href="intro.html#TermTextContentElement">text content
-          elements</a></td>
+          <td><a>shapes</a> and <a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -373,10 +351,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>none</td>
-          <td><a href="intro.html#TermContainerElement">container
-          elements</a> and <a
-          href="intro.html#TermGraphicsElement">graphics
-          elements</a></td>
+          <td><a>container elements</a> and <a>graphics elements</a></td>
           <td>no</td>
           <td>N/A</td>
           <td><a
@@ -435,8 +410,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>see individual properties</td>
-          <td><a href="intro.html#TermTextContentElement">text
-          content elements</a></td>
+          <td><a>text content elements</a></td>
           <td>yes</td>
           <td>see individual properties</td>
           <td><a
@@ -467,8 +441,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>depends on user agent</td>
-          <td><a href="intro.html#TermTextContentElement">text
-          content elements</a></td>
+          <td><a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -496,8 +469,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>medium</td>
-          <td><a href="intro.html#TermTextContentElement">text
-          content elements</a></td>
+          <td><a>text content elements</a></td>
           <td>yes, the computed value is inherited</td>
           <td>refer to parent element's font size</td>
           <td><a
@@ -516,8 +488,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>none</td>
-          <td><a href="intro.html#TermTextContentElement">text
-          content elements</a></td>
+          <td><a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -535,8 +506,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>normal</td>
-          <td><a href="intro.html#TermTextContentElement">text
-          content elements</a></td>
+          <td><a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -551,8 +521,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>normal</td>
-          <td><a href="intro.html#TermTextContentElement">text
-          content elements</a></td>
+          <td><a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -567,8 +536,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>normal</td>
-          <td><a href="intro.html#TermTextContentElement">text
-          content elements</a></td>
+          <td><a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -584,8 +552,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>normal</td>
-          <td><a href="intro.html#TermTextContentElement">text
-          content elements</a></td>
+          <td><a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -600,8 +567,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>0deg</td>
-          <td><a href="intro.html#TermTextContentElement">text
-          content elements</a></td>
+          <td><a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -616,8 +582,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>auto</td>
-          <td><a href="intro.html#TermTextContentElement">text
-          content elements</a></td>
+          <td><a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -650,8 +615,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>auto</td>
-          <td><a href="intro.html#TermTextContentElement">text
-          content elements</a></td>
+          <td><a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -668,8 +632,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>normal</td>
-          <td><a href="intro.html#TermTextContentElement">text
-          content elements</a></td>
+          <td><a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -737,10 +700,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>none</td>
-          <td><a href="intro.html#TermContainerElement">container
-          elements</a> and <a
-          href="intro.html#TermGraphicsElement">graphics
-          elements</a></td>
+          <td><a>container elements</a> and <a>graphics elements</a></td>
           <td>no</td>
           <td>N/A</td>
           <td><a
@@ -755,10 +715,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>1</td>
-          <td><a href="intro.html#TermContainerElement">container
-          elements</a> and <a
-          href="intro.html#TermGraphicsElement">graphics
-          elements</a></td>
+          <td><a>container elements</a> and <a>graphics elements</a></td>
           <td>no</td>
           <td>N/A</td>
           <td><a
@@ -792,8 +749,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>visiblePainted</td>
-          <td><a href="intro.html#TermGraphicsElement">graphics
-          elements</a></td>
+          <td><a>graphics elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -809,7 +765,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>auto</td>
-          <td><a href="intro.html#TermShape">shapes</a></td>
+          <td><a>shapes</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -857,9 +813,7 @@
           href="painting.html#SpecifyingPaint">Specifying
           paint</a>)</td>
           <td>none</td>
-          <td><a href="intro.html#TermShape">shapes</a> and <a
-          href="intro.html#TermTextContentElement">text content
-          elements</a></td>
+          <td><a>shapes</a> and <a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -874,9 +828,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>none</td>
-          <td><a href="intro.html#TermShape">shapes</a> and <a
-          href="intro.html#TermTextContentElement">text content
-          elements</a></td>
+          <td><a>shapes</a> and <a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -893,9 +845,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>0</td>
-          <td><a href="intro.html#TermShape">shapes</a> and <a
-          href="intro.html#TermTextContentElement">text content
-          elements</a></td>
+          <td><a>shapes</a> and <a>text content elements</a></td>
           <td>yes</td>
           <td>see prose</td>
           <td><a
@@ -910,9 +860,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>butt</td>
-          <td><a href="intro.html#TermShape">shapes</a> and <a
-          href="intro.html#TermTextContentElement">text content
-          elements</a></td>
+          <td><a>shapes</a> and <a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -927,9 +875,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>miter</td>
-          <td><a href="intro.html#TermShape">shapes</a> and <a
-          href="intro.html#TermTextContentElement">text content
-          elements</a></td>
+          <td><a>shapes</a> and <a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -944,9 +890,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>4</td>
-          <td><a href="intro.html#TermShape">shapes</a> and <a
-          href="intro.html#TermTextContentElement">text content
-          elements</a></td>
+          <td><a>shapes</a> and <a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -961,9 +905,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>1</td>
-          <td><a href="intro.html#TermShape">shapes</a> and <a
-          href="intro.html#TermTextContentElement">text content
-          elements</a></td>
+          <td><a>shapes</a> and <a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -980,9 +922,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>1</td>
-          <td><a href="intro.html#TermShape">shapes</a> and <a
-          href="intro.html#TermTextContentElement">text content
-          elements</a></td>
+          <td><a>shapes</a> and <a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -997,8 +937,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>start</td>
-          <td><a href="intro.html#TermTextContentElement">text
-          content elements</a></td>
+          <td><a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
@@ -1014,8 +953,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>none</td>
-          <td><a href="intro.html#TermTextContentElement">text
-          content elements</a></td>
+          <td><a>text content elements</a></td>
           <td>no (see prose)</td>
           <td>N/A</td>
           <td><a
@@ -1046,8 +984,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>normal</td>
-          <td><a href="intro.html#TermTextContentElement">text
-          content elements</a></td>
+          <td><a>text content elements</a></td>
           <td>no</td>
           <td>N/A</td>
           <td><a
@@ -1080,8 +1017,7 @@
           <span
           class="value-inst-inherit noxref">inherit</span></a></td>
           <td>normal</td>
-          <td><a href="intro.html#TermTextContentElement">text
-          content elements</a></td>
+          <td><a>text content elements</a></td>
           <td>yes</td>
           <td>N/A</td>
           <td><a
--- a/master/pservers.html	Thu May 10 11:27:20 2012 +0200
+++ b/master/pservers.html	Thu May 10 11:54:52 2012 +0200
@@ -257,7 +257,7 @@
 
 <p>
   Once a gradient is defined, a
-  <a href="intro.html#TermGraphicsElement">graphics element</a> can be
+  <a>graphics element</a> can be
   filled or stroked with the gradient by setting the <a>'fill'</a>
   or <a>'stroke'</a> properties to reference the gradient.
 </p>
@@ -270,17 +270,17 @@
   corresponds to lines with the same color. It is perpendicular to the
   vector in an untransformed gradient.
 
-  When a <a href="intro.html#TermGraphicsElement">graphics element</a>
+  When a <a>graphics element</a>
   references a gradient, conceptually the
-  <a href="intro.html#TermGraphicsElement">graphics element</a>
+  <a>graphics element</a>
   should take a copy of the gradient vector and gradient normal and
   treat it as part of its own geometry. Any transformations applied to
   the
-  <a href="intro.html#TermGraphicsElement">graphics element</a>
+  <a>graphics element</a>
   geometry also apply to the copied gradient vector and gradient
   normal. Any gradient transforms that are specified on the reference
   gradient are applied before any
-  <a href="intro.html#TermGraphicsElement">graphics element</a>
+  <a>graphics element</a>
   transformations are applied to the gradient.
 </p>
 
--- a/master/shapes.html	Thu May 10 11:27:20 2012 +0200
+++ b/master/shapes.html	Thu May 10 11:54:52 2012 +0200
@@ -38,8 +38,7 @@
 <edit:with element='rect'>
 
 <p>The <a>'rect'</a> element defines a rectangle which is axis-aligned
-with the current <a href="intro.html#TermUserCoordinateSystem">user
-coordinate system</a>. Rounded rectangles can be achieved by setting
+with the current <a>user coordinate system</a>. Rounded rectangles can be achieved by setting
 appropriate values for attributes <a>'rx'</a> and <a>'ry'</a>.</p>
 
 <edit:elementsummary name='rect'/>
@@ -299,8 +298,7 @@
 <edit:with element='ellipse'>
 
 <p>The <a>'ellipse'</a> element defines an ellipse which is axis-aligned
-with the current <a href="intro.html#TermUserCoordinateSystem">user
-coordinate system</a> based on a center point and two radii.</p>
+with the current <a>user coordinate system</a> based on a center point and two radii.</p>
 
 <edit:elementsummary name='ellipse'/>
 
--- a/master/struct.html	Thu May 10 11:27:20 2012 +0200
+++ b/master/struct.html	Thu May 10 11:54:52 2012 +0200
@@ -557,8 +557,7 @@
 
 <edit:elementsummary name='use'/>
 
-    <p>Any <a>'svg'</a>, <a>'symbol'</a>, <a>'g'</a>, <a
-    href="intro.html#TermGraphicsElement">graphics element</a> or
+    <p>Any <a>'svg'</a>, <a>'symbol'</a>, <a>'g'</a>, <a>graphics element</a> or
     other <a>'use'</a> is potentially a
     template object that can be re-used (i.e., "instanced") in the
     SVG document via a <a>'use'</a>
@@ -1315,8 +1314,7 @@
     <p>This attribute applies to all types of resource references,
     including style sheets, color profiles (see <a
     href="color.html#ColorProfileDescriptions">Color profile
-    descriptions</a>) and fonts specified by an <a
-    href="intro.html#TermIRIReference">IRI reference</a> using a <a>'font-face'</a> element or a CSS
+    descriptions</a>) and fonts specified by an <a>IRI reference</a> using a <a>'font-face'</a> element or a CSS
     @font-face specification. In particular, if an element sets
     <span
     class="attr-value">externalResourcesRequired="true"</span>,
--- a/master/styling.html	Thu May 10 11:27:20 2012 +0200
+++ b/master/styling.html	Thu May 10 11:54:52 2012 +0200
@@ -572,9 +572,7 @@
     style sheet, not that of the referencing document.</p>
     
     <h2 id='CaseSensitivity'>Case sensitivity of property names and values</h2>
-    <p>Property declarations via <a
-    href="intro.html#TermPresentationAttribute">presentation
-    attributes</a> are expressed in XML [<a
+    <p>Property declarations via <a>presentation attributes</a> are expressed in XML [<a
     href="http://www.w3.org/TR/2008/REC-xml-20081126/">XML10</a>], which is
     case-sensitive. CSS property declarations specified either in
     CSS style sheets or in a <a>'style attribute'</a> attribute, on the other
--- a/master/text.html	Thu May 10 11:27:20 2012 +0200
+++ b/master/text.html	Thu May 10 11:54:52 2012 +0200
@@ -229,7 +229,7 @@
 Thus, <a href="coords.html">coordinate system transformations</a>,
 <a href="painting.html">painting</a>, <a href="masking.html">clipping</a> and
 <a href="masking.html">masking</a> features apply to <a>'text'</a> elements in
-the same way as they apply to <a href="intro.html#TermShape">shapes</a> such as
+the same way as they apply to <a>shapes</a> such as
 <a href="paths.html">paths</a> and <a href="shapes.html#RectElement">rectangles</a>.</p>
 
 <p>Each <a>'text'</a> element causes a single string of text to be rendered.
@@ -521,8 +521,7 @@
 system transformations</a>, <a
 href="painting.html">painting</a>, <a
 href="masking.html">clipping</a> and <a
-href="masking.html">masking</a> features that apply to <a
-href="intro.html#TermShape">shapes</a> such as <a
+href="masking.html">masking</a> features that apply to <a>shapes</a> such as <a
 href="paths.html">paths</a> and <a href="shapes.html#RectElement">rectangles</a> also apply to
 <a>'text'</a> elements.</p>
 
@@ -1269,8 +1268,7 @@
         class="adef">xlink:href</span> = "<span
         class="attr-value"><a
         href="types.html#DataTypeIRI">&lt;iri&gt;</a></span>"</dt>
-        <dd>An <a href="intro.html#TermIRIReference">IRI
-        reference</a> to an element 
+        <dd>An <a>IRI reference</a> to an element 
           whose character data content shall be used as
         character data for this <a>'tref'</a> element.<br />
          <span class="anim-target"><a
@@ -1582,8 +1580,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermTextContentElement">text
-              content elements</a></td>
+              <td><a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -1742,8 +1739,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermTextContentElement">text
-              content elements</a></td>
+              <td><a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -1810,9 +1806,9 @@
     text. The algorithm consists of an implicit part based on 
     character properties, as well as explicit controls for 
     embeddings and overrides. The 
-    <a href="intro.html#TermSVGUserAgent"><span class="svg-term">SVG user agent</span></a> 
+    <a>SVG user agent</a> 
     applies this bidirectional algorithm when determining the layout of characters within a 
-    <a href="intro.html#TermTextContentBlockElement"><span class="svg-term">text content block element</span></a>.
+    <a>text content block element</a>.
   </p>
   
   <p>The <a href="text.html#DirectionProperty"><span class="attr-name">'direction'</span></a> 
@@ -1841,7 +1837,7 @@
   
   <p>
     Within
-    <a href="intro.html#TermTextContentElement"><span class="svg-term">text content elements</span></a>,
+    <a>text content elements</a>,
     the alignment of text with regards to the 
     <a href="#TextAnchorProperty"><span class="property">'text-anchor'</span></a> property
     is determined by the value of the
@@ -1914,8 +1910,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermTextContentElement">text
-              content elements</a></td>
+              <td><a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -1977,8 +1972,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermTextContentElement">text
-              content elements</a></td>
+              <td><a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -2056,8 +2050,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermTextContentElement">text
-              content elements</a></td>
+              <td><a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -2377,8 +2370,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermTextContentElement">text
-              content elements</a></td>
+              <td><a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -2423,16 +2415,12 @@
         <p>If this property occurs on a <a>'tspan'</a>, <a>'tref'</a>,
         <a>'altGlyph'</a> or <a>'textPath'</a> element, then
         the dominant-baseline and the baseline-table components
-        remain the same as those of the parent <a
-        href="intro.html#TermTextContentElement">text content
-        element</a>. If the computed <a>'baseline-shift'</a> value
+        remain the same as those of the parent <a>text content element</a>. If the computed <a>'baseline-shift'</a> value
         actually shifts the baseline, then the baseline-table
         font-size component is set to the value of the <a>'font-size'</a> property on the
         element on which the <a>'dominant-baseline'</a> property
         occurs, otherwise the baseline-table font-size remains the
-        same as that of the element. If there is no parent <a
-        href="intro.html#TermTextContentElement">text content
-        element</a>, the scaled-baseline-table value is constructed
+        same as that of the element. If there is no parent <a>text content element</a>, the scaled-baseline-table value is constructed
         as above for <a>'text'</a> elements.</p>
       </dd>
       <dt><span class="attr-value">use-script</span></dt>
@@ -2449,8 +2437,7 @@
       <dt><span class="attr-value">no-change</span></dt>
       <dd>The dominant-baseline, the baseline-table, and the
       baseline-table font-size remain the same as that of the
-      parent <a href="intro.html#TermTextContentElement">text
-      content element</a>.</dd>
+      parent <a>text content element</a>.</dd>
       <dt><span class="attr-value">reset-size</span></dt>
       <dd>The dominant-baseline and the baseline-table remain the
       same, but the baseline-table font-size is changed to the
@@ -2599,59 +2586,37 @@
       the parent.</dd>
       <dt><b>baseline</b></dt>
       <dd>The alignment-point of the object being aligned is
-      aligned with the dominant-baseline of the parent <a
-      href="intro.html#TermTextContentElement">text content
-      element</a>.</dd>
+      aligned with the dominant-baseline of the parent <a>text content element</a>.</dd>
       <dt><b>before-edge</b></dt>
       <dd>The alignment-point of the object being aligned is
-      aligned with the "before-edge" baseline of the parent <a
-      href="intro.html#TermTextContentElement">text content
-      element</a>.</dd>
+      aligned with the "before-edge" baseline of the parent <a>text content element</a>.</dd>
       <dt><b>text-before-edge</b></dt>
       <dd>The alignment-point of the object being aligned is
-      aligned with the "text-before-edge" baseline of the parent <a
-      href="intro.html#TermTextContentElement">text content
-      element</a>.</dd>
+      aligned with the "text-before-edge" baseline of the parent <a>text content element</a>.</dd>
       <dt><b>middle</b></dt>
       <dd>The alignment-point of the object being aligned is
-      aligned with the "middle" baseline of the parent <a
-      href="intro.html#TermTextContentElement">text content
-      element</a>.</dd>
+      aligned with the "middle" baseline of the parent <a>text content element</a>.</dd>
       <dt><b>central</b></dt>
       <dd>The alignment-point of the object being aligned is
-      aligned with the "central" baseline of the parent <a
-      href="intro.html#TermTextContentElement">text content
-      element</a>.</dd>
+      aligned with the "central" baseline of the parent <a>text content element</a>.</dd>
       <dt><b>after-edge</b></dt>
       <dd>The alignment-point of the object being aligned is
-      aligned with the "after-edge" baseline of the parent <a
-      href="intro.html#TermTextContentElement">text content
-      element</a>.</dd>
+      aligned with the "after-edge" baseline of the parent <a>text content element</a>.</dd>
       <dt><b>text-after-edge</b></dt>
       <dd>The alignment-point of the object being aligned is
-      aligned with the "text-after-edge" baseline of the parent <a
-      href="intro.html#TermTextContentElement">text content
-      element</a>.</dd>
+      aligned with the "text-after-edge" baseline of the parent <a>text content element</a>.</dd>
       <dt><b>ideographic</b></dt>
       <dd>The alignment-point of the object being aligned is
-      aligned with the "ideographic" baseline of the parent <a
-      href="intro.html#TermTextContentElement">text content
-      element</a>.</dd>
+      aligned with the "ideographic" baseline of the parent <a>text content element</a>.</dd>
       <dt><b>alphabetic</b></dt>
       <dd>The alignment-point of the object being aligned is
-      aligned with the "alphabetic" baseline of the parent <a
-      href="intro.html#TermTextContentElement">text content
-      element</a>.</dd>
+      aligned with the "alphabetic" baseline of the parent <a>text content element</a>.</dd>
       <dt><b>hanging</b></dt>
       <dd>The alignment-point of the object being aligned is
-      aligned with the "hanging" baseline of the parent <a
-      href="intro.html#TermTextContentElement">text content
-      element</a>.</dd>
+      aligned with the "hanging" baseline of the parent <a>text content element</a>.</dd>
       <dt><b>mathematical</b></dt>
       <dd>The alignment-point of the object being aligned is
-      aligned with the "mathematical" baseline of the parent <a
-      href="intro.html#TermTextContentElement">text content
-      element</a>.</dd>
+      aligned with the "mathematical" baseline of the parent <a>text content element</a>.</dd>
     </dl>
 
     <div class="propdef">
@@ -2702,19 +2667,11 @@
     </div>
     <p>The <a>'baseline-shift'</a> property
     allows repositioning of the dominant-baseline relative to the
-    dominant-baseline of the parent <a
-    href="intro.html#TermTextContentElement">text content
-    element</a>. The shifted object might be a sub- or superscript.
+    dominant-baseline of the parent <a>text content element</a>. The shifted object might be a sub- or superscript.
     Within the shifted object, the whole baseline-table is offset;
     not just a single baseline. The amount of the shift is
-    determined from information from the parent <a
-    href="intro.html#TermTextContentElement">text content
-    element</a>, the sub- or superscript offset from the nominal
-    font of the parent <a
-    href="intro.html#TermTextContentElement">text content
-    element</a>, percent of the "line-height" of the parent <a
-    href="intro.html#TermTextContentElement">text content
-    element</a> or an absolute value.</p>
+    determined from information from the parent <a>text content element</a>, the sub- or superscript offset from the nominal
+    font of the parent <a>text content element</a>, percent of the "line-height" of the parent <a>text content element</a> or an absolute value.</p>
     <p>In SVG, the <a>'baseline-shift'</a>
     property represents a supplemental adjustment to the baseline
     tables. The <a>'baseline-shift'</a>
@@ -2769,18 +2726,14 @@
       href="text.html#ShiftDirection">shift direction</a> (positive
       value) or opposite to the <a
       href="text.html#ShiftDirection">shift direction</a> (negative
-      value) of the parent <a
-      href="intro.html#TermTextContentElement">text content
-      element</a> by the computed value. A value of "0%" is
+      value) of the parent <a>text content element</a> by the computed value. A value of "0%" is
       equivalent to "baseline".</dd>
       <dt><strong>&lt;length&gt;</strong></dt>
       <dd>The dominant-baseline is shifted in the <a
       href="text.html#ShiftDirection">shift direction</a> (positive
       value) or opposite to the <a
       href="text.html#ShiftDirection">shift direction</a> (negative
-      value) of the parent <a
-      href="intro.html#TermTextContentElement">text content
-      element</a> by the &lt;length&gt; value. A value of "0cm" is
+      value) of the parent <a>text content element</a> by the &lt;length&gt; value. A value of "0cm" is
       equivalent to "baseline".</dd>
     </dl>
 
@@ -2816,8 +2769,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermTextContentElement">text
-              content elements</a></td>
+              <td><a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -2868,8 +2820,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermTextContentElement">text
-              content elements</a></td>
+              <td><a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -2917,8 +2868,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermTextContentElement">text
-              content elements</a></td>
+              <td><a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -2970,8 +2920,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermTextContentElement">text
-              content elements</a></td>
+              <td><a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -3024,8 +2973,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermTextContentElement">text
-              content elements</a></td>
+              <td><a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -3076,8 +3024,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermTextContentElement">text
-              content elements</a></td>
+              <td><a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -3141,8 +3088,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermTextContentElement">text
-              content elements</a></td>
+              <td><a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -3201,8 +3147,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermTextContentElement">text
-              content elements</a></td>
+              <td><a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -3281,8 +3226,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermTextContentElement">text
-              content elements</a></td>
+              <td><a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -3355,8 +3299,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermTextContentElement">text
-              content elements</a></td>
+              <td><a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -3420,8 +3363,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermTextContentElement">text
-              content elements</a></td>
+              <td><a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -3487,8 +3429,7 @@
             </tr>
             <tr valign="baseline">
               <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a href="intro.html#TermTextContentElement">text
-              content elements</a></td>
+              <td><a>text content elements</a></td>
             </tr>
             <tr valign="baseline">
               <td><em>Inherited:</em>&nbsp;&nbsp;</td>
@@ -3589,7 +3530,7 @@
 to place text along the shape of a <a>'path'</a> element. To specify that a
 block of text is to be rendered along the shape of a <a>'path'</a>, include
 the given text within a <a>'textPath'</a> element which includes an
-<a>'xlink:href'</a> attribute with an <a href="intro.html#TermIRIReference">IRI reference</a>
+<a>'xlink:href'</a> attribute with an <a>IRI reference</a>
 to a <a>'path'</a> element.</p>
 
 <h3 id="TextPathElement">The <span class="element-name">'textPath'</span> element</h3>