[web] master update

[Matt Caswell]

The branch master has been updated
       via  d94a44ca1bb6183e692c86a5fe99b4f7bf2f28c0 (commit)
      from  70947eca9c26af584ac69467a6f5fcd1a2fa6b5a (commit)


- Log -----------------------------------------------------------------
commit d94a44ca1bb6183e692c86a5fe99b4f7bf2f28c0
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Dec 16 11:39:44 2019 +0000

    Drop 1.1.0 as a current release
    
    Don't refer to 1.1.0 as a current release since it is no longer supported.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/web/pull/147)

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

Summary of changes:
 Makefile          |  8 ++++----
 source/index.html | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 49b9845..82ffca8 100644
--- a/Makefile
+++ b/Makefile
@@ -17,14 +17,14 @@ RELEASEDIR = /var/www/openssl/source
 ##
 
 ##  Current series
-SERIES=1.1.1 1.1.0 1.0.2
+SERIES=1.1.1 1.0.2
 ##  Older series.  The second type is for source listings
-OLDSERIES=1.0.1 1.0.0 0.9.8 0.9.7 0.9.6
-OLDSERIES2=1.0.1 1.0.0 0.9.x
+OLDSERIES=1.1.0 1.0.1 1.0.0 0.9.8 0.9.7 0.9.6
+OLDSERIES2=1.1.0 1.0.1 1.0.0 0.9.x
 ##  Current series with newer and older manpage layout
 ##  (when the number of old man layout releases drop to none, this goes away)
 NEWMANSERIES=1.1.1
-OLDMANSERIES=1.1.0 1.0.2
+OLDMANSERIES=1.0.2
 
 # All simple generated files.
 SIMPLE = newsflash.inc sitemap.txt \
diff --git a/source/index.html b/source/index.html
index 605c009..122336a 100644
--- a/source/index.html
+++ b/source/index.html
@@ -34,11 +34,12 @@
         also our Long Term Support (LTS) version, supported until 11th September
         2023. Our previous LTS version (1.0.2 series) will continue to be
         supported until 31st December 2019 (security fixes only during the last
-        year of support). The 1.1.0 series is currently only receiving security
-        fixes and will go out of support on 11th September 2019. All users of
-        1.0.2 and 1.1.0 are encouraged to upgrade to 1.1.1 as soon as possible.
-        The 0.9.8, 1.0.0 and 1.0.1 versions are now out of support and should
-        not be used.</p>
+        year of support). All users of 1.0.2 are encouraged to upgrade to 1.1.1
+        as soon as possible. Extended support for 1.0.2 to gain access to
+        security fixes beyond 31st December 2019 is
+        <a href="/support/contracts.html">available</a>.
+        The 0.9.8, 1.0.0, 1.0.1 and 1.1.0 versions are now out of support and
+        should not be used.</p>
 
         <p>The OpenSSL FIPS Object Module 2.0 (FOM) is also available for
         download. It is no longer receiving updates. It must be used in