From 29cea62acf4671be0582e7b915142fe2213ebb08 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 1 Apr 2011 17:19:39 +0000
Subject: [PATCH] Correct a Javadoc mix-up

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1087819 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/Realm.java | 10 +++++-----
 webapps/docs/changelog.xml          |  9 +++++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/Realm.java b/java/org/apache/catalina/Realm.java
index f03f4b6dd..2adf5f8d2 100644
--- a/java/org/apache/catalina/Realm.java
+++ b/java/org/apache/catalina/Realm.java
@@ -108,8 +108,8 @@ public interface Realm {
 
 
     /**
-     * Return the Principal associated with the specified chain of X509
-     * client certificates.  If there is none, return <code>null</code>.
+     * Return the Principal associated with the specified {@link GSSContext}.
+     * If there is none, return <code>null</code>.
      *
      * @param gssContext The gssContext processed by the {@link Authenticator}.
      * @param storeCreds Should the realm attempt to store the delegated
@@ -119,10 +119,10 @@ public interface Realm {
     
     
     /**
-     * Return the Principal associated with the specified {@link GSSContext}.
-     * If there is none, return <code>null</code>.
+     * Return the Principal associated with the specified chain of X509
+     * client certificates.  If there is none, return <code>null</code>.
      *
-     * @param gssContext Array of client certificates, with the first one in
+     * @param certs Array of client certificates, with the first one in
      *  the array being the certificate of the client itself.
      */
     public Principal authenticate(X509Certificate certs[]);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 53dc6241b..e7025c12a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -42,6 +42,15 @@
   General, Catalina, Coyote, Jasper, Cluster, Web applications, Extras, Tribes,
   Other
 -->
+<section name="Tomcat 7.0.13 (markt)">
+  <subsection name="Catalina">
+    <changelog>
+      <fix>
+        Correct mix-up in Realm Javadoc. (markt)
+      </fix>
+    </changelog>
+  </subsection>
+</section>
 <section name="Tomcat 7.0.12 (markt)">
   <subsection name="Catalina">
     <changelog>
-- 
2.11.0