diff --git a/Doc/Manual/Allegrocl.html b/Doc/Manual/Allegrocl.html
index e76d67e4c..9f37d4fc5 100644
--- a/Doc/Manual/Allegrocl.html
+++ b/Doc/Manual/Allegrocl.html
@@ -1,9 +1,9 @@
-
-
+
SWIG and Allegro Common Lisp
+
diff --git a/Doc/Manual/Android.html b/Doc/Manual/Android.html
index 2973f1de1..2d3658009 100644
--- a/Doc/Manual/Android.html
+++ b/Doc/Manual/Android.html
@@ -1,8 +1,9 @@
-
+
SWIG and Android
+
diff --git a/Doc/Manual/Arguments.html b/Doc/Manual/Arguments.html
index 21da790b7..db46359d5 100644
--- a/Doc/Manual/Arguments.html
+++ b/Doc/Manual/Arguments.html
@@ -1,8 +1,9 @@
-
+
Argument Handling
+
diff --git a/Doc/Manual/CCache.html b/Doc/Manual/CCache.html
index 88922a8ea..d23b0cb2f 100644
--- a/Doc/Manual/CCache.html
+++ b/Doc/Manual/CCache.html
@@ -1,8 +1,9 @@
-
+
ccache-swig(1) manpage
+
diff --git a/Doc/Manual/CPlusPlus11.html b/Doc/Manual/CPlusPlus11.html
index 021ad418d..714845bba 100644
--- a/Doc/Manual/CPlusPlus11.html
+++ b/Doc/Manual/CPlusPlus11.html
@@ -1,8 +1,9 @@
-
+
SWIG and C++11
+
diff --git a/Doc/Manual/CSharp.html b/Doc/Manual/CSharp.html
index e6829aabc..0cbc9ec24 100644
--- a/Doc/Manual/CSharp.html
+++ b/Doc/Manual/CSharp.html
@@ -1,8 +1,9 @@
-
+
SWIG and C#
+
diff --git a/Doc/Manual/Chicken.html b/Doc/Manual/Chicken.html
index 88cff55a9..2d800ad6a 100644
--- a/Doc/Manual/Chicken.html
+++ b/Doc/Manual/Chicken.html
@@ -1,9 +1,9 @@
-
-
+
SWIG and Chicken
+
diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html
index 54fa30637..316f8f249 100644
--- a/Doc/Manual/Contents.html
+++ b/Doc/Manual/Contents.html
@@ -1,8 +1,8 @@
-
-
+
SWIG Users Manual
+
SWIG Users Manual
diff --git a/Doc/Manual/Contract.html b/Doc/Manual/Contract.html
index 660daf9fc..4b4995819 100644
--- a/Doc/Manual/Contract.html
+++ b/Doc/Manual/Contract.html
@@ -1,8 +1,9 @@
-
+
Contract Checking
+
diff --git a/Doc/Manual/Customization.html b/Doc/Manual/Customization.html
index 9ab0a6269..d3ddecbb1 100644
--- a/Doc/Manual/Customization.html
+++ b/Doc/Manual/Customization.html
@@ -1,8 +1,9 @@
-
+
Customization Features
+
diff --git a/Doc/Manual/D.html b/Doc/Manual/D.html
index 540d1fdda..9e8e65358 100644
--- a/Doc/Manual/D.html
+++ b/Doc/Manual/D.html
@@ -1,4 +1,4 @@
-
+
SWIG and D
diff --git a/Doc/Manual/Extending.html b/Doc/Manual/Extending.html
index 7519dca94..14dcbdccd 100644
--- a/Doc/Manual/Extending.html
+++ b/Doc/Manual/Extending.html
@@ -1,8 +1,9 @@
-
+
Extending SWIG to support new languages
+
diff --git a/Doc/Manual/Go.html b/Doc/Manual/Go.html
index 2fff4edf5..52f023f92 100644
--- a/Doc/Manual/Go.html
+++ b/Doc/Manual/Go.html
@@ -1,8 +1,9 @@
-
+
SWIG and Go
+
diff --git a/Doc/Manual/Guile.html b/Doc/Manual/Guile.html
index b424df6e2..5c8792150 100644
--- a/Doc/Manual/Guile.html
+++ b/Doc/Manual/Guile.html
@@ -1,9 +1,9 @@
-
-
+
SWIG and Guile
+
diff --git a/Doc/Manual/Introduction.html b/Doc/Manual/Introduction.html
index db35d8425..677784d9a 100644
--- a/Doc/Manual/Introduction.html
+++ b/Doc/Manual/Introduction.html
@@ -1,8 +1,9 @@
-
+
Introduction
+
diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html
index 9b18c4aa9..eeedc5d68 100644
--- a/Doc/Manual/Java.html
+++ b/Doc/Manual/Java.html
@@ -1,8 +1,9 @@
-
+
SWIG and Java
+
diff --git a/Doc/Manual/Javascript.html b/Doc/Manual/Javascript.html
index a3b6cf0c5..3a4b6d69b 100644
--- a/Doc/Manual/Javascript.html
+++ b/Doc/Manual/Javascript.html
@@ -1,8 +1,9 @@
-
+
-
-
+
+
+
diff --git a/Doc/Manual/Library.html b/Doc/Manual/Library.html
index 203ea6d46..954de54f7 100644
--- a/Doc/Manual/Library.html
+++ b/Doc/Manual/Library.html
@@ -1,8 +1,9 @@
-
+
SWIG Library
+
diff --git a/Doc/Manual/Lisp.html b/Doc/Manual/Lisp.html
index ccb424e50..baee4ddf1 100644
--- a/Doc/Manual/Lisp.html
+++ b/Doc/Manual/Lisp.html
@@ -1,8 +1,9 @@
-
+
SWIG and Common Lisp
+
diff --git a/Doc/Manual/Lua.html b/Doc/Manual/Lua.html
index 1b6b87e51..8639e5f9e 100644
--- a/Doc/Manual/Lua.html
+++ b/Doc/Manual/Lua.html
@@ -1,8 +1,9 @@
-
+
SWIG and Lua
+
diff --git a/Doc/Manual/Modula3.html b/Doc/Manual/Modula3.html
index ed6e596e7..f324495a3 100644
--- a/Doc/Manual/Modula3.html
+++ b/Doc/Manual/Modula3.html
@@ -1,8 +1,9 @@
-
+
SWIG and Modula-3
+
diff --git a/Doc/Manual/Modules.html b/Doc/Manual/Modules.html
index d12383a1d..089b1a4ad 100644
--- a/Doc/Manual/Modules.html
+++ b/Doc/Manual/Modules.html
@@ -1,8 +1,9 @@
-
+
Working with Modules
+
diff --git a/Doc/Manual/Mzscheme.html b/Doc/Manual/Mzscheme.html
index 358942a35..5b589cef1 100644
--- a/Doc/Manual/Mzscheme.html
+++ b/Doc/Manual/Mzscheme.html
@@ -1,9 +1,9 @@
-
-
+
SWIG and MzScheme/Racket
+
diff --git a/Doc/Manual/Ocaml.html b/Doc/Manual/Ocaml.html
index 293789656..07b3ffc1f 100644
--- a/Doc/Manual/Ocaml.html
+++ b/Doc/Manual/Ocaml.html
@@ -1,8 +1,9 @@
-
+
SWIG and Ocaml
+
diff --git a/Doc/Manual/Octave.html b/Doc/Manual/Octave.html
index df484103d..611f172e3 100644
--- a/Doc/Manual/Octave.html
+++ b/Doc/Manual/Octave.html
@@ -1,8 +1,9 @@
-
+
SWIG and Octave
+
diff --git a/Doc/Manual/Perl5.html b/Doc/Manual/Perl5.html
index bb912ec8e..4bb2b84c7 100644
--- a/Doc/Manual/Perl5.html
+++ b/Doc/Manual/Perl5.html
@@ -1,8 +1,9 @@
-
+
SWIG and Perl5
+
diff --git a/Doc/Manual/Php.html b/Doc/Manual/Php.html
index b332da552..36f8ca981 100644
--- a/Doc/Manual/Php.html
+++ b/Doc/Manual/Php.html
@@ -1,9 +1,9 @@
-
-
+
SWIG and PHP
+
diff --git a/Doc/Manual/Pike.html b/Doc/Manual/Pike.html
index c7e75d00c..22ab4e2a2 100644
--- a/Doc/Manual/Pike.html
+++ b/Doc/Manual/Pike.html
@@ -1,8 +1,9 @@
-
+
SWIG and Pike
+
diff --git a/Doc/Manual/Preface.html b/Doc/Manual/Preface.html
index 186bc415d..4a9ad5ba9 100644
--- a/Doc/Manual/Preface.html
+++ b/Doc/Manual/Preface.html
@@ -1,8 +1,9 @@
-
+
Preface
+
diff --git a/Doc/Manual/Preprocessor.html b/Doc/Manual/Preprocessor.html
index b8a6e9b0e..2538f8f18 100644
--- a/Doc/Manual/Preprocessor.html
+++ b/Doc/Manual/Preprocessor.html
@@ -1,8 +1,9 @@
-
+
SWIG Preprocessor
+
diff --git a/Doc/Manual/Python.html b/Doc/Manual/Python.html
index c288581b7..c8148fbdc 100644
--- a/Doc/Manual/Python.html
+++ b/Doc/Manual/Python.html
@@ -1,8 +1,9 @@
-
+
SWIG and Python
+
diff --git a/Doc/Manual/R.html b/Doc/Manual/R.html
index fc60f368e..9b5993bff 100644
--- a/Doc/Manual/R.html
+++ b/Doc/Manual/R.html
@@ -1,8 +1,9 @@
-
+
SWIG and R
+
diff --git a/Doc/Manual/Ruby.html b/Doc/Manual/Ruby.html
index cac123fe4..4d7f92a0f 100644
--- a/Doc/Manual/Ruby.html
+++ b/Doc/Manual/Ruby.html
@@ -1,8 +1,9 @@
-
+
- SWIG and Ruby
-
+SWIG and Ruby
+
+
diff --git a/Doc/Manual/SWIG.html b/Doc/Manual/SWIG.html
index d6228ef34..16cdd0e8f 100644
--- a/Doc/Manual/SWIG.html
+++ b/Doc/Manual/SWIG.html
@@ -1,8 +1,9 @@
-
+
SWIG Basics
+
diff --git a/Doc/Manual/SWIGPlus.html b/Doc/Manual/SWIGPlus.html
index 1127a8ee8..07048320b 100644
--- a/Doc/Manual/SWIGPlus.html
+++ b/Doc/Manual/SWIGPlus.html
@@ -1,8 +1,9 @@
-
+
SWIG and C++
+
diff --git a/Doc/Manual/Scilab.html b/Doc/Manual/Scilab.html
index 1ffeb4e61..3e9e1c1a2 100644
--- a/Doc/Manual/Scilab.html
+++ b/Doc/Manual/Scilab.html
@@ -1,8 +1,9 @@
-
+
SWIG and Scilab
+
diff --git a/Doc/Manual/Scripting.html b/Doc/Manual/Scripting.html
index 9e5e85e7d..f178033e4 100644
--- a/Doc/Manual/Scripting.html
+++ b/Doc/Manual/Scripting.html
@@ -1,8 +1,9 @@
-
+
Scripting Languages
+
diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html
index aeebda60e..8f2ba46bf 100644
--- a/Doc/Manual/Sections.html
+++ b/Doc/Manual/Sections.html
@@ -1,7 +1,8 @@
-
+
SWIG-3.0 Documentation
+
diff --git a/Doc/Manual/Tcl.html b/Doc/Manual/Tcl.html
index a3e6ae99a..77ea5f3b6 100644
--- a/Doc/Manual/Tcl.html
+++ b/Doc/Manual/Tcl.html
@@ -1,8 +1,9 @@
-
+
SWIG and Tcl
+
diff --git a/Doc/Manual/Typemaps.html b/Doc/Manual/Typemaps.html
index 1cadd4ae3..6dfc5d05d 100644
--- a/Doc/Manual/Typemaps.html
+++ b/Doc/Manual/Typemaps.html
@@ -1,8 +1,9 @@
-
+
Typemaps
+
diff --git a/Doc/Manual/Varargs.html b/Doc/Manual/Varargs.html
index c2f55b019..78689c2fb 100644
--- a/Doc/Manual/Varargs.html
+++ b/Doc/Manual/Varargs.html
@@ -1,8 +1,9 @@
-
+
Variable Length Arguments
+
diff --git a/Doc/Manual/Warnings.html b/Doc/Manual/Warnings.html
index 92ec5000c..3ec1af757 100644
--- a/Doc/Manual/Warnings.html
+++ b/Doc/Manual/Warnings.html
@@ -1,8 +1,9 @@
-
+
Warning Messages
+
diff --git a/Doc/Manual/Windows.html b/Doc/Manual/Windows.html
index fecdf48ed..d7c1932b7 100644
--- a/Doc/Manual/Windows.html
+++ b/Doc/Manual/Windows.html
@@ -1,8 +1,9 @@
-
+
Getting started on Windows
+
diff --git a/Doc/Manual/index.html b/Doc/Manual/index.html
index eabcb315e..26cc81ea1 100644
--- a/Doc/Manual/index.html
+++ b/Doc/Manual/index.html
@@ -1,7 +1,8 @@
-
+
SWIG-3.0 Documentation
+
diff --git a/Doc/Manual/maketoc.py b/Doc/Manual/maketoc.py
index d8c4aa759..dc8626434 100644
--- a/Doc/Manual/maketoc.py
+++ b/Doc/Manual/maketoc.py
@@ -6,12 +6,14 @@ chs = open("chapters").readlines()
f = open("Contents.html","w")
print >>f, """
-
+
SWIG Users Manual
+
+
SWIG Users Manual