summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorklemens <ka7@github.com>2016-08-05 19:56:58 +0200
committerRich Salz <rsalz@openssl.org>2016-08-05 19:07:30 -0400
commit6025001707fd65679d758c877200469d4e72ea88 (patch)
tree557bc457aea10e4f854f1ae975d38b0e9c8c79fb /doc
parent1ccbe6b32c98f61526e364c7abc94f55ec600293 (diff)
spelling fixes, just comments and readme.
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1413)
Diffstat (limited to 'doc')
-rw-r--r--doc/apps/cms.pod2
-rw-r--r--doc/apps/s_client.pod2
-rw-r--r--doc/apps/sess_id.pod2
-rw-r--r--doc/apps/smime.pod2
-rw-r--r--doc/crypto/ASYNC_start_job.pod2
-rw-r--r--doc/crypto/EVP_EncryptInit.pod2
-rw-r--r--doc/crypto/OPENSSL_malloc.pod2
-rw-r--r--doc/crypto/X509_STORE_CTX_set_verify_cb.pod2
-rw-r--r--doc/crypto/X509_STORE_set_verify_cb_func.pod2
-rw-r--r--doc/crypto/X509_get_extension_flags.pod2
10 files changed, 10 insertions, 10 deletions
diff --git a/doc/apps/cms.pod b/doc/apps/cms.pod
index 4a2b604a83..b6546133cf 100644
--- a/doc/apps/cms.pod
+++ b/doc/apps/cms.pod
@@ -499,7 +499,7 @@ a blank line. Piping the mail directly to sendmail is one way to
achieve the correct format.
The supplied message to be signed or encrypted must include the
-necessary MIME headers or many S/MIME clients wont display it
+necessary MIME headers or many S/MIME clients won't display it
properly (if at all). You can use the B<-text> option to automatically
add plain text headers.
diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod
index 77668ea44e..4ed032ca32 100644
--- a/doc/apps/s_client.pod
+++ b/doc/apps/s_client.pod
@@ -327,7 +327,7 @@ and accepted from the server.
=item B<-dtls>, B<-dtls1>, B<-dtls1_2>
These options make B<s_client> use DTLS protocols instead of TLS.
-With B<-dtls>, B<s_client> will negotiate any supported DTLS protcol version,
+With B<-dtls>, B<s_client> will negotiate any supported DTLS protocol version,
whilst B<-dtls1> and B<-dtls1_2> will only support DTLS1.0 and DTLS1.2
respectively.
diff --git a/doc/apps/sess_id.pod b/doc/apps/sess_id.pod
index b098528bb8..3694f7d838 100644
--- a/doc/apps/sess_id.pod
+++ b/doc/apps/sess_id.pod
@@ -72,7 +72,7 @@ this option prevents output of the encoded version of the session.
=item B<-context ID>
this option can set the session id so the output session information uses the
-supplied ID. The ID can be any string of characters. This option wont normally
+supplied ID. The ID can be any string of characters. This option won't normally
be used.
=back
diff --git a/doc/apps/smime.pod b/doc/apps/smime.pod
index 05cefea7e2..2c7661daf0 100644
--- a/doc/apps/smime.pod
+++ b/doc/apps/smime.pod
@@ -331,7 +331,7 @@ a blank line. Piping the mail directly to sendmail is one way to
achieve the correct format.
The supplied message to be signed or encrypted must include the
-necessary MIME headers or many S/MIME clients wont display it
+necessary MIME headers or many S/MIME clients won't display it
properly (if at all). You can use the B<-text> option to automatically
add plain text headers.
diff --git a/doc/crypto/ASYNC_start_job.pod b/doc/crypto/ASYNC_start_job.pod
index edec50b573..c10a66f565 100644
--- a/doc/crypto/ASYNC_start_job.pod
+++ b/doc/crypto/ASYNC_start_job.pod
@@ -128,7 +128,7 @@ The ASYNC_block_pause() function will prevent the currently active job from
pausing. The block will remain in place until a subsequent call to
ASYNC_unblock_pause(). These functions can be nested, e.g. if you call
ASYNC_block_pause() twice then you must call ASYNC_unblock_pause() twice in
-order to reenable pausing. If these functions are called while there is no
+order to re-enable pausing. If these functions are called while there is no
currently active job then they have no effect. This functionality can be useful
to avoid deadlock scenarios. For example during the execution of an ASYNC_JOB an
application acquires a lock. It then calls some cryptographic function which
diff --git a/doc/crypto/EVP_EncryptInit.pod b/doc/crypto/EVP_EncryptInit.pod
index 8286a717e9..d981620908 100644
--- a/doc/crypto/EVP_EncryptInit.pod
+++ b/doc/crypto/EVP_EncryptInit.pod
@@ -560,7 +560,7 @@ Encrypt a string using IDEA:
EVP_CIPHER_CTX_free(ctx);
/* Need binary mode for fopen because encrypted data is
* binary data. Also cannot use strlen() on it because
- * it wont be null terminated and may contain embedded
+ * it won't be null terminated and may contain embedded
* nulls.
*/
out = fopen(outfile, "wb");
diff --git a/doc/crypto/OPENSSL_malloc.pod b/doc/crypto/OPENSSL_malloc.pod
index 0060b989a9..50f09751cf 100644
--- a/doc/crypto/OPENSSL_malloc.pod
+++ b/doc/crypto/OPENSSL_malloc.pod
@@ -179,7 +179,7 @@ CRYPTO_set_mem_functions() and CRYPTO_set_mem_debug()
return 1 on success or 0 on failure (almost
always because allocations have already happened).
-CRYPTO_mem_ctrl() returns -1 if an error occured, otherwise the
+CRYPTO_mem_ctrl() returns -1 if an error occurred, otherwise the
previous value of the mode.
OPENSSL_mem_debug_push() and OPENSSL_mem_debug_pop()
diff --git a/doc/crypto/X509_STORE_CTX_set_verify_cb.pod b/doc/crypto/X509_STORE_CTX_set_verify_cb.pod
index 034a5804e9..266a4c1ecb 100644
--- a/doc/crypto/X509_STORE_CTX_set_verify_cb.pod
+++ b/doc/crypto/X509_STORE_CTX_set_verify_cb.pod
@@ -201,7 +201,7 @@ X509_STORE_CTX_get_check_issued(), X509_STORE_CTX_get_check_revocation(),
X509_STORE_CTX_get_get_crl(), X509_STORE_CTX_get_check_crl(),
X509_STORE_CTX_get_cert_crl(), X509_STORE_CTX_get_check_policy(),
X509_STORE_CTX_get_lookup_certs(), X509_STORE_CTX_get_lookup_crls()
-and X509_STORE_CTX_get_cleanup() were addded in OpenSSL 1.1.0.
+and X509_STORE_CTX_get_cleanup() were added in OpenSSL 1.1.0.
=head1 COPYRIGHT
diff --git a/doc/crypto/X509_STORE_set_verify_cb_func.pod b/doc/crypto/X509_STORE_set_verify_cb_func.pod
index 89135f4e13..c4f48162c3 100644
--- a/doc/crypto/X509_STORE_set_verify_cb_func.pod
+++ b/doc/crypto/X509_STORE_set_verify_cb_func.pod
@@ -246,7 +246,7 @@ X509_STORE_set_cert_crl(), X509_STORE_get_cert_crl(),
X509_STORE_set_check_policy(), X509_STORE_get_check_policy(),
X509_STORE_set_lookup_certs(), X509_STORE_get_lookup_certs(),
X509_STORE_set_lookup_crls(), X509_STORE_get_lookup_crls(),
-X509_STORE_set_cleanup() and X509_STORE_get_cleanup() were addded in
+X509_STORE_set_cleanup() and X509_STORE_get_cleanup() were added in
OpenSSL 1.1.0.
=head1 COPYRIGHT
diff --git a/doc/crypto/X509_get_extension_flags.pod b/doc/crypto/X509_get_extension_flags.pod
index a4a33ae937..92e8a6ba1f 100644
--- a/doc/crypto/X509_get_extension_flags.pod
+++ b/doc/crypto/X509_get_extension_flags.pod
@@ -118,7 +118,7 @@ certificate B<x>. This is for the users who need to mark non-RFC3820 proxy
certificates as such, as OpenSSL only detects RFC3820 compliant ones.
X509_get_proxy_pathlen() returns the proxy certificate path length for the
-given certificate B<x> if it is a proxy certicate.
+given certificate B<x> if it is a proxy certificate.
=head1 NOTES