[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a41815f05e71009d2a5148bd30b70f47186ed66b (commit)
      from  f5fd3848fe5033534b92d2d18ed6fbd16741a0a2 (commit)


- Log -----------------------------------------------------------------
commit a41815f05e71009d2a5148bd30b70f47186ed66b
Author: Zack Williams <zdw at users.noreply.github.com>
Date:   Fri Mar 17 18:43:53 2017 -0700

    "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 at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2980)

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

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

diff --git a/doc/man5/x509v3_config.pod b/doc/man5/x509v3_config.pod
index e78cf7d..17800ea 100644
--- a/doc/man5/x509v3_config.pod
+++ b/doc/man5/x509v3_config.pod
@@ -165,7 +165,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.