[web] master update

Fri Jan 3 15:10:43 UTC 2020

The branch master has been updated
       via  76f3aa014bf5bf3cf533cf9a0b51951dbd64e8a5 (commit)
      from  f26e81f977a239116ab29fab62b4ed875d9099bc (commit)


- Log -----------------------------------------------------------------
commit 76f3aa014bf5bf3cf533cf9a0b51951dbd64e8a5
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jan 3 14:57:25 2020 +0000

    Create an OTC page on the website
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/web/pull/152)

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

Summary of changes:
 .gitignore              |  1 +
 Makefile                |  6 ++++--
 community/index.html    |  2 ++
 community/otc.html      | 42 ++++++++++++++++++++++++++++++++++++++++++
 community/sidebar.shtml |  3 +++
 5 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 community/otc.html

diff --git a/.gitignore b/.gitignore
index b307d34..83f4641 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ blog
 sitemap.txt
 community/committers.inc
 community/omc-alumni.inc
+community/otc.inc
 community/omc.inc
 docs/OpenSSL300Design.html
 docs/OpenSSLStrategicArchitecture.html
diff --git a/Makefile b/Makefile
index 82ffca8..98ddd9f 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ OLDMANSERIES=1.0.2
 # All simple generated files.
 SIMPLE = newsflash.inc sitemap.txt \
 	 community/committers.inc \
-	 community/omc.inc community/omc-alumni.inc \
+	 community/otc.inc community/omc.inc community/omc-alumni.inc \
 	 docs/faq.inc docs/fips.inc \
 	 docs/OpenSSLStrategicArchitecture.html \
 	 docs/OpenSSL300Design.html \
@@ -153,7 +153,7 @@ docs/manpages.html: docs/manpages.html.tt
 ##
 ##  $(SIMPLE) -- SIMPLE GENERATED FILES
 ##
-.PHONY: sitemap community/committers.inc community/omc.inc community/omc-alumni.inc
+.PHONY: sitemap community/committers.inc community/otc.inc community/omc.inc community/omc-alumni.inc
 newsflash.inc: news/newsflash.inc
 	@rm -f $@
 	head -7 $? >$@
@@ -167,6 +167,8 @@ community/committers.inc:
 	./bin/mk-committers <Members >$@
 	@rm -f Members
 
+community/otc.inc:
+	./bin/mk-omc -n -t 'OTC Members' otc otc-inactive > $@
 community/omc.inc:
 	./bin/mk-omc -n -e -l -p -t 'OMC Members' omc omc-inactive > $@
 community/omc-alumni.inc:
diff --git a/community/index.html b/community/index.html
index e204c4b..72587ad 100644
--- a/community/index.html
+++ b/community/index.html
@@ -16,6 +16,8 @@
             <a href="committers.html">team of committers</a>.
             The overall project is run by the
             <a href="omc.html">OpenSSL Management Committee</a>.
+            Technical decisions are made by the
+            <a href="otc.html">OpenSSL Technical Committee</a>.
             We operate under a set of
             <a href="/policies/omc-bylaws.html">project bylaws</a>
             and ask everyone to follow our
diff --git a/community/otc.html b/community/otc.html
new file mode 100644
index 0000000..19f9f54
--- /dev/null
+++ b/community/otc.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html lang="en">
+<!--#include virtual="/inc/head.shtml" -->
+
+<body>
+<!--#include virtual="/inc/banner.shtml" -->
+
+<div id="main">
+  <div id="content">
+    <div class="blog-index">
+      <article>
+        <header><h2>OpenSSL Technical Committee</h2></header>
+        <div class="entry-content">
+          <p> The
+              <a href="/policies/omc-bylaws.html#OTC">OpenSSL Technical Committee</a>
+              represents the official technical voice of the project. All
+              OTC decisions are taken on the basis of a vote.</p>
+          <p>
+          The current OTC consists of (in alphabetical order):
+          </p>
+
+          <!--#include virtual="otc.inc" -->
+
+          Names with an (I) are currently inactive as defined in our
+          <a href="/policies/omc-bylaws.html">bylaws</a>.
+
+        </div>
+
+        <footer>
+          You are here: <a href="/">Home</a>
+          : <a href=".">Community</a>
+          : <a href="">OTC</a>
+          <br/><a href="/sitemap.txt">Sitemap</a>
+        </footer>
+      </article>
+    </div>
+    <!--#include virtual="sidebar.shtml" -->
+  </div>
+</div>
+<!--#include virtual="/inc/footer.shtml" -->
+</body>
+</html>
diff --git a/community/sidebar.shtml b/community/sidebar.shtml
index 22d5ca0..1f888d0 100644
--- a/community/sidebar.shtml
+++ b/community/sidebar.shtml
@@ -6,6 +6,9 @@
       <li>
 	  <a href="committers.html">List of Committers</a>
       </li>
+      <li>
+	  <a href="otc.html">OpenSSL Technical Committee</a>
+      </li>
       <li>
 	  <a href="omc.html">OpenSSL Management Committee</a>
       </li>
