Merge branch 'rsalz-docfixes'
authorRich Salz <rsalz@akamai.com>
Thu, 3 Jul 2014 16:35:40 +0000 (12:35 -0400)
committerRich Salz <rsalz@akamai.com>
Thu, 3 Jul 2014 16:35:40 +0000 (12:35 -0400)
commit85dcce7c634d97944cadfb65243ce13b38c81372
tree99c358977be34fa420609a1b47c148e55dd681d6
parent2ed29615cb0e58338f16f6c6264a51cefd3e4f44
Merge branch 'rsalz-docfixes'
(cherry picked from commit b5071dc2f67d7667ab3cbbe50a30342f999b896a)

Conflicts:

doc/apps/s_client.pod
doc/apps/verify.pod
doc/apps/x509v3_config.pod
doc/crypto/ASN1_generate_nconf.pod
doc/ssl/SSL_CONF_CTX_set_ssl_ctx.pod
doc/ssl/SSL_CONF_cmd.pod
doc/ssl/SSL_CONF_cmd_argv.pod
doc/ssl/SSL_CTX_set_cert_cb.pod
doc/ssl/SSL_CTX_set_security_level.pod
33 files changed:
doc/apps/asn1parse.pod
doc/apps/ca.pod
doc/apps/crl.pod
doc/apps/dhparam.pod
doc/apps/dsa.pod
doc/apps/ecparam.pod
doc/apps/gendsa.pod
doc/apps/genrsa.pod
doc/apps/rsa.pod
doc/apps/s_client.pod
doc/apps/s_server.pod
doc/apps/verify.pod
doc/apps/x509.pod
doc/apps/x509v3_config.pod
doc/crypto/ASN1_generate_nconf.pod
doc/crypto/BIO_f_base64.pod
doc/crypto/RSA_sign.pod
doc/crypto/err.pod
doc/ssl/SSL_CIPHER_get_name.pod
doc/ssl/SSL_CONF_CTX_set_ssl_ctx.pod [new file with mode: 0644]
doc/ssl/SSL_CONF_cmd.pod [new file with mode: 0644]
doc/ssl/SSL_CONF_cmd_argv.pod [new file with mode: 0644]
doc/ssl/SSL_CTX_add_session.pod
doc/ssl/SSL_CTX_set_cert_cb.pod [new file with mode: 0644]
doc/ssl/SSL_CTX_set_client_CA_list.pod
doc/ssl/SSL_CTX_set_client_cert_cb.pod
doc/ssl/SSL_CTX_set_options.pod
doc/ssl/SSL_CTX_set_security_level.pod [new file with mode: 0644]
doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod [new file with mode: 0644]
doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
doc/ssl/SSL_CTX_set_verify.pod
doc/ssl/SSL_get_version.pod
doc/ssl/d2i_SSL_SESSION.pod