diff --git a/doc/source/_exts/members.py b/doc/source/_exts/members.py index d4662665b..e0bd18ddb 100644 --- a/doc/source/_exts/members.py +++ b/doc/source/_exts/members.py @@ -20,8 +20,8 @@ from docutils.parsers.rst import directives from docutils.parsers.rst.directives import tables from docutils.utils import SystemMessagePropagation -# Full name (IRC nickname) [expires in] {role} -_PATTERN = re.compile('(?P.*)\s+\((?P.*)\)\s+\[(?P.*)\](\s+\{(?P.*)\})?') +# Full name (IRC) [expires in] {role} +_PATTERN = re.compile('(?P.*)\s+\((?P.*)\)\s+\<(?P.*)\>\s+\[(?P.*)\](\s+\{(?P.*)\})?') def _parse_members_file(app, filename): @@ -44,10 +44,11 @@ class MembersTable(tables.Table): """Insert the members table using the referenced file as source. """ - HEADERS = ('Full Name', 'IRC Nickname', 'Term Expires', 'Role') + HEADERS = ('Full Name', 'IRC', 'E-mail', 'Term Expires', 'Role') HEADER_MAP = { 'Full Name': 'name', - 'IRC Nickname': 'irc', + 'IRC': 'irc', + 'E-mail': 'email', 'Term Expires': 'date', 'Role': 'role', } diff --git a/reference/members b/reference/members index 93aa6e015..0b1d91547 100644 --- a/reference/members +++ b/reference/members @@ -1,14 +1,14 @@ -# Full name (IRC nickname) [expires in] {role} -Chris Dent (cdent) [April 2019] -Davanum Srinivas (dims) [April 2019] -Colleen Murphy (cmurphy) [October 2018] -Doug Hellmann (dhellmann) [October 2018] {chair} -Emilien Macchi (emilienm) [October 2018] -Graham Hayes (mugsie) [April 2019] -Jeremy Stanley (fungi) [October 2018] -Julia Kreger (TheJulia) [October 2018] -Mohammed Naser (mnaser) [April 2019] -Paul Belanger (pabelanger) [October 2018] -Sean McGinnis (smcginnis) [April 2019] -Thierry Carrez (ttx) [April 2019] -Zane Bitter (zaneb) [April 2019] +# Full name (IRC) [expires in] {role} +Chris Dent (cdent) [April 2019] +Davanum Srinivas (dims) [April 2019] +Colleen Murphy (cmurphy) [October 2018] +Doug Hellmann (dhellmann) [October 2018] {chair} +Emilien Macchi (emilienm) [October 2018] +Graham Hayes (mugsie) [April 2019] +Jeremy Stanley (fungi) [October 2018] +Julia Kreger (TheJulia) [October 2018] +Mohammed Naser (mnaser) [April 2019] +Paul Belanger (pabelanger) [October 2018] +Sean McGinnis (smcginnis) [April 2019] +Thierry Carrez (ttx) [April 2019] +Zane Bitter (zaneb) [April 2019]