--- a/master/coords.html	Mon Aug 20 14:14:57 2012 +1000
+++ b/master/coords.html	Mon Aug 20 14:32:16 2012 +1000
@@ -96,7 +96,7 @@
 
 <h2 id="ViewportSpace">The initial viewport</h2>
 
-<p>The SVG user agent negotiates with its parent user agent to
+<p id="SVGViewport">The SVG user agent negotiates with its parent user agent to
 determine the viewport into which the SVG user agent can render
 the document. In some circumstances, SVG content will be
 embedded (<a href="concepts.html#UsageOptions">by reference or

--- a/master/masking.html	Mon Aug 20 14:14:57 2012 +1000
+++ b/master/masking.html	Mon Aug 20 14:32:16 2012 +1000
@@ -176,8 +176,8 @@
 </table>
 
 <p>The <a>'overflow'</a> property has the same parameter values and has the
-same meaning <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/visufx.html#overflow">as defined in CSS2</a>
-([<a href="refs.html#ref-CSS2">CSS2</a>], section 11.1.1);
+same meaning <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visufx.html#propdef-overflow">as defined in CSS 2.1</a>
+([<a href="refs.html#ref-CSS21">CSS21</a>], section 11.1.1);
 however, the following additional points apply:</p>
 
 <ul>
@@ -203,16 +203,16 @@
   equivalent to the value <span class='prop-value'>visible</span>.</li>
 
   <li>When an <a>outermost svg element</a> is embedded inline within a
-  parent XML grammar which uses <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/visuren.html">CSS layout</a>
-  ([<a href="refs.html#ref-CSS2">CSS2</a>], chapter 9)
+  parent XML grammar which uses <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visuren.html">CSS layout</a>
+  ([<a href="refs.html#ref-CSS21">CSS21</a>], chapter 9)
   or <a href="http://www.w3.org/TR/2006/REC-xsl11-20061205/">XSL formatting</a>
   [<a href="refs.html#ref-XSL">XSL</a>], if the
   <a>'overflow'</a> property has the value <span class='prop-value'>hidden</span>
   or <span class='prop-value'>scroll</span>, then the user agent will
   establish an initial clipping path equal to the bounds of the initial
   <a href="coords.html#SVGViewport">viewport</a>; otherwise, the initial
-  clipping path is set according to the <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/visufx.html#overflow">clipping rules as defined in CSS2</a>
-  ([<a href="refs.html#ref-CSS2">CSS2</a>], section 11.1.1).</li>
+  clipping path is set according to the <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visufx.html#overflow">clipping rules as defined in CSS 2.1</a>
+  ([<a href="refs.html#ref-CSS21">CSS21</a>], section 11.1.1).</li>
 
   <li>When an <a>outermost svg element</a> is stand-alone or embedded
   inline within a parent XML grammar which does not use CSS layout
@@ -222,7 +222,7 @@
   the bounds of the initial <a href="coords.html#SVGViewport">viewport</a>.</li>
 
   <li>The initial value for <a>'overflow'</a> as defined
-  in [<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/visufx.html#overflow">CSS2-overflow</a>]
+  in [<a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visufx.html#overflow">CSS21-overflow</a>]
   is 'visible', and this applies also to the <a>rootmost 'svg' element</a>; however,
   for child elements of an SVG document, SVG's <a href="styling.html#UAStyleSheet">user agent style sheet</a>
   overrides this initial value and sets the <a>'overflow'</a> property on
@@ -286,8 +286,8 @@
 </table>
 
 <p>The <a>'clip'</a> property has the same parameter values
-<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/visufx.html#clipping">as defined in CSS2</a>
-([<a href="refs.html#ref-CSS2">CSS2</a>], section 11.1.2).
+<a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visufx.html#clipping">as defined in CSS 2.1</a>
+([<a href="refs.html#ref-CSS21">CSS21</a>], section 11.1.2).
 Unitless values, which indicate current user coordinates, are
 permitted on the coordinate values on the &lt;shape&gt;. The
 value of <span class='prop-value'>auto</span> defines a clipping path along
@@ -784,7 +784,7 @@
   element'</a> element is <span class="attr-value">linearRGB</span>, convert the
   original image color values (potentially in the sRGB color space) to the linear
   RGB color space (see <a
-    href="painting.html#RenderingProperties">Rendering properties</a>).
+    href="painting.html#RenderingHints">Rendering properties</a>).
     </li>
     <li>Then, using non-premultiplied RGB color values, apply the
     luminance-to-alpha coefficients (as defined in the <a>'feColorMatrix'</a>