Author: markt
Date: Thu Jan  9 10:42:56 2014
New Revision: 1556783

URL: http://svn.apache.org/r1556783
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55888
Clarify that Container elements may only no more than one Realm.

Modified:
    tomcat/trunk/webapps/docs/config/realm.xml

Modified: tomcat/trunk/webapps/docs/config/realm.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/realm.xml?rev=1556783&r1=1556782&r2=1556783&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/realm.xml (original)
+++ tomcat/trunk/webapps/docs/config/realm.xml Thu Jan  9 10:42:56 2014
@@ -43,11 +43,14 @@
   <em>Container Managed Security</em> as described in the Servlet
   Specification.</p>
 
-  <p>You may nest a Realm inside any Catalina container
-  <a href="engine.html">Engine</a>, <a href="host.html">Host</a>, or
-  <a href="context.html">Context</a>).  In addition, Realms associated with
-  an Engine or a Host are automatically inherited by lower-level
-  containers, unless explicitly overridden.</p>
+  <p>A Catalina container (<a href="engine.html">Engine</a>,
+  <a href="host.html">Host</a>, or <a href="context.html">Context</a>) may
+  contain no more than one Realm element (although if supported by the Realm
+  this one Realm may itself contain multiple nested Realms). In addition, the
+  Realm associated with an Engine or a Host is automatically inherited by
+  lower-level containers unless the lower level container explicitly defines 
its
+  own Realm.
+  </p>
 
   <p>For more in-depth information about container managed security in web
   applications, as well as more information on configuring and using the



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to