Update docs and bump logno for PKCS#11 support change in r1835615.

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

diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number
index 5ce871b01ab66d02551a5f3dc67d31de2e72583a..71bcccf8c603c0c9f1fa558302a7aef472a6b0a6 100644 (file)
--- a/docs/log-message-tags/next-number
+++ b/docs/log-message-tags/next-number
@@ -1 +1 @@
-10149
+10150

diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml
index fc1a208cb7cdf709f453f59f2ff830de2d0c74d5..a08256530b7d5b0cb06f88919de9ce70c76a7833 100644 (file)
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -920,8 +920,7 @@ files, a certificate identifier can be used to identify a certificate
 stored in a token.  Currently, only <a
 href="https://tools.ietf.org/html/rfc7512">PKCS#11 URIs</a> are
 recognized as certificate identifiers, and can be used in conjunction
-with the OpenSSL <code>pkcs11</code> engine configured with <directive
-module="mod_ssl">SSLCryptoDevice</directive>.  If <directive
+with the OpenSSL <code>pkcs11</code> engine.  If <directive
 module="mod_ssl">SSLCertificateKeyFile</directive> is omitted, the
 certificate and private key can be loaded through the single
 identifier specified with <directive
@@ -975,8 +974,6 @@ thus using a custom/suitable length.
 # Example using a PEM-encoded file.
 SSLCertificateFile "/usr/local/apache2/conf/ssl.crt/server.crt"
 # Example use of a certificate and private key from a PKCS#11 token:
-SSLCryptoDevice pkcs11
-...
 SSLCertificateFile "pkcs11:token=My%20Token%20Name;id=45"
 </highlight>
 </example>
@@ -1013,19 +1010,16 @@ an embedded key must be configured after the certificates using a separate
 key file.</p>
 
 <p>As an alternative to storing private keys in files, a key
-identifier can be specified to identify a private key stored in a
+identifier can be used to identify a private key stored in a
 token.  Currently, only <a href="https://tools.ietf.org/html/rfc7512">PKCS#11 URIs</a> are recognized as private key
 identifiers, and can be used in conjunction with the OpenSSL
-<code>pkcs11</code> engine configured with <directive
-module="mod_ssl">SSLCryptoDevice</directive>.</p>
+<code>pkcs11</code> engine.</p>
 
 <example><title>Example</title>
 <highlight language="config">
 # To use a private key from a PEM-encoded file:
 SSLCertificateKeyFile "/usr/local/apache2/conf/ssl.key/server.key"
 # To use a private key from a PKCS#11 token:
-SSLCryptoDevice pkcs11
-...
 SSLCertificateKeyFile "pkcs11:token=My%20Token%20Name;id=45"
 </highlight>
 </example>