diff --git a/Doc/Manual/CSharp.html b/Doc/Manual/CSharp.html
index 968d629c4..c520ccfe4 100644
--- a/Doc/Manual/CSharp.html
+++ b/Doc/Manual/CSharp.html
@@ -11,6 +11,7 @@
 <ul>
 <li><a href="#CSharp_introduction">Introduction</a>
 <li><a href="#CSharp_differences_java">Differences to the Java module</a>
+<li><a href="#CSharp_arrays">Void pointers</a>
 <li><a href="#CSharp_arrays">C# Arrays</a>
 <ul>
 <li><a href="#CSharp_arrays_swig_library">The SWIG C arrays library</a>
@@ -473,7 +474,7 @@ void * f(void *v);
 </pre>
 </div>
 
-<H2><a name="CSharp_arrays"></a>18.3 C# Arrays</H2>
+<H2><a name="CSharp_arrays"></a>18.4 C# Arrays</H2>
 
 
 <p>
@@ -485,7 +486,7 @@ with one of the following three approaches; namely the SWIG C arrays library, P/
 pinned arrays.
 </p>
 
-<H3><a name="CSharp_arrays_swig_library"></a>18.3.1 The SWIG C arrays library</H3>
+<H3><a name="CSharp_arrays_swig_library"></a>18.4.1 The SWIG C arrays library</H3>
 
 
 <p>
@@ -522,7 +523,7 @@ example.print_array(c.cast());          // Pass to C
 </div>
 
 
-<H3><a name="CSharp_arrays_pinvoke_default_array_marshalling"></a>18.3.2 Managed arrays using P/Invoke default array marshalling</H3>
+<H3><a name="CSharp_arrays_pinvoke_default_array_marshalling"></a>18.4.2 Managed arrays using P/Invoke default array marshalling</H3>
 
 
 <p>
@@ -649,7 +650,7 @@ and intermediate class method
 </div>
 
 
-<H3><a name="CSharp_arrays_pinning"></a>18.3.3 Managed arrays using pinning</H3>
+<H3><a name="CSharp_arrays_pinning"></a>18.4.3 Managed arrays using pinning</H3>
 
 
 <p>
@@ -744,7 +745,7 @@ public static extern void myArrayCopy(IntPtr jarg1, IntPtr jarg2, int jarg3);
 
 
 
-<H2><a name="CSharp_exceptions"></a>18.4 C# Exceptions</H2>
+<H2><a name="CSharp_exceptions"></a>18.5 C# Exceptions</H2>
 
 
 <p>
@@ -841,7 +842,7 @@ set so should only be used when a C# exception is not created.
 </p>
 
 
-<H3><a name="CSharp_exception_example_check_typemap"></a>18.4.1 C# exception example using "check" typemap</H3>
+<H3><a name="CSharp_exception_example_check_typemap"></a>18.5.1 C# exception example using "check" typemap</H3>
 
 
 <p>
@@ -1023,7 +1024,7 @@ method and C# code does not handle pending exceptions via the canthrow attribute
 Actually it will issue this warning for any function beginning with <tt>SWIG_CSharpSetPendingException</tt>.
 </P>
 
-<H3><a name="CSharp_exception_example_percent_exception"></a>18.4.2 C# exception example using %exception</H3>
+<H3><a name="CSharp_exception_example_percent_exception"></a>18.5.2 C# exception example using %exception</H3>
 
 
 <p>
@@ -1088,7 +1089,7 @@ The managed code generated does check for the pending exception as mentioned ear
 </pre>
 </div>
 
-<H3><a name="CSharp_exception_example_exception_specifications"></a>18.4.3 C# exception example using exception specifications</H3>
+<H3><a name="CSharp_exception_example_exception_specifications"></a>18.5.3 C# exception example using exception specifications</H3>
 
 
 <p>
@@ -1145,7 +1146,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_evensonly(int jarg1) {
 Multiple catch handlers are generated should there be more than one exception specifications declared.
 </p>
 
-<H3><a name="CSharp_custom_application_exception"></a>18.4.4 Custom C# ApplicationException example</H3>
+<H3><a name="CSharp_custom_application_exception"></a>18.5.4 Custom C# ApplicationException example</H3>
 
 
 <p>
@@ -1279,7 +1280,7 @@ try {
 </pre>
 </div>
 
-<H2><a name="CSharp_directors"></a>18.5 C# Directors</H2>
+<H2><a name="CSharp_directors"></a>18.6 C# Directors</H2>
 
 
 <p>
@@ -1292,7 +1293,7 @@ The following sections provide information on the C# director implementation and
 However, the <a href="Java.html#Java_directors">Java directors</a> section should also be read in order to gain more insight into directors.
 </p>
 
-<H3><a name="CSharp_directors_example"></a>18.5.1 Directors example</H3>
+<H3><a name="CSharp_directors_example"></a>18.6.1 Directors example</H3>
 
 
 <p>
@@ -1413,7 +1414,7 @@ CSharpDerived - UIntMethod(123)
 </pre>
 </div>
 
-<H3><a name="CSharp_directors_implementation"></a>18.5.2 Directors implementation</H3>
+<H3><a name="CSharp_directors_implementation"></a>18.6.2 Directors implementation</H3>
 
 
 <p>
@@ -1599,7 +1600,7 @@ void SwigDirector_Base::BaseBoolMethod(Base const &amp;b, bool flag) {
 </pre>
 </div>
 
-<H3><a name="CSharp_director_caveats"></a>18.5.3 Director caveats</H3>
+<H3><a name="CSharp_director_caveats"></a>18.6.3 Director caveats</H3>
 
 
 <p>
@@ -1647,7 +1648,7 @@ However, a call from C# to <tt>CSharpDefaults.DefaultMethod()</tt> will of cours
 should pass the call on to <tt>CSharpDefaults.DefaultMethod(int)</tt>using the C++ default value, as shown above.
 </p>
 
-<H2><a name="CSharp_typemap_examples"></a>18.6 C# Typemap examples</H2>
+<H2><a name="CSharp_typemap_examples"></a>18.7 C# Typemap examples</H2>
 
 
 This section includes a few examples of typemaps.  For more examples, you
@@ -1655,7 +1656,7 @@ might look at the files "<tt>csharp.swg</tt>" and "<tt>typemaps.i</tt>" in
 the SWIG library.
 
 
-<H3><a name="CSharp_memory_management_member_variables"></a>18.6.1 Memory management when returning references to member variables</H3>
+<H3><a name="CSharp_memory_management_member_variables"></a>18.7.1 Memory management when returning references to member variables</H3>
 
 
 <p>
@@ -1779,7 +1780,7 @@ public class Bike : IDisposable {
 Note the <tt>addReference</tt> call.
 </p>
 
-<H3><a name="CSharp_memory_management_objects"></a>18.6.2 Memory management for objects passed to the C++ layer</H3>
+<H3><a name="CSharp_memory_management_objects"></a>18.7.2 Memory management for objects passed to the C++ layer</H3>
 
 
 <p>
@@ -1898,7 +1899,7 @@ The 'cscode' typemap simply adds in the specified code into the C# proxy class.
 </div>
 
 
-<H3><a name="CSharp_date_marshalling"></a>18.6.3 Date marshalling using the csin typemap and associated attributes</H3>
+<H3><a name="CSharp_date_marshalling"></a>18.7.3 Date marshalling using the csin typemap and associated attributes</H3>
 
 
 <p>
@@ -2184,7 +2185,7 @@ public class example {
 </pre>
 </div>
 
-<H3><a name="CSharp_date_properties"></a>18.6.4 A date example demonstrating marshalling of C# properties</H3>
+<H3><a name="CSharp_date_properties"></a>18.7.4 A date example demonstrating marshalling of C# properties</H3>
 
 
 <p>
@@ -2285,7 +2286,7 @@ Some points to note:
 </ul>
 
 
-<H3><a name="CSharp_partial_classes"></a>18.6.5 Turning wrapped classes into partial classes</H3>
+<H3><a name="CSharp_partial_classes"></a>18.7.5 Turning wrapped classes into partial classes</H3>
 
 
 <p>
@@ -2385,7 +2386,7 @@ demonstrating that the class contains methods calling both unmanaged code - <tt>
 The following example is an alternative approach to adding managed code to the generated proxy class.
 </p>
 
-<H3><a name="CSharp_extending_proxy_class"></a>18.6.6 Extending proxy classes with additional C# code</H3>
+<H3><a name="CSharp_extending_proxy_class"></a>18.7.6 Extending proxy classes with additional C# code</H3>
 
 
 <p>
@@ -2424,7 +2425,7 @@ public class ExtendMe : IDisposable {
 </pre>
 </div>
 
-<H3><a name="CSharp_enum_underlying_type"></a>18.6.7 Underlying type for enums</H3>
+<H3><a name="CSharp_enum_underlying_type"></a>18.7.7 Underlying type for enums</H3>
 
 
 <P>
diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html
index b53923c17..d662626a9 100644
--- a/Doc/Manual/Contents.html
+++ b/Doc/Manual/Contents.html
@@ -635,6 +635,7 @@
 <ul>
 <li><a href="CSharp.html#CSharp_introduction">Introduction</a>
 <li><a href="CSharp.html#CSharp_differences_java">Differences to the Java module</a>
+<li><a href="CSharp.html#CSharp_arrays">Void pointers</a>
 <li><a href="CSharp.html#CSharp_arrays">C# Arrays</a>
 <ul>
 <li><a href="CSharp.html#CSharp_arrays_swig_library">The SWIG C arrays library</a>
@@ -764,8 +765,8 @@
 <li><a href="Go.html#Go_templates">Go Templates</a>
 <li><a href="Go.html#Go_director_classes">Go Director Classes</a>
 <li><a href="Go.html#Go_primitive_type_mappings">Default Go primitive type mappings</a>
-<li><a href="#Go_output_arguments">Output arguments</a>
-<li><a href="#Go_adding_additional_code">Adding additional go code</a>
+<li><a href="Go.html#Go_output_arguments">Output arguments</a>
+<li><a href="Go.html#Go_adding_additional_code">Adding additional go code</a>
 </ul>
 </ul>
 </div>
@@ -1389,6 +1390,8 @@
 <ul>
 <li><a href="Python.html#Python_nn68">%feature("autodoc", "0")</a>
 <li><a href="Python.html#Python_nn69">%feature("autodoc", "1")</a>
+<li><a href="Python.html#Python_autodoc2">%feature("autodoc", "2")</a>
+<li><a href="Python.html#Python_autodoc3">%feature("autodoc", "3")</a>
 <li><a href="Python.html#Python_nn70">%feature("autodoc", "docstring")</a>
 </ul>
 <li><a href="Python.html#Python_nn71">%feature("docstring")</a>
@@ -1691,3 +1694,4 @@
 
 </BODY>
 </HTML>
+
diff --git a/Doc/Manual/Go.html b/Doc/Manual/Go.html
index 8c072e00a..b927e8661 100644
--- a/Doc/Manual/Go.html
+++ b/Doc/Manual/Go.html
@@ -547,6 +547,7 @@ void f(char *output);
 
 <H3><a name="Go_adding_additional_code"></a>21.3.10 Adding additional go code</H3>
 
+
 <p>Often the APIs generated by swig are not very natural in go, especially if
 there are output arguments.  You can
 insert additional go wrapping code to add new APIs
diff --git a/Doc/Manual/Php.html b/Doc/Manual/Php.html
index 2b728b9f9..ccc0f039c 100644
--- a/Doc/Manual/Php.html
+++ b/Doc/Manual/Php.html
@@ -180,6 +180,7 @@ other symbols unless care is taken to <tt>%rename</tt> them.
 
 <H3><a name="Php_nn2_1"></a>31.2.1 Constants</H3>
 
+
 <p>
 These work in much the same way as in C/C++.  Constants can be defined
 by using either the normal C pre-processor declarations, or the