diff --git a/doc/v2/def_visitor.html b/doc/v2/def_visitor.html
index fa39b8a6..91361a25 100644
--- a/doc/v2/def_visitor.html
+++ b/doc/v2/def_visitor.html
@@ -129,7 +129,8 @@ void visit(classT& c, char const* name, OptionalArgs const& options) con
     <h2><a name="examples"></a>Example</h2>
 
     
-<pre>    class my_def_visitor : boost::python::def_visitor&lt;my_def_visitor&gt;
+<pre>    class X {/*...*/};<br>
+    class my_def_visitor : boost::python::def_visitor&lt;my_def_visitor&gt;
     {
         friend class def_visitor_access;
 
@@ -142,11 +143,10 @@ void visit(classT&amp; c, char const* name, OptionalArgs const&amp; options) con
             ;
         }
 
-        static void foo(object self);
-        static void bar(object self);
+        static void foo(X&amp; self);
+        static void bar(X&amp; self);
     };
 
-    class X {/*...*/};
 
     BOOST_PYTHON_MODULE(my_ext)
     { 
diff --git a/doc/v2/reference.html b/doc/v2/reference.html
index 9d5e3a63..5d38a223 100644
--- a/doc/v2/reference.html
+++ b/doc/v2/reference.html
@@ -96,193 +96,158 @@
 
     <h2><a name="high_level">High Level Components</a></h2>
 
-    <dl>
-      <dt><a href="class.html">class.hpp/class_fwd.hpp</a></dt>
-
-      <dd>
+    
+<dl>
+  <dt><a href="class.html">class.hpp/class_fwd.hpp</a></dt>
+  <dd> 
+    <dl class="index">
+      <dt><a href="class.html#classes">Classes</a></dt>
+      <dd> 
         <dl class="index">
-          <dt><a href="class.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="class.html#class_-spec">class_</a></dt>
-
-              <dt><a href="class.html#bases-spec">bases</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="def.html">def.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="def.html#functions">Functions</a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="def.html#def-spec">def</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="enum.html">enum.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="enum.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="enum.html#enum_-spec">enum_</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="errors.html">errors.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="errors.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "errors.html#error_already_set-spec">error_already_set</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="errors.html#functions">Functions</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "errors.html#handle_exception-spec">handle_exception</a></dt>
-
-              <dt><a href=
-              "errors.html#expect_non_null-spec">expect_non_null</a></dt>
-
-              <dt><a href=
-              "errors.html#throw_error_already_set-spec">throw_error_already_set</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href=
-      "exception_translator.html">exception_translator.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href=
-          "exception_translator.html#functions">Functions</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "exception_translator.html#register_exception_translator-spec">register_exception_translator</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="init.html">init.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="init.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="init.html#init-spec">init</a></dt>
-
-              <dt><a href="init.html#optional-spec">optional</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="iterator.html">iterator.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="iterator.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="iterator.html#iterator-spec">iterator</a></dt>
-
-              <dt><a href="iterator.html#iterators-spec">iterators</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="iterator.html#functions">Functions</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="iterator.html#range-spec">range</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="module.html">module.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="module.html#macros">Macros</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "module.html#BOOST_PYTHON_MODULE-spec">BOOST_PYTHON_MODULE</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="operators.html">operators.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="operators.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="operators.html#self_t-spec">self_t</a></dt>
-
-              <dt><a href="operators.html#other-spec">other</a></dt>
-
-              <dt><a href="operators.html#operator_-spec">operator_</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="operators.html#objects">Objects</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="operators.html#self-spec">self</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="scope.html">scope.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="scope.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="scope.html#scope-spec">scope</a></dt>
-            </dl>
-          </dd>
+          <dt><a href="class.html#class_-spec">class_</a></dt>
+          <dt><a href="class.html#bases-spec">bases</a></dt>
         </dl>
       </dd>
     </dl>
+  </dd>
+  <dt><a href="def.html">def.hpp</a></dt>
+  <dd> 
+    <dl class="index">
+      <dt><a href="def.html#functions">Functions</a></dt>
+      <dd> 
+        <dl class="page-index">
+          <dt><a href="def.html#def-spec">def</a></dt>
+        </dl>
+      </dd>
+    </dl>
+  </dd>
+  <dt><a href="def_visitor.html">def_visitor.hpp</a></dt>
+  <dd> 
+    <dl class="index">
+      <dt><a href="def_visitor.html#classes">Classes</a></dt>
+    </dl>
+  </dd>
+  <dt><a href="enum.html">enum.hpp</a></dt>
+  <dd> 
+    <dl class="index">
+      <dt><a href="enum.html#classes">Classes</a></dt>
+      <dd> 
+        <dl class="index">
+          <dt><a href="enum.html#enum_-spec">enum_</a></dt>
+        </dl>
+      </dd>
+    </dl>
+  </dd>
+  <dt><a href="errors.html">errors.hpp</a></dt>
+  <dd> 
+    <dl class="index">
+      <dt><a href="errors.html#classes">Classes</a></dt>
+      <dd> 
+        <dl class="index">
+          <dt><a href=
+              "errors.html#error_already_set-spec">error_already_set</a></dt>
+        </dl>
+      </dd>
+      <dt><a href="errors.html#functions">Functions</a></dt>
+      <dd> 
+        <dl class="index">
+          <dt><a href=
+              "errors.html#handle_exception-spec">handle_exception</a></dt>
+          <dt><a href=
+              "errors.html#expect_non_null-spec">expect_non_null</a></dt>
+          <dt><a href=
+              "errors.html#throw_error_already_set-spec">throw_error_already_set</a></dt>
+        </dl>
+      </dd>
+    </dl>
+  </dd>
+  <dt><a href=
+      "exception_translator.html">exception_translator.hpp</a></dt>
+  <dd> 
+    <dl class="index">
+      <dt><a href=
+          "exception_translator.html#functions">Functions</a></dt>
+      <dd> 
+        <dl class="index">
+          <dt><a href=
+              "exception_translator.html#register_exception_translator-spec">register_exception_translator</a></dt>
+        </dl>
+      </dd>
+    </dl>
+  </dd>
+  <dt><a href="init.html">init.hpp</a></dt>
+  <dd> 
+    <dl class="index">
+      <dt><a href="init.html#classes">Classes</a></dt>
+      <dd> 
+        <dl class="index">
+          <dt><a href="init.html#init-spec">init</a></dt>
+          <dt><a href="init.html#optional-spec">optional</a></dt>
+        </dl>
+      </dd>
+    </dl>
+  </dd>
+  <dt><a href="iterator.html">iterator.hpp</a></dt>
+  <dd> 
+    <dl class="index">
+      <dt><a href="iterator.html#classes">Classes</a></dt>
+      <dd> 
+        <dl class="index">
+          <dt><a href="iterator.html#iterator-spec">iterator</a></dt>
+          <dt><a href="iterator.html#iterators-spec">iterators</a></dt>
+        </dl>
+      </dd>
+      <dt><a href="iterator.html#functions">Functions</a></dt>
+      <dd> 
+        <dl class="index">
+          <dt><a href="iterator.html#range-spec">range</a></dt>
+        </dl>
+      </dd>
+    </dl>
+  </dd>
+  <dt><a href="module.html">module.hpp</a></dt>
+  <dd> 
+    <dl class="index">
+      <dt><a href="module.html#macros">Macros</a></dt>
+      <dd> 
+        <dl class="index">
+          <dt><a href=
+              "module.html#BOOST_PYTHON_MODULE-spec">BOOST_PYTHON_MODULE</a></dt>
+        </dl>
+      </dd>
+    </dl>
+  </dd>
+  <dt><a href="operators.html">operators.hpp</a></dt>
+  <dd> 
+    <dl class="index">
+      <dt><a href="operators.html#classes">Classes</a></dt>
+      <dd> 
+        <dl class="index">
+          <dt><a href="operators.html#self_t-spec">self_t</a></dt>
+          <dt><a href="operators.html#other-spec">other</a></dt>
+          <dt><a href="operators.html#operator_-spec">operator_</a></dt>
+        </dl>
+      </dd>
+      <dt><a href="operators.html#objects">Objects</a></dt>
+      <dd> 
+        <dl class="index">
+          <dt><a href="operators.html#self-spec">self</a></dt>
+        </dl>
+      </dd>
+    </dl>
+  </dd>
+  <dt><a href="scope.html">scope.hpp</a></dt>
+  <dd> 
+    <dl class="index">
+      <dt><a href="scope.html#classes">Classes</a></dt>
+      <dd> 
+        <dl class="index">
+          <dt><a href="scope.html#scope-spec">scope</a></dt>
+        </dl>
+      </dd>
+    </dl>
+  </dd>
+</dl>
 
     <h2><a name="object_wrappers">Object Wrappers</a></h2>