Author: markt
Date: Mon Dec 7 20:41:15 2015
New Revision: 1718458
URL: http://svn.apache.org/viewvc?rev=1718458&view=rev
Log:
Correct the SSL documentation for deprecated attributes to point to the
correct, new location for attributes related to individual certificates.
Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1718458&r1=1718457&r2=1718458&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Dec 7 20:41:15 2015
@@ -182,6 +182,11 @@
<bug>58631</bug>: Correct the continuation character use in the Windows
Service How-To page of the documentation web application. (markt)
</fix>
+ <fix>
+ Correct the SSL documentation for deprecated attributes to point to the
+ correct, new location for attributes related to individual
certificates.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Tribes">
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1718458&r1=1718457&r2=1718458&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Mon Dec 7 20:41:15 2015
@@ -1427,38 +1427,46 @@
<attribute name="keyAlias" required="false">
<p>This is an alias for the <code>certificateKeyAlias</code> attribute of
- the default <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a>
- element.</p>
+ the first <a href="#SSL_Support_-_Certificate">Certificate</a> element
+ nested in the default
+ <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a> element.</p>
</attribute>
<attribute name="keyPass" required="false">
<p>This is an alias for the <code>certificateKeyPassword</code> attribute
- of the default <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a>
- element.</p>
+ of the first <a href="#SSL_Support_-_Certificate">Certificate</a> element
+ nested in the default
+ <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a> element.</p>
</attribute>
<attribute name="keystoreFile" required="false">
<p>This is an alias for the <code>certificateKeystoreFile</code>
attribute
- of the default <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a>
- element.</p>
+ of the first <a href="#SSL_Support_-_Certificate">Certificate</a> element
+ nested in the default
+ <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a> element.</p>
</attribute>
<attribute name="keystorePass" required="false">
<p>This is an alias for the <code>certificateKeystorePassword</code>
- attribute of the default
- <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a> element.</p>
+ attribute of the first
+ <a href="#SSL_Support_-_Certificate">Certificate</a> element nested in
the
+ default <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a>
+ element.</p>
</attribute>
<attribute name="keystoreProvider" required="false">
<p>This is an alias for the <code>certificateKeystoreProvider</code>
- attribute of the default
- <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a> element.</p>
+ attribute of the first
+ <a href="#SSL_Support_-_Certificate">Certificate</a> element nested in
the
+ default <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a>
+ element.</p>
</attribute>
<attribute name="keystoreType" required="false">
<p>This is an alias for the <code>certificateKeystoreType</code>
attribute
- of the default <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a>
- element.</p>
+ of the first <a href="#SSL_Support_-_Certificate">Certificate</a> element
+ nested in the default
+ <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a> element.</p>
</attribute>
<attribute name="sessionCacheSize" required="false">
@@ -1581,13 +1589,15 @@
<attribute name="SSLCertificateFile" required="true">
<p>This is an alias for the <code>certificateFile</code> attribute of the
- default <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a>
+ first <a href="#SSL_Support_-_Certificate">Certificate</a> element nested
+ in the default <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a>
element.</p>
</attribute>
<attribute name="SSLCertificateKeyFile" required="false">
- <p>This is an alias for the <code>certificateKeyFile</code> attribute of
- the default <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a>
+ <p>This is an alias for the <code>certificateKeyFile</code> attribute of
the
+ first <a href="#SSL_Support_-_Certificate">Certificate</a> element nested
+ in the default <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a>
element.</p>
</attribute>
@@ -1610,8 +1620,9 @@
<attribute name="SSLPassword" required="false">
<p>This is an alias for the <code>certificateKeyPassword</code> attribute
- of the default <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a>
- element.</p>
+ of the first <a href="#SSL_Support_-_Certificate">Certificate</a> element
+ nested in the default
+ <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a> element.</p>
</attribute>
<attribute name="SSLProtocol" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
