--- a/master/changes.html	Mon Feb 10 17:03:04 2014 +1100
+++ b/master/changes.html	Mon Feb 10 17:47:28 2014 +1100
@@ -87,7 +87,7 @@
 
   <li class='added-since-last-wd'>Added <a href="types.html#__svg__SVGElement__focus">focus</a> and <a href="types.html#__svg__SVGElement__blur">blur</a> operations and <a href='types.html#__svg__SVGElement__tabIndex'>tabIndex</a> attribute to <a>SVGElement</a>.</li>
 
-  <li class='added-since-last-wd'>Added <a href="types.html#__svg__SVGDocument__activeElement">activeElement</a> attribute to <a>Document</a>.</li>
+  <li class='added-since-last-wd'>Added <a href="struct.html#__svg__SVGDocument__activeElement">activeElement</a> attribute to <a>Document</a>.</li>
 
   <li class='added-since-last-wd'>Made <a>SVGElement</a> implement the <a>GlobalEventHandlers</a> interface from HTML.</li>
 

--- a/master/definitions.xml	Mon Feb 10 17:03:04 2014 +1100
+++ b/master/definitions.xml	Mon Feb 10 17:47:28 2014 +1100
@@ -14,7 +14,7 @@
       href='linking.html#AElement'
       contentmodel='textoranyof'
       elementcategories='animation, descriptive, shape, structural, paint server'
-      elements='a, clipPath, color-profile, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
+      elements='a, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
       attributecategories='aria, navigation, conditional processing, core, graphical event, presentation, style, xlink'
       interfaces='SVGAElement'>
     <attribute name='xlink:href' href='linking.html#AElementXLinkHrefAttribute' animatable='yes'/>
@@ -79,7 +79,7 @@
     <!--
     <attribute name='calcMode' href='animate.html#AnimateMotionElementCalcModeAttribute'/>
     -->
-    <attribute name='path' href='animate.html#PathAttribute'/>
+    <attribute name='path' href='animate.html#AnimateMotionPathAttribute'/>
     <attribute name='keyPoints' href='animate.html#KeyPointsAttribute'/>
     <attribute name='rotate' href='animate.html#RotateAttribute'/>
     <attribute name='origin' href='animate.html#OriginAttribute'/>
@@ -143,19 +143,6 @@
   </element>
 
   <element
-      name='color-profile'
-      href='color.html#ColorProfileElement'
-      contentmodel='anyof'
-      elementcategories='descriptive'
-      attributecategories='core, xlink'
-      interfaces='SVGColorProfileElement'>
-    <attribute name='local' href='color.html#ColorProfileElementLocalAttribute'/>
-    <attribute name='name' href='color.html#ColorProfileElementNameAttribute'/>
-    <attribute name='rendering-intent' href='color.html#ColorProfileElementRenderingIntentAttribute'/>
-    <attribute name='xlink:href' href='color.html#ColorProfileElementHrefAttribute'/>
-  </element>
-
-  <element
       name='cursor'
       href='interact.html#CursorElement'
       contentmodel='anyof'
@@ -172,7 +159,7 @@
     href='struct.html#DefsElement'
     contentmodel='anyof'
     elementcategories='animation, descriptive, shape, structural, paint server'
-    elements='a, clipPath, color-profile, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
+    elements='a, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
     attributecategories='core, graphical event, presentation, style'
     interfaces='SVGDefsElement'/>
   <element
@@ -314,7 +301,7 @@
     href='struct.html#GElement'
     contentmodel='anyof'
     elementcategories='animation, descriptive, shape, structural, paint server'
-    elements='a, clipPath, color-profile, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
+    elements='a, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
     attributecategories='aria, navigation, conditional processing, core, graphical event, presentation, style'
     interfaces='SVGGElement'/>
 
@@ -323,7 +310,7 @@
       href='fonts.html#GlyphElement'
       contentmodel='anyof'
       elementcategories='animation, descriptive, shape, structural, paint server'
-      elements='a, clipPath, color-profile, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
+      elements='a, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
       attributecategories='core, style, presentation'
       attributes='d, horiz-adv-x, vert-origin-x, vert-origin-y, vert-adv-y'
       interfaces='SVGGlyphElement'>
@@ -361,7 +348,7 @@
     <attribute name='x' href='pservers.html#HatchElementXAttribute' animatable='yes'/>
     <attribute name='y' href='pservers.html#HatchElementYAttribute' animatable='yes'/>
     <attribute name='pitch' href='pservers.html#HatchElementPitchAttribute' animatable='yes'/>
-    <attribute name='angle' href='pservers.html#HatchElementAngleAttribute' animatable='yes'/>
+    <attribute name='rotate' href='pservers.html#HatchElementRotateAttribute' animatable='yes'/>
     <attribute name='hatchUnits' href='pservers.html#HatchElementHatchUnitsAttribute' animatable='yes'/>
     <attribute name='hatchContentUnits' href='pservers.html#HatchElementHatchContentUnitsAttribute' animatable='yes'/>
     <attribute name='hatchTransform' href='pservers.html#HatchElementHatchTransformAttribute' animatable='yes'/>
@@ -456,7 +443,7 @@
       href='painting.html#MarkerElement'
       contentmodel='anyof'
       elementcategories='animation, descriptive, shape, structural, paint server'
-      elements='a, clipPath, color-profile, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
+      elements='a, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
       attributecategories='core, presentation, style'
       attributes='viewBox, preserveAspectRatio'
       interfaces='SVGMarkerElement'>
@@ -517,7 +504,7 @@
     href='fonts.html#MissingGlyphElement'
     contentmodel='anyof'
     elementcategories='animation, descriptive, shape, structural, paint server'
-    elements='a, clipPath, color-profile, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
+    elements='a, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
     attributecategories='core, style, presentation'
     attributes='d, horiz-adv-x, vert-origin-x, vert-origin-y, vert-adv-y'
     interfaces='SVGMissingGlyphElement'/>
@@ -549,7 +536,7 @@
       href='pservers.html#PatternElement'
       contentmodel='anyof'
       elementcategories='animation, descriptive, shape, structural, paint server'
-      elements='a, clipPath, color-profile, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
+      elements='a, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
       attributecategories='core, presentation, style, xlink'
       attributes='viewBox, preserveAspectRatio'
       interfaces='SVGPatternElement'>
@@ -697,7 +684,7 @@
       href='struct.html#SVGElement'
       contentmodel='anyof'
       elementcategories='animation, descriptive, shape, structural, paint server'
-      elements='a, clipPath, color-profile, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
+      elements='a, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
       attributecategories='aria, navigation, conditional processing, core, document event, graphical event, presentation, style'
       attributes='viewBox, preserveAspectRatio, zoomAndPan'
       interfaces='SVGSVGElement'>
@@ -726,7 +713,7 @@
     href='struct.html#SymbolElement'
     contentmodel='anyof'
     elementcategories='animation, descriptive, shape, structural, paint server'
-    elements='a, clipPath, color-profile, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
+    elements='a, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
     attributecategories='aria, navigation, core, graphical event, presentation, style'
     attributes='preserveAspectRatio, viewBox'
     interfaces='SVGSymbolElement'>
@@ -925,8 +912,8 @@
   <!-- <attribute name='width' elements='text' href='text.html#TextElementWidthAttribute' animatable='yes'/> -->
 
   <!-- xlink:show and xlink:actuate for all elements supporting the XLink attributes, except a -->
-  <attribute name='xlink:show' elements='animate, set, animateMotion, mpath, animateTransform, color-profile, filter, feImage, font-face-uri, cursor, pattern, hatch, script, textPath, tref, use, image, altGlyph, glyphRef, linearGradient, radialGradient, meshGradient' href='linking.html#XLinkShowAttribute'/>
-  <attribute name='xlink:actuate' elements='animate, set, animateMotion, mpath, animateTransform, color-profile, filter, feImage, font-face-uri, cursor, pattern, hatch, script, textPath, tref, use, image, altGlyph, glyphRef, linearGradient, radialGradient, meshGradient' href='linking.html#XLinkActuateAttribute'/>
+  <attribute name='xlink:show' elements='animate, set, animateMotion, mpath, animateTransform, filter, feImage, font-face-uri, cursor, pattern, hatch, script, textPath, tref, use, image, altGlyph, glyphRef, linearGradient, radialGradient, meshGradient' href='linking.html#XLinkShowAttribute'/>
+  <attribute name='xlink:actuate' elements='animate, set, animateMotion, mpath, animateTransform, filter, feImage, font-face-uri, cursor, pattern, hatch, script, textPath, tref, use, image, altGlyph, glyphRef, linearGradient, radialGradient, meshGradient' href='linking.html#XLinkActuateAttribute'/>
 
   <!-- attribute common to all animation elements -->
   <attribute name='xlink:href' elements='animate, animateMotion, animateTransform, set' href='animate.html#HrefAttribute'/>
@@ -1029,7 +1016,6 @@
       href='intro.html#TermGraphicalEventAttribute'>
     <attribute name='onfocusin' href='script.html#OnFocusInEventAttribute'/>
     <attribute name='onfocusout' href='script.html#OnFocusOutEventAttribute'/>
-    <attribute name='onactivate' href='script.html#OnActivateEventAttribute'/>
     <attribute name='onclick' href='script.html#OnClickEventAttribute'/>
     <attribute name='onmousedown' href='script.html#OnMouseDownEventAttribute'/>
     <attribute name='onmouseup' href='script.html#OnMouseUpEventAttribute'/>
@@ -1292,7 +1278,6 @@
   <interface name='SVGMarkerElement' href='painting.html#InterfaceSVGMarkerElement'/>
   <interface name='SVGMarkerInstance' href='painting.html#InterfaceSVGMarkerInstance'/>
   <interface name='SVGMarkerList' href='painting.html#InterfaceSVGMarkerList'/>
-  <interface name='SVGColorProfileElement' href='color.html#InterfaceSVGColorProfileElement'/>
   <interface name='SVGColorProfileRule' href='color.html#InterfaceSVGColorProfileRule'/>
   <interface name='SVGLinearGradientElement' href='pservers.html#InterfaceSVGLinearGradientElement'/>
   <interface name='SVGRadialGradientElement' href='pservers.html#InterfaceSVGRadialGradientElement'/>

--- a/master/feature.html	Mon Feb 10 17:03:04 2014 +1100
+++ b/master/feature.html	Mon Feb 10 17:47:28 2014 +1100
@@ -357,7 +357,7 @@
   http://www.w3.org/TR/SVG11/feature#GraphicalEventsAttribute</dd>
   <dt>User Agent Supports:</dt>
   <dd>
-    the <a>'onfocusin'</a>, <a>'onfocusout'</a>, <a>'onactivate'</a>, <a>'onclick'</a>, <a>'onmousedown'</a>, <a>'onmouseup'</a>, <a>'onmouseover'</a>, <a>'onmousemove'</a>, <a>'onmouseout'</a> and <a>'svg/onload'</a> attributes</dd>
+    the <a>'onfocusin'</a>, <a>'onfocusout'</a>, <a>'onclick'</a>, <a>'onmousedown'</a>, <a>'onmouseup'</a>, <a>'onmouseover'</a>, <a>'onmousemove'</a>, <a>'onmouseout'</a> and <a>'svg/onload'</a> attributes</dd>
 </dl>
 <dl id="AnimationEventsAttribute">
   <dt>Feature String:</dt>
@@ -517,8 +517,8 @@
   includes all of the language capabilities defined for
   <strong>"org.w3c.svg.animation"</strong> plus the
   availability of all of the language capabilities defined in
-  <a href="svgdom.html#RelationshipWithDOM2Events">Relationship
-  with DOM2 events</a>, <a href="linking.html">Linking</a> and
+  <a href="svgdom.html#RelationshipWithDOM3Events">Relationship
+  with DOM3 events</a>, <a href="linking.html">Linking</a> and
   <a href="interact.html">Interactivity</a> and
   <a href="script.html">Scripting</a>. For SVG viewers running on
   media capable of rendering time-based material, such as

--- a/master/idlindex.html	Mon Feb 10 17:03:04 2014 +1100
+++ b/master/idlindex.html	Mon Feb 10 17:47:28 2014 +1100
@@ -45,7 +45,6 @@
   <li><a>SVGCSSRule</a></li>
   <li><a>SVGCircleElement</a></li>
   <li><a>SVGClipPathElement</a></li>
-  <li><a>SVGColorProfileElement</a></li>
   <li><a>SVGColorProfileRule</a></li>
   <li><a>SVGCursorElement</a></li>
   <li><a>SVGDefsElement</a></li>

--- a/master/intro.html	Mon Feb 10 17:03:04 2014 +1100
+++ b/master/intro.html	Mon Feb 10 17:47:28 2014 +1100
@@ -265,7 +265,7 @@
     There are three kinds of bounding boxes that can be computed
     for an element: the <a>object bounding box</a>, the <a>stroke bounding box</a>
     and the <a>decorated bounding box</a>.  See
-    <a href="coords.html#TermBoundingBoxes">Bounding boxes</a> for a more detailed
+    <a href="coords.html#BoundingBoxes">Bounding boxes</a> for a more detailed
     description of these bounding boxes and how they are computed.</p>
   </dd>
 
@@ -284,8 +284,8 @@
   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
-  <a href="https://dvcs.w3.org/hg/FXTF/raw-file/default/masking/index.html#clipping-paths">Clipping paths</a>
-  from <a href="https://dvcs.w3.org/hg/FXTF/raw-file/default/masking/index.html"><cite>CSS Masking</cite></a>
+  <a href="https://dvcs.w3.org/hg/FXTF/raw-file/default/css-masking-1/index.html#clipping-paths">Clipping paths</a>
+  from <a href="https://dvcs.w3.org/hg/FXTF/raw-file/default/css-masking-1/index.html"><cite>CSS Masking</cite></a>
   ([<a href="refs.html#ref-CSS-MASKING">CSS-MASKING</a>], section 8).</dd>
 
   <dt id="TermContainerElement">container element</dt>
@@ -499,7 +499,7 @@
   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 href="https://dvcs.w3.org/hg/FXTF/raw-file/default/masking/index.html"><cite>CSS Masking</cite></a>
+  <a href="https://dvcs.w3.org/hg/FXTF/raw-file/default/css-masking-1/index.html"><cite>CSS Masking</cite></a>
   [<a href="refs.html#ref-CSS-MASKING">CSS-MASKING</a>].</dd>
 
   <dt id="TermNonLocalIRIReference">non-local IRI reference</dt>

--- a/master/paths.html	Mon Feb 10 17:03:04 2014 +1100
+++ b/master/paths.html	Mon Feb 10 17:47:28 2014 +1100
@@ -122,7 +122,7 @@
     scale all distance-along-a-path computations by the ratio
     of <a>'pathLength'</a> to the user
     agent's own computed value for total path length. <a>'pathLength'</a> potentially affects
-    calculations for <a href="text.html#TextOnAPath">text on a path</a>,
+    calculations for <a href="text.html#TextLayoutPath">text on a path</a>,
     <a href="animate.html#AnimateMotionElement">motion animation</a> and
     various <a href="painting.html#StrokeProperties">stroke operations</a>.</p>
     <p>A negative value is an error (see <a href="implnote.html#ErrorProcessing">Error processing</a>).</p>
@@ -1025,7 +1025,7 @@
 <h2 id="DistanceAlongAPath">Distance along a path</h2>
 
 <p>Various operations, including <a
-href="text.html#TextOnAPath">text on a path</a> and <a
+href="text.html#TextLayoutPath">text on a path</a> and <a
 href="animate.html#AnimateMotionElement">motion animation</a>
 and various <a href="painting.html#StrokeProperties">stroke
 operations</a>, require that the user agent compute the

--- a/master/refs.html	Mon Feb 10 17:03:04 2014 +1100
+++ b/master/refs.html	Mon Feb 10 17:47:28 2014 +1100
@@ -279,7 +279,7 @@
   </dd>
 
 <dl class="references ready-for-wider-review">
-  <dt id="ref-MEDIAFRAGMENTURI" class="normref">[MEDIAFRAGMENTSURI]</dt>
+  <dt id="ref-MEDIAFRAGMENTSURI" class="normref">[MEDIAFRAGMENTSURI]</dt>
   <dd>
     <cite class="w3crec"><a href="http://www.w3.org/TR/2012/REC-media-frags-20120925/">Media Fragments URI 1.0 (basic)</a></cite>,
     R. Troncy, E. Mannens, S. Pfeiffer, D. Van Deursen, eds.

--- a/master/render.html	Mon Feb 10 17:03:04 2014 +1100
+++ b/master/render.html	Mon Feb 10 17:47:28 2014 +1100
@@ -223,8 +223,8 @@
 typically anti-aliased on low-resolution devices (see
 <a>'shape-rendering'</a>. Clipping is
 described in
-<a href="https://dvcs.w3.org/hg/FXTF/raw-file/default/masking/index.html#clipping-paths">Clipping paths</a>
-from <a href="https://dvcs.w3.org/hg/FXTF/raw-file/default/masking/index.html#clipping-paths"><cite>CSS Masking</cite></a>
+<a href="https://dvcs.w3.org/hg/FXTF/raw-file/default/css-masking-1/index.html#clipping-paths">Clipping paths</a>
+from <a href="https://dvcs.w3.org/hg/FXTF/raw-file/default/css-masking-1/index.html#clipping-paths"><cite>CSS Masking</cite></a>
 ([<a href="refs.html#ref-CSS-MASKING">CSS-MASKING</a>], section 8).</p>
 
 <div class="ready-for-wider-review">
@@ -235,7 +235,7 @@
 The resulting alpha value is used as input to the Compositing
 and Blending operations described in the Compositing and Blending Specification [<a href="refs.html#ref-COMPOSITINGBLENDING">COMPOSITING-BLENDING</a>].
 Masking is described in detail in
-<a href="https://dvcs.w3.org/hg/FXTF/raw-file/default/masking/index.html"><cite>CSS Masking</cite></a>
+<a href="https://dvcs.w3.org/hg/FXTF/raw-file/default/css-masking-1/index.html"><cite>CSS Masking</cite></a>
 [<a href="refs.html#ref-CSS-MASKING">CSS-MASKING</a>].</p>
 
 <p>A supplemental masking operation may also be specified by

--- a/master/shapes.html	Mon Feb 10 17:03:04 2014 +1100
+++ b/master/shapes.html	Mon Feb 10 17:47:28 2014 +1100
@@ -311,7 +311,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="RectElementRAttribute">r</dfn></td>
+        <td><dfn id="CircleElementRAttribute">r</dfn></td>
         <td><a>&lt;length&gt;</a></td>
         <td>0</td>
         <td>yes</td>
@@ -436,7 +436,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="LineElementX1Attribute">x1</dfn>, <dfn id="EllipseElementY1Attribute">y1</dfn></td>
+        <td><dfn id="LineElementX1Attribute">x1</dfn>, <dfn id="LineElementY1Attribute">y1</dfn></td>
         <td><a>&lt;length&gt;</a></td>
         <td>0</td>
         <td>yes</td>
@@ -455,7 +455,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="LineElementX2Attribute">x2</dfn>, <dfn id="EllipseElementY2Attribute">y2</dfn></td>
+        <td><dfn id="LineElementX2Attribute">x2</dfn>, <dfn id="LineElementY2Attribute">y2</dfn></td>
         <td><a>&lt;length&gt;</a></td>
         <td>0</td>
         <td>yes</td>

--- a/master/svgdom.html	Mon Feb 10 17:03:04 2014 +1100
+++ b/master/svgdom.html	Mon Feb 10 17:47:28 2014 +1100
@@ -365,7 +365,7 @@
   // process the event
 }
 // ... later ...
-myElement.addEventListener("DOMActivate", myAction1, false)
+myElement.addEventListener("click", myAction1, false)
 </pre>
 
 <p>In ECMAScript, the character data content of an
@@ -377,11 +377,11 @@
 <strong>evt</strong>. For example, it is possible to write:</p>
 
 <pre><![CDATA[
-<rect onactivate="MyActivateHandler(evt)" .../>
+<rect onclick="MyClickHandler(evt)" .../>
 ]]></pre>
 
 <p>which will pass the <a>Event</a> object <strong>evt</strong> into
-function <code>MyActivateHandler</code>.</p>
+function <code>MyClickHandler</code>.</p>
 
 <h2 id="RelationshipWithCSSOM">Relationship with DOM Level 2 CSS</h2>
 

--- a/master/text.html	Mon Feb 10 17:03:04 2014 +1100
+++ b/master/text.html	Mon Feb 10 17:47:28 2014 +1100
@@ -718,7 +718,7 @@
 
     </dd>
 
-    <dt id="TextElementLengthAdjust"><span class="adef">lengthAdjust</span></dt>
+    <dt id="TextElementLengthAdjustAttribute"><span class="adef">lengthAdjust</span></dt>
     <dd>
 
       <p>
@@ -767,7 +767,7 @@
       </p>
     </dd>
 
-    <dt id="TextElementHeight"><span class="adef">height</span></dt>
+    <dt id="TextElementHeightAttribute"><span class="adef">height</span></dt>
     <dd>
       <p class="annotation">Added according to Resolution from June 27th, 2013.</p>
       <p>
@@ -789,7 +789,7 @@
 
     </dd>
 
-    <dt id="TextElementWidth"><span class="adef">width</span></dt>
+    <dt id="TextElementWidthAttribute"><span class="adef">width</span></dt>
     <dd>
       <p class="annotation">Redefined according to Resolution from June 27th, 2013.</p>
       <p>
@@ -1101,7 +1101,7 @@
 
     </dd>
 
-    <dt id="TextElementTextLengthAttribute"><span class="adef">textLength</span></dt>
+    <dt id="TSpanElementTextLengthAttribute"><span class="adef">textLength</span></dt>
     <dd>
 
       <p>
@@ -2477,7 +2477,7 @@
     <a href="#FontsTablesBaselines">baseline table</a>.
   </p>
 
-<h4 id="InlineProgressionDirection">The inline-progression-direction: the <span class="property">'writing-mode'</span> property</h4>
+<h4 id="SettingInlineProgressionDirection">The inline-progression-direction: the <span class="property">'writing-mode'</span> property</h4>
 
   <div class="issue">
     <p>
@@ -4903,7 +4903,7 @@
 
 <h3>Alignment</h3>
 
-<h4 id='TextAlign'>Text alignment: the <span class="property">'text-align'</span> property</h4>
+<h4 id='TextAlignProperty'>Text alignment: the <span class="property">'text-align'</span> property</h4>
 
   <p class="note">
     See the CSS Text Module Level 3 specification for the definition
@@ -4911,7 +4911,7 @@
     [<a href="refs.html#ref-CSS21">CSSXX</a>]
   </p>
 
-<h4 id='TextAlignLast'>Last line alignment: the <span class="property">'text-align-last'</span> property</h4>
+<h4 id='TextAlignLastProperty'>Last line alignment: the <span class="property">'text-align-last'</span> property</h4>
 
   <p class="note">
     See the CSS Text Module Level 3 specification for the definition
@@ -4935,14 +4935,14 @@
     [<a href="refs.html#ref-CSS21">CSSXX</a>]
   </p>
 
-<h4 id="HyphenProperty">Hyphenation Control: the <span class="property">‘hyphens’</span> property</h4>
+<h4 id="HyphensProperty">Hyphenation Control: the <span class="property">‘hyphens’</span> property</h4>
   <p class="note">
     See the CSS Text Module Level 3 specification for the definition
     of <a href="http://dev.w3.org/csswg/css-text/#hyphens">'hyphens'</a>.
     [<a href="refs.html#ref-CSS21">CSSXX</a>]
   </p>
 
-<h4 id="WordWrapProperty">Overflow Wrapping: the <span class="property">‘word-wrap’</span> and <span class="property">‘overflow-wrap’</span> properties</h4>
+<h4 id="WordWrapProperty">Overflow Wrapping: the <span class="property">‘word-wrap’</span> and <span class="property" id="OverflowWrapProperty">‘overflow-wrap’</span> properties</h4>
   <p class="note">
     See the CSS Text Module Level 3 specification for the definition
     of <a href="http://dev.w3.org/csswg/css-text/#word-wrap">'word-wrap'</a>.