Merge from main trunk.
authorRichard Levitte <levitte@openssl.org>
Sun, 17 Sep 2000 00:10:29 +0000 (00:10 +0000)
committerRichard Levitte <levitte@openssl.org>
Sun, 17 Sep 2000 00:10:29 +0000 (00:10 +0000)
commit8de7587e02e5efc586cc61178ec170e7f67afe70
tree0515ccd5ba86e7ea4ff4a92d1610e81857df7a18
parent90ac586317251837e7462f4757831e2821a426af
Merge from main trunk.
37 files changed:
crypto/bio/bio.h
doc/apps/x509.pod
doc/crypto/BIO_ctrl.pod
doc/crypto/BIO_ctrl_get_read_request.pod [deleted file]
doc/crypto/BIO_ctrl_pending.pod [deleted file]
doc/crypto/BIO_f_cipher.pod
doc/crypto/BIO_f_md.pod
doc/crypto/BIO_new.pod
doc/crypto/BIO_new_bio_pair.pod
doc/crypto/BIO_read.pod
doc/crypto/BIO_s_accept.pod
doc/crypto/BIO_s_bio.pod
doc/crypto/BIO_s_connect.pod
doc/crypto/BIO_s_fd.pod
doc/crypto/BIO_s_file.pod
doc/crypto/BIO_s_mem.pod
doc/crypto/BIO_s_socket.pod
doc/crypto/BIO_seek.pod [deleted file]
doc/crypto/bio.pod
doc/crypto/threads.pod
doc/ssl/SSL_SESSION_free.pod
doc/ssl/SSL_accept.pod
doc/ssl/SSL_clear.pod
doc/ssl/SSL_connect.pod
doc/ssl/SSL_free.pod
doc/ssl/SSL_get_error.pod
doc/ssl/SSL_get_fd.pod
doc/ssl/SSL_get_rbio.pod
doc/ssl/SSL_get_session.pod
doc/ssl/SSL_new.pod
doc/ssl/SSL_read.pod
doc/ssl/SSL_set_bio.pod
doc/ssl/SSL_set_fd.pod
doc/ssl/SSL_set_session.pod
doc/ssl/SSL_shutdown.pod
doc/ssl/SSL_write.pod
doc/ssl/ssl.pod