projects / openssl-web.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f26e81f)
Create an OTC page on the website
authorMatt Caswell <matt@openssl.org>
Fri, 3 Jan 2020 14:57:25 +0000 (14:57 +0000)
committerMatt Caswell <matt@openssl.org>
Fri, 3 Jan 2020 15:10:23 +0000 (15:10 +0000)
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/web/pull/152)

.gitignore patch | blob | history
Makefile patch | blob | history
community/index.html patch | blob | history
community/otc.html [new file with mode: 0644] patch | blob
community/sidebar.shtml patch | blob | history

diff --git a/.gitignore b/.gitignore
index b307d340a01c0be679c352428d80edfb5170d144..83f4641a6489e838c81412ac539e2aff11e8a51d 100644 (file)
--- 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 82ffca81e3ed8c2c2546167dd002506980d25858..98ddd9f4682c4aaa27fd46b5efbf1bddefd4e51e 100644 (file)
--- 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 e204c4b174fa796d4f5d3f9422c8072751ad015e..72587ad1f473da8a3d94c0e7aaa9cfc5e078099d 100644 (file)
--- 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 (file)
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 22d5ca0842ae8745ba2223b8d163c05d719b7c8d..1f888d0a5d291a52713d5a6855ea0d46f3d2087a 100644 (file)
--- 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>
Unnamed repository; edit this file 'description' to name the repository.