diff --git a/transforms/adl2controllerclasses.xslt b/transforms/adl2controllerclasses.xslt
index b5eb1d7..c2fdf30 100755
--- a/transforms/adl2controllerclasses.xslt
+++ b/transforms/adl2controllerclasses.xslt
@@ -9,8 +9,8 @@
     Transform ADL into (partial) controller classes
     
     $Author: sb $
-    $Revision: 1.44 $
-    $Date: 2010-01-12 17:20:17 $
+    $Revision: 1.45 $
+    $Date: 2010-06-01 17:29:02 $
   -->
 
 <!-- WARNING WARNING WARNING: Do NOT reformat this file! 
@@ -72,7 +72,7 @@
 		//
 		//  Automatically generated abstract super class for controllers for the
 		//	<xsl:value-of select="/adl:application/@name"/> application; generated using
-		//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.44 $', 10)"/>
+		//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.45 $', 10)"/>
 		//
 		//  <xsl:value-of select="/adl:application/@revision"/>
 		//
@@ -80,6 +80,14 @@
 		//
 		//------------------------------------------------------------------
 
+		/// &lt;summary&gt;
+		/// \mainpage <xsl:value-of select="concat( @name, ' ', @version)"/>
+		/// <xsl:value-of select="normalize-space(adl:documentation)"/>
+		///
+		/// \package <xsl:value-of select="$controllerns"/>
+		/// MVC Controller classes for <xsl:value-of select='/adl:application/@name'/>
+		/// &lt;/summary&gt;
+		namespace <xsl:value-of select="$controllerns"/> {
 		using System;
 		using System.Data;
 		using System.Collections.Generic;
@@ -92,8 +100,6 @@
 		using Castle.MonoRail.Framework;
 		using <xsl:value-of select="$entityns"/>;
 
-		namespace <xsl:value-of select="$controllerns"/> {
-
 		/// &lt;summary&gt;
 		/// Automatically generated abstract super class for controllers for the
 		/// <xsl:value-of select="/adl:application/@name"/> application
@@ -182,12 +188,13 @@
 		//
 		//  Controller for auto-generated forms for editing <xsl:value-of select="@name"/>s
 		//  Automatically generated from application description using
-		//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.44 $', 10)"/>
+		//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.45 $', 10)"/>
 		//
 		//  This file is automatically generated; DO NOT EDIT IT.
 		//
 		//------------------------------------------------------------------
 
+		namespace <xsl:value-of select="$controllerns"/> {
 		using System;
 		using System.Data;
 		using System.Collections.Generic;
@@ -199,28 +206,36 @@
 		using System.Web.UI.WebControls.WebParts;
 		using System.Web.UI.HtmlControls;
 		using Castle.MonoRail.Framework.Helpers;
-    using Cygnet.Entities;
+		using Cygnet.Entities;
 		using Cygnet.Exceptions;
 		using Cygnet.Web.Helpers;
 		using Cygnet.Web.Controllers;
 		using Cygnet.Web.SmartControls;
-    using Cygnet.Utility;
+		using Cygnet.Utility;
 		using NHibernate;
 		using NHibernate.Expression;
 		using Castle.MonoRail.Framework;
 		using Iesi.Collections.Generic;
 		using <xsl:value-of select="$entityns"/>;
 
-		namespace <xsl:value-of select="$controllerns"/> {
-
 		/// &lt;summary&gt;
 		/// Automatically generated partial controller class following 'thin controller'
 		/// strategy, for entity <xsl:value-of select="@name"/>. Note that part of this
 		/// class may be defined in a separate file called
 		/// <xsl:value-of select="@name"/>Controller.manual.cs, q.v.
+		/// &lt;/summary&gt;
+		///
+		/// &lt;remarks&gt;
+		/// &lt;list type='bullet'&gt;
+		/// &lt;listheader&gt;&lt;description&gt;See also auto-generated Velocity view macros&lt;/description&gt;&lt;/listheader&gt;<xsl:for-each select='adl:form|adl:page|adl:list'>
+		/// &lt;item&gt;
+		/// &lt;term&gt;<xsl:value-of select="concat(@name, '.auto.vm')"/>&lt;/term&gt;
+		/// &lt;description&gt;<xsl:apply-templates select='adl:documentation'/>&lt;/description&gt;
+		/// &lt;/item&gt;</xsl:for-each>
+		/// &lt;/list&gt;
 		///
 		/// DO NOT EDIT THIS FILE!
-		/// &lt;/summary&gt;
+		/// &lt;/remarks&gt;
 		[
 		<xsl:if test="$layout-name">
 			Layout("<xsl:value-of select="$layout-name"/>"),
diff --git a/transforms/adl2entityclasses.xslt b/transforms/adl2entityclasses.xslt
index dc522f9..ee022e4 100755
--- a/transforms/adl2entityclasses.xslt
+++ b/transforms/adl2entityclasses.xslt
@@ -8,8 +8,8 @@
     Transform ADL into C# entity classes
     
     $Author: sb $
-    $Revision: 1.27 $
-    $Date: 2010-01-12 17:20:17 $
+    $Revision: 1.28 $
+    $Date: 2010-06-01 17:29:02 $
   -->
 
 <!-- WARNING WARNING WARNING: Do NOT reformat this file! 
@@ -70,7 +70,7 @@
 		//  (c)2007 Cygnet Solutions Ltd
 		//
 		//  Automatically generated from application description using
-		//  adl2entityclass.xsl revision <xsl:value-of select="substring( '$Revision: 1.27 $', 10)"/>
+		//  adl2entityclass.xsl revision <xsl:value-of select="substring( '$Revision: 1.28 $', 10)"/>
 		//
 		//  <xsl:value-of select="/adl:application/@revision"/>
 		//
@@ -97,7 +97,7 @@
 		/// &lt;/summary&gt;
 		/// &lt;remarks&gt;
 		/// Automatically generated from description of group <xsl:value-of select="@name"/>
-		/// using adl2entityclass.xsl revision <xsl:value-of select="substring( '$Revision: 1.27 $', 10)"/>.
+		/// using adl2entityclass.xsl revision <xsl:value-of select="substring( '$Revision: 1.28 $', 10)"/>.
 		///
 		/// DO NOT EDIT THIS FILE!
 		/// &lt;/remarks&gt;
@@ -123,13 +123,25 @@
 		//  (c)2007 Cygnet Solutions Ltd
 		//
 		//  Automatically generated from application description using
-		//  adl2entityclass.xsl revision <xsl:value-of select="substring( '$Revision: 1.27 $', 10)"/>
+		//  adl2entityclass.xsl revision <xsl:value-of select="substring( '$Revision: 1.28 $', 10)"/>
 		//
 		//  <xsl:value-of select="/adl:application/@revision"/>
 		//
 		//  This file is automatically generated; DO NOT EDIT IT.
 		//
 		//-------------------------------------------------------------
+
+		<xsl:if test="position() = 1">
+		/// &lt;summary&gt;
+		/// \mainpage <xsl:value-of select="concat( /adl:application/@name, ' ', /adl:application/@version)"/>
+		/// <xsl:value-of select="normalize-space( /adl:application/adl:documentation)"/>
+		///
+		/// \package <xsl:value-of select="$entityns"/>
+		/// Entity (MVC model) classes for <xsl:value-of select='/adl:application/@name'/>
+		/// &lt;/summary&gt;
+		</xsl:if>
+		namespace <xsl:value-of select="$entityns"/>
+		{
 		using System;
 		using System.Configuration;
 		using System.Collections;
@@ -142,14 +154,12 @@
 		using NHibernate;
 		using NHibernate.Classic;
 
-		namespace <xsl:value-of select="$entityns"/>
-		{
 		/// &lt;summary&gt;
 		/// <xsl:value-of select="normalize-space( adl:documentation)"/>
 		/// &lt;/summary&gt;
 		/// &lt;remarks&gt;
 		/// Automatically generated from description of entity <xsl:value-of select="@name"/>
-		/// using adl2entityclass.xsl revision <xsl:value-of select="substring( '$Revision: 1.27 $', 10)"/>.
+		/// using adl2entityclass.xsl revision <xsl:value-of select="substring( '$Revision: 1.28 $', 10)"/>.
 		/// Note that manually maintained parts of this class may be defined in
 		/// a separate file called <xsl:value-of select="@name"/>.manual.cs, q.v.
 		///