[openssl-commits] [web] master update

[Richard Levitte]

The branch master has been updated
       via  2377ab72410b9c117e9a88cecbad83c6a2827220 (commit)
       via  e9ab2edffc56f8a840347ef7c35cc55cc6879744 (commit)
      from  e56baa71b5cc8028e08e8a3027ea9ecf3f27dbd0 (commit)


- Log -----------------------------------------------------------------
commit 2377ab72410b9c117e9a88cecbad83c6a2827220
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Feb 11 20:49:51 2019 +0100

    Make a general rule for converting markdown to html5
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/114)

commit e9ab2edffc56f8a840347ef7c35cc55cc6879744
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Feb 11 20:49:13 2019 +0100

    Publish  the Strategic Architecture and 3.0.0 Design (draft) documents
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/114)

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

Summary of changes:
 Makefile           | 13 ++++++-------
 docs/index.html    | 11 ++++++++++-
 news/newsflash.txt |  2 ++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index a8dbae6..37ffb75 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,12 @@ SRCLISTS = \
 	   source/old/fips/index.inc \
 
 
+.SUFFIXES: .md .html
+
+.md.html:
+	@rm -f $@
+	./bin/md-to-html5 $<
+
 all: suball manmaster mancross
 
 suball: $(SIMPLE) $(SRCLISTS)
@@ -108,13 +114,6 @@ docs/fips.inc: $(wildcard docs/fips/*) bin/mk-filelist
 	@rm -f $@
 	./bin/mk-filelist docs/fips fips/ '*' >$@
 
-docs/OpenSSLStrategicArchitecture.html: docs/OpenSSLStrategicArchitecture.md
-	@rm -f $@
-	./bin/md-to-html5 $<
-docs/OpenSSL300Design.html: docs/OpenSSL300Design.md
-	@rm -f $@
-	./bin/md-to-html5 $<
-
 news/changelog.inc: news/changelog.txt bin/mk-changelog
 	@rm -f $@
 	./bin/mk-changelog <news/changelog.txt >$@
diff --git a/docs/index.html b/docs/index.html
index 7fcbc9a..1279b6d 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -11,6 +11,15 @@
 	<article>
 	  <header><h2>Documentation<h2></header>
 	  <div class="entry-content">
+	    <p>
+	      We have a
+	      <a href="OpenSSLStrategicArchitecture.html">Strategic
+	      Architecture</a> for the development of OpenSSL from
+	      3.0.0 and going forward, as well as a
+	      <a href="OpenSSL300Design.html">design for 3.0.0 (draft)</a>
+	      specifically.
+	    </p>
+
 	    <p>The
 	    <a href="faq.html">frequently-asked questions (FAQ)</a>
             is available.  So is an incomplete list of
@@ -37,7 +46,7 @@
 	    It is highly recommended.
 	    </p>
 	  </div>
-	  <footer>
+q	  <footer>
 	    You are here: <a href="/">Home</a>
 	    : <a href=".">Documentation</a>
 	    <br/><a href="/sitemap.txt">Sitemap</a>
diff --git a/news/newsflash.txt b/news/newsflash.txt
index 07229f2..d5d6e56 100644
--- a/news/newsflash.txt
+++ b/news/newsflash.txt
@@ -4,6 +4,8 @@
 # Format is two fields, colon-separated; the first line is the column
 # headings.  URL paths must all be absolute.
 Date: Item
+11-Feb-2019: <a href="/docs/OpenSSL300Design.html">3.0.0 Design (draft)</a> is now available
+11-Feb-2019: <a href="/docs/OpenSSLStrategicArchiteture.html">Strategic Architecture</a> for OpenSSL 3.0.0 and beyond is now available
 20-Nov-2018: OpenSSL 1.1.1a is now available, including bug and security fixes
 20-Nov-2018: OpenSSL 1.1.0j is now available, including bug and security fixes
 20-Nov-2018: OpenSSL 1.0.2q is now available, including bug and security fixes