--- a/master/definitions.xml	Wed Feb 12 17:38:50 2014 +1100
+++ b/master/definitions.xml	Wed Feb 12 16:15:24 2014 +0100
@@ -1346,6 +1346,7 @@
   <symbol name='color' href='types.html#DataTypeColor'/>
   <symbol name='child-selector' href='types.html#DataTypeChildSelector'/>
   <symbol name='dasharray' href='painting.html#DataTypeDasharray'/>
+  <symbol name='final-paint-layer' href='types.html#typedef-final-paint-layer'/>
   <symbol name='frequency' href='types.html#DataTypeFrequency'/>
   <symbol name='gradient' href='types.html#DataTypeGradient'/>
   <symbol name='icccolor' href='types.html#DataTypeICCColor'/>
@@ -1362,10 +1363,17 @@
   <symbol name='number' href='types.html#DataTypeNumber'/>
   <symbol name='number-optional-number' href='types.html#DataTypeNumberOptionalNumber'/>
   <symbol name='paint' href='types.html#DataTypePaint'/>
+  <symbol name='paint-layer' href='types.html#typedef-paint-layer'/>
+  <symbol name='paint-source' href='types.html#typedef-paint-source'/>
+  <symbol name='paint-size' href='http://www.w3.org/TR/css3-background/#ltbg-sizegt'/>
   <symbol name='percentage' href='types.html#DataTypePercentage'/>
+  <symbol name='position' href='http://www.w3.org/TR/css3-background/#ltpositiongt'/>
+  <symbol name='repeat-style' href='http://www.w3.org/TR/css3-background/#ltrepeat-stylegt'/>
+  <symbol name='shape-box' href='http://www.w3.org/TR/2014/WD-css-shapes-1-20140211/#typedef-shape-box'/>
   <symbol name='time' href='types.html#DataTypeTime'/>
   <symbol name='transform-list' href='types.html#DataTypeTransformList'/>
   <symbol name='iri' href='types.html#DataTypeIRI'/>
+  <symbol name='url' href='types.html#DataTypeIRI'/>
   <symbol name='FuncIRI' href='types.html#DataTypeFuncIRI'/>
   <symbol name='funciri' href='types.html#DataTypeFuncIRI'/>
   <symbol name='XML-Name' href="types.html#DataTypeXML-Name"/>

--- a/master/painting.html	Wed Feb 12 17:38:50 2014 +1100
+++ b/master/painting.html	Wed Feb 12 16:15:24 2014 +0100
@@ -126,16 +126,16 @@
 <p>The type <a>&lt;paint&gt;</a> is defined as:</p>
 
 <div class="definition">
-  <dfn id="DataTypePaint">&lt;paint&gt;</dfn> =<br/>
-  <div style="margin-left: 2em">
-    none |<br/>
-    <a>&lt;color&gt;</a> |<br/>
-    [ <a>&lt;color&gt;</a>? <a>&lt;icccolor&gt;</a> ] |<br/>
-    <a>&lt;gradient&gt;</a> |<br/>
-    [ [ <a>&lt;funciri&gt;</a> | child | <a>&lt;child-selector&gt;</a> ] [ none | <a>&lt;color&gt;</a> | [ <a>&lt;color&gt;</a>? <a>&lt;icccolor&gt;</a> ] ]? ] |<br/>
-    context-fill |<br/>
-    context-stroke
-  </div>
+<pre class="prod"><dfn class="css-code" data-dfn-type="type" data-export="" id="typedef-paint">&lt;paint&gt;</dfn> = [ <a>&lt;paint-layer&gt;</a> , ]* <a>&lt;final-paint-layer&gt;</a></pre>
+
+<pre class="prod"><dfn class="css-code" data-dfn-type="type" data-export="" id="typedef-paint-layer">&lt;paint-layer&gt;</dfn> = <a>&lt;paint-source&gt;</a>|| <a>&lt;position&gt;</a> [ / <a>&lt;paint-size&gt;</a> ]? || <a>&lt;repeat-style&gt;</a> ||
+[ <a>&lt;shape-box&gt;</a> | fill | stroke | view-box ] || [ <a>&lt;shape-box&gt;</a> | fill | stroke | view-box ]</pre>
+
+<pre class="prod"><dfn class="css-code" data-dfn-type="type" data-export="" id="typedef-final-paint-layer">&lt;final-paint-layer&gt;</dfn> = <a>&lt;paint-source&gt;</a> || <a>&lt;position&gt;</a> [ / <a>&lt;paint-size&gt;</a> ]? || <a>&lt;repeat-style&gt;</a> ||
+[ <a>&lt;shape-box&gt;</a> | fill | stroke | view-box ] ||
+[ <a>&lt;shape-box&gt;</a> | fill | stroke | view-box ] || <a>&lt;color&gt;</a></pre>
+
+<pre class="prod"><dfn class="css-code" data-dfn-type="type" data-export="" id="typedef-paint-source">&lt;paint-source&gt;</dfn> = none | <a>&lt;image&gt;</a> | <a>&lt;url&gt;</a> | <a>&lt;icccolor&gt;</a> | context-fill | context-stroke</pre>
 </div>
 
 <p>Values have the following meaning:</p>
@@ -155,12 +155,7 @@
   and the CSS2 UI colors.  Note that when <span class='prop-value'>currentColor</span>
   is used, it refers to the current animated value of the <a>'color'</a> property.</dd>
 
-  <dt><a href="types.html#DataTypeGradient">&lt;gradient&gt;</a></dt>
-  <dd>A CSS gradient value as <a href="http://www.w3.org/TR/css3-images/#gradients">defined in
-  <cite>CSS Image Values and Replaced Content Module Level 3</cite></a>. Percentage values
-  are resolved against the bounding box of the element to which the gradient is applied.</dd>
-
-  <dt>&lt;color&gt;? &lt;icccolor&gt;</dt>
+  <dt>&lt;icccolor&gt;</dt>
   <dd>An ICC color [<a href='refs.html#ref-ICC42'>ICC42</a>] with an optional sRGB fallback color if the ICC color cannot
   be used.  The user agent searches the color profile description
   database for a <a href="color.html#ColorProfileDescriptions">color profile description</a>
@@ -178,7 +173,7 @@
   href="color.html#ColorProfileDescriptions">Color profile
   descriptions</a>.</dd>
 
-  <dt>[ <a>&lt;funciri&gt;</a> | child | <a>&lt;child-selector&gt;</a> ] [ none | <a>&lt;color&gt;</a> | [ <a>&lt;color&gt;</a>? <a>&lt;icccolor&gt;</a> ] ]?</dt>
+  <dt><a>&lt;url&gt;</a> <!--| child | <a>&lt;child-selector&gt;</a>--></dt>
   <dd>A reference to a <a href="pservers.html">paint server</a> element with, if
   the paint server is the last paint specified, an
   optional fallback color or <span class="prop-value">none</span>.