From b5763fe32628af72310585ef296e087e7908659e Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Wed, 20 Aug 2014 16:36:12 +0200
Subject: [PATCH] Consistent attribute documentation/formatting in
 spring-context and spring-mvc schemas

---
 .../context/config/spring-context-3.2.xsd     |  59 +++----
 .../context/config/spring-context-4.0.xsd     |  59 +++----
 .../context/config/spring-context-4.1.xsd     |  59 +++----
 .../web/servlet/config/spring-mvc-3.2.xsd     |  43 +++--
 .../web/servlet/config/spring-mvc-4.0.xsd     | 167 +++++++++---------
 .../web/servlet/config/spring-mvc-4.1.xsd     |  62 ++++---
 6 files changed, 218 insertions(+), 231 deletions(-)

diff --git a/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.2.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.2.xsd
index d650f071356..6ad52984170 100644
--- a/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.2.xsd
+++ b/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.2.xsd
@@ -25,24 +25,25 @@
 				<xsd:documentation><![CDATA[
 	The location of the properties file to resolve placeholders against, as a Spring
 	resource location: a URL, a "classpath:" pseudo URL, or a relative file path.
-	Multiple locations may be specified, separated by commas. If neither location nor properties-ref is
-	specified, placeholders will be resolved against system properties.
+	Multiple locations may be specified, separated by commas. If neither location nor
+	properties-ref is specified, placeholders will be resolved against system properties.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="properties-ref" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation source="java:java.util.Properties"><![CDATA[
-	The bean name of a Java Properties object that will be used for property substitution.
-	If neither location nor properties-ref is specified, placeholders will be resolved against system properties.
+	The bean name of a Properties object that will be used for property substitution.
+	If neither location nor properties-ref is specified, placeholders will be resolved
+	against system properties.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="file-encoding" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies the encoding to use for parsing properties files.  Default is none,
-	using the java.util.Properties default encoding.  Only applies to classic
+	Specifies the encoding to use for parsing properties files. Default is none,
+	using the java.util.Properties default encoding. Only applies to classic
 	properties files, not to XML files.
 				]]></xsd:documentation>
 			</xsd:annotation>
@@ -50,39 +51,36 @@
 		<xsd:attribute name="order" type="xsd:integer">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies the order for this placeholder configurer.  If more than one is present in a context
-	the order can be important since the first one to be match a placeholder will win.  Often used
-	in conjunction with
+	Specifies the order for this placeholder configurer. If more than one is present
+	in a context, the order can be important since the first one to be match a
+	placeholder will win.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="ignore-resource-not-found" type="xsd:boolean"
-			default="false">
+		<xsd:attribute name="ignore-resource-not-found" type="xsd:boolean" default="false">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies if failure to find the property resource location should be ignored.  Default
-	is "false", meaning that if there is no file in the location specified an exception will
-	be raised at runtime.
+	Specifies if failure to find the property resource location should be ignored.
+	Default is "false", meaning that if there is no file in the location specified
+	an exception will be raised at runtime.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="ignore-unresolvable" type="xsd:boolean"
-			default="false">
+		<xsd:attribute name="ignore-unresolvable" type="xsd:boolean" default="false">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies if failure to find the property value to replace a key should be ignored.  Default
-	is "false", meaning that this placeholder configurer will raise an exception if it cannot resolve
-	a key.  Set to "true" to allow the configurer to pass on the key to any others in
-	the context that have not yet visited the key in question.
+	Specifies if failure to find the property value to replace a key should be ignored.
+	Default is "false", meaning that this placeholder configurer will raise an exception
+	if it cannot resolve a key. Set to "true" to allow the configurer to pass on the key
+	to any others in the context that have not yet visited the key in question.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="local-override" type="xsd:boolean"
-			default="false">
+		<xsd:attribute name="local-override" type="xsd:boolean" default="false">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies whether local properties override properties from files.  Default
-	is "false": Properties from files override local defaults.
+	Specifies whether local properties override properties from files.
+	Default is "false": Properties from files override local defaults.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -104,12 +102,11 @@
 	traditional PropertyPlaceholderConfigurer component will be registered instead of the
 	new PropertySourcesPlaceholderConfigurer.
 
-	See ConfigurableEnvironment Javadoc for more information on using.
+	See ConfigurableEnvironment javadoc for more information on using.
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports
-						type="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
+					<tool:exports type="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -130,7 +127,7 @@
 	newer PropertySourcesPlaceholderConfigurer variant. In this case, the Spring Environment
 	and its property sources are not interrogated when resolving placeholders. Users are
 	encouraged to consider this attribute deprecated, and to take advantage of
-	Environment/PropertySource mechanisms. See ConfigurableEnvironment Javadoc for examples.
+	Environment/PropertySource mechanisms. See ConfigurableEnvironment javadoc for examples.
 
 	"ENVIRONMENT" indicates placeholders should be resolved against the current Environment and against any local properties;
 	"NEVER" indicates placeholders should be resolved only against local properties and never against system properties;
@@ -184,7 +181,7 @@
 	@TransactionAttribute annotation. Consider the use of the <tx:annotation-driven>
 	tag for that purpose.
 
-	See Javadoc for org.springframework.context.annotation.AnnotationConfigApplicationContext
+	See javadoc for org.springframework.context.annotation.AnnotationConfigApplicationContext
 	for information on code-based alternatives to bootstrapping annotation-driven support.
 	from XML.
 			]]></xsd:documentation>
@@ -211,7 +208,7 @@
 	definitions just like to regular bean definitions, but it won't apply to the component
 	scan settings themselves.
 
-	See Javadoc for org.springframework.context.annotation.ComponentScan for information
+	See javadoc for org.springframework.context.annotation.ComponentScan for information
 	on code-based alternatives to bootstrapping component-scanning.
 			]]></xsd:documentation>
 		</xsd:annotation>
@@ -336,7 +333,7 @@
 	This will only happen if the AnnotationBeanConfigurerAspect is on the classpath
 	(i.e. spring-aspects.jar), effectively activating "spring-configured" by default.
 
-	See Javadoc for org.springframework.context.annotation.EnableLoadTimeWeaving
+	See javadoc for org.springframework.context.annotation.EnableLoadTimeWeaving
 	for information on code-based alternatives to bootstrapping load-time weaving support.
 			]]></xsd:documentation>
 			<xsd:appinfo>
diff --git a/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.0.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.0.xsd
index 6b69546f547..10bce2d33a9 100644
--- a/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.0.xsd
+++ b/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.0.xsd
@@ -25,24 +25,25 @@
 				<xsd:documentation><![CDATA[
 	The location of the properties file to resolve placeholders against, as a Spring
 	resource location: a URL, a "classpath:" pseudo URL, or a relative file path.
-	Multiple locations may be specified, separated by commas. If neither location nor properties-ref is
-	specified, placeholders will be resolved against system properties.
+	Multiple locations may be specified, separated by commas. If neither location nor
+	properties-ref is specified, placeholders will be resolved against system properties.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="properties-ref" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation source="java:java.util.Properties"><![CDATA[
-	The bean name of a Java Properties object that will be used for property substitution.
-	If neither location nor properties-ref is specified, placeholders will be resolved against system properties.
+	The bean name of a Properties object that will be used for property substitution.
+	If neither location nor properties-ref is specified, placeholders will be resolved
+	against system properties.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="file-encoding" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies the encoding to use for parsing properties files.  Default is none,
-	using the java.util.Properties default encoding.  Only applies to classic
+	Specifies the encoding to use for parsing properties files. Default is none,
+	using the java.util.Properties default encoding. Only applies to classic
 	properties files, not to XML files.
 				]]></xsd:documentation>
 			</xsd:annotation>
@@ -50,39 +51,36 @@
 		<xsd:attribute name="order" type="xsd:token">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies the order for this placeholder configurer.  If more than one is present in a context
-	the order can be important since the first one to be match a placeholder will win.  Often used
-	in conjunction with
+	Specifies the order for this placeholder configurer. If more than one is present
+	in a context, the order can be important since the first one to be match a
+	placeholder will win.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="ignore-resource-not-found" type="xsd:boolean"
-			default="false">
+		<xsd:attribute name="ignore-resource-not-found" type="xsd:boolean" default="false">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies if failure to find the property resource location should be ignored.  Default
-	is "false", meaning that if there is no file in the location specified an exception will
-	be raised at runtime.
+	Specifies if failure to find the property resource location should be ignored.
+	Default is "false", meaning that if there is no file in the location specified
+	an exception will be raised at runtime.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="ignore-unresolvable" type="xsd:boolean"
-			default="false">
+		<xsd:attribute name="ignore-unresolvable" type="xsd:boolean" default="false">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies if failure to find the property value to replace a key should be ignored.  Default
-	is "false", meaning that this placeholder configurer will raise an exception if it cannot resolve
-	a key.  Set to "true" to allow the configurer to pass on the key to any others in
-	the context that have not yet visited the key in question.
+	Specifies if failure to find the property value to replace a key should be ignored.
+	Default is "false", meaning that this placeholder configurer will raise an exception
+	if it cannot resolve a key. Set to "true" to allow the configurer to pass on the key
+	to any others in the context that have not yet visited the key in question.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="local-override" type="xsd:boolean"
-			default="false">
+		<xsd:attribute name="local-override" type="xsd:boolean" default="false">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies whether local properties override properties from files.  Default
-	is "false": Properties from files override local defaults.
+	Specifies whether local properties override properties from files.
+	Default is "false": Properties from files override local defaults.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -104,12 +102,11 @@
 	traditional PropertyPlaceholderConfigurer component will be registered instead of the
 	new PropertySourcesPlaceholderConfigurer.
 
-	See ConfigurableEnvironment Javadoc for more information on using.
+	See ConfigurableEnvironment javadoc for more information on using.
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports
-						type="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
+					<tool:exports type="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -130,7 +127,7 @@
 	newer PropertySourcesPlaceholderConfigurer variant. In this case, the Spring Environment
 	and its property sources are not interrogated when resolving placeholders. Users are
 	encouraged to consider this attribute deprecated, and to take advantage of
-	Environment/PropertySource mechanisms. See ConfigurableEnvironment Javadoc for examples.
+	Environment/PropertySource mechanisms. See ConfigurableEnvironment javadoc for examples.
 
 	"ENVIRONMENT" indicates placeholders should be resolved against the current Environment and against any local properties;
 	"NEVER" indicates placeholders should be resolved only against local properties and never against system properties;
@@ -184,7 +181,7 @@
 	@TransactionAttribute annotation. Consider the use of the <tx:annotation-driven>
 	tag for that purpose.
 
-	See Javadoc for org.springframework.context.annotation.AnnotationConfigApplicationContext
+	See javadoc for org.springframework.context.annotation.AnnotationConfigApplicationContext
 	for information on code-based alternatives to bootstrapping annotation-driven support.
 	from XML.
 			]]></xsd:documentation>
@@ -211,7 +208,7 @@
 	definitions just like to regular bean definitions, but it won't apply to the component
 	scan settings themselves.
 
-	See Javadoc for org.springframework.context.annotation.ComponentScan for information
+	See javadoc for org.springframework.context.annotation.ComponentScan for information
 	on code-based alternatives to bootstrapping component-scanning.
 			]]></xsd:documentation>
 		</xsd:annotation>
@@ -334,7 +331,7 @@
 	This will only happen if the AnnotationBeanConfigurerAspect is on the classpath
 	(i.e. spring-aspects.jar), effectively activating "spring-configured" by default.
 
-	See Javadoc for org.springframework.context.annotation.EnableLoadTimeWeaving
+	See javadoc for org.springframework.context.annotation.EnableLoadTimeWeaving
 	for information on code-based alternatives to bootstrapping load-time weaving support.
 			]]></xsd:documentation>
 			<xsd:appinfo>
diff --git a/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.1.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.1.xsd
index 7b1468eece6..fa3dde86662 100644
--- a/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.1.xsd
+++ b/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.1.xsd
@@ -25,24 +25,25 @@
 				<xsd:documentation><![CDATA[
 	The location of the properties file to resolve placeholders against, as a Spring
 	resource location: a URL, a "classpath:" pseudo URL, or a relative file path.
-	Multiple locations may be specified, separated by commas. If neither location nor properties-ref is
-	specified, placeholders will be resolved against system properties.
+	Multiple locations may be specified, separated by commas. If neither location nor
+	properties-ref is specified, placeholders will be resolved against system properties.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="properties-ref" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation source="java:java.util.Properties"><![CDATA[
-	The bean name of a Java Properties object that will be used for property substitution.
-	If neither location nor properties-ref is specified, placeholders will be resolved against system properties.
+	The bean name of a Properties object that will be used for property substitution.
+	If neither location nor properties-ref is specified, placeholders will be resolved
+	against system properties.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="file-encoding" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies the encoding to use for parsing properties files.  Default is none,
-	using the java.util.Properties default encoding.  Only applies to classic
+	Specifies the encoding to use for parsing properties files. Default is none,
+	using the java.util.Properties default encoding. Only applies to classic
 	properties files, not to XML files.
 				]]></xsd:documentation>
 			</xsd:annotation>
@@ -50,39 +51,36 @@
 		<xsd:attribute name="order" type="xsd:token">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies the order for this placeholder configurer.  If more than one is present in a context
-	the order can be important since the first one to be match a placeholder will win.  Often used
-	in conjunction with
+	Specifies the order for this placeholder configurer. If more than one is present
+	in a context, the order can be important since the first one to be match a
+	placeholder will win.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="ignore-resource-not-found" type="xsd:boolean"
-			default="false">
+		<xsd:attribute name="ignore-resource-not-found" type="xsd:boolean" default="false">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies if failure to find the property resource location should be ignored.  Default
-	is "false", meaning that if there is no file in the location specified an exception will
-	be raised at runtime.
+	Specifies if failure to find the property resource location should be ignored.
+	Default is "false", meaning that if there is no file in the location specified
+	an exception will be raised at runtime.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="ignore-unresolvable" type="xsd:boolean"
-			default="false">
+		<xsd:attribute name="ignore-unresolvable" type="xsd:boolean" default="false">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies if failure to find the property value to replace a key should be ignored.  Default
-	is "false", meaning that this placeholder configurer will raise an exception if it cannot resolve
-	a key.  Set to "true" to allow the configurer to pass on the key to any others in
-	the context that have not yet visited the key in question.
+	Specifies if failure to find the property value to replace a key should be ignored.
+	Default is "false", meaning that this placeholder configurer will raise an exception
+	if it cannot resolve a key. Set to "true" to allow the configurer to pass on the key
+	to any others in the context that have not yet visited the key in question.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="local-override" type="xsd:boolean"
-			default="false">
+		<xsd:attribute name="local-override" type="xsd:boolean" default="false">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies whether local properties override properties from files.  Default
-	is "false": Properties from files override local defaults.
+	Specifies whether local properties override properties from files.
+	Default is "false": Properties from files override local defaults.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -104,12 +102,11 @@
 	traditional PropertyPlaceholderConfigurer component will be registered instead of the
 	new PropertySourcesPlaceholderConfigurer.
 
-	See ConfigurableEnvironment Javadoc for more information on using.
+	See ConfigurableEnvironment javadoc for more information on using.
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports
-						type="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
+					<tool:exports type="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -130,7 +127,7 @@
 	newer PropertySourcesPlaceholderConfigurer variant. In this case, the Spring Environment
 	and its property sources are not interrogated when resolving placeholders. Users are
 	encouraged to consider this attribute deprecated, and to take advantage of
-	Environment/PropertySource mechanisms. See ConfigurableEnvironment Javadoc for examples.
+	Environment/PropertySource mechanisms. See ConfigurableEnvironment javadoc for examples.
 
 	"ENVIRONMENT" indicates placeholders should be resolved against the current Environment and against any local properties;
 	"NEVER" indicates placeholders should be resolved only against local properties and never against system properties;
@@ -184,7 +181,7 @@
 	@TransactionAttribute annotation. Consider the use of the <tx:annotation-driven>
 	tag for that purpose.
 
-	See Javadoc for org.springframework.context.annotation.AnnotationConfigApplicationContext
+	See javadoc for org.springframework.context.annotation.AnnotationConfigApplicationContext
 	for information on code-based alternatives to bootstrapping annotation-driven support.
 	from XML.
 			]]></xsd:documentation>
@@ -211,7 +208,7 @@
 	definitions just like to regular bean definitions, but it won't apply to the component
 	scan settings themselves.
 
-	See Javadoc for org.springframework.context.annotation.ComponentScan for information
+	See javadoc for org.springframework.context.annotation.ComponentScan for information
 	on code-based alternatives to bootstrapping component-scanning.
 			]]></xsd:documentation>
 		</xsd:annotation>
@@ -334,7 +331,7 @@
 	This will only happen if the AnnotationBeanConfigurerAspect is on the classpath
 	(i.e. spring-aspects.jar), effectively activating "spring-configured" by default.
 
-	See Javadoc for org.springframework.context.annotation.EnableLoadTimeWeaving
+	See javadoc for org.springframework.context.annotation.EnableLoadTimeWeaving
 	for information on code-based alternatives to bootstrapping load-time weaving support.
 			]]></xsd:documentation>
 			<xsd:appinfo>
diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd
index 248145ab6bb..9740c087aa0 100644
--- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd
+++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd
@@ -8,18 +8,17 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.2.xsd" />
-	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.2.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.2.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.2.xsd"/>
 
 	<xsd:element name="annotation-driven">
 		<xsd:annotation>
 			<xsd:documentation source="java:org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter"><![CDATA[
 	Configures the annotation-driven Spring MVC Controller programming model.
-	Note that, with Spring 3.0, this tag works in Servlet MVC only!
+	Note that this tag works in Web MVC only, not in Portlet MVC!
 
-	See org.springframework.web.servlet.config.annotation.EnableWebMvc Javadoc for
-	information on code-based alternatives to enabling annotation-driven Spring MVC
-	support.
+	See org.springframework.web.servlet.config.annotation.EnableWebMvc javadoc for details
+	on code-based alternatives to enabling annotation-driven Spring MVC support.
 			]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
@@ -39,14 +38,14 @@
 								<xsd:element ref="beans:bean">
 									<xsd:annotation>
 										<xsd:documentation><![CDATA[
-		An HttpMessageConverter bean definition.
+	An HttpMessageConverter bean definition.
 										]]></xsd:documentation>
 									</xsd:annotation>
 								</xsd:element>
 								<xsd:element ref="beans:ref">
 									<xsd:annotation>
 										<xsd:documentation><![CDATA[
-		A reference to an HttpMessageConverter bean.
+	A reference to an HttpMessageConverter bean.
 										]]></xsd:documentation>
 									</xsd:annotation>
 								</xsd:element>
@@ -65,8 +64,8 @@
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
 	Configures HandlerMethodArgumentResolver types to support custom controller method argument types.
-    Using this option does not override the built-in support for resolving handler method arguments.
-    To customize the built-in support for argument resolution configure RequestMappingHandlerAdapter directly.
+	Using this option does not override the built-in support for resolving handler method arguments.
+	To customize the built-in support for argument resolution configure RequestMappingHandlerAdapter directly.
 						]]></xsd:documentation>
 					</xsd:annotation>
 					<xsd:complexType>
@@ -80,13 +79,13 @@
 							</xsd:element>
 						</xsd:sequence>
 					</xsd:complexType>
-				</xsd:element>			
+				</xsd:element>
 				<xsd:element name="return-value-handlers" minOccurs="0">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
 	Configures HandlerMethodReturnValueHandler types to support custom controller method return value handling.
-    Using this option does not override the built-in support for handling return values.
-    To customize the built-in support for handling return values configure RequestMappingHandlerAdapter directly.
+	Using this option does not override the built-in support for handling return values.
+	To customize the built-in support for handling return values configure RequestMappingHandlerAdapter directly.
 						]]></xsd:documentation>
 					</xsd:annotation>
 					<xsd:complexType>
@@ -100,7 +99,7 @@
 							</xsd:element>
 						</xsd:sequence>
 					</xsd:complexType>
-				</xsd:element>			
+				</xsd:element>
 				<xsd:element name="async-support" minOccurs="0">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
@@ -153,7 +152,7 @@
 								<xsd:documentation source="java:org.springframework.core.task.AsyncTaskExecutor"><![CDATA[
 	The bean name of a default AsyncTaskExecutor to use when a controller method returns a {@link Callable}.
 	Controller methods can override this default on a per-request basis by returning an AsyncTask.
-	By default a SimpleAsyncTaskExecutor is used which does not re-use threads and is not recommended for production.
+	By default, a SimpleAsyncTaskExecutor is used which does not re-use threads and is not recommended for production.
 								]]></xsd:documentation>
 								<xsd:appinfo>
 									<tool:annotation kind="ref">
@@ -237,7 +236,7 @@
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 	Matrix variables can appear in any path segment, each matrix variable separated with a ";" (semicolon).
-	For example "/cars;color=red;year=2012". By default they're removed from the URL. If this property
+	For example "/cars;color=red;year=2012". By default, they're removed from the URL. If this property
 	is set to true, matrix variables are not removed from the URL, and the request mapping pattern
 	must use URI variable in path segments where matrix variables are expected. For example "/{cars}".
 	Matrix variables can then be injected into a controller method with @MatrixVariable.
@@ -247,8 +246,8 @@
 			<xsd:attribute name="ignoreDefaultModelOnRedirect" type="xsd:boolean">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-	By default the content of the "default" model is used both during rendering and redirect scenarios. 
-	Alternatively a controller method can declare a RedirectAttributes argument and use it to provide attributes for a redirect. 
+	By default, the content of the "default" model is used both during rendering and redirect scenarios.
+	Alternatively a controller method can declare a RedirectAttributes argument and use it to provide attributes for a redirect.
 	Setting this flag to true ensures the "default" model is never used in a redirect scenario even if a RedirectAttributes argument is not declared.
 	Setting it to false means the "default" model may be used in a redirect if the controller method doesn't declare a RedirectAttributes argument.
 	The default setting is false but new applications should consider setting it to true.
@@ -420,16 +419,16 @@
 
 	<xsd:element name="view-controller">
 		<xsd:annotation>
-			<xsd:documentation
-				source="java:org.springframework.web.servlet.mvc.ParameterizableViewController"><![CDATA[
-	Defines a simple Controller that selects a view to render the response.
+			<xsd:documentation source="java:org.springframework.web.servlet.mvc.ParameterizableViewController"><![CDATA[
+	Map a simple (logic-less) view controller to a specific URL path (or pattern)
+	in order to render a response with a pre-configured status code and view.
 			]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:attribute name="path" type="xsd:string" use="required">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-	The URL path the view is mapped to.
+	The URL path (or pattern) the controller is mapped to.
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.0.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.0.xsd
index 5846e0f3914..0ae4616117e 100644
--- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.0.xsd
+++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.0.xsd
@@ -8,8 +8,8 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.0.xsd" />
-	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-4.0.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-4.0.xsd"/>
 
 	<xsd:element name="annotation-driven">
 		<xsd:annotation>
@@ -17,70 +17,69 @@
 	Configures the annotation-driven Spring MVC Controller programming model.
 	Note that this tag works in Web MVC only, not in Portlet MVC!
 
-	See org.springframework.web.servlet.config.annotation.EnableWebMvc Javadoc for
-	information on code-based alternatives to enabling annotation-driven Spring MVC
-	support.
+	See org.springframework.web.servlet.config.annotation.EnableWebMvc javadoc for details
+	on code-based alternatives to enabling annotation-driven Spring MVC support.
 			]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:all minOccurs="0">
-                <xsd:element name="path-matching" minOccurs="0">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
-    Configures the path matching part of the Spring MVC Controller programming model.
-    Like annotation-driven, code-based alternatives are also documented in EnableWebMvc Javadoc.
+				<xsd:element name="path-matching" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
+	Configures the path matching part of the Spring MVC Controller programming model.
+	Like annotation-driven, code-based alternatives are also documented in EnableWebMvc javadoc.
 						]]></xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:complexType>
-                        <xsd:attribute name="suffix-pattern" type="xsd:boolean">
-                            <xsd:annotation>
-                                <xsd:documentation><![CDATA[
-    Whether to use suffix pattern match (".*") when matching patterns to requests. If enabled
-    a method mapped to "/users" also matches to "/users.*".
-    The default value is true.
-					            ]]></xsd:documentation>
-                            </xsd:annotation>
-                        </xsd:attribute>
-                        <xsd:attribute name="trailing-slash" type="xsd:boolean">
-                            <xsd:annotation>
-                                <xsd:documentation><![CDATA[
-    Whether to match to URLs irrespective of the presence of a trailing slash.
-    If enabled a method mapped to "/users" also matches to "/users/".
-    The default value is true.
-                                        ]]></xsd:documentation>
-                            </xsd:annotation>
-                        </xsd:attribute>
-                        <xsd:attribute name="registered-suffixes-only" type="xsd:boolean">
-                            <xsd:annotation>
-                                <xsd:documentation><![CDATA[
-    Whether to use suffix pattern match for registered file extensions only when matching patterns to requests.
-    If enabled, a controller method mapped to "/users" also matches to "/users.json" assuming ".json" is a file extension registered with
-    the provided ContentNegotiationManager. This can be useful for allowing only specific URL extensions to be used as well as in cases
-    where a "." in the URL path can lead to ambiguous interpretation of path variable content, (e.g. given "/users/{user}" and incoming
-    URLs such as "/users/john.j.joe" and "/users/john.j.joe.json").
-    If enabled, this attribute also enables suffix-pattern. The default value is false.
-                                ]]></xsd:documentation>
-                            </xsd:annotation>
-                        </xsd:attribute>
-                        <xsd:attribute name="path-helper" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:documentation><![CDATA[
-    The bean name of the UrlPathHelper to use for resolution of lookup paths.
-    Use this to override the default UrlPathHelper with a custom subclass, or to share common UrlPathHelper settings across
-    multiple HandlerMappings and MethodNameResolvers.
-                                ]]></xsd:documentation>
-                            </xsd:annotation>
-                        </xsd:attribute>
-                        <xsd:attribute name="path-matcher" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:documentation><![CDATA[
-    The bean name of the PathMatcher implementation to use for matching URL paths against registered URL patterns.
-    Default is AntPathMatcher.
-                                ]]></xsd:documentation>
-                            </xsd:annotation>
-                        </xsd:attribute>
-                    </xsd:complexType>
-                </xsd:element>
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:attribute name="suffix-pattern" type="xsd:boolean">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
+	Whether to use suffix pattern match (".*") when matching patterns to requests. If enabled
+	a method mapped to "/users" also matches to "/users.*".
+	The default value is true.
+								]]></xsd:documentation>
+							</xsd:annotation>
+						</xsd:attribute>
+						<xsd:attribute name="trailing-slash" type="xsd:boolean">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
+	Whether to match to URLs irrespective of the presence of a trailing slash.
+	If enabled a method mapped to "/users" also matches to "/users/".
+	The default value is true.
+										]]></xsd:documentation>
+							</xsd:annotation>
+						</xsd:attribute>
+						<xsd:attribute name="registered-suffixes-only" type="xsd:boolean">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
+	Whether to use suffix pattern match for registered file extensions only when matching patterns to requests.
+	If enabled, a controller method mapped to "/users" also matches to "/users.json" assuming ".json" is a file extension registered with
+	the provided ContentNegotiationManager. This can be useful for allowing only specific URL extensions to be used as well as in cases
+	where a "." in the URL path can lead to ambiguous interpretation of path variable content, (e.g. given "/users/{user}" and incoming
+	URLs such as "/users/john.j.joe" and "/users/john.j.joe.json").
+	If enabled, this attribute also enables suffix-pattern. The default value is false.
+								]]></xsd:documentation>
+							</xsd:annotation>
+						</xsd:attribute>
+						<xsd:attribute name="path-helper" type="xsd:string">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
+	The bean name of the UrlPathHelper to use for resolution of lookup paths.
+	Use this to override the default UrlPathHelper with a custom subclass, or to share common UrlPathHelper settings across
+	multiple HandlerMappings and MethodNameResolvers.
+								]]></xsd:documentation>
+							</xsd:annotation>
+						</xsd:attribute>
+						<xsd:attribute name="path-matcher" type="xsd:string">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
+	The bean name of the PathMatcher implementation to use for matching URL paths against registered URL patterns.
+	Default is AntPathMatcher.
+								]]></xsd:documentation>
+							</xsd:annotation>
+						</xsd:attribute>
+					</xsd:complexType>
+				</xsd:element>
 				<xsd:element name="message-converters" minOccurs="0">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
@@ -96,14 +95,14 @@
 								<xsd:element ref="beans:bean">
 									<xsd:annotation>
 										<xsd:documentation><![CDATA[
-		An HttpMessageConverter bean definition.
+	An HttpMessageConverter bean definition.
 										]]></xsd:documentation>
 									</xsd:annotation>
 								</xsd:element>
 								<xsd:element ref="beans:ref">
 									<xsd:annotation>
 										<xsd:documentation><![CDATA[
-		A reference to an HttpMessageConverter bean.
+	A reference to an HttpMessageConverter bean.
 										]]></xsd:documentation>
 									</xsd:annotation>
 								</xsd:element>
@@ -122,8 +121,8 @@
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
 	Configures HandlerMethodArgumentResolver types to support custom controller method argument types.
-    Using this option does not override the built-in support for resolving handler method arguments.
-    To customize the built-in support for argument resolution configure RequestMappingHandlerAdapter directly.
+	Using this option does not override the built-in support for resolving handler method arguments.
+	To customize the built-in support for argument resolution configure RequestMappingHandlerAdapter directly.
 						]]></xsd:documentation>
 					</xsd:annotation>
 					<xsd:complexType>
@@ -142,8 +141,8 @@
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
 	Configures HandlerMethodReturnValueHandler types to support custom controller method return value handling.
-    Using this option does not override the built-in support for handling return values.
-    To customize the built-in support for handling return values configure RequestMappingHandlerAdapter directly.
+	Using this option does not override the built-in support for handling return values.
+	To customize the built-in support for handling return values configure RequestMappingHandlerAdapter directly.
 						]]></xsd:documentation>
 					</xsd:annotation>
 					<xsd:complexType>
@@ -210,7 +209,7 @@
 								<xsd:documentation source="java:org.springframework.core.task.AsyncTaskExecutor"><![CDATA[
 	The bean name of a default AsyncTaskExecutor to use when a controller method returns a {@link Callable}.
 	Controller methods can override this default on a per-request basis by returning an AsyncTask.
-	By default a SimpleAsyncTaskExecutor is used which does not re-use threads and is not recommended for production.
+	By default, a SimpleAsyncTaskExecutor is used which does not re-use threads and is not recommended for production.
 								]]></xsd:documentation>
 								<xsd:appinfo>
 									<tool:annotation kind="ref">
@@ -294,7 +293,7 @@
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 	Matrix variables can appear in any path segment, each matrix variable separated with a ";" (semicolon).
-	For example "/cars;color=red;year=2012". By default they're removed from the URL. If this property
+	For example "/cars;color=red;year=2012". By default, they're removed from the URL. If this property
 	is set to true, matrix variables are not removed from the URL, and the request mapping pattern
 	must use URI variable in path segments where matrix variables are expected. For example "/{cars}".
 	Matrix variables can then be injected into a controller method with @MatrixVariable.
@@ -304,7 +303,7 @@
 			<xsd:attribute name="ignore-default-model-on-redirect" type="xsd:boolean">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-	By default the content of the "default" model is used both during rendering and redirect scenarios.
+	By default, the content of the "default" model is used both during rendering and redirect scenarios.
 	Alternatively a controller method can declare a RedirectAttributes argument and use it to provide attributes for a redirect.
 	Setting this flag to true ensures the "default" model is never used in a redirect scenario even if a RedirectAttributes argument is not declared.
 	Setting it to false means the "default" model may be used in a redirect if the controller method doesn't declare a RedirectAttributes argument.
@@ -472,35 +471,35 @@
 					</xsd:complexType>
 				</xsd:element>
 			</xsd:choice>
-            <xsd:attribute name="path-matcher" type="xsd:string">
-                <xsd:annotation>
-                    <xsd:documentation source="java:org.springframework.util.PathMatcher"><![CDATA[
+			<xsd:attribute name="path-matcher" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation source="java:org.springframework.util.PathMatcher"><![CDATA[
 	The bean name of a PathMatcher implementation to use with nested interceptors. This is an optional,
 	advanced property required only if using custom PathMatcher implementations that support mapping
 	metadata other than the Ant path patterns supported by default.
 					]]></xsd:documentation>
-                    <xsd:appinfo>
-                        <tool:annotation kind="ref">
-                            <tool:expected-type type="java:org.springframework.util.PathMatcher" />
-                        </tool:annotation>
-                    </xsd:appinfo>
-                </xsd:annotation>
-            </xsd:attribute>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type type="java:org.springframework.util.PathMatcher" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
 
 	<xsd:element name="view-controller">
 		<xsd:annotation>
-			<xsd:documentation
-				source="java:org.springframework.web.servlet.mvc.ParameterizableViewController"><![CDATA[
-	Defines a simple Controller that selects a view to render the response.
+			<xsd:documentation source="java:org.springframework.web.servlet.mvc.ParameterizableViewController"><![CDATA[
+	Map a simple (logic-less) view controller to a specific URL path (or pattern)
+	in order to render a response with a pre-configured status code and view.
 			]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:attribute name="path" type="xsd:string" use="required">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-	The URL path the view is mapped to.
+	The URL path (or pattern) the controller is mapped to.
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.1.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.1.xsd
index fb30c9f0a2b..5332453ac19 100644
--- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.1.xsd
+++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.1.xsd
@@ -8,8 +8,8 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" />
-	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-4.1.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-4.1.xsd"/>
 
 	<xsd:element name="annotation-driven">
 		<xsd:annotation>
@@ -17,9 +17,8 @@
 	Configures the annotation-driven Spring MVC Controller programming model.
 	Note that this tag works in Web MVC only, not in Portlet MVC!
 
-	See org.springframework.web.servlet.config.annotation.EnableWebMvc Javadoc for
-	information on code-based alternatives to enabling annotation-driven Spring MVC
-	support.
+	See org.springframework.web.servlet.config.annotation.EnableWebMvc javadoc for details
+	on code-based alternatives to enabling annotation-driven Spring MVC support.
 			]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
@@ -28,7 +27,7 @@
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
 	Configures the path matching part of the Spring MVC Controller programming model.
-	Like annotation-driven, code-based alternatives are also documented in EnableWebMvc Javadoc.
+	Like annotation-driven, code-based alternatives are also documented in EnableWebMvc javadoc.
 						]]></xsd:documentation>
 					</xsd:annotation>
 					<xsd:complexType>
@@ -96,14 +95,14 @@
 								<xsd:element ref="beans:bean">
 									<xsd:annotation>
 										<xsd:documentation><![CDATA[
-		An HttpMessageConverter bean definition.
+	An HttpMessageConverter bean definition.
 										]]></xsd:documentation>
 									</xsd:annotation>
 								</xsd:element>
 								<xsd:element ref="beans:ref">
 									<xsd:annotation>
 										<xsd:documentation><![CDATA[
-		A reference to an HttpMessageConverter bean.
+	A reference to an HttpMessageConverter bean.
 										]]></xsd:documentation>
 									</xsd:annotation>
 								</xsd:element>
@@ -234,7 +233,7 @@
 								<xsd:documentation source="java:org.springframework.core.task.AsyncTaskExecutor"><![CDATA[
 	The bean name of a default AsyncTaskExecutor to use when a controller method returns a {@link Callable}.
 	Controller methods can override this default on a per-request basis by returning an AsyncTask.
-	By default a SimpleAsyncTaskExecutor is used which does not re-use threads and is not recommended for production.
+	By default, a SimpleAsyncTaskExecutor is used which does not re-use threads and is not recommended for production.
 								]]></xsd:documentation>
 								<xsd:appinfo>
 									<tool:annotation kind="ref">
@@ -318,7 +317,7 @@
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 	Matrix variables can appear in any path segment, each matrix variable separated with a ";" (semicolon).
-	For example "/cars;color=red;year=2012". By default they're removed from the URL. If this property
+	For example "/cars;color=red;year=2012". By default, they're removed from the URL. If this property
 	is set to true, matrix variables are not removed from the URL, and the request mapping pattern
 	must use URI variable in path segments where matrix variables are expected. For example "/{cars}".
 	Matrix variables can then be injected into a controller method with @MatrixVariable.
@@ -328,7 +327,7 @@
 			<xsd:attribute name="ignore-default-model-on-redirect" type="xsd:boolean">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-	By default the content of the "default" model is used both during rendering and redirect scenarios.
+	By default, the content of the "default" model is used both during rendering and redirect scenarios.
 	Alternatively a controller method can declare a RedirectAttributes argument and use it to provide attributes for a redirect.
 	Setting this flag to true ensures the "default" model is never used in a redirect scenario even if a RedirectAttributes argument is not declared.
 	Setting it to false means the "default" model may be used in a redirect if the controller method doesn't declare a RedirectAttributes argument.
@@ -628,7 +627,7 @@
 			<xsd:attribute name="redirect-url" type="xsd:string" use="required">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-	By default the redirect URL is expected to be relative to the current ServletContext,
+	By default, the redirect URL is expected to be relative to the current ServletContext,
 	i.e. as relative to the web application root.
 					]]></xsd:documentation>
 				</xsd:annotation>
@@ -648,16 +647,15 @@
 					<xsd:documentation><![CDATA[
 	Whether to interpret a given redirect URL that starts with a slash ("/")
 	as relative to the current ServletContext, i.e. as relative to the web
-	application root.
-	By default set to "true".
+	application root. The default is "true".
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
 			<xsd:attribute name="keep-query-params" type="xsd:boolean">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-	Whether to propagate the query parameters of the current request through to the target redirect URL.
-	By default set to "false".
+	Whether to propagate the query parameters of the current request through
+	to the target redirect URL. The default is "false".
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
@@ -783,7 +781,7 @@
 	before or after it.
 
 	When content negotiation is enabled the order property is set to highest priority
-	instead with the ContentNeogitatingViewResolver encapsulating all other registered
+	instead with the ContentNegotiatingViewResolver encapsulating all other registered
 	view resolver instances. That way the resolvers registered through the MVC namespace
 	form self-encapsulated resolver chain.
 			]]></xsd:documentation>
@@ -794,17 +792,17 @@
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
 	Registers a ContentNegotiatingViewResolver with the list of all other registered
-	ViewResolver instances used to set its "viewResolvers" property. See the Javadoc
+	ViewResolver instances used to set its "viewResolvers" property. See the javadoc
 	of ContentNegotiatingViewResolver for more details.
-					]]></xsd:documentation>
+						]]></xsd:documentation>
 					</xsd:annotation>
 				</xsd:element>
 					<xsd:element name="jsp" type="urlViewResolverType">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[
 	Register an InternalResourceViewResolver bean for JSP rendering.
-	By default "/WEB-INF/" is registered as a view name prefix and ".jsp" as a suffix.
-								]]></xsd:documentation>
+	By default, "/WEB-INF/" is registered as a view name prefix and ".jsp" as a suffix.
+							]]></xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
 					<xsd:element name="tiles" type="urlViewResolverType">
@@ -813,14 +811,14 @@
 	Register a TilesViewResolver based on Tiles 3.x.
 	To configure Tiles you must also add a top-level <mvc:tiles> element
 	or declare a TilesConfigurer bean.
-								]]></xsd:documentation>
+							]]></xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
 					<xsd:element name="freemarker" type="urlViewResolverType">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[
 	Register a FreeMarkerViewResolver.
-	By default ".ftl" is configured as a view name suffix.
+	By default, ".ftl" is configured as a view name suffix.
 	To configure FreeMarker you must also add a top-level <mvc:freemarker> element
 	or declare a FreeMarkerConfigurer bean.
 							]]></xsd:documentation>
@@ -830,7 +828,7 @@
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[
 	Register a VelocityViewResolver.
-	By default ".vm" is configured as a view name suffix.
+	By default, ".vm" is configured as a view name suffix.
 	To configure Velocity you must also add a top-level <mvc:velocity> element
 	or declare a VelocityConfigurer bean.
 							]]></xsd:documentation>
@@ -840,7 +838,7 @@
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[
 	Register a GroovyMarkupViewResolver.
-	By default ".tpl" is configured as a view name suffix.
+	By default, ".tpl" is configured as a view name suffix.
 	To configure the Groovy markup template engine you must also add a top-level <mvc:groovy-markup> element
 	or declare a GroovyMarkupConfigurer bean.
 							]]></xsd:documentation>
@@ -850,21 +848,21 @@
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[
 	Register a BeanNameViewResolver bean.
-								]]></xsd:documentation>
+							]]></xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
 					<xsd:element ref="beans:bean">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[
 	Register a ViewResolver as a direct bean declaration.
-								]]></xsd:documentation>
+							]]></xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
 					<xsd:element ref="beans:ref">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[
 	Register a ViewResolver through references to an existing bean declaration.
-								]]></xsd:documentation>
+							]]></xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
 			</xsd:choice>
@@ -887,7 +885,7 @@
 								<xsd:documentation><![CDATA[
 	The location of a file containing Tiles definitions (or a Spring resource pattern).
 	If no Tiles definitions are registerd, then "/WEB-INF/tiles.xml" is expected to exists.
-				]]></xsd:documentation>
+								]]></xsd:documentation>
 							</xsd:annotation>
 						</xsd:attribute>
 					</xsd:complexType>
@@ -898,14 +896,14 @@
 					<xsd:documentation><![CDATA[
 	Whether to check Tiles definition files for a refresh at runtime.
 	Default is "false".
-				]]></xsd:documentation>
+					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
 			<xsd:attribute name="validate-definitions" type="xsd:boolean">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 	Whether to validate the Tiles XML definitions. Default is "true".
-				]]></xsd:documentation>
+					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
 		</xsd:complexType>
@@ -926,7 +924,7 @@
 							<xsd:annotation>
 								<xsd:documentation><![CDATA[
 	The location of a FreeMarker template loader path (or a Spring resource pattern).
-				]]></xsd:documentation>
+								]]></xsd:documentation>
 							</xsd:annotation>
 						</xsd:attribute>
 					</xsd:complexType>