--- a/master/definitions.xml	Mon Nov 21 14:30:45 2011 +0100
+++ b/master/definitions.xml	Mon Nov 21 14:33:26 2011 +0100
@@ -302,12 +302,20 @@
     interfaces='SVGFEFloodElement'/>
 
   <element
-    name='feFuncR'
-    href='filters.html#feFuncRElement'
+    name='feFuncA'
+    href='filters.html#feFuncAElement'
     contentmodel='anyof'
     elements='animate, set'
     attributecategories='core, transfer function element'
-    interfaces='SVGFEFuncRElement'/>
+    interfaces='SVGFEFuncAElement'/>
+
+  <element
+    name='feFuncB'
+    href='filters.html#feFuncBElement'
+    contentmodel='anyof'
+    elements='animate, set'
+    attributecategories='core, transfer function element'
+    interfaces='SVGFEFuncBElement'/>
 
   <element
     name='feFuncG'
@@ -318,20 +326,12 @@
     interfaces='SVGFEFuncGElement'/>
 
   <element
-    name='feFuncB'
-    href='filters.html#feFuncBElement'
+    name='feFuncR'
+    href='filters.html#feFuncRElement'
     contentmodel='anyof'
     elements='animate, set'
     attributecategories='core, transfer function element'
-    interfaces='SVGFEFuncBElement'/>
-
-  <element
-    name='feFuncA'
-    href='filters.html#feFuncAElement'
-    contentmodel='anyof'
-    elements='animate, set'
-    attributecategories='core, transfer function element'
-    interfaces='SVGFEFuncAElement'/>
+    interfaces='SVGFEFuncRElement'/>
 
   <element
       name='feGaussianBlur'
@@ -1510,32 +1510,58 @@
   <symbol name="XML-Name" href="types.html#DataTypeXML-Name"/>
   
   <!-- ... terms (these will be generated later) .......................... -->
-  <term name='SVG document' href='intro.html#TermSVGDocumentFragment'/>
-  <term name='SVG documents' href='intro.html#TermSVGDocumentFragment'/>
-  <term name='SVG document fragment' href='intro.html#TermSVGDocumentFragment'/>
-  <term name='SVG document fragments' href='intro.html#TermSVGDocumentFragment'/>
-  <term name='graphics element' href='intro.html#TermGraphicsElement'/>
-  <term name='graphics elements' href='intro.html#TermGraphicsElement'/>
+  <!-- ... elements, in alphabetic order ... -->
+  <term name='animation element' href='intro.html#TermAnimationElement'/>
+  <term name='animation elements' href='intro.html#TermAnimationElement'/>
   <term name='container element' href='intro.html#TermGraphicsElement'/>
   <term name='container elements' href='intro.html#TermContainerElement'/>
-  <term name='animation element' href='intro.html#TermAnimationElement'/>
-  <term name='animation elements' href='intro.html#TermAnimationElement'/>
+  <term name='descriptive element' href='intro.html#TermDescriptiveElement'/>
+  <term name='descriptive elements' href='intro.html#TermDescriptiveElement'/>
+  <term name='filter primitive element' href='intro.html#TermFilterPrimitiveElement'/>
+  <term name='filter primitive elements' href='intro.html#TermFilterPrimitiveElement'/>
+  <term name='gradient element' href='intro.html#TermGradientElement'/>
+  <term name='gradient elements' href='intro.html#TermGradientElement'/>
+  <term name='graphics element' href='intro.html#TermGraphicsElement'/>
+  <term name='graphics elements' href='intro.html#TermGraphicsElement'/>
+  <term name='light source element' href='intro.html#TermLightSourceElement'/>
+  <term name='light source elements' href='intro.html#TermLightSourceElement'/>
+  <term name='outermost svg element' href='intro.html#TermOutermostSVGElement'/>
+  <term name='outermost svg elements' href='intro.html#TermOutermostSVGElement'/>
+  <term name='rootmost SVG element' href='intro.html#TermRootmostSVGElement'/>
+  <term name="rootmost 'svg' element" href='intro.html#TermRootmostSVGElement'>rootmost <span xmlns='http://www.w3.org/1999/xhtml' class="element-name">‘svg’</span> element</term>
   <term name='structural element' href='intro.html#TermStructuralElement'/>
   <term name='structural elements' href='intro.html#TermStructuralElement'/>
-  <term name='descriptive element' href='intro.html#TermDescriptiveElement'/>
-  <term name='descriptive elements' href='intro.html#TermDescriptiveElement'/>
-  <term name='gradient element' href='intro.html#TermGradientElement'/>
-  <term name='gradient elements' href='intro.html#TermGradientElement'/>
-  <term name='hit-test' href='intro.html#TermHitTesting'/>
-  <term name='hit-testing' href='intro.html#TermHitTesting'/>
   <term name='text content element' href='intro.html#TermTextContentElement'/>
   <term name='text content elements' href='intro.html#TermTextContentElement'/>
   <term name='text content child element' href='intro.html#TermTextContentChildElement'/>
   <term name='text content child elements' href='intro.html#TermTextContentChildElement'/>
-  <term name='filter primitive element' href='intro.html#TermFilterPrimitiveElement'/>
-  <term name='filter primitive elements' href='intro.html#TermFilterPrimitiveElement'/>
-  <term name='light source element' href='intro.html#TermLightSourceElement'/>
-  <term name='light source elements' href='intro.html#TermLightSourceElement'/>
+  <!-- ... attributes, in alphabetic order -->
+  <term name='animation addition attribute' href='intro.html#TermAnimationAdditionAttribute'/>
+  <term name='animation attribute target attribute' href='intro.html#TermAnimationAttributeTargetAttribute'/>
+  <term name='animation event attribute' href='intro.html#TermAnimationEventAttribute'/>
+  <term name='animation event attributes' href='intro.html#TermAnimationEventAttribute'/>
+  <term name='animation timing attribute' href='intro.html#TermAnimationTimingAttribute'/>
+  <term name='animation value attribute' href='intro.html#TermAnimationValueAttribute'/>
+  <term name='conditional processing attribute' href='intro.html#TermConditionalProcessingAttribute'/>
+  <term name='conditional processing attributes' href='intro.html#TermConditionalProcessingAttribute'/>
+  <term name='core attribute' href='intro.html#TermCoreAttributes'/>
+  <term name='core attributes' href='intro.html#TermCoreAttributes'/>
+  <term name='document event attribute' href='intro.html#TermDocumentEventAttribute'/>
+  <term name='document event attributes' href='intro.html#TermDocumentEventAttribute'/>
+  <term name='event attribute' href='intro.html#TermEventAttribute'/>
+  <term name='event attributes' href='intro.html#TermEventAttribute'/>
+  <term name='graphical event attribute' href='intro.html#TermGraphicalEventAttribute'/>
+  <term name='graphical event attributes' href='intro.html#TermGraphicalEventAttribute'/>
+  <term name='filter primitive attribute' href='intro.html#TermFilterPrimitiveAttributes'/>
+  <term name='filter primitive attributes' href='intro.html#TermFilterPrimitiveAttributes'/>
+  <term name='presentation attribute' href='intro.html#TermPresentationAttribute'/>
+  <term name='presentation attributes' href='intro.html#TermPresentationAttribute'/>
+  <term name='XLink attribute' href='intro.html#TermXLinkAttributes'/>
+  <term name='XLink attributes' href='intro.html#TermXLinkAttributes'/>
+  <!-- ... properties -->
+  <term name='property' href='intro.html#TermProperty'/>
+  <term name='properties' href='intro.html#TermProperty'/>
+  <!-- ... references ... -->
   <term name='IRI' href='intro.html#TermIRIReference'/>
   <term name='IRI reference' href='intro.html#TermIRIReference'/>
   <term name='IRI references' href='intro.html#TermIRIReference'/>
@@ -1543,44 +1569,27 @@
   <term name='local IRI references' href='intro.html#TermLocalIRIReference'/>
   <term name='non-local IRI reference' href='intro.html#TermNonLocalIRIReference'/>
   <term name='non-local IRI references' href='intro.html#TermNonLocalIRIReference'/>
-  <term name='property' href='intro.html#TermProperty'/>
-  <term name='properties' href='intro.html#TermProperty'/>
-  <term name='presentation attribute' href='intro.html#TermPresentationAttribute'/>
-  <term name='presentation attributes' href='intro.html#TermPresentationAttribute'/>
-  <term name='graphical event attribute' href='intro.html#TermGraphicalEventAttribute'/>
-  <term name='graphical event attributes' href='intro.html#TermGraphicalEventAttribute'/>
-  <term name='document event attribute' href='intro.html#TermDocumentEventAttribute'/>
-  <term name='document event attributes' href='intro.html#TermDocumentEventAttribute'/>
-  <term name='animation event attribute' href='intro.html#TermAnimationEventAttribute'/>
-  <term name='animation event attributes' href='intro.html#TermAnimationEventAttribute'/>
-  <term name='animation attribute target attribute' href='intro.html#TermAnimationAttributeTargetAttribute'/>
-  <term name='animation timing attribute' href='intro.html#TermAnimationTimingAttribute'/>
-  <term name='animation value attribute' href='intro.html#TermAnimationValueAttribute'/>
-  <term name='animation addition attribute' href='intro.html#TermAnimationAdditionAttribute'/>
-  <term name='event attribute' href='intro.html#TermEventAttribute'/>
-  <term name='event attributes' href='intro.html#TermEventAttribute'/>
-  <term name='conditional processing attribute' href='intro.html#TermConditionalProcessingAttribute'/>
-  <term name='conditional processing attributes' href='intro.html#TermConditionalProcessingAttribute'/>
-  <term name='filter primitive attribute' href='intro.html#TermFilterPrimitiveAttributes'/>
-  <term name='filter primitive attributes' href='intro.html#TermFilterPrimitiveAttributes'/>
-  <term name='XLink attribute' href='intro.html#TermXLinkAttributes'/>
-  <term name='XLink attributes' href='intro.html#TermXLinkAttributes'/>
-  <term name='core attribute' href='intro.html#TermCoreAttributes'/>
-  <term name='core attributes' href='intro.html#TermCoreAttributes'/>
-  <term name='outermost svg element' href='intro.html#TermOutermostSVGElement'/>
-  <term name='outermost svg elements' href='intro.html#TermOutermostSVGElement'/>
+  <!-- ... other, defined in intro.html ... -->
+  <term name='hit-test' href='intro.html#TermHitTesting'/>
+  <term name='hit-testing' href='intro.html#TermHitTesting'/>
+  <term name='Lacuna value' href='intro.html#TermLacunaValue'/>
+  <term name='SVG document' href='intro.html#TermSVGDocumentFragment'/>
+  <term name='SVG documents' href='intro.html#TermSVGDocumentFragment'/>
+  <term name='SVG document fragment' href='intro.html#TermSVGDocumentFragment'/>
+  <term name='SVG document fragments' href='intro.html#TermSVGDocumentFragment'/>
+  <term name='SVG user agent' href='intro.html#TermUserAgent'/>
+  <term name='SVG user agents' href='intro.html#TermUserAgent'/>
   <term name='user agent' href='intro.html#TermUserAgent'/>
   <term name='user agents' href='intro.html#TermUserAgent'/>
-  <term name='SVG user agent' href='intro.html#TermUserAgent'/>
-  <term name='SVG user agents' href='intro.html#TermUserAgent'/>
-  <term name='rootmost SVG element' href='intro.html#TermRootmostSVGElement'/>
-  <term name="rootmost 'svg' element" href='intro.html#TermRootmostSVGElement'>rootmost <span xmlns='http://www.w3.org/1999/xhtml' class="element-name">‘svg’</span> element</term>
   <term name='user coordinate system' href='intro.html#TermUserCoordinateSystem'/>
-  <term name='object bounding box units' href='coords.html#ObjectBoundingBoxUnits'/>
-  <term name='initial coordinate system' href='coords.html#InitialCoordinateSystem'/>
-  <term name='simple alpha compositing' href='masking.html#SimpleAlphaBlending'/>
+  <!-- ... other, defined outside intro.html ... -->
+  <term name='Animatable' href="animate.html#Animatable"/>
   <term name='filter region' href='filters.html#FilterEffectsRegion'/>
   <term name='filter primitive subregion' href='filters.html#FilterPrimitiveSubRegion'/>
+  <term name='initial coordinate system' href='coords.html#InitialCoordinateSystem'/>
+  <term name='inherit' href='http://www.w3.org/TR/2008/REC-CSS2-20080411/cascade.html#value-def-inherit'/>
+  <term name='object bounding box units' href='coords.html#ObjectBoundingBoxUnits'/>
+  <term name='simple alpha compositing' href='masking.html#SimpleAlphaBlending'/>
   
   <!-- === defined in other specifications ================================ -->