diff --git a/org.springframework.web.servlet/src/main/resources/META-INF/spring.tld b/org.springframework.web.servlet/src/main/resources/META-INF/spring.tld
index 74f3c460bd0..51319ed8bff 100644
--- a/org.springframework.web.servlet/src/main/resources/META-INF/spring.tld
+++ b/org.springframework.web.servlet/src/main/resources/META-INF/spring.tld
@@ -379,7 +379,7 @@
true
- Set HTML escaping for this tag, as boolean value. Overrides the
+ Set HTML escaping for this tag, as a boolean value. Overrides the
default HTML escaping setting for the current page.
htmlEscape
false
diff --git a/spring-framework-reference/src/spring.tld.xml b/spring-framework-reference/src/spring.tld.xml
index 482b8bcc82f..868a6dc47c9 100644
--- a/spring-framework-reference/src/spring.tld.xml
+++ b/spring-framework-reference/src/spring.tld.xml
@@ -39,6 +39,12 @@
+
+
+
+
+
+
The <literal>bind</literal> tag
@@ -737,4 +743,222 @@
-
+
+ The <literal>url</literal> tag
+
+ Creates URLs with support for URI template variables, HTML/XML escaping, and Javascript escaping.
+ Modeled after the JSTL c:url tag with backwards compatibility in mind.
+
+
+ Attributes
+
+
+
+
+
+
+
+ Attribute
+ Required?
+ Runtime Expression?
+ Description
+
+
+
+
+
+ url
+
+
+ true
+
+
+ true
+
+
+ The URL to build. This value can include template {placeholders}
+ that are replaced with the URL encoded value of the named parameter. Parameters
+ must be defined using the param tag inside the body of this tag.
+
+
+
+
+ context
+
+
+ false
+
+
+ true
+
+
+ Specifies a remote application context path. The default is the
+ current application context path.
+
+
+
+
+ var
+
+
+ false
+
+
+ true
+
+
+ The name of the variable to export the URL value to.
+ If not specified the URL is written as output.
+
+
+
+
+ scope
+
+
+ false
+
+
+ true
+
+
+ The scope for the var. 'application', 'session', 'request' and
+ 'page' scopes are supported. Defaults to page scope. This attribute has no
+ effect unless the var attribute is also defined.
+
+
+
+
+ htmlEncoding
+
+
+ false
+
+
+ true
+
+
+ Set HTML escaping for this tag, as a boolean value. Overrides the
+ default HTML escaping setting for the current page.
+
+
+
+
+ javascriptEncoding
+
+
+ false
+
+
+ true
+
+
+ Set JavaScript escaping for this tag, as boolean value.
+ Default is false.
+
+
+
+
+
+
+
+ The <literal>eval</literal> tag
+
+ Evaluates a Spring expression (SpEL) and either prints the result or assigns it to a variable.
+
+
+ Attributes
+
+
+
+
+
+
+
+ Attribute
+ Required?
+ Runtime Expression?
+ Description
+
+
+
+
+
+ expression
+
+
+ true
+
+
+ true
+
+
+ The expression to evaluate.
+
+
+
+
+ var
+
+
+ false
+
+
+ true
+
+
+ The name of the variable to export the evaluation result to.
+ If not specified the evaluation result is converted to a String and written as output.
+
+
+
+
+ scope
+
+
+ false
+
+
+ true
+
+
+ The scope for the var. 'application', 'session', 'request' and
+ 'page' scopes are supported. Defaults to page scope. This attribute has no
+ effect unless the var attribute is also defined.
+
+
+
+
+ htmlEncoding
+
+
+ false
+
+
+ true
+
+
+ Set HTML escaping for this tag, as a boolean value. Overrides the
+ default HTML escaping setting for the current page.
+
+
+
+
+ javascriptEncoding
+
+
+ false
+
+
+ true
+
+
+ Set JavaScript escaping for this tag, as boolean value.
+ Default is false.
+
+
+
+
+
+
+
\ No newline at end of file