--- a/master/changes.html	Fri Apr 11 20:20:11 2014 +1000
+++ b/master/changes.html	Fri Apr 11 20:25:15 2014 +1000
@@ -315,6 +315,20 @@
 
 <ul>
   <li>Added WOFF requirement, rearranged content.</li>
+
+  <li class='added-since-last-wd'>Removed this chapter and the SVG Fonts
+  feature is contained, including the
+  <span class='element-name'>'font'</span>,
+  <span class='element-name'>'glyph'</span>,
+  <span class='element-name'>'missing-glyph'</span>,
+  <span class='element-name'>'hkern'</span>,
+  <span class='element-name'>'vkern'</span>,
+  <span class='element-name'>'font-face'</span>,
+  <span class='element-name'>'font-face-src'</span>,
+  <span class='element-name'>'font-face-uri'</span>,
+  <span class='element-name'>'font-face-format'</span> and
+  <span class='element-name'>'font-face-name'</span> elements
+  and their corresponding IDL interfaces.</li>
 </ul>
 
 <h3 id="extend">Extensibility chapter</h3>

--- a/master/definitions.xml	Fri Apr 11 20:20:11 2014 +1000
+++ b/master/definitions.xml	Fri Apr 11 20:25:15 2014 +1000
@@ -14,7 +14,7 @@
       href='linking.html#AElement'
       contentmodel='textoranyof'
       elementcategories='animation, descriptive, shape, structural, paint server'
-      elements='a, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
+      elements='a, clipPath, cursor, filter, 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'/>
@@ -162,7 +162,7 @@
     href='struct.html#DefsElement'
     contentmodel='anyof'
     elementcategories='animation, descriptive, shape, structural, paint server'
-    elements='a, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
+    elements='a, clipPath, cursor, filter, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
     attributecategories='core, graphical event, presentation, style'
     interfaces='SVGDefsElement'/>
   <element
@@ -198,103 +198,6 @@
   </element>
 
   <element
-      name='font'
-      href='fonts.html#FontElement'
-      contentmodel='anyof'
-      elementcategories='descriptive, paint server'
-      elements='clipPath, font-face, glyph, hkern, mask, marker, missing-glyph, script, vkern'
-      attributecategories='core, style, presentation'
-      interfaces='SVGFontElement'>
-    <attribute name='horiz-origin-x' href='fonts.html#FontElementHorizOriginXAttribute'/>
-    <attribute name='horiz-origin-y' href='fonts.html#FontElementHorizOriginYAttribute'/>
-    <attribute name='horiz-adv-x' href='fonts.html#FontElementHorizAdvXAttribute'/>
-    <attribute name='vert-origin-x' href='fonts.html#FontElementVertOriginXAttribute'/>
-    <attribute name='vert-origin-y' href='fonts.html#FontElementVertOriginYAttribute'/>
-    <attribute name='vert-adv-y' href='fonts.html#FontElementVertAdvYAttribute'/>
-  </element>
-
-  <element
-      name='font-face'
-      href='fonts.html#FontFaceElement'
-      contentmodel='anyof'
-      elements='script'
-      attributecategories='core'
-      interfaces='SVGFontFaceElement'>
-    <x:contentmodel xmlns='http://www.w3.org/1999/xhtml'>Any number of <a>descriptive elements</a>, <a>'script'</a> and at most one <a>'font-face-src'</a> element, in any order.</x:contentmodel>
-    <attribute name='font-family' href='fonts.html#FontFaceElementFontFamilyAttribute'/>
-    <attribute name='font-style' href='fonts.html#FontFaceElementFontStyleAttribute'/>
-    <attribute name='font-variant' href='fonts.html#FontFaceElementFontVariantAttribute'/>
-    <attribute name='font-weight' href='fonts.html#FontFaceElementFontWeightAttribute'/>
-    <attribute name='font-stretch' href='fonts.html#FontFaceElementFontStretchAttribute'/>
-    <attribute name='font-size' href='fonts.html#FontFaceElementFontSizeAttribute'/>
-    <attribute name='unicode-range' href='fonts.html#FontFaceElementUnicodeRangeAttribute'/>
-    <attribute name='units-per-em' href='fonts.html#FontFaceElementUnitsPerEmAttribute'/>
-    <attribute name='panose-1' href='fonts.html#FontFaceElementPanose1Attribute'/>
-    <attribute name='stemv' href='fonts.html#FontFaceElementStemvAttribute'/>
-    <attribute name='stemh' href='fonts.html#FontFaceElementStemhAttribute'/>
-    <attribute name='slope' href='fonts.html#FontFaceElementSlopeAttribute'/>
-    <attribute name='cap-height' href='fonts.html#FontFaceElementCapHeightAttribute'/>
-    <attribute name='x-height' href='fonts.html#FontFaceElementXHeightAttribute'/>
-    <attribute name='accent-height' href='fonts.html#FontFaceElementAccentHeightAttribute'/>
-    <attribute name='ascent' href='fonts.html#FontFaceElementAscentAttribute'/>
-    <attribute name='descent' href='fonts.html#FontFaceElementDescentAttribute'/>
-    <attribute name='widths' href='fonts.html#FontFaceElementWidthsAttribute'/>
-    <attribute name='bbox' href='fonts.html#FontFaceElementBboxAttribute'/>
-    <attribute name='ideographic' href='fonts.html#FontFaceElementIdeographicAttribute'/>
-    <attribute name='alphabetic' href='fonts.html#FontFaceElementAlphabeticAttribute'/>
-    <attribute name='mathematical' href='fonts.html#FontFaceElementMathematicalAttribute'/>
-    <attribute name='hanging' href='fonts.html#FontFaceElementHangingAttribute'/>
-    <attribute name='v-ideographic' href='fonts.html#FontFaceElementVertIdeographicAttribute'/>
-    <attribute name='v-alphabetic' href='fonts.html#FontFaceElementVertAlphabeticAttribute'/>
-    <attribute name='v-mathematical' href='fonts.html#FontFaceElementVertMathematicalAttribute'/>
-    <attribute name='v-hanging' href='fonts.html#FontFaceElementVertHangingAttribute'/>
-    <attribute name='underline-position' href='fonts.html#FontFaceElementUnderlinePositionAttribute'/>
-    <attribute name='underline-thickness' href='fonts.html#FontFaceElementUnderlineThicknessAttribute'/>
-    <attribute name='strikethrough-position' href='fonts.html#FontFaceElementStrikeThroughPositionAttribute'/>
-    <attribute name='strikethrough-thickness' href='fonts.html#FontFaceElementStrikeThroughThicknessAttribute'/>
-    <attribute name='overline-position' href='fonts.html#FontFaceElementOverlinePositionAttribute'/>
-    <attribute name='overline-thickness' href='fonts.html#FontFaceElementOverlineThicknessAttribute'/>
-  </element>
-
-  <element
-      name='font-face-format'
-      href='fonts.html#FontFaceFormatElement'
-      contentmodel='anyof'
-      elements='script'
-      attributecategories='core'
-      interfaces='SVGFontFaceFormatElement'>
-    <attribute name='string' href='fonts.html#FontFaceFormatElementStringAttribute'/>
-  </element>
-
-  <element
-      name='font-face-name'
-      href='fonts.html#FontFaceNameElement'
-      contentmodel='anyof'
-      elements='script'
-      attributecategories='core'
-      interfaces='SVGFontFaceNameElement'>
-    <attribute name='name' href='fonts.html#FontFaceNameElementNameAttribute'/>
-  </element>
-
-  <element
-    name='font-face-src'
-    href='fonts.html#FontFaceSrcElement'
-    contentmodel='oneormoreof'
-    elements='font-face-uri, font-face-name, script'
-    attributecategories='core'
-    interfaces='SVGFontFaceSrcElement'/>
-
-  <element
-    name='font-face-uri'
-    href='fonts.html#FontFaceURIElement'
-    contentmodel='anyof'
-    elements='font-face-format, script'
-    attributecategories='core, xlink'
-    interfaces='SVGFontFaceUriElement'>
-    <attribute name='xlink:href' href='fonts.html#FontFaceUriElementHrefAttribute'/>
-  </element>
-
-  <element
       name='foreignObject'
       href='extend.html#ForeignObjectElement'
       contentmodel='any'
@@ -311,33 +214,17 @@
     href='struct.html#GElement'
     contentmodel='anyof'
     elementcategories='animation, descriptive, shape, structural, paint server'
-    elements='a, altGlyphDef, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, text, view'
+    elements='a, altGlyphDef, clipPath, cursor, filter, foreignObject, image, marker, mask, script, style, switch, text, view'
     attributecategories='aria, navigation, conditional processing, core, graphical event, presentation, style'
     interfaces='SVGGElement'/>
 
   <element
-      name='glyph'
-      href='fonts.html#GlyphElement'
-      contentmodel='anyof'
-      elementcategories='animation, descriptive, shape, structural, paint server'
-      elements='a, altGlyphDef, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, text, view'
-      attributecategories='core, style, presentation'
-      attributes='d, horiz-adv-x, vert-origin-x, vert-origin-y, vert-adv-y'
-      interfaces='SVGGlyphElement'>
-    <attribute name='unicode' elements='glyph' href='fonts.html#GlyphElementUnicodeAttribute'/>
-    <attribute name='glyph-name' elements='glyph' href='fonts.html#GlyphElementGlyphNameAttribute'/>
-    <attribute name='orientation' elements='glyph' href='fonts.html#GlyphElementOrientationAttribute'/>
-    <attribute name='arabic-form' elements='glyph' href='fonts.html#GlyphElementArabicFormAttribute'/>
-    <attribute name='lang' elements='glyph' href='fonts.html#GlyphElementLangAttribute'/>
-  </element>
-
-  <element
       name='glyphRef'
       href='text.html#GlyphRefElement'
       elementcategories='paint server'
       contentmodel='anyof'
       elements='clipPath, marker, mask, script'
-      attributecategories='core, style, presentation, xlink'
+      attributecategories='core, style, presentation'
       interfaces='SVGGlyphRefElement'>
     <attribute name='x' href='text.html#GlyphRefElementXAttribute'/>
     <attribute name='y' href='text.html#GlyphRefElementYAttribute'/>
@@ -345,7 +232,6 @@
     <attribute name='dy' href='text.html#GlyphRefElementDYAttribute'/>
     <attribute name='glyphRef' href='text.html#GlyphRefElementGlyphRefAttribute'/>
     <attribute name='format' href='text.html#GlyphRefElementFormatAttribute'/>
-    <attribute name='xlink:href' href='text.html#GlyphRefElementHrefAttribute'/>
   </element>
 
   <element
@@ -379,15 +265,6 @@
   </element>
 
   <element
-    name='hkern'
-    href='fonts.html#HKernElement'
-    contentmodel='anyof'
-    elements='script'
-    attributecategories='core'
-    attributes='u1, g1, u2, g2, k'
-    interfaces='SVGHKernElement'/>
-
-  <element
       name='iframe'
       href='embedded.html#IframeElement'
       contentmodel='anyof'
@@ -457,7 +334,7 @@
       href='painting.html#MarkerElement'
       contentmodel='anyof'
       elementcategories='animation, descriptive, shape, structural, paint server'
-      elements='a, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
+      elements='a, clipPath, cursor, filter, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
       attributecategories='core, presentation, style'
       attributes='viewBox, preserveAspectRatio'
       interfaces='SVGMarkerElement'>
@@ -514,16 +391,6 @@
     interfaces='SVGMetadataElement'/>
 
   <element
-    name='missing-glyph'
-    href='fonts.html#MissingGlyphElement'
-    contentmodel='anyof'
-    elementcategories='animation, descriptive, shape, structural, paint server'
-    elements='a, altGlyphDef, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, text, view'
-    attributecategories='core, style, presentation'
-    attributes='d, horiz-adv-x, vert-origin-x, vert-origin-y, vert-adv-y'
-    interfaces='SVGMissingGlyphElement'/>
-
-  <element
       name='mpath'
       href='animate.html#MPathElement'
       contentmodel='anyof'
@@ -551,7 +418,7 @@
       href='pservers.html#PatternElement'
       contentmodel='anyof'
       elementcategories='animation, descriptive, shape, structural, paint server'
-      elements='a, altGlyphDef, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, text, view'
+      elements='a, altGlyphDef, clipPath, cursor, filter, foreignObject, image, marker, mask, script, style, switch, text, view'
       attributecategories='core, presentation, style, xlink'
       attributes='viewBox, preserveAspectRatio'
       interfaces='SVGPatternElement'>
@@ -700,7 +567,7 @@
       href='struct.html#SVGElement'
       contentmodel='anyof'
       elementcategories='animation, descriptive, shape, structural, paint server'
-      elements='a, altGlyphDef, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, text, view'
+      elements='a, altGlyphDef, clipPath, cursor, filter, foreignObject, image, marker, mask, script, style, switch, text, view'
       attributecategories='aria, navigation, conditional processing, core, document event, graphical event, presentation, style'
       attributes='viewBox, preserveAspectRatio, zoomAndPan'
       interfaces='SVGSVGElement'>
@@ -727,7 +594,7 @@
     href='struct.html#SymbolElement'
     contentmodel='anyof'
     elementcategories='animation, descriptive, shape, structural, paint server'
-    elements='a, altGlyphDef, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, text, view'
+    elements='a, altGlyphDef, clipPath, cursor, filter, foreignObject, image, marker, mask, script, style, switch, text, view'
     attributecategories='aria, navigation, core, graphical event, presentation, style'
     attributes='preserveAspectRatio, viewBox'
     interfaces='SVGSymbolElement'>
@@ -865,19 +732,11 @@
       interfaces='SVGViewElement'>
     <attribute name='viewTarget' elements='view' href='linking.html#ViewElementViewTargetAttribute'/>
   </element>
-  <element
-    name='vkern'
-    href='fonts.html#VKernElement'
-    contentmodel='anyof'
-    elements='script'
-    attributecategories='core'
-    attributes='u1, g1, u2, g2, k'
-    interfaces='SVGVKernElement'/>
 
   <!-- ... element categories ............................................ -->
 
   <elementcategory name='animation' href='intro.html#TermAnimationElement' elements='animate, animateMotion, animateTransform, discard, set'/>
-  <elementcategory name='container' href='intro.html#TermContainerElement' elements='svg, g, defs, symbol, mask, pattern, marker, a, switch, glyph, missing-glyph'/>
+  <elementcategory name='container' href='intro.html#TermContainerElement' elements='svg, g, defs, symbol, mask, pattern, marker, a, switch'/>
   <elementcategory name='descriptive' href='intro.html#TermDescriptiveElement' elements='desc, title, metadata'/>
   <elementcategory name='gradient' href='intro.html#TermGradientElement' elements='linearGradient, radialGradient, meshGradient'/>
   <elementcategory name='graphics' href='intro.html#TermGraphicsElement' elements='path, text, rect, circle, ellipse, line, polyline, polygon, image, use, foreignObject, iframe, video, audio, canvas'/>
@@ -900,21 +759,7 @@
   -->
 
   <!-- attributes common to both desc and title -->
-  <attribute name='lang' elements='desc, title' href='fonts.html#GlyphElementLangAttribute'/>
-
-  <!-- attributes common to both glyph and missing-glyph -->
-  <attribute name='d' elements='glyph, missing-glyph' href='fonts.html#GlyphElementDAttribute'/>
-  <attribute name='horiz-adv-x' elements='glyph, missing-glyph' href='fonts.html#GlyphElementHorizAdvXAttribute'/>
-  <attribute name='vert-origin-x' elements='glyph, missing-glyph' href='fonts.html#GlyphElementVertOriginXAttribute'/>
-  <attribute name='vert-origin-y' elements='glyph, missing-glyph' href='fonts.html#GlyphElementVertOriginYAttribute'/>
-  <attribute name='vert-adv-y' elements='glyph, missing-glyph' href='fonts.html#GlyphElementVertAdvYAttribute'/>
-
-  <!-- attributes common to hkern and vkern -->
-  <attribute name='u1' elements='hkern, vkern' href='fonts.html#HKernElementU1Attribute'/>
-  <attribute name='g1' elements='hkern, vkern' href='fonts.html#HKernElementG1Attribute'/>
-  <attribute name='u2' elements='hkern, vkern' href='fonts.html#HKernElementU2Attribute'/>
-  <attribute name='g2' elements='hkern, vkern' href='fonts.html#HKernElementG2Attribute'/>
-  <attribute name='k' elements='hkern, vkern' href='fonts.html#HKernElementKAttribute'/>
+  <attribute name='lang' elements='desc, title' href='struct.html#LangAttribute'/>
 
   <!-- attributes common to text elements -->
   <attribute name='x' elements='tref, tspan' href='text.html#TSpanElementXAttribute' animatable='yes'/>
@@ -929,8 +774,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, 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 name='xlink:show' elements='animate, set, animateMotion, mpath, animateTransform, filter, feImage, cursor, pattern, hatch, script, textPath, tref, use, image, altGlyph, linearGradient, radialGradient, meshGradient' href='linking.html#XLinkShowAttribute'/>
+  <attribute name='xlink:actuate' elements='animate, set, animateMotion, mpath, animateTransform, filter, feImage, cursor, pattern, hatch, script, textPath, tref, use, image, altGlyph, 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'/>
@@ -1321,16 +1166,6 @@
   <interface name='SVGAnimateTransformElement' href='animate.html#InterfaceSVGAnimateTransformElement'/>
   <interface name='TimeEvent' href='animate.html#InterfaceTimeEvent'/>
   <interface name='SVGAnimationElement' href='animate.html#InterfaceSVGAnimationElement'/>
-  <interface name='SVGFontElement' href='fonts.html#InterfaceSVGFontElement'/>
-  <interface name='SVGGlyphElement' href='fonts.html#InterfaceSVGGlyphElement'/>
-  <interface name='SVGMissingGlyphElement' href='fonts.html#InterfaceSVGMissingGlyphElement'/>
-  <interface name='SVGHKernElement' href='fonts.html#InterfaceSVGHKernElement'/>
-  <interface name='SVGVKernElement' href='fonts.html#InterfaceSVGVKernElement'/>
-  <interface name='SVGFontFaceElement' href='fonts.html#InterfaceSVGFontFaceElement'/>
-  <interface name='SVGFontFaceSrcElement' href='fonts.html#InterfaceSVGFontFaceSrcElement'/>
-  <interface name='SVGFontFaceUriElement' href='fonts.html#InterfaceSVGFontFaceUriElement'/>
-  <interface name='SVGFontFaceFormatElement' href='fonts.html#InterfaceSVGFontFaceFormatElement'/>
-  <interface name='SVGFontFaceNameElement' href='fonts.html#InterfaceSVGFontFaceNameElement'/>
   <interface name='SVGMetadataElement' href='metadata.html#InterfaceSVGMetadataElement'/>
   <interface name='SVGForeignObjectElement' href='extend.html#InterfaceSVGForeignObjectElement'/>
   <interface name='SVGSolidColorElement' href='pservers.html#InterfaceSVGSolidColorElement'/>

--- a/master/feature.html	Fri Apr 11 20:20:11 2014 +1000
+++ b/master/feature.html	Fri Apr 11 20:25:15 2014 +1000
@@ -409,20 +409,6 @@
   <dd>
     the <a>'animate'</a>, <a>'set'</a>, <a>'animateMotion'</a>, <a>'animateTransform'</a> and <a>'mpath'</a> elements</dd>
 </dl>
-<dl id="Font">
-  <dt>Feature String:</dt>
-  <dd>http://www.w3.org/TR/SVG11/feature#Font</dd>
-  <dt>User Agent Supports:</dt>
-  <dd>
-    the <a>'font element'</a>, <a>'font-face'</a>, <a>'glyph'</a>, <a>'missing-glyph'</a>, <a>'hkern'</a>, <a>'vkern'</a>, <a>'font-face-src'</a>, <a>'font-face-uri'</a>, <a>'font-face-format'</a> and <a>'font-face-name'</a>  elements</dd>
-</dl>
-<dl id="BasicFont">
-  <dt>Feature String:</dt>
-  <dd>http://www.w3.org/TR/SVG11/feature#BasicFont</dd>
-  <dt>User Agent Supports:</dt>
-  <dd>
-    the <a>'font element'</a>, <a>'font-face'</a>, <a>'glyph'</a>, <a>'missing-glyph'</a>, <a>'hkern'</a>, <a>'font-face-src'</a> and <a>'font-face-name'</a>  elements</dd>
-</dl>
 <dl id="Extensibility">
   <dt>Feature String:</dt>
   <dd>http://www.w3.org/TR/SVG11/feature#Extensibility</dd>

--- a/master/idlindex.html	Fri Apr 11 20:20:11 2014 +1000
+++ b/master/idlindex.html	Fri Apr 11 20:25:15 2014 +1000
@@ -53,20 +53,12 @@
   <li><a>SVGElement</a></li>
   <li><a>SVGEllipseElement</a></li>
   <li><a>SVGFitToViewBox</a></li>
-  <li><a>SVGFontElement</a></li>
-  <li><a>SVGFontFaceElement</a></li>
-  <li><a>SVGFontFaceFormatElement</a></li>
-  <li><a>SVGFontFaceNameElement</a></li>
-  <li><a>SVGFontFaceSrcElement</a></li>
-  <li><a>SVGFontFaceUriElement</a></li>
   <li><a>SVGForeignObjectElement</a></li>
   <li><a>SVGGElement</a></li>
   <li><a>SVGGeometryElement</a></li>
-  <li><a>SVGGlyphElement</a></li>
   <li><a>SVGGlyphRefElement</a></li>
   <li><a>SVGGradientElement</a></li>
   <li><a>SVGGraphicsElement</a></li>
-  <li><a>SVGHKernElement</a></li>
   <li><a>SVGImageElement</a></li>
   <li><a>SVGLength</a></li>
   <li><a>SVGLengthList</a></li>
@@ -83,7 +75,6 @@
   <li><a>SVGMeshPatchElement</a></li>
   <li><a>SVGMeshRowElement</a></li>
   <li><a>SVGMetadataElement</a></li>
-  <li><a>SVGMissingGlyphElement</a></li>
   <li><a>SVGNumber</a></li>
   <li><a>SVGNumberList</a></li>
   <li><a>SVGPathElement</a></li>
@@ -140,7 +131,6 @@
   <li><a>SVGURIReference</a></li>
   <li><a>SVGUnitTypes</a></li>
   <li><a>SVGUseElement</a></li>
-  <li><a>SVGVKernElement</a></li>
   <li><a>SVGViewElement</a></li>
   <li><a>SVGViewSpec</a></li>
   <li><a>SVGZoomAndPan</a></li>

--- a/master/linking.html	Fri Apr 11 20:20:11 2014 +1000
+++ b/master/linking.html	Fri Apr 11 20:25:15 2014 +1000
@@ -168,7 +168,7 @@
 
 <ul>
   <li>the <a>'a'</a> element can reference any local or non-local resource</li>
-  <li>the <a>'altGlyph'</a> element must reference either an <a>'altGlyphDef'</a> element or a <a>'glyph'</a> element</li>
+  <li>the <a>'altGlyph'</a> element must reference an <a>'altGlyphDef'</a> element</li>
   <li>the <a>'animate'</a> element (see <a href="animate.html#TargetElement">Identifying the target element for an animation</a> for reference rules)</li>
   <li>the <a>'animateMotion'</a> element (see <a href="animate.html#TargetElement">Identifying the target element for an animation</a> for reference rules)</li>
   <li>the <a>'animateTransform'</a> element (see <a href="animate.html#TargetElement">Identifying the target element for an animation</a> for reference rules)</li>

--- a/master/struct.html	Fri Apr 11 20:20:11 2014 +1000
+++ b/master/struct.html	Fri Apr 11 20:25:15 2014 +1000
@@ -1723,7 +1723,7 @@
   </table>
 </div>
 
-<p class="issue">Should we be moving <span class="attr-name">'lang'</span> instead
+<p class="issue" id="LangAttribute">Should we be moving <span class="attr-name">'lang'</span> instead
 of <span class="attr-name">'xlink:lang'</span>?</p>
 
 <dl class="attrdef-list">
@@ -2082,16 +2082,6 @@
       <td>no restrictions</td>
     </tr>
     <tr>
-      <td><a>'glyph'</a></td>
-      <td>none</td>
-      <td>no role may be applied</td>
-    </tr>
-    <tr>
-      <td><a>'glyphRef'</a></td>
-      <td>none</td>
-      <td>no role may be applied</td>
-    </tr>
-    <tr>
       <td><a>'hatch'</a></td>
       <td>none</td>
       <td>no role may be applied</td>
@@ -2152,11 +2142,6 @@
       <td>no role may be applied</td>
     </tr>
     <tr>
-      <td><a>'missing-glyph'</a></td>
-      <td>none</td>
-      <td>no role may be applied</td>
-    </tr>
-    <tr>
       <td><a>'mpath'</a></td>
       <td>none</td>
       <td>no role may be applied</td>

--- a/master/text.html	Fri Apr 11 20:20:11 2014 +1000
+++ b/master/text.html	Fri Apr 11 20:25:15 2014 +1000
@@ -6446,17 +6446,10 @@
 
       <p>
 	An <a href="linking.html#IRIReference">IRI reference</a>
-        either to a <a>'glyph'</a> element in an SVG document fragment
-        or to an <a>'altGlyphDef'</a> element.
+        to an <a>'altGlyphDef'</a> element.
       </p>
       <p>
-        If the reference is to a <a>'glyph'</a> element and that glyph
-        is available, then that glyph is rendered instead of the
-        character(s) that are inside of the <a>'altGlyph'</a> element.
-      </p>
-      <p>
-        If the reference is to an <a>'altGlyphDef'</a> element, then
-        if an appropriate set of alternate glyphs is located from
+        If an appropriate set of alternate glyphs is located from
         processing the <a>'altGlyphDef'</a> element, then those
         alternate glyphs are rendered instead of the character(s) that
         are inside of the <a>'altGlyph'</a> element.
@@ -6633,8 +6626,8 @@
     identification of alternate glyphs to use, then the character(s)
     that are inside of the <a>'altGlyph'</a> element are rendered as
     if the <a>'altGlyph'</a> element were a <a>'tspan'</a> element
-    instead.</p> <p>An <a>'altGlyph'</a> element either references a
-    <a>'glyph'</a> element or an <a>'altGlyphDef'</a> element via its
+    instead.</p> <p>An <a>'altGlyph'</a> element references
+    an <a>'altGlyphDef'</a> element via its
     <a>'xlink:href'</a> attribute or identifies a glyph by means of
     <a href="text.html#FontPropertiesUsedBySVG">font selection
     properties</a>, a glyph identifier and a font format. If
@@ -6714,23 +6707,6 @@
 <h4 id="GlyphRefAttributes">Attributes</h4>
 
   <dl class="attrdef-list-svg2">
-    <dt id="GlyphRefElementHrefAttribute"><span class="adef">xlink:href</span></dt>
-    <dd>
-      <p>
-	An <a href="linking.html#IRIReference">IRI reference</a> to
-        a <a>'glyph'</a> element in an SVG document fragment. The
-        referenced <a>'glyph'</a> is rendered as an alternate
-        glyph.
-      </p>
-
-      <dl class="attrdef-svg2">
-	<dt>Value</dt>                <dd><a href="types.html#DataTypeIRI">&lt;iri&gt;</a></dd>
-	<dt><a>Lacuna value</a></dt>  <dd></dd>
-	<dt><a>Animatable</a></dt>    <dd>no</dd>
-      </dl>
-
-    </dd>
-
     <dt id="GlyphRefElementGlyphRefAttribute"><span class="adef">glyphRef</span></dt>
     <dd>
       <p>
@@ -6853,9 +6829,7 @@
   </dl>
 
   <p>
-    A <a>'glyphRef element'</a> either references a
-    <a>'glyph'</a> element in an SVG document fragment via its
-    <a>'xlink:href'</a> attribute or identifies a glyph by means
+    A <a>'glyphRef element'</a> identifies a glyph by means
     of <a href="text.html#FontPropertiesUsedBySVG">font selection
     properties</a>, a glyph identifier and a font format. If
     insufficient attributes and properties have been specified to
@@ -7845,9 +7819,7 @@
   attribute float <a href="text.html#__svg__SVGGlyphRefElement__y">y</a>;
   attribute float <a href="text.html#__svg__SVGGlyphRefElement__dx">dx</a>;
   attribute float <a href="text.html#__svg__SVGGlyphRefElement__dy">dy</a>;
-};
-
-<a>SVGGlyphRefElement</a> implements <a>SVGURIReference</a>;</pre>
+};</pre>
 
 <dl class="interface">
 <dt class="attributes-header">Attributes:</dt>