diff --git a/docs/simplesamlphp-advancedfeatures.txt b/docs/simplesamlphp-advancedfeatures.txt
index 8935185fe7602d901e614c393ed03c97f883c7d5..b34a9a7e649868bb3012a0ec8999502c5f11149a 100644
--- a/docs/simplesamlphp-advancedfeatures.txt
+++ b/docs/simplesamlphp-advancedfeatures.txt
@@ -10,6 +10,8 @@ simpleSAMLphp Advanced Features
* Version: `$Id$`
+<!-- {{TOC}} -->
+
simpleSAMLphp documentation
---------------------------
diff --git a/docs/simplesamlphp-authproc.txt b/docs/simplesamlphp-authproc.txt
index f169294ff6d8766a8c5d44918c4e6eb7fca9c9f1..df3700c56dd8303dfde4345788bbdf304f8946d9 100644
--- a/docs/simplesamlphp-authproc.txt
+++ b/docs/simplesamlphp-authproc.txt
@@ -9,6 +9,9 @@ Authentication Processing Filters in SimpleSAMLphp
* Version: `$Id$`
+<!-- {{TOC}} -->
+
+
In SimpleSAMLphp, there is an API where you can *do stuff* at the IdP after authentication is complete, and just before you are sent back to the SP. The same API is available on the SP, after you have received a successfull Authentication Response from the IdP and before you are sent back to the SP application.
Authentication processing filters postprocesses authentication information received from authentication sources. It is possible to use this for additional authentication checks, requesting the users consent before delivering attributes to the user, modifying the users attributes, and other things which should be performed before returning the user to the service provider he came from.
diff --git a/docs/simplesamlphp-automated_metadata.txt b/docs/simplesamlphp-automated_metadata.txt
index 9411c232e1c4002d3340f4ab6f420360f2b89559..8cfd4d763ee33026279bd03ef9c948bc533f41a8 100644
--- a/docs/simplesamlphp-automated_metadata.txt
+++ b/docs/simplesamlphp-automated_metadata.txt
@@ -9,6 +9,7 @@ Automated Metadata Management
* Version: `$Id$`
+<!-- {{TOC}} -->
Introduction
------------
diff --git a/docs/simplesamlphp-changelog.txt b/docs/simplesamlphp-changelog.txt
index dbe756ed587f511e9dc02f9d85449672a30cf5ba..5c19b4ff2869e5dd96aa8fa5b84603792ff92884 100644
--- a/docs/simplesamlphp-changelog.txt
+++ b/docs/simplesamlphp-changelog.txt
@@ -1,6 +1,7 @@
simpleSAMLphp changelog
=======================
+<!-- {{TOC}} -->
Here is changes between simpleSAMLphp versions. Look here if you are upgrading, to see if there are any changes to the config format.
diff --git a/docs/simplesamlphp-errorhandling.txt b/docs/simplesamlphp-errorhandling.txt
index 0b5cc602b6d08826cae1f08a95544abedc57862e..6d705f69eda93c5a86a450ccfb3e9b0e6ba2981b 100644
--- a/docs/simplesamlphp-errorhandling.txt
+++ b/docs/simplesamlphp-errorhandling.txt
@@ -9,6 +9,8 @@ Exception and error handling in simpleSAMLphp
* Version: `$Id$`
+<!-- {{TOC}} -->
+
This document describes the way errors and exceptions are handled in authentication sources and authentication processing filters.
The basic goal is to be able to throw an exception during authentication, and then have that exception transported back to the SP in a way that the SP understands.
diff --git a/docs/simplesamlphp-features.txt b/docs/simplesamlphp-features.txt
index d3b1d57509c85132dd45da78b7611c3c719662aa..ba4a781f0ff0d42f88dcab1f2de5cc39167b68bf 100644
--- a/docs/simplesamlphp-features.txt
+++ b/docs/simplesamlphp-features.txt
@@ -9,6 +9,8 @@ SimpleSAMLphp Features
* Version: `$Id`
+<!-- {{TOC}} -->
+
## Automatic Metadata Retrieval
SimpleSAMLphp supports regurlarly downloading SAML metadata form a HTTP location, optionally validating the signature on the metadata, and then cache the metadata to be used by a SP or IdP. Shibboleth introduced this functionality, and SimpleSAMLphp implements it in a compatible way.
diff --git a/docs/simplesamlphp-googleapps.txt b/docs/simplesamlphp-googleapps.txt
index 24bcc7db84b2be400c4eacf19ffb7d634779cb93..cf134d6ce388a3ad7a8238e53db9340d41c94bc2 100644
--- a/docs/simplesamlphp-googleapps.txt
+++ b/docs/simplesamlphp-googleapps.txt
@@ -10,6 +10,7 @@ Setting up a simpleSAMLphp SAML 2.0 IdP to use with Google Apps for Education
* Version: `$Id$`
+<!-- {{TOC}} -->
simpleSAMLphp news and documentation
------------------------------------
diff --git a/docs/simplesamlphp-idp-more.txt b/docs/simplesamlphp-idp-more.txt
index b169667686566d3c80d0e9886957b71074453ff3..fe28c237600fc49ed29b8043d2477e8b38737955 100644
--- a/docs/simplesamlphp-idp-more.txt
+++ b/docs/simplesamlphp-idp-more.txt
@@ -9,6 +9,7 @@ SimpleSAMLphp Identity Provider Advanced Topics
* Version: `$Id$`
+<!-- {{TOC}} -->
AJAX iFrame Single Log-Out
--------------------------
diff --git a/docs/simplesamlphp-idp.txt b/docs/simplesamlphp-idp.txt
index 648fd9d2199930eb561091532510a97097d9cf48..51baf9b7404a4f1f70652294ae0ff2e243a2074a 100644
--- a/docs/simplesamlphp-idp.txt
+++ b/docs/simplesamlphp-idp.txt
@@ -9,6 +9,8 @@ SimpleSAMLphp Identity Provider QuickStart
* Version: `$Id$`
+<!-- {{TOC}} -->
+
This guide will describe how to configure simpleSAMLphp as an identity provider (IdP). You should previously have installed simpleSAMLphp as described in [the simpleSAMLphp installation instructions](http://rnd.feide.no/content/installing-simplesamlphp)
diff --git a/docs/simplesamlphp-install.txt b/docs/simplesamlphp-install.txt
index ac99cd3de050958fb6992efdcb03332c0d1d380b..dcad81c4778e3e9e9634ad0de536b7449c5d0ede 100644
--- a/docs/simplesamlphp-install.txt
+++ b/docs/simplesamlphp-install.txt
@@ -10,6 +10,7 @@ simpleSAMLphp Installation and Configuration
* Version: `$Id$`
+<!-- {{TOC}} -->
simpleSAMLphp news and documentation
------------------------------------
diff --git a/docs/simplesamlphp-maintenance.txt b/docs/simplesamlphp-maintenance.txt
index 19c62c4042d6d1b4eb4ec41c8ca224cf4dee0dc6..cc9f8616264633969e006d6c351e4248e5f3c914 100644
--- a/docs/simplesamlphp-maintenance.txt
+++ b/docs/simplesamlphp-maintenance.txt
@@ -9,7 +9,7 @@ simpleSAMLphp Maintenance
* Version: `$Id$`
-
+<!-- {{TOC}} -->
simpleSAMLphp news and documentation
------------------------------------
diff --git a/docs/simplesamlphp-modules.txt b/docs/simplesamlphp-modules.txt
index 94b1db58c7f3d5684dae3f45de5518340449e9be..9aa6dc6a342596fbb00d579f3a0a2836dbb5cdde 100644
--- a/docs/simplesamlphp-modules.txt
+++ b/docs/simplesamlphp-modules.txt
@@ -9,6 +9,7 @@ simpleSAMLphp modules
* Version: `$Id$`
+<!-- {{TOC}} -->
This document describes how the module system in simpleSAMLphp
works. It descibes what types of modules there are, how they are
diff --git a/docs/simplesamlphp-reference-idp-hosted.txt b/docs/simplesamlphp-reference-idp-hosted.txt
index 1e836342c1d3a2afec7fd35b379dda696415c901..95c33daf7125b5b2a65e3ea4ba23cc1959d9c44e 100644
--- a/docs/simplesamlphp-reference-idp-hosted.txt
+++ b/docs/simplesamlphp-reference-idp-hosted.txt
@@ -1,6 +1,8 @@
IdP hosted metadata reference
=============================
+<!-- {{TOC}} -->
+
This is a reference for the metadata files
`metadata/saml20-idp-hosted.php` and `metadata/shib13-idp-hosted.php`.
Both files have the following format:
diff --git a/docs/simplesamlphp-reference-idp-remote.txt b/docs/simplesamlphp-reference-idp-remote.txt
index eff3183c2abc0bb8386540bd3ffaae17f670a306..96197ca6260c51f67156ee877ee674802ff77d23 100644
--- a/docs/simplesamlphp-reference-idp-remote.txt
+++ b/docs/simplesamlphp-reference-idp-remote.txt
@@ -1,6 +1,8 @@
IdP remote metadata reference
=============================
+<!-- {{TOC}} -->
+
This is a reference for metadata options available for `metadata/saml20-idp-remote.php` and `metadata/shib13-idp-remote.php`. Both files have the following format:
<?php
diff --git a/docs/simplesamlphp-reference-sp-hosted.txt b/docs/simplesamlphp-reference-sp-hosted.txt
index fd47918d0cfe04fe2d06acb1176ea47f1957461a..668998f1520777577194509e62282ef9728ee3c6 100644
--- a/docs/simplesamlphp-reference-sp-hosted.txt
+++ b/docs/simplesamlphp-reference-sp-hosted.txt
@@ -1,6 +1,8 @@
SP hosted metadata reference
============================
+<!-- {{TOC}} -->
+
This is a reference for the metadata files `metadata/saml20-sp-hosted.php` and `metadata/shib13-sp-hosted.php`. Both files have the following format:
<?php
diff --git a/docs/simplesamlphp-reference-sp-remote.txt b/docs/simplesamlphp-reference-sp-remote.txt
index 2f89ff91305b6de7cb70c07e379f7b53fa51292d..c175b20d68612986b597a23baad15c241561adfa 100644
--- a/docs/simplesamlphp-reference-sp-remote.txt
+++ b/docs/simplesamlphp-reference-sp-remote.txt
@@ -1,6 +1,8 @@
SP remote metadata reference
============================
+<!-- {{TOC}} -->
+
This is a reference for metadata options available for
`metadata/saml20-sp-remote.php` and `metadata/shib13-sp-remote.php`.
Both files have the following format:
diff --git a/docs/simplesamlphp-sp-api.txt b/docs/simplesamlphp-sp-api.txt
index fafc8d2ec2e6490dd72af325596e02e173b39442..e94a3baeb7d21165ff5663da5459edc3e39fcff6 100644
--- a/docs/simplesamlphp-sp-api.txt
+++ b/docs/simplesamlphp-sp-api.txt
@@ -1,6 +1,8 @@
simpleSAMLphp SP API reference
==============================
+<!-- {{TOC}} -->
+
This document describes the SimpleSAML_Auth_Simple API.
This is the preferred API for integrating simpleSAMLphp with other applications.
diff --git a/docs/simplesamlphp-sp-migration.txt b/docs/simplesamlphp-sp-migration.txt
index 28c6da922de19047b00098b3983e8ada81c98105..564a4690a3080d74421a892dec4104b36e970c82 100644
--- a/docs/simplesamlphp-sp-migration.txt
+++ b/docs/simplesamlphp-sp-migration.txt
@@ -1,6 +1,8 @@
Migrating to the `saml` module
==============================
+<!-- {{TOC}} -->
+
This document describes how you can migrate your code to use the `saml` module for authentication against SAML 2.0 and SAML 1.1 IdPs.
It assumes that you have previously set up a SP by using redirects to `saml2/sp/initSSO.php`.
diff --git a/docs/simplesamlphp-sp.txt b/docs/simplesamlphp-sp.txt
index 0ceaad005165ce58cdb6f9790ac962a6a1f1e80f..1d8fcf3079129fbce1a08375bb9f57fe29417aad 100644
--- a/docs/simplesamlphp-sp.txt
+++ b/docs/simplesamlphp-sp.txt
@@ -9,6 +9,7 @@ SimpleSAMLphp Service Provider QuickStart
* Version: `$Id$`
+<!-- {{TOC}} -->
This guide will describe how to configure simpleSAMLphp as a service provider (SP). You should previously have installed simpleSAMLphp as described in [the simpleSAMLphp installation instructions](http://rnd.feide.no/content/installing-simplesamlphp).
diff --git a/docs/simplesamlphp-theming.txt b/docs/simplesamlphp-theming.txt
index a0fe5929573408134e0ae41ed0fc15bb8087143f..e287f298e07e6fa829619298be241e6d93668d60 100644
--- a/docs/simplesamlphp-theming.txt
+++ b/docs/simplesamlphp-theming.txt
@@ -9,6 +9,7 @@ Theming the user interface in SimpleSAMLphp
* Version: `$Id$`
+<!-- {{TOC}} -->
In SimpleSAMLphp every part that needs to interact with the user by using a web page, uses templates to present the XHTML. SimpleSAMLphp comes with a default set of templates that presents a anonymous look.
diff --git a/docs/simplesamlphp-translation.txt b/docs/simplesamlphp-translation.txt
index f7e8d53d2b436a6de045c178f9f74445af44ce3c..a77227d9c0025f4b1159e37095be7922f46ac0a8 100644
--- a/docs/simplesamlphp-translation.txt
+++ b/docs/simplesamlphp-translation.txt
@@ -9,6 +9,8 @@ SimpleSAMLphp Translation Portal
* Version: `$Id$`
+<!-- {{TOC}} -->
+
SimpleSAMLphp supports multiple languages.
* The SimpleSAMLphp Translation Portal
diff --git a/docs/simplesamlphp-ukaccess.txt b/docs/simplesamlphp-ukaccess.txt
index 23da452e99c5c1f470826e6f4bdfd4359ac24471..73efc2925a504f8d8b5e909d975d54e3c00ba3d9 100644
--- a/docs/simplesamlphp-ukaccess.txt
+++ b/docs/simplesamlphp-ukaccess.txt
@@ -9,6 +9,7 @@ Connecting SimpleSAMLphp SP to UK Access Federation and InCommon
* Version: `$Id$`
+<!-- {{TOC}} -->
This guide will describe how to configure simpleSAMLphp as a service provider (SP) supporting SAML 1.1 (shib1.3) and SAML 2.0 connecting it to a federation such as **UK Access Federation** or **InCommon**.