[whimsy] branch master updated: Chairman => Chair

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 0722e78  Chairman => Chair
0722e78 is described below

commit 0722e7845d1e571f2cfd3968430d3014a0f8e41d
Author: Sebb <s...@apache.org>
AuthorDate: Fri Mar 12 13:48:47 2021 +0000

    Chairman => Chair
---
 tools/collate_minutes.rb    | 5 +++++
 www/board/minutes/.htaccess | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/tools/collate_minutes.rb b/tools/collate_minutes.rb
index 151e040..96f9329 100755
--- a/tools/collate_minutes.rb
+++ b/tools/collate_minutes.rb
@@ -177,6 +177,7 @@ end
 
 # handle project name changes
 # see also www/board/minutes/.htaccess
+# also see parse (Executive) Officer Reports ca. line 670
 def name_changes(title)
   title.sub! 'Ace', 'ACE' # WHIMSY-31
   title.sub! 'ADF Faces', 'MyFaces' # via Trinidad
@@ -683,6 +684,10 @@ seen={}
 
       title.sub! 'Executive VP', 'Executive Vice President'
       title.sub! 'Exec. V.P. and Secretary', 'Secretary'
+      title.sub! 'Vice Chairman', 'Vice Chair'
+      title.sub! 'Acting Chairman', 'Acting Chair'
+      title.sub! 'Chairman', 'Board Chair'
+    
       report = OpenStruct.new
       if title.include? ' ['
         report.owners = title.split(' [').last.sub(']','').strip
diff --git a/www/board/minutes/.htaccess b/www/board/minutes/.htaccess
index 5c24b1b..d6c97f5 100644
--- a/www/board/minutes/.htaccess
+++ b/www/board/minutes/.htaccess
@@ -13,3 +13,7 @@ RedirectMatch ^/board/minutes/trafficcontrol(\.html)?$ 
/board/minutes/Traffic_Co
 RedirectMatch ^/board/minutes/trafficserver(\.html)?$  
/board/minutes/Traffic_Server.html
 RedirectMatch ^/board/minutes/ws(\.html)?$             
/board/minutes/Web_Services.html
 RedirectMatch ^/board/minutes/xmlgraphics(\.html)?$    
/board/minutes/XML_Graphics.html
+RedirectMatch ^/board/minutes/Chairman(\.html)?$       
/board/minutes/Board_Chair.html
+RedirectMatch ^/board/minutes/Vice_Chairman(\.html)?$  
/board/minutes/Vice_Chair.html
+RedirectMatch ^/board/minutes/Vice_Chairman(\.html)?$  
/board/minutes/Vice_Chair.html
+RedirectMatch ^/board/minutes/Acting_Chairman(\.html)?$ 
/board/minutes/Acting_Chair.html