In preparation for the coming release of 0.9.6a, prepare a branch for

engine-0.9.6-stable.

There's no need to update this with the new bug fixes, it will get
updated from the changes in OpenSSL_0_9_6-stable, just like any normal
merge.

diff --git a/doc/ssl/SSL_CTX_set_options.pod b/doc/ssl/SSL_CTX_set_options.pod
index 5eb376eda88fd51e3afbcf910138024460f9a533..3dc7cc74ad63f91a1358ac2a4f8a033533586708 100644 (file)
--- a/doc/ssl/SSL_CTX_set_options.pod
+++ b/doc/ssl/SSL_CTX_set_options.pod
@@ -128,14 +128,6 @@ Always create a new key when using temporary DH parameters.
 
 Also use the temporary RSA key when doing RSA operations.
 
-=item SSL_OP_CIPHER_SERVER_PREFERENCE
-
-When choosing a cipher, use the server's preferences instead of the client
-preferences. When not set, the SSL server will always follow the clients
-preferences. When set, the SSLv3/TLSv1 server will choose following its
-own preferences. Because of the different protocol, for SSLv2 the server
-will send his list of preferences to the client and the client chooses.
-
 =item SSL_OP_PKCS1_CHECK_1
 
 ...
@@ -186,8 +178,6 @@ L<ssl(3)|ssl(3)>, L<SSL_new(3)|SSL_new(3)>, L<SSL_clear(3)|SSL_clear(3)>
 
 =head1 HISTORY
 
-SSL_OP_CIPHER_SERVER_PREFERENCE has been added in OpenSSL 0.9.7.
-
 SSL_OP_TLS_ROLLBACK_BUG has been added in OpenSSL 0.9.6.
 
 =cut