Author: violetagg
Date: Sun Jun 11 18:31:56 2017
New Revision: 1798390
URL: http://svn.apache.org/viewvc?rev=1798390&view=rev
Log:
Fix typos
Modified:
tomcat/trunk/conf/catalina.policy
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/conf/catalina.policy
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.policy?rev=1798390&r1=1798389&r2=1798390&view=diff
==============================================================================
--- tomcat/trunk/conf/catalina.policy (original)
+++ tomcat/trunk/conf/catalina.policy Sun Jun 11 18:31:56 2017
@@ -194,7 +194,7 @@ grant {
// The Manager application needs access to the following packages to support
the
// session display functionality. It also requires the custom Tomcat
-// DeployXmlPermission to enable the use of META_INF/context.xml
+// DeployXmlPermission to enable the use of META-INF/context.xml
// These settings support the following configurations:
// - default CATALINA_HOME == CATALINA_BASE
// - CATALINA_HOME != CATALINA_BASE, per instance Manager in CATALINA_BASE
@@ -217,7 +217,7 @@ grant codeBase "file:${catalina.home}/we
};
// The Host Manager application needs the custom Tomcat DeployXmlPermission to
-// enable the use of META_INF/context.xml
+// enable the use of META-INF/context.xml
// These settings support the following configurations:
// - default CATALINA_HOME == CATALINA_BASE
// - CATALINA_HOME != CATALINA_BASE, per instance Host Manager in CATALINA_BASE
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1798390&r1=1798389&r2=1798390&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Jun 11 18:31:56 2017
@@ -87,10 +87,10 @@
by Katya Todorova. (violetagg)
</fix>
<fix>
- <bug>61154</bug>: Allow the Manager and Host Manager web applciations
to
+ <bug>61154</bug>: Allow the Manager and Host Manager web applications
to
start by default when running under a security manager. This was
accomplished by adding a custom permission,
- <code>org.apache.catalina.security.DeployXmlPermisasion</code>, that
+ <code>org.apache.catalina.security.DeployXmlPermission</code>, that
permits an application to use a <code>META-INF/context.xml</code> file
and then granting that permission to the Manager and Host Manager.
(markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
