Author: kkolinko
Date: Wed Jun 20 09:35:25 2012
New Revision: 1352013
URL: http://svn.apache.org/viewvc?rev=1352013&view=rev
Log:
Merged revision 1352011 from tomcat/trunk:
Correct description of UserDatabaseRealm
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1352011
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml?rev=1352013&r1=1352012&r2=1352013&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml Wed Jun 20 09:35:25 2012
@@ -613,7 +613,7 @@
that is based on a UserDatabase resource made available through the global
JNDI resources configured for this Tomcat instance.</p>
- <p>The Memory Based Realm implementation supports the following
+ <p>The UserDatabase Realm implementation supports the following
additional attributes:</p>
<attributes>
@@ -632,8 +632,8 @@
</attribute>
<attribute name="resourceName" required="true">
- <p>The name of the resource that this realm will use for user, password
- and role information.</p>
+ <p>The name of the global <code>UserDatabase</code> resource
+ that this realm will use for user, password and role information.</p>
</attribute>
<attribute name="X509UsernameRetrieverClassName" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
