From: Richard Levitte <levitte@openssl.org>
Date: Thu, 6 Dec 2018 13:05:02 +0000 (+0100)
Subject: Following the license change, modify the boilerplates in doc/man5/
X-Git-Tag: openssl-3.0.0-alpha1~2769
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b1e979aeec8238ceddc20fc3f7487649fef4ca07;p=oweals%2Fopenssl.git

Following the license change, modify the boilerplates in doc/man5/

[skip ci]

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7830)
---

diff --git a/doc/man5/config.pod b/doc/man5/config.pod
index 3e110b0313..275d96c29d 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 a35b4ccfff..b8fc00ed2d 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>.