--- a/master/definitions.xml	Mon Aug 20 12:31:14 2012 +1000
+++ b/master/definitions.xml	Mon Aug 20 12:53:07 2012 +1000
@@ -972,7 +972,7 @@
   <property name='marker' href='painting.html#MarkerProperty'/>
   <property name='marker-end' href='painting.html#MarkerEndProperty'/>
   <property name='marker-knockout-left' href='painting.html#MarkerKnockoutLeftProperty'/>
-  <property name='marker-knockout-right' href='painting.html#MarkerKnockoutirhgtProperty'/>
+  <property name='marker-knockout-right' href='painting.html#MarkerKnockoutRightProperty'/>
   <property name='marker-mid' href='painting.html#MarkerMidProperty'/>
   <property name='marker-pattern' href='painting.html#MarkerPatternProperty'/>
   <property name='marker-segment' href='painting.html#MarkerSegmentProperty'/>

--- a/master/painting.html	Mon Aug 20 12:31:14 2012 +1000
+++ b/master/painting.html	Mon Aug 20 12:53:07 2012 +1000
@@ -108,8 +108,8 @@
   the explicit color (in the sRGB color space [<a href='refs.html#ref-SRGB'>SRGB</a>])
   to be used to paint the current object. SVG supports all of
   the syntax alternatives for &lt;color&gt;
-  <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/syndata.html#value-def-color">defined in CSS2</a>
-  ([<a href="refs.html#ref-CSS2">CSS2</a>], section 4.3.6), with the
+  <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/syndata.html#value-def-color">defined in CSS 2.1</a>
+  ([<a href="refs.html#ref-CSS21">CSS21</a>], section 4.3.6), with the
   exception that SVG contains an expanded list of <a
   href="types.html#ColorKeywords">recognized color keywords
   names</a>. If an optional ICC color specification [<a href='refs.html#ref-ICC42'>ICC42</a>] is
@@ -1388,20 +1388,20 @@
   other vertex (aside from the first and last).  The <a>'marker-start'</a> and
   <a>'marker-end'</a> can be used for example to add arrowheads to paths.
   Markers placed using these properties are known as
-  <dfn id="TermVertexMarkers">vertex markers</dfn>.</li>
+  <dfn id="TermVertexMarker">vertex markers</dfn>.</li>
 
   <li>The <a>'marker-segment'</a> property can be used to place markers
   at the center of every path segment.  These markers are known as
-  <dfn id="TermSegmentMarkers">segment markers</dfn>.</li>
+  <dfn id="TermSegmentMarker">segment markers</dfn>.</li>
 
   <li>The <a>'marker-pattern'</a> property can be used to define
   a regular repeating pattern of markers to place along the length of the
   path.  Markers placed with <a>'marker-pattern'</a> are known as
-  <dfn id="TermRepeatingMarkers">repeating markers</dfn>.</li>
+  <dfn id="TermRepeatingMarker">repeating markers</dfn>.</li>
 
   <li>A child <a>'marker element'</a> element with a <a>'position'</a> attribute
   can be used to place a marker at a particular location along the path.
-  Such markers are known as <dfn id="TermPositionedMarkers">positioned
+  Such markers are known as <dfn id="TermPositionedMarker">positioned
   markers</dfn>.</li>
 </ul>
 
@@ -1544,7 +1544,7 @@
     <th>Animatable</th>
   </tr>
   <tr>
-    <td><dfn id="RefXAttribute">refX</dfn>, <dfn id="RefYAttribute">refY</dfn></td>
+    <td><dfn id="MarkerElementRefXAttribute">refX</dfn>, <dfn id="MarkerElementRefYAttribute">refY</dfn></td>
     <td><a>&lt;coordinate&gt;</a></td>
     <td>0</td>
     <td>yes</td>
@@ -1571,7 +1571,7 @@
     <th>Animatable</th>
   </tr>
   <tr>
-    <td><dfn id="MarkerOrientAttribute">orient</dfn></td>
+    <td><dfn id="OrientAttribute">orient</dfn></td>
     <td>auto | <a>&lt;angle&gt;</a></td>
     <td>0</td>
     <td>yes&#160;(non-additive)</td>
@@ -1751,7 +1751,7 @@
 <a>'display'</a> property on the <a>'marker element'</a> element or any of its
 ancestors is set to <span class="prop-value">none</span>.  <a>'marker element'</a>
 elements that are used as <a>positioned markers</a> can simultaneously be referenced
-by the <a href='#markerProperties'>marker properties</a> to be used as
+by the <a href='#TermMarkerProperties'>marker properties</a> to be used as
 <a>segment markers</a> and <a>repeating markers</a>.</p>
 
 <p><a href="script.html#EventAttributes">Event attributes</a> and
@@ -2251,7 +2251,7 @@
 <p>where:</p>
 
 <p class="definition">
-  <dfn id="DataTypeKnockoutShape">&lt;knockout-offset&gt;</dfn> =
+  <dfn id="DataTypeKnockoutOffset">&lt;knockout-offset&gt;</dfn> =
   <div style="margin-left: 4em">[ <a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a> ]</div>
 </p>
 
@@ -2510,11 +2510,11 @@
 with CSS</a>, the conceptual deep cloning of the referenced
 <a>'marker element'</a> element into a non-exposed DOM tree also
 copies any property values resulting from
-<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/cascade.html">the CSS cascade</a>
-([<a href="refs.html#ref-CSS2">CSS2</a>], chapter 6) and
-property inheritance on the referenced element and its contents. CSS2
+<a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/cascade.html">the CSS cascade</a>
+([<a href="refs.html#ref-CSS21">CSS21</a>], chapter 6) and
+property inheritance on the referenced element and its contents. CSS 2.1
 selectors can be applied to the original (i.e., referenced) elements
-because they are part of the formal document structure. CSS2 selectors
+because they are part of the formal document structure. CSS 2.1 selectors
 cannot be applied to the (conceptually) cloned DOM tree because its
 contents are not part of the formal document structure.</p>