[tools] master update

[Richard Levitte]

The branch master has been updated
       via  b6beff129e2cd4c74a75cfd367056c7d8e9b1517 (commit)
      from  e4755452b7bd93c37d0d4b09ebfc7d2cb2f1f498 (commit)


- Log -----------------------------------------------------------------
commit b6beff129e2cd4c74a75cfd367056c7d8e9b1517
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Nov 13 14:34:39 2020 +0100

    release-tools/MKRELEASE.md: Add a note on suitability for OpenSSL 3.0
    
    These release tools are not suitable for OpenSSL 3.0 and on, so we add
    a note saying so.  release-tools/README.md will need to be retrofitted
    for the release method used with OpenSSL 3.0.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/tools/pull/73)

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

Summary of changes:
 release-tools/MKRELEASE.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/release-tools/MKRELEASE.md b/release-tools/MKRELEASE.md
index 04d6dc7..3c8c1e4 100644
--- a/release-tools/MKRELEASE.md
+++ b/release-tools/MKRELEASE.md
@@ -1,5 +1,10 @@
 # Documentation on the mkrelease.pl script
 
+**NOTE**: this script is unsuitable for OpenSSL 3.0 and on.  Instead, use
+the `dev/release.sh` script found in the source.  That script has a built
+in manual; `dev/release.sh --help` gives a quick usage summary, while
+`dev/release.sh --manual` displays a man-page.
+
 This file provides an overview of the mkrelease.pl script, and how to
 configure some of its parameters (by setting environment variables).
 It is normally run by following the process in README.md and should be