Update section numbering

author: William S Fulton <wsf@fultondesigns.co.uk> 2019-02-10 01:03:06 +0000
committer: William S Fulton <wsf@fultondesigns.co.uk> 2019-02-10 01:03:06 +0000
commit: 940e32477dba502a98477960d5a0d1385f7e2edb (patch)
tree: af56ad2dc60b187bad87450c6ef6dedbd4eef27c /Doc
parent: 24682a724302b70d3b363fbbe0125ab0c53384b6 (diff)
download: swig-940e32477dba502a98477960d5a0d1385f7e2edb.tar.gz
20 files changed, 810 insertions, 1017 deletions
diff --git a/Doc/Manual/Android.html b/Doc/Manual/Android.html
index 894724188..cc11ec26e 100644
--- a/Doc/Manual/Android.html
+++ b/Doc/Manual/Android.html
@@ -6,7 +6,7 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 </head>
 <body bgcolor="#FFFFFF">
-<H1><a name="Android">21 SWIG and Android</a></H1>
+<H1><a name="Android">20 SWIG and Android</a></H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -31,7 +31,7 @@ This chapter describes SWIG's support of Android.
 
 
 
-<H2><a name="Android_overview">21.1 Overview</a></H2>
+<H2><a name="Android_overview">20.1 Overview</a></H2>
 
 
 <p>
@@ -41,10 +41,10 @@ Everything in the <a href="Java.html#Java">Java chapter</a> applies to generatin
 This chapter contains a few Android specific notes and examples.
 </p>
 
-<H2><a name="Android_examples">21.2 Android examples</a></H2>
+<H2><a name="Android_examples">20.2 Android examples</a></H2>
 
 
-<H3><a name="Android_examples_intro">21.2.1 Examples introduction</a></H3>
+<H3><a name="Android_examples_intro">20.2.1 Examples introduction</a></H3>
 
 
 <p>
@@ -77,7 +77,7 @@ $ android list targets
 The following examples are shipped with SWIG under the Examples/android directory and include a Makefile to build and install each example.
 </p>
 
-<H3><a name="Android_example_simple">21.2.2 Simple C example</a></H3>
+<H3><a name="Android_example_simple">20.2.2 Simple C example</a></H3>
 
 
 <p>
@@ -399,7 +399,7 @@ Run the app again and this time you will see the output pictured below, showing
 <center><img src="android-simple.png" alt="Android screenshot of SwigSimple example"></center>
 
 
-<H3><a name="Android_example_class">21.2.3 C++ class example</a></H3>
+<H3><a name="Android_example_class">20.2.3 C++ class example</a></H3>
 
 
 <p>
@@ -747,7 +747,7 @@ Run the app to see the result of calling the C++ code from Java:
 
 <center><img src="android-class.png" alt="Android screenshot of SwigClass example"></center>
 
-<H3><a name="Android_examples_other">21.2.4 Other examples</a></H3>
+<H3><a name="Android_examples_other">20.2.4 Other examples</a></H3>
 
 
 <p>
@@ -759,7 +759,7 @@ Note that the 'extend' example is demonstrates the directors feature.
 Normally C++ exception handling and the STL is not available by default in the version of g++ shipped with Android, but this example turns these features on as described in the next section.
 </p>
 
-<H2><a name="Android_stl">21.3 C++ STL</a></H2>
+<H2><a name="Android_stl">20.3 C++ STL</a></H2>
 
 
 <p>
diff --git a/Doc/Manual/CSharp.html b/Doc/Manual/CSharp.html
index a4e0be799..7a1326b54 100644
--- a/Doc/Manual/CSharp.html
+++ b/Doc/Manual/CSharp.html
@@ -6,7 +6,7 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 </head>
 <body bgcolor="#FFFFFF">
-<H1><a name="CSharp">22 SWIG and C#</a></H1>
+<H1><a name="CSharp">21 SWIG and C#</a></H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -55,7 +55,7 @@
 
 
 
-<H2><a name="CSharp_introduction">22.1 Introduction</a></H2>
+<H2><a name="CSharp_introduction">21.1 Introduction</a></H2>
 
 
 <p>
@@ -75,7 +75,7 @@ The <a href="http://msdn.microsoft.com">Microsoft Developer Network (MSDN)</a> h
 Monodoc, available from the Mono project, has a very useful section titled <a href="http://www.mono-project.com/docs/advanced/pinvoke/">Interop with native libraries</a>.
 </p>
 
-<H3><a name="CSharp_introduction_swig2_compatibility">22.1.1 SWIG 2 Compatibility</a></H3>
+<H3><a name="CSharp_introduction_swig2_compatibility">21.1.1 SWIG 2 Compatibility</a></H3>
 
 
 <p>
@@ -83,7 +83,7 @@ In order to minimize name collisions between names generated based on input to S
 </p>
 
 
-<H3><a name="CSharp_commandline">22.1.2 Additional command line options</a></H3>
+<H3><a name="CSharp_commandline">21.1.2 Additional command line options</a></H3>
 
 
 <p>
@@ -135,7 +135,7 @@ Note that the file extension (.cs) will not be automatically added and needs to
 Due to possible compiler limits it is not advisable to use <tt>-outfile</tt> for large projects.
 </p>
 
-<H2><a name="CSharp_differences_java">22.2 Differences to the Java module</a></H2>
+<H2><a name="CSharp_differences_java">21.2 Differences to the Java module</a></H2>
 
 
 <p>
@@ -556,7 +556,7 @@ Windows users can also get the examples working using a
 <a href="http://www.cygwin.com">Cygwin</a> or <a href="http://www.mingw.org">MinGW</a> environment for automatic configuration of the example makefiles.
 Any one of the C# compilers (Mono or Microsoft) can be detected from within a Cygwin or Mingw environment if installed in your path. 
 
-<H2><a name="CSharp_void_pointers">22.3 Void pointers</a></H2>
+<H2><a name="CSharp_void_pointers">21.3 Void pointers</a></H2>
 
 
 <p>
@@ -574,7 +574,7 @@ void * f(void *v);
 </pre>
 </div>
 
-<H2><a name="CSharp_arrays">22.4 C# Arrays</a></H2>
+<H2><a name="CSharp_arrays">21.4 C# Arrays</a></H2>
 
 
 <p>
@@ -586,7 +586,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">22.4.1 The SWIG C arrays library</a></H3>
+<H3><a name="CSharp_arrays_swig_library">21.4.1 The SWIG C arrays library</a></H3>
 
 
 <p>
@@ -623,7 +623,7 @@ example.print_array(c.cast());          // Pass to C
 </div>
 
 
-<H3><a name="CSharp_arrays_pinvoke_default_array_marshalling">22.4.2 Managed arrays using P/Invoke default array marshalling</a></H3>
+<H3><a name="CSharp_arrays_pinvoke_default_array_marshalling">21.4.2 Managed arrays using P/Invoke default array marshalling</a></H3>
 
 
 <p>
@@ -750,7 +750,7 @@ and intermediary class method
 </div>
 
 
-<H3><a name="CSharp_arrays_pinning">22.4.3 Managed arrays using pinning</a></H3>
+<H3><a name="CSharp_arrays_pinning">21.4.3 Managed arrays using pinning</a></H3>
 
 
 <p>
@@ -845,7 +845,7 @@ public static extern void myArrayCopy(global::System.IntPtr jarg1, global::Syste
 
 
 
-<H2><a name="CSharp_exceptions">22.5 C# Exceptions</a></H2>
+<H2><a name="CSharp_exceptions">21.5 C# Exceptions</a></H2>
 
 
 <p>
@@ -942,7 +942,7 @@ set so should only be used when a C# exception is not created.
 </p>
 
 
-<H3><a name="CSharp_exception_example_check_typemap">22.5.1 C# exception example using "check" typemap</a></H3>
+<H3><a name="CSharp_exception_example_check_typemap">21.5.1 C# exception example using "check" typemap</a></H3>
 
 
 <p>
@@ -1124,7 +1124,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">22.5.2 C# exception example using %exception</a></H3>
+<H3><a name="CSharp_exception_example_percent_exception">21.5.2 C# exception example using %exception</a></H3>
 
 
 <p>
@@ -1189,7 +1189,7 @@ The managed code generated does check for the pending exception as mentioned ear
 </pre>
 </div>
 
-<H3><a name="CSharp_exception_example_exception_specifications">22.5.3 C# exception example using exception specifications</a></H3>
+<H3><a name="CSharp_exception_example_exception_specifications">21.5.3 C# exception example using exception specifications</a></H3>
 
 
 <p>
@@ -1245,7 +1245,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">22.5.4 Custom C# ApplicationException example</a></H3>
+<H3><a name="CSharp_custom_application_exception">21.5.4 Custom C# ApplicationException example</a></H3>
 
 
 <p>
@@ -1379,7 +1379,7 @@ try {
 </pre>
 </div>
 
-<H2><a name="CSharp_directors">22.6 C# Directors</a></H2>
+<H2><a name="CSharp_directors">21.6 C# Directors</a></H2>
 
 
 <p>
@@ -1392,7 +1392,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">22.6.1 Directors example</a></H3>
+<H3><a name="CSharp_directors_example">21.6.1 Directors example</a></H3>
 
 
 <p>
@@ -1513,7 +1513,7 @@ CSharpDerived - UIntMethod(123)
 </pre>
 </div>
 
-<H3><a name="CSharp_directors_implementation">22.6.2 Directors implementation</a></H3>
+<H3><a name="CSharp_directors_implementation">21.6.2 Directors implementation</a></H3>
 
 
 <p>
@@ -1721,7 +1721,7 @@ before SWIG parses the Base class will change all the delegates to <tt>internal<
 </pre>
 </div>
 
-<H3><a name="CSharp_director_caveats">22.6.3 Director caveats</a></H3>
+<H3><a name="CSharp_director_caveats">21.6.3 Director caveats</a></H3>
 
 
 <p>
@@ -1769,7 +1769,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_multiple_modules">22.7 Multiple modules</a></H2>
+<H2><a name="CSharp_multiple_modules">21.7 Multiple modules</a></H2>
 
 
 <p>
@@ -1804,7 +1804,7 @@ the <tt>[System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrows
 if you don't want users to easily stumble upon these so called 'internal workings' of the wrappers.
 </p>
 
-<H2><a name="CSharp_typemap_examples">22.8 C# Typemap examples</a></H2>
+<H2><a name="CSharp_typemap_examples">21.8 C# Typemap examples</a></H2>
 
 
 This section includes a few examples of typemaps.  For more examples, you
@@ -1812,7 +1812,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">22.8.1 Memory management when returning references to member variables</a></H3>
+<H3><a name="CSharp_memory_management_member_variables">21.8.1 Memory management when returning references to member variables</a></H3>
 
 
 <p>
@@ -1936,7 +1936,7 @@ public class Bike : global::System.IDisposable {
 Note the <tt>addReference</tt> call.
 </p>
 
-<H3><a name="CSharp_memory_management_objects">22.8.2 Memory management for objects passed to the C++ layer</a></H3>
+<H3><a name="CSharp_memory_management_objects">21.8.2 Memory management for objects passed to the C++ layer</a></H3>
 
 
 <p>
@@ -2068,7 +2068,7 @@ as mentioned earlier, <tt>setElement</tt> is actually:
 </div>
 
 
-<H3><a name="CSharp_date_marshalling">22.8.3 Date marshalling using the csin typemap and associated attributes</a></H3>
+<H3><a name="CSharp_date_marshalling">21.8.3 Date marshalling using the csin typemap and associated attributes</a></H3>
 
 
 <p>
@@ -2354,7 +2354,7 @@ public class example {
 </pre>
 </div>
 
-<H3><a name="CSharp_date_properties">22.8.4 A date example demonstrating marshalling of C# properties</a></H3>
+<H3><a name="CSharp_date_properties">21.8.4 A date example demonstrating marshalling of C# properties</a></H3>
 
 
 <p>
@@ -2454,7 +2454,7 @@ Some points to note:
   <li>The 'csin' typemap has 'pre', 'post' and 'cshin' attributes, and these are all ignored in the property set. The code in these attributes must instead be replicated within the 'csvarin' typemap. The line creating the <tt>temp$csinput</tt> variable is such an example; it is identical to what is in the 'pre' attribute.
 </ul>
 
-<H3><a name="CSharp_date_pre_post_directors">22.8.5 Date example demonstrating the 'pre' and 'post' typemap attributes for directors</a></H3>
+<H3><a name="CSharp_date_pre_post_directors">21.8.5 Date example demonstrating the 'pre' and 'post' typemap attributes for directors</a></H3>
 
 
 <p>
@@ -2516,7 +2516,7 @@ Pay special attention to the memory management issues, using these attributes.
 </p>
 
 
-<H3><a name="CSharp_partial_classes">22.8.6 Turning proxy classes into partial classes</a></H3>
+<H3><a name="CSharp_partial_classes">21.8.6 Turning proxy classes into partial classes</a></H3>
 
 
 <p>
@@ -2616,7 +2616,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_sealed_proxy_class">22.8.7 Turning proxy classes into sealed classes</a></H3>
+<H3><a name="CSharp_sealed_proxy_class">21.8.7 Turning proxy classes into sealed classes</a></H3>
 
 
 <p>
@@ -2706,7 +2706,7 @@ Either suppress the warning or modify the generated code by copying and tweaking
 'csbody' typemap code in csharp.swg by modifying swigCMemOwn to not be protected.
 </p>
 
-<H3><a name="CSharp_extending_proxy_class">22.8.8 Extending proxy classes with additional C# code</a></H3>
+<H3><a name="CSharp_extending_proxy_class">21.8.8 Extending proxy classes with additional C# code</a></H3>
 
 
 <p>
@@ -2745,7 +2745,7 @@ public class ExtendMe : global::System.IDisposable {
 </pre>
 </div>
 
-<H3><a name="CSharp_enum_underlying_type">22.8.9 Underlying type for enums</a></H3>
+<H3><a name="CSharp_enum_underlying_type">21.8.9 Underlying type for enums</a></H3>
 
 
 <P>
diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html
index 06dd91ae6..e0db363f7 100644
--- a/Doc/Manual/Contents.html
+++ b/Doc/Manual/Contents.html
@@ -711,91 +711,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Allegrocl.html#Allegrocl">20 SWIG and Allegro Common Lisp</a></h3>
-
-<!-- INDEX -->
-<div class="sectiontoc">
-<ul>
-<li><a href="Allegrocl.html#Allegrocl_nn2">Basics</a>
-<ul>
-<li><a href="Allegrocl.html#Allegrocl_nn3">Running SWIG</a>
-<li><a href="Allegrocl.html#Allegrocl_nn4">Command Line Options</a>
-<li><a href="Allegrocl.html#Allegrocl_nn5">Inserting user code into generated files</a>
-</ul>
-<li><a href="Allegrocl.html#Allegrocl_nn6">Wrapping Overview</a>
-<ul>
-<li><a href="Allegrocl.html#Allegrocl_nn7">Function Wrapping</a>
-<li><a href="Allegrocl.html#Allegrocl_nn8">Foreign Wrappers</a>
-<li><a href="Allegrocl.html#Allegrocl_nn9">FFI Wrappers</a>
-<li><a href="Allegrocl.html#Allegrocl_nn10">Non-overloaded Defuns</a>
-<li><a href="Allegrocl.html#Allegrocl_nn11">Overloaded Defuns</a>
-<li><a href="Allegrocl.html#Allegrocl_nn12">What about constant and variable access?</a>
-<li><a href="Allegrocl.html#Allegrocl_nn13">Object Wrapping</a>
-</ul>
-<li><a href="Allegrocl.html#Allegrocl_nn14">Wrapping Details</a>
-<ul>
-<li><a href="Allegrocl.html#Allegrocl_nn15">Namespaces</a>
-<li><a href="Allegrocl.html#Allegrocl_nn16">Constants</a>
-<li><a href="Allegrocl.html#Allegrocl_nn17">Variables</a>
-<li><a href="Allegrocl.html#Allegrocl_nn18">Enumerations</a>
-<li><a href="Allegrocl.html#Allegrocl_nn19">Arrays</a>
-<li><a href="Allegrocl.html#Allegrocl_nn20">Classes and Structs and Unions (oh my!)</a>
-<ul>
-<li><a href="Allegrocl.html#Allegrocl_nn21">CLOS wrapping of</a>
-<li><a href="Allegrocl.html#Allegrocl_nn22">CLOS Inheritance</a>
-<li><a href="Allegrocl.html#Allegrocl_nn23">Member fields and functions</a>
-<li><a href="Allegrocl.html#Allegrocl_nn24">Why not directly access C++ classes using foreign types?</a>
-</ul>
-<li><a href="Allegrocl.html#Allegrocl_nn25">Templates</a>
-<ul>
-<li><a href="Allegrocl.html#Allegrocl_nn26">Generating wrapper code for templates</a>
-<li><a href="Allegrocl.html#Allegrocl_nn27">Implicit Template instantiation</a>
-</ul>
-<li><a href="Allegrocl.html#Allegrocl_nn28">Typedef, Templates, and Synonym Types</a>
-<ul>
-<li><a href="Allegrocl.html#Allegrocl_nn29">Choosing a primary type</a>
-</ul>
-<li><a href="Allegrocl.html#Allegrocl_nn30">Function overloading/Parameter defaulting</a>
-<li><a href="Allegrocl.html#Allegrocl_nn31">Operator wrapping and Operator overloading</a>
-<li><a href="Allegrocl.html#Allegrocl_nn32">Varargs</a>
-<li><a href="Allegrocl.html#Allegrocl_nn33">C++ Exceptions</a>
-<li><a href="Allegrocl.html#Allegrocl_nn34">Pass by value, pass by reference</a>
-</ul>
-<li><a href="Allegrocl.html#Allegrocl_nn35">Typemaps</a>
-<ul>
-<li><a href="Allegrocl.html#Allegrocl_nn36">Code Generation in the C++ Wrapper</a>
-<ul>
-<li><a href="Allegrocl.html#Allegrocl_nn37">IN Typemap</a>
-<li><a href="Allegrocl.html#Allegrocl_nn38">OUT Typemap</a>
-<li><a href="Allegrocl.html#Allegrocl_nn39">CTYPE Typemap</a>
-</ul>
-<li><a href="Allegrocl.html#Allegrocl_nn40">Code generation in Lisp wrappers</a>
-<ul>
-<li><a href="Allegrocl.html#Allegrocl_nn41">LIN Typemap</a>
-<li><a href="Allegrocl.html#Allegrocl_nn42">LOUT Typemap</a>
-<li><a href="Allegrocl.html#Allegrocl_nn43">FFITYPE Typemap</a>
-<li><a href="Allegrocl.html#Allegrocl_nn44">LISPTYPE Typemap</a>
-<li><a href="Allegrocl.html#Allegrocl_nn45">LISPCLASS Typemap</a>
-</ul>
-<li><a href="Allegrocl.html#Allegrocl_nn46">Modifying SWIG behavior using typemaps</a>
-</ul>
-<li><a href="Allegrocl.html#Allegrocl_nn47">Identifier Converter functions</a>
-<ul>
-<li><a href="Allegrocl.html#Allegrocl_nn48">Creating symbols in the lisp environment</a>
-<li><a href="Allegrocl.html#Allegrocl_nn49">Existing identifier-converter functions</a>
-<ul>
-<li><a href="Allegrocl.html#Allegrocl_nn50">identifier-convert-null</a>
-<li><a href="Allegrocl.html#Allegrocl_nn51">identifier-convert-lispify</a>
-<li><a href="Allegrocl.html#Allegrocl_nn52">Default identifier to symbol conversions</a>
-</ul>
-<li><a href="Allegrocl.html#Allegrocl_nn53">Defining your own identifier-converter</a>
-<li><a href="Allegrocl.html#Allegrocl_nn54">Instructing SWIG to use a particular identifier-converter</a>
-</ul>
-</ul>
-</div>
-<!-- INDEX -->
-
-<h3><a href="Android.html#Android">21 SWIG and Android</a></h3>
+<h3><a href="Android.html#Android">20 SWIG and Android</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -813,7 +729,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="CSharp.html#CSharp">22 SWIG and C#</a></h3>
+<h3><a href="CSharp.html#CSharp">21 SWIG and C#</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -861,45 +777,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Chicken.html#Chicken">23 SWIG and Chicken</a></h3>
-
-<!-- INDEX -->
-<div class="sectiontoc">
-<ul>
-<li><a href="Chicken.html#Chicken_nn2">Preliminaries</a>
-<ul>
-<li><a href="Chicken.html#Chicken_nn3">Running SWIG in C mode</a>
-<li><a href="Chicken.html#Chicken_nn4">Running SWIG in C++ mode</a>
-</ul>
-<li><a href="Chicken.html#Chicken_nn5">Code Generation</a>
-<ul>
-<li><a href="Chicken.html#Chicken_nn6">Naming Conventions</a>
-<li><a href="Chicken.html#Chicken_nn7">Modules</a>
-<li><a href="Chicken.html#Chicken_nn8">Constants and Variables</a>
-<li><a href="Chicken.html#Chicken_nn9">Functions</a>
-<li><a href="Chicken.html#Chicken_nn10">Exceptions</a>
-</ul>
-<li><a href="Chicken.html#Chicken_nn11">TinyCLOS</a>
-<li><a href="Chicken.html#Chicken_nn12">Linkage</a>
-<ul>
-<li><a href="Chicken.html#Chicken_nn13">Static binary or shared library linked at compile time</a>
-<li><a href="Chicken.html#Chicken_nn14">Building chicken extension libraries</a>
-<li><a href="Chicken.html#Chicken_nn15">Linking multiple SWIG modules with TinyCLOS</a>
-</ul>
-<li><a href="Chicken.html#Chicken_nn16">Typemaps</a>
-<li><a href="Chicken.html#Chicken_nn17">Pointers</a>
-<ul>
-<li><a href="Chicken.html#Chicken_collection">Garbage collection</a>
-</ul>
-<li><a href="Chicken.html#Chicken_nn18">Unsupported features and known problems</a>
-<ul>
-<li><a href="Chicken.html#Chicken_nn19">TinyCLOS problems with Chicken version &lt;= 1.92</a>
-</ul>
-</ul>
-</div>
-<!-- INDEX -->
-
-<h3><a href="D.html#D">24 SWIG and D</a></h3>
+<h3><a href="D.html#D">22 SWIG and D</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -933,7 +811,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Go.html#Go">25 SWIG and Go</a></h3>
+<h3><a href="Go.html#Go">23 SWIG and Go</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -977,7 +855,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Guile.html#Guile">26 SWIG and Guile</a></h3>
+<h3><a href="Guile.html#Guile">24 SWIG and Guile</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1013,7 +891,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Java.html#Java">27 SWIG and Java</a></h3>
+<h3><a href="Java.html#Java">25 SWIG and Java</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1167,7 +1045,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Javascript.html#Javascript">28 SWIG and Javascript</a></h3>
+<h3><a href="Javascript.html#Javascript">26 SWIG and Javascript</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1209,30 +1087,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Lisp.html#Lisp">29 SWIG and Common Lisp</a></h3>
-
-<!-- INDEX -->
-<div class="sectiontoc">
-<ul>
-<li><a href="Lisp.html#Lisp_nn2">Allegro Common Lisp</a>
-<li><a href="Lisp.html#Lisp_nn3">Common Foreign Function Interface(CFFI)</a>
-<ul>
-<li><a href="Lisp.html#Lisp_nn4">Additional Commandline Options </a>
-<li><a href="Lisp.html#Lisp_nn5">Generating CFFI bindings</a>
-<li><a href="Lisp.html#Lisp_nn6">Generating CFFI bindings for C++ code</a>
-<li><a href="Lisp.html#Lisp_nn7">Inserting user code into generated files</a>
-</ul>
-<li><a href="Lisp.html#Lisp_nn8">CLISP</a>
-<ul>
-<li><a href="Lisp.html#Lisp_nn9">Additional Commandline Options </a>
-<li><a href="Lisp.html#Lisp_nn10">Details on CLISP bindings</a>
-</ul>
-<li><a href="Lisp.html#Lisp_nn11">UFFI </a>
-</ul>
-</div>
-<!-- INDEX -->
-
-<h3><a href="Lua.html#Lua">30 SWIG and Lua</a></h3>
+<h3><a href="Lua.html#Lua">27 SWIG and Lua</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1300,57 +1155,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Modula3.html#Modula3">31 SWIG and Modula-3</a></h3>
-
-<!-- INDEX -->
-<div class="sectiontoc">
-<ul>
-<li><a href="Modula3.html#Modula3_modula3_overview">Overview</a>
-<ul>
-<li><a href="Modula3.html#Modula3_motivation">Motivation</a>
-</ul>
-<li><a href="Modula3.html#Modula3_conception">Conception</a>
-<ul>
-<li><a href="Modula3.html#Modula3_cinterface">Interfaces to C libraries</a>
-<li><a href="Modula3.html#Modula3_cppinterface">Interfaces to C++ libraries</a>
-</ul>
-<li><a href="Modula3.html#Modula3_preliminaries">Preliminaries</a>
-<ul>
-<li><a href="Modula3.html#Modula3_compilers">Compilers</a>
-<li><a href="Modula3.html#Modula3_commandline">Additional Commandline Options</a>
-</ul>
-<li><a href="Modula3.html#Modula3_typemaps">Modula-3 typemaps</a>
-<ul>
-<li><a href="Modula3.html#Modula3_inoutparam">Inputs and outputs</a>
-<li><a href="Modula3.html#Modula3_ordinals">Subranges, Enumerations, Sets</a>
-<li><a href="Modula3.html#Modula3_class">Objects</a>
-<li><a href="Modula3.html#Modula3_imports">Imports</a>
-<li><a href="Modula3.html#Modula3_exceptions">Exceptions</a>
-<li><a href="Modula3.html#Modula3_typemap_example">Example</a>
-</ul>
-<li><a href="Modula3.html#Modula3_hints">More hints to the generator</a>
-<ul>
-<li><a href="Modula3.html#Modula3_features">Features</a>
-<li><a href="Modula3.html#Modula3_pragmas">Pragmas</a>
-</ul>
-<li><a href="Modula3.html#Modula3_remarks">Remarks</a>
-</ul>
-</div>
-<!-- INDEX -->
-
-<h3><a href="Mzscheme.html#Mzscheme">32 SWIG and MzScheme/Racket</a></h3>
-
-<!-- INDEX -->
-<div class="sectiontoc">
-<ul>
-<li><a href="Mzscheme.html#MzScheme_nn2">Creating native structures</a>
-<li><a href="Mzscheme.html#MzScheme_simple">Simple example</a>
-<li><a href="Mzscheme.html#MzScheme_external_docs">External documentation</a>
-</ul>
-</div>
-<!-- INDEX -->
-
-<h3><a href="Ocaml.html#Ocaml">33 SWIG and Ocaml</a></h3>
+<h3><a href="Ocaml.html#Ocaml">28 SWIG and Ocaml</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1405,7 +1210,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Octave.html#Octave">34 SWIG and Octave</a></h3>
+<h3><a href="Octave.html#Octave">29 SWIG and Octave</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1445,7 +1250,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Perl5.html#Perl5">35 SWIG and Perl5</a></h3>
+<h3><a href="Perl5.html#Perl5">30 SWIG and Perl5</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1521,7 +1326,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Php.html#Php">36 SWIG and PHP</a></h3>
+<h3><a href="Php.html#Php">31 SWIG and PHP</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1562,31 +1367,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Pike.html#Pike">37 SWIG and Pike</a></h3>
-
-<!-- INDEX -->
-<div class="sectiontoc">
-<ul>
-<li><a href="Pike.html#Pike_nn2">Preliminaries</a>
-<ul>
-<li><a href="Pike.html#Pike_nn3">Running SWIG</a>
-<li><a href="Pike.html#Pike_nn4">Getting the right header files</a>
-<li><a href="Pike.html#Pike_nn5">Using your module</a>
-</ul>
-<li><a href="Pike.html#Pike_nn6">Basic C/C++ Mapping</a>
-<ul>
-<li><a href="Pike.html#Pike_nn7">Modules</a>
-<li><a href="Pike.html#Pike_nn8">Functions</a>
-<li><a href="Pike.html#Pike_nn9">Global variables</a>
-<li><a href="Pike.html#Pike_nn10">Constants and enumerated types</a>
-<li><a href="Pike.html#Pike_nn11">Constructors and Destructors</a>
-<li><a href="Pike.html#Pike_nn12">Static Members</a>
-</ul>
-</ul>
-</div>
-<!-- INDEX -->
-
-<h3><a href="Python.html#Python">38 SWIG and Python</a></h3>
+<h3><a href="Python.html#Python">32 SWIG and Python</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1728,7 +1509,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="R.html#R">39 SWIG and R</a></h3>
+<h3><a href="R.html#R">33 SWIG and R</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1744,7 +1525,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Ruby.html#Ruby">40 SWIG and Ruby</a></h3>
+<h3><a href="Ruby.html#Ruby">34 SWIG and Ruby</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1882,7 +1663,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Scilab.html#Scilab">41 SWIG and Scilab</a></h3>
+<h3><a href="Scilab.html#Scilab">35 SWIG and Scilab</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1951,7 +1732,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Tcl.html#Tcl">42 SWIG and Tcl</a></h3>
+<h3><a href="Tcl.html#Tcl">36 SWIG and Tcl</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -2017,7 +1798,19 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Extending.html#Extending">43 Extending SWIG to support new languages</a></h3>
+<h3><a href="Mzscheme.html#Mzscheme">37 SWIG and MzScheme/Racket</a></h3>
+
+<!-- INDEX -->
+<div class="sectiontoc">
+<ul>
+<li><a href="Mzscheme.html#MzScheme_nn2">Creating native structures</a>
+<li><a href="Mzscheme.html#MzScheme_simple">Simple example</a>
+<li><a href="Mzscheme.html#MzScheme_external_docs">External documentation</a>
+</ul>
+</div>
+<!-- INDEX -->
+
+<h3><a href="Extending.html#Extending">38 Extending SWIG to support new languages</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
diff --git a/Doc/Manual/D.html b/Doc/Manual/D.html
index 5a6ee8f28..1a317a005 100644
--- a/Doc/Manual/D.html
+++ b/Doc/Manual/D.html
@@ -6,7 +6,7 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 </head>
 <body bgcolor="#FFFFFF">
-<H1><a name="D">24 SWIG and D</a></H1>
+<H1><a name="D">22 SWIG and D</a></H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -41,7 +41,7 @@
 
 
 
-<H2><a name="D_introduction">24.1 Introduction</a></H2>
+<H2><a name="D_introduction">22.1 Introduction</a></H2>
 
 
 <p>From the <a href="http://www.digitalmars.com/d/">D Programming Language</a> web site: <em>D is a systems programming language. Its focus is on combining the power and high performance of C and C++ with the programmer productivity of modern languages like Ruby and Python. [...] The D language is statically typed and compiles directly to machine code.</em> As such, it is not very surprising that D is able to directly <a href="http://www.digitalmars.com/d/1.0/interfaceToC.html">interface with C libraries</a>. Why would a SWIG module for D be needed then in the first place?</p>
@@ -53,7 +53,7 @@
 <p>To help addressing these issues, the SWIG C# module has been forked to support D. Is has evolved quite a lot since then, but there are still many similarities, so if you do not find what you are looking for on this page, it might be worth having a look at the chapter on <a href="CSharp.html#CSharp">C#</a> (and also on <a href="Java.html#Java">Java</a>, since the C# module was in turn forked from it).</p>
 
 
-<H2><a name="D_command_line_invocation">24.2 Command line invocation</a></H2>
+<H2><a name="D_command_line_invocation">22.2 Command line invocation</a></H2>
 
 
 <p>To activate the D module, pass the <tt>-d</tt> option to SWIG at the command line. The same standard command line switches as with any other language module are available, plus the following D specific ones:</p>
@@ -83,10 +83,10 @@
 </dl>
 
 
-<H2><a name="D_typemaps">24.3 Typemaps</a></H2>
+<H2><a name="D_typemaps">22.3 Typemaps</a></H2>
 
 
-<H3><a name="D_typemap_name_comparison">24.3.1 C# &lt;-&gt; D name comparison</a></H3>
+<H3><a name="D_typemap_name_comparison">22.3.1 C# &lt;-&gt; D name comparison</a></H3>
 
 
 <p>If you already know the SWIG C# module, you might find the following name comparison table useful:</p>
@@ -112,7 +112,7 @@
 </pre></div>
 
 
-<H3><a name="D_ctype_imtype_dtype">24.3.2 ctype, imtype, dtype</a></H3>
+<H3><a name="D_ctype_imtype_dtype">22.3.2 ctype, imtype, dtype</a></H3>
 
 
 <p>Mapping of types between the C/C++ library, the C/C++ library wrapper exposing the C functions, the D wrapper module importing these functions and the D proxy code.</p>
@@ -120,7 +120,7 @@
 <p>The <tt>ctype</tt> typemap is used to determine the types to use in the C wrapper functions. The types from the <tt>imtype</tt> typemap are used in the extern(C) declarations of these functions in the intermediary D module. The <tt>dtype</tt> typemap contains the D types used in the D proxy module/class.</p>
 
 
-<H3><a name="D_in_out_directorin_direcetorout">24.3.3 in, out, directorin, directorout</a></H3>
+<H3><a name="D_in_out_directorin_direcetorout">22.3.3 in, out, directorin, directorout</a></H3>
 
 
 <p>Used for converting between the types for C/C++ and D when generating the code for the wrapper functions (on the C++ side).</p>
@@ -130,7 +130,7 @@
 <p>The <tt>directorin</tt> typemap is used to convert parameters to the type used in the D director callback function, its return value is processed by <tt>directorout</tt> (see below).</p>
 
 
-<H3><a name="D_din_dout_ddirectorin_ddirectorout">24.3.4 din, dout, ddirectorin, ddirectorout</a></H3>
+<H3><a name="D_din_dout_ddirectorin_ddirectorout">22.3.4 din, dout, ddirectorin, ddirectorout</a></H3>
 
 
 <p>Typemaps for code generation in D proxy and type wrapper classes.</p>
@@ -157,13 +157,13 @@
       dtype             DClass.method(dtype a)</pre></div>
 
 
-<H3><a name="D_typecheck_typemaps">24.3.5 typecheck typemaps</a></H3>
+<H3><a name="D_typecheck_typemaps">22.3.5 typecheck typemaps</a></H3>
 
 
 <p>Because, unlike many scripting languages supported by SWIG, D does not need any dynamic dispatch helper to access an overloaded function, the purpose of these is merely to issue a warning for overloaded C++ functions that cannot be overloaded in D (as more than one C++ type maps to a single D type).</p>
 
 
-<H3><a name="D_code_injection_typemaps">24.3.6 Code injection typemaps</a></H3>
+<H3><a name="D_code_injection_typemaps">22.3.6 Code injection typemaps</a></H3>
 
 
 <p>These typemaps are used for generating the skeleton of proxy classes for C++ types.</p>
@@ -178,7 +178,7 @@
 Code can also be injected into the D proxy class using <tt>%proxycode</tt>.
 </p>
 
-<H3><a name="D_special_variables">24.3.7 Special variable macros</a></H3>
+<H3><a name="D_special_variables">22.3.7 Special variable macros</a></H3>
 
 
 <p>The standard SWIG special variables are available for use within typemaps as described in the <a href="Typemaps.html#Typemaps">Typemaps documentation</a>, for example <tt>$1</tt>, <tt>$input</tt>, <tt>$result</tt> etc.</p>
@@ -299,7 +299,7 @@ $importtype(AnotherInterface)
 </dl>
 
 
-<H2><a name="D_features">24.4 D and %feature</a></H2>
+<H2><a name="D_features">22.4 D and %feature</a></H2>
 
 
 <p>The D module defines a number of directives which modify the <a href="Customization.html#Customization_features">SWIG features</a> set globally or for a specific declaration:</p>
@@ -329,7 +329,7 @@ struct A {
 </dl>
 
 
-<H2><a name="D_pragmas">24.5 Pragmas</a></H2>
+<H2><a name="D_pragmas">22.5 Pragmas</a></H2>
 
 
 <p>There are a few SWIG pragmas specific to the D module, which you can use to influence the D code SWIG generates:</p>
@@ -368,7 +368,7 @@ struct A {
 </dl>
 
 
-<H2><a name="D_exceptions">24.6 D Exceptions</a></H2>
+<H2><a name="D_exceptions">22.6 D Exceptions</a></H2>
 
 
 <p>Out of the box, C++ exceptions are fundamentally incompatible to their equivalent in the D world and cannot simply be propagated to a calling D method. There is, however, an easy way to solve this problem: Just catch the exception in the C/C++ wrapper layer, pass the contents to D, and make the wrapper code rethrow the exception in the D world.</p>
@@ -378,7 +378,7 @@ struct A {
 <p>As this feature is implemented in exactly the same way it is for C#, please see the <a href="CSharp.html#CSharp_exceptions">C# documentation</a> for a more detailed explanation.</p>
 
 
-<H2><a name="D_directors">24.7 D Directors</a></H2>
+<H2><a name="D_directors">22.7 D Directors</a></H2>
 
 
 <p>When the directors feature is activated, SWIG generates extra code on both the C++ and the D side to enable cross-language polymorphism. Essentially, this means that if you subclass a proxy class in D, C++ code can access any overridden virtual methods just as if you created a derived class in C++.</p>
@@ -387,16 +387,16 @@ struct A {
 </p>
 
 
-<H2><a name="D_other_features">24.8 Other features</a></H2>
+<H2><a name="D_other_features">22.8 Other features</a></H2>
 
 
-<H3><a name="D_nspace">24.8.1 Extended namespace support (nspace)</a></H3>
+<H3><a name="D_nspace">22.8.1 Extended namespace support (nspace)</a></H3>
 
 
 <p>By default, SWIG flattens all C++ namespaces into a single target language namespace, but as for Java and C#, the <a href="SWIGPlus.html#SWIGPlus_nspace"><tt>nspace</tt></a> feature is supported for D. If it is active, C++ namespaces are mapped to D packages/modules. Note, however, that like for the other languages, <em>free</em> variables and functions are not supported yet; currently, they are all allows written to the main proxy D module.</p>
 
 
-<H3><a name="D_native_pointer_support">24.8.2 Native pointer support</a></H3>
+<H3><a name="D_native_pointer_support">22.8.2 Native pointer support</a></H3>
 
 
 <p>Contrary to many of the scripting languages supported by SWIG, D fully supports C-style pointers. The D module thus includes a custom mechanism to wrap C pointers directly as D pointers where applicable, that is, if the type that is pointed to is represented the same in C and D (on the bit-level), dubbed a <em>primitive type</em> below.</p>
@@ -408,7 +408,7 @@ struct A {
 <p>To determine if a type should be considered primitive, the <tt>cprimitive</tt> attribute on its <tt>dtype</tt> attribute is used. For example, the <tt>dtype</tt> typemap for <tt>float</tt> has <tt>cprimitive="1"</tt>, so the code from the <tt>nativepointer</tt> attribute is taken into account e.g. for <tt>float **</tt> or the function pointer <tt>float (*)(float *)</tt>.</p>
 
 
-<H3><a name="D_operator_overloading">24.8.3 Operator overloading</a></H3>
+<H3><a name="D_operator_overloading">22.8.3 Operator overloading</a></H3>
 
 
 <p>The D module comes with basic operator overloading support for both D1 and D2. There are, however, a few limitations arising from conceptual differences between C++ and D:</p>
@@ -420,7 +420,7 @@ struct A {
 <p>There are also some cases where the operators can be translated to D, but the differences in the implementation details are big enough that a rather involved scheme would be required for automatic wrapping them, which has not been implemented yet. This affects, for example, the array subscript operator, <tt>[]</tt>, in combination with assignments - while <tt>operator []</tt> in C++ simply returns a reference which is then written to, D resorts to a separate <tt>opIndexAssign</tt> method -, or implicit casting (which was introduced in D2 via <tt>alias this</tt>). Despite the lack of automatic support, manually handling these cases should be perfectly possible.</p>
 
 
-<H3><a name="D_test_suite">24.8.4 Running the test-suite</a></H3>
+<H3><a name="D_test_suite">22.8.4 Running the test-suite</a></H3>
 
 
 <p>As with any other language, the SWIG test-suite can be built for D using the <tt>*-d-test-suite</tt> targets of the top-level Makefile. By default, D1 is targeted, to build it with D2, use the optional <tt>D_VERSION</tt> variable, e.g. <tt>make check-d-test-suite D_VERSION=2</tt>.</p>
@@ -428,14 +428,14 @@ struct A {
 <p>Note: If you want to use GDC on Linux or another platform which requires you to link <tt>libdl</tt> for dynamically loading the shared library, you might have to add <tt>-ldl</tt> manually to the <tt>d_compile</tt> target in <tt>Examples/Makefile</tt>, because GDC does not currently honor the <tt>pragma(lib, ...)</tt> statement.</p>
 
 
-<H2><a name="D_typemap_examples">24.9 D Typemap examples</a></H2>
+<H2><a name="D_typemap_examples">22.9 D Typemap examples</a></H2>
 
 
 <p>There are no D-specific typemap examples yet. However, with the above <a href="D.html#D_typemap_name_comparison">name comparison table</a>, you should be able to get an idea what can be done by looking at the <a href="CSharp.html#CSharp_typemap_examples">corresponding C# section</a>.</p>
 
 
 
-<H2><a name="D_planned_features">24.10 Work in progress and planned features</a></H2>
+<H2><a name="D_planned_features">22.10 Work in progress and planned features</a></H2>
 
 
 <p>There are a couple of features which are not implemented yet, but would be very useful and might be added in the near future:</p>
diff --git a/Doc/Manual/Extending.html b/Doc/Manual/Extending.html
index 7b2e61e21..1d9fc83ac 100644
--- a/Doc/Manual/Extending.html
+++ b/Doc/Manual/Extending.html
@@ -7,7 +7,7 @@
 </head>
 
 <body bgcolor="#ffffff">
-<H1><a name="Extending">43 Extending SWIG to support new languages</a></H1>
+<H1><a name="Extending">38 Extending SWIG to support new languages</a></H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -81,7 +81,7 @@
 
 
 
-<H2><a name="Extending_nn2">43.1 Introduction</a></H2>
+<H2><a name="Extending_nn2">38.1 Introduction</a></H2>
 
 
 <p>
@@ -97,7 +97,7 @@ Also, this chapter is not meant to be a hand-holding tutorial.  As a starting po
 you should probably look at one of SWIG's existing modules.
 </p>
 
-<H2><a name="Extending_nn3">43.2 Prerequisites</a></H2>
+<H2><a name="Extending_nn3">38.2 Prerequisites</a></H2>
 
 
 <p>
@@ -127,7 +127,7 @@ obvious, but almost all SWIG directives as well as the low-level generation of
 wrapper code are driven by C++ datatypes.
 </p>
 
-<H2><a name="Extending_nn4">43.3 The Big Picture</a></H2>
+<H2><a name="Extending_nn4">38.3 The Big Picture</a></H2>
 
 
 <p>
@@ -164,7 +164,7 @@ role in making the system work.  For example, both typemaps and declaration anno
 based on pattern matching and interact heavily with the underlying type system.
 </p>
 
-<H2><a name="Extending_nn5">43.4 Execution Model</a></H2>
+<H2><a name="Extending_nn5">38.4 Execution Model</a></H2>
 
 
 <p>
@@ -209,7 +209,7 @@ latter stage of compilation.
 The next few sections briefly describe some of these stages.
 </p>
 
-<H3><a name="Extending_nn6">43.4.1 Preprocessing</a></H3>
+<H3><a name="Extending_nn6">38.4.1 Preprocessing</a></H3>
 
 
 <p>
@@ -290,7 +290,7 @@ been expanded as well as everything else that goes into the low-level
 construction of the wrapper code.
 </p>
 
-<H3><a name="Extending_nn7">43.4.2 Parsing</a></H3>
+<H3><a name="Extending_nn7">38.4.2 Parsing</a></H3>
 
 
 <p>
@@ -391,7 +391,7 @@ returning a <tt>foo</tt> and taking types <tt>a</tt> and <tt>b</tt> as
 arguments).
 </p>
 
-<H3><a name="Extending_nn8">43.4.3 Parse Trees</a></H3>
+<H3><a name="Extending_nn8">38.4.3 Parse Trees</a></H3>
 
 
 <p>
@@ -646,7 +646,7 @@ $ swig -c++ -python -debug-module 4 example.i
 </pre>
 </div>
 
-<H3><a name="Extending_nn9">43.4.4 Attribute namespaces</a></H3>
+<H3><a name="Extending_nn9">38.4.4 Attribute namespaces</a></H3>
 
 
 <p>
@@ -665,7 +665,7 @@ that matches the name of the target language.  For example, <tt>python:foo</tt>
 <tt>perl:foo</tt>.
 </p>
 
-<H3><a name="Extending_nn10">43.4.5 Symbol Tables</a></H3>
+<H3><a name="Extending_nn10">38.4.5 Symbol Tables</a></H3>
 
 
 <p>
@@ -756,7 +756,7 @@ example.i:5. Previous declaration is foo_i(int )
 </pre>
 </div>
 
-<H3><a name="Extending_nn11">43.4.6 The %feature directive</a></H3>
+<H3><a name="Extending_nn11">38.4.6 The %feature directive</a></H3>
 
 
 <p>
@@ -812,7 +812,7 @@ For example, the exception code above is simply
 stored without any modifications.
 </p>
 
-<H3><a name="Extending_nn12">43.4.7 Code Generation</a></H3>
+<H3><a name="Extending_nn12">38.4.7 Code Generation</a></H3>
 
 
 <p>
@@ -934,7 +934,7 @@ public :
 The role of these functions is described shortly.
 </p>
 
-<H3><a name="Extending_nn13">43.4.8 SWIG and XML</a></H3>
+<H3><a name="Extending_nn13">38.4.8 SWIG and XML</a></H3>
 
 
 <p>
@@ -947,7 +947,7 @@ internal data structures, it may be useful to keep XML in the back of
 your mind as a model.
 </p>
 
-<H2><a name="Extending_nn14">43.5 Primitive Data Structures</a></H2>
+<H2><a name="Extending_nn14">38.5 Primitive Data Structures</a></H2>
 
 
 <p>
@@ -993,7 +993,7 @@ typedef Hash   Typetab;
 </pre>
 </div>
 
-<H3><a name="Extending_nn15">43.5.1 Strings</a></H3>
+<H3><a name="Extending_nn15">38.5.1 Strings</a></H3>
 
 
 <p>
@@ -1134,7 +1134,7 @@ Returns the number of replacements made (if any).
 
 </div>
 
-<H3><a name="Extending_nn16">43.5.2 Hashes</a></H3>
+<H3><a name="Extending_nn16">38.5.2 Hashes</a></H3>
 
 
 <p>
@@ -1211,7 +1211,7 @@ Returns the list of hash table keys.
 </div>
 
 
-<H3><a name="Extending_nn17">43.5.3 Lists</a></H3>
+<H3><a name="Extending_nn17">38.5.3 Lists</a></H3>
 
 
 <p>
@@ -1300,7 +1300,7 @@ If <tt>t</tt> is not a standard object, it is assumed to be a <tt>char *</tt>
 and is used to create a String object.
 </div>
 
-<H3><a name="Extending_nn18">43.5.4 Common operations</a></H3>
+<H3><a name="Extending_nn18">38.5.4 Common operations</a></H3>
 
 
 The following operations are applicable to all datatypes.
@@ -1355,7 +1355,7 @@ objects and report errors.
 Gets the line number associated with <tt>x</tt>.
 </div>
 
-<H3><a name="Extending_nn19">43.5.5 Iterating over Lists and Hashes</a></H3>
+<H3><a name="Extending_nn19">38.5.5 Iterating over Lists and Hashes</a></H3>
 
 
 To iterate over the elements of a list or a hash table, the following functions are used:
@@ -1400,7 +1400,7 @@ for (j = First(j); j.item; j= Next(j)) {
 
 </div>
 
-<H3><a name="Extending_nn20">43.5.6 I/O</a></H3>
+<H3><a name="Extending_nn20">38.5.6 I/O</a></H3>
 
 
 Special I/O functions are used for all internal I/O.  These operations
@@ -1534,7 +1534,7 @@ Printf(f, "%s\n", s);
 Similarly, the preprocessor and parser all operate on string-files.
 </p>
 
-<H2><a name="Extending_nn21">43.6 Navigating and manipulating parse trees</a></H2>
+<H2><a name="Extending_nn21">38.6 Navigating and manipulating parse trees</a></H2>
 
 
 Parse trees are built as collections of hash tables.   Each node is a hash table in which
@@ -1668,7 +1668,7 @@ Deletes a node from the parse tree.  Deletion reconnects siblings and properly u
 the parent so that sibling nodes are unaffected.
 </div>
 
-<H2><a name="Extending_nn22">43.7 Working with attributes</a></H2>
+<H2><a name="Extending_nn22">38.7 Working with attributes</a></H2>
 
 
 <p>
@@ -1785,7 +1785,7 @@ the attribute is optional.   <tt>Swig_restore()</tt> must always be called after
 function.
 </div>
 
-<H2><a name="Extending_nn23">43.8 Type system</a></H2>
+<H2><a name="Extending_nn23">38.8 Type system</a></H2>
 
 
 <p>
@@ -1794,7 +1794,7 @@ pointers, references, and pointers to members.   A detailed discussion of
 type theory is impossible here.   However, let's cover the highlights.
 </p>
 
-<H3><a name="Extending_nn24">43.8.1 String encoding of types</a></H3>
+<H3><a name="Extending_nn24">38.8.1 String encoding of types</a></H3>
 
 
 <p>
@@ -1895,7 +1895,7 @@ make the final type, the two parts are just joined together using
 string concatenation.
 </p>
 
-<H3><a name="Extending_nn25">43.8.2 Type construction</a></H3>
+<H3><a name="Extending_nn25">38.8.2 Type construction</a></H3>
 
 
 <p>
@@ -2064,7 +2064,7 @@ Returns the prefix of a type. For example, if <tt>ty</tt> is
 <tt>ty</tt> is unmodified.
 </div>
 
-<H3><a name="Extending_nn26">43.8.3 Type tests</a></H3>
+<H3><a name="Extending_nn26">38.8.3 Type tests</a></H3>
 
 
 <p>
@@ -2151,7 +2151,7 @@ Checks if <tt>ty</tt> is a varargs type.
 Checks if <tt>ty</tt> is a templatized type.
 </div>
 
-<H3><a name="Extending_nn27">43.8.4 Typedef and inheritance</a></H3>
+<H3><a name="Extending_nn27">38.8.4 Typedef and inheritance</a></H3>
 
 
 <p>
@@ -2253,7 +2253,7 @@ Fully reduces <tt>ty</tt> according to typedef rules.  Resulting datatype
 will consist only of primitive typenames.
 </div>
 
-<H3><a name="Extending_nn28">43.8.5 Lvalues</a></H3>
+<H3><a name="Extending_nn28">38.8.5 Lvalues</a></H3>
 
 
 <p>
@@ -2290,7 +2290,7 @@ Literal y;    // type = 'Literal', ltype='p.char'
 </pre>
 </div>
 
-<H3><a name="Extending_nn29">43.8.6 Output functions</a></H3>
+<H3><a name="Extending_nn29">38.8.6 Output functions</a></H3>
 
 
 <p>
@@ -2352,7 +2352,7 @@ SWIG, but is most commonly associated with type-descriptor objects
 that appear in wrappers (e.g., <tt>SWIGTYPE_p_double</tt>).
 </div>
 
-<H2><a name="Extending_nn30">43.9 Parameters</a></H2>
+<H2><a name="Extending_nn30">38.9 Parameters</a></H2>
 
 
 <p>
@@ -2451,7 +2451,7 @@ included.  Used to emit prototypes.
 Returns the number of required (non-optional) arguments in <tt>p</tt>.
 </div>
 
-<H2><a name="Extending_nn31">43.10 Writing a Language Module</a></H2>
+<H2><a name="Extending_nn31">38.10 Writing a Language Module</a></H2>
 
 
 <p>
@@ -2466,7 +2466,7 @@ describes the creation of a minimal Python module.   You should be able to extra
 this to other languages.
 </p>
 
-<H3><a name="Extending_nn32">43.10.1 Execution model</a></H3>
+<H3><a name="Extending_nn32">38.10.1 Execution model</a></H3>
 
 
 <p>
@@ -2476,7 +2476,7 @@ the parsing of command line options, all aspects of code generation are controll
 different methods of the <tt>Language</tt> that must be defined by your module.
 </p>
 
-<H3><a name="Extending_starting_out">43.10.2 Starting out</a></H3>
+<H3><a name="Extending_starting_out">38.10.2 Starting out</a></H3>
 
 
 <p>
@@ -2584,7 +2584,7 @@ that activates your module. For example, <tt>swig -python foo.i</tt>. The
 messages from your new module should appear.
 </p>
 
-<H3><a name="Extending_nn34">43.10.3 Command line options</a></H3>
+<H3><a name="Extending_nn34">38.10.3 Command line options</a></H3>
 
 
 <p>
@@ -2643,7 +2643,7 @@ to mark the option as valid.   If you forget to do this, SWIG will terminate wit
 unrecognized command line option error.
 </p>
 
-<H3><a name="Extending_nn35">43.10.4 Configuration and preprocessing</a></H3>
+<H3><a name="Extending_nn35">38.10.4 Configuration and preprocessing</a></H3>
 
 
 <p>
@@ -2692,7 +2692,7 @@ an implementation file <tt>python.cxx</tt> and a configuration file
 <tt>python.swg</tt>.
 </p>
 
-<H3><a name="Extending_nn36">43.10.5 Entry point to code generation</a></H3>
+<H3><a name="Extending_nn36">38.10.5 Entry point to code generation</a></H3>
 
 
 <p>
@@ -2750,7 +2750,7 @@ int Python::top(Node *n) {
 </pre>
 </div>
 
-<H3><a name="Extending_nn37">43.10.6 Module I/O and wrapper skeleton</a></H3>
+<H3><a name="Extending_nn37">38.10.6 Module I/O and wrapper skeleton</a></H3>
 
 
 <!-- please report bugs in this section to mgossage -->
@@ -2898,7 +2898,7 @@ functionWrapper   : void Shape_y_set(Shape *self, double y)
 </pre>
 </div>
 
-<H3><a name="Extending_nn38">43.10.7 Low-level code generators</a></H3>
+<H3><a name="Extending_nn38">38.10.7 Low-level code generators</a></H3>
 
 
 <!-- please report bugs in this section to mgossage -->
@@ -3052,7 +3052,7 @@ but without the typemaps, there is still work to do.
 </p>
 
 
-<H3><a name="Extending_configuration_files">43.10.8 Configuration files</a></H3>
+<H3><a name="Extending_configuration_files">38.10.8 Configuration files</a></H3>
 
 
 <!-- please report bugs in this section to ttn -->
@@ -3196,7 +3196,7 @@ politely displays the ignoring language message.
 </dl>
 
 
-<H3><a name="Extending_nn40">43.10.9 Runtime support</a></H3>
+<H3><a name="Extending_nn40">38.10.9 Runtime support</a></H3>
 
 
 <p>
@@ -3205,7 +3205,7 @@ Discuss the kinds of functions typically needed for SWIG runtime support (e.g.
 the SWIG files that implement those functions.
 </p>
 
-<H3><a name="Extending_nn41">43.10.10 Standard library files</a></H3>
+<H3><a name="Extending_nn41">38.10.10 Standard library files</a></H3>
 
 
 <p>
@@ -3224,7 +3224,7 @@ The following are the minimum that are usually supported:
 Please copy these and modify for any new language.
 </p>
 
-<H3><a name="Extending_nn42">43.10.11 User examples</a></H3>
+<H3><a name="Extending_nn42">38.10.11 User examples</a></H3>
 
 
 <p>
@@ -3253,7 +3253,7 @@ during this process, see the section on <a href="#Extending_configuration_files"
 files</a>.
 </p>
 
-<H3><a name="Extending_test_suite">43.10.12 Test driven development and the test-suite</a></H3>
+<H3><a name="Extending_test_suite">38.10.12 Test driven development and the test-suite</a></H3>
 
 
 <p>
@@ -3312,7 +3312,7 @@ It is therefore essential that the runtime tests are written in a manner that di
 but error/exception out with an error message on stderr on failure.
 </p>
 
-<H4><a name="Extending_running_test_suite">43.10.12.1 Running the test-suite</a></H4>
+<H4><a name="Extending_running_test_suite">38.10.12.1 Running the test-suite</a></H4>
 
 
 <p>
@@ -3504,7 +3504,7 @@ It can be run in the same way as the other language test-suites, replacing [lang
 The test cases used and the way it works is described in <tt>Examples/test-suite/errors/Makefile.in</tt>.
 </p>
 
-<H3><a name="Extending_nn43">43.10.13 Documentation</a></H3>
+<H3><a name="Extending_nn43">38.10.13 Documentation</a></H3>
 
 
 <p>
@@ -3536,7 +3536,7 @@ Some topics that you'll want to be sure to address include:
      if available.
 </ul>
 
-<H3><a name="Extending_coding_style_guidelines">43.10.14 Coding style guidelines</a></H3>
+<H3><a name="Extending_coding_style_guidelines">38.10.14 Coding style guidelines</a></H3>
 
 
 <p>
@@ -3561,7 +3561,7 @@ should be avoided as unlike the SWIG developers, users will never have consisten
 </p>
 
 
-<H3><a name="Extending_language_status">43.10.15 Target language status</a></H3>
+<H3><a name="Extending_language_status">38.10.15 Target language status</a></H3>
 
 
 <p>
@@ -3570,7 +3570,7 @@ the <a href="Introduction.html#Introduction_target_languages">Target language in
 This section provides more details on how this status is given.
 </p>
 
-<H4><a name="Extending_supported_status">43.10.15.1 Supported status</a></H4>
+<H4><a name="Extending_supported_status">38.10.15.1 Supported status</a></H4>
 
 
 <p>
@@ -3617,7 +3617,7 @@ A target language is given the 'Supported' status when
 </li>
 </ul>
 
-<H4><a name="Extending_experimental_status">43.10.15.2 Experimental status</a></H4>
+<H4><a name="Extending_experimental_status">38.10.15.2 Experimental status</a></H4>
 
 
 <p>
@@ -3682,7 +3682,7 @@ Some minimum requirements and notes about languages with the 'Experimental' stat
 </li>
 </ul>
 
-<H3><a name="Extending_prerequisites">43.10.16 Prerequisites for adding a new language module to the SWIG distribution</a></H3>
+<H3><a name="Extending_prerequisites">38.10.16 Prerequisites for adding a new language module to the SWIG distribution</a></H3>
 
 
 <p>
@@ -3746,7 +3746,7 @@ the existing tests.
 </p>
 
 
-<H2><a name="Extending_debugging_options">43.11 Debugging Options</a></H2>
+<H2><a name="Extending_debugging_options">38.11 Debugging Options</a></H2>
 
 
 <p>
@@ -3773,7 +3773,7 @@ There are various command line options which can aid debugging a SWIG interface
 The complete list of command line options for SWIG are available by running <tt>swig -help</tt>.
 </p>
 
-<H2><a name="Extending_nn46">43.12 Guide to parse tree nodes</a></H2>
+<H2><a name="Extending_nn46">38.12 Guide to parse tree nodes</a></H2>
 
 
 <p>
@@ -4181,7 +4181,7 @@ extern "X" { ... } declaration.
 </pre>
 </div>
 
-<H2><a name="Extending_further_info">43.13 Further Development Information</a></H2>
+<H2><a name="Extending_further_info">38.13 Further Development Information</a></H2>
 
 
 <p>
diff --git a/Doc/Manual/Go.html b/Doc/Manual/Go.html
index 3b8d872ae..8523f74aa 100644
--- a/Doc/Manual/Go.html
+++ b/Doc/Manual/Go.html
@@ -6,7 +6,7 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 </head>
 <body bgcolor="#FFFFFF">
-<H1><a name="Go">25 SWIG and Go</a></H1>
+<H1><a name="Go">23 SWIG and Go</a></H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -57,7 +57,7 @@ the Go programming language
 see <a href="http://golang.org/">golang.org</a>.
 </p>
 
-<H2><a name="Go_overview">25.1 Overview</a></H2>
+<H2><a name="Go_overview">23.1 Overview</a></H2>
 
 
 <p>
@@ -86,7 +86,7 @@ type-safe as well.  In case of type issues the build will fail and hence SWIG's
 are not used.
 </p>
 
-<H2><a name="Go_examples">25.2 Examples</a></H2>
+<H2><a name="Go_examples">23.2 Examples</a></H2>
 
 
 <p>
@@ -101,7 +101,7 @@ SWIG interface file extension for backwards compatibility with Go 1.
 </p>
 
 
-<H2><a name="Go_running_swig">25.3 Running SWIG with Go</a></H2>
+<H2><a name="Go_running_swig">23.3 Running SWIG with Go</a></H2>
 
 
 <p>
@@ -181,7 +181,7 @@ sequence for this approach would look like this:
 </pre></div>
 
 
-<H3><a name="Go_commandline">25.3.1 Go-specific Commandline Options</a></H3>
+<H3><a name="Go_commandline">23.3.1 Go-specific Commandline Options</a></H3>
 
 
 <p>
@@ -264,7 +264,7 @@ swig -go -help
 </table>
 
 
-<H3><a name="Go_outputs">25.3.2 Generated Wrapper Files</a></H3>
+<H3><a name="Go_outputs">23.3.2 Generated Wrapper Files</a></H3>
 
 
 <p>There are two different approaches to generating wrapper files,
@@ -308,7 +308,7 @@ combined with the compiled MODULE.go using go tool pack.
 </ul>
 
 
-<H2><a name="Go_basic_tour">25.4 A tour of basic C/C++ wrapping</a></H2>
+<H2><a name="Go_basic_tour">23.4 A tour of basic C/C++ wrapping</a></H2>
 
 
 <p>
@@ -318,7 +318,7 @@ modifications have to occur.  This section briefly covers the
 essential aspects of this wrapping.
 </p>
 
-<H3><a name="Go_package">25.4.1 Go Package Name</a></H3>
+<H3><a name="Go_package">23.4.1 Go Package Name</a></H3>
 
 
 <p>
@@ -328,7 +328,7 @@ directive.  You may override this by using SWIG's <tt>-package</tt>
 command line option.
 </p>
 
-<H3><a name="Go_names">25.4.2 Go Names</a></H3>
+<H3><a name="Go_names">23.4.2 Go Names</a></H3>
 
 
 <p>
@@ -360,7 +360,7 @@ followed by that name, and the destructor will be
 named <tt>Delete</tt> followed by that name.
 </p>
 
-<H3><a name="Go_constants">25.4.3 Go Constants</a></H3>
+<H3><a name="Go_constants">23.4.3 Go Constants</a></H3>
 
 
 <p>
@@ -368,7 +368,7 @@ C/C++ constants created via <tt>#define</tt> or the <tt>%constant</tt>
 directive become Go constants, declared with a <tt>const</tt>
 declaration.
 
-<H3><a name="Go_enumerations">25.4.4 Go Enumerations</a></H3>
+<H3><a name="Go_enumerations">23.4.4 Go Enumerations</a></H3>
 
 
 <p>
@@ -378,7 +378,7 @@ usual).  The values of the enumeration will become variables in Go;
 code should avoid modifying those variables.
 </p>
 
-<H3><a name="Go_classes">25.4.5 Go Classes</a></H3>
+<H3><a name="Go_classes">23.4.5 Go Classes</a></H3>
 
 
 <p>
@@ -456,7 +456,7 @@ returns a go interface.  If the returned pointer can be null, you can check
 for this by calling the Swigcptr() method.
 </p>
 
-<H4><a name="Go_class_memory">25.4.5.1 Go Class Memory Management</a></H4>
+<H4><a name="Go_class_memory">23.4.5.1 Go Class Memory Management</a></H4>
 
 
 <p>
@@ -578,7 +578,7 @@ func (o *GoClassName) Close() {
 </pre>
 </div>
 
-<H4><a name="Go_class_inheritance">25.4.5.2 Go Class Inheritance</a></H4>
+<H4><a name="Go_class_inheritance">23.4.5.2 Go Class Inheritance</a></H4>
 
 
 <p>
@@ -590,7 +590,7 @@ Doing the reverse will require an explicit type assertion, which will
 be checked dynamically.
 </p>
 
-<H3><a name="Go_templates">25.4.6 Go Templates</a></H3>
+<H3><a name="Go_templates">23.4.6 Go Templates</a></H3>
 
 
 <p>
@@ -599,7 +599,7 @@ wrappers for a particular template instantation.  To do this, use
 the <tt>%template</tt> directive.
 
 
-<H3><a name="Go_director_classes">25.4.7 Go Director Classes</a></H3>
+<H3><a name="Go_director_classes">23.4.7 Go Director Classes</a></H3>
 
 
 <p>
@@ -617,7 +617,7 @@ completely to avoid common pitfalls with directors in Go.
 </p>
 
 
-<H4><a name="Go_director_example_cpp_code">25.4.7.1 Example C++ code</a></H4>
+<H4><a name="Go_director_example_cpp_code">23.4.7.1 Example C++ code</a></H4>
 
 
 <p>
@@ -689,7 +689,7 @@ be found in <a href="#Go_director_foobargo_class">the end of the guide</a>.
 </p>
 
 
-<H4><a name="Go_director_enable">25.4.7.2 Enable director feature</a></H4>
+<H4><a name="Go_director_enable">23.4.7.2 Enable director feature</a></H4>
 
 
 <p>
@@ -724,7 +724,7 @@ documentation on directors.
 </p>
 
 
-<H4><a name="Go_director_ctor_dtor">25.4.7.3 Constructor and destructor</a></H4>
+<H4><a name="Go_director_ctor_dtor">23.4.7.3 Constructor and destructor</a></H4>
 
 
 <p>
@@ -777,7 +777,7 @@ embedding</a>.
 </p>
 
 
-<H4><a name="Go_director_overriding">25.4.7.4 Override virtual methods</a></H4>
+<H4><a name="Go_director_overriding">23.4.7.4 Override virtual methods</a></H4>
 
 
 <p>
@@ -843,7 +843,7 @@ the Go methods.
 </p>
 
 
-<H4><a name="Go_director_base_methods">25.4.7.5 Call base methods</a></H4>
+<H4><a name="Go_director_base_methods">23.4.7.5 Call base methods</a></H4>
 
 
 <p>
@@ -880,7 +880,7 @@ be found in <a href="#Go_director_foobargo_class">the end of the guide</a>.
 </p>
 
 
-<H4><a name="Go_director_subclass">25.4.7.6 Subclass via embedding</a></H4>
+<H4><a name="Go_director_subclass">23.4.7.6 Subclass via embedding</a></H4>
 
 
 <p>
@@ -948,7 +948,7 @@ class.
 </p>
 
 
-<H4><a name="Go_director_finalizer">25.4.7.7 Memory management with runtime.SetFinalizer</a></H4>
+<H4><a name="Go_director_finalizer">23.4.7.7 Memory management with runtime.SetFinalizer</a></H4>
 
 
 <p>
@@ -1013,7 +1013,7 @@ before using <tt>runtime.SetFinalizer</tt> to know all of its gotchas.
 </p>
 
 
-<H4><a name="Go_director_foobargo_class">25.4.7.8 Complete FooBarGo example class</a></H4>
+<H4><a name="Go_director_foobargo_class">23.4.7.8 Complete FooBarGo example class</a></H4>
 
 
 <p>
@@ -1142,7 +1142,7 @@ SWIG/Examples/go/director/</a>.
 </p>
 
 
-<H3><a name="Go_primitive_type_mappings">25.4.8 Default Go primitive type mappings</a></H3>
+<H3><a name="Go_primitive_type_mappings">23.4.8 Default Go primitive type mappings</a></H3>
 
 
 <p>
@@ -1249,7 +1249,7 @@ that typemap, or add new values, to control how C/C++ types are mapped
 into Go types.
 </p>
 
-<H3><a name="Go_output_arguments">25.4.9 Output arguments</a></H3>
+<H3><a name="Go_output_arguments">23.4.9 Output arguments</a></H3>
 
 
 <p>Because of limitations in the way output arguments are processed in swig,
@@ -1302,7 +1302,7 @@ void f(char *output);
 </pre>
 </div>
 
-<H3><a name="Go_adding_additional_code">25.4.10 Adding additional go code</a></H3>
+<H3><a name="Go_adding_additional_code">23.4.10 Adding additional go code</a></H3>
 
 
 <p>Often the APIs generated by swig are not very natural in go, especially if
@@ -1397,7 +1397,7 @@ func bar() {
 </pre>
 </div>
 
-<H3><a name="Go_typemaps">25.4.11 Go typemaps</a></H3>
+<H3><a name="Go_typemaps">23.4.11 Go typemaps</a></H3>
 
 
 <p>
diff --git a/Doc/Manual/Guile.html b/Doc/Manual/Guile.html
index 9d55b632b..6acdd2dc3 100644
--- a/Doc/Manual/Guile.html
+++ b/Doc/Manual/Guile.html
@@ -8,7 +8,7 @@
 
 <body bgcolor="#ffffff">
 
-<H1><a name="Guile">26 SWIG and Guile</a></H1>
+<H1><a name="Guile">24 SWIG and Guile</a></H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -48,7 +48,7 @@
 <p>
 This section details guile-specific support in SWIG.
 
-<H2><a name="Guile_nn1">26.1 Supported Guile Versions</a></H2>
+<H2><a name="Guile_nn1">24.1 Supported Guile Versions</a></H2>
 
 
 <p>
@@ -62,7 +62,7 @@ improved performance. This is currently not tested with swig
 so your mileage may vary. To be safe set environment variable
 GUILE_AUTO_COMPILE to 0 when using swig generated guile code.
 
-<H2><a name="Guile_nn2">26.2 Meaning of "Module"</a></H2>
+<H2><a name="Guile_nn2">24.2 Meaning of "Module"</a></H2>
 
 
 <p>
@@ -70,7 +70,7 @@ There are three different concepts of "module" involved, defined
 separately for SWIG, Guile, and Libtool.  To avoid horrible confusion,
 we explicitly prefix the context, e.g., "guile-module".
 
-<H2><a name="Guile_nn3">26.3 Old GH Guile API</a></H2>
+<H2><a name="Guile_nn3">24.3 Old GH Guile API</a></H2>
 
 
 <p>Guile 1.8 and older could be interfaced using two different api's, the SCM
@@ -81,7 +81,7 @@ or the GH API. The GH interface to guile is deprecated.  Read more about why in
 version of SWIG that can still generate guile GH wrapper code is 2.0.9. Please
 use that version if you really need the GH wrapper code.
 
-<H2><a name="Guile_nn4">26.4 Linkage</a></H2>
+<H2><a name="Guile_nn4">24.4 Linkage</a></H2>
 
 
 <p>
@@ -89,7 +89,7 @@ Guile support is complicated by a lack of user community cohesiveness,
 which manifests in multiple shared-library usage conventions.  A set of
 policies implementing a usage convention is called a <b>linkage</b>.
 
-<H3><a name="Guile_nn5">26.4.1 Simple Linkage</a></H3>
+<H3><a name="Guile_nn5">24.4.1 Simple Linkage</a></H3>
 
 
 <p>
@@ -194,7 +194,7 @@ placed between the <code>define-module</code> form and the
 <code>SWIG_init</code> via a preprocessor define to avoid symbol
 clashes. For this case, however, passive linkage is available.
 
-<H3><a name="Guile_nn6">26.4.2 Passive Linkage</a></H3>
+<H3><a name="Guile_nn6">24.4.2 Passive Linkage</a></H3>
 
 
 <p>Passive linkage is just like simple linkage, but it generates an
@@ -204,7 +204,7 @@ package name (see below).
 <p>You should use passive linkage rather than simple linkage when you
 are using multiple modules.
 
-<H3><a name="Guile_nn7">26.4.3 Native Guile Module Linkage</a></H3>
+<H3><a name="Guile_nn7">24.4.3 Native Guile Module Linkage</a></H3>
 
 
 <p>SWIG can also generate wrapper code that does all the Guile module
@@ -245,7 +245,7 @@ Newer Guile versions have a shorthand procedure for this:
 </div>
 </ul>
 
-<H3><a name="Guile_nn8">26.4.4 Old Auto-Loading Guile Module Linkage</a></H3>
+<H3><a name="Guile_nn8">24.4.4 Old Auto-Loading Guile Module Linkage</a></H3>
 
 
 <p>Guile used to support an autoloading facility for object-code
@@ -271,7 +271,7 @@ option, SWIG generates an exported module initialization function with
 an appropriate name. 
 
 
-<H3><a name="Guile_nn9">26.4.5 Hobbit4D Linkage</a></H3>
+<H3><a name="Guile_nn9">24.4.5 Hobbit4D Linkage</a></H3>
 
 
 <p>
@@ -296,7 +296,7 @@ my/lib/libfoo.so.X.Y.Z and friends.  This scheme is still very
 experimental; the (hobbit4d link) conventions are not well understood.
 </p>
 
-<H2><a name="Guile_nn10">26.5 Underscore Folding</a></H2>
+<H2><a name="Guile_nn10">24.5 Underscore Folding</a></H2>
 
 
 <p>
@@ -308,7 +308,7 @@ complained so far.
 <code>%rename</code> to specify the Guile name of the wrapped
 functions and variables (see CHANGES).
 
-<H2><a name="Guile_nn11">26.6 Typemaps</a></H2>
+<H2><a name="Guile_nn11">24.6 Typemaps</a></H2>
 
 
 <p>
@@ -400,7 +400,7 @@ constant will appear as a scheme variable. See
 <a href="Customization.html#Customization_features">Features and the %feature directive</a>
 for info on how to apply the %feature.</p>
 
-<H2><a name="Guile_nn12">26.7 Representation of pointers as smobs</a></H2>
+<H2><a name="Guile_nn12">24.7 Representation of pointers as smobs</a></H2>
 
 
 <p>
@@ -421,7 +421,7 @@ representing the expected pointer type.  See also
 If the Scheme object passed was not a SWIG smob representing a compatible
 pointer, a <code>wrong-type-arg</code> exception is raised.
 
-<H3><a name="Guile_nn14">26.7.1 Smobs</a></H3>
+<H3><a name="Guile_nn14">24.7.1 Smobs</a></H3>
 
 
 <p>
@@ -440,7 +440,7 @@ structure describing this type.  If a generated GOOPS module has been loaded, sm
 the corresponding GOOPS class.</p>
 
 
-<H3><a name="Guile_nn15">26.7.2 Garbage Collection</a></H3>
+<H3><a name="Guile_nn15">24.7.2 Garbage Collection</a></H3>
 
 
 <p>Garbage collection is a feature of Guile since version 1.6. As SWIG now requires Guile &gt; 1.8,
@@ -454,14 +454,14 @@ is exactly like described in <a href="Customization.html#Customization_ownership
 Object ownership and %newobject</a> in the SWIG manual.  All typemaps use an $owner var, and
 the guile module replaces $owner with 0 or 1 depending on feature:new.</p>
 
-<H2><a name="Guile_nn16">26.8 Native Guile pointers</a></H2>
+<H2><a name="Guile_nn16">24.8 Native Guile pointers</a></H2>
 
 
 <p>
 In addition to SWIG smob pointers, <a href="https://www.gnu.org/software/guile/manual/html_node/Foreign-Pointers.html">Guile's native pointer type</a> are accepted as arguments to wrapped SWIG functions. This can be useful for passing <a href="https://www.gnu.org/software/guile/manual/html_node/Void-Pointers-and-Byte-Access.html#">pointers to bytevector data</a> to wrapped functions.
 </p>
 
-<H2><a name="Guile_nn17">26.9 Exception Handling</a></H2>
+<H2><a name="Guile_nn17">24.9 Exception Handling</a></H2>
 
 
 <p>
@@ -487,7 +487,7 @@ mapping:
 The default when not specified here is to use "swig-error".
 See Lib/exception.i for details.
 
-<H2><a name="Guile_nn18">26.10 Procedure documentation</a></H2>
+<H2><a name="Guile_nn18">24.10 Procedure documentation</a></H2>
 
 
 <p>If invoked with the command-line option <code>-procdoc
@@ -522,7 +522,7 @@ like this:
 typemap argument <code>doc</code>. See <code>Lib/guile/typemaps.i</code> for
 details.
 
-<H2><a name="Guile_nn19">26.11 Procedures with setters</a></H2>
+<H2><a name="Guile_nn19">24.11 Procedures with setters</a></H2>
 
 
 <p>For global variables, SWIG creates a single wrapper procedure
@@ -550,7 +550,7 @@ struct members, the procedures <code>(<var>struct</var>-<var>member</var>-get
 pointer)</code> and <code>(<var>struct-member</var>-set pointer
 value)</code> are <em>not</em> generated.
 
-<H2><a name="Guile_nn20">26.12 GOOPS Proxy Classes</a></H2>
+<H2><a name="Guile_nn20">24.12 GOOPS Proxy Classes</a></H2>
 
 
 <p>SWIG can also generate classes and generic functions for use with
@@ -696,7 +696,7 @@ Notice that &lt;Foo&gt; is used before it is defined.  The fix is to just put th
 <code>%import "foo.h"</code> before the <code>%inline</code> block.
 </p>
 
-<H3><a name="Guile_nn21">26.12.1 Naming Issues</a></H3>
+<H3><a name="Guile_nn21">24.12.1 Naming Issues</a></H3>
 
 
 <p>As you can see in the example above, there are potential naming conflicts.  The default exported
@@ -733,7 +733,7 @@ guile-modules.  For example,</p>
 (use-modules ((Test) #:renamer (symbol-prefix-proc 'goops:)))
 </pre></div>
 
-<H3><a name="Guile_nn22">26.12.2 Linking</a></H3>
+<H3><a name="Guile_nn22">24.12.2 Linking</a></H3>
 
 
 <p>The guile-modules generated above all need to be linked together.  GOOPS support requires
diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html
index ac92252e0..77a81995e 100644
--- a/Doc/Manual/Java.html
+++ b/Doc/Manual/Java.html
@@ -6,7 +6,7 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 </head>
 <body bgcolor="#FFFFFF">
-<H1><a name="Java">27 SWIG and Java</a></H1>
+<H1><a name="Java">25 SWIG and Java</a></H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -167,7 +167,7 @@ It covers most SWIG features, but certain low-level details are covered in less
 </p>
 
 
-<H2><a name="Java_overview">27.1 Overview</a></H2>
+<H2><a name="Java_overview">25.1 Overview</a></H2>
 
 
 <p>
@@ -202,7 +202,7 @@ Various customisation tips and techniques using SWIG directives are covered.
 The latter sections cover the advanced techniques of using typemaps for complete control of the wrapping process.
 </p>
 
-<H2><a name="Java_preliminaries">27.2 Preliminaries</a></H2>
+<H2><a name="Java_preliminaries">25.2 Preliminaries</a></H2>
 
 
 <p>
@@ -222,7 +222,7 @@ This is the commonly used method to load JNI code so your system will more than
 Android uses Java JNI and also works with SWIG. Please read the <a href="Android.html#Android">Android chapter</a> in conjunction with this one if you are targeting Android.
 </p>
 
-<H3><a name="Java_running_swig">27.2.1 Running SWIG</a></H3>
+<H3><a name="Java_running_swig">25.2.1 Running SWIG</a></H3>
 
 
 <p>
@@ -281,7 +281,7 @@ The following sections have further practical examples and details on how you mi
 compiling and using the generated files.
 </p>
 
-<H3><a name="Java_commandline">27.2.2 Additional Commandline Options</a></H3>
+<H3><a name="Java_commandline">25.2.2 Additional Commandline Options</a></H3>
 
 
 <p>
@@ -318,7 +318,7 @@ swig -java -help
 Their use will become clearer by the time you have finished reading this section on SWIG and Java.
 </p>
 
-<H3><a name="Java_getting_right_headers">27.2.3 Getting the right header files</a></H3>
+<H3><a name="Java_getting_right_headers">25.2.3 Getting the right header files</a></H3>
 
 
 <p>
@@ -333,7 +333,7 @@ They are usually in directories like this:</p>
 <p>
 The exact location may vary on your machine, but the above locations are typical. </p>
 
-<H3><a name="Java_compiling_dynamic">27.2.4 Compiling a dynamic module</a></H3>
+<H3><a name="Java_compiling_dynamic">25.2.4 Compiling a dynamic module</a></H3>
 
 
 <p>
@@ -368,7 +368,7 @@ The name of the shared library output file is important.
 If the name of your SWIG module is "<tt>example</tt>", the name of the corresponding shared library file should be "<tt>libexample.so</tt>" (or equivalent depending on your machine, see <a href="#Java_dynamic_linking_problems">Dynamic linking problems</a> for more information). 
 The name of the module is specified using the <tt>%module</tt> directive or <tt>-module</tt> command line option.</p>
 
-<H3><a name="Java_using_module">27.2.5 Using your module</a></H3>
+<H3><a name="Java_using_module">25.2.5 Using your module</a></H3>
 
 
 <p>
@@ -403,7 +403,7 @@ $
 If it doesn't work have a look at the following section which discusses problems loading the shared library.
 </p>
 
-<H3><a name="Java_dynamic_linking_problems">27.2.6 Dynamic linking problems</a></H3>
+<H3><a name="Java_dynamic_linking_problems">25.2.6 Dynamic linking problems</a></H3>
 
 
 <p>
@@ -490,7 +490,7 @@ The following section also contains some C++ specific linking problems and solut
 </p>
 
 
-<H3><a name="Java_compilation_problems_cpp">27.2.7 Compilation problems and compiling with C++</a></H3>
+<H3><a name="Java_compilation_problems_cpp">25.2.7 Compilation problems and compiling with C++</a></H3>
 
 
 <p>
@@ -542,7 +542,7 @@ Finally make sure the version of JDK header files matches the version of Java th
 </p>
 
 
-<H3><a name="Java_building_windows">27.2.8 Building on Windows</a></H3>
+<H3><a name="Java_building_windows">25.2.8 Building on Windows</a></H3>
 
 
 <p>
@@ -551,7 +551,7 @@ You will want to produce a DLL that can be loaded by the Java Virtual Machine.
 This section covers the process of using SWIG with Microsoft Visual C++ 6 although the procedure may be similar with other compilers.  
 In order for everything to work, you will need to have a JDK installed on your machine in order to read the JNI header files.</p>
 
-<H4><a name="Java_visual_studio">27.2.8.1 Running SWIG from Visual Studio</a></H4>
+<H4><a name="Java_visual_studio">25.2.8.1 Running SWIG from Visual Studio</a></H4>
 
 
 <p>
@@ -590,7 +590,7 @@ To run the native code in the DLL (example.dll), make sure that it is in your pa
 If the library fails to load have a look at <a href="#Java_dynamic_linking_problems">Dynamic linking problems</a>.
 </p>
 
-<H4><a name="Java_nmake">27.2.8.2 Using NMAKE</a></H4>
+<H4><a name="Java_nmake">25.2.8.2 Using NMAKE</a></H4>
 
 
 <p>
@@ -649,7 +649,7 @@ Of course you may want to make changes for it to work for C++ by adding in the -
 </p>
 
 
-<H2><a name="Java_basic_tour">27.3 A tour of basic C/C++ wrapping</a></H2>
+<H2><a name="Java_basic_tour">25.3 A tour of basic C/C++ wrapping</a></H2>
 
 
 <p>
@@ -659,7 +659,7 @@ variables are wrapped with JavaBean type getters and setters and so forth.
 This section briefly covers the essential aspects of this wrapping.
 </p>
 
-<H3><a name="Java_module_packages_classes">27.3.1 Modules, packages and generated Java classes</a></H3>
+<H3><a name="Java_module_packages_classes">25.3.1 Modules, packages and generated Java classes</a></H3>
 
 
 <p>
@@ -695,7 +695,7 @@ swig -java -package com.bloggs.swig -outdir com/bloggs/swig example.i
 SWIG won't create the directory, so make sure it exists beforehand.
 </p>
 
-<H3><a name="Java_functions">27.3.2 Functions</a></H3>
+<H3><a name="Java_functions">25.3.2 Functions</a></H3>
 
 
 <p>
@@ -729,7 +729,7 @@ System.out.println(example.fact(4));
 </pre></div>
 
 
-<H3><a name="Java_global_variables">27.3.3 Global variables</a></H3>
+<H3><a name="Java_global_variables">25.3.3 Global variables</a></H3>
 
 
 <p>
@@ -816,7 +816,7 @@ extern char *path;      // Read-only (due to %immutable)
 </div>
 
 
-<H3><a name="Java_constants">27.3.4 Constants</a></H3>
+<H3><a name="Java_constants">25.3.4 Constants</a></H3>
 
 
 <p>
@@ -956,7 +956,7 @@ Or if you decide this practice isn't so bad and your own class implements <tt>ex
 </p>
 
 
-<H3><a name="Java_enumerations">27.3.5 Enumerations</a></H3>
+<H3><a name="Java_enumerations">25.3.5 Enumerations</a></H3>
 
 
 <p>
@@ -970,7 +970,7 @@ The final two approaches use simple integers for each enum item.
 Before looking at the various approaches for wrapping named C/C++ enums, anonymous enums are considered.
 </p>
 
-<H4><a name="Java_anonymous_enums">27.3.5.1 Anonymous enums</a></H4>
+<H4><a name="Java_anonymous_enums">25.3.5.1 Anonymous enums</a></H4>
 
 
 <p>
@@ -1033,7 +1033,7 @@ As in the case of constants, you can access them through either the module class
 </p>
 
 
-<H4><a name="Java_typesafe_enums">27.3.5.2 Typesafe enums</a></H4>
+<H4><a name="Java_typesafe_enums">25.3.5.2 Typesafe enums</a></H4>
 
 
 <p>
@@ -1127,7 +1127,7 @@ When upgrading to JDK 1.5 or later, proper Java enums could be used instead, wit
 The following section details proper Java enum generation.
 </p>
 
-<H4><a name="Java_proper_enums">27.3.5.3 Proper Java enums</a></H4>
+<H4><a name="Java_proper_enums">25.3.5.3 Proper Java enums</a></H4>
 
 
 <p>
@@ -1180,7 +1180,7 @@ The additional support methods need not be generated if none of the enum items h
 <a href="#Java_simpler_enum_classes">Simpler Java enums for enums without initializers</a> section.
 </p>
 
-<H4><a name="Java_typeunsafe_enums">27.3.5.4 Type unsafe enums</a></H4>
+<H4><a name="Java_typeunsafe_enums">25.3.5.4 Type unsafe enums</a></H4>
 
 
 <p>
@@ -1228,7 +1228,7 @@ Note that unlike typesafe enums, this approach requires users to mostly use diff
 Thus the upgrade path to proper enums provided in JDK 1.5 is more painful.
 </p>
 
-<H4><a name="Java_simple_enums">27.3.5.5 Simple enums</a></H4>
+<H4><a name="Java_simple_enums">25.3.5.5 Simple enums</a></H4>
 
 
 <p>
@@ -1247,7 +1247,7 @@ SWIG-1.3.21 and earlier versions wrapped all enums using this approach.
 The type unsafe approach is preferable to this one and this simple approach is only included for backwards compatibility with these earlier versions of SWIG.
 </p>
 
-<H3><a name="Java_pointers">27.3.6 Pointers</a></H3>
+<H3><a name="Java_pointers">25.3.6 Pointers</a></H3>
 
 
 <p>
@@ -1335,7 +1335,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return
 a NULL pointer if the conversion can't be performed.
 </p>
 
-<H3><a name="Java_structures">27.3.7 Structures</a></H3>
+<H3><a name="Java_structures">25.3.7 Structures</a></H3>
 
 
 <p>
@@ -1503,7 +1503,7 @@ x.setA(3);          // Modify x.a - this is the same as b.f.a
 </div>
 
 
-<H3><a name="Java_classes">27.3.8 C++ classes</a></H3>
+<H3><a name="Java_classes">25.3.8 C++ classes</a></H3>
 
 
 <p>
@@ -1566,7 +1566,7 @@ int bar = Spam.getBar();
 </div>
 
 
-<H3><a name="Java_inheritance">27.3.9 C++ inheritance</a></H3>
+<H3><a name="Java_inheritance">25.3.9 C++ inheritance</a></H3>
 
 
 <p>
@@ -1627,7 +1627,7 @@ Note that Java does not support multiple inheritance so any multiple inheritance
 A warning is given when multiple inheritance is detected and only the first base class is used. 
 </p>
 
-<H3><a name="Java_pointers_refs_arrays">27.3.10 Pointers, references, arrays and pass by value</a></H3>
+<H3><a name="Java_pointers_refs_arrays">25.3.10 Pointers, references, arrays and pass by value</a></H3>
 
 
 <p>
@@ -1682,7 +1682,7 @@ to hold the result and a pointer is returned (Java will release this memory
 when the returned object's finalizer is run by the garbage collector).
 </p>
 
-<H4><a name="Java_null_pointers">27.3.10.1 Null pointers</a></H4>
+<H4><a name="Java_null_pointers">25.3.10.1 Null pointers</a></H4>
 
 
 <p>
@@ -1706,7 +1706,7 @@ For <tt>spam1</tt> and <tt>spam4</tt> above the Java <tt>null</tt> gets translat
 The converse also occurs, that is, NULL pointers are translated into <tt>null</tt> Java objects when returned from a C/C++ function.
 </p>
 
-<H3><a name="Java_overloaded_functions">27.3.11 C++ overloaded functions</a></H3>
+<H3><a name="Java_overloaded_functions">25.3.11 C++ overloaded functions</a></H3>
 
 
 <p>
@@ -1821,7 +1821,7 @@ void spam(unsigned short);   // Ignored
 </pre>
 </div>
 
-<H3><a name="Java_default_arguments">27.3.12 C++ default arguments</a></H3>
+<H3><a name="Java_default_arguments">25.3.12 C++ default arguments</a></H3>
 
 
 <p>
@@ -1864,7 +1864,7 @@ Further details on default arguments and how to restore this approach are given
 </p>
 
 
-<H3><a name="Java_namespaces">27.3.13 C++ namespaces</a></H3>
+<H3><a name="Java_namespaces">25.3.13 C++ namespaces</a></H3>
 
 
 <p>
@@ -1954,7 +1954,7 @@ If the resulting use of the nspace feature and hence packages results in a proxy
 you will need to open up the visibility for the pointer constructor and <tt>getCPtr</tt> method from the default 'protected' to 'public' with the <tt>SWIG_JAVABODY_PROXY</tt> macro. See <a href="#Java_code_typemaps">Java code typemaps</a>.
 </p>
 
-<H3><a name="Java_templates">27.3.14 C++ templates</a></H3>
+<H3><a name="Java_templates">25.3.14 C++ templates</a></H3>
 
 
 <p>
@@ -2003,10 +2003,10 @@ Obviously, there is more to template wrapping than shown in this example.
 More details can be found in the <a href="SWIGPlus.html#SWIGPlus">SWIG and C++</a> chapter.   
 </p>
 
-<H3><a name="Java_smart_pointers">27.3.15 C++ Smart Pointers</a></H3>
+<H3><a name="Java_smart_pointers">25.3.15 C++ Smart Pointers</a></H3>
 
 
-<H4><a name="Java_smart_pointers_shared_ptr">27.3.15.1 The shared_ptr Smart Pointer</a></H4>
+<H4><a name="Java_smart_pointers_shared_ptr">25.3.15.1 The shared_ptr Smart Pointer</a></H4>
 
 
 <p>
@@ -2017,7 +2017,7 @@ in the <a href="Library.html#Library_std_shared_ptr">shared_ptr smart pointer</a
 </p>
 
 
-<H4><a name="Java_smart_pointers_generic">27.3.15.2 Generic Smart Pointers</a></H4>
+<H4><a name="Java_smart_pointers_generic">25.3.15.2 Generic Smart Pointers</a></H4>
 
 
 <p>
@@ -2101,7 +2101,7 @@ Foo f = p.__deref__();               // Returns underlying Foo *
 </pre>
 </div>
 
-<H2><a name="Java_further_details">27.4 Further details on the generated Java classes</a></H2>
+<H2><a name="Java_further_details">25.4 Further details on the generated Java classes</a></H2>
 
 
 <p>
@@ -2116,7 +2116,7 @@ Finally enum classes are covered.
 First, the crucial intermediary JNI class is considered.
 </p>
 
-<H3><a name="Java_imclass">27.4.1 The intermediary JNI class</a></H3>
+<H3><a name="Java_imclass">25.4.1 The intermediary JNI class</a></H3>
 
 
 <p>
@@ -2236,7 +2236,7 @@ If <tt>name</tt> is the same as <tt>modulename</tt> then the module class name g
 from <tt>modulename</tt> to <tt>modulenameModule</tt>.
 </p>
 
-<H4><a name="Java_imclass_pragmas">27.4.1.1 The intermediary JNI class pragmas</a></H4>
+<H4><a name="Java_imclass_pragmas">25.4.1.1 The intermediary JNI class pragmas</a></H4>
 
 
 <p>
@@ -2318,7 +2318,7 @@ For example, let's change the intermediary JNI class access to just the default
 All the methods in the intermediary JNI class will then not be callable outside of the package as the method modifiers have been changed from public access to default access. This is useful if you want to prevent users calling these low level functions.
 </p>
 
-<H3><a name="Java_module_class">27.4.2 The Java module class</a></H3>
+<H3><a name="Java_module_class">25.4.2 The Java module class</a></H3>
 
 
 <p>
@@ -2349,7 +2349,7 @@ example.egg(new Foo());
 The primary reason for having the module class wrapping the calls in the intermediary JNI class is to implement static type checking. In this case only a <tt>Foo</tt> can be passed to the <tt>egg</tt> function, whereas any <tt>long</tt> can be passed to the <tt>egg</tt> function in the intermediary JNI class.
 </p>
 
-<H4><a name="Java_module_class_pragmas">27.4.2.1 The Java module class pragmas</a></H4>
+<H4><a name="Java_module_class_pragmas">25.4.2.1 The Java module class pragmas</a></H4>
 
 
 <p>
@@ -2400,7 +2400,7 @@ See <a href="#Java_imclass_pragmas">The intermediary JNI class pragmas</a> secti
 </p>
 
 
-<H3><a name="Java_proxy_classes">27.4.3 Java proxy classes</a></H3>
+<H3><a name="Java_proxy_classes">25.4.3 Java proxy classes</a></H3>
 
 
 <p>
@@ -2476,7 +2476,7 @@ int y = f.spam(5, new Foo());
 </pre>
 </div>
 
-<H4><a name="Java_memory_management">27.4.3.1 Memory management</a></H4>
+<H4><a name="Java_memory_management">25.4.3.1 Memory management</a></H4>
 
 
 <p>
@@ -2638,7 +2638,7 @@ and
 </p>
 
 
-<H4><a name="Java_inheritance_mirroring">27.4.3.2 Inheritance</a></H4>
+<H4><a name="Java_inheritance_mirroring">25.4.3.2 Inheritance</a></H4>
 
 
 <p>
@@ -2754,7 +2754,7 @@ However, true cross language polymorphism can be achieved using the <a href="#Ja
 </p>
 
 
-<H4><a name="Java_proxy_classes_gc">27.4.3.3 Proxy classes and garbage collection</a></H4>
+<H4><a name="Java_proxy_classes_gc">25.4.3.3 Proxy classes and garbage collection</a></H4>
 
 
 <p>
@@ -2837,7 +2837,7 @@ The section on <a href="#Java_typemaps">Java typemaps</a> details how to specify
 See the <a href="http://www.devx.com/Java/Article/30192">How to Handle Java Finalization's Memory-Retention Issues</a> article for alternative approaches to managing memory by avoiding finalizers altogether.
 </p>
 
-<H4><a name="Java_pgcpp">27.4.3.4 The premature garbage collection prevention parameter for proxy class marshalling</a></H4>
+<H4><a name="Java_pgcpp">25.4.3.4 The premature garbage collection prevention parameter for proxy class marshalling</a></H4>
 
 
 <p>
@@ -2959,7 +2959,7 @@ For example:
 <b>Compatibility note:</b> The generation of this additional parameter did not occur in versions prior to SWIG-1.3.30.
 </p>
 
-<H4><a name="Java_multithread_libraries">27.4.3.5 Single threaded applications and thread safety</a></H4>
+<H4><a name="Java_multithread_libraries">25.4.3.5 Single threaded applications and thread safety</a></H4>
 
 
 <p>
@@ -3047,7 +3047,7 @@ for (int i=0; i&lt;100000; i++) {
 </pre></div>
  
 
-<H3><a name="Java_type_wrapper_classes">27.4.4 Type wrapper classes</a></H3>
+<H3><a name="Java_type_wrapper_classes">25.4.4 Type wrapper classes</a></H3>
 
 
 <p>
@@ -3134,7 +3134,7 @@ public static void spam(SWIGTYPE_p_int x, SWIGTYPE_p_int y, int z) { ... }
 </div>
 
 
-<H3><a name="Java_enum_classes">27.4.5 Enum classes</a></H3>
+<H3><a name="Java_enum_classes">25.4.5 Enum classes</a></H3>
 
 
 <p>
@@ -3143,7 +3143,7 @@ The <a href="#Java_enumerations">Enumerations</a> section discussed these but om
 The following sub-sections detail the various types of enum classes that can be generated.
 </p>
 
-<H4><a name="Java_typesafe_enums_classes">27.4.5.1 Typesafe enum classes</a></H4>
+<H4><a name="Java_typesafe_enums_classes">25.4.5.1 Typesafe enum classes</a></H4>
 
 
 <p>
@@ -3227,7 +3227,7 @@ The <tt>swigValue</tt> method is used for marshalling in the other direction.
 The <tt>toString</tt> method is overridden so that the enum name is available.
 </p>
 
-<H4><a name="Java_proper_enums_classes">27.4.5.2 Proper Java enum classes</a></H4>
+<H4><a name="Java_proper_enums_classes">25.4.5.2 Proper Java enum classes</a></H4>
 
 
 <p>
@@ -3305,7 +3305,7 @@ These needn't be generated if the enum being wrapped does not have any initializ
 <a href="#Java_simpler_enum_classes">Simpler Java enums for enums without initializers</a> section describes how typemaps can be used to achieve this.
 </p>
 
-<H4><a name="Java_typeunsafe_enums_classes">27.4.5.3 Type unsafe enum classes</a></H4>
+<H4><a name="Java_typeunsafe_enums_classes">25.4.5.3 Type unsafe enum classes</a></H4>
 
 
 <p>
@@ -3336,7 +3336,7 @@ public final class Beverage {
 </pre>
 </div>
 
-<H3><a name="Java_interfaces">27.4.6 Interfaces</a></H3>
+<H3><a name="Java_interfaces">25.4.6 Interfaces</a></H3>
 
 
 <p>
@@ -3581,7 +3581,7 @@ typemap which is only used when a class is marked with the <tt>interface</tt> fe
 See <a href="Java.html#Java_code_typemaps">Java code typemaps</a> for details.
 </p>
 
-<H2><a name="Java_directors">27.5 Cross language polymorphism using directors</a></H2>
+<H2><a name="Java_directors">25.5 Cross language polymorphism using directors</a></H2>
 
 
 <p>
@@ -3603,7 +3603,7 @@ The upshot is that C++ classes can be extended in Java and from C++ these extens
 Neither C++ code nor Java code needs to know where a particular method is implemented: the combination of proxy classes, director classes, and C wrapper functions transparently takes care of all the cross-language method routing.
 </p>
 
-<H3><a name="Java_enabling_directors">27.5.1 Enabling directors</a></H3>
+<H3><a name="Java_enabling_directors">25.5.1 Enabling directors</a></H3>
 
 
 <p>
@@ -3671,7 +3671,7 @@ public:
 </pre>
 </div>
 
-<H3><a name="Java_directors_classes">27.5.2 Director classes</a></H3>
+<H3><a name="Java_directors_classes">25.5.2 Director classes</a></H3>
 
 
 <p>
@@ -3698,7 +3698,7 @@ If the correct implementation is in Java, the Java API is used to call the metho
 </p>
 
 
-<H3><a name="Java_directors_overhead">27.5.3 Overhead and code bloat</a></H3>
+<H3><a name="Java_directors_overhead">25.5.3 Overhead and code bloat</a></H3>
 
 
 <p>
@@ -3716,7 +3716,7 @@ This situation can be optimized by selectively enabling director methods (using
 </p>
 
 
-<H3><a name="Java_directors_example">27.5.4 Simple directors example</a></H3>
+<H3><a name="Java_directors_example">25.5.4 Simple directors example</a></H3>
 
 
 <p>
@@ -3779,7 +3779,7 @@ DirectorDerived.upcall_method() invoked.
 </pre>
 </div>
 
-<H3><a name="Java_directors_threading">27.5.5 Director threading issues</a></H3>
+<H3><a name="Java_directors_threading">25.5.5 Director threading issues</a></H3>
 
 
 <p>
@@ -3799,7 +3799,7 @@ Macros can be defined on the commandline when compiling your C++ code, or altern
 </pre>
 </div>
 
-<H3><a name="Java_directors_performance">27.5.6 Director performance tuning</a></H3>
+<H3><a name="Java_directors_performance">25.5.6 Director performance tuning</a></H3>
 
 
 <p>
@@ -3820,7 +3820,7 @@ However, if all director methods are expected to usually be overridden by Java s
 The disadvantage is that invocation of director methods from C++ when Java doesn't actually override the method will require an additional call up into Java and back to C++.  As such, this option is only useful when overrides are extremely common and instantiation is frequent enough that its performance is critical.
 </p>
 
-<H3><a name="Java_exceptions_from_directors">27.5.7 Java exceptions from directors</a></H3>
+<H3><a name="Java_exceptions_from_directors">25.5.7 Java exceptions from directors</a></H3>
 
 
 <p>
@@ -3896,7 +3896,7 @@ Exception in thread "main" java.lang.RuntimeException: There was a problem!
 More on the <tt>Swig::DirectorException</tt> class can be found in the next section which details how to customize the handling of director exceptions.
 </p>
 
-<H4><a name="Java_customizing_director_exceptions">27.5.7.1 Customizing director exceptions</a></H4>
+<H4><a name="Java_customizing_director_exceptions">25.5.7.1 Customizing director exceptions</a></H4>
 
 
 <p>
@@ -4454,7 +4454,7 @@ Exception in thread "main" java.lang.IndexOutOfBoundsException: Index is negativ
 </pre>
 </div>
 
-<H2><a name="Java_allprotected">27.6 Accessing protected members</a></H2>
+<H2><a name="Java_allprotected">25.6 Accessing protected members</a></H2>
 
 
 <p>
@@ -4550,7 +4550,7 @@ class MyProtectedBase extends ProtectedBase
 
 
 
-<H2><a name="Java_common_customization">27.7 Common customization features</a></H2>
+<H2><a name="Java_common_customization">25.7 Common customization features</a></H2>
 
 
 <p>
@@ -4562,7 +4562,7 @@ be awkward.  This section describes some common SWIG features that are used
 to improve the interface to existing C/C++ code.
 </p>
 
-<H3><a name="Java_helper_functions">27.7.1 C/C++ helper functions</a></H3>
+<H3><a name="Java_helper_functions">25.7.1 C/C++ helper functions</a></H3>
 
 
 <p>
@@ -4628,7 +4628,7 @@ hard to implement.  It is possible to improve on this using Java code, typemaps,
 customization features as covered in later sections, but sometimes helper functions are a quick and easy solution to difficult cases.  
 </p>
 
-<H3><a name="Java_class_extension">27.7.2 Class extension with %extend</a></H3>
+<H3><a name="Java_class_extension">25.7.2 Class extension with %extend</a></H3>
 
 
 <p>
@@ -4691,7 +4691,7 @@ Vector(2, 3, 4)
 in any way---the extensions only show up in the Java interface.
 </p>
 
-<H3><a name="Java_proxycode">27.7.3 Class extension with %proxycode</a></H3>
+<H3><a name="Java_proxycode">25.7.3 Class extension with %proxycode</a></H3>
 
 
 <p>
@@ -4828,7 +4828,7 @@ public class ValueUnsignedInt {
 </pre>
 </div>
 
-<H3><a name="Java_exception_handling">27.7.4 Exception handling with %exception and %javaexception</a></H3>
+<H3><a name="Java_exception_handling">25.7.4 Exception handling with %exception and %javaexception</a></H3>
 
 
 <p>
@@ -4987,7 +4987,7 @@ to raise exceptions.  See the <a href="Library.html#Library">SWIG Library</a> ch
 The typemap example <a href="#Java_exception_typemap">Handling C++ exception specifications as Java exceptions</a> provides further exception handling capabilities.
 </p>
 
-<H3><a name="Java_method_access">27.7.5 Method access with %javamethodmodifiers</a></H3>
+<H3><a name="Java_method_access">25.7.5 Method access with %javamethodmodifiers</a></H3>
 
 
 <p>
@@ -5013,7 +5013,7 @@ protected static void protect_me() {
 </pre>
 </div>
 
-<H2><a name="Java_tips_techniques">27.8 Tips and techniques</a></H2>
+<H2><a name="Java_tips_techniques">25.8 Tips and techniques</a></H2>
 
 
 <p>
@@ -5023,7 +5023,7 @@ strings and arrays.   This chapter discusses the common techniques for
 solving these problems.
 </p>
 
-<H3><a name="Java_input_output_parameters">27.8.1 Input and output parameters using primitive pointers and references</a></H3>
+<H3><a name="Java_input_output_parameters">25.8.1 Input and output parameters using primitive pointers and references</a></H3>
 
 
 <p>
@@ -5197,7 +5197,7 @@ void foo(Bar *OUTPUT);
 will not have the intended effect since <tt>typemaps.i</tt> does not define an OUTPUT rule for <tt>Bar</tt>.
 </p>
 
-<H3><a name="Java_simple_pointers">27.8.2 Simple pointers</a></H3>
+<H3><a name="Java_simple_pointers">25.8.2 Simple pointers</a></H3>
 
 
 <p>
@@ -5263,7 +5263,7 @@ System.out.println("3 + 4 = " + result);
 See the <a href="Library.html#Library">SWIG Library</a> chapter for further details.
 </p>
 
-<H3><a name="Java_c_arrays">27.8.3 Wrapping C arrays with Java arrays</a></H3>
+<H3><a name="Java_c_arrays">25.8.3 Wrapping C arrays with Java arrays</a></H3>
 
 
 <p>
@@ -5330,7 +5330,7 @@ Please be aware that the typemaps in this library are not efficient as all the e
 There is an alternative approach using the SWIG array library and this is covered in the next section.
 </p>
 
-<H3><a name="Java_unbounded_c_arrays">27.8.4 Unbounded C Arrays</a></H3>
+<H3><a name="Java_unbounded_c_arrays">25.8.4 Unbounded C Arrays</a></H3>
 
 
 <p>
@@ -5475,7 +5475,7 @@ well suited for applications in which you need to create buffers,
 package binary data, etc.
 </p>
 
-<H3><a name="Java_binary_char">27.8.5 Binary data vs Strings</a></H3>
+<H3><a name="Java_binary_char">25.8.5 Binary data vs Strings</a></H3>
 
 
 <p>
@@ -5519,7 +5519,7 @@ len: 5 data: 68 69 0 6a 6b
 </pre></div>
 
 
-<H3><a name="Java_heap_allocations">27.8.6 Overriding new and delete to allocate from Java heap</a></H3>
+<H3><a name="Java_heap_allocations">25.8.6 Overriding new and delete to allocate from Java heap</a></H3>
 
 
 <p>
@@ -5636,7 +5636,7 @@ model and use these functions in place of malloc and free in your own
 code.
 </p>
 
-<H2><a name="Java_typemaps">27.9 Java typemaps</a></H2>
+<H2><a name="Java_typemaps">25.9 Java typemaps</a></H2>
 
 
 <p>
@@ -5657,7 +5657,7 @@ Before proceeding, it should be stressed that typemaps are not a required
 part of using SWIG---the default wrapping behavior is enough in most cases.
 Typemaps are only used if you want to change some aspect of the generated code.
 
-<H3><a name="Java_default_primitive_type_mappings">27.9.1 Default primitive type mappings</a></H3>
+<H3><a name="Java_default_primitive_type_mappings">25.9.1 Default primitive type mappings</a></H3>
 
 
 <p>
@@ -5809,7 +5809,7 @@ However, the mappings allow the full range of values for each C type from Java.
 </p>
 
 
-<H3><a name="Java_default_non_primitive_typemaps">27.9.2 Default typemaps for non-primitive types</a></H3>
+<H3><a name="Java_default_non_primitive_typemaps">25.9.2 Default typemaps for non-primitive types</a></H3>
 
 
 <p>
@@ -5824,7 +5824,7 @@ So in summary, the C/C++ pointer to non-primitive types is cast into the 64 bit
 The Java type is either the proxy class or type wrapper class.
 </p>
 
-<H3><a name="Java_jvm64">27.9.3 Sixty four bit JVMs</a></H3>
+<H3><a name="Java_jvm64">25.9.3 Sixty four bit JVMs</a></H3>
 
 
 <p>
@@ -5837,7 +5837,7 @@ Unfortunately it won't of course hold true for JNI code.
 </p>
 
 
-<H3><a name="Java_what_is_typemap">27.9.4 What is a typemap?</a></H3>
+<H3><a name="Java_what_is_typemap">25.9.4 What is a typemap?</a></H3>
 
 
 <p>
@@ -5960,7 +5960,7 @@ int c = example.count('e', "Hello World");
 </pre>
 </div>
 
-<H3><a name="Java_typemaps_c_to_java_types">27.9.5 Typemaps for mapping C/C++ types to Java types</a></H3>
+<H3><a name="Java_typemaps_c_to_java_types">25.9.5 Typemaps for mapping C/C++ types to Java types</a></H3>
 
 
 <p>
@@ -6240,7 +6240,7 @@ These are listed below:
 
 </table>
 
-<H3><a name="Java_typemap_attributes">27.9.6 Java typemap attributes</a></H3>
+<H3><a name="Java_typemap_attributes">25.9.6 Java typemap attributes</a></H3>
 
 
 <p>
@@ -6286,7 +6286,7 @@ The "javain" typemap has the optional 'pre', 'post' and 'pgcppname' attributes.
 Note that when the 'pre' or 'post' attributes are specified and the associated type is used in a constructor, a constructor helper function is generated. This is necessary as the Java proxy constructor wrapper makes a call to a support constructor using a <i>this</i> call. In Java the <i>this</i> call must be the first statement in the constructor body. The constructor body thus calls the helper function and the helper function instead makes the JNI call, ensuring the 'pre' code is called before the JNI call is made. There is a <a href="#Java_date_marshalling">Date marshalling</a> example showing 'pre', 'post' and 'pgcppname' attributes in action.
 </p>
 
-<H3><a name="Java_special_variables">27.9.7 Java special variables</a></H3>
+<H3><a name="Java_special_variables">25.9.7 Java special variables</a></H3>
 
 
 <p>
@@ -6468,7 +6468,7 @@ in that it is not fully qualified with the package name when using the
 <a href="SWIGPlus.html#SWIGPlus_nspace">nspace feature</a>.
 </p>
 
-<H3><a name="Java_typemaps_for_c_and_cpp">27.9.8 Typemaps for both C and C++ compilation</a></H3>
+<H3><a name="Java_typemaps_for_c_and_cpp">25.9.8 Typemaps for both C and C++ compilation</a></H3>
 
 
 <p>
@@ -6505,7 +6505,7 @@ If you do not intend your code to be targeting both C and C++ then your typemaps
 </p>
 
 
-<H3><a name="Java_code_typemaps">27.9.9 Java code typemaps</a></H3>
+<H3><a name="Java_code_typemaps">25.9.9 Java code typemaps</a></H3>
 
 
 <p>
@@ -6801,7 +6801,7 @@ to make the method and constructor public:
 </pre>
 </div>
 
-<H3><a name="Java_directors_typemaps">27.9.10 Director specific typemaps</a></H3>
+<H3><a name="Java_directors_typemaps">25.9.10 Director specific typemaps</a></H3>
 
 
 <p>
@@ -7078,7 +7078,7 @@ The basic strategy here is to provide a default package typemap for the majority
 
 </div>
 
-<H2><a name="Java_typemap_examples">27.10 Typemap Examples</a></H2>
+<H2><a name="Java_typemap_examples">25.10 Typemap Examples</a></H2>
 
 
 <p>
@@ -7088,7 +7088,7 @@ the SWIG library.
 </p>
 
 
-<H3><a name="Java_simpler_enum_classes">27.10.1 Simpler Java enums for enums without initializers</a></H3>
+<H3><a name="Java_simpler_enum_classes">25.10.1 Simpler Java enums for enums without initializers</a></H3>
 
 
 <p>
@@ -7167,7 +7167,7 @@ This would be done by using the original versions of these typemaps in "enums.sw
 </p>
 
 
-<H3><a name="Java_exception_typemap">27.10.2 Handling C++ exception specifications as Java exceptions</a></H3>
+<H3><a name="Java_exception_typemap">25.10.2 Handling C++ exception specifications as Java exceptions</a></H3>
 
 
 <p>
@@ -7292,7 +7292,7 @@ We could alternatively have used <tt>%rename</tt> to rename <tt>what()</tt> into
 </p>
 
 
-<H3><a name="Java_nan_exception_typemap">27.10.3 NaN Exception - exception handling for a particular type</a></H3>
+<H3><a name="Java_nan_exception_typemap">25.10.3 NaN Exception - exception handling for a particular type</a></H3>
 
 
 <p>
@@ -7447,7 +7447,7 @@ If we were a martyr to the JNI cause, we could replace the succinct code within
 If we had, we would have put it in the "in" typemap which, like all JNI and Java typemaps, also supports the 'throws' attribute.
 </p>
 
-<H3><a name="Java_converting_java_string_arrays">27.10.4 Converting Java String arrays to char ** </a></H3>
+<H3><a name="Java_converting_java_string_arrays">25.10.4 Converting Java String arrays to char ** </a></H3>
 
 
 <p>
@@ -7591,7 +7591,7 @@ Lastly the "jni", "jtype" and "jstype" typemaps are also required to specify
 what Java types to use.
 </p>
 
-<H3><a name="Java_expanding_java_object">27.10.5 Expanding a Java object to multiple arguments</a></H3>
+<H3><a name="Java_expanding_java_object">25.10.5 Expanding a Java object to multiple arguments</a></H3>
 
 
 <p>
@@ -7673,7 +7673,7 @@ example.foo(new String[]{"red", "green", "blue", "white"});
 </div>
 
 
-<H3><a name="Java_using_typemaps_return_arguments">27.10.6 Using typemaps to return arguments</a></H3>
+<H3><a name="Java_using_typemaps_return_arguments">25.10.6 Using typemaps to return arguments</a></H3>
 
 
 <p>
@@ -7791,7 +7791,7 @@ $ java runme
 1 12.0  340.0
 </pre></div>
 
-<H3><a name="Java_adding_downcasts">27.10.7 Adding Java downcasts to polymorphic return types</a></H3>
+<H3><a name="Java_adding_downcasts">25.10.7 Adding Java downcasts to polymorphic return types</a></H3>
 
 
 <p>
@@ -7997,7 +7997,7 @@ SWIG usually generates code which constructs the proxy classes using Java code a
 Note that the JNI code above uses a number of string lookups to call a constructor, whereas this would not occur using byte compiled Java code.
 </p>
 
-<H3><a name="Java_adding_equals_method">27.10.8 Adding an equals method to the Java classes</a></H3>
+<H3><a name="Java_adding_equals_method">25.10.8 Adding an equals method to the Java classes</a></H3>
 
 
 <p>
@@ -8041,7 +8041,7 @@ System.out.println("foo1? " + foo1.equals(foo2));
 </div>
 
 
-<H3><a name="Java_void_pointers">27.10.9 Void pointers and a common Java base class</a></H3>
+<H3><a name="Java_void_pointers">25.10.9 Void pointers and a common Java base class</a></H3>
 
 
 <p>
@@ -8100,7 +8100,7 @@ This example contains some useful functionality which you may want in your code.
     <li> It also has a function which effectively implements a cast from the type of the proxy/type wrapper class to a void pointer. This is necessary for passing a proxy class or a type wrapper class to a function that takes a void pointer.
 </ul>
 
-<H3><a name="Java_struct_pointer_pointer">27.10.10 Struct pointer to pointer</a></H3>
+<H3><a name="Java_struct_pointer_pointer">25.10.10 Struct pointer to pointer</a></H3>
 
 
 <p>
@@ -8280,7 +8280,7 @@ The C functional interface has been completely morphed into an object-oriented i
 the Butler class would behave much like any pure Java class and feel more natural to Java users.
 </p>
 
-<H3><a name="Java_memory_management_member_variables">27.10.11 Memory management when returning references to member variables</a></H3>
+<H3><a name="Java_memory_management_member_variables">25.10.11 Memory management when returning references to member variables</a></H3>
 
 
 <p>
@@ -8403,7 +8403,7 @@ public class Bike {
 Note the <tt>addReference</tt> call.
 </p>
 
-<H3><a name="Java_memory_management_objects">27.10.12 Memory management for objects passed to the C++ layer</a></H3>
+<H3><a name="Java_memory_management_objects">25.10.12 Memory management for objects passed to the C++ layer</a></H3>
 
 
 <p>
@@ -8531,7 +8531,7 @@ as mentioned earlier, <tt>setElement</tt> is actually:
 </pre>
 </div>
 
-<H3><a name="Java_date_marshalling">27.10.13 Date marshalling using the javain typemap and associated attributes</a></H3>
+<H3><a name="Java_date_marshalling">25.10.13 Date marshalling using the javain typemap and associated attributes</a></H3>
 
 
 <p>
@@ -8708,7 +8708,7 @@ A few things to note:
 
 
 
-<H2><a name="Java_directors_faq">27.11 Living with Java Directors</a></H2>
+<H2><a name="Java_directors_faq">25.11 Living with Java Directors</a></H2>
 
 
 <p>
@@ -8887,10 +8887,10 @@ public abstract class UserVisibleFoo extends Foo {
   </li>
 </ol>
 
-<H2><a name="Java_odds_ends">27.12 Odds and ends</a></H2>
+<H2><a name="Java_odds_ends">25.12 Odds and ends</a></H2>
 
 
-<H3><a name="Java_javadoc_comments">27.12.1 JavaDoc comments</a></H3>
+<H3><a name="Java_javadoc_comments">25.12.1 JavaDoc comments</a></H3>
 
 
 <p>
@@ -8946,7 +8946,7 @@ public class Barmy {
 
 
 
-<H3><a name="Java_functional_interface">27.12.2 Functional interface without proxy classes</a></H3>
+<H3><a name="Java_functional_interface">25.12.2 Functional interface without proxy classes</a></H3>
 
 
 <p>
@@ -9007,7 +9007,7 @@ All destructors have to be called manually for example the <tt>delete_Foo(foo)</
 </p>
 
 
-<H3><a name="Java_using_own_jni_functions">27.12.3 Using your own JNI functions</a></H3>
+<H3><a name="Java_using_own_jni_functions">25.12.3 Using your own JNI functions</a></H3>
 
 
 <p>
@@ -9057,7 +9057,7 @@ This directive is only really useful if you want to mix your own hand crafted JN
 </p>
 
 
-<H3><a name="Java_performance">27.12.4 Performance concerns and hints</a></H3>
+<H3><a name="Java_performance">25.12.4 Performance concerns and hints</a></H3>
 
 
 <p>
@@ -9078,7 +9078,7 @@ However, you will have to be careful about memory management and make sure that
 This method normally calls the C++ destructor or <tt>free()</tt> for C code.
 </p>
 
-<H3><a name="Java_debugging">27.12.5 Debugging</a></H3>
+<H3><a name="Java_debugging">25.12.5 Debugging</a></H3>
 
 
 <p>
@@ -9100,7 +9100,7 @@ The -verbose:jni and -verbose:gc are also useful options for monitoring code beh
 </p>
 
 
-<H2><a name="Java_examples">27.13 Java Examples</a></H2>
+<H2><a name="Java_examples">25.13 Java Examples</a></H2>
 
 
 <p>
diff --git a/Doc/Manual/Javascript.html b/Doc/Manual/Javascript.html
index ab7ee5157..8de528511 100644
--- a/Doc/Manual/Javascript.html
+++ b/Doc/Manual/Javascript.html
@@ -7,7 +7,7 @@
 </head>
 <body>
 
-<H1><a name="Javascript">28 SWIG and Javascript</a></H1>
+<H1><a name="Javascript">26 SWIG and Javascript</a></H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -52,7 +52,7 @@
 
 <p>This chapter describes SWIG's support of Javascript. It does not cover SWIG basics, but only information that is specific to this module.</p>
 
-<H2><a name="Javascript_overview">28.1 Overview</a></H2>
+<H2><a name="Javascript_overview">26.1 Overview</a></H2>
 
 
 <p>Javascript is a prototype-based scripting language that is dynamic, weakly typed and has first-class functions. Its arguably the most popular language for web development.
@@ -63,10 +63,10 @@ Javascript has gone beyond being a browser-based scripting language and with <a
 With <a href="https://github.com/rogerwang/node-webkit">node-webkit</a> there is a platform which uses Google's <code>Chromium</code> as Web-Browser widget and <code>node.js</code> for javascript extensions.
 </p>
 
-<H2><a name="Javascript_preliminaries">28.2 Preliminaries</a></H2>
+<H2><a name="Javascript_preliminaries">26.2 Preliminaries</a></H2>
 
 
-<H3><a name="Javascript_running_swig">28.2.1 Running SWIG</a></H3>
+<H3><a name="Javascript_running_swig">26.2.1 Running SWIG</a></H3>
 
 
 <p>Suppose that you defined a SWIG module such as the following:</p>
@@ -121,7 +121,7 @@ void example_initialize(v8::Handle&lt;v8::Object&gt; exports)</pre>
 <b>Note</b>: be aware that <code>v8</code> has a C++ API, and thus, the generated modules must be compiled as C++.
 </p>
 
-<H3><a name="Javascript_running_tests_examples">28.2.2 Running Tests and Examples</a></H3>
+<H3><a name="Javascript_running_tests_examples">26.2.2 Running Tests and Examples</a></H3>
 
 
 <p>The configuration for tests and examples currently supports Linux and Mac only and not MinGW (Windows) yet.</p>
@@ -153,7 +153,7 @@ $ make check-javascript-test-suite ENGINE=jsc</pre>
 $ make check-javascript-examples V8_VERSION=0x032530 ENGINE=v8</pre>
 </div>
 
-<H3><a name="Javascript_known_issues">28.2.3 Known Issues</a></H3>
+<H3><a name="Javascript_known_issues">26.2.3 Known Issues</a></H3>
 
 
 <p>At the moment, the Javascript generators pass all tests syntactically, i.e., the generated source code compiles. However, there are still remaining runtime issues.</p>
@@ -170,12 +170,12 @@ $ make check-javascript-examples V8_VERSION=0x032530 ENGINE=v8</pre>
 
 <p>The primary development environment has been Linux (Ubuntu 12.04). Windows and Mac OS X have been tested sporadically. Therefore, the generators might have more issues on those platforms. Please report back any problem you observe to help us improving this module quickly.</p>
 
-<H2><a name="Javascript_integration">28.3 Integration</a></H2>
+<H2><a name="Javascript_integration">26.3 Integration</a></H2>
 
 
 <p>This chapter gives a short introduction how to use a native Javascript extension: as a <code>node.js</code> module, and as an extension for an embedded Webkit.</p>
 
-<H3><a name="Javascript_node_extensions">28.3.1 Creating node.js Extensions</a></H3>
+<H3><a name="Javascript_node_extensions">26.3.1 Creating node.js Extensions</a></H3>
 
 
 <p>To install <code>node.js</code> you can download an installer from their <a href="https://launchpad.net/~chris-lea/+archive/node.js">web-site</a> for Mac OS X and Windows. For Linux you can either build the source yourself and run <code>sudo checkinstall</code> or keep to the (probably stone-age) packaged version. For Ubuntu there is a <a href="https://launchpad.net/~chris-lea/+archive/ubuntu/node.js/">PPA</a> available.</p>
@@ -221,7 +221,7 @@ require("./build/Release/example")</pre>
 </div>
 <p>A more detailed explanation is given in the <a href="#Javascript_examples">Examples</a> section.</p>
 
-<H4><a name="Javascript_troubleshooting">28.3.1.1 Troubleshooting</a></H4>
+<H4><a name="Javascript_troubleshooting">26.3.1.1 Troubleshooting</a></H4>
 
 
 <ul>
@@ -233,12 +233,12 @@ require("./build/Release/example")</pre>
 $ sudo apt-get remove gyp</pre>
 </div>
 
-<H3><a name="Javascript_embedded_webkit">28.3.2 Embedded Webkit</a></H3>
+<H3><a name="Javascript_embedded_webkit">26.3.2 Embedded Webkit</a></H3>
 
 
 <p>Webkit is pre-installed on Mac OS X and available as a library for GTK.</p>
 
-<H4><a name="Javascript_osx">28.3.2.1 Mac OS X</a></H4>
+<H4><a name="Javascript_osx">26.3.2.1 Mac OS X</a></H4>
 
 
 <p>There is general information about programming with WebKit on <a href="https://developer.apple.com/library/mac/documentation/cocoa/conceptual/DisplayWebContent/DisplayWebContent.html">Apple Developer Documentation</a>. Details about <code>Cocoa</code> programming are not covered here.</p>
@@ -286,7 +286,7 @@ extern bool example_initialize(JSGlobalContextRef context, JSObjectRef* exports)
 @end</pre>
 </div>
 
-<H4><a name="Javascript_gtk">28.3.2.2 GTK</a></H4>
+<H4><a name="Javascript_gtk">26.3.2.2 GTK</a></H4>
 
 
 <p>There is general information about programming GTK at <a href="https://developer.gnome.org/gtk2/">GTK documentation</a> and in the <a href="https://developer.gnome.org/gtk-tutorial">GTK tutorial</a>, and for Webkit there is a <a href="http://webkitgtk.org/reference/webkitgtk/stable/index.html">Webkit GTK+ API Reference</a>.</p>
@@ -331,7 +331,7 @@ int main(int argc, char* argv[])
 }</pre>
 </div>
 
-<H3><a name="Javascript_applications_webkit">28.3.3 Creating Applications with node-webkit</a></H3>
+<H3><a name="Javascript_applications_webkit">26.3.3 Creating Applications with node-webkit</a></H3>
 
 
 <p>To get started with <code>node-webkit</code> there is a very informative set of <a href="https://github.com/rogerwang/node-webkit/wiki">wiki pages</a>.</p>
@@ -422,12 +422,12 @@ open new windows, and many more things.
 };</pre>
 </div>
 
-<H2><a name="Javascript_examples">28.4 Examples</a></H2>
+<H2><a name="Javascript_examples">26.4 Examples</a></H2>
 
 
 <p>Some basic examples are shown here in more detail.</p>
 
-<H3><a name="Javascript_simple_example">28.4.1 Simple</a></H3>
+<H3><a name="Javascript_simple_example">26.4.1 Simple</a></H3>
 
 
 <p>The common example <code>simple</code> looks like this:</p>
@@ -477,7 +477,7 @@ example.Foo = 3.1415926;</pre>
 
 <p><b>Note</b>: ECMAScript 5, the currently implemented Javascript standard, does not have modules. <code>node.js</code> and other implementations provide this mechanism defined by the <a href="http://wiki.commonjs.org/wiki/CommonJS">CommonJS</a> group. For browsers this is provided by <a href="http://browserify.org">Browserify</a>, for instance.</p>
 
-<H3><a name="Javascript_class_example">28.4.2 Class</a></H3>
+<H3><a name="Javascript_class_example">26.4.2 Class</a></H3>
 
 
 <p>The common example <code>class</code> defines three classes, <code>Shape</code>, <code>Circle</code>, and <code>Square</code>:</p>
@@ -607,12 +607,12 @@ at emitKey (readline.js:1095:12)</pre>
 <b>Note</b>: In ECMAScript 5 there is no concept for classes. Instead each function can be used as a constructor function which is executed by the 'new' operator. Furthermore, during construction the key property <code>prototype</code> of the constructor function is used to attach a prototype instance to the created object. A prototype is essentially an object itself that is the first-class delegate of a class used whenever the access to a property of an object fails. The very same prototype instance is shared among all instances of one type. Prototypal inheritance is explained in more detail on in <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Inheritance_and_the_prototype_chain">Inheritance and the prototype chain</a>, for instance.
 </p>
 
-<H2><a name="Javascript_implementation">28.5 Implementation</a></H2>
+<H2><a name="Javascript_implementation">26.5 Implementation</a></H2>
 
 
 <p>The Javascript Module implementation has taken a very different approach compared to other language modules in order to support different Javascript interpreters.</p>
 
-<H3><a name="Javascript_source_code">28.5.1 Source Code</a></H3>
+<H3><a name="Javascript_source_code">26.5.1 Source Code</a></H3>
 
 
 <p>The Javascript module is implemented in <code>Source/Modules/javascript.cxx</code>. It dispatches the code generation to a <code>JSEmitter</code> instance, <code>V8Emitter</code> or <code>JSCEmitter</code>. Additionally there are some helpers: <code>Template</code>, for templated code generation, and <code>JSEmitterState</code>, which is used to manage state information during AST traversal. This rough map shall make it easier to find a way through this huge source file:</p>
@@ -713,7 +713,7 @@ Template::Template(const String *code_) { ... }
 ...</pre>
 </div>
 
-<H3><a name="Javascript_code_templates">28.5.2 Code Templates</a></H3>
+<H3><a name="Javascript_code_templates">26.5.2 Code Templates</a></H3>
 
 
 <p>All generated code is created on the basis of code templates. The templates for <em>JavascriptCore</em> can be found in <code>Lib/javascript/jsc/javascriptcode.swg</code>, for <em>v8</em> in <code>Lib/javascript/v8/javascriptcode.swg</code>.</p>
@@ -752,7 +752,7 @@ t_register.replace("$jsparent", state.clazz(NAME_MANGLED))
 </div>
 <p><code>Template</code> creates a copy of that string and <code>Template::replace</code> uses Swig's <code>Replaceall</code> to replace variables in the template. <code>Template::trim</code> can be used to eliminate leading and trailing whitespaces. <code>Template::print</code> is used to write the final template string to a Swig <code>DOH</code> (based on <code>Printv</code>). All methods allow chaining.</p>
 
-<H3><a name="Javascript_emitter">28.5.3 Emitter</a></H3>
+<H3><a name="Javascript_emitter">26.5.3 Emitter</a></H3>
 
 
 <p>The Javascript module delegates code generation to a <code>JSEmitter</code> instance. The following extract shows the essential interface:</p>
@@ -871,7 +871,7 @@ int JAVASCRIPT::classHandler(Node *n) {
 </div>
 <p>In <code>enterClass</code> the emitter stores state information that is necessary when processing class members. In <code>exitClass</code> the wrapper code for the whole class is generated.</p>
 
-<H3><a name="Javascript_emitter_states">28.5.4 Emitter states</a></H3>
+<H3><a name="Javascript_emitter_states">26.5.4 Emitter states</a></H3>
 
 
 <p>For storing information during the AST traversal the emitter provides a <code>JSEmitterState</code> with different slots to store data representing the scopes global, class, function, and variable.</p>
@@ -915,7 +915,7 @@ state.clazz(NAME, Getattr(n, "sym:name"));</pre>
 <p>State information can be retrieved using <code>state.clazz(NAME)</code> or with <code>Getattr</code> on <code>state.clazz()</code> which actually returns a <code>Hash</code> instance.</p>
 
 
-<H3><a name="Javascript_jsc_exceptions">28.5.5 Handling Exceptions in JavascriptCore</a></H3>
+<H3><a name="Javascript_jsc_exceptions">26.5.5 Handling Exceptions in JavascriptCore</a></H3>
 
 
 <p>Applications with an embedded JavascriptCore should be able to present detailed exception messages that occur in the Javascript engine. Below is an example derived from code provided by Brian Barnes on how these exception details can be extracted.</p>
diff --git a/Doc/Manual/Lua.html b/Doc/Manual/Lua.html
index 25d5e2cd5..90bcc5a00 100644
--- a/Doc/Manual/Lua.html
+++ b/Doc/Manual/Lua.html
@@ -7,7 +7,7 @@
 </head>
 
 <body bgcolor="#ffffff">
-<H1><a name="Lua">30 SWIG and Lua</a></H1>
+<H1><a name="Lua">27 SWIG and Lua</a></H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -83,14 +83,14 @@ Lua is an extension programming language designed to support general procedural
 eLua stands for Embedded Lua (can be thought of as a flavor of Lua) and offers the full implementation of the Lua programming language to the embedded world, extending it with specific features for efficient and portable software embedded development. eLua runs on smaller devices like microcontrollers and provides the full features of the regular Lua desktop version. More information on eLua can be found here: <a href="http://www.eluaproject.net">http://www.eluaproject.net</a>
 </p>
 
-<H2><a name="Lua_nn2">30.1 Preliminaries</a></H2>
+<H2><a name="Lua_nn2">27.1 Preliminaries</a></H2>
 
 
 <p>
 The current SWIG implementation is designed to work with Lua 5.0.x, 5.1.x and 5.2.x. It should work with later versions of Lua, but certainly not with Lua 4.0 due to substantial API changes. It is possible to either static link or dynamic link a Lua module into the interpreter (normally Lua static links its libraries, as dynamic linking is not available on all platforms). SWIG also has support for eLua starting from eLua 0.8. Due to substantial changes between SWIG 2.x and SWIG 3.0 and unavailability of testing platform, eLua status was downgraded to 'experimental'.
 </p>
 
-<H2><a name="Lua_nn3">30.2 Running SWIG</a></H2>
+<H2><a name="Lua_nn3">27.2 Running SWIG</a></H2>
 
 
 <p>
@@ -138,7 +138,7 @@ $ swig -lua -eluac example.i
 The <tt>-elua</tt> option puts all the C function wrappers and variable get/set wrappers in rotables. It also generates a metatable which will control the access to these variables from eLua. It also offers a significant amount of module size compression. On the other hand, the <tt>-eluac</tt> option puts all the wrappers in a single rotable. With this option, no matter how huge the module, it will consume no additional microcontroller SRAM (crass compression). There is a catch though: Metatables are not generated with <tt>-eluac</tt>. To access any value from eLua, one must directly call the wrapper function associated with that value.
 </p>
 
-<H3><a name="Lua_commandline">30.2.1 Additional command line options</a></H3>
+<H3><a name="Lua_commandline">27.2.1 Additional command line options</a></H3>
 
 
 <p>
@@ -179,7 +179,7 @@ swig -lua -help
 </tr>
 </table>
 
-<H3><a name="Lua_nn4">30.2.2 Compiling and Linking and Interpreter</a></H3>
+<H3><a name="Lua_nn4">27.2.2 Compiling and Linking and Interpreter</a></H3>
 
 
 <p>
@@ -250,7 +250,7 @@ LUALIB_API int ( luaopen_mod )(lua_State *L );
 More information on building and configuring eLua can be found here: <a href="http://www.eluaproject.net/doc/v0.8/en_building.html">http://www.eluaproject.net/doc/v0.8/en_building.html</a>
 </p>
 
-<H3><a name="Lua_nn5">30.2.3 Compiling a dynamic module</a></H3>
+<H3><a name="Lua_nn5">27.2.3 Compiling a dynamic module</a></H3>
 
 
 <p>
@@ -318,7 +318,7 @@ Is quite obvious (Go back and consult the Lua documents on how to enable loadlib
 
 
 
-<H3><a name="Lua_nn6">30.2.4 Using your module</a></H3>
+<H3><a name="Lua_nn6">27.2.4 Using your module</a></H3>
 
 
 <p>
@@ -336,19 +336,19 @@ $ ./my_lua
 &gt;
 </pre></div>
 
-<H2><a name="Lua_nn7">30.3 A tour of basic C/C++ wrapping</a></H2>
+<H2><a name="Lua_nn7">27.3 A tour of basic C/C++ wrapping</a></H2>
 
 
 <p>
 By default, SWIG tries to build a very natural Lua interface to your C/C++ code. This section briefly covers the essential aspects of this wrapping.
 </p>
-<H3><a name="Lua_nn8">30.3.1 Modules</a></H3>
+<H3><a name="Lua_nn8">27.3.1 Modules</a></H3>
 
 
 <p>
 The SWIG module directive specifies the name of the Lua module. If you specify `module example', then everything is wrapped into a Lua table 'example' containing all the functions and variables. When choosing a module name, make sure you don't use the same name as a built-in Lua command or standard module name.
 </p>
-<H3><a name="Lua_nn9">30.3.2 Functions</a></H3>
+<H3><a name="Lua_nn9">27.3.2 Functions</a></H3>
 
 
 <p>
@@ -389,7 +389,7 @@ It is also possible to rename the module with an assignment.
 24
 </pre></div>
 
-<H3><a name="Lua_nn10">30.3.3 Global variables</a></H3>
+<H3><a name="Lua_nn10">27.3.3 Global variables</a></H3>
 
 
 <p>
@@ -477,7 +477,7 @@ If you have used the <tt>-eluac</tt> option for your eLua module, you will have
 In general, functions of the form <tt>"variable_get()"</tt> and <tt>"variable_set()"</tt> are automatically generated by SWIG for use with <tt>-eluac</tt>.
 </p>
 
-<H3><a name="Lua_nn11">30.3.4 Constants and enums</a></H3>
+<H3><a name="Lua_nn11">27.3.4 Constants and enums</a></H3>
 
 
 <p>
@@ -512,7 +512,7 @@ If you're using eLua and have used <tt>-elua</tt> or <tt>-eluac</tt> to generate
 Hello World
 </pre></div>
 
-<H4><a name="Lua_nn13">30.3.4.1 Constants/enums and classes/structures</a></H4>
+<H4><a name="Lua_nn13">27.3.4.1 Constants/enums and classes/structures</a></H4>
 
 
 <p>
@@ -568,7 +568,7 @@ If the <tt>-no-old-metatable-bindings</tt> option is used, then these old-style
 It is worth mentioning, that <tt>example.Test.TEST1</tt> and <tt>example.Test_TEST1</tt> are different entities and changing one does not change the other. 
 Given the fact that these are constantes and they are not supposed to be changed, it is up to you to avoid such issues.
 </p>
-<H3><a name="Lua_nn12">30.3.5 Pointers</a></H3>
+<H3><a name="Lua_nn12">27.3.5 Pointers</a></H3>
 
 
 <p>
@@ -606,7 +606,7 @@ Lua enforces the integrity of its userdata, so it is virtually impossible to cor
 nil
 </pre></div>
 
-<H3><a name="Lua_structures">30.3.6 Structures</a></H3>
+<H3><a name="Lua_structures">27.3.6 Structures</a></H3>
 
 
 <p>
@@ -710,7 +710,7 @@ For eLua with the <tt>-eluac</tt> option, structure manipulation has to be perfo
 In general, functions of the form <tt>"new_struct()"</tt>, <tt>"struct_member_get()"</tt>, <tt>"struct_member_set()"</tt> and <tt>"free_struct()"</tt> are automatically generated by SWIG for each structure defined in C. (Please note: This doesn't apply for modules generated with the <tt>-elua</tt> option)
 </p>
 
-<H3><a name="Lua_nn14">30.3.7 C++ classes</a></H3>
+<H3><a name="Lua_nn14">27.3.7 C++ classes</a></H3>
 
 
 <p>
@@ -785,7 +785,7 @@ Both style names are generated by default now.
 However, if the <tt>-no-old-metatable-bindings</tt> option is used, then the backward compatible names are not generated in addition to ordinary ones.
 </p>
 
-<H3><a name="Lua_nn15">30.3.8 C++ inheritance</a></H3>
+<H3><a name="Lua_nn15">27.3.8 C++ inheritance</a></H3>
 
 
 <p>
@@ -810,7 +810,7 @@ then the function <tt>spam()</tt> accepts a Foo pointer or a pointer to any clas
 <p>
 It is safe to use multiple inheritance with SWIG.
 </p>
-<H3><a name="Lua_nn16">30.3.9 Pointers, references, values, and arrays</a></H3>
+<H3><a name="Lua_nn16">27.3.9 Pointers, references, values, and arrays</a></H3>
 
 
 <p>
@@ -841,7 +841,7 @@ Foo  spam7();
 <p>
 then all three functions will return a pointer to some Foo object. Since the third function (spam7) returns a value, newly allocated memory is used to hold the result and a pointer is returned (Lua will release this memory when the return value is garbage collected). The other two are pointers which are assumed to be managed by the C code and so will not be garbage collected.
 </p>
-<H3><a name="Lua_nn17">30.3.10 C++ overloaded functions</a></H3>
+<H3><a name="Lua_nn17">27.3.10 C++ overloaded functions</a></H3>
 
 
 <p>
@@ -927,7 +927,7 @@ Please refer to the "SWIG and C++" chapter for more information about overloadin
 <p>
 Dealing with the Lua coercion mechanism, the priority is roughly (integers, floats, strings, userdata). But it is better to rename the functions rather than rely upon the ordering.
 </p>
-<H3><a name="Lua_nn18">30.3.11 C++ operators</a></H3>
+<H3><a name="Lua_nn18">27.3.11 C++ operators</a></H3>
 
 
 <p>
@@ -1059,7 +1059,7 @@ operators and pseudo-operators):</p>
 </ul>
 <p>No other lua metafunction is inherited. For example, __gc is not inherited and must be redefined in every class. <tt>__tostring</tt> is subject to a special handling. If absent in class and in class bases, a default one will be provided by SWIG.
 </p>
-<H3><a name="Lua_nn19">30.3.12 Class extension with %extend</a></H3>
+<H3><a name="Lua_nn19">27.3.12 Class extension with %extend</a></H3>
 
 
 <p>
@@ -1116,7 +1116,7 @@ true
 Extend works with both C and C++ code, on classes and structs. It does not modify the underlying object in any way---the extensions only show up in the Lua interface. The only item to take note of is the code has to use the '$self' instead of 'this', and that you cannot access protected/private members of the code (as you are not officially part of the class).
 </p>
 
-<H3><a name="Lua_nn20">30.3.13 Using %newobject to release memory</a></H3>
+<H3><a name="Lua_nn20">27.3.13 Using %newobject to release memory</a></H3>
 
 
 <p> If you have a function that allocates memory like this,</p>
@@ -1140,7 +1140,7 @@ char *foo();
 </div>
 <p> This will release the allocated memory.</p>
 
-<H3><a name="Lua_nn21">30.3.14 C++ templates</a></H3>
+<H3><a name="Lua_nn21">27.3.14 C++ templates</a></H3>
 
 
 <p>
@@ -1175,7 +1175,7 @@ In Lua:
 <p>
 Obviously, there is more to template wrapping than shown in this example. More details can be found in the SWIG and C++ chapter. Some more complicated examples will appear later.
 </p>
-<H3><a name="Lua_nn22">30.3.15 C++ Smart Pointers</a></H3>
+<H3><a name="Lua_nn22">27.3.15 C++ Smart Pointers</a></H3>
 
 
 <p>
@@ -1227,7 +1227,7 @@ If you ever need to access the underlying pointer returned by <tt>operator-&gt;(
 &gt; f = p:__deref__()     -- Returns underlying Foo *
 </pre></div>
 
-<H3><a name="Lua_nn23">30.3.16 C++ Exceptions</a></H3>
+<H3><a name="Lua_nn23">27.3.16 C++ Exceptions</a></H3>
 
 
 <p>
@@ -1370,7 +1370,7 @@ and the "<a href="Customization.html#Customization_exception">Exception handling
 add exception specification to functions or globally (respectively).
 </p>
 
-<H3><a name="Lua_namespaces">30.3.17 Namespaces </a></H3>
+<H3><a name="Lua_namespaces">27.3.17 Namespaces </a></H3>
 
 
 <p>
@@ -1421,7 +1421,7 @@ Now, from Lua usage is as follows:
 19
 &gt;
 </pre></div>
-<H4><a name="Lua_nn27">30.3.17.1 Compatibility Note </a></H4>
+<H4><a name="Lua_nn27">27.3.17.1 Compatibility Note </a></H4>
 
 
 <p>
@@ -1437,7 +1437,7 @@ If SWIG is running in a backwards compatible way, i.e. without the <tt>-no-old-m
 </pre></div>
 
 
-<H4><a name="Lua_nn29">30.3.17.2 Names </a></H4>
+<H4><a name="Lua_nn29">27.3.17.2 Names </a></H4>
 
 
 <p> If SWIG is launched without <tt>-no-old-metatable-bindings</tt> option, then it enters backward-compatible mode. While in this mode, it tries
@@ -1481,7 +1481,7 @@ surrounding scope without any prefixing. Pretending that Test2 is a struct, not
 &gt;
 </pre></div>
 
-<H4><a name="Lua_nn30">30.3.17.3 Inheritance </a></H4>
+<H4><a name="Lua_nn30">27.3.17.3 Inheritance </a></H4>
 
 
 <p> The internal organization of inheritance has changed. 
@@ -1522,12 +1522,12 @@ function
 &gt;
 </pre></div>
 
-<H2><a name="Lua_nn24">30.4 Typemaps</a></H2>
+<H2><a name="Lua_nn24">27.4 Typemaps</a></H2>
 
 
 <p>This section explains what typemaps are and how to use them. The default wrapping behaviour of SWIG is enough in most cases. However sometimes SWIG may need a little additional assistance to know which typemap to apply to provide the best wrapping. This section will be explaining how to use typemaps to best effect</p>
 
-<H3><a name="Lua_nn25">30.4.1 What is a typemap?</a></H3>
+<H3><a name="Lua_nn25">27.4.1 What is a typemap?</a></H3>
 
 
 <p>A typemap is nothing more than a code generation rule that is attached to a specific C datatype. For example, to convert integers from Lua to C, you might define a typemap like this:</p>
@@ -1555,7 +1555,7 @@ Received an integer : 6
 720
 </pre></div>
 
-<H3><a name="Lua_nn26">30.4.2 Using typemaps</a></H3>
+<H3><a name="Lua_nn26">27.4.2 Using typemaps</a></H3>
 
 
 <p>There are many ready written typemaps built into SWIG for all common types (int, float, short, long, char*, enum and more), which SWIG uses automatically, with no effort required on your part.</p>
@@ -1608,7 +1608,7 @@ void swap(int *sx, int *sy);
 
 <p>Note: C++ references must be handled exactly the same way. However SWIG will automatically wrap a <tt>const int&amp;</tt>  as an input parameter (since that it obviously input).</p>
 
-<H3><a name="Lua_typemap_arrays">30.4.3 Typemaps and arrays</a></H3>
+<H3><a name="Lua_typemap_arrays">27.4.3 Typemaps and arrays</a></H3>
 
 
 <p>Arrays present a challenge for SWIG, because like pointers SWIG does not know whether these are input or output values, nor
@@ -1672,7 +1672,7 @@ and Lua tables to be 1..N, (the indexing follows the norm for the language). In
 
 <p>Note: SWIG also can support arrays of pointers in a similar manner.</p>
 
-<H3><a name="Lua_typemaps_ptr_ptr_functions">30.4.4 Typemaps and pointer-pointer functions</a></H3>
+<H3><a name="Lua_typemaps_ptr_ptr_functions">27.4.4 Typemaps and pointer-pointer functions</a></H3>
 
 
 <p>Several C++ libraries use a pointer-pointer functions to create its objects. These functions require a pointer to a pointer which is then filled with the pointer to the new object. Microsoft's COM and DirectX as well as many other libraries have this kind of function. An example is given below:</p>
@@ -1706,7 +1706,7 @@ int Create_Math(iMath** pptr); // its creator (assume it mallocs)
 ptr=nil -- the iMath* will be GC'ed as normal
 </pre></div>
 
-<H2><a name="Lua_writing_typemaps">30.5 Writing typemaps</a></H2>
+<H2><a name="Lua_writing_typemaps">27.5 Writing typemaps</a></H2>
 
 
 <p>This section describes how you can modify SWIG's default wrapping behavior for various C/C++ datatypes using the <tt>%typemap</tt> directive. This is an advanced topic that assumes familiarity with the Lua C API as well as the material in the "<a href="Typemaps.html#Typemaps">Typemaps</a>" chapter.</p>
@@ -1715,7 +1715,7 @@ ptr=nil -- the iMath* will be GC'ed as normal
 
 <p>Before proceeding, you should read the previous section on using typemaps, and look at the existing typemaps found in luatypemaps.swg and typemaps.i. These are both well documented and fairly easy to read. You should not attempt to write your own typemaps until you have read and can understand both of these files (they may well also give you an idea to base your work on).</p>
 
-<H3><a name="Lua_typemaps_write">30.5.1 Typemaps you can write</a></H3>
+<H3><a name="Lua_typemaps_write">27.5.1 Typemaps you can write</a></H3>
 
 
 <p>There are many different types of typemap that can be written, the full list can be found in the "<a href="Typemaps.html#Typemaps">Typemaps</a>" chapter. However the following are the most commonly used ones.</p>
@@ -1728,7 +1728,7 @@ ptr=nil -- the iMath* will be GC'ed as normal
 (the syntax for the typecheck is different from the typemap, see typemaps for details).</li>
 </ul>
 
-<H3><a name="Lua_nn31">30.5.2 SWIG's Lua-C API</a></H3>
+<H3><a name="Lua_nn31">27.5.2 SWIG's Lua-C API</a></H3>
 
 
 <p>This section explains the SWIG specific Lua-C API. It does not cover the main Lua-C api, as this is well documented and not worth covering.</p>
@@ -1777,7 +1777,7 @@ This macro, when called within the context of a SWIG wrapped function, will disp
 <div class="indent">
 Similar to SWIG_fail_arg, except that it will display the swig_type_info information instead.</div>
 
-<H2><a name="Lua_nn32">30.6 Customization of your Bindings</a></H2>
+<H2><a name="Lua_nn32">27.6 Customization of your Bindings</a></H2>
 
 
 <p>
@@ -1786,7 +1786,7 @@ This section covers adding of some small extra bits to your module to add the la
 
 
 
-<H3><a name="Lua_nn33">30.6.1 Writing your own custom wrappers</a></H3>
+<H3><a name="Lua_nn33">27.6.1 Writing your own custom wrappers</a></H3>
 
 
 <p>
@@ -1805,7 +1805,7 @@ int native_function(lua_State*L) // my native code
 The <tt>%native</tt> directive in the above example, tells SWIG that there is a function <tt>int native_function(lua_State*L);</tt> which is to be added into the module under the name '<tt>my_func</tt>'. SWIG will not add any wrapper for this function, beyond adding it into the function table. How you write your code is entirely up to you.
 </p>
 
-<H3><a name="Lua_nn34">30.6.2 Adding additional Lua code</a></H3>
+<H3><a name="Lua_nn34">27.6.2 Adding additional Lua code</a></H3>
 
 
 <p>
@@ -1843,7 +1843,7 @@ Good uses for this feature is adding of new code, or writing helper functions to
 See Examples/lua/arrays for an example of this code.
 </p>
 
-<H2><a name="Lua_nn35">30.7 Details on the Lua binding</a></H2>
+<H2><a name="Lua_nn35">27.7 Details on the Lua binding</a></H2>
 
 
 <p>
@@ -1854,7 +1854,7 @@ See Examples/lua/arrays for an example of this code.
  </i>
 </p>
 
-<H3><a name="Lua_nn36">30.7.1 Binding global data into the module.</a></H3>
+<H3><a name="Lua_nn36">27.7.1 Binding global data into the module.</a></H3>
 
 
 <p>
@@ -1914,7 +1914,7 @@ end
 <p>
 That way when you call '<tt>a=example.Foo</tt>', the interpreter looks at the table 'example' sees that there is no field 'Foo' and calls __index. This will in turn check in '.get' table and find the existence of 'Foo' and then return the value of the C function call 'Foo_get()'. Similarly for the code '<tt>example.Foo=10</tt>', the interpreter will check the table, then call the __newindex which will then check the '.set' table and call the C function 'Foo_set(10)'.
 </p>
-<H3><a name="Lua_nn37">30.7.2 Userdata and Metatables</a></H3>
+<H3><a name="Lua_nn37">27.7.2 Userdata and Metatables</a></H3>
 
 
 <p>
@@ -1994,7 +1994,7 @@ Note: Both the opaque structures (like the FILE*) and normal wrapped classes/str
 <p>
 Note: Operator overloads are basically done in the same way, by adding functions such as '__add' &amp; '__call' to the class' metatable. The current implementation is a bit rough as it will add any member function beginning with '__' into the metatable too, assuming its an operator overload.
 </p>
-<H3><a name="Lua_nn38">30.7.3 Memory management</a></H3>
+<H3><a name="Lua_nn38">27.7.3 Memory management</a></H3>
 
 
 <p>
diff --git a/Doc/Manual/Mzscheme.html b/Doc/Manual/Mzscheme.html
index c3af5c49e..860a5c412 100644
--- a/Doc/Manual/Mzscheme.html
+++ b/Doc/Manual/Mzscheme.html
@@ -8,7 +8,7 @@
 
 <body bgcolor="#ffffff">
 
-<H1><a name="Mzscheme">32 SWIG and MzScheme/Racket</a></H1>
+<H1><a name="Mzscheme">37 SWIG and MzScheme/Racket</a></H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -24,7 +24,7 @@
 <p>
 This section contains information on SWIG's support of Racket, formally known as MzScheme.
 
-<H2><a name="MzScheme_nn2">32.1 Creating native structures</a></H2>
+<H2><a name="MzScheme_nn2">37.1 Creating native structures</a></H2>
 
 
 <p>
@@ -65,7 +65,7 @@ Then in scheme, you can use regular struct access procedures like
 </pre>
 </div>
 
-<H2><a name="MzScheme_simple">32.2 Simple example</a></H2>
+<H2><a name="MzScheme_simple">37.2 Simple example</a></H2>
 
 
 <p>
@@ -166,7 +166,7 @@ Some points of interest:
   <li> The above requests mzc to create an extension using the CGC garbage-collector. The alternative -- the 3m collector -- has generally better performance, but work is still required for SWIG to emit code which is compatible with it.
 </ul>
 
-<H2><a name="MzScheme_external_docs">32.3 External documentation</a></H2>
+<H2><a name="MzScheme_external_docs">37.3 External documentation</a></H2>
 
 
 <p>
diff --git a/Doc/Manual/Ocaml.html b/Doc/Manual/Ocaml.html
index a3c60db02..9e0902bc8 100644
--- a/Doc/Manual/Ocaml.html
+++ b/Doc/Manual/Ocaml.html
@@ -7,7 +7,7 @@
 </head>
 
 <body bgcolor="#ffffff">
-<H1><a name="Ocaml">33 SWIG and Ocaml</a></H1>
+<H1><a name="Ocaml">28 SWIG and Ocaml</a></H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -88,7 +88,7 @@ If you're not familiar with the Objective Caml language, you can visit
 <a href="http://ocaml.org/">The Ocaml Website</a>.
 </p>
 
-<H2><a name="Ocaml_nn2">33.1 Preliminaries</a></H2>
+<H2><a name="Ocaml_nn2">28.1 Preliminaries</a></H2>
 
 
 <p>
@@ -106,7 +106,7 @@ file Examples/Makefile illustrate how to compile and link SWIG modules that
 will be loaded dynamically.  This has only been tested on Linux so far.
 </p>
 
-<H3><a name="Ocaml_nn3">33.1.1 Running SWIG</a></H3>
+<H3><a name="Ocaml_nn3">28.1.1 Running SWIG</a></H3>
 
 
 <p>
@@ -129,7 +129,7 @@ you will compile the file <tt>example_wrap.c</tt> with <tt>ocamlc</tt> or
 the resulting .ml and .mli files as well, and do the final link with -custom
 (not needed for native link).</p>
 
-<H3><a name="Ocaml_nn4">33.1.2 Compiling the code</a></H3>
+<H3><a name="Ocaml_nn4">28.1.2 Compiling the code</a></H3>
 
 
 <p>
@@ -166,7 +166,7 @@ in C++ mode, you must:</p>
 </pre>
 </div>
 
-<H3><a name="Ocaml_nn5">33.1.3 The camlp4 module</a></H3>
+<H3><a name="Ocaml_nn5">28.1.3 The camlp4 module</a></H3>
 
 
 <p>
@@ -242,7 +242,7 @@ let b = C_string (getenv "PATH")
 </td></tr>
 </table>
 
-<H3><a name="Ocaml_nn6">33.1.4 Using your module</a></H3>
+<H3><a name="Ocaml_nn6">28.1.4 Using your module</a></H3>
 
 
 <p>
@@ -256,7 +256,7 @@ option to build your functions into the primitive list. This
 option is not needed when you build native code.
 </p>
 
-<H3><a name="Ocaml_nn7">33.1.5 Compilation problems and compiling with C++</a></H3>
+<H3><a name="Ocaml_nn7">28.1.5 Compilation problems and compiling with C++</a></H3>
 
 
 <p>
@@ -267,7 +267,7 @@ liberal with pointer types may not compile under the C++ compiler.
 Most code meant to be compiled as C++ will not have problems.
 </p>
 
-<H2><a name="Ocaml_nn8">33.2 The low-level Ocaml/C interface</a></H2>
+<H2><a name="Ocaml_nn8">28.2 The low-level Ocaml/C interface</a></H2>
 
 
 <p>
@@ -367,7 +367,7 @@ value items pass through directly, but you must make your own type
 signature for a function that uses value in this way.
 </p>
 
-<H3><a name="Ocaml_nn9">33.2.1 The generated module</a></H3>
+<H3><a name="Ocaml_nn9">28.2.1 The generated module</a></H3>
 
 
 <p>
@@ -401,7 +401,7 @@ it describes the output SWIG will generate for class definitions.
 </td></tr>
 </table>
 
-<H3><a name="Ocaml_nn10">33.2.2 Enums</a></H3>
+<H3><a name="Ocaml_nn10">28.2.2 Enums</a></H3>
 
 
 <p>
@@ -464,7 +464,7 @@ val x : Enum_test.c_obj = C_enum `a
 </pre>
 </div>
 
-<H4><a name="Ocaml_nn11">33.2.2.1 Enum typing in Ocaml</a></H4>
+<H4><a name="Ocaml_nn11">28.2.2.1 Enum typing in Ocaml</a></H4>
 
 
 <p>
@@ -477,10 +477,10 @@ functions imported from different modules.  You must convert values to master
 values using the swig_val function before sharing them with another module.
 </p>
 
-<H3><a name="Ocaml_nn12">33.2.3 Arrays</a></H3>
+<H3><a name="Ocaml_nn12">28.2.3 Arrays</a></H3>
 
 
-<H4><a name="Ocaml_nn13">33.2.3.1 Simple types of bounded arrays</a></H4>
+<H4><a name="Ocaml_nn13">28.2.3.1 Simple types of bounded arrays</a></H4>
 
 
 <p>
@@ -501,7 +501,7 @@ arrays of simple types with known bounds in your code, but this only works
 for arrays whose bounds are completely specified.
 </p>
 
-<H4><a name="Ocaml_nn14">33.2.3.2 Complex and unbounded arrays</a></H4>
+<H4><a name="Ocaml_nn14">28.2.3.2 Complex and unbounded arrays</a></H4>
 
 
 <p>
@@ -514,7 +514,7 @@ SWIG can't predict which of these methods will be used in the array,
 so you have to specify it for yourself in the form of a typemap.
 </p>
 
-<H4><a name="Ocaml_nn15">33.2.3.3 Using an object</a></H4>
+<H4><a name="Ocaml_nn15">28.2.3.3 Using an object</a></H4>
 
 
 <p>
@@ -528,7 +528,7 @@ Consider writing an object when the ending condition of your array is complex,
 such as using a required sentinel, etc.
 </p>
 
-<H4><a name="Ocaml_nn16">33.2.3.4 Example typemap for a function taking float * and int</a></H4>
+<H4><a name="Ocaml_nn16">28.2.3.4 Example typemap for a function taking float * and int</a></H4>
 
 
 <p>
@@ -579,7 +579,7 @@ void printfloats( float *tab, int len );
 </pre></td></tr></table>
 
 
-<H3><a name="Ocaml_nn17">33.2.4 C++ Classes</a></H3>
+<H3><a name="Ocaml_nn17">28.2.4 C++ Classes</a></H3>
 
 
 <p>
@@ -622,7 +622,7 @@ the underlying pointer, so using create_[x]_from_ptr alters the
 returned value for the same object.
 </p>
 
-<H4><a name="Ocaml_nn18">33.2.4.1 STL vector and string Example</a></H4>
+<H4><a name="Ocaml_nn18">28.2.4.1 STL vector and string Example</a></H4>
 
 
 <p>
@@ -702,7 +702,7 @@ baz
 #
 </pre></div>
 
-<H4><a name="Ocaml_nn19">33.2.4.2 C++ Class Example</a></H4>
+<H4><a name="Ocaml_nn19">28.2.4.2 C++ Class Example</a></H4>
 
 
 <p>
@@ -732,7 +732,7 @@ public:
 };
 </pre></td></tr></table>
 
-<H4><a name="Ocaml_nn20">33.2.4.3 Compiling the example</a></H4>
+<H4><a name="Ocaml_nn20">28.2.4.3 Compiling the example</a></H4>
 
 
 <div class="code"><pre>
@@ -750,7 +750,7 @@ bash-2.05a$ ocamlmktop -custom swig.cmo -I `camlp4 -where` \
   -L$QTPATH/lib -cclib -lqt
 </pre></div>
 
-<H4><a name="Ocaml_nn21">33.2.4.4 Sample Session</a></H4>
+<H4><a name="Ocaml_nn21">28.2.4.4 Sample Session</a></H4>
 
 
 <div class="code"><pre>
@@ -777,10 +777,10 @@ Assuming you have a working installation of QT, you will see a window
 containing the string "hi" in a button.
 </p>
 
-<H3><a name="Ocaml_nn22">33.2.5 Director Classes</a></H3>
+<H3><a name="Ocaml_nn22">28.2.5 Director Classes</a></H3>
 
 
-<H4><a name="Ocaml_nn23">33.2.5.1 Director Introduction</a></H4>
+<H4><a name="Ocaml_nn23">28.2.5.1 Director Introduction</a></H4>
 
 
 <p>
@@ -807,7 +807,7 @@ class foo {
 };
 </pre></div>
 
-<H4><a name="Ocaml_nn24">33.2.5.2 Overriding Methods in Ocaml</a></H4>
+<H4><a name="Ocaml_nn24">28.2.5.2 Overriding Methods in Ocaml</a></H4>
 
 
 <p>
@@ -835,7 +835,7 @@ In this example, I'll examine the objective caml code involved in providing
 an overloaded class.  This example is contained in Examples/ocaml/shapes.
 </p>
 
-<H4><a name="Ocaml_nn25">33.2.5.3 Director Usage Example</a></H4>
+<H4><a name="Ocaml_nn25">28.2.5.3 Director Usage Example</a></H4>
 
 
 <table border="1" bgcolor="#dddddd" summary="Director usage example">
@@ -896,7 +896,7 @@ in a more effortless style in ocaml, while leaving the "engine" part of the
 program in C++.
 </p>
 
-<H4><a name="Ocaml_nn26">33.2.5.4 Creating director objects</a></H4>
+<H4><a name="Ocaml_nn26">28.2.5.4 Creating director objects</a></H4>
 
 
 <p>
@@ -937,7 +937,7 @@ object from causing a core dump, as long as the object is destroyed
 properly.
 </p>
 
-<H4><a name="Ocaml_nn27">33.2.5.5 Typemaps for directors, directorin, directorout, directorargout</a></H4>
+<H4><a name="Ocaml_nn27">28.2.5.5 Typemaps for directors, directorin, directorout, directorargout</a></H4>
 
 
 <p>
@@ -948,7 +948,7 @@ well as a function return value in the same way you provide function arguments,
 and to receive arguments the same way you normally receive function returns.
 </p>
 
-<H4><a name="Ocaml_nn28">33.2.5.6 typemap</a></H4>
+<H4><a name="Ocaml_nn28">28.2.5.6 typemap</a></H4>
 
 
 <p>
@@ -959,7 +959,7 @@ code receives when you are called.  In general, a simple <tt>directorin</tt> typ
 can use the same body as a simple <tt>out</tt> typemap.
 </p>
 
-<H4><a name="Ocaml_nn29">33.2.5.7 directorout typemap</a></H4>
+<H4><a name="Ocaml_nn29">28.2.5.7 directorout typemap</a></H4>
 
 
 <p>
@@ -970,7 +970,7 @@ for the same type, except when there are special requirements for object
 ownership, etc.
 </p>
 
-<H4><a name="Ocaml_nn30">33.2.5.8 directorargout typemap</a></H4>
+<H4><a name="Ocaml_nn30">28.2.5.8 directorargout typemap</a></H4>
 
 
 <p>
@@ -987,7 +987,7 @@ In the event that you don't specify all of the necessary values, integral
 values will read zero, and struct or object returns have undefined results.
 </p>
 
-<H3><a name="Ocaml_nn31">33.2.6 Exceptions</a></H3>
+<H3><a name="Ocaml_nn31">28.2.6 Exceptions</a></H3>
 
 
 <p>
@@ -996,7 +996,7 @@ but not too useful example is provided by the throw_exception testcase in
 Examples/test-suite.  You can provide your own exceptions, too.
 </p>
 
-<H2><a name="Ocaml_nn32">33.3 Documentation Features</a></H2>
+<H2><a name="Ocaml_nn32">28.3 Documentation Features</a></H2>
 
 
 <p>
@@ -1005,7 +1005,7 @@ comments (colloquially referred to as "docstrings") that can be read by
 <a href="https://caml.inria.fr/pub/docs/manual-ocaml/ocamldoc.html">OCamldoc</a>.
 </p>
 
-<H3><a name="Ocaml_nn33">33.3.1 Module docstring</a></H3>
+<H3><a name="Ocaml_nn33">28.3.1 Module docstring</a></H3>
 
 
 <p>
diff --git a/Doc/Manual/Octave.html b/Doc/Manual/Octave.html
index 1295966bd..bd6b08ff9 100644
--- a/Doc/Manual/Octave.html
+++ b/Doc/Manual/Octave.html
@@ -9,7 +9,7 @@
 
 <body bgcolor="#ffffff">
 
-<H1><a name="Octave">34 SWIG and Octave</a></H1>
+<H1><a name="Octave">29 SWIG and Octave</a></H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -60,7 +60,7 @@ This chapter is intended to give an introduction to using the module. You should
 Also, there are a dozen or so examples in the Examples/octave directory, and hundreds in the test suite (Examples/test-suite and Examples/test-suite/octave).
 </p>
 
-<H2><a name="Octave_nn2">34.1 Preliminaries</a></H2>
+<H2><a name="Octave_nn2">29.1 Preliminaries</a></H2>
 
 
 <p>
@@ -76,7 +76,7 @@ This cannot be guaranteed however, as in recent times new Octave releases have r
 The SWIG runtime exports the function <tt>swig_octave_prereq()</tt> for checking the version of Octave.
 </p>
 
-<H2><a name="Octave_nn3">34.2 Running SWIG</a></H2>
+<H2><a name="Octave_nn3">29.2 Running SWIG</a></H2>
 
 
 <p>
@@ -108,7 +108,7 @@ The <tt>-c++</tt> option is also required when wrapping C++ code:
 This creates a C++ source file "example_wrap.cpp". A C++ file is generated even when wrapping C code as Octave is itself written in C++ and requires wrapper code to be in the same language. The generated C++ source file contains the low-level wrappers that need to be compiled and linked with the rest of your C/C++ application (in this case, the gcd implementation) to create an extension module.
 </p>
 
-<H3><a name="Octave_nn4">34.2.1 Command-line options</a></H3>
+<H3><a name="Octave_nn4">29.2.1 Command-line options</a></H3>
 
 
 <p>
@@ -131,7 +131,7 @@ The special name "." loads C global variables into the module namespace, i.e. al
 The <em>-opprefix</em> options sets the prefix of the names of global/friend <a href="#Octave_nn18">operator</a> functions.
 </p>
 
-<H3><a name="Octave_nn5">34.2.2 Compiling a dynamic module</a></H3>
+<H3><a name="Octave_nn5">29.2.2 Compiling a dynamic module</a></H3>
 
 
 <p>
@@ -158,7 +158,7 @@ $ mkoctfile example_wrap.cpp example.c
 
           <div class="targetlang"><pre>octave:1&gt; swigexample</pre></div>
 
-<H3><a name="Octave_nn6">34.2.3 Using your module</a></H3>
+<H3><a name="Octave_nn6">29.2.3 Using your module</a></H3>
 
 
 <p>
@@ -176,10 +176,10 @@ octave:4&gt; swigexample.cvar.Foo=4;
 octave:5&gt; swigexample.cvar.Foo
 ans =  4 </pre></div>
 
-<H2><a name="Octave_nn7">34.3 A tour of basic C/C++ wrapping</a></H2>
+<H2><a name="Octave_nn7">29.3 A tour of basic C/C++ wrapping</a></H2>
 
 
-<H3><a name="Octave_nn8">34.3.1 Modules</a></H3>
+<H3><a name="Octave_nn8">29.3.1 Modules</a></H3>
 
 
 <p>
@@ -224,7 +224,7 @@ octave:4&gt; swigexample.gcd(4, 6)
 ans =  2
 </pre></div>
 
-<H3><a name="Octave_nn9">34.3.2 Functions</a></H3>
+<H3><a name="Octave_nn9">29.3.2 Functions</a></H3>
 
 
 <p>
@@ -241,7 +241,7 @@ int fact(int n); </pre></div>
     <div class="targetlang"><pre>octave:1&gt; swigexample.fact(4)
 24 </pre></div>
 
-<H3><a name="Octave_nn10">34.3.3 Global variables</a></H3>
+<H3><a name="Octave_nn10">29.3.3 Global variables</a></H3>
 
 
 <p>
@@ -294,7 +294,7 @@ octave:2&gt; swigexample.PI=3.142;
 octave:3&gt; swigexample.PI
 ans =  3.1420 </pre></div>
 
-<H3><a name="Octave_nn11">34.3.4 Constants and enums</a></H3>
+<H3><a name="Octave_nn11">29.3.4 Constants and enums</a></H3>
 
 
 <p>
@@ -316,7 +316,7 @@ swigexample.SCONST="Hello World"
 swigexample.SUNDAY=0
 .... </pre></div>
 
-<H3><a name="Octave_nn12">34.3.5 Pointers</a></H3>
+<H3><a name="Octave_nn12">29.3.5 Pointers</a></H3>
 
 
 <p>
@@ -363,7 +363,7 @@ octave:2&gt; f=swigexample.fopen("not there", "r");
 error: value on right hand side of assignment is undefined
 error: evaluating assignment expression near line 2, column 2 </pre></div>
 
-<H3><a name="Octave_nn13">34.3.6 Structures and C++ classes</a></H3>
+<H3><a name="Octave_nn13">29.3.6 Structures and C++ classes</a></H3>
 
 
 <p>
@@ -498,7 +498,7 @@ ans =  1
 Depending on the ownership setting of a <tt>swig_ref</tt>, it may call C++ destructors when its reference count goes to zero. See the section on memory management below for details.
 </p>
 
-<H3><a name="Octave_nn15">34.3.7 C++ inheritance</a></H3>
+<H3><a name="Octave_nn15">29.3.7 C++ inheritance</a></H3>
 
 
 <p>
@@ -507,7 +507,7 @@ This information contains the full class hierarchy. When an indexing operation (
 the tree is walked to find a match in the current class as well as any of its bases. The lookup is then cached in the <tt>swig_ref</tt>.
 </p>
 
-<H3><a name="Octave_nn17">34.3.8 C++ overloaded functions</a></H3>
+<H3><a name="Octave_nn17">29.3.8 C++ overloaded functions</a></H3>
 
 
 <p>
@@ -517,7 +517,7 @@ The dispatch function selects which overload to call (if any) based on the passe
 <tt>typecheck</tt> typemaps are used to analyze each argument, as well as assign precedence. See the chapter on typemaps for details.
 </p>
 
-<H3><a name="Octave_nn18">34.3.9 C++ operators</a></H3>
+<H3><a name="Octave_nn18">29.3.9 C++ operators</a></H3>
 
 
 <p>
@@ -621,7 +621,7 @@ On the C++ side, the default mappings are as follows:
 Octave can also utilise friend (i.e. non-member) operators with a simple %rename: see the example in the Examples/octave/operator directory.
 </p>
 
-<H3><a name="Octave_nn19">34.3.10 Class extension with %extend</a></H3>
+<H3><a name="Octave_nn19">29.3.10 Class extension with %extend</a></H3>
 
 
 <p>
@@ -660,7 +660,7 @@ Similarly, Octave can use the <tt>__float__</tt> method to convert an object to
 Octave 3.8.0 and later versions will also map unary functions X() to the corresponding <tt>__X__</tt> method, where X includes: abs(), acos(), acosh(), angle(), arg(), asin(), asinh(), atan(), atanh(), cbrt(), ceil(), conj(), cos(), cosh(), dawson(), erf(), erfc(), erfcinv(), erfcx(), erfi(), erfinv(), exp(), expm1(), finite(), fix(), floor(), gamma(), imag(), isalnum(), isalpha(), isascii(), iscntrl(), isdigit(), isgraph(), isinf(), islower(), isna(), isnan(), isprint(), ispunct(), isspace(), isupper(), isxdigit(), lgamma(), log(), log10(), log1p(), log2(), real(), round(), roundb(), signbit(), signum(), sin(), sinh(), sqrt(), tan(), tanh(), toascii(), tolower(), toupper()
 </p>
 
-<H3><a name="Octave_nn20">34.3.11 C++ templates</a></H3>
+<H3><a name="Octave_nn20">29.3.11 C++ templates</a></H3>
 
 
 <p>
@@ -737,10 +737,10 @@ ans =
 </pre></div>
 
 
-<H3><a name="Octave_nn21">34.3.12 C++ Smart Pointers</a></H3>
+<H3><a name="Octave_nn21">29.3.12 C++ Smart Pointers</a></H3>
 
 
-<H4><a name="Octave_smart_pointers_shared_ptr">34.3.12.1 The shared_ptr Smart Pointer</a></H4>
+<H4><a name="Octave_smart_pointers_shared_ptr">29.3.12.1 The shared_ptr Smart Pointer</a></H4>
 
 
 <p>
@@ -751,14 +751,14 @@ in the <a href="Library.html#Library_std_shared_ptr">shared_ptr smart pointer</a
 </p>
 
 
-<H4><a name="Octave_smart_pointers_generic">34.3.12.2 Generic Smart Pointers</a></H4>
+<H4><a name="Octave_smart_pointers_generic">29.3.12.2 Generic Smart Pointers</a></H4>
 
 
 <p>
 C++ smart pointers are fully supported as in other modules.
 </p>
 
-<H3><a name="Octave_nn22">34.3.13 Directors (calling Octave from C++ code)</a></H3>
+<H3><a name="Octave_nn22">29.3.13 Directors (calling Octave from C++ code)</a></H3>
 
 
 <p>
@@ -839,14 +839,14 @@ c-side routine called
 octave-side routine called
 </pre></div>
 
-<H3><a name="Octave_nn23">34.3.14 Threads</a></H3>
+<H3><a name="Octave_nn23">29.3.14 Threads</a></H3>
 
 
 <p>
 The use of threads in wrapped Director code is not supported; i.e., an Octave-side implementation of a C++ class must be called from the Octave interpreter's thread. Anything fancier (apartment/queue model, whatever) is left to the user. Without anything fancier, this amounts to the limitation that Octave must drive the module... like, for example, an optimization package that calls Octave to evaluate an objective function.
 </p>
 
-<H3><a name="Octave_nn24">34.3.15 Memory management</a></H3>
+<H3><a name="Octave_nn24">29.3.15 Memory management</a></H3>
 
 
 <p>
@@ -880,14 +880,14 @@ The %newobject directive may be used to control this behavior for pointers retur
 In the case where one wishes for the C++ side to own an object that was created in Octave (especially a Director object), one can use the __disown() method to invert this logic. Then letting the Octave reference count go to zero will not destroy the object, but destroying the object will invalidate the Octave-side object if it still exists (and call destructors of other C++ bases in the case of multiple inheritance/<tt>subclass()</tt>'ing).
 </p>
 
-<H3><a name="Octave_nn25">34.3.16 STL support</a></H3>
+<H3><a name="Octave_nn25">29.3.16 STL support</a></H3>
 
 
 <p>
 Various STL library files are provided for wrapping STL containers.
 </p>
 
-<H3><a name="Octave_nn26">34.3.17 Matrix typemaps</a></H3>
+<H3><a name="Octave_nn26">29.3.17 Matrix typemaps</a></H3>
 
 
 <p>
diff --git a/Doc/Manual/Perl5.html b/Doc/Manual/Perl5.html
index a3efdf609..f3ba75572 100644
--- a/Doc/Manual/Perl5.html
+++ b/Doc/Manual/Perl5.html
@@ -7,7 +7,7 @@
 </head>
 
 <body bgcolor="#ffffff">
-<H1><a name="Perl5">35 SWIG and Perl5</a></H1>
+<H1><a name="Perl5">30 SWIG and Perl5</a></H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -97,7 +97,7 @@ later. We're no longer testing regularly with older versions, but
 Perl 5.6 seems to mostly work, while older versions don't.
 </p>
 
-<H2><a name="Perl5_nn2">35.1 Overview</a></H2>
+<H2><a name="Perl5_nn2">30.1 Overview</a></H2>
 
 
 <p>
@@ -118,7 +118,7 @@ described.  Advanced customization features, typemaps, and other
 options are found near the end of the chapter.
 </p>
 
-<H2><a name="Perl5_nn3">35.2 Preliminaries</a></H2>
+<H2><a name="Perl5_nn3">30.2 Preliminaries</a></H2>
 
 
 <p>
@@ -143,7 +143,7 @@ To build the module, you will need to compile the file
 <tt>example_wrap.c</tt> and link it with the rest of your program.
 </p>
 
-<H3><a name="Perl5_nn4">35.2.1 Getting the right header files</a></H3>
+<H3><a name="Perl5_nn4">30.2.1 Getting the right header files</a></H3>
 
 
 <p>
@@ -175,7 +175,7 @@ $ perl -e 'use Config; print "$Config{archlib}\n";'
 </pre>
 </div>
 
-<H3><a name="Perl5_nn5">35.2.2 Compiling a dynamic module</a></H3>
+<H3><a name="Perl5_nn5">30.2.2 Compiling a dynamic module</a></H3>
 
 
 <p>
@@ -208,7 +208,7 @@ the target should be named `<tt>example.so</tt>',
 `<tt>example.sl</tt>', or the appropriate dynamic module name on your system.
 </p>
 
-<H3><a name="Perl5_nn6">35.2.3 Building a dynamic module with MakeMaker</a></H3>
+<H3><a name="Perl5_nn6">30.2.3 Building a dynamic module with MakeMaker</a></H3>
 
 
 <p>
@@ -242,7 +242,7 @@ the preferred approach to compilation.  More information about MakeMaker can be
 found in "Programming Perl, 2nd ed." by Larry Wall, Tom Christiansen,
 and Randal Schwartz.</p>
 
-<H3><a name="Perl5_nn7">35.2.4 Building a static version of Perl</a></H3>
+<H3><a name="Perl5_nn7">30.2.4 Building a static version of Perl</a></H3>
 
 
 <p>
@@ -311,7 +311,7 @@ added to it.  Depending on your machine, you may need to link with
 additional libraries such as <tt>-lsocket, -lnsl, -ldl</tt>, etc.
 </p>
 
-<H3><a name="Perl5_nn8">35.2.5 Using the module</a></H3>
+<H3><a name="Perl5_nn8">30.2.5 Using the module</a></H3>
 
 
 <p>
@@ -464,7 +464,7 @@ system configuration (this requires root access and you will need to
 read the man pages).
 </p>
 
-<H3><a name="Perl5_nn9">35.2.6 Compilation problems and compiling with C++</a></H3>
+<H3><a name="Perl5_nn9">30.2.6 Compilation problems and compiling with C++</a></H3>
 
 
 <p>
@@ -607,7 +607,7 @@ have to find the macro that conflicts and add an #undef into the .i file.  Pleas
 any conflicting macros you find to <a href="http://www.swig.org/mail.html">swig-user mailing list</a>.
 </p>
 
-<H3><a name="Perl5_nn10">35.2.7 Compiling for 64-bit platforms</a></H3>
+<H3><a name="Perl5_nn10">30.2.7 Compiling for 64-bit platforms</a></H3>
 
 
 <p>
@@ -634,7 +634,7 @@ also introduce problems on platforms that support more than one
 linking standard (e.g., -o32 and -n32 on Irix).
 </p>
 
-<H2><a name="Perl5_nn11">35.3 Building Perl Extensions under Windows</a></H2>
+<H2><a name="Perl5_nn11">30.3 Building Perl Extensions under Windows</a></H2>
 
 
 <p>
@@ -645,7 +645,7 @@ section assumes you are using SWIG with Microsoft Visual C++
 although the procedure may be similar with other compilers.  
 </p>
 
-<H3><a name="Perl5_nn12">35.3.1 Running SWIG from Developer Studio</a></H3>
+<H3><a name="Perl5_nn12">30.3.1 Running SWIG from Developer Studio</a></H3>
 
 
 <p>
@@ -708,7 +708,7 @@ print "$a\n";
 
 </pre></div>
 
-<H3><a name="Perl5_nn13">35.3.2 Using other compilers</a></H3>
+<H3><a name="Perl5_nn13">30.3.2 Using other compilers</a></H3>
 
 
 <p>
@@ -716,7 +716,7 @@ SWIG is known to work with Cygwin and may work with other compilers on Windows.
 For general hints and suggestions refer to the <a href="Windows.html#Windows">Windows</a> chapter.
 </p>
 
-<H2><a name="Perl5_nn14">35.4 The low-level interface</a></H2>
+<H2><a name="Perl5_nn14">30.4 The low-level interface</a></H2>
 
 
 <p>
@@ -726,7 +726,7 @@ can be used to control your application.  However, it is also used to
 construct more user-friendly proxy classes as described in the next section.
 </p>
 
-<H3><a name="Perl5_nn15">35.4.1 Functions</a></H3>
+<H3><a name="Perl5_nn15">30.4.1 Functions</a></H3>
 
 
 <p>
@@ -749,7 +749,7 @@ use example;
 $a = &amp;example::fact(2);
 </pre></div>
 
-<H3><a name="Perl5_nn16">35.4.2 Global variables</a></H3>
+<H3><a name="Perl5_nn16">30.4.2 Global variables</a></H3>
 
 
 <p>
@@ -819,7 +819,7 @@ extern char *path;       // Declared later in the input
 </pre>
 </div>
 
-<H3><a name="Perl5_nn17">35.4.3 Constants</a></H3>
+<H3><a name="Perl5_nn17">30.4.3 Constants</a></H3>
 
 
 <p>
@@ -859,7 +859,7 @@ print example::FOO, "\n";
 </pre>
 </div>
 
-<H3><a name="Perl5_nn18">35.4.4 Pointers</a></H3>
+<H3><a name="Perl5_nn18">30.4.4 Pointers</a></H3>
 
 
 <p>
@@ -968,7 +968,7 @@ as XS and <tt>xsubpp</tt>.  Given the advancement of the SWIG typesystem and the
 SWIG and XS, this is no longer supported.
 </p>
 
-<H3><a name="Perl5_nn19">35.4.5 Structures</a></H3>
+<H3><a name="Perl5_nn19">30.4.5 Structures</a></H3>
 
 
 <p>
@@ -1102,7 +1102,7 @@ void Bar_f_set(Bar *b, Foo *val) {
 </div>
 
 
-<H3><a name="Perl5_nn20">35.4.6 C++ classes</a></H3>
+<H3><a name="Perl5_nn20">30.4.6 C++ classes</a></H3>
 
 
 <p>
@@ -1167,7 +1167,7 @@ provides direct access to C++ objects.  A higher level interface using Perl prox
 can be built using these low-level accessors.  This is described shortly.
 </p>
 
-<H3><a name="Perl5_nn21">35.4.7 C++ classes and type-checking</a></H3>
+<H3><a name="Perl5_nn21">30.4.7 C++ classes and type-checking</a></H3>
 
 
 <p>
@@ -1203,7 +1203,7 @@ If necessary, the type-checker also adjusts the value of the pointer (as is nece
 multiple inheritance is used).
 </p>
 
-<H3><a name="Perl5_nn22">35.4.8 C++ overloaded functions</a></H3>
+<H3><a name="Perl5_nn22">30.4.8 C++ overloaded functions</a></H3>
 
 
 <p>
@@ -1247,7 +1247,7 @@ example::Spam_foo_d($s, 3.14);
 Please refer to the "SWIG Basics" chapter for more information. 
 </p>
 
-<H3><a name="Perl5_nn23">35.4.9 Operators</a></H3>
+<H3><a name="Perl5_nn23">30.4.9 Operators</a></H3>
 
 
     <p>
@@ -1274,7 +1274,7 @@ The following C++ operators are currently supported by the Perl module:
 <li>operator or  </li>
     </ul>
 
-<H3><a name="Perl5_nn24">35.4.10 Modules and packages</a></H3>
+<H3><a name="Perl5_nn24">30.4.10 Modules and packages</a></H3>
 
 
 <p>
@@ -1369,7 +1369,7 @@ print Foo::fact(4), "\n";        # Call a function in package FooBar
 </pre></div>
 -->
 
-<H2><a name="Perl5_nn25">35.5 Input and output parameters</a></H2>
+<H2><a name="Perl5_nn25">30.5 Input and output parameters</a></H2>
 
 
 <p>
@@ -1588,7 +1588,7 @@ print "$c\n";
 <b>Note:</b> The <tt>REFERENCE</tt> feature is only currently supported for numeric types (integers and floating point).
 </p>
 
-<H2><a name="Perl5_nn26">35.6 Exception handling</a></H2>
+<H2><a name="Perl5_nn26">30.6 Exception handling</a></H2>
 
 
 <p>
@@ -1752,7 +1752,7 @@ This is still supported, but it is deprecated.  The newer <tt>%exception</tt> di
 functionality, but it has additional capabilities that make it more powerful.
 </p>
 
-<H2><a name="Perl5_nn27">35.7 Remapping datatypes with typemaps</a></H2>
+<H2><a name="Perl5_nn27">30.7 Remapping datatypes with typemaps</a></H2>
 
 
 <p>
@@ -1769,7 +1769,7 @@ Typemaps are only used if you want to change some aspect of the primitive
 C-Perl interface.
 </p>
 
-<H3><a name="Perl5_nn28">35.7.1 A simple typemap example</a></H3>
+<H3><a name="Perl5_nn28">30.7.1 A simple typemap example</a></H3>
 
 
 <p>
@@ -1873,7 +1873,7 @@ example::count("e", "Hello World");
 </div>
 
 
-<H3><a name="Perl5_nn29">35.7.2 Perl5 typemaps</a></H3>
+<H3><a name="Perl5_nn29">30.7.2 Perl5 typemaps</a></H3>
 
 
 <p>
@@ -1978,7 +1978,7 @@ Return of C++ member data (all languages).
 Check value of input parameter.
 </div>
 
-<H3><a name="Perl5_nn30">35.7.3 Typemap variables</a></H3>
+<H3><a name="Perl5_nn30">30.7.3 Typemap variables</a></H3>
 
 
 <p>
@@ -2049,7 +2049,7 @@ properly assigned.
 The Perl name of the wrapper function being created.
 </div>
 
-<H3><a name="Perl5_nn31">35.7.4 Useful functions</a></H3>
+<H3><a name="Perl5_nn31">30.7.4 Useful functions</a></H3>
 
 
 <p>
@@ -2118,7 +2118,7 @@ int       sv_isa(SV *, char *0;
 </div>
 
 
-<H2><a name="Perl5_nn32">35.8 Typemap Examples</a></H2>
+<H2><a name="Perl5_nn32">30.8 Typemap Examples</a></H2>
 
 
 <p>
@@ -2127,7 +2127,7 @@ might look at the files "<tt>perl5.swg</tt>" and "<tt>typemaps.i</tt>" in
 the SWIG library.
 </p>
 
-<H3><a name="Perl5_nn33">35.8.1 Converting a Perl5 array to a char **</a></H3>
+<H3><a name="Perl5_nn33">30.8.1 Converting a Perl5 array to a char **</a></H3>
 
 
 <p>
@@ -2219,7 +2219,7 @@ print @$b, "\n";                                 # Print it out
 </pre></div>
 
 
-<H3><a name="Perl5_nn34">35.8.2 Return values</a></H3>
+<H3><a name="Perl5_nn34">30.8.2 Return values</a></H3>
 
 
 <p>
@@ -2248,7 +2248,7 @@ can be done using the <tt>EXTEND()</tt> macro as in:
 }
 </pre></div>
 
-<H3><a name="Perl5_nn35">35.8.3 Returning values from arguments</a></H3>
+<H3><a name="Perl5_nn35">30.8.3 Returning values from arguments</a></H3>
 
 
 <p>
@@ -2302,7 +2302,7 @@ print "multout(7, 13) = @r\n";
 ($x, $y) = multout(7, 13);
 </pre></div>
 
-<H3><a name="Perl5_nn36">35.8.4 Accessing array structure members</a></H3>
+<H3><a name="Perl5_nn36">30.8.4 Accessing array structure members</a></H3>
 
 
 <p>
@@ -2365,7 +2365,7 @@ the "in" typemap in the previous section would be used to convert an
 to copy the converted array into a C data structure.
 </p>
 
-<H3><a name="Perl5_nn37">35.8.5 Turning Perl references into C pointers</a></H3>
+<H3><a name="Perl5_nn37">30.8.5 Turning Perl references into C pointers</a></H3>
 
 
 <p>
@@ -2430,7 +2430,7 @@ print "$c\n";
 
 </pre></div>
 
-<H3><a name="Perl5_nn38">35.8.6 Pointer handling</a></H3>
+<H3><a name="Perl5_nn38">30.8.6 Pointer handling</a></H3>
 
 
 <p>
@@ -2515,7 +2515,7 @@ For example:
 </pre>
 </div>
 
-<H2><a name="Perl5_nn39">35.9 Proxy classes</a></H2>
+<H2><a name="Perl5_nn39">30.9 Proxy classes</a></H2>
 
 
 <p>
@@ -2531,7 +2531,7 @@ to the underlying code.  This section describes the implementation
 details of the proxy interface.
 </p>
 
-<H3><a name="Perl5_nn40">35.9.1 Preliminaries</a></H3>
+<H3><a name="Perl5_nn40">30.9.1 Preliminaries</a></H3>
 
 
 <p>
@@ -2553,7 +2553,7 @@ SWIG creates a collection of high-level Perl wrappers.  In your scripts, you wil
 high level wrappers.  The wrappers, in turn, interact with the low-level procedural module.
 </p>
 
-<H3><a name="Perl5_nn41">35.9.2 Structure and class wrappers</a></H3>
+<H3><a name="Perl5_nn41">30.9.2 Structure and class wrappers</a></H3>
 
 
 <p>
@@ -2680,7 +2680,7 @@ $v-&gt;DESTROY();
 
 </pre></div>
 
-<H3><a name="Perl5_nn42">35.9.3 Object Ownership</a></H3>
+<H3><a name="Perl5_nn42">30.9.3 Object Ownership</a></H3>
 
 
 <p>
@@ -2767,7 +2767,7 @@ counting, garbage collection, or advanced features one might find in
 sophisticated languages.
 </p>
 
-<H3><a name="Perl5_nn43">35.9.4 Nested Objects</a></H3>
+<H3><a name="Perl5_nn43">30.9.4 Nested Objects</a></H3>
 
 
 <p>
@@ -2820,7 +2820,7 @@ $p-&gt;{f}-&gt;{x} = 0.0;
 %${$p-&gt;{v}} = ( x=&gt;0, y=&gt;0, z=&gt;0);         
 </pre></div>
 
-<H3><a name="Perl5_nn44">35.9.5 Proxy Functions</a></H3>
+<H3><a name="Perl5_nn44">30.9.5 Proxy Functions</a></H3>
 
 
 <p>
@@ -2854,7 +2854,7 @@ This function replaces the original function, but operates in an
 identical manner.
 </p>
 
-<H3><a name="Perl5_nn45">35.9.6 Inheritance</a></H3>
+<H3><a name="Perl5_nn45">30.9.6 Inheritance</a></H3>
 
 
 <p>
@@ -2930,7 +2930,7 @@ particular, inheritance of data members is extremely tricky (and I'm
 not even sure if it really works).
 </p>
 
-<H3><a name="Perl5_nn46">35.9.7 Modifying the proxy methods</a></H3>
+<H3><a name="Perl5_nn46">30.9.7 Modifying the proxy methods</a></H3>
 
 
 <p>
@@ -2958,7 +2958,7 @@ public:
 };
 </pre></div>
 
-<H2><a name="Perl5_nn47">35.10 Adding additional Perl code</a></H2>
+<H2><a name="Perl5_nn47">30.10 Adding additional Perl code</a></H2>
 
 
 <p>
@@ -3009,7 +3009,7 @@ set_transform($im, $a);
 </pre>
 </div>
 
-<H2><a name="Perl5_directors">35.11 Cross language polymorphism</a></H2>
+<H2><a name="Perl5_directors">30.11 Cross language polymorphism</a></H2>
 
 
 <p>
@@ -3043,7 +3043,7 @@ proxy classes, director classes, and C wrapper functions takes care of
 all the cross-language method routing transparently.
 </p>
 
-<H3><a name="Perl5_nn48">35.11.1 Enabling directors</a></H3>
+<H3><a name="Perl5_nn48">30.11.1 Enabling directors</a></H3>
 
 
 <p>
@@ -3133,7 +3133,7 @@ sub one {
 </div>
 
 
-<H3><a name="Perl5_nn49">35.11.2 Director classes</a></H3>
+<H3><a name="Perl5_nn49">30.11.2 Director classes</a></H3>
 
 
  
@@ -3213,7 +3213,7 @@ so there is no need for the extra overhead involved with routing the
 calls through Perl.
 </p>
 
-<H3><a name="Perl5_nn50">35.11.3 Ownership and object destruction</a></H3>
+<H3><a name="Perl5_nn50">30.11.3 Ownership and object destruction</a></H3>
 
 
 <p>
@@ -3262,7 +3262,7 @@ sub DESTROY {
 </div>
 
 
-<H3><a name="Perl5_nn51">35.11.4 Exception unrolling</a></H3>
+<H3><a name="Perl5_nn51">30.11.4 Exception unrolling</a></H3>
 
 
 <p>
@@ -3318,7 +3318,7 @@ Swig::DirectorMethodException is thrown, Perl will register the
 exception as soon as the C wrapper function returns.
 </p>
 
-<H3><a name="Perl5_nn52">35.11.5 Overhead and code bloat</a></H3>
+<H3><a name="Perl5_nn52">30.11.5 Overhead and code bloat</a></H3>
 
 
 <p>
@@ -3352,7 +3352,7 @@ directive) for only those methods that are likely to be extended in
 Perl.
 </p>
 
-<H3><a name="Perl5_nn53">35.11.6 Typemaps</a></H3>
+<H3><a name="Perl5_nn53">30.11.6 Typemaps</a></H3>
 
 
 <p>
diff --git a/Doc/Manual/Php.html b/Doc/Manual/Php.html
index f224f19fb..85732fd33 100644
--- a/Doc/Manual/Php.html
+++ b/Doc/Manual/Php.html
@@ -7,7 +7,7 @@
 </head>
 
 <body bgcolor="#ffffff">
-<H1><a name="Php">36 SWIG and PHP</a></H1>
+<H1><a name="Php">31 SWIG and PHP</a></H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -70,7 +70,7 @@ your extension into php directly, you will need the complete PHP source tree
 available.
 </p>
 
-<H2><a name="Php_nn1">36.1 Generating PHP Extensions</a></H2>
+<H2><a name="Php_nn1">31.1 Generating PHP Extensions</a></H2>
 
 
 <p>
@@ -119,7 +119,7 @@ and it doesn't play nicely with package system.  We don't recommend
 this approach, or provide explicit support for it.
 </p>
 
-<H3><a name="Php_nn1_1">36.1.1 Building a loadable extension</a></H3>
+<H3><a name="Php_nn1_1">31.1.1 Building a loadable extension</a></H3>
 
 
 <p>
@@ -134,7 +134,7 @@ least work for Linux though):
         gcc -shared example_wrap.o example.o -o example.so
 </pre></div>
 
-<H3><a name="Php_nn1_3">36.1.2 Using PHP Extensions</a></H3>
+<H3><a name="Php_nn1_3">31.1.2 Using PHP Extensions</a></H3>
 
 
 <p>
@@ -182,7 +182,7 @@ This PHP module also defines the PHP classes for the wrapped API, so you'll
 almost certainly want to include it anyway.
 </p>
 
-<H2><a name="Php_nn2">36.2 Basic PHP interface</a></H2>
+<H2><a name="Php_nn2">31.2 Basic PHP interface</a></H2>
 
 
 <p>
@@ -194,7 +194,7 @@ SWIG doesn't have support for generating wrappers which make use of PHP's
 namespace feature.
 </p>
 
-<H3><a name="Php_nn2_1">36.2.1 Constants</a></H3>
+<H3><a name="Php_nn2_1">31.2.1 Constants</a></H3>
 
 
 <p>
@@ -272,7 +272,7 @@ would be treated as false!  Modern versions of PHP will at least issue
 a PHP notice by default when this happens.
 </p>
 
-<H3><a name="Php_nn2_2">36.2.2 Global Variables</a></H3>
+<H3><a name="Php_nn2_2">31.2.2 Global Variables</a></H3>
 
 
 <p>
@@ -321,7 +321,7 @@ undefined.
 At this time SWIG does not support custom accessor methods.
 </p>
 
-<H3><a name="Php_nn2_3">36.2.3 Functions</a></H3>
+<H3><a name="Php_nn2_3">31.2.3 Functions</a></H3>
 
 
 <p>
@@ -374,7 +374,7 @@ print $s;      # The value of $s was not changed.
 -->
 
 
-<H3><a name="Php_nn2_4">36.2.4 Overloading</a></H3>
+<H3><a name="Php_nn2_4">31.2.4 Overloading</a></H3>
 
 
 <p>
@@ -429,7 +429,7 @@ taking the integer argument.
 </p>
 -->
 
-<H3><a name="Php_nn2_5">36.2.5 Pointers and References</a></H3>
+<H3><a name="Php_nn2_5">31.2.5 Pointers and References</a></H3>
 
 
 <p>
@@ -567,7 +567,7 @@ PHP in a number of ways: by using <tt>unset</tt> on an existing
 variable, or assigning <tt>NULL</tt> to a variable.
 </p>
 
-<H3><a name="Php_nn2_6">36.2.6 Structures and C++ classes</a></H3>
+<H3><a name="Php_nn2_6">31.2.6 Structures and C++ classes</a></H3>
 
 
 <p>
@@ -628,7 +628,7 @@ Would be used in the following way from PHP:
 Member variables and methods are accessed using the <tt>-&gt;</tt> operator.
 </p>
 
-<H4><a name="Php_nn2_6_1">36.2.6.1 Using -noproxy</a></H4>
+<H4><a name="Php_nn2_6_1">31.2.6.1 Using -noproxy</a></H4>
 
 
 <p>
@@ -654,7 +654,7 @@ Complex_im_set($obj, $d);
 Complex_im_get($obj);
 </pre></div>
 
-<H4><a name="Php_nn2_6_2">36.2.6.2 Constructors and Destructors</a></H4>
+<H4><a name="Php_nn2_6_2">31.2.6.2 Constructors and Destructors</a></H4>
 
 
 <p>
@@ -695,7 +695,7 @@ the programmer can either reassign the variable or call
 <tt>unset($v)</tt>
 </p>
 
-<H4><a name="Php_nn2_6_3">36.2.6.3 Static Member Variables</a></H4>
+<H4><a name="Php_nn2_6_3">31.2.6.3 Static Member Variables</a></H4>
 
 
 <p>
@@ -738,7 +738,7 @@ Ko::threats(10);
 echo "There have now been " . Ko::threats() . " threats\n";
 
 </pre></div>
-<H4><a name="Php_nn2_6_4">36.2.6.4 Static Member Functions</a></H4>
+<H4><a name="Php_nn2_6_4">31.2.6.4 Static Member Functions</a></H4>
 
 
 <p>
@@ -760,7 +760,7 @@ Ko::threats();
 </pre></div>
 
 
-<H4><a name="Php_nn2_6_5">36.2.6.5 Specifying Implemented Interfaces</a></H4>
+<H4><a name="Php_nn2_6_5">31.2.6.5 Specifying Implemented Interfaces</a></H4>
 
 
 <p>
@@ -778,7 +778,7 @@ so:
 If there are multiple interfaces, just list them separated by commas.
 </p>
 
-<H3><a name="Php_nn2_7">36.2.7 PHP Pragmas, Startup and Shutdown code</a></H3>
+<H3><a name="Php_nn2_7">31.2.7 PHP Pragmas, Startup and Shutdown code</a></H3>
 
 
 <p>
@@ -875,7 +875,7 @@ The <tt>%rinit</tt> and <tt>%rshutdown</tt> statements are very similar but inse
 into the request init (PHP_RINIT_FUNCTION) and request shutdown (PHP_RSHUTDOWN_FUNCTION) code respectively.
 </p>
 
-<H2><a name="Php_nn3">36.3 Cross language polymorphism</a></H2>
+<H2><a name="Php_nn3">31.3 Cross language polymorphism</a></H2>
 
 
 <p>
@@ -910,7 +910,7 @@ wrapper functions takes care of all the cross-language method routing
 transparently.
 </p>
 
-<H3><a name="Php_nn3_1">36.3.1 Enabling directors</a></H3>
+<H3><a name="Php_nn3_1">31.3.1 Enabling directors</a></H3>
 
 
 <p>
@@ -999,7 +999,7 @@ class MyFoo extends Foo {
 </div>
 
 
-<H3><a name="Php_nn3_2">36.3.2 Director classes</a></H3>
+<H3><a name="Php_nn3_2">31.3.2 Director classes</a></H3>
 
 
  
@@ -1079,7 +1079,7 @@ so there is no need for the extra overhead involved with routing the
 calls through PHP.
 </p>
 
-<H3><a name="Php_nn3_3">36.3.3 Ownership and object destruction</a></H3>
+<H3><a name="Php_nn3_3">31.3.3 Ownership and object destruction</a></H3>
 
 
 <p>
@@ -1135,7 +1135,7 @@ In this example, we are assuming that FooContainer will take care of
 deleting all the Foo pointers it contains at some point.
 </p>
 
-<H3><a name="Php_nn3_4">36.3.4 Exception unrolling</a></H3>
+<H3><a name="Php_nn3_4">31.3.4 Exception unrolling</a></H3>
 
 
 <p>
@@ -1202,7 +1202,7 @@ Swig::DirectorMethodException is thrown, PHP will register the exception
 as soon as the C wrapper function returns.
 </p>
 
-<H3><a name="Php_nn3_5">36.3.5 Overhead and code bloat</a></H3>
+<H3><a name="Php_nn3_5">31.3.5 Overhead and code bloat</a></H3>
 
 
 <p>
@@ -1235,7 +1235,7 @@ optimized by selectively enabling director methods (using the %feature
 directive) for only those methods that are likely to be extended in PHP.
 </p>
 
-<H3><a name="Php_nn3_6">36.3.6 Typemaps</a></H3>
+<H3><a name="Php_nn3_6">31.3.6 Typemaps</a></H3>
 
 
 <p>
@@ -1249,7 +1249,7 @@ need to be supported.
 </p>
 
 
-<H3><a name="Php_nn3_7">36.3.7 Miscellaneous</a></H3>
+<H3><a name="Php_nn3_7">31.3.7 Miscellaneous</a></H3>
 
 
 <p> Director typemaps for STL classes are mostly in place, and hence you
diff --git a/Doc/Manual/Python.html b/Doc/Manual/Python.html
index e94d9d9cb..9d5d2a307 100644
--- a/Doc/Manual/Python.html
+++ b/Doc/Manual/Python.html
@@ -7,7 +7,7 @@
 </head>
 
 <body bgcolor="#ffffff">
-<H1><a name="Python">38 SWIG and Python</a></H1>
+<H1><a name="Python">32 SWIG and Python</a></H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -168,7 +168,7 @@ very least, make sure you read the "<a href="SWIG.html#SWIG">SWIG
 Basics</a>" chapter.
 </p>
 
-<H2><a name="Python_nn2">38.1 Overview</a></H2>
+<H2><a name="Python_nn2">32.1 Overview</a></H2>
 
 
 <p>
@@ -195,10 +195,10 @@ described followed by a discussion of low-level implementation
 details.
 </p>
 
-<H2><a name="Python_nn3">38.2 Preliminaries</a></H2>
+<H2><a name="Python_nn3">32.2 Preliminaries</a></H2>
 
 
-<H3><a name="Python_nn4">38.2.1 Running SWIG</a></H3>
+<H3><a name="Python_nn4">32.2.1 Running SWIG</a></H3>
 
 
 <p>
@@ -295,7 +295,7 @@ The following sections have further practical examples and details on
 how you might go about compiling and using the generated files.
 </p>
 
-<H3><a name="Python_nn6">38.2.2 Using distutils</a></H3>
+<H3><a name="Python_nn6">32.2.2 Using distutils</a></H3>
 
 
 <p>
@@ -387,7 +387,7 @@ This same approach works on all platforms if the appropriate compiler is install
 can even build extensions to the standard Windows Python using MingGW)
 </p>
 
-<H3><a name="Python_nn7">38.2.3 Hand compiling a dynamic module</a></H3>
+<H3><a name="Python_nn7">32.2.3 Hand compiling a dynamic module</a></H3>
 
 
 <p>
@@ -435,7 +435,7 @@ module actually consists of two files; <tt>socket.py</tt> and
 </p>
 
 
-<H3><a name="Python_nn8">38.2.4 Static linking</a></H3>
+<H3><a name="Python_nn8">32.2.4 Static linking</a></H3>
 
 
 <p>
@@ -514,7 +514,7 @@ If using static linking, you might want to rely on a different approach
 (perhaps using distutils).
 </p>
 
-<H3><a name="Python_nn9">38.2.5 Using your module</a></H3>
+<H3><a name="Python_nn9">32.2.5 Using your module</a></H3>
 
 
 <p>
@@ -671,7 +671,7 @@ system configuration (this requires root access and you will need to
 read the man pages).
 </p>
 
-<H3><a name="Python_nn10">38.2.6 Compilation of C++ extensions</a></H3>
+<H3><a name="Python_nn10">32.2.6 Compilation of C++ extensions</a></H3>
 
 
 <p>
@@ -763,7 +763,7 @@ erratic program behavior.   If working with lots of software components, you
 might want to investigate using a more formal standard such as COM.
 </p>
 
-<H3><a name="Python_nn11">38.2.7 Compiling for 64-bit platforms</a></H3>
+<H3><a name="Python_nn11">32.2.7 Compiling for 64-bit platforms</a></H3>
 
 
 <p>
@@ -800,7 +800,7 @@ and -m64 allow you to choose the desired binary format for your Python
 extension.
 </p>
 
-<H3><a name="Python_nn12">38.2.8 Building Python extensions under Windows</a></H3>
+<H3><a name="Python_nn12">32.2.8 Building Python extensions under Windows</a></H3>
 
 
 <p>
@@ -930,7 +930,7 @@ SWIG Wiki</a>.
 </p>
 
 
-<H3><a name="Python_commandline">38.2.9 Additional Python commandline options</a></H3>
+<H3><a name="Python_commandline">32.2.9 Additional Python commandline options</a></H3>
 
 
 <p>
@@ -974,7 +974,7 @@ swig -python -help
 Many of these options are covered later on and their use should become clearer by the time you have finished reading this section on SWIG and Python.
 </p>
 
-<H2><a name="Python_nn13">38.3 A tour of basic C/C++ wrapping</a></H2>
+<H2><a name="Python_nn13">32.3 A tour of basic C/C++ wrapping</a></H2>
 
 
 <p>
@@ -983,7 +983,7 @@ to your C/C++ code.  Functions are wrapped as functions, classes are wrapped as
 This section briefly covers the essential aspects of this wrapping.
 </p>
 
-<H3><a name="Python_nn14">38.3.1 Modules</a></H3>
+<H3><a name="Python_nn14">32.3.1 Modules</a></H3>
 
 
 <p>
@@ -996,7 +996,7 @@ module name, make sure you don't use the same name as a built-in
 Python command or standard module name.
 </p>
 
-<H3><a name="Python_nn15">38.3.2 Functions</a></H3>
+<H3><a name="Python_nn15">32.3.2 Functions</a></H3>
 
 
 <p>
@@ -1020,7 +1020,7 @@ like you think it does:
 &gt;&gt;&gt;
 </pre></div>
 
-<H3><a name="Python_nn16">38.3.3 Global variables</a></H3>
+<H3><a name="Python_nn16">32.3.3 Global variables</a></H3>
 
 
 <p>
@@ -1158,7 +1158,7 @@ that starts with a leading underscore. SWIG does not create <tt>cvar</tt>
 if there are no global variables in a module.
 </p>
 
-<H3><a name="Python_nn17">38.3.4 Constants and enums</a></H3>
+<H3><a name="Python_nn17">32.3.4 Constants and enums</a></H3>
 
 
 <p>
@@ -1198,7 +1198,7 @@ other object.  Unfortunately, there is no easy way for SWIG to
 generate code that prevents this.  You will just have to be careful.
 </p>
 
-<H3><a name="Python_nn18">38.3.5 Pointers</a></H3>
+<H3><a name="Python_nn18">32.3.5 Pointers</a></H3>
 
 
 <p>
@@ -1339,7 +1339,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return
 <tt>None</tt> if the conversion can't be performed.
 </p>
 
-<H3><a name="Python_nn19">38.3.6 Structures</a></H3>
+<H3><a name="Python_nn19">32.3.6 Structures</a></H3>
 
 
 <p>
@@ -1549,7 +1549,7 @@ memory and use of it results in a segfault or some sort of other undefined behav
 </p>
 
 
-<H3><a name="Python_nn20">38.3.7 C++ classes</a></H3>
+<H3><a name="Python_nn20">32.3.7 C++ classes</a></H3>
 
 
 <p>
@@ -1637,7 +1637,7 @@ they are accessed through <tt>cvar</tt> like this:
 </pre>
 </div>
 
-<H3><a name="Python_nn21">38.3.8 C++ inheritance</a></H3>
+<H3><a name="Python_nn21">32.3.8 C++ inheritance</a></H3>
 
 
 <p>
@@ -1692,7 +1692,7 @@ then the function <tt>spam()</tt> accepts <tt>Foo *</tt> or a pointer to any cla
 It is safe to use multiple inheritance with SWIG.
 </p>
 
-<H3><a name="Python_nn22">38.3.9 Pointers, references, values, and arrays</a></H3>
+<H3><a name="Python_nn22">32.3.9 Pointers, references, values, and arrays</a></H3>
 
 
 <p>
@@ -1753,7 +1753,7 @@ treated as a returning value, and it will follow the same
 allocation/deallocation process.
 </p>
 
-<H3><a name="Python_nn23">38.3.10 C++ overloaded functions</a></H3>
+<H3><a name="Python_nn23">32.3.10 C++ overloaded functions</a></H3>
 
 
 <p>
@@ -1876,7 +1876,7 @@ first declaration takes precedence.
 Please refer to the "SWIG and C++" chapter for more information about overloading.
 </p>
 
-<H3><a name="Python_nn24">38.3.11 C++ operators</a></H3>
+<H3><a name="Python_nn24">32.3.11 C++ operators</a></H3>
 
 
 <p>
@@ -1973,7 +1973,7 @@ instead of raising an exception when the comparison fails, that is, on any kind
 This follows the guidelines in <a href="https://www.python.org/dev/peps/pep-0207/">PEP 207 - Rich Comparisons</a> and <a href="https://docs.python.org/3/library/constants.html#NotImplemented">NotImplemented Python constant</a>.
 </p>
 
-<H3><a name="Python_nn25">38.3.12 C++ namespaces</a></H3>
+<H3><a name="Python_nn25">32.3.12 C++ namespaces</a></H3>
 
 
 <p>
@@ -2040,7 +2040,7 @@ utilizes thousands of small deeply nested namespaces each with
 identical symbol names, well, then you get what you deserve.
 </p>
 
-<H3><a name="Python_nn26">38.3.13 C++ templates</a></H3>
+<H3><a name="Python_nn26">32.3.13 C++ templates</a></H3>
 
 
 <p>
@@ -2094,10 +2094,10 @@ Some more complicated
 examples will appear later.
 </p>
 
-<H3><a name="Python_nn27">38.3.14 C++ Smart Pointers</a></H3>
+<H3><a name="Python_nn27">32.3.14 C++ Smart Pointers</a></H3>
 
 
-<H4><a name="Python_smart_pointers_shared_ptr">38.3.14.1 The shared_ptr Smart Pointer</a></H4>
+<H4><a name="Python_smart_pointers_shared_ptr">32.3.14.1 The shared_ptr Smart Pointer</a></H4>
 
 
 <p>
@@ -2108,7 +2108,7 @@ in the <a href="Library.html#Library_std_shared_ptr">shared_ptr smart pointer</a
 </p>
 
 
-<H4><a name="Python_smart_pointers_generic">38.3.14.2 Generic Smart Pointers</a></H4>
+<H4><a name="Python_smart_pointers_generic">32.3.14.2 Generic Smart Pointers</a></H4>
 
 
 <p>
@@ -2192,7 +2192,7 @@ simply use the <tt>__deref__()</tt> method.  For example:
 </pre>
 </div>
 
-<H3><a name="Python_nn27a">38.3.15 C++ reference counted objects</a></H3>
+<H3><a name="Python_nn27a">32.3.15 C++ reference counted objects</a></H3>
 
 
 <p>
@@ -2201,7 +2201,7 @@ Python examples of memory management using referencing counting.
 </p>
 
 
-<H2><a name="Python_nn28">38.4 Further details on the Python class interface</a></H2>
+<H2><a name="Python_nn28">32.4 Further details on the Python class interface</a></H2>
 
 
 <p>
@@ -2224,7 +2224,7 @@ the <tt>-builtin</tt> option are in the <a href="#Python_builtin_types">Built-in
 section.
 </p>
 
-<H3><a name="Python_nn29">38.4.1 Proxy classes</a></H3>
+<H3><a name="Python_nn29">32.4.1 Proxy classes</a></H3>
 
 
 <p>
@@ -2313,7 +2313,7 @@ you can attach new Python methods to the class and you can even inherit from it
 by Python built-in types until Python 2.2).
 </p>
 
-<H3><a name="Python_builtin_types">38.4.2 Built-in Types</a></H3>
+<H3><a name="Python_builtin_types">32.4.2 Built-in Types</a></H3>
 
 
 <p>
@@ -2357,7 +2357,7 @@ please refer to the Python documentation:</p>
 
 <p><a href="http://docs.python.org/extending/newtypes.html">http://docs.python.org/extending/newtypes.html</a></p>
 
-<H4><a name="Python_builtin_limitations">38.4.2.1 Limitations</a></H4>
+<H4><a name="Python_builtin_limitations">32.4.2.1 Limitations</a></H4>
 
 
 <p>Use of the <tt>-builtin</tt> option implies a couple of limitations:
@@ -2518,7 +2518,7 @@ assert(issubclass(B.Derived, A.Base))
 </li>
 </ul>
 
-<H4><a name="Python_builtin_overloads">38.4.2.2 Operator overloads and slots -- use them!</a></H4>
+<H4><a name="Python_builtin_overloads">32.4.2.2 Operator overloads and slots -- use them!</a></H4>
 
 
 <p>The entire justification for the <tt>-builtin</tt> option is improved
@@ -2678,7 +2678,7 @@ in the file <tt>python/pyopers.swig</tt> in the SWIG library.
 </p>
 
 
-<H3><a name="Python_nn30">38.4.3 Memory management</a></H3>
+<H3><a name="Python_nn30">32.4.3 Memory management</a></H3>
 
 
 <p>NOTE: Although this section refers to proxy objects, everything here also applies
@@ -2873,7 +2873,7 @@ It is also possible to deal with situations like this using
 typemaps--an advanced topic discussed later.
 </p>
 
-<H2><a name="Python_directors">38.5 Cross language polymorphism</a></H2>
+<H2><a name="Python_directors">32.5 Cross language polymorphism</a></H2>
 
 
 <p>
@@ -2907,7 +2907,7 @@ proxy classes, director classes, and C wrapper functions takes care of
 all the cross-language method routing transparently.
 </p>
 
-<H3><a name="Python_nn33">38.5.1 Enabling directors</a></H3>
+<H3><a name="Python_nn33">32.5.1 Enabling directors</a></H3>
 
 
 <p>
@@ -2999,7 +2999,7 @@ class MyFoo(mymodule.Foo):
 </div>
 
 
-<H3><a name="Python_nn34">38.5.2 Director classes</a></H3>
+<H3><a name="Python_nn34">32.5.2 Director classes</a></H3>
 
 
 <p>
@@ -3078,7 +3078,7 @@ so there is no need for the extra overhead involved with routing the
 calls through Python.
 </p>
 
-<H3><a name="Python_nn35">38.5.3 Ownership and object destruction</a></H3>
+<H3><a name="Python_nn35">32.5.3 Ownership and object destruction</a></H3>
 
 
 <p>
@@ -3145,7 +3145,7 @@ deleting all the Foo pointers it contains at some point.  Note that no hard
 references to the Foo objects remain in Python.
 </p>
 
-<H3><a name="Python_nn36">38.5.4 Exception unrolling</a></H3>
+<H3><a name="Python_nn36">32.5.4 Exception unrolling</a></H3>
 
 
 <p>
@@ -3204,7 +3204,7 @@ Swig::DirectorMethodException is thrown, Python will register the
 exception as soon as the C wrapper function returns.
 </p>
 
-<H3><a name="Python_nn37">38.5.5 Overhead and code bloat</a></H3>
+<H3><a name="Python_nn37">32.5.5 Overhead and code bloat</a></H3>
 
 
 <p>
@@ -3238,7 +3238,7 @@ directive) for only those methods that are likely to be extended in
 Python.
 </p>
 
-<H3><a name="Python_nn38">38.5.6 Typemaps</a></H3>
+<H3><a name="Python_nn38">32.5.6 Typemaps</a></H3>
 
 
 <p>
@@ -3252,7 +3252,7 @@ need to be supported.
 </p>
 
 
-<H3><a name="Python_nn39">38.5.7 Miscellaneous</a></H3>
+<H3><a name="Python_nn39">32.5.7 Miscellaneous</a></H3>
 
 
 <p>
@@ -3299,7 +3299,7 @@ methods that return const references.
 </p>
 
 
-<H2><a name="Python_nn40">38.6 Common customization features</a></H2>
+<H2><a name="Python_nn40">32.6 Common customization features</a></H2>
 
 
 <p>
@@ -3312,7 +3312,7 @@ This section describes some common SWIG features that are used to
 improve your the interface to an extension module.
 </p>
 
-<H3><a name="Python_nn41">38.6.1 C/C++ helper functions</a></H3>
+<H3><a name="Python_nn41">32.6.1 C/C++ helper functions</a></H3>
 
 
 <p>
@@ -3393,7 +3393,7 @@ hard to implement.  It is possible to clean this up using Python code, typemaps,
 customization features as covered in later sections.
 </p>
 
-<H3><a name="Python_nn42">38.6.2 Adding additional Python code</a></H3>
+<H3><a name="Python_nn42">32.6.2 Adding additional Python code</a></H3>
 
 
 <p>
@@ -3649,7 +3649,7 @@ The same applies for overloaded constructors.
 </p>
 
 
-<H3><a name="Python_nn43">38.6.3 Class extension with %extend</a></H3>
+<H3><a name="Python_nn43">32.6.3 Class extension with %extend</a></H3>
 
 
 <p>
@@ -3738,7 +3738,7 @@ Vector(12, 14, 16)
 in any way---the extensions only show up in the Python interface.
 </p>
 
-<H3><a name="Python_nn44">38.6.4 Exception handling with %exception</a></H3>
+<H3><a name="Python_nn44">32.6.4 Exception handling with %exception</a></H3>
 
 
 <p>
@@ -3872,10 +3872,10 @@ The language-independent <tt>exception.i</tt> library file can also be used
 to raise exceptions.  See the <a href="Library.html#Library">SWIG Library</a> chapter.
 </p>
 
-<H3><a name="Python_optimization">38.6.5 Optimization options</a></H3>
+<H3><a name="Python_optimization">32.6.5 Optimization options</a></H3>
 
 
-<H4><a name="Python_fastproxy">38.6.5.1 -fastproxy</a></H4>
+<H4><a name="Python_fastproxy">32.6.5.1 -fastproxy</a></H4>
 
 
 <p>
@@ -4008,7 +4008,7 @@ While this possibly provides the best of both worlds, the time to import the mod
 The command line options mentioned above also apply to wrapped C/C++ global functions, not just class methods.
 </p>
 
-<H2><a name="Python_nn45">38.7 Tips and techniques</a></H2>
+<H2><a name="Python_nn45">32.7 Tips and techniques</a></H2>
 
 
 <p>
@@ -4018,7 +4018,7 @@ strings, binary data, and arrays.   This chapter discusses the common techniques
 solving these problems.
 </p>
 
-<H3><a name="Python_nn46">38.7.1 Input and output parameters</a></H3>
+<H3><a name="Python_nn46">32.7.1 Input and output parameters</a></H3>
 
 
 <p>
@@ -4231,7 +4231,7 @@ void foo(Bar *OUTPUT);
 may not have the intended effect since <tt>typemaps.i</tt> does not define an OUTPUT rule for <tt>Bar</tt>.
 </p>
 
-<H3><a name="Python_nn47">38.7.2 Simple pointers</a></H3>
+<H3><a name="Python_nn47">32.7.2 Simple pointers</a></H3>
 
 
 <p>
@@ -4300,7 +4300,7 @@ If you replace <tt>%pointer_functions()</tt> by <tt>%pointer_class(type, name)</
 See the <a href="Library.html#Library">SWIG Library</a> chapter for further details.
 </p>
 
-<H3><a name="Python_nn48">38.7.3 Unbounded C Arrays</a></H3>
+<H3><a name="Python_nn48">32.7.3 Unbounded C Arrays</a></H3>
 
 
 <p>
@@ -4362,7 +4362,7 @@ well suited for applications in which you need to create buffers,
 package binary data, etc.
 </p>
 
-<H3><a name="Python_nn49">38.7.4 String handling</a></H3>
+<H3><a name="Python_nn49">32.7.4 String handling</a></H3>
 
 
 <p>
@@ -4432,7 +4432,7 @@ also be used to extra binary data from arbitrary pointers.
 </p>
 
 
-<H3><a name="Python_default_args">38.7.5 Default arguments</a></H3>
+<H3><a name="Python_default_args">32.7.5 Default arguments</a></H3>
 
 
 <p>
@@ -4531,7 +4531,7 @@ Versions of SWIG prior to this varied in their ability to convert C++ default va
 equivalent Python default argument values.
 </p>
 
-<H2><a name="Python_nn53">38.8 Typemaps</a></H2>
+<H2><a name="Python_nn53">32.8 Typemaps</a></H2>
 
 
 <p>
@@ -4548,7 +4548,7 @@ Typemaps are only used if you want to change some aspect of the primitive
 C-Python interface or if you want to elevate your guru status.
 </p>
 
-<H3><a name="Python_nn54">38.8.1 What is a typemap?</a></H3>
+<H3><a name="Python_nn54">32.8.1 What is a typemap?</a></H3>
 
 
 <p>
@@ -4664,7 +4664,7 @@ parameter is omitted):
 </pre>
 </div>
 
-<H3><a name="Python_nn55">38.8.2 Python typemaps</a></H3>
+<H3><a name="Python_nn55">32.8.2 Python typemaps</a></H3>
 
 
 <p>
@@ -4705,7 +4705,7 @@ a look at the SWIG library version 1.3.20 or so.
 </p>
 
 
-<H3><a name="Python_nn56">38.8.3 Typemap variables</a></H3>
+<H3><a name="Python_nn56">32.8.3 Typemap variables</a></H3>
 
 
 <p>
@@ -4776,7 +4776,7 @@ properly assigned.
 The Python name of the wrapper function being created.
 </div>
 
-<H3><a name="Python_nn57">38.8.4 Useful Python Functions</a></H3>
+<H3><a name="Python_nn57">32.8.4 Useful Python Functions</a></H3>
 
 
 <p>
@@ -4904,7 +4904,7 @@ write me
 </pre>
 </div>
 
-<H2><a name="Python_nn58">38.9 Typemap Examples</a></H2>
+<H2><a name="Python_nn58">32.9 Typemap Examples</a></H2>
 
 
 <p>
@@ -4913,7 +4913,7 @@ might look at the files "<tt>python.swg</tt>" and "<tt>typemaps.i</tt>" in
 the SWIG library.
 </p>
 
-<H3><a name="Python_nn59">38.9.1 Converting  Python list to a char ** </a></H3>
+<H3><a name="Python_nn59">32.9.1 Converting  Python list to a char ** </a></H3>
 
 
 <p>
@@ -4993,7 +4993,7 @@ memory allocation is used to allocate memory for the array, the
 the C function.
 </p>
 
-<H3><a name="Python_nn60">38.9.2 Expanding a Python object into multiple arguments</a></H3>
+<H3><a name="Python_nn60">32.9.2 Expanding a Python object into multiple arguments</a></H3>
 
 
 <p>
@@ -5112,7 +5112,7 @@ TypeError: Wrong number or type of arguments for overloaded function 'foo'.
 </pre>
 </div>
 
-<H3><a name="Python_nn61">38.9.3 Using typemaps to return arguments</a></H3>
+<H3><a name="Python_nn61">32.9.3 Using typemaps to return arguments</a></H3>
 
 
 <p>
@@ -5200,7 +5200,7 @@ function can now be used as follows:
 &gt;&gt;&gt;
 </pre></div>
 
-<H3><a name="Python_nn62">38.9.4 Mapping Python tuples into small arrays</a></H3>
+<H3><a name="Python_nn62">32.9.4 Mapping Python tuples into small arrays</a></H3>
 
 
 <p>
@@ -5249,7 +5249,7 @@ array, such an approach would not be recommended for huge arrays, but
 for small structures, this approach works fine.
 </p>
 
-<H3><a name="Python_nn63">38.9.5 Mapping sequences to C arrays</a></H3>
+<H3><a name="Python_nn63">32.9.5 Mapping sequences to C arrays</a></H3>
 
 
 <p>
@@ -5338,7 +5338,7 @@ static int convert_darray(PyObject *input, double *ptr, int size) {
 </pre>
 </div>
 
-<H3><a name="Python_nn64">38.9.6 Pointer handling</a></H3>
+<H3><a name="Python_nn64">32.9.6 Pointer handling</a></H3>
 
 
 <p>
@@ -5435,7 +5435,7 @@ that has a <tt>this</tt> attribute.  In addition,
 class object (if applicable).
 </p>
 
-<H3><a name="Python_memory_management_member_variables">38.9.7 Memory management when returning references to member variables</a></H3>
+<H3><a name="Python_memory_management_member_variables">32.9.7 Memory management when returning references to member variables</a></H3>
 
 
 <p>
@@ -5596,7 +5596,7 @@ static PyObject *bike_reference() {
 
 
 
-<H2><a name="Python_nn65">38.10 Docstring Features</a></H2>
+<H2><a name="Python_nn65">32.10 Docstring Features</a></H2>
 
 
 <p>
@@ -5624,7 +5624,7 @@ of your users much simpler.
 </p>
 
 
-<H3><a name="Python_nn66">38.10.1 Module docstring</a></H3>
+<H3><a name="Python_nn66">32.10.1 Module docstring</a></H3>
 
 
 <p>
@@ -5658,7 +5658,7 @@ layout of controls on a panel, etc. to be loaded from an XML file."
 </div>
 
 
-<H3><a name="Python_nn67">38.10.2 %feature("autodoc")</a></H3>
+<H3><a name="Python_nn67">32.10.2 %feature("autodoc")</a></H3>
 
 
 <p>
@@ -5686,7 +5686,7 @@ four levels for autodoc controlled by the value given to the
 feature, <tt>%feature("autodoc", "<i>level</i>")</tt>.
 The four values for <i>level</i> are covered in the following sub-sections.
 
-<H4><a name="Python_nn68">38.10.2.1 %feature("autodoc", "0")</a></H4>
+<H4><a name="Python_nn68">32.10.2.1 %feature("autodoc", "0")</a></H4>
 
 
 <p>
@@ -5715,7 +5715,7 @@ def function_name(*args, **kwargs):
 </div>
 
 
-<H4><a name="Python_nn69">38.10.2.2 %feature("autodoc", "1")</a></H4>
+<H4><a name="Python_nn69">32.10.2.2 %feature("autodoc", "1")</a></H4>
 
 
 <p>
@@ -5740,7 +5740,7 @@ def function_name(*args, **kwargs):
 </div>
 
 
-<H4><a name="Python_autodoc2">38.10.2.3 %feature("autodoc", "2")</a></H4>
+<H4><a name="Python_autodoc2">32.10.2.3 %feature("autodoc", "2")</a></H4>
 
 
 <p>
@@ -5802,7 +5802,7 @@ def function_name(*args, **kwargs):
 </pre>
 </div>
 
-<H4><a name="Python_autodoc3">38.10.2.4 %feature("autodoc", "3")</a></H4>
+<H4><a name="Python_autodoc3">32.10.2.4 %feature("autodoc", "3")</a></H4>
 
 
 <p>
@@ -5828,7 +5828,7 @@ def function_name(*args, **kwargs):
 </div>
 
 
-<H4><a name="Python_nn70">38.10.2.5 %feature("autodoc", "docstring")</a></H4>
+<H4><a name="Python_nn70">32.10.2.5 %feature("autodoc", "docstring")</a></H4>
 
 
 <p>
@@ -5847,7 +5847,7 @@ void GetPosition(int* OUTPUT, int* OUTPUT);
 </div>
 
 
-<H3><a name="Python_nn71">38.10.3 %feature("docstring")</a></H3>
+<H3><a name="Python_nn71">32.10.3 %feature("docstring")</a></H3>
 
 
 <p>
@@ -5879,7 +5879,7 @@ with more than one line.
 </pre>
 </div>
 
-<H2><a name="Python_nn72">38.11 Python Packages</a></H2>
+<H2><a name="Python_nn72">32.11 Python Packages</a></H2>
 
 
 <p>Python has concepts of modules and packages. Modules are separate units of
@@ -5953,7 +5953,7 @@ users may need to use special features such as the <tt>package</tt> option in th
 <tt>%module</tt> directive or import related command line options. These are
 explained in the following sections.</p>
 
-<H3><a name="Python_modulepackage">38.11.1 Setting the Python package</a></H3>
+<H3><a name="Python_modulepackage">32.11.1 Setting the Python package</a></H3>
 
 
 <p>
@@ -6007,7 +6007,7 @@ pkg1/pkg2/_foo.so       # (shared library built from C/C++ code generated by SWI
 </pre>
 </div>
 
-<H3><a name="Python_absrelimports">38.11.2 Absolute and relative imports</a></H3>
+<H3><a name="Python_absrelimports">32.11.2 Absolute and relative imports</a></H3>
 
 
 <p>Suppose, we have the following hierarchy of files:</p>
@@ -6144,7 +6144,7 @@ uses relative imports. Second case is, when one puts import directives in
 <tt>__init__.py</tt> to import symbols from submodules or subpackages and the
 submodule depends on other submodules (discussed later).</p>
 
-<H3><a name="Python_absimport">38.11.3 Enforcing absolute import semantics</a></H3>
+<H3><a name="Python_absimport">32.11.3 Enforcing absolute import semantics</a></H3>
 
 
 <p>As you may know, there is an incompatibility in import semantics (for the
@@ -6181,7 +6181,7 @@ from __future__ import absolute_import
 </pre>
 </div>
 
-<H3><a name="Python_importfrominit">38.11.4 Importing from __init__.py</a></H3>
+<H3><a name="Python_importfrominit">32.11.4 Importing from __init__.py</a></H3>
 
 
 <p>Imports in <tt>__init__.py</tt> are handy when you want to populate a
@@ -6291,7 +6291,7 @@ class Bar(pkg3.foo.Foo): pass
 effect (note, that the Python 2 case also needs the <tt>-relativeimport</tt>
 workaround).</p>
 
-<H3><a name="Python_implicit_namespace_packages">38.11.5 Implicit namespace packages</a></H3>
+<H3><a name="Python_implicit_namespace_packages">32.11.5 Implicit namespace packages</a></H3>
 
 
 <p> Python 3.3 introduced
@@ -6369,7 +6369,7 @@ zipimporter requires python-3.5.1 or newer to work with subpackages.
 </p>
 
 
-<H3><a name="Python_package_search">38.11.6 Location of modules</a></H3>
+<H3><a name="Python_package_search">32.11.6 Location of modules</a></H3>
 
 
 <p>
@@ -6405,7 +6405,7 @@ The following sub-sections look more closely at the two default configurations a
 An input interface file, foo.i, results in the two modules foo.py and _foo.so for each of the configurations.
 </p>
 
-<H4><a name="Python_package_search_both_package_modules">38.11.6.1 Both modules in the same package</a></H4>
+<H4><a name="Python_package_search_both_package_modules">32.11.6.1 Both modules in the same package</a></H4>
 
 
 <p>
@@ -6440,7 +6440,7 @@ from mypackage import foo
 </div>
 
 
-<H4><a name="Python_package_search_both_global_modules">38.11.6.2 Both modules are global</a></H4>
+<H4><a name="Python_package_search_both_global_modules">32.11.6.2 Both modules are global</a></H4>
 
 
 <p>
@@ -6472,7 +6472,7 @@ import foo
 </pre>
 </div>
 
-<H4><a name="Python_package_search_wrapper_split">38.11.6.3 Split modules custom configuration</a></H4>
+<H4><a name="Python_package_search_wrapper_split">32.11.6.3 Split modules custom configuration</a></H4>
 
 
 <p>In this non-standard 'split module' configuration, the pure Python module is in a package and the low level C/C++ module is global.
@@ -6522,7 +6522,7 @@ Using one of the two default configurations is the recommended approach now.
 </p>
 
 
-<H4><a name="Python_custom_module_import">38.11.6.4 More on customizing the module import code</a></H4>
+<H4><a name="Python_custom_module_import">32.11.6.4 More on customizing the module import code</a></H4>
 
 
 <p>
@@ -6642,7 +6642,7 @@ The following will do this for the <a href="#Python_package_search_wrapper_split
 </pre>
 </div>
 
-<H4><a name="Python_package_search_static">38.11.6.5 Statically linked C modules</a></H4>
+<H4><a name="Python_package_search_static">32.11.6.5 Statically linked C modules</a></H4>
 
 
 <p>It is strongly recommended to use dynamically linked modules for the C
@@ -6714,7 +6714,7 @@ module then you will either need to refer to the Python documentation on how
 to do this (remember you are now the Python importer) or use dynamic linking.
 </p>
 
-<H2><a name="Python_python3support">38.12 Python 3 Support</a></H2>
+<H2><a name="Python_python3support">32.12 Python 3 Support</a></H2>
 
 
 <p>
@@ -6739,7 +6739,7 @@ The following are Python 3 new features that are currently supported by
 SWIG.
 </p>
 
-<H3><a name="Python_nn74">38.12.1 Function annotation</a></H3>
+<H3><a name="Python_nn74">32.12.1 Function annotation</a></H3>
 
 
 <p>
@@ -6772,7 +6772,7 @@ For detailed usage of function annotation, see
 <a href="https://www.python.org/dev/peps/pep-3107/">PEP 3107</a>.
 </p>
 
-<H3><a name="Python_nn75">38.12.2 Buffer interface</a></H3>
+<H3><a name="Python_nn75">32.12.2 Buffer interface</a></H3>
 
 
 <p>
@@ -6924,7 +6924,7 @@ modify the buffer.
 </div>
 
 
-<H3><a name="Python_nn76">38.12.3 Abstract base classes</a></H3>
+<H3><a name="Python_nn76">32.12.3 Abstract base classes</a></H3>
 
 
 <p>
@@ -6974,7 +6974,7 @@ The <tt>collections.abc</tt> module was introduced in Python 3.3 and hence this
 requires Python 3.3 or later.
 </p>
 
-<H3><a name="Python_nn77">38.12.4 Byte string output conversion</a></H3>
+<H3><a name="Python_nn77">32.12.4 Byte string output conversion</a></H3>
 
 
 <p>
@@ -7155,7 +7155,7 @@ overloads taking both std::string (as Python bytes) and std::wstring
 (as Python unicode).
 </p>
 
-<H3><a name="Python_2_unicode">38.12.5 Python 2 Unicode</a></H3>
+<H3><a name="Python_2_unicode">32.12.5 Python 2 Unicode</a></H3>
 
 
 <p>
@@ -7227,7 +7227,7 @@ the first is allowing unicode conversion and the second is explicitly
 prohibiting it.
 </p>
 
-<H2><a name="Python_multithreaded">38.13 Support for Multithreaded Applications</a></H2>
+<H2><a name="Python_multithreaded">32.13 Support for Multithreaded Applications</a></H2>
 
 
 <p>By default, SWIG does not enable support for multithreaded Python applications.  More
@@ -7242,7 +7242,7 @@ will not be able to run any other threads, even if the wrapped C/C++ code is wai
     interface for this is described in the next section.
 </p>
 
-<H3><a name="Python_thread_UI">38.13.1 UI for Enabling Multithreading Support</a></H3>
+<H3><a name="Python_thread_UI">32.13.1 UI for Enabling Multithreading Support</a></H3>
 
 
 <p>The user interface is as follows:</p>
@@ -7285,7 +7285,7 @@ will not be able to run any other threads, even if the wrapped C/C++ code is wai
   </li>
 </ol>
 
-<H3><a name="Python_thread_performance">38.13.2 Multithread Performance</a></H3>
+<H3><a name="Python_thread_performance">32.13.2 Multithread Performance</a></H3>
 
 
 <p>
diff --git a/Doc/Manual/R.html b/Doc/Manual/R.html
index 3a6aaeb3c..b9dba4f9c 100644
--- a/Doc/Manual/R.html
+++ b/Doc/Manual/R.html
@@ -7,7 +7,7 @@
 </head>
 
 <body bgcolor="#ffffff">
-<H1><a name="R">39 SWIG and R</a></H1>
+<H1><a name="R">33 SWIG and R</a></H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -34,7 +34,7 @@ compile and run an R interface to QuantLib running on Mandriva Linux
 with gcc. The R bindings also work on Microsoft Windows using Visual C++.
 </p>
 
-<H2><a name="R_nn2">39.1 Bugs</a></H2>
+<H2><a name="R_nn2">33.1 Bugs</a></H2>
 
 
 <p>
@@ -46,7 +46,7 @@ Currently the following features are not implemented or broken:
 <li>C Array wrappings
 </ul>
 
-<H2><a name="R_nn3">39.2 Using R and SWIG</a></H2>
+<H2><a name="R_nn3">33.2 Using R and SWIG</a></H2>
 
 
 <p>
@@ -137,7 +137,7 @@ Error in .Call("R_swig_fact", s_arg1, as.logical(.copy), PACKAGE = "example") :
 <li>Make sure the architecture of the shared library(x64 for instance), matches the architecture of the R program you want to load your shared library into
 </ul>
 
-<H2><a name="R_nn4">39.3 Precompiling large R files</a></H2>
+<H2><a name="R_nn4">33.3 Precompiling large R files</a></H2>
 
 
 In cases where the R file is large, one make save a lot of loading
@@ -155,7 +155,7 @@ will save a large amount of loading time.
 
 
 
-<H2><a name="R_nn5">39.4 General policy</a></H2>
+<H2><a name="R_nn5">33.4 General policy</a></H2>
 
 
 <p>
@@ -164,7 +164,7 @@ wrapping over the underlying functions and rely on the R type system
 to provide R syntax.
 </p>
 
-<H2><a name="R_language_conventions">39.5 Language conventions</a></H2>
+<H2><a name="R_language_conventions">33.5 Language conventions</a></H2>
 
 
 <p>
@@ -173,7 +173,7 @@ and [ are overloaded to allow for R syntax (one based indices and
 slices)
 </p>
 
-<H2><a name="R_nn6">39.6 C++ classes</a></H2>
+<H2><a name="R_nn6">33.6 C++ classes</a></H2>
 
 
 <p>
@@ -185,7 +185,7 @@ keep track of the pointer object which removes the necessity for a lot
 of the proxy class baggage you see in other languages.
 </p>
 
-<H2><a name="R_nn7">39.7 Enumerations</a></H2>
+<H2><a name="R_nn7">33.7 Enumerations</a></H2>
 
 
 <p>
diff --git a/Doc/Manual/Ruby.html b/Doc/Manual/Ruby.html
index 9b9b49d07..aa4212667 100644
--- a/Doc/Manual/Ruby.html
+++ b/Doc/Manual/Ruby.html
@@ -8,7 +8,7 @@
 
 <body bgcolor="#ffffff">
 
-<H1><a name="Ruby">40 SWIG and Ruby</a></H1>
+<H1><a name="Ruby">34 SWIG and Ruby</a></H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -149,7 +149,7 @@
 
 <p>This chapter describes SWIG's support of Ruby.</p>
 
-<H2><a name="Ruby_nn2">40.1 Preliminaries</a></H2>
+<H2><a name="Ruby_nn2">34.1 Preliminaries</a></H2>
 
 
 <p> SWIG 3.0 is known to work with Ruby versions 1.8 and later.
@@ -164,7 +164,7 @@ read the "<a href="SWIG.html#SWIG">SWIG Basics</a>"
 chapter. It is also assumed that the reader has a basic understanding
 of Ruby. </p>
 
-<H3><a name="Ruby_nn3">40.1.1 Running SWIG</a></H3>
+<H3><a name="Ruby_nn3">34.1.1 Running SWIG</a></H3>
 
 
 <p> To build a Ruby module, run SWIG using the <tt>-ruby</tt>
@@ -188,7 +188,7 @@ if compiling a C++ extension) that contains all of the code needed to
 build a Ruby extension module. To finish building the module, you need
 to compile this file and link it with the rest of your program. </p>
 
-<H3><a name="Ruby_nn4">40.1.2 Getting the right header files</a></H3>
+<H3><a name="Ruby_nn4">34.1.2 Getting the right header files</a></H3>
 
 
 <p> In order to compile the wrapper code, the compiler needs the <tt>ruby.h</tt>
@@ -202,7 +202,7 @@ the compiler options needed to compile the code is to ask Ruby itself:</p>
 </pre>
 </div>
 
-<H3><a name="Ruby_nn5">40.1.3 Compiling a dynamic module</a></H3>
+<H3><a name="Ruby_nn5">34.1.3 Compiling a dynamic module</a></H3>
 
 
 <p> Ruby extension modules are typically compiled into shared
@@ -275,7 +275,7 @@ manual pages for your compiler and linker to determine the correct set
 of options. You might also check the <a href="https://github.com/swig/swig/wiki">SWIG Wiki</a>
 for additional information. </p>
 
-<H3><a name="Ruby_nn6">40.1.4 Using your module</a></H3>
+<H3><a name="Ruby_nn6">34.1.4 Using your module</a></H3>
 
 
 <p> Ruby <i>module</i> names must be capitalized,
@@ -305,7 +305,7 @@ begins with: </p>
 <p> will result in an extension module using the feature name
 "example" and Ruby module name "Example". </p>
 
-<H3><a name="Ruby_nn7">40.1.5 Static linking</a></H3>
+<H3><a name="Ruby_nn7">34.1.5 Static linking</a></H3>
 
 
 <p> An alternative approach to dynamic linking is to rebuild the
@@ -320,7 +320,7 @@ finding the Ruby source, adding an entry to the <tt>ext/Setup</tt>
 file, adding your directory to the list of extensions in the file, and
 finally rebuilding Ruby. </p>
 
-<H3><a name="Ruby_nn8">40.1.6 Compilation of C++ extensions</a></H3>
+<H3><a name="Ruby_nn8">34.1.6 Compilation of C++ extensions</a></H3>
 
 
 <p> On most machines, C++ extension modules should be linked
@@ -352,7 +352,7 @@ $libs = append_library($libs, "supc++")
 create_makefile('example')</pre>
 </div>
 
-<H2><a name="Ruby_nn9">40.2 Building Ruby Extensions under Windows 95/NT</a></H2>
+<H2><a name="Ruby_nn9">34.2 Building Ruby Extensions under Windows 95/NT</a></H2>
 
 
 <p> Building a SWIG extension to Ruby under Windows 95/NT is
@@ -377,7 +377,7 @@ order to build extensions, you may need to download the source
 distribution to the Ruby package, as you will need the Ruby header
 files. </p>
 
-<H3><a name="Ruby_nn10">40.2.1 Running SWIG from Developer Studio</a></H3>
+<H3><a name="Ruby_nn10">34.2.1 Running SWIG from Developer Studio</a></H3>
 
 
 <p> If you are developing your application within Microsoft
@@ -441,13 +441,13 @@ Foo = 3.0
 </pre>
 </div>
 
-<H2><a name="Ruby_nn11">40.3 The Ruby-to-C/C++ Mapping</a></H2>
+<H2><a name="Ruby_nn11">34.3 The Ruby-to-C/C++ Mapping</a></H2>
 
 
 <p> This section describes the basics of how SWIG maps C or C++
 declarations in your SWIG interface files to Ruby constructs. </p>
 
-<H3><a name="Ruby_nn12">40.3.1 Modules</a></H3>
+<H3><a name="Ruby_nn12">34.3.1 Modules</a></H3>
 
 
 <p> The SWIG <tt>%module</tt> directive specifies
@@ -519,7 +519,7 @@ option to wrap everything into the global module, take care that the
 names of your constants, classes and methods don't conflict with any of
 Ruby's built-in names. </p>
 
-<H3><a name="Ruby_nn13">40.3.2 Functions</a></H3>
+<H3><a name="Ruby_nn13">34.3.2 Functions</a></H3>
 
 
 <p> Global functions are wrapped as Ruby module methods. For
@@ -553,7 +553,7 @@ irb(main):002:0&gt; <b>Example.fact(4)</b>
 24</pre>
 </div>
 
-<H3><a name="Ruby_nn14">40.3.3 Variable Linking</a></H3>
+<H3><a name="Ruby_nn14">34.3.3 Variable Linking</a></H3>
 
 
 <p> C/C++ global variables are wrapped as a pair of singleton
@@ -615,7 +615,7 @@ directive. For example: </p>
 effect until it is explicitly disabled using <tt>%mutable</tt>.
 </p>
 
-<H3><a name="Ruby_nn15">40.3.4 Constants</a></H3>
+<H3><a name="Ruby_nn15">34.3.4 Constants</a></H3>
 
 
 <p> C/C++ constants are wrapped as module constants initialized
@@ -643,7 +643,7 @@ irb(main):002:0&gt; <b>Example::PI</b>
 3.14159</pre>
 </div>
 
-<H3><a name="Ruby_nn16">40.3.5 Pointers</a></H3>
+<H3><a name="Ruby_nn16">34.3.5 Pointers</a></H3>
 
 
 <p> "Opaque" pointers to arbitrary C/C++ types (i.e. types that
@@ -667,7 +667,7 @@ returns an instance of an internally generated Ruby class: </p>
 <p> A <tt>NULL</tt> pointer is always represented by
 the Ruby <tt>nil</tt> object. </p>
 
-<H3><a name="Ruby_nn17">40.3.6 Structures</a></H3>
+<H3><a name="Ruby_nn17">34.3.6 Structures</a></H3>
 
 
 <p> C/C++ structs are wrapped as Ruby classes, with accessor
@@ -772,7 +772,7 @@ void Bar_f_set(Bar *b, Foo *val) {
 }</pre>
 </div>
 
-<H3><a name="Ruby_nn18">40.3.7 C++ classes</a></H3>
+<H3><a name="Ruby_nn18">34.3.7 C++ classes</a></H3>
 
 
 <p> Like structs, C++ classes are wrapped by creating a new Ruby
@@ -827,7 +827,7 @@ Ale
 3</pre>
 </div>
 
-<H3><a name="Ruby_nn19">40.3.8 C++ Inheritance</a></H3>
+<H3><a name="Ruby_nn19">34.3.8 C++ Inheritance</a></H3>
 
 
 <p> The SWIG type-checker is fully aware of C++ inheritance.
@@ -980,7 +980,7 @@ inherit from both <tt>Base1</tt> and <tt>Base2</tt>
 (i.e. they exhibit <a href="http://c2.com/cgi/wiki?DuckTyping">"Duck
 Typing"</a>). </p>
 
-<H3><a name="Ruby_nn20">40.3.9 C++ Overloaded Functions</a></H3>
+<H3><a name="Ruby_nn20">34.3.9 C++ Overloaded Functions</a></H3>
 
 
 <p> C++ overloaded functions, methods, and constructors are
@@ -1070,7 +1070,7 @@ arises--in this case, the first declaration takes precedence. </p>
 <p>Please refer to the <a href="SWIGPlus.html#SWIGPlus">"SWIG
 and C++"</a> chapter for more information about overloading. </p>
 
-<H3><a name="Ruby_nn21">40.3.10 C++ Operators</a></H3>
+<H3><a name="Ruby_nn21">34.3.10 C++ Operators</a></H3>
 
 
 <p> For the most part, overloaded operators are handled
@@ -1112,7 +1112,7 @@ c = Example.add_complex(a, b)</pre>
 is discussed in the <a href="#Ruby_operator_overloading">section
 on operator overloading</a>. </p>
 
-<H3><a name="Ruby_nn22">40.3.11 C++ namespaces</a></H3>
+<H3><a name="Ruby_nn22">34.3.11 C++ namespaces</a></H3>
 
 
 <p> SWIG is aware of C++ namespaces, but namespace names do not
@@ -1169,7 +1169,7 @@ and create extension modules for each namespace separately. If your
 program utilizes thousands of small deeply nested namespaces each with
 identical symbol names, well, then you get what you deserve. </p>
 
-<H3><a name="Ruby_nn23">40.3.12 C++ templates</a></H3>
+<H3><a name="Ruby_nn23">34.3.12 C++ templates</a></H3>
 
 
 <p> C++ templates don't present a huge problem for SWIG. However,
@@ -1211,7 +1211,7 @@ irb(main):004:0&gt; <b>p.second</b>
 4</pre>
 </div>
 
-<H3><a name="Ruby_nn23_1">40.3.13 C++ Standard Template Library (STL)</a></H3>
+<H3><a name="Ruby_nn23_1">34.3.13 C++ Standard Template Library (STL)</a></H3>
 
 
 <p> On a related note, the standard SWIG library contains a
@@ -1304,7 +1304,7 @@ puts v
 shown in these examples. More details can be found in the <a href="SWIGPlus.html#SWIGPlus">SWIG and C++</a>
 chapter.</p>
 
-<H3><a name="Ruby_C_STL_Functors">40.3.14 C++ STL Functors</a></H3>
+<H3><a name="Ruby_C_STL_Functors">34.3.14 C++ STL Functors</a></H3>
 
 
 <p>Some containers in the STL allow you to modify their default
@@ -1365,7 +1365,7 @@ b
 </pre>
 </div>
 
-<H3><a name="Ruby_C_Iterators">40.3.15 C++ STL Iterators</a></H3>
+<H3><a name="Ruby_C_Iterators">34.3.15 C++ STL Iterators</a></H3>
 
 
 <p>The STL is well known for the use of iterators. There
@@ -1448,10 +1448,10 @@ i
 
 <p>If you'd rather have STL classes without any iterators, you should define <tt>-DSWIG_NO_EXPORT_ITERATOR_METHODS</tt> when running swig.</p>
 
-<H3><a name="Ruby_nn24">40.3.16 C++ Smart Pointers</a></H3>
+<H3><a name="Ruby_nn24">34.3.16 C++ Smart Pointers</a></H3>
 
 
-<H4><a name="Ruby_smart_pointers_shared_ptr">40.3.16.1 The shared_ptr Smart Pointer</a></H4>
+<H4><a name="Ruby_smart_pointers_shared_ptr">34.3.16.1 The shared_ptr Smart Pointer</a></H4>
 
 
 <p>
@@ -1462,7 +1462,7 @@ in the <a href="Library.html#Library_std_shared_ptr">shared_ptr smart pointer</a
 </p>
 
 
-<H4><a name="Ruby_smart_pointers_generic">40.3.16.2 Generic Smart Pointers</a></H4>
+<H4><a name="Ruby_smart_pointers_generic">34.3.16.2 Generic Smart Pointers</a></H4>
 
 
 <p> In certain C++ programs, it is common to use classes that
@@ -1527,7 +1527,7 @@ method. For example: </p>
 <pre>irb(main):004:0&gt; <b>f = p.__deref__()</b> # Returns underlying Foo *</pre>
 </div>
 
-<H3><a name="Ruby_nn25">40.3.17 Cross-Language Polymorphism</a></H3>
+<H3><a name="Ruby_nn25">34.3.17 Cross-Language Polymorphism</a></H3>
 
 
 <p> SWIG's Ruby module supports cross-language polymorphism
@@ -1536,7 +1536,7 @@ module. Rather than duplicate the information presented in the <a href="Python.h
 section just notes the differences that you need to be aware of when
 using this feature with Ruby. </p>
 
-<H4><a name="Ruby_nn26">40.3.17.1 Exception Unrolling</a></H4>
+<H4><a name="Ruby_nn26">34.3.17.1 Exception Unrolling</a></H4>
 
 
 <p> Whenever a C++ director class routes one of its virtual
@@ -1559,7 +1559,7 @@ method is "wrapped" using the <tt>rb_rescue2()</tt>
 function from Ruby's C API. If any Ruby exception is raised, it will be
 caught here and a C++ exception is raised in its place. </p>
 
-<H2><a name="Ruby_nn27">40.4 Naming</a></H2>
+<H2><a name="Ruby_nn27">34.4 Naming</a></H2>
 
 
 <p>Ruby has several common naming conventions. Constants are
@@ -1597,7 +1597,7 @@ generated
 by SWIG, it is turned off by default in SWIG 1.3.28. However, it is
 planned to become the default option in future releases.</p>
 
-<H3><a name="Ruby_nn28">40.4.1 Defining Aliases</a></H3>
+<H3><a name="Ruby_nn28">34.4.1 Defining Aliases</a></H3>
 
 
 <p> It's a fairly common practice in the Ruby built-ins and
@@ -1667,7 +1667,7 @@ matching rules used for other kinds of features apply (see the chapter
 on <a href="Customization.html#Customization">"Customization
 Features"</a>) for more details).</p>
 
-<H3><a name="Ruby_nn29">40.4.2 Predicate Methods</a></H3>
+<H3><a name="Ruby_nn29">34.4.2 Predicate Methods</a></H3>
 
 
 <p> Ruby methods that return a boolean value and end in a
@@ -1716,7 +1716,7 @@ using SWIG's "features" mechanism and so the same name matching rules
 used for other kinds of features apply (see the chapter on <a href="Customization.html#Customization">"Customization
 Features"</a>) for more details). </p>
 
-<H3><a name="Ruby_nn30">40.4.3 Bang Methods</a></H3>
+<H3><a name="Ruby_nn30">34.4.3 Bang Methods</a></H3>
 
 
 <p> Ruby methods that modify an object in-place and end in an
@@ -1748,7 +1748,7 @@ using SWIG's "features" mechanism and so the same name matching rules
 used for other kinds of features apply (see the chapter on <a href="Customization.html#Customization">"Customization
 Features"</a>) for more details). </p>
 
-<H3><a name="Ruby_nn31">40.4.4 Getters and Setters</a></H3>
+<H3><a name="Ruby_nn31">34.4.4 Getters and Setters</a></H3>
 
 
 <p> Often times a C++ library will expose properties through
@@ -1783,7 +1783,7 @@ irb(main):003:0&gt; <b>puts foo.value</b></pre>
 %rename("value=") Foo::setValue(int value);</pre>
 </div>
 
-<H2><a name="Ruby_nn32">40.5 Input and output parameters</a></H2>
+<H2><a name="Ruby_nn32">34.5 Input and output parameters</a></H2>
 
 
 <p> A common problem in some C programs is handling parameters
@@ -1922,10 +1922,10 @@ void get_dimensions(Matrix *m, int *rows, int*columns);</pre>
 <pre>r, c = Example.get_dimensions(m)</pre>
 </div>
 
-<H2><a name="Ruby_nn33">40.6 Exception handling </a></H2>
+<H2><a name="Ruby_nn33">34.6 Exception handling </a></H2>
 
 
-<H3><a name="Ruby_nn34">40.6.1 Using the %exception directive </a></H3>
+<H3><a name="Ruby_nn34">34.6.1 Using the %exception directive </a></H3>
 
 
 <p>The SWIG <tt>%exception</tt> directive can be
@@ -2034,7 +2034,7 @@ methods and functions named <tt>getitem</tt> and <tt>setitem</tt>.
 limited to C++ exception handling. See the chapter on <a href="Customization.html#Customization">Customization
 Features</a> for more examples.</p>
 
-<H3><a name="Ruby_nn34_2">40.6.2 Handling Ruby Blocks </a></H3>
+<H3><a name="Ruby_nn34_2">34.6.2 Handling Ruby Blocks </a></H3>
 
 
 <p>One of the highlights of Ruby and most of its standard library
@@ -2101,7 +2101,7 @@ a special in typemap, like:</p>
 
 <p>For more information on typemaps, see <a href="#Ruby_nn37">Typemaps</a>.</p>
 
-<H3><a name="Ruby_nn35">40.6.3 Raising exceptions </a></H3>
+<H3><a name="Ruby_nn35">34.6.3 Raising exceptions </a></H3>
 
 
 <p>There are three ways to raise exceptions from C++ code to
@@ -2258,7 +2258,7 @@ function. The first argument passed to <tt>rb_raise()</tt>
 is the exception type. You can raise a custom exception type or one of
 the built-in Ruby exception types.</p>
 
-<H3><a name="Ruby_nn36">40.6.4 Exception classes </a></H3>
+<H3><a name="Ruby_nn36">34.6.4 Exception classes </a></H3>
 
 
 <p>Starting with SWIG 1.3.28, the Ruby module supports the <tt>%exceptionclass</tt>
@@ -2295,7 +2295,7 @@ end </pre>
 <p>For another example look at swig/Examples/ruby/exception_class.
 </p>
 
-<H2><a name="Ruby_nn37">40.7 Typemaps</a></H2>
+<H2><a name="Ruby_nn37">34.7 Typemaps</a></H2>
 
 
 <p> This section describes how you can modify SWIG's default
@@ -2310,7 +2310,7 @@ a required part of using SWIG---the default wrapping behavior is enough
 in most cases. Typemaps are only used if you want to change some aspect
 of the primitive C-Ruby interface.</p>
 
-<H3><a name="Ruby_nn38">40.7.1 What is a typemap?</a></H3>
+<H3><a name="Ruby_nn38">34.7.1 What is a typemap?</a></H3>
 
 
 <p> A typemap is nothing more than a code generation rule that is
@@ -2467,7 +2467,7 @@ to be used as follows (notice how the length parameter is omitted): </p>
 2</pre>
 </div>
 
-<H3><a name="Ruby_Typemap_scope">40.7.2 Typemap scope</a></H3>
+<H3><a name="Ruby_Typemap_scope">34.7.2 Typemap scope</a></H3>
 
 
 <p> Once defined, a typemap remains in effect for all of the
@@ -2513,7 +2513,7 @@ where the class itself is defined. For example:</p>
 };</pre>
 </div>
 
-<H3><a name="Ruby_Copying_a_typemap">40.7.3 Copying a typemap</a></H3>
+<H3><a name="Ruby_Copying_a_typemap">34.7.3 Copying a typemap</a></H3>
 
 
 <p> A typemap is copied by using assignment. For example:</p>
@@ -2555,7 +2555,7 @@ rules as for <tt>
 %apply (char *buf, int len) { (char *buffer, int size) }; // Multiple arguments</pre>
 </div>
 
-<H3><a name="Ruby_Deleting_a_typemap">40.7.4 Deleting a typemap</a></H3>
+<H3><a name="Ruby_Deleting_a_typemap">34.7.4 Deleting a typemap</a></H3>
 
 
 <p> A typemap can be deleted by simply defining no code. For
@@ -2580,7 +2580,7 @@ defined by typemaps, clearing a fundamental type like <tt>int</tt>
 will make that type unusable unless you also define a new set of
 typemaps immediately after the clear operation.</p>
 
-<H3><a name="Ruby_Placement_of_typemaps">40.7.5 Placement of typemaps</a></H3>
+<H3><a name="Ruby_Placement_of_typemaps">34.7.5 Placement of typemaps</a></H3>
 
 
 <p> Typemap declarations can be declared in the global scope,
@@ -2651,13 +2651,13 @@ In this example, this is done using the class declaration <tt>class
 string</tt>
 .</p>
 
-<H3><a name="Ruby_nn39">40.7.6 Ruby typemaps</a></H3>
+<H3><a name="Ruby_nn39">34.7.6 Ruby typemaps</a></H3>
 
 
 <p>The following list details all of the typemap methods that
 can be used by the Ruby module: </p>
 
-<H4><a name="Ruby_in_typemap">40.7.6.1 "in" typemap</a></H4>
+<H4><a name="Ruby_in_typemap">34.7.6.1 "in" typemap</a></H4>
 
 
 <p>Converts Ruby objects to input
@@ -2724,7 +2724,7 @@ arguments to be specified. For example:</p>
 
 <p> At this time, only zero or one arguments may be converted.</p>
 
-<H4><a name="Ruby_typecheck_typemap">40.7.6.2 "typecheck" typemap</a></H4>
+<H4><a name="Ruby_typecheck_typemap">34.7.6.2 "typecheck" typemap</a></H4>
 
 
 <p> The "typecheck" typemap is used to support overloaded
@@ -2746,7 +2746,7 @@ program uses overloaded methods, you should also define a collection of
 "typecheck" typemaps. More details about this follow in a later section
 on "Typemaps and Overloading."</p>
 
-<H4><a name="Ruby_out_typemap">40.7.6.3 "out" typemap</a></H4>
+<H4><a name="Ruby_out_typemap">34.7.6.3 "out" typemap</a></H4>
 
 
 <p>Converts return value of a C function
@@ -2797,7 +2797,7 @@ version of the C datatype matched by the typemap.</td>
 </table>
 </div>
 
-<H4><a name="Ruby_arginit_typemap">40.7.6.4 "arginit" typemap</a></H4>
+<H4><a name="Ruby_arginit_typemap">34.7.6.4 "arginit" typemap</a></H4>
 
 
 <p> The "arginit" typemap is used to set the initial value of a
@@ -2812,7 +2812,7 @@ applications. For example:</p>
 }</pre>
 </div>
 
-<H4><a name="Ruby_default_typemap">40.7.6.5 "default" typemap</a></H4>
+<H4><a name="Ruby_default_typemap">34.7.6.5 "default" typemap</a></H4>
 
 
 <p> The "default" typemap is used to turn an argument into a
@@ -2837,7 +2837,7 @@ arguments that follow must have default values. See the <a href="SWIG.html#SWIG_
 Default/optional arguments</a> section for further information on
 default argument wrapping.</p>
 
-<H4><a name="Ruby_check_typemap">40.7.6.6 "check" typemap</a></H4>
+<H4><a name="Ruby_check_typemap">34.7.6.6 "check" typemap</a></H4>
 
 
 <p> The "check" typemap is used to supply value checking code
@@ -2852,7 +2852,7 @@ arguments have been converted. For example:</p>
 }</pre>
 </div>
 
-<H4><a name="Ruby_argout_typemap_">40.7.6.7 "argout" typemap</a></H4>
+<H4><a name="Ruby_argout_typemap_">34.7.6.7 "argout" typemap</a></H4>
 
 
 <p> The "argout" typemap is used to return values from arguments.
@@ -2906,7 +2906,7 @@ some function like SWIG_Ruby_AppendOutput.</p>
 
 <p> See the <tt>typemaps.i</tt> library for examples.</p>
 
-<H4><a name="Ruby_freearg_typemap_">40.7.6.8 "freearg" typemap</a></H4>
+<H4><a name="Ruby_freearg_typemap_">34.7.6.8 "freearg" typemap</a></H4>
 
 
 <p> The "freearg" typemap is used to cleanup argument data. It is
@@ -2933,7 +2933,7 @@ This code is also placed into a special variable <tt>$cleanup</tt>
 that may be used in other typemaps whenever a wrapper function needs to
 abort prematurely.</p>
 
-<H4><a name="Ruby_newfree_typemap">40.7.6.9 "newfree" typemap</a></H4>
+<H4><a name="Ruby_newfree_typemap">34.7.6.9 "newfree" typemap</a></H4>
 
 
 <p> The "newfree" typemap is used in conjunction with the <tt>%newobject</tt>
@@ -2957,7 +2957,7 @@ string *foo();</pre>
 <p> See <a href="Customization.html#Customization_ownership">Object
 ownership and %newobject</a> for further details.</p>
 
-<H4><a name="Ruby_memberin_typemap">40.7.6.10 "memberin" typemap</a></H4>
+<H4><a name="Ruby_memberin_typemap">34.7.6.10 "memberin" typemap</a></H4>
 
 
 <p> The "memberin" typemap is used to copy data from<em> an
@@ -2975,21 +2975,21 @@ example:</p>
 already provides a default implementation for arrays, strings, and
 other objects.</p>
 
-<H4><a name="Ruby_varin_typemap">40.7.6.11 "varin" typemap</a></H4>
+<H4><a name="Ruby_varin_typemap">34.7.6.11 "varin" typemap</a></H4>
 
 
 <p> The "varin" typemap is used to convert objects in the target
 language to C for the purposes of assigning to a C/C++ global variable.
 This is implementation specific.</p>
 
-<H4><a name="Ruby_varout_typemap_">40.7.6.12 "varout" typemap</a></H4>
+<H4><a name="Ruby_varout_typemap_">34.7.6.12 "varout" typemap</a></H4>
 
 
 <p> The "varout" typemap is used to convert a C/C++ object to an
 object in the target language when reading a C/C++ global variable.
 This is implementation specific.</p>
 
-<H4><a name="Ruby_throws_typemap">40.7.6.13 "throws" typemap</a></H4>
+<H4><a name="Ruby_throws_typemap">34.7.6.13 "throws" typemap</a></H4>
 
 
 <p> The "throws" typemap is only used when SWIG parses a C++
@@ -3030,7 +3030,7 @@ specification yet they do throw exceptions, SWIG cannot know how to
 deal with them. For a neat way to handle these, see the <a href="Customization.html#Customization_exception">Exception
 handling with %exception</a> section.</p>
 
-<H4><a name="Ruby_directorin_typemap">40.7.6.14 directorin typemap</a></H4>
+<H4><a name="Ruby_directorin_typemap">34.7.6.14 directorin typemap</a></H4>
 
 
 <p>Converts C++ objects in director
@@ -3089,7 +3089,7 @@ referring to the class itself.</td>
 </table>
 </div>
 
-<H4><a name="Ruby_directorout_typemap">40.7.6.15 directorout typemap</a></H4>
+<H4><a name="Ruby_directorout_typemap">34.7.6.15 directorout typemap</a></H4>
 
 
 <p>Converts Ruby objects in director
@@ -3162,7 +3162,7 @@ exception.
 
 </p>
 
-<H4><a name="Ruby_directorargout_typemap">40.7.6.16 directorargout typemap</a></H4>
+<H4><a name="Ruby_directorargout_typemap">34.7.6.16 directorargout typemap</a></H4>
 
 
 <p>Output argument processing in director
@@ -3220,19 +3220,19 @@ referring to the instance of the class itself</td>
 </table>
 </div>
 
-<H4><a name="Ruby_ret_typemap">40.7.6.17 ret typemap</a></H4>
+<H4><a name="Ruby_ret_typemap">34.7.6.17 ret typemap</a></H4>
 
 
 <p>Cleanup of function return values
 </p>
 
-<H4><a name="Ruby_globalin_typemap">40.7.6.18 globalin typemap</a></H4>
+<H4><a name="Ruby_globalin_typemap">34.7.6.18 globalin typemap</a></H4>
 
 
 <p>Setting of C global variables
 </p>
 
-<H3><a name="Ruby_nn40">40.7.7 Typemap variables</a></H3>
+<H3><a name="Ruby_nn40">34.7.7 Typemap variables</a></H3>
 
 
 <p>
@@ -3282,7 +3282,7 @@ so that their values can be properly assigned. </div>
 <div class="indent">The Ruby name of the wrapper function
 being created. </div>
 
-<H3><a name="Ruby_nn41">40.7.8 Useful Functions</a></H3>
+<H3><a name="Ruby_nn41">34.7.8 Useful Functions</a></H3>
 
 
 <p> When you write a typemap, you usually have to work directly
@@ -3297,7 +3297,7 @@ stick to the swig functions instead of the native Ruby functions.
 That should help you avoid having to rewrite a lot of typemaps
 across multiple languages.</p>
 
-<H4><a name="Ruby_nn42">40.7.8.1 C Datatypes to Ruby Objects</a></H4>
+<H4><a name="Ruby_nn42">34.7.8.1 C Datatypes to Ruby Objects</a></H4>
 
 
 <div class="diagram">
@@ -3339,7 +3339,7 @@ SWIG_From_float(float)</td>
 </table>
 </div>
 
-<H4><a name="Ruby_nn43">40.7.8.2 Ruby Objects to C Datatypes</a></H4>
+<H4><a name="Ruby_nn43">34.7.8.2 Ruby Objects to C Datatypes</a></H4>
 
 
 <p>Here, while the Ruby versions return the value directly, the SWIG
@@ -3407,7 +3407,7 @@ versions do not, but return a status value to indicate success (<tt>SWIG_OK</tt>
 </table>
 </div>
 
-<H4><a name="Ruby_nn44">40.7.8.3 Macros for VALUE</a></H4>
+<H4><a name="Ruby_nn44">34.7.8.3 Macros for VALUE</a></H4>
 
 
 <p> <tt>RSTRING_LEN(str)</tt> </p>
@@ -3430,7 +3430,7 @@ versions do not, but return a status value to indicate success (<tt>SWIG_OK</tt>
 
 <div class="indent">pointer to array storage</div>
 
-<H4><a name="Ruby_nn45">40.7.8.4 Exceptions</a></H4>
+<H4><a name="Ruby_nn45">34.7.8.4 Exceptions</a></H4>
 
 
 <p> <tt>void rb_raise(VALUE exception, const char *fmt,
@@ -3509,7 +3509,7 @@ message to standard error if Ruby was invoked with the <tt>-w</tt>
 flag. The given format string <i>fmt</i> and remaining
 arguments are interpreted as with <tt>printf()</tt>. </div>
 
-<H4><a name="Ruby_nn46">40.7.8.5 Iterators</a></H4>
+<H4><a name="Ruby_nn46">34.7.8.5 Iterators</a></H4>
 
 
 <p> <tt>void rb_iter_break()</tt> </p>
@@ -3555,14 +3555,14 @@ VALUE), VALUE value)</tt></p>
 <div class="indent"> Equivalent to Ruby's <tt>throw</tt>.
 </div>
 
-<H3><a name="Ruby_nn47">40.7.9 Typemap Examples</a></H3>
+<H3><a name="Ruby_nn47">34.7.9 Typemap Examples</a></H3>
 
 
 <p> This section includes a few examples of typemaps. For more
 examples, you might look at the examples in the <tt>Example/ruby</tt>
 directory. </p>
 
-<H3><a name="Ruby_nn48">40.7.10 Converting a Ruby array to a char **</a></H3>
+<H3><a name="Ruby_nn48">34.7.10 Converting a Ruby array to a char **</a></H3>
 
 
 <p> A common problem in many C programs is the processing of
@@ -3627,7 +3627,7 @@ array. Since dynamic memory allocation is used to allocate memory for
 the array, the "freearg" typemap is used to later release this memory
 after the execution of the C function. </p>
 
-<H3><a name="Ruby_nn49">40.7.11 Collecting arguments in a hash</a></H3>
+<H3><a name="Ruby_nn49">34.7.11 Collecting arguments in a hash</a></H3>
 
 
 <p> Ruby's solution to the "keyword arguments" capability of some
@@ -3841,7 +3841,7 @@ memory leak. Fortunately, this typemap is a lot easier to write: </p>
 program that uses the extension, can be found in the <tt>Examples/ruby/hashargs</tt>
 directory of the SWIG distribution. </p>
 
-<H3><a name="Ruby_nn50">40.7.12 Pointer handling</a></H3>
+<H3><a name="Ruby_nn50">34.7.12 Pointer handling</a></H3>
 
 
 <p> Occasionally, it might be necessary to convert pointer values
@@ -3900,7 +3900,7 @@ For example: </p>
 }</pre>
 </div>
 
-<H4><a name="Ruby_nn51">40.7.12.1 Ruby Datatype Wrapping</a></H4>
+<H4><a name="Ruby_nn51">34.7.12.1 Ruby Datatype Wrapping</a></H4>
 
 
 <p> <tt>VALUE Data_Wrap_Struct(VALUE class, void
@@ -3927,7 +3927,7 @@ as above. </div>
 type <i>c-type</i> from the data object <i>obj</i>
 and assigns that pointer to <i>ptr</i>. </div>
 
-<H3><a name="Ruby_nn52">40.7.13 Example: STL Vector to Ruby Array</a></H3>
+<H3><a name="Ruby_nn52">34.7.13 Example: STL Vector to Ruby Array</a></H3>
 
 
 <p>Another use for macros and type maps is to create a Ruby array
@@ -4019,7 +4019,7 @@ STL with ruby, you are advised to use the standard swig STL library,
 which does much more than this. Refer to the section called
 the<a href="#Ruby_nn23_1"> C++ Standard Template Library</a>.
 
-<H2><a name="Ruby_nn65">40.8 Docstring Features</a></H2>
+<H2><a name="Ruby_nn65">34.8 Docstring Features</a></H2>
 
 
 <p>
@@ -4053,7 +4053,7 @@ generate ri documentation from a c wrap file, you could do:</p>
 $ rdoc -r file_wrap.c
 </pre></div>
 
-<H3><a name="Ruby_nn66">40.8.1 Module docstring</a></H3>
+<H3><a name="Ruby_nn66">34.8.1 Module docstring</a></H3>
 
 
 <p>
@@ -4083,7 +4083,7 @@ layout of controls on a panel, etc. to be loaded from an XML file."
 %module(docstring=DOCSTRING) xrc</pre>
 </div>
 
-<H3><a name="Ruby_nn67">40.8.2 %feature("autodoc")</a></H3>
+<H3><a name="Ruby_nn67">34.8.2 %feature("autodoc")</a></H3>
 
 
 <p>Since SWIG does know everything about the function it wraps,
@@ -4104,7 +4104,7 @@ several options for autodoc controlled by the value given to the
 feature, described below.
 </p>
 
-<H4><a name="Ruby_nn68">40.8.2.1 %feature("autodoc", "0")</a></H4>
+<H4><a name="Ruby_nn68">34.8.2.1 %feature("autodoc", "0")</a></H4>
 
 
 <p>
@@ -4128,7 +4128,7 @@ Then Ruby code like this will be generated:
   ...</pre>
 </div>
 
-<H4><a name="Ruby_autodoc1">40.8.2.2 %feature("autodoc", "1")</a></H4>
+<H4><a name="Ruby_autodoc1">34.8.2.2 %feature("autodoc", "1")</a></H4>
 
 
 <p>
@@ -4148,7 +4148,7 @@ this:
   ...</pre>
 </div>
 
-<H4><a name="Ruby_autodoc2">40.8.2.3 %feature("autodoc", "2")</a></H4>
+<H4><a name="Ruby_autodoc2">34.8.2.3 %feature("autodoc", "2")</a></H4>
 
 
 <p>
@@ -4160,7 +4160,7 @@ parameter types with the "2" option will result in Ruby code like
 this:
 </p>
 
-<H4><a name="Ruby_feature_autodoc3">40.8.2.4 %feature("autodoc", "3")</a></H4>
+<H4><a name="Ruby_feature_autodoc3">34.8.2.4 %feature("autodoc", "3")</a></H4>
 
 
 <p>
@@ -4181,7 +4181,7 @@ Parameters:
         bar - Bar</pre>
 </div>
 
-<H4><a name="Ruby_nn70">40.8.2.5 %feature("autodoc", "docstring")</a></H4>
+<H4><a name="Ruby_nn70">34.8.2.5 %feature("autodoc", "docstring")</a></H4>
 
 
 <p>
@@ -4197,7 +4197,7 @@ generated string. For example:
 void GetPosition(int* OUTPUT, int* OUTPUT);</pre>
 </div>
 
-<H3><a name="Ruby_nn71">40.8.3 %feature("docstring")</a></H3>
+<H3><a name="Ruby_nn71">34.8.3 %feature("docstring")</a></H3>
 
 
 <p>
@@ -4208,10 +4208,10 @@ docstring associated with classes, function or methods are output.
 If an item already has an autodoc string then it is combined with the
 docstring and they are output together. </p>
 
-<H2><a name="Ruby_nn53">40.9 Advanced Topics</a></H2>
+<H2><a name="Ruby_nn53">34.9 Advanced Topics</a></H2>
 
 
-<H3><a name="Ruby_operator_overloading">40.9.1 Operator overloading</a></H3>
+<H3><a name="Ruby_operator_overloading">34.9.1 Operator overloading</a></H3>
 
 
 <p> SWIG allows operator overloading with, by using the <tt>%extend</tt>
@@ -4392,7 +4392,7 @@ separate method for handling <i>inequality</i> since Ruby
 parses the expression <i>a != b</i> as <i>!(a == b)</i>.
 </p>
 
-<H3><a name="Ruby_nn55">40.9.2 Creating Multi-Module Packages</a></H3>
+<H3><a name="Ruby_nn55">34.9.2 Creating Multi-Module Packages</a></H3>
 
 
 <p> The chapter on <a href="Modules.html#Modules">Working
@@ -4518,7 +4518,7 @@ irb(main):005:0&gt; <b>c.getX()</b>
 5.0</pre>
 </div>
 
-<H3><a name="Ruby_nn56">40.9.3 Specifying Mixin Modules</a></H3>
+<H3><a name="Ruby_nn56">34.9.3 Specifying Mixin Modules</a></H3>
 
 
 <p> The Ruby language doesn't support multiple inheritance, but
@@ -4585,7 +4585,7 @@ matching rules used for other kinds of features apply (see the chapter
 on <a href="Customization.html#Customization">"Customization
 Features"</a>) for more details). </p>
 
-<H2><a name="Ruby_nn57">40.10 Memory Management</a></H2>
+<H2><a name="Ruby_nn57">34.10 Memory Management</a></H2>
 
 
 <p>One of the most common issues in generating SWIG bindings for
@@ -4608,7 +4608,7 @@ to C++ (or vice versa) depending on what function or methods are
 invoked. Clearly, developing a SWIG wrapper requires a thorough
 understanding of how the underlying library manages memory.</p>
 
-<H3><a name="Ruby_nn58">40.10.1 Mark and Sweep Garbage Collector </a></H3>
+<H3><a name="Ruby_nn58">34.10.1 Mark and Sweep Garbage Collector </a></H3>
 
 
 <p>Ruby uses a mark and sweep garbage collector. When the garbage
@@ -4639,7 +4639,7 @@ any memory has been allocated in creating the underlying C struct or
 C++ struct, then a "free" function must be defined that deallocates
 this memory. </p>
 
-<H3><a name="Ruby_nn59">40.10.2 Object Ownership</a></H3>
+<H3><a name="Ruby_nn59">34.10.2 Object Ownership</a></H3>
 
 
 <p>As described above, memory management depends on clearly
@@ -4784,7 +4784,7 @@ public:
 
 <p> This code can be seen in swig/examples/ruby/tracking.</p>
 
-<H3><a name="Ruby_nn60">40.10.3 Object Tracking</a></H3>
+<H3><a name="Ruby_nn60">34.10.3 Object Tracking</a></H3>
 
 
 <p>The remaining parts of this section will use the class library
@@ -5010,7 +5010,7 @@ However, if you implement your own free functions (see below) you may
 also have to call the <tt>SWIG_RubyRemoveTracking</tt> and <tt>RubyUnlinkObjects</tt>
 methods.</p>
 
-<H3><a name="Ruby_nn61">40.10.4 Mark Functions</a></H3>
+<H3><a name="Ruby_nn61">34.10.4 Mark Functions</a></H3>
 
 
 <p>With a bit more testing, we see that our class library still
@@ -5139,7 +5139,7 @@ irb(main):016:0&gt;</pre>
 
 <p>This code can be seen in swig/examples/ruby/mark_function.</p>
 
-<H3><a name="Ruby_nn62">40.10.5 Free Functions</a></H3>
+<H3><a name="Ruby_nn62">34.10.5 Free Functions</a></H3>
 
 
 <p>By default, SWIG creates a "free" function that is called when
@@ -5307,7 +5307,7 @@ been freed, and thus raises a runtime exception.</p>
 
 <p>This code can be seen in swig/examples/ruby/free_function.</p>
 
-<H3><a name="Ruby_nn63">40.10.6 Embedded Ruby and the C++ Stack</a></H3>
+<H3><a name="Ruby_nn63">34.10.6 Embedded Ruby and the C++ Stack</a></H3>
 
 
 <p>As has been said, the Ruby GC runs and marks objects before
diff --git a/Doc/Manual/Scilab.html b/Doc/Manual/Scilab.html
index 3ea21a753..29c4eacf0 100644
--- a/Doc/Manual/Scilab.html
+++ b/Doc/Manual/Scilab.html
@@ -9,7 +9,7 @@
 
 <body bgcolor="#ffffff">
 
-<H1><a name="Scilab">41 SWIG and Scilab</a></H1>
+<H1><a name="Scilab">35 SWIG and Scilab</a></H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -88,7 +88,7 @@ This chapter explains how to use SWIG for Scilab. After this introduction, you s
 </p>
 
 
-<H2><a name="Scilab_preliminaries">41.1 Preliminaries</a></H2>
+<H2><a name="Scilab_preliminaries">35.1 Preliminaries</a></H2>
 
 
 <p>
@@ -105,7 +105,7 @@ SWIG for Scilab supports C language. C++ is partially supported. See <a href="#S
 </p>
 
 
-<H2><a name="Scilab_running_swig">41.2 Running SWIG</a></H2>
+<H2><a name="Scilab_running_swig">35.2 Running SWIG</a></H2>
 
 
 <p>
@@ -139,7 +139,7 @@ Note: a code in an <tt>%inline</tt> section is both parsed and wrapped by SWIG,
 </p>
 
 
-<H3><a name="Scilab_running_swig_generating_module">41.2.1 Generating the module</a></H3>
+<H3><a name="Scilab_running_swig_generating_module">35.2.1 Generating the module</a></H3>
 
 
 <p>
@@ -182,7 +182,7 @@ The <tt>swig</tt> executable has several other command line options you can use.
 </p>
 
 
-<H3><a name="Scilab_running_swig_building_module">41.2.2 Building the module</a></H3>
+<H3><a name="Scilab_running_swig_building_module">35.2.2 Building the module</a></H3>
 
 
 <p>
@@ -202,7 +202,7 @@ $ gcc -shared example_wrap.o -o libexample.so
 Note: we supposed in this example that the path to the Scilab include directory is <tt>/usr/local/include/scilab</tt> (which is the case in a Debian environment), this should be changed for another environment.
 </p>
 
-<H3><a name="Scilab_running_swig_loading_module">41.2.3 Loading the module</a></H3>
+<H3><a name="Scilab_running_swig_loading_module">35.2.3 Loading the module</a></H3>
 
 
 <p>
@@ -226,7 +226,7 @@ Link done.
 which means that Scilab has successfully loaded the shared library. The module functions and other symbols are now available in Scilab.
 </p>
 
-<H3><a name="Scilab_running_swig_using_module">41.2.4 Using the module</a></H3>
+<H3><a name="Scilab_running_swig_using_module">35.2.4 Using the module</a></H3>
 
 
 <p>
@@ -260,7 +260,7 @@ ans  =
 Note: for conciseness, we assume in the subsequent Scilab code examples that the modules have been beforehand built and loaded in Scilab.
 </p>
 
-<H3><a name="Scilab_running_swig_options">41.2.5 Scilab command line options</a></H3>
+<H3><a name="Scilab_running_swig_options">35.2.5 Scilab command line options</a></H3>
 
 
 <p>
@@ -320,10 +320,10 @@ $ swig -scilab -help
 </pre></div>
 
 
-<H2><a name="Scilab_wrapping">41.3 A basic tour of C/C++ wrapping</a></H2>
+<H2><a name="Scilab_wrapping">35.3 A basic tour of C/C++ wrapping</a></H2>
 
 
-<H3><a name="Scilab_wrapping_overview">41.3.1 Overview</a></H3>
+<H3><a name="Scilab_wrapping_overview">35.3.1 Overview</a></H3>
 
 
 <p>
@@ -332,7 +332,7 @@ This means that functions, structs, classes, variables, etc... are interfaced th
 There are a few exceptions, such as constants and enumerations, which can be wrapped directly as Scilab variables.
 </p>
 
-<H3><a name="Scilab_wrapping_identifiers">41.3.2 Identifiers</a></H3>
+<H3><a name="Scilab_wrapping_identifiers">35.3.2 Identifiers</a></H3>
 
 
 <p>
@@ -347,7 +347,7 @@ In these cases, the <a href="SWIG.html#SWIG_rename_ignore">%rename directive</a>
 Note: truncations can be disabled by specifying the target version 6 of Scilab in the <tt>targetversion</tt> argument (i.e. <tt>-targetversion 6</tt>).
 </p>
 
-<H3><a name="Scilab_wrapping_functions">41.3.3 Functions</a></H3>
+<H3><a name="Scilab_wrapping_functions">35.3.3 Functions</a></H3>
 
 
 <p>
@@ -378,7 +378,7 @@ ans  =
     24.
 </pre></div>
 
-<H4><a name="Scilab_nn13">41.3.3.1 Argument passing</a></H4>
+<H4><a name="Scilab_nn13">35.3.3.1 Argument passing</a></H4>
 
 
 <p>
@@ -431,7 +431,7 @@ In Scilab, parameters are passed by value. The output (and inout) parameters are
     7.
 </pre></div>
 
-<H4><a name="Scilab_nn14">41.3.3.2 Multiple output arguments</a></H4>
+<H4><a name="Scilab_nn14">35.3.3.2 Multiple output arguments</a></H4>
 
 
 <p>
@@ -480,7 +480,7 @@ int divide(int n, int d, int *OUTPUT, int *OUTPUT);
 </pre></div>
 
 
-<H3><a name="Scilab_wrapping_global_variables">41.3.4 Global variables</a></H3>
+<H3><a name="Scilab_wrapping_global_variables">35.3.4 Global variables</a></H3>
 
 
 <p>
@@ -549,10 +549,10 @@ It works the same:</p>
 </pre></div>
 
 
-<H3><a name="Scilab_wrapping_constants_and_enums">41.3.5 Constants and enumerations</a></H3>
+<H3><a name="Scilab_wrapping_constants_and_enums">35.3.5 Constants and enumerations</a></H3>
 
 
-<H4><a name="Scilab_wrapping_constants">41.3.5.1 Constants</a></H4>
+<H4><a name="Scilab_wrapping_constants">35.3.5.1 Constants</a></H4>
 
 
 <p>
@@ -693,7 +693,7 @@ are mapped to Scilab variables, with the same name:
     3.14
 </pre></div>
 
-<H4><a name="Scilab_wrapping_enums">41.3.5.2 Enumerations</a></H4>
+<H4><a name="Scilab_wrapping_enums">35.3.5.2 Enumerations</a></H4>
 
 
 <p>
@@ -758,7 +758,7 @@ typedef enum { RED, BLUE, GREEN } color;
 
 </pre></div>
 
-<H3><a name="Scilab_wrapping_pointers">41.3.6 Pointers</a></H3>
+<H3><a name="Scilab_wrapping_pointers">35.3.6 Pointers</a></H3>
 
 
 <p>
@@ -820,7 +820,7 @@ Note: the type name <tt>_p_FILE</tt> which means "pointer to FILE".
 The user of a pointer is responsible for freeing it or, like in the example, closing any resources associated with it (just as is required in a C program).
 </p>
 
-<H4><a name="Scilab_wrapping_pointers_utility_functions">41.3.6.1 Utility functions</a></H4>
+<H4><a name="Scilab_wrapping_pointers_utility_functions">35.3.6.1 Utility functions</a></H4>
 
 
 <p>
@@ -861,7 +861,7 @@ ans  =
 </pre></div>
 
 
-<H4><a name="Scilab_wrapping_pointers_null_pointers">41.3.6.2 Null pointers:</a></H4>
+<H4><a name="Scilab_wrapping_pointers_null_pointers">35.3.6.2 Null pointers:</a></H4>
 
 
 <p>
@@ -877,7 +877,7 @@ Using the previous <tt>SWIG_this()</tt> and <tt>SWIG_ptr()</tt>, it is possible
 </pre></div>
 
 
-<H3><a name="Scilab_wrapping_structs">41.3.7 Structures</a></H3>
+<H3><a name="Scilab_wrapping_structs">35.3.7 Structures</a></H3>
 
 
 <p>
@@ -986,7 +986,7 @@ Note: the pointer to the struct works as described in <a href="Scilab_wrapping_p
 --&gt; delete_Bar(b);
 </pre></div>
 
-<H3><a name="Scilab_wrapping_cpp_classes">41.3.8 C++ classes</a></H3>
+<H3><a name="Scilab_wrapping_cpp_classes">35.3.8 C++ classes</a></H3>
 
 
 <p>
@@ -1054,7 +1054,7 @@ Note: like structs, class pointers are mapped as described in <a href="Scilab_wr
 --&gt; delete_Point(p);
 </pre></div>
 
-<H3><a name="Scilab_wrapping_cpp_inheritance">41.3.9 C++ inheritance</a></H3>
+<H3><a name="Scilab_wrapping_cpp_inheritance">35.3.9 C++ inheritance</a></H3>
 
 
 <p>
@@ -1129,7 +1129,7 @@ But we can use either use the <tt>get_perimeter()</tt> function of the parent cl
     18.84
 </pre></div>
 
-<H3><a name="Scilab_wrapping_cpp_overloading">41.3.10 C++ overloading</a></H3>
+<H3><a name="Scilab_wrapping_cpp_overloading">35.3.10 C++ overloading</a></H3>
 
 
 <p>
@@ -1169,7 +1169,7 @@ void magnify(Circle *circle, double factor) {
 </pre></div>
 
 
-<H3><a name="Scilab_wrapping_pointers_references_values_arrays">41.3.11 Pointers, references, values, and arrays</a></H3>
+<H3><a name="Scilab_wrapping_pointers_references_values_arrays">35.3.11 Pointers, references, values, and arrays</a></H3>
 
 
 <p>
@@ -1227,7 +1227,7 @@ All these functions will return a pointer to an instance of <tt>Foo</tt>.
 As the function <tt>spam7</tt> returns a value, new instance of <tt>Foo</tt> has to be allocated, and a pointer on this instance is returned.
 </p>
 
-<H3><a name="Scilab_wrapping_cpp_templates">41.3.12 C++ templates</a></H3>
+<H3><a name="Scilab_wrapping_cpp_templates">35.3.12 C++ templates</a></H3>
 
 
 <p>
@@ -1286,7 +1286,7 @@ Then in Scilab:
 More details on template support can be found in the <a href="SWIGPlus.html#SWIGPlus_nn30">templates</a> documentation.
 </p>
 
-<H3><a name="Scilab_wrapping_cpp_operators">41.3.13 C++ operators</a></H3>
+<H3><a name="Scilab_wrapping_cpp_operators">35.3.13 C++ operators</a></H3>
 
 
 <p>
@@ -1339,7 +1339,7 @@ private:
 </pre></div>
 
 
-<H3><a name="Scilab_wrapping_cpp_namespaces">41.3.14 C++ namespaces</a></H3>
+<H3><a name="Scilab_wrapping_cpp_namespaces">35.3.14 C++ namespaces</a></H3>
 
 
 <p>
@@ -1417,7 +1417,7 @@ Note: the <a href="SWIGPlus.html#SWIGPlus_nspace">nspace</a> feature is not supp
 </p>
 
 
-<H3><a name="Scilab_wrapping_cpp_exceptions">41.3.15 C++ exceptions</a></H3>
+<H3><a name="Scilab_wrapping_cpp_exceptions">35.3.15 C++ exceptions</a></H3>
 
 
 <p>
@@ -1500,17 +1500,17 @@ More complex or custom exception types require specific exception typemaps to be
 See the <a href="SWIGPlus.html#SWIGPlus">SWIG C++ documentation</a> for more details.
 </p>
 
-<H3><a name="Scilab_wrapping_cpp_stl">41.3.16 C++ STL</a></H3>
+<H3><a name="Scilab_wrapping_cpp_stl">35.3.16 C++ STL</a></H3>
 
 
 <p>
 The Standard Template Library (STL) is partially supported. See <a href="#Scilab_typemaps_stl">STL</a> for more details.
 </p>
 
-<H2><a name="Scilab_typemaps">41.4 Type mappings and libraries</a></H2>
+<H2><a name="Scilab_typemaps">35.4 Type mappings and libraries</a></H2>
 
 
-<H3><a name="Scilab_typemaps_primitive_types">41.4.1 Default primitive type mappings</a></H3>
+<H3><a name="Scilab_typemaps_primitive_types">35.4.1 Default primitive type mappings</a></H3>
 
 
 <p>
@@ -1561,7 +1561,7 @@ The default behaviour is for SWIG to generate code that will give a runtime erro
 
 
 
-<H3><a name="Scilab_typemaps_arrays">41.4.2 Arrays</a></H3>
+<H3><a name="Scilab_typemaps_arrays">35.4.2 Arrays</a></H3>
 
 
 <p>
@@ -1616,7 +1616,7 @@ void printArray(int values[], int len) {
 [ 0  1  2  3 ]
 </pre></div>
 
-<H3><a name="Scilab_typemaps_pointer-to-pointers">41.4.3 Pointer-to-pointers</a></H3>
+<H3><a name="Scilab_typemaps_pointer-to-pointers">35.4.3 Pointer-to-pointers</a></H3>
 
 
 <p>
@@ -1689,7 +1689,7 @@ void print_matrix(double **M, int nbRows, int nbCols) {
 </pre></div>
 
 
-<H3><a name="Scilab_typemaps_matrices">41.4.4 Matrices</a></H3>
+<H3><a name="Scilab_typemaps_matrices">35.4.4 Matrices</a></H3>
 
 
 <p>
@@ -1782,7 +1782,7 @@ The remarks made earlier for arrays also apply here:
 <li>There is no control while converting <tt>double</tt> values to integers, <tt>double</tt> values are truncated without any checking or warning.</li>
 </ul>
 
-<H3><a name="Scilab_typemaps_stl">41.4.5 STL</a></H3>
+<H3><a name="Scilab_typemaps_stl">35.4.5 STL</a></H3>
 
 
 <p>
@@ -1982,7 +1982,7 @@ ans  =
 --&gt; delete_PersonPtrSet(p);
 </pre></div>
 
-<H2><a name="Scilab_module_initialization">41.5 Module initialization</a></H2>
+<H2><a name="Scilab_module_initialization">35.5 Module initialization</a></H2>
 
 
 <p>
@@ -2006,7 +2006,7 @@ For example, to initialize the module <tt>example</tt>:
 --&gt; example_Init();
 </pre></div>
 
-<H2><a name="Scilab_building_modes">41.6 Building modes</a></H2>
+<H2><a name="Scilab_building_modes">35.6 Building modes</a></H2>
 
 
 <p>
@@ -2021,7 +2021,7 @@ To produce a dynamic module, when generating the wrapper, there are two possibil
 <li>the <tt>builder</tt> mode. In this mode, Scilab is responsible of building.
 </ul>
 
-<H3><a name="Scilab_building_modes_nobuilder_mode">41.6.1 No-builder mode</a></H3>
+<H3><a name="Scilab_building_modes_nobuilder_mode">35.6.1 No-builder mode</a></H3>
 
 
 <p>
@@ -2034,7 +2034,7 @@ This mode is the best option to use when you have to integrate the module build
 </p>
 
 
-<H3><a name="Scilab_building_modes_builder_mode">41.6.2 Builder mode</a></H3>
+<H3><a name="Scilab_building_modes_builder_mode">35.6.2 Builder mode</a></H3>
 
 
 <p>
@@ -2074,14 +2074,14 @@ The command is:
 $ swig -scilab -builder -buildercflags -I/opt/foo/include -builderldflags "-L/opt/foo/lib -lfoo" -buildersources baa1.cxx, baa2.cxx example.i
 </pre></div>
 
-<H2><a name="Scilab_generated_scripts">41.7 Generated scripts</a></H2>
+<H2><a name="Scilab_generated_scripts">35.7 Generated scripts</a></H2>
 
 
 <p>
 In this part we give some details about the generated Scilab scripts.
 </p>
 
-<H3><a name="Scilab_generated_scripts_builder_script">41.7.1 Builder script</a></H3>
+<H3><a name="Scilab_generated_scripts_builder_script">35.7.1 Builder script</a></H3>
 
 
 <p>
@@ -2106,7 +2106,7 @@ ilib_build(ilib_name, table, files, libs);
 <li><tt><b>table</b></tt>: two column string matrix containing a table of pairs of 'scilab function name', 'C function name'.</li>
 </ul>
 
-<H3><a name="Scilab_generated_scripts_loader_script">41.7.2 Loader script</a></H3>
+<H3><a name="Scilab_generated_scripts_loader_script">35.7.2 Loader script</a></H3>
 
 
 <p>
@@ -2145,7 +2145,7 @@ clear get_file_path;
 </ul>
 
 
-<H2><a name="Scilab_other_resources">41.8 Other resources</a></H2>
+<H2><a name="Scilab_other_resources">35.8 Other resources</a></H2>
 
 
 <ul>
diff --git a/Doc/Manual/Tcl.html b/Doc/Manual/Tcl.html
index 2eb49bde9..ba5ca3852 100644
--- a/Doc/Manual/Tcl.html
+++ b/Doc/Manual/Tcl.html
@@ -7,7 +7,7 @@
 </head>
 
 <body bgcolor="#ffffff">
-<H1><a name="Tcl">42 SWIG and Tcl</a></H1>
+<H1><a name="Tcl">36 SWIG and Tcl</a></H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -84,7 +84,7 @@ Tcl 8.0 or a later release.   Earlier releases of SWIG supported Tcl 7.x, but
 this is no longer supported.
 </p>
 
-<H2><a name="Tcl_nn2">42.1 Preliminaries</a></H2>
+<H2><a name="Tcl_nn2">36.1 Preliminaries</a></H2>
 
 
 <p>
@@ -110,7 +110,7 @@ build a Tcl extension module.  To finish building the module, you
 need to compile this file and link it with the rest of your program.
 </p>
 
-<H3><a name="Tcl_nn3">42.1.1 Getting the right header files</a></H3>
+<H3><a name="Tcl_nn3">36.1.1 Getting the right header files</a></H3>
 
 
 <p>
@@ -128,7 +128,7 @@ this is the case, you should probably make a symbolic link so that <tt>tcl.h</tt
 header file.
 </p>
 
-<H3><a name="Tcl_nn4">42.1.2 Compiling a dynamic module</a></H3>
+<H3><a name="Tcl_nn4">36.1.2 Compiling a dynamic module</a></H3>
 
 
 <p>
@@ -164,7 +164,7 @@ The name of the module is specified using the <tt>%module</tt> directive or the
  <tt>-module</tt> command line option.
 </p>
 
-<H3><a name="Tcl_nn5">42.1.3 Static linking</a></H3>
+<H3><a name="Tcl_nn5">36.1.3 Static linking</a></H3>
 
 
 <p>
@@ -230,7 +230,7 @@ minimal in most situations (and quite frankly not worth the extra
 hassle in the opinion of this author). 
 </p>
 
-<H3><a name="Tcl_nn6">42.1.4 Using your module</a></H3>
+<H3><a name="Tcl_nn6">36.1.4 Using your module</a></H3>
 
 
 <p>
@@ -358,7 +358,7 @@ to the default system configuration (this requires root access and you will need
 the man pages). 
 </p>
 
-<H3><a name="Tcl_nn7">42.1.5 Compilation of C++ extensions</a></H3>
+<H3><a name="Tcl_nn7">36.1.5 Compilation of C++ extensions</a></H3>
 
 
 <p>
@@ -441,7 +441,7 @@ erratic program behavior.   If working with lots of software components, you
 might want to investigate using a more formal standard such as COM.
 </p>
 
-<H3><a name="Tcl_nn8">42.1.6 Compiling for 64-bit platforms</a></H3>
+<H3><a name="Tcl_nn8">36.1.6 Compiling for 64-bit platforms</a></H3>
 
 
 <p>
@@ -468,7 +468,7 @@ also introduce problems on platforms that support more than one
 linking standard (e.g., -o32 and -n32 on Irix).
 </p>
 
-<H3><a name="Tcl_nn9">42.1.7 Setting a package prefix</a></H3>
+<H3><a name="Tcl_nn9">36.1.7 Setting a package prefix</a></H3>
 
 
 <p>
@@ -487,7 +487,7 @@ option will append the prefix to the name when creating a command and
 call it "<tt>Foo_bar</tt>".
 </p>
 
-<H3><a name="Tcl_nn10">42.1.8 Using namespaces</a></H3>
+<H3><a name="Tcl_nn10">36.1.8 Using namespaces</a></H3>
 
 
 <p>
@@ -509,7 +509,7 @@ When the <tt>-namespace</tt> option is used, objects in the module
 are always accessed with the namespace name such as <tt>Foo::bar</tt>.
 </p>
 
-<H2><a name="Tcl_nn11">42.2 Building Tcl/Tk Extensions under Windows 95/NT</a></H2>
+<H2><a name="Tcl_nn11">36.2 Building Tcl/Tk Extensions under Windows 95/NT</a></H2>
 
 
 <p>
@@ -520,7 +520,7 @@ covers the process of using SWIG with Microsoft Visual C++.
 although the procedure may be similar with other compilers.
 </p>
 
-<H3><a name="Tcl_nn12">42.2.1 Running SWIG from Developer Studio</a></H3>
+<H3><a name="Tcl_nn12">36.2.1 Running SWIG from Developer Studio</a></H3>
 
 
 <p>
@@ -578,7 +578,7 @@ MSDOS &gt; tclsh80
 %
 </pre></div>
 
-<H3><a name="Tcl_nn13">42.2.2 Using NMAKE</a></H3>
+<H3><a name="Tcl_nn13">36.2.2 Using NMAKE</a></H3>
 
 
 <p>
@@ -641,7 +641,7 @@ to get you started.  With a little practice, you'll be making lots of
 Tcl extensions.
 </p>
 
-<H2><a name="Tcl_nn14">42.3 A tour of basic C/C++ wrapping</a></H2>
+<H2><a name="Tcl_nn14">36.3 A tour of basic C/C++ wrapping</a></H2>
 
 
 <p>
@@ -652,7 +652,7 @@ classes.  This section briefly covers the essential aspects of this
 wrapping.
 </p>
 
-<H3><a name="Tcl_nn15">42.3.1 Modules</a></H3>
+<H3><a name="Tcl_nn15">36.3.1 Modules</a></H3>
 
 
 <p>
@@ -686,7 +686,7 @@ To fix this, supply an extra argument to <tt>load</tt> like this:
 </pre>
 </div>
 
-<H3><a name="Tcl_nn16">42.3.2 Functions</a></H3>
+<H3><a name="Tcl_nn16">36.3.2 Functions</a></H3>
 
 
 <p>
@@ -711,7 +711,7 @@ like you think it does:
 %
 </pre></div>
 
-<H3><a name="Tcl_nn17">42.3.3 Global variables</a></H3>
+<H3><a name="Tcl_nn17">36.3.3 Global variables</a></H3>
 
 
 <p>
@@ -791,7 +791,7 @@ extern char *path;      // Read-only (due to %immutable)
 </pre>
 </div>
 
-<H3><a name="Tcl_nn18">42.3.4 Constants and enums</a></H3>
+<H3><a name="Tcl_nn18">36.3.4 Constants and enums</a></H3>
 
 
 <p>
@@ -875,7 +875,7 @@ When an identifier name is given, it is used to perform an implicit hash-table l
 conversion.  This allows the <tt>global</tt> statement to be omitted.
 </p>
 
-<H3><a name="Tcl_nn19">42.3.5 Pointers</a></H3>
+<H3><a name="Tcl_nn19">36.3.5 Pointers</a></H3>
 
 
 <p>
@@ -971,7 +971,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return
 <tt>None</tt> if the conversion can't be performed.
 </p>
 
-<H3><a name="Tcl_nn20">42.3.6 Structures</a></H3>
+<H3><a name="Tcl_nn20">36.3.6 Structures</a></H3>
 
 
 <p>
@@ -1253,7 +1253,7 @@ Note: Tcl only destroys the underlying object if it has ownership.  See the
 memory management section that appears shortly.
 </p>
 
-<H3><a name="Tcl_nn21">42.3.7 C++ classes</a></H3>
+<H3><a name="Tcl_nn21">36.3.7 C++ classes</a></H3>
 
 
 <p>
@@ -1319,7 +1319,7 @@ In Tcl, the static member is accessed as follows:
 </pre>
 </div>
 
-<H3><a name="Tcl_nn22">42.3.8 C++ inheritance</a></H3>
+<H3><a name="Tcl_nn22">36.3.8 C++ inheritance</a></H3>
 
 
 <p>
@@ -1368,7 +1368,7 @@ For instance:
 It is safe to use multiple inheritance with SWIG.
 </p>
 
-<H3><a name="Tcl_nn23">42.3.9 Pointers, references, values, and arrays</a></H3>
+<H3><a name="Tcl_nn23">36.3.9 Pointers, references, values, and arrays</a></H3>
 
 
 <p>
@@ -1422,7 +1422,7 @@ to hold the result and a pointer is returned (Tcl will release this memory
 when the return value is garbage collected).
 </p>
 
-<H3><a name="Tcl_nn24">42.3.10 C++ overloaded functions</a></H3>
+<H3><a name="Tcl_nn24">36.3.10 C++ overloaded functions</a></H3>
 
 
 <p>
@@ -1545,7 +1545,7 @@ first declaration takes precedence.
 Please refer to the "SWIG and C++" chapter for more information about overloading. 
 </p>
 
-<H3><a name="Tcl_nn25">42.3.11 C++ operators</a></H3>
+<H3><a name="Tcl_nn25">36.3.11 C++ operators</a></H3>
 
 
 <p>
@@ -1647,7 +1647,7 @@ There are ways to make this operator appear as part of the class using the <tt>%
 Keep reading.
 </p>
 
-<H3><a name="Tcl_nn26">42.3.12 C++ namespaces</a></H3>
+<H3><a name="Tcl_nn26">36.3.12 C++ namespaces</a></H3>
 
 
 <p>
@@ -1711,7 +1711,7 @@ utilizes thousands of small deeply nested namespaces each with
 identical symbol names, well, then you get what you deserve.
 </p>
 
-<H3><a name="Tcl_nn27">42.3.13 C++ templates</a></H3>
+<H3><a name="Tcl_nn27">36.3.13 C++ templates</a></H3>
 
 
 <p>
@@ -1763,7 +1763,7 @@ More details can be found in the <a href="SWIGPlus.html#SWIGPlus">SWIG and C++</
 examples will appear later.
 </p>
 
-<H3><a name="Tcl_nn28">42.3.14 C++ Smart Pointers</a></H3>
+<H3><a name="Tcl_nn28">36.3.14 C++ Smart Pointers</a></H3>
 
 
 <p>
@@ -1847,7 +1847,7 @@ simply use the <tt>__deref__()</tt> method.  For example:
 </pre>
 </div>
 
-<H2><a name="Tcl_nn29">42.4 Further details on the Tcl class interface</a></H2>
+<H2><a name="Tcl_nn29">36.4 Further details on the Tcl class interface</a></H2>
 
 
 <p>
@@ -1860,7 +1860,7 @@ of low-level details were omitted.  This section provides a brief overview
 of how the proxy classes work.
 </p>
 
-<H3><a name="Tcl_nn30">42.4.1 Proxy classes</a></H3>
+<H3><a name="Tcl_nn30">36.4.1 Proxy classes</a></H3>
 
 
 <p>
@@ -1925,7 +1925,7 @@ function.   This allows objects to be encapsulated objects that look a lot like
 as shown in the last section.
 </p>
 
-<H3><a name="Tcl_nn31">42.4.2 Memory management</a></H3>
+<H3><a name="Tcl_nn31">36.4.2 Memory management</a></H3>
 
 
 <p>
@@ -2113,7 +2113,7 @@ typemaps--an advanced topic discussed later.
 </p>
 
 
-<H2><a name="Tcl_nn32">42.5 Input and output parameters</a></H2>
+<H2><a name="Tcl_nn32">36.5 Input and output parameters</a></H2>
 
 
 <p>
@@ -2301,7 +2301,7 @@ set c  [lindex $dim 1]
 </pre>
 </div>
 
-<H2><a name="Tcl_nn33">42.6 Exception handling </a></H2>
+<H2><a name="Tcl_nn33">36.6 Exception handling </a></H2>
 
 
 <p>
@@ -2435,7 +2435,7 @@ Since SWIG's exception handling is user-definable, you are not limited to C++ ex
 See the chapter on "<a href="Customization.html#Customization">Customization Features</a>" for more examples.
 </p>
 
-<H2><a name="Tcl_nn34">42.7 Typemaps</a></H2>
+<H2><a name="Tcl_nn34">36.7 Typemaps</a></H2>
 
 
 <p>
@@ -2452,7 +2452,7 @@ Typemaps are only used if you want to change some aspect of the primitive
 C-Tcl interface.
 </p>
 
-<H3><a name="Tcl_nn35">42.7.1 What is a typemap?</a></H3>
+<H3><a name="Tcl_nn35">36.7.1 What is a typemap?</a></H3>
 
 
 <p>
@@ -2572,7 +2572,7 @@ parameter is omitted):
 </pre>
 </div>
 
-<H3><a name="Tcl_nn36">42.7.2 Tcl typemaps</a></H3>
+<H3><a name="Tcl_nn36">36.7.2 Tcl typemaps</a></H3>
 
 
 <p>
@@ -2710,7 +2710,7 @@ Initialize an argument to a value before any conversions occur.
 Examples of these methods will appear shortly.
 </p>
 
-<H3><a name="Tcl_nn37">42.7.3 Typemap variables</a></H3>
+<H3><a name="Tcl_nn37">36.7.3 Typemap variables</a></H3>
 
 
 <p>
@@ -2781,7 +2781,7 @@ properly assigned.
 The Tcl name of the wrapper function being created.
 </div>
 
-<H3><a name="Tcl_nn38">42.7.4 Converting  a Tcl list to a char ** </a></H3>
+<H3><a name="Tcl_nn38">36.7.4 Converting  a Tcl list to a char ** </a></H3>
 
 
 <p>
@@ -2843,7 +2843,7 @@ argv[2] = Larry
 3
 </pre></div>
 
-<H3><a name="Tcl_nn39">42.7.5 Returning values in arguments</a></H3>
+<H3><a name="Tcl_nn39">36.7.5 Returning values in arguments</a></H3>
 
 
 <p>
@@ -2885,7 +2885,7 @@ result, a Tcl function using these typemaps will work like this :
 %
 </pre></div>
 
-<H3><a name="Tcl_nn40">42.7.6 Useful functions</a></H3>
+<H3><a name="Tcl_nn40">36.7.6 Useful functions</a></H3>
 
 
 <p>
@@ -2961,7 +2961,7 @@ int      Tcl_IsShared(Tcl_Obj *obj);
 </pre>
 </div>
 
-<H3><a name="Tcl_nn41">42.7.7 Standard  typemaps</a></H3>
+<H3><a name="Tcl_nn41">36.7.7 Standard  typemaps</a></H3>
 
 
 <p>
@@ -3045,7 +3045,7 @@ work)
 </pre>
 </div>
 
-<H3><a name="Tcl_nn42">42.7.8 Pointer handling</a></H3>
+<H3><a name="Tcl_nn42">36.7.8 Pointer handling</a></H3>
 
 
 <p>
@@ -3127,7 +3127,7 @@ For example:
 </pre>
 </div>
 
-<H2><a name="Tcl_nn43">42.8 Turning a SWIG module into a Tcl Package.</a></H2>
+<H2><a name="Tcl_nn43">36.8 Turning a SWIG module into a Tcl Package.</a></H2>
 
 
 <p>
@@ -3199,7 +3199,7 @@ As a final note, most SWIG examples do not yet use the
 to use the <tt>load</tt> command instead.
 </p>
 
-<H2><a name="Tcl_nn44">42.9 Building new kinds of Tcl interfaces (in Tcl)</a></H2>
+<H2><a name="Tcl_nn44">36.9 Building new kinds of Tcl interfaces (in Tcl)</a></H2>
 
 
 <p>
@@ -3298,7 +3298,7 @@ danger of blowing something up (although it is easily accomplished
 with an out of bounds array access).
 </p>
 
-<H3><a name="Tcl_nn45">42.9.1 Proxy classes</a></H3>
+<H3><a name="Tcl_nn45">36.9.1 Proxy classes</a></H3>
 
 
 <p>
@@ -3419,7 +3419,7 @@ short, but clever Tcl script can be combined with SWIG to do many
 interesting things.
 </p>
 
-<H2><a name="Tcl_nn46">42.10 Tcl/Tk Stubs</a></H2>
+<H2><a name="Tcl_nn46">36.10 Tcl/Tk Stubs</a></H2>
 
 
 <p>
author	William S Fulton <wsf@fultondesigns.co.uk>	2019-02-10 01:03:06 +0000
committer	William S Fulton <wsf@fultondesigns.co.uk>	2019-02-10 01:03:06 +0000
commit	940e32477dba502a98477960d5a0d1385f7e2edb (patch)
tree	af56ad2dc60b187bad87450c6ef6dedbd4eef27c /Doc
parent	24682a724302b70d3b363fbbe0125ab0c53384b6 (diff)
download	swig-940e32477dba502a98477960d5a0d1385f7e2edb.tar.gz