From 538ffd7dcfffc3b273e4662886c05e7a84d3eb8d Mon Sep 17 00:00:00 2001
From: "Jonathan S. Katz" <jonathan.katz@excoventures.com>
Date: Thu, 17 Oct 2019 12:19:57 +0200
Subject: [PATCH] Update the membership of the Code of Conduct Committee.

Includes biographical information of the committee members.
---
 media/css/main.css                                |   5 +
 templates/pages/about/policies/coc_committee.html | 125 +++++++++++++++++-----
 2 files changed, 106 insertions(+), 24 deletions(-)
 rewrite templates/pages/about/policies/coc_committee.html (69%)

diff --git a/media/css/main.css b/media/css/main.css
index ea8fab57..c2d4f33e 100644
--- a/media/css/main.css
+++ b/media/css/main.css
@@ -1265,6 +1265,11 @@ td.fm_unk {
   background-color: #ffffaa !important;
 }
 
+/* Code of Conduct Committee */
+table.cocc-table tbody tr td:nth-child(1) {
+  width: 20%;
+}
+
 /* Contributors */
 table.contributor-table thead tr th {
   width: 50%;
diff --git a/templates/pages/about/policies/coc_committee.html b/templates/pages/about/policies/coc_committee.html
dissimilarity index 69%
index 184e79e3..38d285f6 100644
--- a/templates/pages/about/policies/coc_committee.html
+++ b/templates/pages/about/policies/coc_committee.html
@@ -1,24 +1,101 @@
-{%extends "base/page.html"%}
-{%block title%}Code of Conduct Committee{%endblock%}
-{%block contents%}
-
-<h1>Code of Conduct Committee <i class="fas fa-users"></i></h1>
-
-<p><i>Last updated: September 14, 2018</i></p>
-
-<p>The <a href="/about/policies/coc/">Code of Conduct</a> committee consists of the
-    following people:</p>
-
-<ul>
-    <li>Stacey Haysler (Chair)</li>
-    <li>Lætitia Avrot</li>
-    <li>Vik Fearing</li>
-    <li>Jonathan Katz</li>
-    <li>Ilya Kosmodemiansky</li>
-</ul>
-
-<p>
-  You can contact the Code of Conduct Committee at
-  <a href="mailto:coc@postgresql.org">coc@postgresql.org</a>.
-</p>
-{%endblock%}
+{%extends "base/page.html"%}
+{%block title%}Code of Conduct Committee{%endblock%}
+{%block contents%}
+
+<h1>Code of Conduct Committee <i class="fas fa-users"></i></h1>
+
+<p><i>Last updated: October 17, 2019</i></p>
+
+<h3>Contact</h3>
+
+<p>
+  You can contact the <a href="/about/policies/coc/">Code of Conduct</a>
+  Committee at <a href="mailto:coc@postgresql.org">coc@postgresql.org</a>.
+</p>
+
+<h3>Current Members</h3>
+
+<table class="table table-striped cocc-table">
+  <tbody>
+     <tr>
+      <td>Stacey Haysler (Chair)</td>
+      <td>
+        Stacey Haysler is the CFO and COO of PostgreSQL Experts, Inc., in
+        Alameda, California. She is a PostgreSQL Global Development Group
+        Contributor, and is also a principal organizer of the San Francisco
+        PostgreSQL Users’ Group and PgDay San Francisco.
+      </td>
+     </tr>
+     <tr>
+      <td>Carole Arnaud</td>
+      <td>
+        Carole Arnaud is an executive board member of Dalibo and team manager.
+        She lives in Nantes, France. She was part of the PGDay France committee
+        from 2015 to 2018, and has been co-organizer of pgDay Paris since 2018.
+      </td>
+     </tr>
+     <tr>
+      <td>Ilya Kosmodemiansky</td>
+      <td>
+        Ilya Kosmodemiansky is a CEO and co-founder at Data Egret, lives in
+        Saarbruecken, Germany. He is a co-organizer of usergroups and meetups
+        (PostgreSQL User group Frankfurt-am-Main, DevOpsSaar meetup) and part of
+        the organization team of several conferences (PGConf.EU, FOSDEM PGDay,
+        PGDay.Russia). He is also a member of the Sponsorship Committee of
+        PostgreSQL Project.
+      </td>
+     </tr>
+     <tr>
+      <td>Jonathan Katz</td>
+      <td>
+        Jonathan S. Katz is the Director of Cloud Engineering & Growth at
+        Crunchy Data, and lives in New York. He is a PostgreSQL Global
+        Development Group Major Contributor focused on advocacy, the website,
+        and releases, and also serves on the board of the United States
+        PostgreSQL Association.
+      </td>
+     </tr>
+     <tr>
+      <td>Umair Shahid</td>
+      <td>
+        Umair Shahid heads Marketing & Products for 2ndQuadrant and is based in
+        Islamabad, Pakistan. He serves as a member of PgUS User Group committee
+        along with being the organizer for Islamabad and Dubai PostgreSQL Users'
+        Groups. As part of his day job, he organizes the annual PostgresLondon
+        event.
+      </td>
+     </tr>
+  </tbody>
+</table>
+
+<h3>Past Members</h3>
+
+<table class="table table-striped cocc-table">
+  <tbody>
+     <tr>
+      <td>Laetitia Avrot</td>
+      <td>
+        Laetitia Avrot is a Consultant Database for EnterpriseDB and lives in
+        France, near Lyon. She is one of the Postgres Women Co-Founder and also
+        an organizer of the Postgres Lyon User Group.
+      </td>
+     </tr>
+     <tr>
+      <td>Vik Fearing</td>
+      <td>
+        Vik Fearing is a consultant and trainer for 2ndQuadrant France, and
+        lives in Paris, France. He has been in the PostgreSQL community since
+        2008 and is the founder and co-organizer of pgDay Paris, co-organizer of
+        PostgreSQL Conference Europe, and a volunteer and speaker at many other
+        conferences around the world. He is also a moderator for several of the
+        PostgreSQL mailing lists as well as an IRC channel operator for
+        #postgresql and #postgresqlfr. He is an inaugural member of the
+        Community Code of Coduct Committee and part of the team behind the
+        @PostgreSQL Twitter account. In his spare time, he likes to write minor
+        patches to the PostgreSQL codebase.
+      </td>
+     </tr>
+  </tbody>
+</table>
+
+{%endblock%}
-- 
2.11.4.GIT