Author: kkolinko
Date: Sun Jul 1 20:52:18 2012
New Revision: 1356021
URL: http://svn.apache.org/viewvc?rev=1356021&view=rev
Log:
Merged revision 1356014 from tomcat/trunk:
s/Catalina/Tomcat/ and several typos
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:r1356014
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=1356021&r1=1356020&r2=1356021&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml Sun Jul 1 20:52:18 2012
@@ -92,7 +92,7 @@
<subsection name="JDBC Database Realm - org.apache.catalina.realm.JDBCRealm">
- <p>The <strong>JDBC Database Realm</strong> connects Catalina to
+ <p>The <strong>JDBC Database Realm</strong> connects Tomcat to
a relational database, accessed through an appropriate JDBC driver,
to perform lookups of usernames, passwords, and their associated
roles. Because the lookup is done each time that it is required,
@@ -162,7 +162,7 @@
<attribute name="userCredCol" required="true">
<p>Name of the column, in the "users" table, which contains
- the user's credentials (i.e. password(. If a value for the
+ the user's credentials (i.e. password). If a value for the
<code>digest</code> attribute is specified, this component
will assume that the passwords have been encoded with the
specified algorithm. Otherwise, they will be assumed to be
@@ -205,7 +205,7 @@
<subsection name="DataSource Database Realm -
org.apache.catalina.realm.DataSourceRealm">
- <p>The <strong>DataSource Database Realm</strong> connects Catalina to
+ <p>The <strong>DataSource Database Realm</strong> connects Tomcat to
a relational database, accessed through a JNDI named JDBC DataSource
to perform lookups of usernames, passwords, and their associated
roles. Because the lookup is done each time that it is required,
@@ -270,7 +270,7 @@
<attribute name="userCredCol" required="true">
<p>Name of the column, in the "users" table, which contains
- the user's credentials (i.e. password(. If a value for the
+ the user's credentials (i.e. password). If a value for the
<code>digest</code> attribute is specified, this component
will assume that the passwords have been encoded with the
specified algorithm. Otherwise, they will be assumed to be
@@ -313,7 +313,7 @@
<subsection name="JNDI Directory Realm -
org.apache.catalina.realm.JNDIRealm">
- <p>The <strong>JNDI Directory Realm</strong> connects Catalina to
+ <p>The <strong>JNDI Directory Realm</strong> connects Tomcat to
an LDAP Directory, accessed through an appropriate JNDI driver,
that stores usernames, passwords, and their associated
roles. Changes to the directory are immediately reflected in the
@@ -456,7 +456,7 @@
<p>The base directory entry for performing role searches. If not
specified the top-level element in the directory context will be used.
If specified it may optionally include pattern replacements
- "{0}".."{n}" corrosponding to the name parts of the
+ "{0}".."{n}" corresponding to the name parts of the
user's distinguished name (as returned by
<code>javax.naming.Name.get()</code>).</p>
</attribute>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
