diff --git a/CCache/ccache.yo b/CCache/ccache.yo
index 08acb843e..82ac05d2e 100644
--- a/CCache/ccache.yo
+++ b/CCache/ccache.yo
@@ -8,12 +8,12 @@ whenhtml(htmlcommand(
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<title>swig-ccache(1) manpage</title>
+<title>ccache-swig(1) manpage</title>
 <link rel="stylesheet" type="text/css" href="style.css">
 </head>
 
 <body bgcolor="#ffffff">
-<H1><a name="CCache"></a>swig-ccache(1) manpage</H1>
+<H1><a name="CCache"></a>ccache-swig(1) manpage</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <!-- INDEX -->
diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html
index fcba1352d..e764d2828 100644
--- a/Doc/Manual/Contents.html
+++ b/Doc/Manual/Contents.html
@@ -483,7 +483,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="CCache.html#CCache">15 swig-ccache(1) manpage</a></h3>
+<h3><a href="CCache.html#CCache">15 ccache-swig(1) manpage</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -914,14 +914,29 @@
 <li><a href="Lua.html#Lua_nn20">C++ templates</a>
 <li><a href="Lua.html#Lua_nn21">C++ Smart Pointers</a>
 <li><a href="Lua.html#Lua_nn22">C++ Exceptions</a>
-<li><a href="Lua.html#Lua_nn23">Writing your own custom wrappers</a>
-<li><a href="Lua.html#Lua_nn24">Adding additional Lua code</a>
 </ul>
-<li><a href="Lua.html#Lua_nn25">Details on the Lua binding</a>
+<li><a href="Lua.html#Lua_nn23">Typemaps</a>
 <ul>
-<li><a href="Lua.html#Lua_nn26">Binding global data into the module.</a>
-<li><a href="Lua.html#Lua_nn27">Userdata and Metatables</a>
-<li><a href="Lua.html#Lua_nn28">Memory management</a>
+<li><a href="Lua.html#Lua_nn24">What is a typemap?</a>
+<li><a href="Lua.html#Lua_nn25">Using typemaps</a>
+<li><a href="Lua.html#Lua_nn26">Typemaps and arrays</a>
+<li><a href="Lua.html#Lua_nn27">Typemaps and pointer-pointer functions</a>
+</ul>
+<li><a href="Lua.html#Lua_nn28">Writing typemaps</a>
+<ul>
+<li><a href="Lua.html#Lua_nn29">Typemaps you can write</a>
+<li><a href="Lua.html#Lua_nn30">SWIG's Lua-C API</a>
+</ul>
+<li><a href="Lua.html#Lua_nn31">Customization of your Bindings</a>
+<ul>
+<li><a href="Lua.html#Lua_nn32">Writing your own custom wrappers</a>
+<li><a href="Lua.html#Lua_nn33">Adding additional Lua code</a>
+</ul>
+<li><a href="Lua.html#Lua_nn34">Details on the Lua binding</a>
+<ul>
+<li><a href="Lua.html#Lua_nn35">Binding global data into the module.</a>
+<li><a href="Lua.html#Lua_nn36">Userdata and Metatables</a>
+<li><a href="Lua.html#Lua_nn37">Memory management</a>
 </ul>
 </ul>
 </div>
