diff --git a/maven-site/src/site/apt/guides/mini/guide-generating-sources.apt b/maven-site/src/site/apt/guides/mini/guide-generating-sources.apt
index 52da157683..7ea4db64f1 100644
--- a/maven-site/src/site/apt/guides/mini/guide-generating-sources.apt
+++ b/maven-site/src/site/apt/guides/mini/guide-generating-sources.apt
@@ -1,5 +1,5 @@
  ------
- Guide
+ Guide to Generating Sources
  ------
  Jason van Zyl
  ------
diff --git a/maven-site/src/site/apt/guides/mini/guide-manifest.apt b/maven-site/src/site/apt/guides/mini/guide-manifest.apt
index a0e4b71783..fceb29533d 100644
--- a/maven-site/src/site/apt/guides/mini/guide-manifest.apt
+++ b/maven-site/src/site/apt/guides/mini/guide-manifest.apt
@@ -68,7 +68,7 @@ url: http://maven.apache.org
               <mainClass>com.mycompany.app.App</mainClass/>
               <packageName>com.mycompany.app</packageName>
               <!--
-              <addClasspath/>
+              <addClasspath>true</addClasspath>
               <addExtensions/>
               <classpathPrefix/>
               -->
diff --git a/maven-site/src/site/apt/guides/mini/guide-proxy-settings.apt b/maven-site/src/site/apt/guides/mini/guide-proxies.apt
similarity index 93%
rename from maven-site/src/site/apt/guides/mini/guide-proxy-settings.apt
rename to maven-site/src/site/apt/guides/mini/guide-proxies.apt
index 7118495890..446b9fb915 100644
--- a/maven-site/src/site/apt/guides/mini/guide-proxy-settings.apt
+++ b/maven-site/src/site/apt/guides/mini/guide-proxies.apt
@@ -1,12 +1,12 @@
  ------
- Guide to Proxy Settings
+ Guide to using proxies
  ------
  Jason van Zyl
  ------
  12 October 2005
  ------
 
-Configuring a Proxy
+Configuring a proxy
 
  You can configure a proxy to use for some or all of your HTTP requests in Maven 2.0. The username and password are only
  required if your proxy requires basic authentication (note that later releases may support storing your passwords in
@@ -38,4 +38,4 @@ the JDK configuration equivalent.
 
 +----+
 
- Please note that urrently NTML proxies are not supported as they have not been tested.
\ No newline at end of file
+ Please note that urrently NTML proxies are not supported as they have not been tested.
diff --git a/maven-site/src/site/apt/guides/mktoc.sh b/maven-site/src/site/apt/guides/mktoc.sh
new file mode 100755
index 0000000000..baf0d5883d
--- /dev/null
+++ b/maven-site/src/site/apt/guides/mktoc.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+toc=`pwd`/toc.apt
+
+echo " ------ " > $toc
+echo " Summary of Maven 2.x documentation " >> $toc
+echo " ------ " >> $toc
+echo " Jason van Zyl " >> $toc
+echo " ------ " >> $toc
+echo " 12 October 2005 " >> $toc
+echo " ------ " >> $toc
+
+echo >> $toc
+echo "Documentation" >> $toc
+echo >> $toc
+
+echo >> $toc
+echo "* Guides" >> $toc
+echo >> $toc
+echo " * {{{getting-started/index.html}Getting Started Guide}}" >> $toc
+echo >> $toc
+echo " * {{{plugin-development/index.html}Plug-in Developer's Guide}}" >> $toc
+echo >> $toc
+
+echo "* Mini Guides" >> $toc
+echo >> $toc
+
+(
+  cd mini
+
+  for i in `ls guide-*.apt`
+  do
+   title=`grep "^ Guide" $i | sed 's/^ *//'`
+   [ ! -z "$title" ] && echo " * {{{$i}$title}}" >> $toc && echo >> $toc
+  done       
+)       
+
+echo >> $toc
+echo "* Introductions" >> $toc
+echo >> $toc
+
+(
+  cd introduction
+
+  for i in `ls introduction-*.apt`
+  do
+   title=`grep "^ Introduction" $i | sed 's/^ *//'`
+   [ ! -z "$title" ] && echo " * {{{$i}$title}}" >> $toc && echo >> $toc
+  done       
+)       
+