diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html
index 6d2cdaa76..54fa30637 100644
--- a/Doc/Manual/Contents.html
+++ b/Doc/Manual/Contents.html
@@ -142,8 +142,8 @@
 <li><a href="SWIG.html#SWIG_nn10">Basic Type Handling</a>
 <li><a href="SWIG.html#SWIG_nn11">Global Variables</a>
 <li><a href="SWIG.html#SWIG_nn12">Constants</a>
-<li><a href="SWIG.html#SWIG_nn13">A brief word about <tt>const</tt></a>
-<li><a href="SWIG.html#SWIG_nn14">A cautionary tale of <tt>char *</tt></a>
+<li><a href="SWIG.html#SWIG_nn13">A brief word about const</a>
+<li><a href="SWIG.html#SWIG_nn14">A cautionary tale of char *</a>
 </ul>
 <li><a href="SWIG.html#SWIG_nn15">Pointers and complex objects</a>
 <ul>
@@ -158,7 +158,7 @@
 <li><a href="SWIG.html#SWIG_nn22">Passing structures by value</a>
 <li><a href="SWIG.html#SWIG_nn23">Return by value</a>
 <li><a href="SWIG.html#SWIG_nn24">Linking to structure variables</a>
-<li><a href="SWIG.html#SWIG_nn25">Linking to <tt>char *</tt></a>
+<li><a href="SWIG.html#SWIG_nn25">Linking to char *</a>
 <li><a href="SWIG.html#SWIG_nn26">Arrays</a>
 <li><a href="SWIG.html#SWIG_readonly_variables">Creating read-only variables</a>
 <li><a href="SWIG.html#SWIG_rename_ignore">Renaming and ignoring declarations</a>
@@ -480,7 +480,7 @@
 <li><a href="Typemaps.html#Typemaps_runtime_type_checker_usage">Usage</a>
 </ul>
 <li><a href="Typemaps.html#Typemaps_overloading">Typemaps and overloading</a>
-<li><a href="Typemaps.html#Typemaps_nn48">More about <tt>%apply</tt> and <tt>%clear</tt></a>
+<li><a href="Typemaps.html#Typemaps_nn48">More about %apply and %clear</a>
 <li><a href="Typemaps.html#Typemaps_nn47">Passing data between typemaps</a>
 <li><a href="Typemaps.html#Typemaps_nn52">C++ "this" pointer</a>
 <li><a href="Typemaps.html#Typemaps_nn51">Where to go for more information?</a>
@@ -821,13 +821,13 @@
 <li><a href="D.html#D_code_injection_typemaps">Code injection typemaps</a>
 <li><a href="D.html#D_special_variables">Special variable macros</a>
 </ul>
-<li><a href="D.html#D_features"><tt>%feature</tt>s</a>
+<li><a href="D.html#D_features">D and %feature</a>
 <li><a href="D.html#D_pragmas">Pragmas</a>
 <li><a href="D.html#D_exceptions">D Exceptions</a>
 <li><a href="D.html#D_directors">D Directors</a>
 <li><a href="D.html#D_other_features">Other features</a>
 <ul>
-<li><a href="D.html#D_nspace">Extended namespace support (<tt>nspace</tt>)</a>
+<li><a href="D.html#D_nspace">Extended namespace support (nspace)</a>
 <li><a href="D.html#D_native_pointer_support">Native pointer support</a>
 <li><a href="D.html#D_operator_overloading">Operator overloading</a>
 <li><a href="D.html#D_test_suite">Running the test-suite</a>
@@ -1289,10 +1289,10 @@
 <li><a href="Ocaml.html#Ocaml_nn24">Overriding Methods in Ocaml</a>
 <li><a href="Ocaml.html#Ocaml_nn25">Director Usage Example</a>
 <li><a href="Ocaml.html#Ocaml_nn26">Creating director objects</a>
-<li><a href="Ocaml.html#Ocaml_nn27">Typemaps for directors, <tt>directorin, directorout, directorargout</tt></a>
-<li><a href="Ocaml.html#Ocaml_nn28"><tt>directorin</tt> typemap</a>
-<li><a href="Ocaml.html#Ocaml_nn29"><tt>directorout</tt> typemap</a>
-<li><a href="Ocaml.html#Ocaml_nn30"><tt>directorargout</tt> typemap</a>
+<li><a href="Ocaml.html#Ocaml_nn27">Typemaps for directors, directorin, directorout, directorargout</a>
+<li><a href="Ocaml.html#Ocaml_nn28">typemap</a>
+<li><a href="Ocaml.html#Ocaml_nn29">directorout typemap</a>
+<li><a href="Ocaml.html#Ocaml_nn30">directorargout typemap</a>
 </ul>
 <li><a href="Ocaml.html#Ocaml_nn31">Exceptions</a>
 </ul>
@@ -1435,7 +1435,7 @@
 <li><a href="Php.html#Php_nn2_5">Pointers and References</a>
 <li><a href="Php.html#Php_nn2_6">Structures and C++ classes</a>
 <ul>
-<li><a href="Php.html#Php_nn2_6_1">Using <tt>-noproxy</tt></a>
+<li><a href="Php.html#Php_nn2_6_1">Using -noproxy</a>
 <li><a href="Php.html#Php_nn2_6_2">Constructors and Destructors</a>
 <li><a href="Php.html#Php_nn2_6_3">Static Member Variables</a>
 <li><a href="Php.html#Php_nn2_6_4">Static Member Functions</a>
diff --git a/Doc/Manual/D.html b/Doc/Manual/D.html
index 8007ccbb6..540d1fdda 100644
--- a/Doc/Manual/D.html
+++ b/Doc/Manual/D.html
@@ -22,13 +22,13 @@
 <li><a href="#D_code_injection_typemaps">Code injection typemaps</a>
 <li><a href="#D_special_variables">Special variable macros</a>
 </ul>
-<li><a href="#D_features"><tt>%feature</tt>s</a>
+<li><a href="#D_features">D and %feature</a>
 <li><a href="#D_pragmas">Pragmas</a>
 <li><a href="#D_exceptions">D Exceptions</a>
 <li><a href="#D_directors">D Directors</a>
 <li><a href="#D_other_features">Other features</a>
 <ul>
-<li><a href="#D_nspace">Extended namespace support (<tt>nspace</tt>)</a>
+<li><a href="#D_nspace">Extended namespace support (nspace)</a>
 <li><a href="#D_native_pointer_support">Native pointer support</a>
 <li><a href="#D_operator_overloading">Operator overloading</a>
 <li><a href="#D_test_suite">Running the test-suite</a>
@@ -295,7 +295,7 @@ $importtype(AnotherInterface)
 </dl>
 
 
-<H2><a name="D_features">22.4 <tt>%feature</tt>s</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>
@@ -386,7 +386,7 @@ struct A {
 <H2><a name="D_other_features">22.8 Other features</a></H2>
 
 
-<H3><a name="D_nspace">22.8.1 Extended namespace support (<tt>nspace</tt>)</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>
diff --git a/Doc/Manual/Ocaml.html b/Doc/Manual/Ocaml.html
index 789bbae53..293789656 100644
--- a/Doc/Manual/Ocaml.html
+++ b/Doc/Manual/Ocaml.html
@@ -45,10 +45,10 @@
 <li><a href="#Ocaml_nn24">Overriding Methods in Ocaml</a>
 <li><a href="#Ocaml_nn25">Director Usage Example</a>
 <li><a href="#Ocaml_nn26">Creating director objects</a>
-<li><a href="#Ocaml_nn27">Typemaps for directors, <tt>directorin, directorout, directorargout</tt></a>
-<li><a href="#Ocaml_nn28"><tt>directorin</tt> typemap</a>
-<li><a href="#Ocaml_nn29"><tt>directorout</tt> typemap</a>
-<li><a href="#Ocaml_nn30"><tt>directorargout</tt> typemap</a>
+<li><a href="#Ocaml_nn27">Typemaps for directors, directorin, directorout, directorargout</a>
+<li><a href="#Ocaml_nn28">typemap</a>
+<li><a href="#Ocaml_nn29">directorout typemap</a>
+<li><a href="#Ocaml_nn30">directorargout typemap</a>
 </ul>
 <li><a href="#Ocaml_nn31">Exceptions</a>
 </ul>
@@ -930,7 +930,7 @@ object from causing a core dump, as long as the object is destroyed
 properly.
 </p>
 
-<H4><a name="Ocaml_nn27">31.2.5.5 Typemaps for directors, <tt>directorin, directorout, directorargout</tt></a></H4>
+<H4><a name="Ocaml_nn27">31.2.5.5 Typemaps for directors, directorin, directorout, directorargout</a></H4>
 
 
 <p>
@@ -941,7 +941,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">31.2.5.6 <tt>directorin</tt> typemap</a></H4>
+<H4><a name="Ocaml_nn28">31.2.5.6 typemap</a></H4>
 
 
 <p>
@@ -952,7 +952,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">31.2.5.7 <tt>directorout</tt> typemap</a></H4>
+<H4><a name="Ocaml_nn29">31.2.5.7 directorout typemap</a></H4>
 
 
 <p>
@@ -963,7 +963,7 @@ for the same type, except when there are special requirements for object
 ownership, etc.
 </p>
 
-<H4><a name="Ocaml_nn30">31.2.5.8 <tt>directorargout</tt> typemap</a></H4>
+<H4><a name="Ocaml_nn30">31.2.5.8 directorargout typemap</a></H4>
 
 
 <p>
diff --git a/Doc/Manual/Php.html b/Doc/Manual/Php.html
index e1adce5ad..b332da552 100644
--- a/Doc/Manual/Php.html
+++ b/Doc/Manual/Php.html
@@ -25,7 +25,7 @@
 <li><a href="#Php_nn2_5">Pointers and References</a>
 <li><a href="#Php_nn2_6">Structures and C++ classes</a>
 <ul>
-<li><a href="#Php_nn2_6_1">Using <tt>-noproxy</tt></a>
+<li><a href="#Php_nn2_6_1">Using -noproxy</a>
 <li><a href="#Php_nn2_6_2">Constructors and Destructors</a>
 <li><a href="#Php_nn2_6_3">Static Member Variables</a>
 <li><a href="#Php_nn2_6_4">Static Member Functions</a>
@@ -640,7 +640,7 @@ Would be used in the following way from PHP5:
 Member variables and methods are accessed using the <tt>-&gt;</tt> operator.
 </p>
 
-<H4><a name="Php_nn2_6_1">34.2.6.1 Using <tt>-noproxy</tt></a></H4>
+<H4><a name="Php_nn2_6_1">34.2.6.1 Using -noproxy</a></H4>
 
 
 <p>
diff --git a/Doc/Manual/SWIG.html b/Doc/Manual/SWIG.html
index c31d8255f..d6228ef34 100644
--- a/Doc/Manual/SWIG.html
+++ b/Doc/Manual/SWIG.html
@@ -24,8 +24,8 @@
 <li><a href="#SWIG_nn10">Basic Type Handling</a>
 <li><a href="#SWIG_nn11">Global Variables</a>
 <li><a href="#SWIG_nn12">Constants</a>
-<li><a href="#SWIG_nn13">A brief word about <tt>const</tt></a>
-<li><a href="#SWIG_nn14">A cautionary tale of <tt>char *</tt></a>
+<li><a href="#SWIG_nn13">A brief word about const</a>
+<li><a href="#SWIG_nn14">A cautionary tale of char *</a>
 </ul>
 <li><a href="#SWIG_nn15">Pointers and complex objects</a>
 <ul>
@@ -40,7 +40,7 @@
 <li><a href="#SWIG_nn22">Passing structures by value</a>
 <li><a href="#SWIG_nn23">Return by value</a>
 <li><a href="#SWIG_nn24">Linking to structure variables</a>
-<li><a href="#SWIG_nn25">Linking to <tt>char *</tt></a>
+<li><a href="#SWIG_nn25">Linking to char *</a>
 <li><a href="#SWIG_nn26">Arrays</a>
 <li><a href="#SWIG_readonly_variables">Creating read-only variables</a>
 <li><a href="#SWIG_rename_ignore">Renaming and ignoring declarations</a>
@@ -758,7 +758,7 @@ is only used when you want to add constants to the scripting language
 interface that are not defined in the original header file. 
 </p>
 
-<H3><a name="SWIG_nn13">5.2.4 A brief word about <tt>const</tt></a></H3>
+<H3><a name="SWIG_nn13">5.2.4 A brief word about const</a></H3>
 
 
 <p>
@@ -860,7 +860,7 @@ const int    spam = 42;
 </pre>
 </div>
 
-<H3><a name="SWIG_nn14">5.2.5 A cautionary tale of <tt>char *</tt></a></H3>
+<H3><a name="SWIG_nn14">5.2.5 A cautionary tale of char *</a></H3>
 
 
 <p>
@@ -1329,7 +1329,7 @@ C++ classes must supply a properly defined copy constructor in order for
 assignment to work correctly.
 </p>
 
-<H3><a name="SWIG_nn25">5.4.4 Linking to <tt>char *</tt></a></H3>
+<H3><a name="SWIG_nn25">5.4.4 Linking to char *</a></H3>
 
 
 <p>
diff --git a/Doc/Manual/Typemaps.html b/Doc/Manual/Typemaps.html
index 770604684..1cadd4ae3 100644
--- a/Doc/Manual/Typemaps.html
+++ b/Doc/Manual/Typemaps.html
@@ -87,7 +87,7 @@
 <li><a href="#Typemaps_runtime_type_checker_usage">Usage</a>
 </ul>
 <li><a href="#Typemaps_overloading">Typemaps and overloading</a>
-<li><a href="#Typemaps_nn48">More about <tt>%apply</tt> and <tt>%clear</tt></a>
+<li><a href="#Typemaps_nn48">More about %apply and %clear</a>
 <li><a href="#Typemaps_nn47">Passing data between typemaps</a>
 <li><a href="#Typemaps_nn52">C++ "this" pointer</a>
 <li><a href="#Typemaps_nn51">Where to go for more information?</a>
@@ -4664,7 +4664,7 @@ Subsequent "in" typemaps would then perform more extensive type-checking.
 </li>
 </ul>
 
-<H2><a name="Typemaps_nn48">11.14 More about <tt>%apply</tt> and <tt>%clear</tt></a></H2>
+<H2><a name="Typemaps_nn48">11.14 More about %apply and %clear</a></H2>
 
 
 <p>