summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2018-03-29 20:17:44 +0000
committerschwarze <schwarze@openbsd.org>2018-03-29 20:17:44 +0000
commit3084f28507a9f61935ef47c9195949c0551a31c8 (patch)
tree9eb8ae59915911b3693847b6507cc0bc815ce950
parentmissing words; from Ivan Filenko <ivan dot filenko at protonmail dot com> (diff)
downloadwireguard-openbsd-3084f28507a9f61935ef47c9195949c0551a31c8.tar.xz
wireguard-openbsd-3084f28507a9f61935ef47c9195949c0551a31c8.zip
spelling; from <Alex dot Gaynor at gmail dot com>
via OpenSSL commit d47eaaf4 Mar 9 07:11:13 2018 -0500
-rw-r--r--lib/libcrypto/man/ASN1_TIME_set.310
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libcrypto/man/ASN1_TIME_set.3 b/lib/libcrypto/man/ASN1_TIME_set.3
index aa66b692f80..f9b0d0c8ae4 100644
--- a/lib/libcrypto/man/ASN1_TIME_set.3
+++ b/lib/libcrypto/man/ASN1_TIME_set.3
@@ -1,6 +1,6 @@
-.\" $OpenBSD: ASN1_TIME_set.3,v 1.11 2018/03/27 17:35:50 schwarze Exp $
-.\" OpenSSL ASN1_TIME_set.pod cf37aaa3 Aug 4 11:24:03 2017 +1000
-.\" OpenSSL ASN1_TIME_set.pod e9b77246 Jan 20 19:58:49 2017 +0100
+.\" $OpenBSD: ASN1_TIME_set.3,v 1.12 2018/03/29 20:17:44 schwarze Exp $
+.\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
+.\" selective merge up to: OpenSSL b0edda11 Mar 20 13:00:17 2018 +0000
.\"
.\" This file was written by Dr. Stephen Henson <steve@openssl.org>
.\" and Todd Short <tshort@akamai.com>.
@@ -50,7 +50,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: March 27 2018 $
+.Dd $Mdocdate: March 29 2018 $
.Dt ASN1_TIME_SET 3
.Os
.Sh NAME
@@ -214,7 +214,7 @@ may change the type from
.Vt ASN1_GENERALIZEDTIME
to
.Vt ASN1_UTCTIME
-or vise-versa depending on the resulting year.
+or vice versa depending on the resulting year.
The functions
.Fn ASN1_UTCTIME_adj
and