Author: markt
Date: Sun Mar  5 07:55:59 2006
New Revision: 383347

URL: http://svn.apache.org/viewcvs?rev=383347&view=rev
Log:
Merge duplicate attribute descriptions into a single entry.

Modified:
    tomcat/container/tc5.5.x/webapps/docs/config/http.xml

Modified: tomcat/container/tc5.5.x/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/config/http.xml?rev=383347&r1=383346&r2=383347&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/config/http.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/config/http.xml Sun Mar  5 07:55:59 
2006
@@ -218,16 +218,6 @@
       The default value is <code>text/html,text/xml,text/plain</code>.</p>
     </attribute>
 
-    <attribute name="clientAuth" required="false">
-      <p>
-        Set this value to <code>true</code> if you want Tomcat to require
-        all SSL clients to present a client Certificate in order to use
-        this socket.  Set this value to <code>want</code> if you want Tomcat
-        to request a client Certificate, but not fail if one isn't presented.
-        See the <a href="../ssl-howto.html">SSL HowTo</a> for an example.
-      </p>
-    </attribute>
-
     <attribute name="compression" required="false">
       <p>The <strong>Connector</strong> may use HTTP/1.1 GZIP compression in
       an attempt to save server bandwidth. The acceptable values for the
@@ -424,12 +414,19 @@
     </attribute>
 
     <attribute name="clientAuth" required="false">
-      <p>Set to <code>true</code> if you want the SSL stack to
-      require a valid certificate chain from the client before
-      accepting a connection.  A <code>false</code> value (which
-      is the default) will not require a certificate chain unless
-      the client requests a resource protected by a security constraint
-      that uses <code>CLIENT-CERT</code> authentication.</p>
+      <p>Set to <code>true</code> if you want the SSL stack to require a
+      valid certificate chain from the client before
+ accepting a connection.
+      Set to <code>want</code> if you
+ want the SSL stack to request a client
+      Certificate, but
+ not fail if one isn't presented. A <code>false</code>
+      value (which is the default) will not require a certificate chain
+      unless
+ the client requests a resource protected by a security
+      constraint
+ that uses <code>CLIENT-CERT</code> authentication. See the
+      <a href="../ssl-howto.html">SSL HowTo</a> for an example.</p>
     </attribute>
 
     <attribute name="keystoreFile" required="false">



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to