On Mon, Mar 26, 2018 at 04:10:33PM +0100, Simon McVittie wrote:
> On Mon, 26 Mar 2018 at 17:33:15 +0300, Niko Tyni wrote:
> > <define-tag chairman><br>
> > -<spaces><em><gettext
> > domain="organization">chairman</gettext></em> </define-tag>
> > +<spaces><em><gettext
> > domain="organization">chair</gettext></em> </define-tag>
> ...
> > - <chairman>Didier Raboud
> ...
> > + <chair>Margarita Manterola
>
> I don't really speak WML, but I think you probably need to
> <define-tag chair> instead of <define-tag chairman> if you want to
> use <chair> further down the document. The alternative would be to leave the
> machine-readable tag as <chairman> but make it produce the human-readable
> text "chair", as in a previous patch. The version in this patch looks
> like a middle ground between the two that isn't going to work as intended.
Oh right, thanks for noticing! I had that right earlier but goofed it
up this time.
New version attached...
--
Niko
Index: english/devel/tech-ctte.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/devel/tech-ctte.wml,v
retrieving revision 1.71
diff -u -r1.71 tech-ctte.wml
--- english/devel/tech-ctte.wml 29 Jan 2017 03:32:44 -0000 1.71
+++ english/devel/tech-ctte.wml 26 Mar 2018 15:20:57 -0000
@@ -316,6 +316,12 @@
Thanks to the following people who have served on the committee:
<ul>
+<li>Keith Packard (2013-11-29 - 2017-12-31)</li>
+<li>Sam Hartman (2015-03-08 - 2017-11-09)</li>
+<li>Don Armstrong (2009-09-11 - 2016-12-31)</li>
+<li>Andreas Barth (2006-01-04 - 2016-12-31)</li>
+<li>Steve Langasek (2006-01-04 - 2015-12-31)</li>
+<li>Bdale Garbee (2001-04-17 - 2015-12-31)</li>
<li>Colin Watson (2011-08-24 - 2015-03-05)</li>
<li>Ian Jackson (to 2014-11-19)</li>
<li>Russ Allbery (2009-01-11 - 2014-11-16)</li>
Index: english/intro/organization.data
===================================================================
RCS file: /cvs/webwml/webwml/english/intro/organization.data,v
retrieving revision 1.574
diff -u -r1.574 organization.data
--- english/intro/organization.data 20 Mar 2018 05:49:08 -0000 1.574
+++ english/intro/organization.data 26 Mar 2018 15:20:57 -0000
@@ -36,7 +36,7 @@
<spaces><em><gettext domain="organization">wizard</gettext></em> </define-tag>
# we only use the chairman tag once, for techctte, I wonder why it's here.
<define-tag chairman><br>
-<spaces><em><gettext domain="organization">chairman</gettext></em> </define-tag>
+<spaces><em><gettext domain="organization">chair</gettext></em> </define-tag>
# assistant tag added for DPL "second in command"
<define-tag assistant><br>
<spaces><em><gettext domain="organization">assistant</gettext></em> </define-tag>
@@ -71,10 +71,10 @@
<appointmentmail 1498053993.4017640.1016684592.748e3...@webmail.messagingengine.com>
<appointmentmail 1514922200.4161380.1222079088.19895...@webmail.messagingengine.com>
<appointmentmail 1521224077.296447.1305789200.53c43...@webmail.messagingengine.com>
- <chairman>Didier Raboud
+ <member>Didier Raboud
<member>Philip Hands
<member>Tollef Fog Heen
- <member>Margarita Manterola
+ <chairman>Margarita Manterola
<member>David Bremner
<member>Niko Tyni
<member>Gunnar Wolf
