diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html
index c4dbfe093..a315096a5 100644
--- a/Doc/Manual/Contents.html
+++ b/Doc/Manual/Contents.html
@@ -598,6 +598,7 @@
 <ul>
 <li><a href="CSharp.html#csharp_memory_management_member_variables">Memory management when returning references to member variables</a>
 <li><a href="CSharp.html#csharp_memory_management_objects">Memory management for objects passed to the C++ layer</a>
+<li><a href="CSharp.html#csharp_date_marshalling">Date marshalling using the csin typemap and associated attributes</a>
 </ul>
 </ul>
 </div>
@@ -798,6 +799,7 @@
 <li><a href="Java.html#struct_pointer_pointer">Struct pointer to pointer</a>
 <li><a href="Java.html#java_memory_management_member_variables">Memory management when returning references to member variables</a>
 <li><a href="Java.html#java_memory_management_objects">Memory management for objects passed to the C++ layer</a>
+<li><a href="Java.html#java_date_marshalling">Date marshalling using the javain typemap and associated attributes</a>
 </ul>
 <li><a href="Java.html#java_directors_faq">Living with Java Directors</a>
 <li><a href="Java.html#odds_ends">Odds and ends</a>
@@ -823,7 +825,7 @@
 <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></li>
+<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>
@@ -1364,9 +1366,9 @@
 <li><a href="R.html#R_nn3">Using R and SWIG</a>
 <li><a href="R.html#R_nn4">Precompiling large R files</a>
 <li><a href="R.html#R_nn5">General policy</a>
-<li><a href="R.html#R_nn6">Language conventions</a>
-<li><a href="R.html#R_nn7">C++ classes</a>
-<li><a href="R.html#R_nn8">Enumerations</a>
+<li><a href="R.html#R_language_conventions">Language conventions</a>
+<li><a href="R.html#R_nn6">C++ classes</a>
+<li><a href="R.html#R_nn7">Enumerations</a>
 </ul>
 </div>
 <!-- INDEX -->
diff --git a/Doc/Manual/Lisp.html b/Doc/Manual/Lisp.html
index d462f339e..ca2d0414e 100644
--- a/Doc/Manual/Lisp.html
+++ b/Doc/Manual/Lisp.html
@@ -16,7 +16,7 @@
 <li><a href="#Lisp_nn4">Additional Commandline Options </a>
 <li><a href="#Lisp_nn5">Generating CFFI bindings</a>
 <li><a href="#Lisp_nn6">Generating CFFI bindings for C++ code</a>
-<li><a href="#Lisp_nn7">Inserting user code into generated files</a></li>
+<li><a href="#Lisp_nn7">Inserting user code into generated files</a>
 </ul>
 <li><a href="#Lisp_nn8">CLISP</a>
 <ul>
@@ -570,6 +570,7 @@ If you have any questions, suggestions, patches, etc., related to CFFI
 
 <H3><a name="Lisp_nn7"></a>21.2.4 Inserting user code into generated files</H3>
 
+
 <p>
 It is often necessary to <a href="SWIG.html#SWIG_nn40">include user-defined code</a> 
 into the automatically generated interface files. For example, when building
diff --git a/Doc/Manual/R.html b/Doc/Manual/R.html
index 0e3aac30b..461058a3a 100644
--- a/Doc/Manual/R.html
+++ b/Doc/Manual/R.html
@@ -14,9 +14,9 @@
 <li><a href="#R_nn3">Using R and SWIG</a>
 <li><a href="#R_nn4">Precompiling large R files</a>
 <li><a href="#R_nn5">General policy</a>
-<li><a href="#R_nn6">Language conventions</a>
-<li><a href="#R_nn7">C++ classes</a>
-<li><a href="#R_nn8">Enumerations</a>
+<li><a href="#R_language_conventions">Language conventions</a>
+<li><a href="#R_nn6">C++ classes</a>
+<li><a href="#R_nn7">Enumerations</a>
 </ul>
 </div>
 <!-- INDEX -->
@@ -127,7 +127,7 @@ wrapping over the underlying functions and rely on the R type system
 to provide R syntax.
 </p>
 
-<H2><a name="R_nn6"></a>32.5 Language conventions</H2>
+<H2><a name="R_language_conventions"></a>32.5 Language conventions</H2>
 
 
 <p>
@@ -136,7 +136,7 @@ and [ are overloaded to allow for R syntax (one based indices and
 slices)
 </p>
 
-<H2><a name="R_nn7"></a>32.6 C++ classes</H2>
+<H2><a name="R_nn6"></a>32.6 C++ classes</H2>
 
 
 <p>
@@ -148,7 +148,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_nn8"></a>32.7 Enumerations</H2>
+<H2><a name="R_nn7"></a>32.7 Enumerations</H2>
 
 
 <p>