From: Zack Williams <zdw@users.noreply.github.com>
Date: Sat, 18 Mar 2017 01:43:53 +0000 (-0700)
Subject: "any" instead of "and"
X-Git-Tag: OpenSSL_1_1_0f~125
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=943a3ccb968f3544be4b03099ab04a400b758f11;hp=f4944142b82d557799c2a73361202a07a54fd69d;p=oweals%2Fopenssl.git

"any" instead of "and"

The "and" should be an "any"

Fixed in LibreSSL's docs: http://man.openbsd.org/man5/x509v3.cnf.5#Subject_alternative_name

CLA: trivial

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2980)
(cherry picked from commit a41815f05e71009d2a5148bd30b70f47186ed66b)
---

diff --git a/doc/apps/x509v3_config.pod b/doc/apps/x509v3_config.pod
index edfd76e125..17d9f1c3f0 100644
--- a/doc/apps/x509v3_config.pod
+++ b/doc/apps/x509v3_config.pod
@@ -167,7 +167,7 @@ registered ID: OBJECT IDENTIFIER), B<IP> (an IP address), B<dirName>
 (a distinguished name) and otherName.
 
 The email option include a special 'copy' value. This will automatically
-include and email addresses contained in the certificate subject name in
+include any email addresses contained in the certificate subject name in
 the extension.
 
 The IP address used in the B<IP> options can be in either IPv4 or IPv6 format.