From: Joe Orton <jorton@apache.org>
Date: Thu, 20 Feb 2020 08:47:24 +0000 (+0000)
Subject: Merge r1874243 from trunk:
X-Git-Tag: 2.4.42~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bab11f21228f4b8008a02a6b0e7c80f5ffa132a1;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1874243 from trunk:

PKCS#11 URIs usable from 2.4.42 and later now. [skip ci]




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874244 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml
index 51d9d7a67b7..289673a8a40 100644
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -899,7 +899,7 @@ SSLCipherSuite RSA:!EXP:!NULL:+HIGH:+MEDIUM:-LOW
 <syntax>SSLCertificateFile <var>file-path</var>|<var>certid</var></syntax>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility><var>certid</var> available in 2.5.1 and later.</compatibility>
+<compatibility><var>certid</var> available in 2.4.42 and later.</compatibility>
 
 <usage>
 <p>
@@ -1016,7 +1016,7 @@ SSLCertificateFile "pkcs11:token=My%20Token%20Name;id=45"
 <syntax>SSLCertificateKeyFile <var>file-path</var>|<var>keyid</var></syntax>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility><var>keyid</var> available in 2.5.1 and later.</compatibility>
+<compatibility><var>keyid</var> available in 2.4.42 and later.</compatibility>
 
 <usage>
 <p>