diff options
author | marha <marha@users.sourceforge.net> | 2015-04-20 23:05:23 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2015-04-20 23:05:23 +0200 |
commit | 0f7871ff824bcf064db3ab6bdfe26645ba6c8087 (patch) | |
tree | 90d3d2b6112e083289c9cf68146852087814f6d3 /openssl/doc/ssl/SSL_CONF_CTX_set_flags.pod | |
parent | 934184bfecd402aae891b8740d788b486aa7269f (diff) | |
parent | 2a00e489122f6c4b525090dbdba2855a2ea2d519 (diff) | |
download | vcxsrv-0f7871ff824bcf064db3ab6bdfe26645ba6c8087.tar.gz vcxsrv-0f7871ff824bcf064db3ab6bdfe26645ba6c8087.tar.bz2 vcxsrv-0f7871ff824bcf064db3ab6bdfe26645ba6c8087.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
Diffstat (limited to 'openssl/doc/ssl/SSL_CONF_CTX_set_flags.pod')
-rwxr-xr-x | openssl/doc/ssl/SSL_CONF_CTX_set_flags.pod | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/doc/ssl/SSL_CONF_CTX_set_flags.pod b/openssl/doc/ssl/SSL_CONF_CTX_set_flags.pod index ab87efcc2..4e3428046 100755 --- a/openssl/doc/ssl/SSL_CONF_CTX_set_flags.pod +++ b/openssl/doc/ssl/SSL_CONF_CTX_set_flags.pod @@ -36,7 +36,7 @@ least one of these flags must be set. recognise options intended for use in SSL/TLS clients or servers. One or both of these flags must be set. -=item SSL_CONF_CERTIFICATE +=item SSL_CONF_FLAG_CERTIFICATE recognise certificate and private key options. |