From 7c416df94736f1ed969842ef5fb660b28e229d6e Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Mon, 9 Apr 2018 14:29:40 +0200
Subject: [PATCH] Bug 19904: Release team for 18.05

First moved all relevant 17.11 release team entries to the development
section, and then updated the release team section from the wiki 18.05
roles page.

Test plan:
[1] Check if Koha team tab on about looks as it should.
[2] Verify changes with 17.11 and 18.05 roles.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 54 ++++++++++++------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 217ac65db3..546f459869 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -408,36 +408,38 @@
                 <li><a href="http://www.ashs.school.nz/">Albany Senior High School</a>, Auckland, New Zealand (OPAC 'star-ratings' sponsorship)</li>
             </ul>
 
-            <h2>Koha <span style="color:red" title="Koha version numbering has jumped from 3.22 to 16.05 (yy.mm) as from May 2016">17.11</span> release team</h2>
+            <h2>Koha <span style="color:red" title="Koha version numbering has jumped from 3.22 to 16.05 (yy.mm) as from May 2016">18.05</span> release team</h2>
             <ul>
                 <li><strong>Release manager:</strong>
                     <a href="https://www.openhub.net/p/koha/contributors/6618545125093">Jonathan Druart</a></li>
                 <li><strong>Documentation Team:</strong>
                     <ul>
-                    <li><a href="https://www.openhub.net/p/koha/contributors/6618544609030">Chris Cormack</a></li>
-                    <li><a href="https://www.openhub.net/p/koha/contributors/6618544670742">Katrin Fischer</a></li>
-                    <li>Indranil Das Gupta (Database documentation)</li>
+                    <li>Michael Cabus</li>
+                    <li>Lee Jamison</li>
+                    <li>Ed Veal</li>
                     </ul>
                 </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 manager:</strong>
+                    <a href="https://www.openhub.net/p/koha/contributors/6618544670742">Katrin Fischer</a>
+                </li>
                 <li><strong>Quality assurance team:</strong>
                     <ul>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6618544730094">Tomás Cohen Arazi</a></li>
+                        <li>Alex Arnaud</li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6620692886191">Nick Clemens</a></li>
-                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544661344">Brendan A. 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/6618544785220">Martin Renvoize</a></li>
+                        <li>Josef Moravec</li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6618544727712">Marcel de Rooy</a></li>
-                        <li>Alex Sassmannshausen</li>
                     </ul>
                 </li>
                 <li><strong>Release maintainers:</strong>
                     <ul>
+                        <li><a href="https://www.openhub.net/p/koha/contributors/6620692886191">Nick Clemens</a> (17.11)</li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6620692831733">Fridolin Somers</a> (17.05)</li>
-                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544670742">Katrin Fischer</a> (16.11)</li>
-                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544618401">Mason James</a> (16.05)</li>
+                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544609030">Chris Cormack</a> (16.11)</li>
                     </ul>
                 </li>
                 <li><strong>Packaging manager:</strong>
@@ -448,9 +450,9 @@
                 </li>
                 <li><strong>Bug wranglers:</strong>
                     <ul>
+                        <li>Alex Buckley</li>
                         <li>Claire Gravely</li>
-                        <li>Amit Gupta</li>
-                        <li>Josef Moravec</li>
+                        <li>Jon Knight</li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6618545408147">Marc Véron</a></li>
                     </ul>
                 </li>
@@ -474,7 +476,7 @@
                 <li><a href="https://www.openhub.net/p/koha/contributors/6620692181851">Nahuel Angelinetti</a></li>
                 <li>Nuño López Ansótegui</li>
                 <li>Dimitris Antonakis</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544730094">Tomás Cohen Arazi (3.18 - 3.22 Release Manager; 3.12 Release Maintainer; 16.05 - 17.05 QA Team Member)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544730094">Tomás Cohen Arazi (3.18 - 3.22 Release Manager; 3.12 Release Maintainer; 16.05 - 17.11 QA Team Member)</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 Goksøyr Åsen</li>
@@ -528,12 +530,12 @@
                 <li>Pongtawat Chippimolchai</li>
                 <li>Barton Chittenden</li>
                 <li>Koha SAB CINECA</li>
-                <li>Nick Clemens (16.11 - 17.05 QA Team Member)</li>
+                <li>Nick Clemens (16.11 - 17.11 QA Team Member)</li>
                 <li>Garry Collum</li>
                 <li>David Cook</li>
                 <li>John Copeland</li>
                 <li>Charlotte Cordwell</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544609030">Chris Cormack (1.x, 3.4 and 3.6 Release Manager; 3.8, 3.10, 3.18 and 3.20 Release Maintainer; 3.2 Translation Manager; 3.14 QA Team Member; 17.05 Documentation Manager)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544609030">Chris Cormack (1.x, 3.4 and 3.6 Release Manager; 3.8, 3.10, 3.18 and 3.20 Release Maintainer; 3.2 Translation Manager; 3.14 QA Team Member; 17.05 Documentation Manager; 17.11 Documentation Team Member)</a></li>
                 <li>Jeremy Crabtree</li>
                 <li>Bonnie Crawford</li>
                 <li>Samuel Crosby</li>
@@ -552,7 +554,7 @@
                 <li>Leire Diez</li>
                 <li>Yarik</li>
                 <li>Rocio Dressler</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618545125093">Jonathan Druart (3.8 - 17.05 QA Team Member)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618545125093">Jonathan Druart (3.8 - 17.05 QA Team Member; 17.11 Release Manager)</a></li>
                 <li>Serhij Dubyk</li>
                 <li>Yohann Dufour</li>
                 <li>Thomas Dukleth (MARC Frameworks Maintenance)</li>
@@ -577,7 +579,7 @@
                 <li>Vitor Fernandes</li>
                 <li><a href="https://www.openhub.net/p/koha/contributors/6618544609053">Joshua Ferraro (3.0 Release Manager and Translation Manager)</a></li>
                 <li>Julian Fiol</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544670742">Katrin Fischer (3.12 - 16.11 QA Manager, 16.11 Release Maintainer)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544670742">Katrin Fischer (3.12 - 16.11 QA Manager, 16.11 Release Maintainer, 17.11 Documentation Team Member)</a></li>
                 <li>Connor Fraser</li>
                 <li>Clay Fouts</li>
                 <li>Brendon Ford</li>
@@ -586,13 +588,13 @@
                 <li>Corey Fuimaono</li>
                 <li>Marco Gaiarin</li>
                 <li>Pierrick Le Gall</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544661344">Brendan A. Gallagher (3.14 - 3.22 QA Team Member; 16.05, 16.11 - 17.05 Release Manager)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544661344">Brendan A. Gallagher (3.14 - 3.22 QA Team Member; 16.05 - 17.05 Release Manager; 17.11 QA Team Member)</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 (3.14 - 17.05 Translation Manager; 3.10 Release Maintainer)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544839606">Bernardo González Kriegel (3.14 - 17.11 Translation Manager; 3.10 Release Maintainer)</a></li>
                 <li>Caitlin Goodger</li>
                 <li>Claire Gravely</li>
                 <li>Briana Greally</li>
@@ -601,10 +603,10 @@
                 <li>Isabel Grubi</li>
                 <li>David Gustafsson</li>
                 <li>Amit Gupta</li>
-                <li>Indranil Das Gupta</li>
+                <li>Indranil Das Gupta (17.11 Documentation Team Member)</li>
                 <li>Michael Hafen</li>
                 <li>Christopher Hall (3.8 Release Maintainer)</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6620692261494">Kyle Hall (3.8 Release Maintainer; 3.14 - 17.05 QA Team Member; 16.11 - 17.05 Release Manager)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6620692261494">Kyle Hall (3.8 Release Maintainer; 3.14 - 17.11 QA Team Member; 16.11 - 17.05 Release Manager)</a></li>
                 <li>Sean Hamlin</li>
                 <li>Tim Hannah</li>
                 <li>Mike Hansen</li>
@@ -677,7 +679,7 @@
                 <li>Jesse Maseto</li>
                 <li>Frère Sébastien Marie</li>
                 <li>Ricardo Dias Marques</li>
-                <li>Julian Maurice (3.18, 17.05 QA Team Member; 3.22 Release Maintainer)</li>
+                <li>Julian Maurice (3.18, 17.05 - 17.11 QA Team Member; 3.22 Release Maintainer)</li>
                 <li>Remi Mayrand-Provencher</li>
                 <li>Brig C. McCoy</li>
                 <li>Grace McKenzie</li>
@@ -730,12 +732,12 @@
                 <li>Thatcher Rea</li>
                 <li>Allen Reinmeyer</li>
                 <li>Serge Renaux</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544785220">Martin Renvoize (3.16 - 17.05 QA Team Member)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544785220">Martin Renvoize (3.16 - 17.11 QA Team Member)</a></li>
                 <li>Francesco Rivetti</li>
                 <li>Abby Robertson</li>
                 <li>Waylon Robertson</li>
                 <li>Benjamin Rokseth</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544727712">Marcel de Rooy (3.8 - 17.05 QA Team Member)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544727712">Marcel de Rooy (3.8 - 17.11 QA Team Member)</a></li>
                 <li>Andreas Roussos</li>
                 <li>Salvador Zaragoza Rubio</li>
                 <li>Mathieu Saby</li>
@@ -744,7 +746,7 @@
                 <li>Sam Sanders</li>
                 <li>Rodrigo Santellan</li>
                 <li>Viktor Sarge</li>
-                <li>Alex Sassmannshausen</li>
+                <li>Alex Sassmannshausen (17.11 QA Team Member)</li>
                 <li>Adrien Saurat</li>
                 <li>Zoe Schoeler</li>
                 <li>Dan Scott</li>
@@ -760,7 +762,7 @@
                 <li>Pawel Skuza (Polish for 1.2)</li>
                 <li>Emma Smith</li>
                 <li>Grace Smyth</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6620692831733">Fridolin Somers (3.14 Release Maintainer, 17.05 QA Team Member)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6620692831733">Fridolin Somers (3.14 Release Maintainer, 17.05 QA Team Member, 17.05 Release Maintainer)</a></li>
                 <li>Southeastern University</li>
                 <li>Martin Stenberg</li>
                 <li>Glen Stewart</li>
@@ -776,7 +778,7 @@
                 <li><a href="https://www.openhub.net/p/koha/contributors/6618544609107">Finlay Thompson</a></li>
                 <li>Peggy Thrasher</li>
                 <li>Fabio Tiana</li>
-                <li>Mirko Tietgen (16.11 - 17.05 Packaging Manager)</li>
+                <li>Mirko Tietgen (16.11 - 17.11 Packaging Manager)</li>
                 <li>Mark Tompsett</li>
                 <li><a href="https://www.openhub.net/p/koha/contributors/6620692101577">Steve Tonnesen (early MARC work, Virtual Bookshelves concept, KohaCD)</a></li>
                 <li>Bruno Toumi</li>
-- 
2.14.1