Author: kkolinko
Date: Tue Nov 26 18:02:02 2013
New Revision: 1545752
URL: http://svn.apache.org/r1545752
Log:
Merged r1545750 from tomcat/trunk:
Align description of properties of StandardContext in mbeans-descriptors.xml
with its Javadoc.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1545750
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1545752&r1=1545751&r2=1545752&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
Tue Nov 26 18:02:02 2013
@@ -367,7 +367,7 @@
type="boolean"/>
<attribute name="tldNamespaceAware"
- description="Should TLD XML namespace validation be turned on?"
+ description="Should the parsing of *.tld files be performed by
a namespace aware parser? (This option is deprecated)"
type="boolean"/>
<attribute name="tldScanTime"
@@ -375,7 +375,7 @@
type="long"/>
<attribute name="tldValidation"
- description="Should TLD XML validation be turned on?"
+ description="Should the parsing of *.tld files be performed by
a validating parser?"
type="boolean"/>
<attribute name="unloadDelay"
@@ -410,11 +410,11 @@
type="java.lang.String"/>
<attribute name="xmlValidation"
- description="Should XML validation be turned on?"
+ description="Should the parsing of web.xml and web-fragment.xml
files be performed by a validating parser?"
type="boolean"/>
<attribute name="xmlNamespaceAware"
- description="Should XML namespace validation be turned on?"
+ description="Should the parsing of web.xml and web-fragment.xml
files be performed by a namespace aware parser?"
type="boolean"/>
<operation name="addApplicationListener"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
