[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  d47eaaf41f67b0c3521a53aed6b4c4458417f791 (commit)
      from  e440f51395f10e307f720213bd75393e446024a3 (commit)


- Log -----------------------------------------------------------------
commit d47eaaf41f67b0c3521a53aed6b4c4458417f791
Author: Alex Gaynor <alex.gaynor at gmail.com>
Date:   Fri Mar 9 07:11:13 2018 -0500

    Fixed a spelling mistake in ASN1_TIME_set.pod
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5569)

-----------------------------------------------------------------------

Summary of changes:
 doc/man3/ASN1_TIME_set.pod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/man3/ASN1_TIME_set.pod b/doc/man3/ASN1_TIME_set.pod
index d45cfe6..4ae640b 100644
--- a/doc/man3/ASN1_TIME_set.pod
+++ b/doc/man3/ASN1_TIME_set.pod
@@ -155,7 +155,7 @@ in the B<offset_sec> and B<offset_day> parameters instead of directly
 manipulating a time_t value.
 
 ASN1_TIME_adj() may change the type from ASN1_GENERALIZEDTIME to ASN1_UTCTIME,
-or vise-versa, based on the resulting year. The ASN1_GENERALIZEDTIME_adj() and
+or vice versa, based on the resulting year. The ASN1_GENERALIZEDTIME_adj() and
 ASN1_UTCTIME_adj() functions will not modify the type of the return structure.
 
 It is recommended that functions starting with ASN1_TIME be used instead of