The branch master has been updated
via 0f13e11e18c095b1880821007c06719808ce1360 (commit)
via 5fbd49f0e4457fdae7e5c09a263792f97353c759 (commit)
via cea049657a3078c9cde30101ec0aef24169642c5 (commit)
from 8930b3a506ef2147a434448fc21429c1d3e8027d (commit)
- Log -----------------------------------------------------------------
commit 0f13e11e18c095b1880821007c06719808ce1360
Merge: 8930b3a 5fbd49f
Author: Mark J. Cox <m...@openssl.org>
Date: Mon Nov 11 12:35:06 2019 +0000
Merge pull request #140 from iamamoose/sponsorship
Sync the OSF sponsorship page with the current sponsors
commit 5fbd49f0e4457fdae7e5c09a263792f97353c759
Author: Mark J. Cox <m...@awe.com>
Date: Mon Nov 11 12:13:54 2019 +0000
Better grammar for where the support goes
commit cea049657a3078c9cde30101ec0aef24169642c5
Author: Mark J. Cox <m...@awe.com>
Date: Mon Nov 11 11:47:41 2019 +0000
Update the sponsorship page to be current with the list of OSF
sponsors. Add a bronze level and the current sponsors at that level.
Add a link to the 'in kind' thanks page.
-----------------------------------------------------------------------
Summary of changes:
support/acks.html | 76 ++++++++++++++++++++++++++++++--------------------
support/donations.html | 3 ++
2 files changed, 49 insertions(+), 30 deletions(-)
diff --git a/support/acks.html b/support/acks.html
index eea4919..1f5714c 100644
--- a/support/acks.html
+++ b/support/acks.html
@@ -7,19 +7,19 @@
<div id="content">
<div class="blog-index">
<article>
- <header><h2>Sponsor Acknowledgements</h2></header>
+ <header><h2>Acknowledgements</h2></header>
<div class="entry-content">
<p>The OpenSSL project depends on volunteer efforts and financial
support from the end user community. That support comes
in <a href="donations.html">many forms.</a>
- <p>We would like to identify and thank the following such sponsors
- for their significant support of the OpenSSL project. Sponsors are
- listed alphabetically within categories. Please note that we ask
- permission to identify sponsors and that some sponsors we consider
- eligible for inclusion here have requested to remain anonymous.</p>
+ <h3 id="current">Sponsorship Donations</h3>
- <h3 id="current">Current Sponsors:</h3>
+
+ <p>We would like to identify and thank the following sponsors
+ for their donations which give significant support to the OpenSSL
project.
+ Please note some sponsors remain anonymous.</p>
+ <hr noshade size=1>
<style type="text/css">
.sponsorlogo {
@@ -37,44 +37,60 @@
text-align: center !important;
}
</style>
-
- <hr noshade size=1>
- <p>Exceptional support:</p>
+
+ <h4>Exceptional:</h4>
<div class="sponsorsection">
- <a href="https://www.akamai.com/";><img src="/img/akamai-logo-med.png"
- alt="" class="sponsorlogo"></a>
<a href="https://www.smartisan.com/";><img
src="/img/smartisan-logo-med.png"
alt="" class="sponsorlogo"></a>
</div>
- <p></p>
- <hr noshade size=1>
- <p>Platinum support:</p>
+ <h4>Platinum:</h4>
<div class="sponsorsection">
- <a href="https://www.bluecedar.com/";><img
src="/img/bluecedar-logo-med.png"
- alt="" class="sponsorlogo"></a>
<a href="https://www.huawei.com/";><img src="/img/huawei-logo-med.jpg"
alt="" class="sponsorlogo"></a>
- <a href="https://www.netapp.com/";><img src="/img/netapp-logo-med.jpg"
- alt="" class="sponsorlogo"></a>
- <a href="https://www.oracle.com/";><img src="/img/oracle-logo-med.jpg"
- alt="" class="sponsorlogo"></a>
- <a href="https://www.vmware.com/";><img src="/img/vmware-logo-med.jpg"
- alt="" class="sponsorlogo"></a>
</div>
-<!-- <hr noshade size=1>
- <p>Gold support:</p>
-
- <hr noshade size=1>
- <p>Silver support:</p>
- -->
+ <h4>Bronze:</h4>
+ <div class="sponsorsection">
+ <p><a href="https://cargurus.com/";>CarGurus</a></p>
+ </div>
+ <h4>Past sponsors include:</h4>
+ <dl>
+ <dd>2018: <a href="https://www.akamai.com/";>Akamai</a>,
+ <a href="https://www.bluecedar.com/";>Blue Cedar</a>,
+ <a href="https://www.handshake.org/";>Handshake</a>,
+ <a href="https://www.huawei.com/";>Huawei</a>,
+ <a href="https://levchinprize.com/";>Levchin Prize</a>,
+ <a href="https://www.netapp.com/";>NetApp</a>,
+ <a href="https://www.smartisan.com/";>Smartisan</a>,
+ and
+ <a href="https://vmware.com/";>VMWare</a>.
+ </dd>
+ <dd>2017: <a href="https://www.akamai.com/";>Akamai</a>,
+ <a href="https://www.huawei.com/";>Huawei</a>,
+ <a href="https://www.oracle.com/";>Oracle</a>,
+ and
+ <a href="https://www.smartisan.com/";>Smartisan</a>.
+ </dd>
+ <dd>2016: <a href="https://www.huawei.com/";>Huawei</a>,
+ <a href="https://www.coreinfrastructure.org/";>Linux Foundation
+ Core Infrastructure Initiative</a>,
+ and
+ <a href="https://www.smartisan.com/";>Smartisan</a>.
+ </dd>
+ </dl>
<p></p>
<hr noshade size=1>
-
+ <h3>Other Donations</h3>
+ <div class="entry-content">
+ <p>
+ We also identify and thank organizations who contribute
+ <a href="/community/thanks.html"> in-kind donations to the
project</a>.
+ </p>
+ </div>
</div>
<footer>
diff --git a/support/donations.html b/support/donations.html
index 1e6d56e..731ac19 100644
--- a/support/donations.html
+++ b/support/donations.html
@@ -48,6 +48,9 @@
<tr><td>Silver<br>$10,000/yr</td>
<td>Acknowledgement on openssl.org</td></tr>
+ <tr><td>Bronze<br>$5,000/yr</td>
+ <td>Acknowledgement on openssl.org</td></tr>
+
</table>
<p> </p>
