From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 13 Jan 2010 11:18:10 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48532
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=b1c48ac551edd3e76297795ff21b8b471e8f5cc6;p=tomcat7.0

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48532
Better documentation of the SSL connector defaults

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@898718 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index b4ec6d4ae..c3417fc50 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -764,22 +764,34 @@
     </attribute>
 
     <attribute name="truststoreFile" required="false">
-      <p>The TrustStore file to use to validate client certificates.</p>
+      <p>The trust store file to use to validate client certificates. The
+      default is the value of the <code>javax.net.ssl.trustStore</code> system
+      property. If neither this attribute nor the default system property is
+      set, no trust store will be configured.</p>
     </attribute>
 
     <attribute name="truststorePass" required="false">
-      <p>The password to access the TrustStore. This defaults to the value
-      of <code>keystorePass</code>.</p>
+      <p>The password to access the trust store. The default is the value of the
+      <code>javax.net.ssl.trustStorePassword</code> system property. If that
+      property is null, the value of <code>keystorePass</code> is used as the
+      default. If neither this attribute, the default system property nor
+      <code>keystorePass</code>is set, no trust store will be configured.</p>
     </attribute>
 
     <attribute name="truststoreType" required="false">
-      <p>Add this element if your are using a different format for the
-      TrustStore then you are using for the KeyStore.</p>
+      <p>The type of key store used for the trust store. The default is the
+      value of the <code>javax.net.ssl.trustStoreType</code> system property. If
+      that property is null, the value of <code>keystoreType</code> is used as
+      the default.</p>
      </attribute>
 
     <attribute name="truststoreProvider" required="false">
       <p>The name of the truststore provider to be used for the server
-      certificate. If not specified, the list of registered providers is
+      certificate. The default is the value of the
+      <code>javax.net.ssl.trustStoreProvider</code> system property. If
+      that property is null, the value of <code>keystoreProvider</code> is used
+      as the default. If neither this attribute, the default system property nor
+      <code>keystoreProvider</code>is set, the list of registered providers is
       traversed in preference order and the first provider that supports the
       <code>truststoreType</code> is used.
       </p>