Change spelling back to "behaviour" and "flavour" instead of the

American variants.

diff --git a/doc/apps/x509.pod b/doc/apps/x509.pod
index 7f32eef0009babb68033c8089fd7b290641f2bb6..84f76cb421be86735e0115c712424b26659a4ca9 100644 (file)
--- a/doc/apps/x509.pod
+++ b/doc/apps/x509.pod
@@ -694,7 +694,7 @@ There should be options to explicitly set such things as start and end
 dates rather than an offset from the current time.
 
 The code to implement the verify behaviour described in the B<TRUST SETTINGS>
-is currently being developed. It thus describes the intended behavior rather
+is currently being developed. It thus describes the intended behaviour rather
 than the current behaviour. It is hoped that it will represent reality in
 OpenSSL 0.9.5 and later.
 

diff --git a/doc/crypto/BIO_f_md.pod b/doc/crypto/BIO_f_md.pod
index ebca9440654bc20c2e191417c8d108cf6890bc7b..c32504dfb186f6854ecd9c41fb2b07d67ab215f9 100644 (file)
--- a/doc/crypto/BIO_f_md.pod
+++ b/doc/crypto/BIO_f_md.pod
@@ -127,7 +127,7 @@ outputs them. This could be used with the examples above.
 
 =head1 BUGS
 
-The lack of support for BIO_puts() and the non standard behavior of
+The lack of support for BIO_puts() and the non standard behaviour of
 BIO_gets() could be regarded as anomalous. It could be argued that BIO_gets()
 and BIO_puts() should be passed to the next BIO in the chain and digest
 the data passed through and that digests should be retrieved using a

diff --git a/doc/crypto/BIO_f_ssl.pod b/doc/crypto/BIO_f_ssl.pod
index 122deb42cb67c3b57d8c5aa28e48b380dc3098e7..ba36eff80e4f5bc90e02cc0e2426247acf43d507 100644 (file)
--- a/doc/crypto/BIO_f_ssl.pod
+++ b/doc/crypto/BIO_f_ssl.pod
@@ -33,7 +33,7 @@ BIO_ssl_shutdown - SSL BIO
 =head1 DESCRIPTION
 
 BIO_f_ssl() returns the SSL BIO method. This is a filter BIO which
-is a wrapper round the OpenSSL SSL routines adding a BIO "flavor" to
+is a wrapper round the OpenSSL SSL routines adding a BIO "flavour" to
 SSL I/O. 
 
 I/O performed on an SSL BIO communicates using the SSL protocol with
@@ -100,7 +100,7 @@ renegotiation takes place during a BIO_read() operation, one
 case where this happens is when SGC or step up occurs.
 
 In OpenSSL 0.9.6 and later the SSL flag SSL_AUTO_RETRY can be
-set to disable this behavior. That is when this flag is set
+set to disable this behaviour. That is when this flag is set
 an SSL BIO using a blocking transport will never request a
 retry.
 

diff --git a/doc/crypto/BIO_s_fd.pod b/doc/crypto/BIO_s_fd.pod
index e0ca2eca9435860e78c87695b11ef5c45ddb574b..4681e5e13b6583671815905770bff63f9a907255 100644 (file)
--- a/doc/crypto/BIO_s_fd.pod
+++ b/doc/crypto/BIO_s_fd.pod
@@ -40,7 +40,7 @@ BIO_new_fd() returns a file descriptor BIO using B<fd> and B<close_flag>.
 
 =head1 NOTES
 
-The behavior of BIO_read() and BIO_write() depends on the behavior of the
+The behaviour of BIO_read() and BIO_write() depends on the behavior of the
 platforms read() and write() calls on the descriptor. If the underlying 
 file descriptor is in a non blocking mode then the BIO will behave in the
 manner described in the L<BIO_read(3)|BIO_read(3)> and L<BIO_should_retry(3)|BIO_should_retry(3)>
@@ -56,7 +56,7 @@ BIO_s_fd() returns the file descriptor BIO method.
 BIO_reset() returns zero for success and -1 if an error occurred.
 BIO_seek() and BIO_tell() return the current file position or -1
 is an error occurred. These values reflect the underlying lseek()
-behavior.
+behaviour.
 
 BIO_set_fd() always returns 1.
 

diff --git a/doc/crypto/BIO_s_file.pod b/doc/crypto/BIO_s_file.pod
index 672dc2f48de07ef4ce7e1d83cf2857fa0ffb150c..10fe4933c72343a63821df8f08e693d2f0077730 100644 (file)
--- a/doc/crypto/BIO_s_file.pod
+++ b/doc/crypto/BIO_s_file.pod
@@ -66,7 +66,7 @@ When wrapping stdout, stdin or stderr the underlying stream should not
 normally be closed so the BIO_NOCLOSE flag should be set.
 
 Because the file BIO calls the underlying stdio functions any quirks
-in stdio behavior will be mirrored by the corresponding BIO.
+in stdio behaviour will be mirrored by the corresponding BIO.
 
 =head1 EXAMPLES
 

diff --git a/doc/crypto/BIO_s_mem.pod b/doc/crypto/BIO_s_mem.pod
index 32089325886ecae39913249bc558a755397135a1..19648acfae0f265b00ced60ee855851fd94d497a 100644 (file)
--- a/doc/crypto/BIO_s_mem.pod
+++ b/doc/crypto/BIO_s_mem.pod
@@ -43,7 +43,7 @@ BIO_eof() is true if no data is in the BIO.
 
 BIO_ctrl_pending() returns the number of bytes currently stored.
 
-BIO_set_mem_eof_return() sets the behavior of memory BIO B<b> when it is
+BIO_set_mem_eof_return() sets the behaviour of memory BIO B<b> when it is
 empty. If the B<v> is zero then an empty memory BIO will return EOF (that is
 it will return zero and BIO_should_retry(b) will be false. If B<v> is non
 zero then it will return B<v> when it is empty and it will set the read retry

diff --git a/doc/crypto/BIO_should_retry.pod b/doc/crypto/BIO_should_retry.pod
index cd7adcd425c33358f05c0be35a1a5c66fe95620f..539c3912728caebc5e77bfcadf583e52f061cc92 100644 (file)
--- a/doc/crypto/BIO_should_retry.pod
+++ b/doc/crypto/BIO_should_retry.pod
@@ -97,7 +97,7 @@ the performance may be poor if SSL BIOs are present because long delays
 can occur during the initial handshake process. 
 
 It is possible for a BIO to block indefinitely if the underlying I/O
-structure cannot process or return any data. This depends on the behavior of
+structure cannot process or return any data. This depends on the behaviour of
 the platforms I/O functions. This is often not desirable: one solution
 is to use non blocking I/O and use a timeout on the select() (or
 equivalent) call.

diff --git a/doc/crypto/threads.pod b/doc/crypto/threads.pod
index bcaa94d1bb8a8b135a7d271e63b4262a295f80bd..7fa18aa443c453e32f033046dbc8a9f697fad0b2 100644 (file)
--- a/doc/crypto/threads.pod
+++ b/doc/crypto/threads.pod
@@ -106,7 +106,7 @@ CRYPTO_lock() is used to lock and unlock the locks.  mode is a bitfield
 describing what should be done with the lock.  n is the number of the
 lock as returned from CRYPTO_get_new_dynlockid().  mode can be combined
 from the following values.  These values are pairwise exclusive, with
-undefined behavior if misused (for example, CRYPTO_READ and CRYPTO_WRITE
+undefined behaviour if misused (for example, CRYPTO_READ and CRYPTO_WRITE
 should not be used together):
 
        CRYPTO_LOCK     0x01

diff --git a/doc/ssl/SSL_accept.pod b/doc/ssl/SSL_accept.pod
index 303cf2468056e350f4da3455f5880214d6801832..fc6a57b5daabbddc8005bf1d91d4669fe5b6e871 100644 (file)
--- a/doc/ssl/SSL_accept.pod
+++ b/doc/ssl/SSL_accept.pod
@@ -14,7 +14,7 @@ SSL_accept - wait for a TLS/SSL client to initiate a TLS/SSL handshake
 
 SSL_accept() waits for a TLS/SSL client to initiate the TLS/SSL handshake.
 The communication channel must already have been set and assigned to the
-B<ssl> by setting an underlying B<BIO>. The behavior of SSL_accept() depends
+B<ssl> by setting an underlying B<BIO>. The behaviour of SSL_accept() depends
 on the underlying BIO. 
 
 If the underlying BIO is B<blocking>, SSL_accept() will only return once the

diff --git a/doc/ssl/SSL_connect.pod b/doc/ssl/SSL_connect.pod
index a5027717cf084e5686f072135b97c074573736a3..92aa20e07974069ba1abb24207e606bbc033e400 100644 (file)
--- a/doc/ssl/SSL_connect.pod
+++ b/doc/ssl/SSL_connect.pod
@@ -14,7 +14,7 @@ SSL_connect - initiate the TLS/SSL handshake with an TLS/SSL server
 
 SSL_connect() initiates the TLS handshake with a server. The communication
 channel must already have been set and assigned to the B<ssl> by setting an
-underlying B<BIO>. The behavior of SSL_connect() depends on the underlying
+underlying B<BIO>. The behaviour of SSL_connect() depends on the underlying
 BIO. 
 
 If the underlying BIO is B<blocking>, SSL_connect() will only return once the

diff --git a/doc/ssl/SSL_read.pod b/doc/ssl/SSL_read.pod
index a1fc0fb3563e123047249a578e4caf6f91b15f36..3b082a7c909ff3d56b71bd342df6c0cb1b53720f 100644 (file)
--- a/doc/ssl/SSL_read.pod
+++ b/doc/ssl/SSL_read.pod
@@ -16,7 +16,7 @@ SSL_read() tries to read B<num> bytes from the specified B<ssl> into the
 buffer B<buf>. If necessary, SSL_read() will negotiate a TLS/SSL session, if
 not already explicitly performed by SSL_connect() or SSL_accept(). If the
 peer requests a re-negotiation, it will be performed transparently during
-the SSL_read() operation. The behavior of SSL_read() depends on the
+the SSL_read() operation. The behaviour of SSL_read() depends on the
 underlying BIO. 
 
 If the underlying BIO is B<blocking>, SSL_read() will only return, once the

diff --git a/doc/ssl/SSL_set_bio.pod b/doc/ssl/SSL_set_bio.pod
index 296aa6d7e27241cbc683a934aa837a7a954f474c..67c9756d3fe5ee77a1b9d1ae89592890c0c12482 100644 (file)
--- a/doc/ssl/SSL_set_bio.pod
+++ b/doc/ssl/SSL_set_bio.pod
@@ -15,8 +15,8 @@ SSL_set_bio - connect the SSL object with a BIO
 SSL_set_bio() connects the BIOs B<rbio> and B<wbio> for the read and write
 operations of the TLS/SSL (encrypted) side of B<ssl>.
 
-The SSL engine inherits the behavior of B<rbio> and B<wbio>, respectively.
-If a BIO is non-blocking, the B<ssl> will also have non-blocking behavior.
+The SSL engine inherits the behaviour of B<rbio> and B<wbio>, respectively.
+If a BIO is non-blocking, the B<ssl> will also have non-blocking behaviour.
 
 If there was already a BIO connected to B<ssl>, BIO_free() will be called
 (for both the reading and writing side, if different).

diff --git a/doc/ssl/SSL_set_fd.pod b/doc/ssl/SSL_set_fd.pod
index f6d9b7a1dcc15e70b841990f1fa351abfbc05b47..70291128fcec08ed036b85e009a398ceb66d9f3f 100644 (file)
--- a/doc/ssl/SSL_set_fd.pod
+++ b/doc/ssl/SSL_set_fd.pod
@@ -20,8 +20,8 @@ socket file descriptor of a network connection.
 
 When performing the operation, a B<socket BIO> is automatically created to
 interface between the B<ssl> and B<fd>. The BIO and hence the SSL engine
-inherit the behavior of B<fd>. If B<fd> is non-blocking, the B<ssl> will
-also have non-blocking behavior.
+inherit the behaviour of B<fd>. If B<fd> is non-blocking, the B<ssl> will
+also have non-blocking behaviour.
 
 If there was already a BIO connected to B<ssl>, BIO_free() will be called
 (for both the reading and writing side, if different).

diff --git a/doc/ssl/SSL_shutdown.pod b/doc/ssl/SSL_shutdown.pod
index f287aad9ce7a1590798c211cc958f01056758a6e..20e273bd4d58de11ee8d2f43a874ba77cd7ce7fe 100644 (file)
--- a/doc/ssl/SSL_shutdown.pod
+++ b/doc/ssl/SSL_shutdown.pod
@@ -13,7 +13,7 @@ SSL_shutdown - shut down a TLS/SSL connection
 =head1 DESCRIPTION
 
 SSL_shutdown() shuts down an active TLS/SSL connection. It sends the shutdown
-alert to the peer. The behavior of SSL_shutdown() depends on the underlying
+alert to the peer. The behaviour of SSL_shutdown() depends on the underlying
 BIO. 
 
 If the underlying BIO is B<blocking>, SSL_shutdown() will only return once the

diff --git a/doc/ssl/SSL_write.pod b/doc/ssl/SSL_write.pod
index 4db85473d9a9c552848f07f5c4616d8f3b9f1bb8..b086258e82e4388c5e04c94cf14fa794d97b29cd 100644 (file)
--- a/doc/ssl/SSL_write.pod
+++ b/doc/ssl/SSL_write.pod
@@ -16,7 +16,7 @@ SSL_write() writes B<num> bytes from the buffer B<buf> into the specified
 B<ssl>. If necessary, SSL_write() will negotiate a TLS/SSL session, if
 not already explicitly performed by SSL_connect() or SSL_accept(). If the
 peer requests a re-negotiation, it will be performed transparently during
-the SSL_write() operation. The behavior of SSL_write() depends on the
+the SSL_write() operation. The behaviour of SSL_write() depends on the
 underlying BIO. 
 
 If the underlying BIO is B<blocking>, SSL_write() will only return, once the