diff --git a/proposal/xdocs/dvsl/task.dvsl b/proposal/xdocs/dvsl/task.dvsl
index 89b6a4d56..778a01c1a 100644
--- a/proposal/xdocs/dvsl/task.dvsl
+++ b/proposal/xdocs/dvsl/task.dvsl
@@ -54,7 +54,7 @@ $word.substring(0,1).toUpperCase()$word.substring(1)
   #set( $project = $node.selectSingleNode("document('xdocs/stylesheets/project.xml')/project" ) )
   #if ($node.name().equals("task"))
     #set( $title = "#capitalize($attrib.name) Task" )
-    #set( $summary = $node.short-description )
+    #set( $summary = $node.short-description )   
   #end
 
 <html>
@@ -105,7 +105,7 @@ $word.substring(0,1).toUpperCase()$word.substring(1)
           <!-- Applying task/long-description -->
 #*        *#$context.applyTemplates("long-description")
 #*      *##end
-#*     *#$context.applyTemplates("structure/attributes")
+#*     *#$context.applyTemplates("structure/attribute-groups")
 #*     *#$context.applyTemplates("structure/elements")
 #*     *#$context.applyTemplates("external/section")
 #*    *##end
@@ -153,6 +153,16 @@ $word.substring(0,1).toUpperCase()$word.substring(1)
         </td>
 #end
 
+#*
+    Macro to format a table body cell that spans multiple rows
+*#
+#macro( tdmr $text $rows  )
+        <td bgcolor="$table-td-bg" valign="top" align="left" rowspan="$rows">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">$text</font>
+        </td>
+#end
+
+
 #*
     Macro to format a section banner
 *#
@@ -215,19 +225,18 @@ $word.substring(0,1).toUpperCase()$word.substring(1)
 #*
     Process top level attributes
 *#
-#match( "structure/attributes" )
+#match( "structure/attribute-groups" )
     <!-- Start Attributes -->
     <table border="0" cellspacing="0" cellpadding="2" width="100%">
       <tr><td>&nbsp;</td></tr>
-
-#*      *##section("attributes" "Parameters")
-
+#*      *##section("attributes" "Parameters") 
       <tr><td><blockquote>
         <table>
           <tr>
 #*          *##th("Attribute")
 #*          *##th("Description")
 #*          *##th("Type")
+#*          *##th("Requirement")
           </tr>
 #*        *#$context.applyTemplates("*")
         </table>
@@ -237,15 +246,30 @@ $word.substring(0,1).toUpperCase()$word.substring(1)
     <!-- End Attributes -->
 #end
 
+#*
+    Process attribute group
+*#
+#match( "structure/attribute-groups/attribute-group" )
+    <!-- Attribute Group -->    
+    #set ($attributeGroup = $attrib.description)
+    #set ($numGroups = $node.selectNodes("attribute").size())
+    #set ($inGroup = true)
+#*        *#$context.applyTemplates("*")
+#end
+
 #*
     Process a single attribute
 *#
-#match( "attribute" )
+#match( "structure/attribute-groups/attribute-group/attribute" )    
     <!-- Attribute -->
     <tr>
 #*    *##td($attrib.name)
 #*    *##td($node.description)
 #*    *##td($attrib.briefType)
+#if ($inGroup)
+#*    *##tdmr($attributeGroup $numGroups)
+#set ($inGroup = false)
+#end
     </tr>
 #end
 
@@ -385,6 +409,15 @@ $word.substring(0,1).toUpperCase()$word.substring(1)
     </table>
 #end
 
+#*
+ *  process a the requirement groups
+ *#
+#match( "requirement-group" )
+    #if ($regGroup == $attrib.name)
+#*      *#$attrib.description
+    #end
+#end
+
 #match( "source" )
     <div align="left">
       <table cellspacing="4" cellpadding="0" border="0">
diff --git a/proposal/xdocs/lib/xdoclet-apache-module-1.2b3-dev.jar b/proposal/xdocs/lib/xdoclet-apache-module-1.2b3-dev.jar
index b7b7a3b1d..c2409e95b 100644
Binary files a/proposal/xdocs/lib/xdoclet-apache-module-1.2b3-dev.jar and b/proposal/xdocs/lib/xdoclet-apache-module-1.2b3-dev.jar differ
