--- a/master/definitions.xml	Mon Nov 21 14:49:57 2011 +0100
+++ b/master/definitions.xml	Thu Dec 01 12:01:22 2011 +0100
@@ -4,6 +4,11 @@
 
   <!-- ... elements and element-specific attributes ....................... -->
 
+  <!-- Note: Attributes must be listed only once, either in
+       'attributes' or in an <attribute>.  If listed in 'attributes'
+       then a stand-alone <attribute> entry must be added in the next
+       section.
+  -->
   <element
       name='a'
       href='linking.html#AElement'
@@ -930,7 +935,7 @@
       elementcategories='animation, descriptive, shape, structural, gradient'
       elements='a, clipPath, color-profile, cursor, filter, font, font-face, foreignObject, image, marker, mask, pattern, script, style, switch, view, text, altGlyphDef'
       attributecategories='conditional processing, core, document event, graphical event, presentation, style'
-      attributes='externalResourcesRequired, x, y, width, height, viewBox, preserveAspectRatio, zoomAndPan, version, baseProfile, contentScriptType, contentStyleType'
+      attributes='externalResourcesRequired, viewBox, preserveAspectRatio, zoomAndPan, contentScriptType, contentStyleType'
       interfaces='SVGSVGElement'>
     <attribute name='x' href='struct.html#SVGElementXAttribute' animatable='yes'/>
     <attribute name='y' href='struct.html#SVGElementYAttribute' animatable='yes'/>
@@ -984,7 +989,7 @@
       elementcategories='descriptive'
       elements='animate, animateColor, a, set, tspan, tref, altGlyph'
       attributecategories='conditional processing, core, graphical event, presentation, style, xlink'
-      attributes='externalResourcesRequired'
+      attributes='externalResourcesRequired, lengthAdjust, textLength'
       interfaces='SVGTextPathElement'>
     <attribute name='xlink:href' href='text.html#TextPathElementHrefAttribute' animatable='yes'/>
     <attribute name='startOffset' href='text.html#TextPathElementStartOffsetAttribute' animatable='yes'/>
@@ -1006,7 +1011,7 @@
       elementcategories='descriptive'
       elements='animate, animateColor, set'
       attributecategories='conditional processing, core, graphical event, presentation, style, xlink'
-      attributes='externalResourcesRequired'
+      attributes='externalResourcesRequired, x, y, dx, dy, rotate, textLength, lengthAdjust'
       interfaces='SVGTRefElement'>
     <attribute name='xlink:href' elements='tref' href='text.html#TRefElementHrefAttribute' animatable='yes'/>
   </element>
@@ -1072,6 +1077,12 @@
 
   <!-- ... attributes common to multiple elements ........................ -->
 
+  <!-- Note: An <attribute> defined here applies only to the listed
+       elements if a list is given in 'elements', otherwise, it
+       applies to all <element>s that include the attribute name in
+       their 'attribute' attribute.
+  -->
+
   <!-- 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'/>
@@ -1080,7 +1091,7 @@
   <attribute name='vert-adv-y' elements='glyph, missing-glyph' href='fonts.html#GlyphElementVertAdvYAttribute'/>
 
   <!-- attribute common to most filter primitives (all except feFlood feImage feMerge feTurbulence -->
-  <attribute name='in' elements='feBlend, feColorMatrix, feComponentTransfer, feComposite, feConvolveMatrix, feDiffuseLighting, feDisplacementMap, feGaussianBlur, feMorphology, feOffset, feSpecularLighting, feTile' href='filters.html#FilterPrimitiveInAttribute' animatable='yes'/>
+  <attribute name='in' elements='feBlend, feColorMatrix, feComponentTransfer, feComposite, feConvolveMatrix, feDiffuseLighting, feDisplacementMap, feGaussianBlur, feMergeNode, feMorphology, feOffset, feSpecularLighting, feTile' href='filters.html#FilterPrimitiveInAttribute' animatable='yes'/>
 
   <!-- attributes common to hkern and vkern -->
   <attribute name='u1' elements='hkern, vkern' href='fonts.html#HKernElementU1Attribute'/>
@@ -1090,13 +1101,13 @@
   <attribute name='k' elements='hkern, vkern' href='fonts.html#HKernElementKAttribute'/>
 
   <!-- attributes common to text elements -->
-  <attribute name='x' elements='tspan, tref' href='text.html#TSpanElementXAttribute' animatable='yes'/>
-  <attribute name='y' elements='tspan, tref' href='text.html#TSpanElementYAttribute' animatable='yes'/>
-  <attribute name='dx' elements='tspan, tref' href='text.html#TSpanElementDXAttribute' animatable='yes'/>
-  <attribute name='dy' elements='tspan, tref' href='text.html#TSpanElementDYAttribute' animatable='yes'/>
-  <attribute name='rotate' elements='tspan, tref' href='text.html#TSpanElementRotateAttribute' animatable='yes'/>
-  <attribute name='textLength' elements='tspan, tref, textPath' href='text.html#TSpanElementTextLengthAttribute' animatable='yes'/>
-  <attribute name='lengthAdjust' elements='text, tspan, tref, textPath' href='text.html#TextElementLengthAdjustAttribute' animatable='yes'/>
+  <attribute name='x' elements='tref, tspan' href='text.html#TSpanElementXAttribute' animatable='yes'/>
+  <attribute name='y' elements='tref, tspan' href='text.html#TSpanElementYAttribute' animatable='yes'/>
+  <attribute name='dx' elements='tref, tspan' href='text.html#TSpanElementDXAttribute' animatable='yes'/>
+  <attribute name='dy' elements='tref, tspan' href='text.html#TSpanElementDYAttribute' animatable='yes'/>
+  <attribute name='rotate' elements='tref, tspan' href='text.html#TSpanElementRotateAttribute' animatable='yes'/>
+  <attribute name='textLength' elements='textPath, tref, tspan' href='text.html#TSpanElementTextLengthAttribute' animatable='yes'/>
+  <attribute name='lengthAdjust' elements='text, textPath, tref, tspan' href='text.html#TextElementLengthAdjustAttribute' 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, animateColor, animateTransform, color-profile, filter, feImage, font-face-uri, cursor, pattern, script, use, image, altGlyph, glyphRef' href='linking.html#XLinkShowAttribute'/>
@@ -1105,7 +1116,7 @@
   <!-- attribute common to all animation elements -->
   <attribute name='xlink:href' elements='animate, animateColor, animateMotion, animateTransform, set' href='animate.html#HrefAttribute'/>
 
-  <!-- misc -->
+  <!-- misc:  Applies to all <element>s that include attribute name in 'attribute'. -->
   <attribute name='contentScriptType' href='script.html#ContentScriptTypeAttribute'/>
   <attribute name='contentStyleType' href='styling.html#ContentStyleTypeAttribute'/>
   <attribute name='externalResourcesRequired' href='struct.html#ExternalResourcesRequiredAttribute'/>