diff --git a/core/src/main/java/org/apache/struts2/components/Form.java b/core/src/main/java/org/apache/struts2/components/Form.java
index 316b0a825..c6dbd3fa9 100644
--- a/core/src/main/java/org/apache/struts2/components/Form.java
+++ b/core/src/main/java/org/apache/struts2/components/Form.java
@@ -93,6 +93,7 @@ public class Form extends ClosingUIBean {
     private int sequence = 0;
 
     protected String onsubmit;
+    protected String onreset;
     protected String action;
     protected String target;
     protected String enctype;
@@ -103,7 +104,7 @@ public class Form extends ClosingUIBean {
     protected String windowState;
     protected String acceptcharset;
     protected String focusElement;
-    
+
     protected Configuration configuration;
     protected ObjectFactory objectFactory;
     protected UrlRenderer urlRenderer;
@@ -134,12 +135,12 @@ public class Form extends ClosingUIBean {
     public void setObjectFactory(ObjectFactory objectFactory) {
         this.objectFactory = objectFactory;
     }
-    
+
     @Inject
     public void setUrlRenderer(UrlRenderer urlRenderer) {
     	this.urlRenderer = urlRenderer;
     }
-    
+
     @Inject
     public void setActionValidatorManager(ActionValidatorManager mgr) {
         this.actionValidatorManager = mgr;
@@ -178,6 +179,10 @@ public class Form extends ClosingUIBean {
             addParameter("onsubmit", findString(onsubmit));
         }
 
+        if (onreset != null) {
+            addParameter("onreset", findString(onreset));
+        }
+
         if (target != null) {
             addParameter("target", findString(target));
         }
@@ -200,7 +205,7 @@ public class Form extends ClosingUIBean {
             // we have this if check so we don't do this twice (on open and close of the template)
             addParameter("tagNames", new ArrayList());
         }
-        
+
         if (focusElement != null) {
             addParameter("focusElement", findString(focusElement));
         }
@@ -295,6 +300,11 @@ public class Form extends ClosingUIBean {
         this.onsubmit = onsubmit;
     }
 
+    @StrutsTagAttribute(description="HTML onreset attribute")
+    public void setOnreset(String onreset) {
+        this.onreset = onreset;
+    }
+
     @StrutsTagAttribute(description="Set action name to submit to, without .action suffix", defaultValue="current action")
     public void setAction(String action) {
         this.action = action;
diff --git a/core/src/main/resources/template/css_xhtml/form.ftl b/core/src/main/resources/template/css_xhtml/form.ftl
index be8a2cbcc..d57733743 100644
--- a/core/src/main/resources/template/css_xhtml/form.ftl
+++ b/core/src/main/resources/template/css_xhtml/form.ftl
@@ -21,5 +21,13 @@
  */
 -->
 <#include "/${parameters.templateDir}/css_xhtml/form-validate.ftl" />
-<#include "/${parameters.templateDir}/simple/form.ftl" />
+<#include "/${parameters.templateDir}/simple/form-common.ftl" />
+<#if (parameters.validate?default(false))>
+  onreset="${parameters.onreset?default('clearErrorMessages(this);clearErrorLabels(this);')}"
+<#else>
+  <#if parameters.onreset?exists>
+  onreset="${parameters.onreset?html}"
+  </#if>
+</#if>
+>
 <#include "/${parameters.templateDir}/css_xhtml/control.ftl">
diff --git a/core/src/main/resources/template/simple/form-common.ftl b/core/src/main/resources/template/simple/form-common.ftl
new file mode 100644
index 000000000..6bfc9ff68
--- /dev/null
+++ b/core/src/main/resources/template/simple/form-common.ftl
@@ -0,0 +1,69 @@
+<#--
+/*
+ * $Id: form.ftl 590812 2007-10-31 20:32:54Z apetrelli $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+<#if (parameters.validate?default(false) == false)><#rt/>
+    <#if parameters.onsubmit?exists><#rt/>
+        ${tag.addParameter('onsubmit', "${parameters.onsubmit}; return true;") }
+    <#else>
+        ${tag.addParameter('onsubmit', "return true;") }
+    </#if>
+</#if>
+<form<#rt/>
+<#if parameters.id?exists>
+ id="${parameters.id?html}"<#rt/>
+</#if>
+<#if parameters.name?exists>
+ name="${parameters.name?html}"<#rt/>
+</#if>
+<#if parameters.onsubmit?exists>
+ onsubmit="${parameters.onsubmit?html}"<#rt/>
+</#if>
+<#if parameters.onreset?exists>
+ onsubmit="${parameters.onreset?html}"<#rt/>
+</#if>
+<#if parameters.action?exists>
+ action="${parameters.action?html}"<#rt/>
+</#if>
+<#if parameters.target?exists>
+ target="${parameters.target?html}"<#rt/>
+</#if>
+<#if parameters.method?exists>
+ method="${parameters.method?html}"<#rt/>
+<#else>
+ method="post"<#rt/>
+</#if>
+<#if parameters.enctype?exists>
+ enctype="${parameters.enctype?html}"<#rt/>
+</#if>
+<#if parameters.cssClass?exists>
+ class="${parameters.cssClass?html}"<#rt/>
+</#if>
+<#if parameters.cssStyle?exists>
+ style="${parameters.cssStyle?html}"<#rt/>
+</#if>
+<#if parameters.title?exists>
+ title="${parameters.title?html}"<#rt/>
+</#if>
+<#if parameters.acceptcharset?exists>
+ accept-charset="${parameters.acceptcharset?html}"<#rt/>
+</#if>
+<#include "/${parameters.templateDir}/simple/dynamic-attributes.ftl" />
\ No newline at end of file
diff --git a/core/src/main/resources/template/simple/form.ftl b/core/src/main/resources/template/simple/form.ftl
index f7730cd27..39617f189 100644
--- a/core/src/main/resources/template/simple/form.ftl
+++ b/core/src/main/resources/template/simple/form.ftl
@@ -20,48 +20,8 @@
  * under the License.
  */
 -->
-<#if (parameters.validate?default(false) == false)><#rt/>
-	<#if parameters.onsubmit?exists><#rt/>
-		${tag.addParameter('onsubmit', "${parameters.onsubmit}; return true;") }
-	<#else>
-		${tag.addParameter('onsubmit', "return true;") }	
-	</#if>
+<#include "/${parameters.templateDir}/simple/form-common.ftl" />
+<#if parameters.onreset?exists>
+ onreset="${parameters.onreset?html}"<#rt/>
 </#if>
-<form<#rt/>
-<#if parameters.id?exists>
- id="${parameters.id?html}"<#rt/>
-</#if>
-<#if parameters.name?exists>
- name="${parameters.name?html}"<#rt/>
-</#if>
-<#if parameters.onsubmit?exists>
- onsubmit="${parameters.onsubmit?html}"<#rt/>
-</#if>
-<#if parameters.action?exists>
- action="${parameters.action?html}"<#rt/>
-</#if>
-<#if parameters.target?exists>
- target="${parameters.target?html}"<#rt/>
-</#if>
-<#if parameters.method?exists>
- method="${parameters.method?html}"<#rt/>
-<#else>
- method="post"<#rt/>
-</#if>
-<#if parameters.enctype?exists>
- enctype="${parameters.enctype?html}"<#rt/>
-</#if>
-<#if parameters.cssClass?exists>
- class="${parameters.cssClass?html}"<#rt/>
-</#if>
-<#if parameters.cssStyle?exists>
- style="${parameters.cssStyle?html}"<#rt/>
-</#if>
-<#if parameters.title?exists>
- title="${parameters.title?html}"<#rt/>
-</#if>
-<#if parameters.acceptcharset?exists>
- accept-charset="${parameters.acceptcharset?html}"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/simple/dynamic-attributes.ftl" />
 >
\ No newline at end of file
diff --git a/core/src/main/resources/template/xhtml/form.ftl b/core/src/main/resources/template/xhtml/form.ftl
index a271949b6..64a73145b 100644
--- a/core/src/main/resources/template/xhtml/form.ftl
+++ b/core/src/main/resources/template/xhtml/form.ftl
@@ -21,5 +21,13 @@
  */
 -->
 <#include "/${parameters.templateDir}/xhtml/form-validate.ftl" />
-<#include "/${parameters.templateDir}/simple/form.ftl" />
+<#include "/${parameters.templateDir}/simple/form-common.ftl" />
+<#if (parameters.validate?default(false))>
+  onreset="${parameters.onreset?default('clearErrorMessages(this);clearErrorLabels(this);')}"
+<#else>
+  <#if parameters.onreset?exists>
+  onreset="${parameters.onreset?html}"
+  </#if>
+</#if>
+>
 <#include "/${parameters.templateDir}/xhtml/control.ftl" />
diff --git a/core/src/site/resources/tags/a.html b/core/src/site/resources/tags/a.html
index 2f30262d9..ef3361dcd 100644
--- a/core/src/site/resources/tags/a.html
+++ b/core/src/site/resources/tags/a.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> true</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/action.html b/core/src/site/resources/tags/action.html
index 6d01f376c..169008f3d 100644
--- a/core/src/site/resources/tags/action.html
+++ b/core/src/site/resources/tags/action.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/actionerror.html b/core/src/site/resources/tags/actionerror.html
index 04f82320b..e1129b970 100644
--- a/core/src/site/resources/tags/actionerror.html
+++ b/core/src/site/resources/tags/actionerror.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/actionmessage.html b/core/src/site/resources/tags/actionmessage.html
index 00ea05042..3370c17d8 100644
--- a/core/src/site/resources/tags/actionmessage.html
+++ b/core/src/site/resources/tags/actionmessage.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/ajax/bind.html b/core/src/site/resources/tags/ajax/bind.html
index df06274da..b450b9331 100644
--- a/core/src/site/resources/tags/ajax/bind.html
+++ b/core/src/site/resources/tags/ajax/bind.html
@@ -19,6 +19,12 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
+			<tr>
+				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
+			</tr>
+			<tr>
+				<td colspan="6">&nbsp;</td>
+			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/ajax/head.html b/core/src/site/resources/tags/ajax/head.html
index 063a7b20e..b1257e991 100644
--- a/core/src/site/resources/tags/ajax/head.html
+++ b/core/src/site/resources/tags/ajax/head.html
@@ -19,6 +19,12 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
+			<tr>
+				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
+			</tr>
+			<tr>
+				<td colspan="6">&nbsp;</td>
+			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/ajax/submit.html b/core/src/site/resources/tags/ajax/submit.html
index b9b668ff6..3f487f6ac 100644
--- a/core/src/site/resources/tags/ajax/submit.html
+++ b/core/src/site/resources/tags/ajax/submit.html
@@ -19,6 +19,12 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
+			<tr>
+				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
+			</tr>
+			<tr>
+				<td colspan="6">&nbsp;</td>
+			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/ajax/treenode.html b/core/src/site/resources/tags/ajax/treenode.html
index 562a7faa2..ad1d0e69f 100644
--- a/core/src/site/resources/tags/ajax/treenode.html
+++ b/core/src/site/resources/tags/ajax/treenode.html
@@ -19,6 +19,12 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
+			<tr>
+				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
+			</tr>
+			<tr>
+				<td colspan="6">&nbsp;</td>
+			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/append.html b/core/src/site/resources/tags/append.html
index 1bd29a0db..dfe711907 100644
--- a/core/src/site/resources/tags/append.html
+++ b/core/src/site/resources/tags/append.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/bean.html b/core/src/site/resources/tags/bean.html
index eb801da0a..c8b2d8608 100644
--- a/core/src/site/resources/tags/bean.html
+++ b/core/src/site/resources/tags/bean.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/checkbox.html b/core/src/site/resources/tags/checkbox.html
index 220d168f3..0ad8b712b 100644
--- a/core/src/site/resources/tags/checkbox.html
+++ b/core/src/site/resources/tags/checkbox.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> true</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/checkboxlist.html b/core/src/site/resources/tags/checkboxlist.html
index c44b12dfd..4cf9a42e3 100644
--- a/core/src/site/resources/tags/checkboxlist.html
+++ b/core/src/site/resources/tags/checkboxlist.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/combobox.html b/core/src/site/resources/tags/combobox.html
index 135c31914..7cd803c09 100644
--- a/core/src/site/resources/tags/combobox.html
+++ b/core/src/site/resources/tags/combobox.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/component.html b/core/src/site/resources/tags/component.html
index 1aa1dff03..4521da922 100644
--- a/core/src/site/resources/tags/component.html
+++ b/core/src/site/resources/tags/component.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/date.html b/core/src/site/resources/tags/date.html
index 11f4a448c..795f1c248 100644
--- a/core/src/site/resources/tags/date.html
+++ b/core/src/site/resources/tags/date.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/debug.html b/core/src/site/resources/tags/debug.html
index 38f230dba..38ae28efa 100644
--- a/core/src/site/resources/tags/debug.html
+++ b/core/src/site/resources/tags/debug.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/div.html b/core/src/site/resources/tags/div.html
index 693e1c0dd..0197777fa 100644
--- a/core/src/site/resources/tags/div.html
+++ b/core/src/site/resources/tags/div.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> true</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/doubleselect.html b/core/src/site/resources/tags/doubleselect.html
index 09da45dd2..9426f36a9 100644
--- a/core/src/site/resources/tags/doubleselect.html
+++ b/core/src/site/resources/tags/doubleselect.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/else.html b/core/src/site/resources/tags/else.html
index 1e4b7e851..86399aec6 100644
--- a/core/src/site/resources/tags/else.html
+++ b/core/src/site/resources/tags/else.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/elseif.html b/core/src/site/resources/tags/elseif.html
index 0554e5cc2..f046922e8 100644
--- a/core/src/site/resources/tags/elseif.html
+++ b/core/src/site/resources/tags/elseif.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/fielderror.html b/core/src/site/resources/tags/fielderror.html
index a2bc883a0..cd77b5987 100644
--- a/core/src/site/resources/tags/fielderror.html
+++ b/core/src/site/resources/tags/fielderror.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/file.html b/core/src/site/resources/tags/file.html
index 28a314b51..30e9e82c5 100644
--- a/core/src/site/resources/tags/file.html
+++ b/core/src/site/resources/tags/file.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> true</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/form.html b/core/src/site/resources/tags/form.html
index adb4d4a4b..b97660fc9 100644
--- a/core/src/site/resources/tags/form.html
+++ b/core/src/site/resources/tags/form.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> true</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
@@ -289,6 +283,14 @@ Please do not edit it directly.
 					<td align="left" valign="top">String</td>
 					<td align="left" valign="top">Set the html onmouseup attribute on rendered html element</td>
 				</tr>
+				<tr>
+					<td align="left" valign="top">onreset</td>
+					<td align="left" valign="top">false</td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">false</td>
+					<td align="left" valign="top">String</td>
+					<td align="left" valign="top">HTML onreset attribute</td>
+				</tr>
 				<tr>
 					<td align="left" valign="top">onselect</td>
 					<td align="left" valign="top">false</td>
diff --git a/core/src/site/resources/tags/generator.html b/core/src/site/resources/tags/generator.html
index 7824c583f..7a60cfc44 100644
--- a/core/src/site/resources/tags/generator.html
+++ b/core/src/site/resources/tags/generator.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/head.html b/core/src/site/resources/tags/head.html
index b2c06d77e..42b982d6f 100644
--- a/core/src/site/resources/tags/head.html
+++ b/core/src/site/resources/tags/head.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/hidden.html b/core/src/site/resources/tags/hidden.html
index fef121d8a..1ccb6c36f 100644
--- a/core/src/site/resources/tags/hidden.html
+++ b/core/src/site/resources/tags/hidden.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> true</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/i18n.html b/core/src/site/resources/tags/i18n.html
index a022b8ac9..e67fa5976 100644
--- a/core/src/site/resources/tags/i18n.html
+++ b/core/src/site/resources/tags/i18n.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/if.html b/core/src/site/resources/tags/if.html
index a90b6f3a6..0d5386f2e 100644
--- a/core/src/site/resources/tags/if.html
+++ b/core/src/site/resources/tags/if.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/include.html b/core/src/site/resources/tags/include.html
index 369c0fc47..f1be249af 100644
--- a/core/src/site/resources/tags/include.html
+++ b/core/src/site/resources/tags/include.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/inputtransferselect.html b/core/src/site/resources/tags/inputtransferselect.html
index 148388347..5c9e30d3c 100644
--- a/core/src/site/resources/tags/inputtransferselect.html
+++ b/core/src/site/resources/tags/inputtransferselect.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/iterator.html b/core/src/site/resources/tags/iterator.html
index 85f64a839..e525fe309 100644
--- a/core/src/site/resources/tags/iterator.html
+++ b/core/src/site/resources/tags/iterator.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/label.html b/core/src/site/resources/tags/label.html
index 3de6623b3..28e9589ae 100644
--- a/core/src/site/resources/tags/label.html
+++ b/core/src/site/resources/tags/label.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> true</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/merge.html b/core/src/site/resources/tags/merge.html
index 66c963893..cc191fe0d 100644
--- a/core/src/site/resources/tags/merge.html
+++ b/core/src/site/resources/tags/merge.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/optgroup.html b/core/src/site/resources/tags/optgroup.html
index dcb94319f..acbd52eca 100644
--- a/core/src/site/resources/tags/optgroup.html
+++ b/core/src/site/resources/tags/optgroup.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/optiontransferselect.html b/core/src/site/resources/tags/optiontransferselect.html
index 580a6b28b..1af8c970e 100644
--- a/core/src/site/resources/tags/optiontransferselect.html
+++ b/core/src/site/resources/tags/optiontransferselect.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/param.html b/core/src/site/resources/tags/param.html
index f4cc5ef0e..b42371631 100644
--- a/core/src/site/resources/tags/param.html
+++ b/core/src/site/resources/tags/param.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/password.html b/core/src/site/resources/tags/password.html
index cb4f2df32..28a14cabd 100644
--- a/core/src/site/resources/tags/password.html
+++ b/core/src/site/resources/tags/password.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> true</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/property.html b/core/src/site/resources/tags/property.html
index 60c72a47a..7de6263b8 100644
--- a/core/src/site/resources/tags/property.html
+++ b/core/src/site/resources/tags/property.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/push.html b/core/src/site/resources/tags/push.html
index f9d1a59fc..ba47fdca0 100644
--- a/core/src/site/resources/tags/push.html
+++ b/core/src/site/resources/tags/push.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/radio.html b/core/src/site/resources/tags/radio.html
index 5bcea6248..368f1f90d 100644
--- a/core/src/site/resources/tags/radio.html
+++ b/core/src/site/resources/tags/radio.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/reset.html b/core/src/site/resources/tags/reset.html
index 722235b91..0ed87531e 100644
--- a/core/src/site/resources/tags/reset.html
+++ b/core/src/site/resources/tags/reset.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> true</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/select.html b/core/src/site/resources/tags/select.html
index 82b27419a..8847d1aee 100644
--- a/core/src/site/resources/tags/select.html
+++ b/core/src/site/resources/tags/select.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> true</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/set.html b/core/src/site/resources/tags/set.html
index 566ab4234..7d1b37bc3 100644
--- a/core/src/site/resources/tags/set.html
+++ b/core/src/site/resources/tags/set.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/sort.html b/core/src/site/resources/tags/sort.html
index 148000157..79ab3c024 100644
--- a/core/src/site/resources/tags/sort.html
+++ b/core/src/site/resources/tags/sort.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/submit.html b/core/src/site/resources/tags/submit.html
index 803b0fb7b..1623a3d67 100644
--- a/core/src/site/resources/tags/submit.html
+++ b/core/src/site/resources/tags/submit.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> true</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/subset.html b/core/src/site/resources/tags/subset.html
index 3fcaffd29..2ce4b8f8c 100644
--- a/core/src/site/resources/tags/subset.html
+++ b/core/src/site/resources/tags/subset.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/text.html b/core/src/site/resources/tags/text.html
index ddc11a393..0a85503f7 100644
--- a/core/src/site/resources/tags/text.html
+++ b/core/src/site/resources/tags/text.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/textarea.html b/core/src/site/resources/tags/textarea.html
index 0e0a67545..24e014b0d 100644
--- a/core/src/site/resources/tags/textarea.html
+++ b/core/src/site/resources/tags/textarea.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> true</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/textfield.html b/core/src/site/resources/tags/textfield.html
index b513ac3bc..43519654d 100644
--- a/core/src/site/resources/tags/textfield.html
+++ b/core/src/site/resources/tags/textfield.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> true</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/token.html b/core/src/site/resources/tags/token.html
index 144163ab5..5a90725b4 100644
--- a/core/src/site/resources/tags/token.html
+++ b/core/src/site/resources/tags/token.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/updownselect.html b/core/src/site/resources/tags/updownselect.html
index 5fa3f0bc4..0b2e4b41d 100644
--- a/core/src/site/resources/tags/updownselect.html
+++ b/core/src/site/resources/tags/updownselect.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/site/resources/tags/url.html b/core/src/site/resources/tags/url.html
index 2b023f34f..01fe4aff9 100644
--- a/core/src/site/resources/tags/url.html
+++ b/core/src/site/resources/tags/url.html
@@ -19,12 +19,6 @@ Please do not edit it directly.
 		<h2>Attributes</h2>
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
-			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
-			</tr>
-			<tr>
-				<td colspan="6">&nbsp;</td>
-			</tr>
 			<tr>
 				<th align="left" valign="top"><h4>Name</h4></th>
 				<th align="left" valign="top"><h4>Required</h4></th>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
index 0e21a6047..487fd2b8a 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
@@ -1,6 +1,6 @@
 <script type="text/javascript" src="/struts/xhtml/validation.js"></script>
 <script type="text/javascript" src="/struts/utils.js"></script>
-<form id="myAction" name="myForm" onsubmit="submitMe(); return validateForm_myAction();" action="/myAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8">
+<form id="myAction" name="myForm" onsubmit="submitMe(); return validateForm_myAction();" action="/myAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8" onreset="clearErrorMessages(this);clearErrorLabels(this);">
 <table class="wwFormTable"> <tr>
     <td class="tdLabel"></td>
     <td>	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
@@ -22,7 +22,7 @@
 
 <script type="text/javascript">
 	var containingForm = document.getElementById("myAction");
-	StrutsUtils.addEventListener(containingForm, "submit", 
+	StrutsUtils.addEventListener(containingForm, "submit",
 			function(evt) {
 				var updownselectObj = document.getElementById("myAction_myUpDownSelectTag");
 				selectAllOptionsExceptSome(updownselectObj, "key", "");
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
index c11f0cf8b..da469e71f 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
@@ -1,6 +1,6 @@
 <script type="text/javascript" src="/struts/xhtml/validation.js"></script>
 <script type="text/javascript "src="/struts/utils.js"></script>
-<form id="myAction" name="myForm" onsubmit="submitMe(); return validateForm_myAction();" action="/myAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8">
+<form id="myAction" name="myForm" onsubmit="submitMe(); return validateForm_myAction();" action="/myAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8" onreset="clearErrorMessages(this);clearErrorLabels(this);">
 <table class="wwFormTable"> <tr>
     <td class="tdLabel"></td>
     <td>	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
@@ -22,7 +22,7 @@
 
 <script type="text/javascript">
 	var containingForm = document.getElementById("myAction");
-	StrutsUtils.addEventListener(containingForm, "submit", 
+	StrutsUtils.addEventListener(containingForm, "submit",
 			function(evt) {
 				var updownselectObj = document.getElementById("myAction_myUpDownSelectTag");
 				selectAllOptionsExceptSome(updownselectObj, "key", "");
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
index 38a969595..53071751a 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
@@ -1,6 +1,6 @@
 <script type="text/javascript" src="/struts/xhtml/validation.js"></script>
 <script type="text/javascript "src="/struts/utils.js"></script>
-<form id="myAction" name="myForm" onsubmit="submitMe(); return validateForm_myAction();" action="/myAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8">
+<form id="myAction" name="myForm" onsubmit="submitMe(); return validateForm_myAction();" action="/myAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8" onreset="clearErrorMessages(this);clearErrorLabels(this);">
 <table class="wwFormTable"> <tr>
     <td class="tdLabel"></td>
     <td>	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
@@ -22,7 +22,7 @@
 
 <script type="text/javascript">
 	var containingForm = document.getElementById("myAction");
-	StrutsUtils.addEventListener(containingForm, "submit", 
+	StrutsUtils.addEventListener(containingForm, "submit",
 			function(evt) {
 				var updownselectObj = document.getElementById("myAction_myUpDownSelectTag");
 				selectAllOptionsExceptSome(updownselectObj, "key", "");