diff --git a/ccm-sci-bundle/web/themes/foundry/doc/foundry-documentation.xml b/ccm-sci-bundle/web/themes/foundry/doc/foundry-documentation.xml
index ec0cd132b..4776504b0 100644
--- a/ccm-sci-bundle/web/themes/foundry/doc/foundry-documentation.xml
+++ b/ccm-sci-bundle/web/themes/foundry/doc/foundry-documentation.xml
@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <foundry:documentation xmlns:foundry="http://foundry.libreccm.org">
-    <foundry:doc-static-text href="overview"/>
+    <foundry:doc-chapter id="overview"
+                         title="Overview">
+        <foundry:doc-static-text href="overview-foundry"/>
+        <foundry:doc-static-text href="this-manual"/>
+    </foundry:doc-chapter>
+   
     <foundry:doc-chapter id="user-manual"
                          title="User Manual">
         <foundry:doc-static-text href="user/about-foundry"/>
         <foundry:doc-static-text href="user/layout-templates"/>
         <foundry:doc-static-text href="user/css-files"/>
         <foundry:doc-generated title="Templates Tags Reference" 
-                   href="lib/template-tags"/>
+                               section="user"/>
     </foundry:doc-chapter>
     <foundry:doc-chapter id="developer-manual"
                          title="Developer Manual">
         <foundry:doc-static-text href="devel/foundry-structure"/>
         <foundry:doc-static-text href="devel/coding-style"/>
         <foundry:doc-static-text href="devel/foundry-doc-system"/>
-        <!--<foundry:doc-generated title="XSL Templates and Function references"
-        href="lib/lib"/>-->
+        <foundry:doc-generated title="XSL Templates and Function references"
+                               href="devel"/>
     </foundry:doc-chapter>
 </foundry:documentation>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/doc/xsl/foundry-documentation.xsl b/ccm-sci-bundle/web/themes/foundry/doc/xsl/foundry-documentation.xsl
index 81f3ea53d..5ead40f7f 100644
--- a/ccm-sci-bundle/web/themes/foundry/doc/xsl/foundry-documentation.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/doc/xsl/foundry-documentation.xsl
@@ -33,7 +33,7 @@
     <xsl:strip-space elements="*"/>
     
     <xsl:template match="/foundry:documentation">
-        <xsl:text>&lt;!DOCTYPE HTML&gt;</xsl:text>
+        <!--<xsl:text>&lt;!DOCTYPE HTML&gt;</xsl:text>-->
         <html>
             <head>
                 <meta http-equiv="content-type" 
@@ -65,12 +65,12 @@
     </xsl:template>
 
     <xsl:template match="/foundry:documentation/foundry:doc-chapter">
-        <section id="{./@id}">
+        <article id="{./@id}">
             <h1>
                 <xsl:value-of select="./@title"/>
             </h1>
             <xsl:apply-templates/>
-        </section>
+        </article>
     </xsl:template>
     
     <xsl:template match="/foundry:documentation//foundry:doc-static-text">
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/global-vars.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/global-vars.xsl
index b809415f2..d432e8e93 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/global-vars.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/global-vars.xsl
@@ -37,7 +37,7 @@ processor, some are read from the configuration files of Foundry and some are de
     <foundry:doc section="devel">
         <foundry:doc-desc>
             The version of Foundry. Kept in sync with the version of CCM, so the first version
-            will be 2.2.3.
+            was be 2.2.3.
         </foundry:doc-desc>
     </foundry:doc>
     <xsl:variable name="foundry-version" select="'2.2.3-SNAPSHOT'"/>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl
index 837a40893..4080758c8 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl
@@ -23,7 +23,7 @@
 
 <!--
     This file contains utility functions and templates for Foundry. Most of them are implemented as
-EXSLT functions.
+XSLT 2.0 functions.
 --> 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl
index eeb53de48..5a384f36d 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl
@@ -82,7 +82,6 @@
         </foundry:doc-desc>
     </foundry:doc>
     <xsl:template match="/foundry:documentation">
-        <!--<xsl:text>&lt;!DOCTYPE HTML&gt;</xsl:text>-->
         <html>
             <head>
                 <meta http-equiv="content-type" 
