--- a/master/changes.html	Mon Aug 20 12:56:22 2012 +1000
+++ b/master/changes.html	Mon Aug 20 13:13:59 2012 +1000
@@ -196,7 +196,7 @@
 
   <li>Changed informative reference to SMIL 3 to be normative.</li>
 
-  <li>Added normative references to CSS3 Color, CSS3 Fonts, CSS3 Line Box, CSS3 Transforms, CSS3 UI, CSS4 Images, Filter Effects, WOFF, Web IDL.</li>
+  <li>Added normative references to CSS3 Color, CSS3 Fonts, CSS3 Line Box, CSS3 Transforms, CSS3 UI, CSS3 Values and Units, CSS4 Images, Filter Effects, WOFF, Web IDL.</li>
 
   <li>Added informative references to CSS 3 Transitions and Animations.</li>
 </ul>

--- a/master/color.html	Mon Aug 20 12:56:22 2012 +1000
+++ b/master/color.html	Mon Aug 20 13:13:59 2012 +1000
@@ -73,9 +73,8 @@
 <p>All SVG colors are specified in the sRGB color space
 [<a href="refs.html#ref-SRGB">SRGB</a>]. At a minimum, SVG user
 agents shall conform to the color behavior requirements specified in the
-<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/syndata.html#color-units">color units section</a>
-and the <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/colors.html#gamma-correction">minimal gamma correction rules</a>
-defined in the CSS2 specification.</p>
+<a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/syndata.html#color-units">color units section</a>
+defined in the CSS 2.1 specification.</p>
 
 <p>Additionally, SVG content can specify an alternate color specification
 using an ICC profile [<a href="refs.html#ref-ICC42">ICC42</a>]
@@ -167,9 +166,12 @@
 
   <li>an <em>@color-profile</em> rule within a CSS style sheet (only
   applicable for user agents which support using CSS to style the SVG
-  content [<a href="refs.html#ref-CSS2">CSS2</a>])</li>
+  content</li>
 </ul>
 
+<p class="issue">The above used to reference CSS2.  @color-profile was
+removed from the latest draft of css3-color, too.</p>
+
 <p>If a color profile with the same <em>name</em> value has
 been identified by both a <a>'color-profile element'</a> element and
 <em>@color-profile</em> rules within a CSS style sheet, then
@@ -212,7 +214,7 @@
         href="animate.html#Animatable">Animatable</a>:
         no.</span></dd>
         <dt id="ColorProfileElementNameAttribute"><span class="adef">name</span> = "<span
-        class="attr-value">&lt;author-ident&gt;</span>"</dt>
+        class="attr-value">&lt;identifier&gt;</span>"</dt>
         <dd>The name which is used as the first parameter for <span
         class="prop-value">icc-color</span> specifications within
         <a>'fill'</a>, <a>'stroke'</a>, <a>'stop-color'</a>,
@@ -223,11 +225,11 @@
         that if 'name' is not provided, it will be impossible
         to reference the given color profile description. The name
         "sRGB" is predefined; any color profile descriptions with
-        <span class="attr-value">&lt;author-ident&gt;</span> set to "sRGB"
+        <span class="attr-value">&lt;identifier&gt;</span> set to "sRGB"
         will be ignored. For consistency with <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/grammar.html#q2">CSS
+        href="http://www.w3.org/TR/2011/REC-CSS2-20110607/grammar.html#scanner">CSS
         lexical scanning and parsing rules</a>
-        ([<a href="refs.html#ref-CSS2">CSS2</a>], section D.2), the keyword "sRGB"
+        ([<a href="refs.html#ref-CSS21">CSS21</a>], section G.2), the keyword "sRGB"
         is case-insensitive; however, it is recommended that the
         mixed capitalization "sRGB" be used for consistency with
         common industry practice.<br />
@@ -353,8 +355,8 @@
   <dt><span class='prop-value'>sRGB</span></dt>
   <dd>The source profile is the sRGB color space. For
   consistency with
-  <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/grammar.html#q2">CSS lexical scanning and parsing rules</a>
-  ([<a href="refs.html#ref-CSS2">CSS2</a>], section D.2), the keyword "sRGB" is
+  <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/grammar.html#scanner">CSS lexical scanning and parsing rules</a>
+  ([<a href="refs.html#ref-CSS21">CSS21</a>], section G.2), the keyword "sRGB" is
   case-insensitive; however, it is recommended that the mixed
   capitalization "sRGB" be used for consistency with common
   industry practice.</dd>
@@ -397,7 +399,7 @@
           class="propinfo" cellspacing="0" cellpadding="0">
             <tr>
               <td><em>Values:</em></td>
-              <td><a>&lt;author-ident&gt;</a></td>
+              <td><a>&lt;identifier&gt;</a></td>
             </tr>
             <tr>
               <td><em>Initial:</em></td>
@@ -413,7 +415,7 @@
     </div>
 
 <dl>
-  <dt><span class='prop-value'><a>&lt;author-ident&gt;</a></span></dt>
+  <dt><span class='prop-value'><a>&lt;identifier&gt;</a></span></dt>
   <dd>See the description for the <a>'color-profile/name'</a> attribute on the
   <a>'color-profile element'</a> element. Note that if 'name' is not
   provided, it will be impossible to reference the given @color-profile
@@ -462,7 +464,7 @@
   </tr>
   <tr>
     <th>Value:</th>
-    <td>auto | sRGB | <a>&lt;author-ident&gt;</a> | <a>&lt;funciri&gt;</a></td>
+    <td>auto | sRGB | <a>&lt;identifier&gt;</a> | <a>&lt;funciri&gt;</a></td>
   </tr>
   <tr>
     <th>Initial:</th>
@@ -509,20 +511,20 @@
     from auto in that it overrides an embedded profile inside an
     image.</p>
 
-    <p>For consistency with <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/grammar.html#q2">CSS lexical scanning and parsing rules</a>
-    ([<a href="refs.html#ref-CSS2">CSS2</a>], section D.2), the keyword "sRGB" is
+    <p>For consistency with <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/grammar.html#scanner">CSS lexical scanning and parsing rules</a>
+    ([<a href="refs.html#ref-CSS21">CSS21</a>], section G.2), the keyword "sRGB" is
     case-insensitive; however, it is recommended that the mixed
     capitalization "sRGB" be used for consistency with common
     industry practice.</p>
   </dd>
 
-  <dt><span class='prop-value'><a>&lt;author-ident&gt;</a></span></dt>
+  <dt><span class='prop-value'><a>&lt;identifier&gt;</a></span></dt>
   <dd>A name corresponding to a defined color profile that is
   in the user agent's color profile description database. The
   user agent searches the color profile description database
   for a <a href="color.html#ColorProfileDescriptions">color
   profile description</a> entry whose name descriptor matches
-  &lt;author-ident&gt; and uses the last matching entry that is found.
+  &lt;identifier&gt; and uses the last matching entry that is found.
   If a match is found, the corresponding profile overrides an
   embedded profile inside an image. If no match is found, then
   the embedded profile inside the image is used.</dd>

--- a/master/definitions.xml	Mon Aug 20 12:56:22 2012 +1000
+++ b/master/definitions.xml	Mon Aug 20 13:13:59 2012 +1000
@@ -1151,7 +1151,6 @@
   <!-- ... grammar symbols ................................................ -->
   <symbol name='angle' href='types.html#DataTypeAngle'/>
   <symbol name='anything' href='types.html#DataTypeAnything'/>
-  <symbol name='author-ident' href='http://dev.w3.org/csswg/css3-values/#identifiers'/>
   <symbol name='color' href='types.html#DataTypeColor'/>
   <symbol name='child-selector' href='types.html#DataTypeChildSelector'/>
   <symbol name='coordinate' href='types.html#DataTypeCoordinate'/>
@@ -1345,4 +1344,7 @@
   <term name='filter primitive elements' href='https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#TermFilterPrimitiveElement'/>
   <term name='tree order' href='http://www.w3.org/TR/2012/WD-dom-20120405/#concept-tree-order'/>
 
+  <!-- ... grammar symbols ................................................ -->
+  <symbol name='identifier' href='http://www.w3.org/TR/2012/WD-css3-values-20120308/#identifier'/>
+
 </definitions>

--- a/master/refs.html	Mon Aug 20 12:56:22 2012 +1000
+++ b/master/refs.html	Mon Aug 20 13:13:59 2012 +1000
@@ -117,6 +117,16 @@
     http://www.w3.org/TR/css3-transforms/.
   </dd>
 
+  <dt id="ref-CSS3VALUES" class="normref">[CSS3VALUES]</dt>
+  <dd>
+    <cite class="w3cwd"><a href="http://www.w3.org/TR/2012/WD-css3-values-20120308/">CSS Values and Units Level 3</a></cite>,
+    H. Lie, T. Atkins, E. Etemad, eds.
+    World Wide Web Consortium, 8 March 2012. W3C Working Draft. (Work in progress.)
+    <br/>This edition of CSS3 Values and Units is http://www.w3.org/TR/2012/WD-css3-values-20120308/.
+    <br/>The <a href="http://www.w3.org/TR/css3-values/">latest edition of CSS3 Values and Units</a> is available at
+    http://www.w3.org/TR/css3-values/.
+  </dd>
+
   <dt id="ref-CSS4IMAGES" class="normref">[CSS4IMAGES]</dt>
   <dd>
     <cite class="w3cwd"><a href="http://www.w3.org/TR/css3-images/">CSS Image