--- a/master/linking.html	Sun Aug 05 18:14:44 2012 +1000
+++ b/master/linking.html	Sun Aug 05 18:17:03 2012 +1000
@@ -708,13 +708,16 @@
 
 <edit:with element='view'>
 
-The <a>SVGViewElement</a> interface corresponds to the <a>'view'</a> element.
-<pre class="idl">interface <b>SVGViewElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a>,
-                           <a class="idlinterface" href="types.html#InterfaceSVGZoomAndPan">SVGZoomAndPan</a> {
+<p>The <a>SVGViewElement</a> interface corresponds to the <a>'view'</a> element.</p>
+
+<pre class="idl">interface <b>SVGViewElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a> {
   readonly attribute <a class="idlinterface" href="types.html#InterfaceSVGStringList">SVGStringList</a> <a href="linking.html#__svg__SVGViewElement__viewTarget">viewTarget</a>;
 };
 
-<a>SVGViewElement</a> implements <a>SVGFitToViewBox</a>;</pre><dl class="interface">
+<a>SVGViewElement</a> implements <a>SVGFitToViewBox</a>;
+<a>SVGViewElement</a> implements <a>SVGZoomAndPan</a>;</pre>
+
+<dl class="interface">
 <dt class="attributes-header">Attributes:</dt>
 <dd>
 <dl class="attributes">

--- a/master/struct.html	Sun Aug 05 18:14:44 2012 +1000
+++ b/master/struct.html	Sun Aug 05 18:17:03 2012 +1000
@@ -1723,25 +1723,19 @@
 which is the interface that corresponds to the <a>'svg'</a> element. This
 interface contains various miscellaneous commonly-used utility
 methods, such as matrix operations and the ability to control the
-time of redraw on visual rendering devices.
-</p>
-
+time of redraw on visual rendering devices.</p>
 
 <p><a>SVGSVGElement</a> extends <a>ViewCSS</a> and <a>DocumentCSS</a> to
 provide access to the computed values of properties and the override style
 sheet as described in <a href="http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113/"><cite>DOM Level 2 Style</cite></a>
-[<a href="refs.html#ref-DOM2STYLE">DOM2STYLE</a>].
-</p>
+[<a href="refs.html#ref-DOM2STYLE">DOM2STYLE</a>].</p>
+
 <pre class="idl">interface <b>SVGSVGElement</b> : <a>SVGGraphicsElement</a>,
                           <a class="idlinterface" href="types.html#InterfaceSVGTests">SVGTests</a>,
                           <a class="idlinterface" href="types.html#InterfaceSVGLangSpace">SVGLangSpace</a>,
-                          <a class="idlinterface" href="types.html#InterfaceSVGZoomAndPan">SVGZoomAndPan</a>,
-                          <a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-DocumentEvent">DocumentEvent</a>,
-                          <a class="idlinterface"
-   href="http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113/css.html#CSS-ViewCSS">ViewCSS</a>,
-                          <a class="idlinterface"
-   href="http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113/css.html#CSS-DocumentCSS">DocumentCSS</a> {
+                          <a class="idlinterface" href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-DocumentEvent">DocumentEvent</a>,
+                          <a class="idlinterface" href="http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113/css.html#CSS-ViewCSS">ViewCSS</a>,
+                          <a class="idlinterface" href="http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113/css.html#CSS-DocumentCSS">DocumentCSS</a> {
 
   readonly attribute <a class="idlinterface" href="types.html#InterfaceSVGAnimatedLength">SVGAnimatedLength</a> <a href="struct.html#__svg__SVGSVGElement__x">x</a>;
   readonly attribute <a class="idlinterface" href="types.html#InterfaceSVGAnimatedLength">SVGAnimatedLength</a> <a href="struct.html#__svg__SVGSVGElement__y">y</a>;
@@ -1785,7 +1779,10 @@
    href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-745549614">Element</a> <a href="struct.html#__svg__SVGSVGElement__getElementById">getElementById</a>(in DOMString elementId);
 };
 
-<a>SVGSVGElement</a> implements <a>SVGFitToViewBox</a>;</pre><dl class="interface">
+<a>SVGSVGElement</a> implements <a>SVGFitToViewBox</a>;
+<a>SVGSVGElement</a> implements <a>SVGZoomAndPan</a>;</pre>
+
+<dl class="interface">
 <dt class="attributes-header">Attributes:</dt>
 <dd>
 <dl class="attributes">

--- a/master/types.html	Sun Aug 05 18:14:44 2012 +1000
+++ b/master/types.html	Sun Aug 05 18:17:03 2012 +1000
@@ -4845,10 +4845,11 @@
 
 <h3 id="InterfaceSVGZoomAndPan">Interface SVGZoomAndPan</h3>
 
-
-The <a>SVGZoomAndPan</a> interface defines attribute <a>zoomAndPan</a> and
-associated constants. 
-<pre class="idl">interface <b>SVGZoomAndPan</b> {
+<p>The <a>SVGZoomAndPan</a> interface defines attribute <a>zoomAndPan</a> and
+associated constants.</p>
+
+<pre class="idl">[NoInterfaceObject]
+interface <b>SVGZoomAndPan</b> {
 
   // Zoom and Pan Types
   const unsigned short <a href="types.html#__svg__SVGZoomAndPan__SVG_ZOOMANDPAN_UNKNOWN">SVG_ZOOMANDPAN_UNKNOWN</a> = 0;
@@ -4857,7 +4858,9 @@
 
   attribute unsigned short <a href="types.html#__svg__SVGZoomAndPan__zoomAndPan">zoomAndPan</a> setraises(<a class="idlinterface"
    href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-};</pre><dl class="interface">
+};</pre>
+
+<dl class="interface">
 <dt class="constants-header">Constants in group “Zoom and Pan Types”:</dt>
 <dd>
 <dl class="constants">