[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  b1e979aeec8238ceddc20fc3f7487649fef4ca07 (commit)
      from  4746f25ac62e5bbdc07eedcec9c9a27547577141 (commit)


- Log -----------------------------------------------------------------
commit b1e979aeec8238ceddc20fc3f7487649fef4ca07
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Dec 6 14:05:02 2018 +0100

    Following the license change, modify the boilerplates in doc/man5/
    
    [skip ci]
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7830)

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

Summary of changes:
 doc/man5/config.pod        | 2 +-
 doc/man5/x509v3_config.pod | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/man5/config.pod b/doc/man5/config.pod
index 3e110b0..275d96c 100644
--- a/doc/man5/config.pod
+++ b/doc/man5/config.pod
@@ -421,7 +421,7 @@ L<x509(1)>, L<req(1)>, L<ca(1)>
 
 Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
 
-Licensed under the OpenSSL license (the "License").  You may not use
+Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
 in the file LICENSE in the source distribution or at
 L<https://www.openssl.org/source/license.html>.
diff --git a/doc/man5/x509v3_config.pod b/doc/man5/x509v3_config.pod
index a35b4cc..b8fc00e 100644
--- a/doc/man5/x509v3_config.pod
+++ b/doc/man5/x509v3_config.pod
@@ -537,7 +537,7 @@ L<ASN1_generate_nconf(3)>
 
 Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved.
 
-Licensed under the OpenSSL license (the "License").  You may not use
+Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
 in the file LICENSE in the source distribution or at
 L<https://www.openssl.org/source/license.html>.