[openssl-commits] [web] master update
Rich Salz
rsalz at openssl.org
Wed May 31 14:33:43 UTC 2017
The branch master has been updated
via 2b82c36c59e0188cf28eac8fa2984c80bb9f7aec (commit)
from a1274c5acd18ea042c0066fae3fb6075ae82bc88 (commit)
- Log -----------------------------------------------------------------
commit 2b82c36c59e0188cf28eac8fa2984c80bb9f7aec
Author: Rich Salz <rsalz at akamai.com>
Date: Wed May 31 09:33:52 2017 -0400
Re-org to replace "team" with "omc"
Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/web/pull/7)
-----------------------------------------------------------------------
Summary of changes:
community/conduct.html | 6 +++---
community/index.html | 4 +---
community/{team.html => omc.html} | 11 +++++------
community/sidebar.shtml | 2 +-
docs/faq.txt | 10 +++++-----
news/vulnerabilities.html | 2 +-
policies/bylaws.html | 2 +-
policies/index.html | 13 ++++++++-----
source/index.html | 4 ++--
9 files changed, 27 insertions(+), 27 deletions(-)
rename community/{team.html => omc.html} (95%)
diff --git a/community/conduct.html b/community/conduct.html
index e0bea4f..1b04ef0 100644
--- a/community/conduct.html
+++ b/community/conduct.html
@@ -16,9 +16,9 @@
<p>The OpenSSL community consists primarily, although not solely, of
its online presence in mailing lists and activities such as the blog
postings and comments, the GitHub repository, and so on. These
- outlets are managed by the OpenSSL development team, whose members
- are listed here:
- <a href="team.html">https://www.openssl.org/community/team.html</a>
+ outlets are managed by the OpenSSL Management Committee, whose
+ members are listed here:
+ <a href="omc.html">https://www.openssl.org/community/omc.html</a>
</p>
<p>We strive to be an open and inclusive community where anyone can
diff --git a/community/index.html b/community/index.html
index ea44745..33881f2 100644
--- a/community/index.html
+++ b/community/index.html
@@ -17,9 +17,7 @@
</p>
<p>Here are some of the ways you can join the
community and contribute.
- The list of <a href="team.html">development team members</a> is
- available, as is a description of how to
- <a href="contacts.html">contact us</a> off-line. We'd also like
+ We'd also like
to <a href="thanks.html">thank</a> several groups for help with
the project infrastructure over time.
</p>
diff --git a/community/team.html b/community/omc.html
similarity index 95%
rename from community/team.html
rename to community/omc.html
index adde487..9dbf001 100644
--- a/community/team.html
+++ b/community/omc.html
@@ -12,14 +12,13 @@
<header><h2>Team</h2></header>
<div class="entry-content">
<p>
- The OpenSSL development team consists of people who have commit
- access to the source repository.
- Policies and procedures are adopted after a majority vote of
- the dev-team.
+ The
+ <a href="/policies/bylaws.html#OMC">OpenSSL Management Committee</a>
+ represents the official voice of the project. All official
+ OMC decisions are taken on the basis of a vote.</p>
<p>
- The current OpenSSL development team consists of (in alphabetical
- order):
+ The current OMC consists of (in alphabetical order):
</p>
<table summary="">
<tr>
diff --git a/community/sidebar.shtml b/community/sidebar.shtml
index bbbe84b..4b418e4 100644
--- a/community/sidebar.shtml
+++ b/community/sidebar.shtml
@@ -7,7 +7,7 @@
<a href="conduct.html">Code of Conduct</a>
</li>
<li>
- <a href="team.html">Team</a>
+ <a href="omc.html">OpenSSL Management Committee</a>
</li>
<li>
<a href="contacts.html">Contact Us</a>
diff --git a/docs/faq.txt b/docs/faq.txt
index 6caa5e3..172eb43 100644
--- a/docs/faq.txt
+++ b/docs/faq.txt
@@ -168,9 +168,9 @@ For example, one of the following might work on your system:
sha1sum TARBALL | awk '{print $1;}' | cmp - TARBALL.sha1
sha256sum TARBALL | awk '{print $1;}' | cmp - TARBALL.sha256
-You can check authenticity using pgp or gpg. You need the OpenSSL team
-member public key used to sign it (download it from a key server, see a
-list of keys at <URL: https://www.openssl.org/community/team.html>). Then
+You can check authenticity using pgp or gpg. You need the OpenSSL OMC
+member public key used to sign it (download it from a key server or see a
+list of keys at <URL: https://www.openssl.org/community/omc.html>). Then
just do:
pgp TARBALL.asc
@@ -762,8 +762,8 @@ If you think your bug has security implications then please send it to
openssl-security at openssl.org if you don't get a prompt reply at least
acknowledging receipt then resend or mail it directly to one of the
more active team members (e.g. Steve). If you wish to use PGP to send
-in a report please use one or more of the keys of the team members listed
-at <URL: https://www.openssl.org/community/team.html>
+in a report please use one or more of the keys of the OMC listed
+at <URL: https://www.openssl.org/community/omc.html>
Note that bugs only present in the openssl utility are not in general
considered to be security issues.
diff --git a/news/vulnerabilities.html b/news/vulnerabilities.html
index 508cc32..dc73d6f 100644
--- a/news/vulnerabilities.html
+++ b/news/vulnerabilities.html
@@ -18,7 +18,7 @@
If you want to encrypt the mail, you can use our
team's <a href="pgpkey.html">PGP Key</a>. Or you can
send mail to one or more individual <a
- href="/community/team.html">Team Members</a>,
+ href="/community/omc.html">OMC Members</a>,
encrypted or plaintext.
We will work with you to assess and fix the flaw,
as discussed in our
diff --git a/policies/bylaws.html b/policies/bylaws.html
index bda93de..471b4fa 100644
--- a/policies/bylaws.html
+++ b/policies/bylaws.html
@@ -63,7 +63,7 @@
quarter. This rule does not apply if the committer first received
their commit access during the previous calendar quarter.</p>
- <h3>OpenSSL Management Committee (OMC)</h3>
+ <h3><a name="OMC">OpenSSL Management Committee (OMC)</a></h3>
<p>The OMC represents the official voice of the project. All official
OMC decisions are taken on the basis of a vote.</p>
diff --git a/policies/index.html b/policies/index.html
index 855a474..5c752cb 100644
--- a/policies/index.html
+++ b/policies/index.html
@@ -50,12 +50,15 @@
</p>
<p>
The OpenSSL project is managed by the OpenSSL Management Committee
- (OMC). The OMC works in accordance with the project bylaws which are
- available <a href="bylaws.html">here</a>. The OpenSSL project is
+ (OMC), as defined by the <a href="bylaws.html">project bylaws</a>.
+ </p>
+ <p>
+ The OpenSSL project is
represented in legal and most official formal capacities by the
- OpenSSL Software Foundation, a Delaware (US) non-profit corporation.
- Signing one of our CLA's grants certain rights to OSF. The OSF is
- operated according to its own <a href="osf-bylaws.pdf">by-laws</a>.
+ OpenSSL Software Foundation, a Delaware (US) non-profit corporation
+ which has its own <a href="osf-bylaws.pdf">bylaws</a> as a legal
+ document.
+ Signing one of our CLA's grants certain rights to OSF.
</p>
<p>
We are pleased to mention that
diff --git a/source/index.html b/source/index.html
index 63dd60f..c9e6351 100644
--- a/source/index.html
+++ b/source/index.html
@@ -50,8 +50,8 @@
found <a href="/docs/faq.html">online</a>.</p>
<p>PGP keys for the signatures are available from the
- <a href="https://www.openssl.org/community/team.html">team page</a>.
- Current team members that sign releases include Richard Levitte, Stephen
+ <a href="https://www.openssl.org/community/omc.html">OMC page</a>.
+ Current members that sign releases include Richard Levitte, Stephen
Henson and Matt Caswell.
<p>
More information about the openssl-commits
mailing list