From 9e0a9c33ddfc01a21cd9d4da29362983fef007a1 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Mon, 12 Jan 2015 11:28:11 +0100
Subject: [PATCH] Bug 7143: Release team 3.20

Updated the release team with the roles for 3.20 pages on the wiki and
checked with the votes on the IRC meeting log.
Simplified the section on Former release team members by moving that
information (in a compressed format) to the Developers section.
If someone had a role for multiple releases, I used constructs as 3.X.
Sorted the Additional thanks-section.

Signed-off-by: Justin <justinvos@live.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |  100 +++++++++-------------
 1 file changed, 39 insertions(+), 61 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 1d62c9b..ad096f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -224,23 +224,22 @@
                 <li><a href="http://www.ashs.school.nz/">Albany Senior High School</a>, Auckland, New Zealand (OPAC 'star-ratings' sponsorship)</li>
             </ul>
 
-            <h2>Koha 3.18 release team</h2>
+            <h2>Koha 3.20 release team</h2>
             <ul>
                 <li><strong>Release manager:</strong>
                     <a href="https://www.openhub.net/p/koha/contributors/6618544730094">Tomás Cohen Arazi</a></li>
                 <li><strong>Quality assurance manager:</strong>
                     <a href="https://www.openhub.net/p/koha/contributors/6618544670742">Katrin Fischer</a></li>
-                <li><strong>Documentation manager:</strong>
+                <li><strong>(Database) Documentation manager:</strong>
                     <a href="https://www.openhub.net/p/koha/contributors/6618544646984">Nicole C. Engard</a></li>
                 <li><strong>Translation manager:</strong>
                     <a href="https://www.openhub.net/p/koha/contributors/6618544839606">Bernardo González Kriegel</a></li>
                 <li><strong>Quality assurance team:</strong>
                     <ul>
-                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544614260">Galen Charlton</a></li>
+                        <li>Christopher Brannon</li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6618545125093">Jonathan Druart</a></li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6618544661344">Brendan Gallagher</a></li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6620692261494">Kyle Hall</a></li>
-                        <li><a href="https://www.openhub.net/p/koha/contributors/6620692419690">Julian Maurice</a></li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6618544612249">Paul Poulain</a></li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6618544785220">Martin Renvoize</a></li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6618544727712">Marcel de Rooy</a></li>
@@ -248,49 +247,20 @@
                 </li>
                 <li><strong>Release maintainers:</strong>
                     <ul>
-                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544614260">Galen Charlton</a> (3.16)</li>
+                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544609030">Chris Cormack</a> (3.18)</li>
+                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544618401">Mason James</a> (3.16)</li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6620692831733">Fridolin Somers</a> (3.14)</li>
-                        <li><a href="https://www.openhub.net/p/koha/contributors/6620692261494">Kyle Hall</a> (3.12)</li>
                     </ul>
                 </li>
                 <li><strong>Packaging manager:</strong>
                     <a href="https://www.openhub.net/p/koha/contributors/6618544619438">Robin Sheat</a></li>
-                <li><strong>Database documentation manager:</strong>
-                    <a href="https://www.openhub.net/p/koha/contributors/6620692234485">Zeno Tajoli</a></li>
                 <li><strong>Bug wranglers:</strong>
                     <ul>
-                        <li>Alex Sassmannshausen</li>
-                        <li><a href="https://www.openhub.net/p/koha/contributors/6620692234485">Zeno Tajoli</a></li>
+                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544677502">Magnus Enger</a></li>
                     </ul>
                 </li>
             </ul>
 
-            <h2>Former Koha release team members</h2>
-            <ul>
-               <li>D Ruth Bavousett (3.12 Translation Manager)</li>
-               <li>Jared Camins-Esakov (3.6 Release Maintainer, 3.12 Release Manager)</li>
-               <li>Colin Campbell (3.4 QA Manager)</li>
-               <li><a href="https://www.openhub.net/p/koha/contributors/6618544614260">Galen Charlton</a> (3.2, 3.14, 3.16 Release Manager)</li>
-               <li><a href="https://www.openhub.net/p/koha/contributors/6618544730094">Tomás Cohen Arazi</a> (3.12 Release Maintainer)</li>
-               <li><a href="https://www.openhub.net/p/koha/contributors/6618544609030">Chris Cormack</a> (1.x, 3.4, 3.6 Release Manager, 3.2 Translation Manager, 3.8, 3.10 Release Maintainer)</li>
-               <li><a href="https://www.openhub.net/p/koha/contributors/6620692210484">Frédéric Demians</a> (3.4, 3.6, 3.8, 3.10 Translation Manager)</li>
-               <li><a href="https://www.openhub.net/p/koha/contributors/6618544646984">Nicole C. Engard</a> (3.x Documentation Manager)</li>
-               <li><a href="https://www.openhub.net/p/koha/contributors/6618544609053">Joshua Ferraro</a> (3.0 Release Manager &amp; Translation Manager)</li>
-               <li>Katrin Fischer (3.12, 3.14, 3.16 QA Manager)</li>
-               <li>Christopher Hall (3.8 Release Maintainer)</li>
-               <li>Kyle Hall (3.8 Release Maintainer)</li>
-               <li>Rachel Hamilton-Williams (Kaitiaki from 2004 to present)</li>
-               <li><a href="https://www.openhub.net/p/koha/contributors/6618544839606">Bernardo González Kriegel</a> (3.14, 3.16 Translation Manager, 3.10 Release Maintainer)</li>
-               <li><a href="https://www.openhub.net/p/koha/contributors/6618544614275">Henri-Damien Laurent</a> (3.0 Release Maintainer)</li>
-               <li><a href="https://www.openhub.net/p/koha/contributors/6618544609147">Owen Leonard</a> (3.x Interface Design)</li>
-               <li><a href="https://www.openhub.net/p/koha/contributors/6618544615991">Chris Nighswonger</a> (3.2, 3.4, 3.6 Release Maintainer)</li>
-               <li><a href="https://www.openhub.net/p/koha/contributors/6618544612249">Paul Poulain</a> (2.0 Release Manager, 2.2 Release Manager/Maintainer, 3.8, 3.10 Release Manager)</li>
-               <li><a href="https://www.openhub.net/p/koha/contributors/6620692116417">MJ Ray</a> (2.0 Release Maintainer)</li>
-               <li>Liz Rea (3.6 Release Maintainer)</li>
-               <li>Fridolin Somers (3.14 Release Maintainer)</li>
-               <li>Ian Walls (3.6, 3.8, 3.10 QA Manager)</li>
-            </ul>
-
             <h2>Koha development team</h2>
             <ul>
                 <li>Jacek Ablewicz</li>
@@ -305,7 +275,7 @@
                 <li>Richard Anderson</li>
                 <li><a href="https://www.openhub.net/p/koha/contributors/6620692181851">Nahuel Angelinetti</a></li>
                 <li>Nuño López Ansótegui</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544730094">Tomás Cohen Arazi</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544730094">Tomás Cohen Arazi (3.X RM/RMt)</a></li>
                 <li><a href="https://www.openhub.net/p/koha/contributors/6620692124662">Andrew Arensburger (the small and great C4::Context module)</a></li>
                 <li>Alex Arnaud</li>
                 <li>Petter Goksoyr Asen</li>
@@ -320,7 +290,7 @@
                 <li>Daniel Barker</li>
                 <li>Greg Barniskis</li>
                 <li>Benedykt P. Barszcz (Polish for 2.0)</li>
-                <li>D Ruth Bavousett</li>
+                <li>D Ruth Bavousett (3.12 TM)</li>
                 <li>Maxime Beaulieu</li>
                 <li>Natalie Bennison</li>
                 <li>John Beppu</li>
@@ -334,8 +304,8 @@
                 <li>Ivan Brown</li>
                 <li>Roger Buck</li>
                 <li>Steven Callender</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6620692376789">Jared Camins-Esakov</a></li>
-                <li>Colin Campbell</li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6620692376789">Jared Camins-Esakov (3.X RM/RMt)</a></li>
+                <li>Colin Campbell (3.4 QAM)</li>
                 <li>Fernando Canizo</li>
                 <li>Barry Cannon</li>
                 <li>Frédérick Capovilla</li>
@@ -343,6 +313,7 @@
                 <li>Chris Catalfo (new plugin MARC editor)</li>
                 <li>Marc Chantreux</li>
                 <li>Jerome Charaoui</li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544614260">Galen Charlton (3.X RM/RMt/QAA)</a></li>
                 <li>Evonne Cheung</li>
                 <li>Andrew Chilton</li>
                 <li>Koha SAB CINECA</li>
@@ -350,6 +321,7 @@
                 <li>Garry Collum</li>
                 <li>David Cook</li>
                 <li>John Copeland</li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544609030">Chris Cormack (1.X/3.X RM/RMt/TM)</a></li>
                 <li>Jeremy Crabtree</li>
                 <li>Samuel Crosby</li>
                 <li>Christophe Croullebois</li>
@@ -361,10 +333,10 @@
                 <li>Doug Dearden</li>
                 <li>Kip DeGraaf</li>
                 <li>Stéphane Delaune</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6620692210484">Frédéric Demians</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6620692210484">Frédéric Demians (3.X TM)</a></li>
                 <li>Connor Dewar</li>
                 <li>Srikanth Dhondi</li>
-                <li>Jonathan Druart</li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618545125093">Jonathan Druart (3.X QAA)</a></li>
                 <li>Serhij Dubyk</li>
                 <li>Yohann Dufour</li>
                 <li>Thomas Dukleth (MARC Frameworks Maintenance)</li>
@@ -375,6 +347,7 @@
                 <li>Stephen Edwards</li>
                 <li>Andrew Elwell</li>
                 <li>Brian Engard</li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544646984">Nicole C. Engard (3.X DM)</a></li>
                 <li><a href="https://www.openhub.net/p/koha/contributors/6618544677502">Magnus Enger</a></li>
                 <li>Esiee School (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)</li>
                 <li>Jason Etheridge</li>
@@ -383,7 +356,8 @@
                 <li>Charles Farmer</li>
                 <li><a href="https://www.openhub.net/p/koha/contributors/6618544609865">Antoine Farnault</a></li>
                 <li>Vitor Fernandes</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544670742">Katrin Fischer</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544609053">Joshua Ferraro (3.X RM/TM)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544670742">Katrin Fischer (3.X QAM)</a></li>
                 <li>Connor Fraser</li>
                 <li>Clay Fouts</li>
                 <li>Brendon Ford</li>
@@ -391,18 +365,18 @@
                 <li>Corey Fuimaono</li>
                 <li>Marco Gaiarin</li>
                 <li>Pierrick Le Gall</li>
-                <li>Brendan A. Gallagher</li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544661344">Brendan A. Gallagher (3.X QAA)</a></li>
                 <li>Tumer Garip</li>
                 <li>Russel Garlick</li>
                 <li>Mark Gavillet</li>
                 <li>Daniel Kahn Gillmor</li>
                 <li>David Goldfein</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544839606">Bernardo González Kriegel</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544839606">Bernardo González Kriegel (3.X TM/RMt)</a></li>
                 <li>Daniel Grobani</li>
                 <li>Amit Gupta</li>
                 <li>Michael Hafen</li>
-                <li>Christopher Hall</li>
-                <li>Kyle Hall</li>
+                <li>Christopher Hall (3.8 RMt)</li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6620692261494">Kyle Hall (3.X RMt/QAA)</a></li>
                 <li>Sean Hamlin</li>
                 <li>Tim Hannah</li>
                 <li>Mike Hansen</li>
@@ -427,7 +401,7 @@
                 <li>Cory Jaeger</li>
                 <li>Srdjan Jankovic</li>
                 <li>Philippe Jaillon</li>
-                <li><a href="https://www.openhub.net/accounts/kohaaloha">Mason James</a></li>
+                <li><a href="https://www.openhub.net/accounts/kohaaloha">Mason James (3.X RMt/QAA)</a></li>
                 <li>Mike Johnson</li>
                 <li>Donovan Jones</li>
                 <li>Bart Jorgensen</li>
@@ -439,9 +413,11 @@
                 <li>Ulrich Kleiber</li>
                 <li>Rafal Kopaczka</li>
                 <li>Piotr Kowalski</li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544614275">Henri-Damien Laurent (3.0 RMt)</a></li>
                 <li>Arnaud Laurin</li>
                 <li>Nicolas Legrand</li>
                 <li>Sonia Lemaire</li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544609147">Owen Leonard (3.x Interface Design)</a></li>
                 <li>Ambrose Li (translation tool)</li>
                 <li>Gynn Lomax</li>
                 <li>Peter Lorimer</li>
@@ -451,7 +427,7 @@
                 <li>Jesse Maseto</li>
                 <li>Frère Sébastien Marie</li>
                 <li>Ricardo Dias Marques</li>
-                <li>Julian Maurice</li>
+                <li>Julian Maurice (3.X QAA)</li>
                 <li>Brig C. McCoy</li>
                 <li>Dorian Meid (German translation)</li>
                 <li>Meenakshi. R</li>
@@ -470,7 +446,7 @@
                 <li>Mike Mylonas</li>
                 <li>Nadia Nicolaides</li>
                 <li>Joy Nelson</li>
-                <li><a href="https://www.openhub.net/accounts/cnighswonger">Chris Nighswonger</a></li>
+               <li><a href="https://www.openhub.net/p/koha/contributors/6618544615991">Chris Nighswonger (3.X RMt)</a></li>
                 <li>Brian Norris</li>
                 <li>Albert Oller</li>
                 <li>Eric Olsen</li>
@@ -480,16 +456,17 @@
                 <li>Shari Perkins</li>
                 <li>Fred Pierre</li>
                 <li>Polytechnic University</li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544612249">Paul Poulain (2.X/3.X RM/RMt/QAA)</a></li>
                 <li>Karam Qubsi</li>
                 <li>Romina Racca</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6620692116417">MJ Ray</a></li>
-                <li>Liz Rea</li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6620692116417">MJ Ray (2.0 RMt)</a></li>
+                <li>Liz Rea (3.6 RMt)</li>
                 <li>Thatcher Rea</li>
                 <li>Allen Reinmeyer</li>
                 <li>Serge Renaux</li>
-                <li>Martin Renvoize</li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544785220">Martin Renvoize (3.X QAA)</a></li>
                 <li>Waylon Robertson</li>
-                <li>Marcel de Rooy</li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544727712">Marcel de Rooy (3.X QAA)</a></li>
                 <li>Salvador Zaragoza Rubio</li>
                 <li>Mathieu Saby</li>
                 <li>Brice Sanchez</li>
@@ -498,7 +475,7 @@
                 <li>A. Sassmannshausen</li>
                 <li>Adrien Saurat</li>
                 <li>Dan Scott</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544619438">Robin Sheat</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544619438">Robin Sheat (3.X PM)</a></li>
                 <li>Juhani Seppälä</li>
                 <li>John Seymour</li>
                 <li>Juan Romay Sieira</li>
@@ -507,7 +484,7 @@
                 <li>Silvia Simonetti</li>
                 <li>Savitra Sirohi</li>
                 <li>Pawel Skuza (Polish for 1.2)</li>
-                <li>Fridolyn Somers</li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6620692831733">Fridolin Somers (3.X RMt)</a></li>
                 <li>Southeastern University</li>
                 <li>Glen Stewart</li>
                 <li>Will Stokes</li>
@@ -533,7 +510,7 @@
                 <li>Aleksa Vujicic</li>
                 <li>Reed Wade</li>
                 <li>Stacey Walker</li>
-                <li>Ian Walls</li>
+                <li>Ian Walls (3.X QAM)</li>
                 <li><a href="https://www.openhub.net/accounts/janewagner">Jane Wagner</a></li>
                 <li>Ward van Wanrooij</li>
                 <li><a href="https://www.openhub.net/accounts/pianohacker">Jesse Weaver</a></li>
@@ -577,12 +554,13 @@
 
             <h2>Additional thanks to...</h2>
             <ul>
+                <li>Irma Birchall</li>
+                <li>Rachel Hamilton-Williams (Kaitiaki from 2004 to present)</li>
+                <li>Stephen Hedges (early Documentation Manager)</li>
+                <li>Brooke Johnson</li>
                 <li>Jo Ransom</li>
-                <li>Nicholas Rosasco, (Documentation Compiler)</li>
+                <li>Nicholas Rosasco (Documentation Compiler)</li>
                 <li>Regula Sebastiao</li>
-                <li>Brooke Johnson</li>
-                <li>Stephen Hedges (early Documentation Manager)</li>
-                <li>Irma Birchall</li>
             </ul>
         </div>
 
-- 
1.7.10.4