--- a/master/definitions.xml	Thu Aug 07 16:46:32 2014 +0200
+++ b/master/definitions.xml	Thu Aug 14 08:10:00 2014 -0500
@@ -15,7 +15,7 @@
       contentmodel='textoranyof'
       elementcategories='animation, descriptive, shape, structural, paint server'
       elements='a, clipPath, cursor, filter, foreignObject, image, marker, mask, script, style, switch, view, text'
-      attributecategories='aria, navigation, conditional processing, core, graphical event, presentation, style, xlink'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style, xlink'
       interfaces='SVGAElement'>
     <attribute name='xlink:href' href='linking.html#AElementXLinkHrefAttribute' animatable='yes'/>
     <attribute name='xlink:show' href='linking.html#XLinkShowAttribute'/>
@@ -62,7 +62,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive, paint server, structurally external'
       elements='clipPath, marker, mask, script, source, track'
-      attributecategories='aria, navigation, core, conditional processing, graphical event, style, presentation, embedding placement'
+      attributecategories='aria, core, conditional processing, graphical event, style, presentation, embedding placement'
       attributes=''
       interfaces='SVGAudioElement'>
     <attribute name='src' href='http://www.w3.org/TR/html5/embedded-content-0.html#attr-media-src' animatable='yes'/>
@@ -82,7 +82,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive, paint server'
       elements='clipPath, marker, mask, script'
-      attributecategories='aria, navigation, core, conditional processing, graphical event, style, presentation, embedding placement, embedding size'
+      attributecategories='aria, core, conditional processing, graphical event, style, presentation, embedding placement, embedding size'
       attributes='preserveAspectRatio'
       interfaces='SVGCanvasElement'>
     
@@ -97,7 +97,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive, paint server'
       elements='clipPath, marker, mask, script'
-      attributecategories='aria, navigation, conditional processing, core, graphical event, presentation, style'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style'
       interfaces='SVGCircleElement'>
     <attribute name='cx' href='shapes.html#CircleElementCXAttribute' animatable='yes'/>
     <attribute name='cy' href='shapes.html#CircleElementCYAttribute' animatable='yes'/>
@@ -110,7 +110,7 @@
       contentmodel='anyof'
       elementcategories='descriptive'
       elements='script'
-      attributecategories='aria, navigation, core, xlink'
+      attributecategories='aria, core, xlink'
       interfaces='SVGCursorElement'>
     <attribute name='x' href='interact.html#CursorElementXAttribute' animatable='yes'/>
     <attribute name='y' href='interact.html#CursorElementYAttribute' animatable='yes'/>
@@ -138,7 +138,7 @@
     contentmodel='anyof'
     elementcategories='descriptive'
     elements='script'
-    attributecategories='conditional processing, core, aria, navigation'>
+    attributecategories='conditional processing, core, aria'>
     <attribute name='begin' href='struct.html#DiscardElementBeginAttribute' animatable='no'/>
     <attribute name='href' href='struct.html#DiscardElementHrefAttribute' animatable='no'/>
   </element>
@@ -149,7 +149,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive, paint server'
       elements='clipPath, marker, mask, script'
-      attributecategories='aria, navigation, conditional processing, core, graphical event, presentation, style' 
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style' 
       interfaces='SVGEllipseElement'>
     <attribute name='cx' href='shapes.html#EllipseElementCXAttribute' animatable='yes'/>
     <attribute name='cy' href='shapes.html#EllipseElementCYAttribute' animatable='yes'/>
@@ -161,7 +161,7 @@
       name='foreignObject'
       href='extend.html#ForeignObjectElement'
       contentmodel='any'
-      attributecategories='aria, navigation, core, conditional processing, graphical event, presentation, style'
+      attributecategories='aria, core, conditional processing, graphical event, presentation, style'
       interfaces='SVGForeignObjectElement'>
     <attribute name='x' href='extend.html#ForeignObjectElementXAttribute' animatable='yes'/>
     <attribute name='y' href='extend.html#ForeignObjectElementYAttribute' animatable='yes'/>
@@ -175,7 +175,7 @@
     contentmodel='anyof'
     elementcategories='animation, descriptive, shape, structural, paint server'
     elements='a, clipPath, cursor, filter, foreignObject, image, marker, mask, script, style, switch, text, view'
-    attributecategories='aria, navigation, conditional processing, core, graphical event, presentation, style'
+    attributecategories='aria, conditional processing, core, graphical event, presentation, style'
     interfaces='SVGGElement'/>
 
   <element
@@ -214,7 +214,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive, paint server, structurally external'
       elements='clipPath, marker, mask, script'
-      attributecategories='aria, navigation, core, conditional processing, graphical event, style, presentation, embedding placement, embedding size'
+      attributecategories='aria, core, conditional processing, graphical event, style, presentation, embedding placement, embedding size'
       attributes='preserveAspectRatio'
       interfaces='SVGIframeElement'>
     
@@ -235,7 +235,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive, paint server, structurally external'
       elements='clipPath, marker, mask, script'
-      attributecategories='aria, navigation, core, conditional processing, graphical event, style, xlink, presentation, embedding placement, embedding size'
+      attributecategories='aria, core, conditional processing, graphical event, style, xlink, presentation, embedding placement, embedding size'
       attributes='preserveAspectRatio'
       interfaces='SVGImageElement'>
     <attribute name='xlink:href' href='embedded.html#ImageElementHrefAttribute' animatable='yes'/>
@@ -247,7 +247,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive, paint server'
       elements='clipPath, marker, mask, script'
-      attributecategories='aria, navigation, conditional processing, core, graphical event, presentation, style'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style'
       interfaces='SVGLineElement'>
     <attribute name='x1' href='shapes.html#LineElementX1Attribute' animatable='yes'/>
     <attribute name='y1' href='shapes.html#LineElementY1Attribute' animatable='yes'/>
@@ -351,7 +351,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive, paint server'
       elements='clipPath, marker, mask, script'
-      attributecategories='aria, navigation, conditional processing, core, graphical event, presentation, style'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style'
       interfaces='SVGPathElement'>
     <attribute name='d' href='paths.html#DAttribute' animatable='yes'/>
     <attribute name='pathLength' href='paths.html#PathLengthAttribute' animatable='yes'/>
@@ -382,7 +382,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive, paint server'
       elements='clipPath, marker, mask, script'
-      attributecategories='aria, navigation, conditional processing, core, graphical event, presentation, style'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style'
       interfaces='SVGPolygonElement'>
     <attribute name='points' href='shapes.html#PolygonElementPointsAttribute' animatable='yes'/>
   </element>
@@ -393,7 +393,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive, paint server'
       elements='clipPath, marker, mask, script'
-      attributecategories='aria, navigation, conditional processing, core, graphical event, presentation, style'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style'
       interfaces='SVGPolylineElement'>
     <attribute name='points' href='shapes.html#PolylineElementPointsAttribute' animatable='yes'/>
   </element>
@@ -424,7 +424,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive, paint server'
       elements='mask, clipPath, marker, script'
-      attributecategories='aria, navigation, conditional processing, core, graphical event, presentation, style'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style'
       interfaces='SVGRectElement'>
     <attribute name='x' href='shapes.html#RectElementXAttribute' animatable='yes'/>
     <attribute name='y' href='shapes.html#RectElementYAttribute' animatable='yes'/>
@@ -472,7 +472,7 @@
       contentmodel='anyof'
       elementcategories=''
       elements='script'
-      attributecategories='navigation, core, style'
+      attributecategories='core, style'
       attributes=''
       interfaces='SVGSourceElement'>
     <attribute name='xlink:title' href='linking.html#XLinkTitleAttribute'/>
@@ -512,7 +512,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive, shape, structural, paint server'
       elements='a, clipPath, cursor, filter, foreignObject, image, marker, mask, script, style, switch, text, view'
-      attributecategories='aria, navigation, conditional processing, core, document event, graphical event, presentation, style'
+      attributecategories='aria, conditional processing, core, document event, graphical event, presentation, style'
       attributes='viewBox, preserveAspectRatio, zoomAndPan'
       interfaces='SVGSVGElement'>
     <attribute name='x' href='struct.html#SVGElementXAttribute' animatable='yes'/>
@@ -529,7 +529,7 @@
     contentmodel='anyof'
     elementcategories='animation, descriptive, shape, paint server'
     elements='a, clipPath, foreignObject, g, image, marker, mask, script, svg, switch, text, use'
-    attributecategories='aria, navigation, conditional processing, core, graphical event, presentation, style'
+    attributecategories='aria, conditional processing, core, graphical event, presentation, style'
     interfaces='SVGSwitchElement'>
   </element>
 
@@ -539,7 +539,7 @@
     contentmodel='anyof'
     elementcategories='animation, descriptive, shape, structural, paint server'
     elements='a, clipPath, cursor, filter, foreignObject, image, marker, mask, script, style, switch, text, view'
-    attributecategories='aria, navigation, core, graphical event, presentation, style'
+    attributecategories='aria, core, graphical event, presentation, style'
     attributes='preserveAspectRatio, viewBox'
     interfaces='SVGSymbolElement'>
   </element>
@@ -550,7 +550,7 @@
       contentmodel='textoranyof'
       elementcategories='animation, descriptive, text content child, paint server'
       elements='a, clipPath, marker, mask, script'
-      attributecategories='aria, navigation, conditional processing, core, graphical event, presentation, style'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style'
       attributes='lengthAdjust'
       interfaces='SVGTextElement'>
     <attribute name='x' href='text.html#TextElementXAttribute' animatable='yes'/>
@@ -569,7 +569,7 @@
       contentmodel='textoranyof'
       elementcategories='descriptive, paint server'
       elements='a, animate, clipPath, marker, mask, script, set, tspan'
-      attributecategories='aria, navigation, conditional processing, core, graphical event, presentation, style, xlink'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style, xlink'
       attributes='lengthAdjust, textLength'
       interfaces='SVGTextPathElement'>
     <attribute name='d' href='text.html#TextPathElementDAttribute' animatable='yes'/>
@@ -593,7 +593,7 @@
       contentmodel='anyof'
       elementcategories=''
       elements='script'
-      attributecategories='navigation, core, style'
+      attributecategories='core, style'
       attributes=''
       interfaces='SVGTrackElement'>
     <attribute name='title' href='linking.html#XLinkTitleAttribute'/>
@@ -612,7 +612,7 @@
     contentmodel='textoranyof'
     elementcategories='descriptive, paint server'
     elements='a, animate, script, set, tspan'
-    attributecategories='aria, navigation, conditional processing, core, graphical event, presentation, style'
+    attributecategories='aria, conditional processing, core, graphical event, presentation, style'
     attributes='x, y, dx, dy, rotate, textLength, lengthAdjust'
     interfaces='SVGTSpanElement'>
   </element>
@@ -623,7 +623,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive, paint server, structurally external'
       elements='clipPath, marker, mask, script'
-      attributecategories='aria, navigation, core, conditional processing, graphical event, presentation, style, xlink'
+      attributecategories='aria, core, conditional processing, graphical event, presentation, style, xlink'
       interfaces='SVGUseElement'>
     <attribute name='x' href='struct.html#UseElementXAttribute' animatable='yes'/>
     <attribute name='y' href='struct.html#UseElementYAttribute' animatable='yes'/>
@@ -638,7 +638,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive, paint server, structurally external'
       elements='clipPath, marker, mask, script, source, track'
-      attributecategories='aria, navigation, core, conditional processing, graphical event, style, presentation, embedding placement, embedding size'
+      attributecategories='aria, core, conditional processing, graphical event, style, presentation, embedding placement, embedding size'
       attributes='preserveAspectRatio'
       interfaces='SVGVideoElement'>
     <attribute name='src' href='http://www.w3.org/TR/html5/embedded-content-0.html#attr-media-src' animatable='yes'/>
@@ -659,7 +659,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive'
       elements='script'
-      attributecategories='aria, navigation, core'
+      attributecategories='aria, core'
       attributes='viewBox, preserveAspectRatio, zoomAndPan'
       interfaces='SVGViewElement'>
     <attribute name='viewTarget' elements='view' href='linking.html#ViewElementViewTargetAttribute'/>
@@ -761,12 +761,6 @@
     <attribute name='role' href='struct.html#RoleAttribute'/>
   </attributecategory>
   <attributecategory
-      name='navigation'
-      href='intro.html#TermNavigationAttribute'>
-    <attribute name='tabindex' href='tabindex' href='interact.html#SVGElementTabindexAttribute'/>
-    <!--Make room for SVG tiny directional navigation-->
-  </attributecategory>
-  <attributecategory
       name='conditional processing'
       href='intro.html#TermConditionalProcessingAttribute'>
     <attribute name='requiredFeatures' href='struct.html#RequiredFeaturesAttribute'/>
@@ -778,9 +772,11 @@
       name='core'
       href='intro.html#TermCoreAttribute'>
     <attribute name='id' href='struct.html#IDAttribute'/>
+    <attribute name='tabindex' href='tabindex' href='struct.html#SVGElementTabindexAttribute'/>
     <attribute name='xml:base' href='struct.html#XMLBaseAttribute'/>
     <attribute name='xml:lang' href='struct.html#XMLLangAttribute'/>
     <attribute name='xml:space' href='struct.html#XMLSpaceAttribute'/>
+
   </attributecategory>
 
   <attributecategory

--- a/master/interact.html	Thu Aug 07 16:46:32 2014 +0200
+++ b/master/interact.html	Thu Aug 14 08:10:00 2014 -0500
@@ -1103,41 +1103,8 @@
   </div>
 <h3 id="sequential-focus-navigation-and-the-tabindex-attribute">Sequential focus navigation and the <span class="attr-name">'tabindex'</span> attribute</h3>
 
-<dl class='attrdef-list'>
-   <dt>
-    <table class="propdef attrdef">
-      <tr>
-        <th>Name</th>
-        <th>Value</th>
-        <th>Lacuna value</th>
-        <th>Animatable</th>
-      </tr>
-      <tr>
-        <td><dfn id="SVGElementTabindexAttribute">tabindex</dfn></td>
-        <td><a>&lt;number&gt;</a></td>
-        <td>(none)</td>
-        <td>no</td>
-      </tr>
-    </table>
-  </dt>
-  <dd>
-    <p>This content attribute allows authors to control whether an element is focusable, whether it is supposed to be reachable
-  using sequential focus navigation, and what is to be the relative
-  order of the element for the purposes of sequential focus
-  navigation</p>
-    <p>The name "tab index" comes from the common use of the
-  "tab" key to navigate through the focusable elements. The term
-  "tabbing" refers to moving forward through the focusable elements
-  that can be reached using sequential focus navigation.
-   </p>
-  </dd>
-</dl>
-
   <div class="impl">
-
-  <p>Each element can have a <dfn id="specially-focusable">tabindex focus flag</dfn> set, as defined
-  below. This flag is a factor that contributes towards determining whether an element is
-  <a href="#focusable">focusable</a>, as described in the next section.</p>
+  <p>The <a href="struct.html#SVGElementTabindexAttribute" class="attr-name">tabindex</a> attribute allows the author to control whether and element is focusable.Each element can have a <dfn id="specially-focusable">tabindex focus flag</dfn> set, as defined below. This flag is a factor that contributes towards determining whether an element is <a href="#focusable">focusable</a>, as described in the next section.</p>
 
   <dl><dt>If the tabindex attribute is omitted or an invalid &lt;number&gt; </dt>
    

--- a/master/intro.html	Thu Aug 07 16:46:32 2014 +0200
+++ b/master/intro.html	Thu Aug 14 08:10:00 2014 -0500
@@ -451,10 +451,6 @@
   <a href="struct.html#Head">References and the
   <span class="element-name">'defs'</span> element</a>.</dd>
 
- <dt id="TermNavigationAttribute">navigation attributes</dt>
-  <dd>These are the collection of attributes which enable navigation.
-  The navigation-related attributes include <edit:attributecategory name='navigation'/>.</dd>
-
   <dt id="TermInvalidValue">invalid value</dt>
   <dd>An invalid value specified for a <a>property</a>, either in a style sheet
   or a <a>presentation attribute</a>, is one that is either not allowed according

--- a/master/struct.html	Thu Aug 07 16:46:32 2014 +0200
+++ b/master/struct.html	Thu Aug 14 08:10:00 2014 -0500
@@ -1778,6 +1778,42 @@
   </dd>
 </dl>
 
+<h3 id="tabindexattribute">The <span class='attr-name'>'tabindex'</span> attribute</h3>
+
+<dl class='attrdef-list'>
+   <dt>
+    <table class="propdef attrdef">
+      <tr>
+        <th>Name</th>
+        <th>Value</th>
+        <th>Lacuna value</th>
+        <th>Animatable</th>
+      </tr>
+      <tr>
+        <td><dfn id="SVGElementTabindexAttribute">tabindex</dfn></td>
+        <td><a>&lt;number&gt;</a></td>
+        <td>(none)</td>
+        <td>no</td>
+      </tr>
+    </table>
+  </dt>
+  <dd>
+ <p>This content attribute allows authors to control whether an element is focusable, whether it is supposed to be reachable
+  using <a href="interact.html#sequential-focus-navigation-and-the-tabindex-attribute">sequential focus navigation</a>, and what is to be the relative
+  order of the element for the purposes of sequential focus
+  navigation</p>
+    <p>The name "tab index" comes from the common use of the
+  "tab" key to navigate through the focusable elements. The term
+  "tabbing" refers to moving forward through the focusable elements
+  that can be reached using sequential focus navigation.
+   </p>
+  </dd>
+</dl>
+
+
+
+
+
 <h2 id="WAIARIAAttributes">WAI-ARIA attributes</h2>
 
 <h3 id="roleattribute">Role attribute</h3>