[web] master update

[Matt Caswell]

The branch master has been updated
       via  9076297127056a7f2127e1040fb35bbefb7f8611 (commit)
      from  f0be824328dc1cbbe56c1adb943d180c86aa4642 (commit)


- Log -----------------------------------------------------------------
commit 9076297127056a7f2127e1040fb35bbefb7f8611
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Jun 17 11:10:58 2021 +0100

    Website updates for the 3.0 beta1 release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/web/pull/244)

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

Summary of changes:
 news/newsflash.txt | 2 ++
 source/index.html  | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/news/newsflash.txt b/news/newsflash.txt
index 6c1f2dc..cb959e3 100644
--- a/news/newsflash.txt
+++ b/news/newsflash.txt
@@ -5,6 +5,8 @@
 # headings.  URL paths must all be absolute.
 Date: Item
 
+17-Jun-2021: New Blog post: <a href="/blog/blog/2021/06/17/OpenSSL3.0ReleaseCandidate/">OpenSSL 3.0 Release Candidate</a>
+17-Jun-2021: Beta 1 of OpenSSL 3.0 is now available. This is a release candidate: please download and test it
 20-May-2021: Alpha 17 of OpenSSL 3.0 is now available: please download and test it
 06-May-2021: Alpha 16 of OpenSSL 3.0 is now available: please download and test it
 22-Apr-2021: Alpha 15 of OpenSSL 3.0 is now available: please download and test it
diff --git a/source/index.html b/source/index.html
index a45310c..bde4983 100644
--- a/source/index.html
+++ b/source/index.html
@@ -46,9 +46,12 @@
         <p>OpenSSL 3.0 is the next major version of OpenSSL that is currently
         in development and includes the new FIPS Object Module. A pre-release
         version of this is available below. This is for testing only. It should
-        not be used in production. Information and notes about OpenSSL 3.0 are
-        available on the OpenSSL
-        <a href="https://wiki.openssl.org/index.php/OpenSSL_3.0">Wiki</a></p>
+        not be used in production. For an overview of some of the key concepts
+        in OpenSSL 3.0 see the libcrypto
+        <a href="https://www.openssl.org/docs/manmaster/man7/crypto.html">manual page</a>.
+        Information and notes about migrating existing applications to OpenSSL
+        3.0 are available in the
+        <a href="https://www.openssl.org/docs/manmaster/man7/migration_guide.html">OpenSSL 3.0 Migration Guide</a></p>
 	    <table>
 	      <tr>
 		<td>KBytes </td>