From 9d9c4f1783d5a3dee43f00ba43e18643e0def527 Mon Sep 17 00:00:00 2001 From: Curtis Christopher Hovey Date: Sun, 18 Apr 2004 18:33:55 +0000 Subject: [PATCH] ---------------------------------------------------------------------- ---------------------------------------------------------------------- Converted to UTF-8 and XHTML transitional. Committing in . Modified Files: ChangeLog foundation.gnome.org/index.wml foundation.gnome.org/about/index.wml foundation.gnome.org/about/charter/index.wml foundation.gnome.org/about/history/index.wml foundation.gnome.org/contact/index.wml foundation.gnome.org/elections/index.wml foundation.gnome.org/elections/overview.wml foundation.gnome.org/elections/2000/candidates.wml foundation.gnome.org/elections/2000/index.wml foundation.gnome.org/elections/2000/results.wml foundation.gnome.org/elections/2000/rules.wml foundation.gnome.org/elections/2000/verify.wml foundation.gnome.org/elections/2000/voters.wml foundation.gnome.org/elections/2001/candidates.wml foundation.gnome.org/elections/2001/index.wml foundation.gnome.org/elections/2001/rules.wml foundation.gnome.org/elections/2001/verify.wml foundation.gnome.org/elections/2001/voters.wml foundation.gnome.org/elections/2002/candidates.wml foundation.gnome.org/elections/2002/index.wml foundation.gnome.org/elections/2002/preliminary-results.wml foundation.gnome.org/elections/2002/rules.wml foundation.gnome.org/elections/2002/verify.wml foundation.gnome.org/elections/2002/voters.wml foundation.gnome.org/elections/2003/candidates.wml foundation.gnome.org/elections/2003/index.wml foundation.gnome.org/elections/2003/preliminary-results.wml foundation.gnome.org/elections/2003/rules.wml foundation.gnome.org/elections/2003/verify.wml foundation.gnome.org/elections/2003/voters.wml foundation.gnome.org/legal/index.wml foundation.gnome.org/membership/application.wml foundation.gnome.org/membership/index.wml foundation.gnome.org/membership/members.wml foundation.gnome.org/news/index.wml include/evilsedhack ---------------------------------------------------------------------- --- ChangeLog | 41 +++++++++++++++++++ foundation.gnome.org/about/charter/index.wml | 5 ++- foundation.gnome.org/about/history/index.wml | 5 ++- foundation.gnome.org/about/index.wml | 5 ++- foundation.gnome.org/contact/index.wml | 7 ++-- .../elections/2000/candidates.wml | 5 ++- foundation.gnome.org/elections/2000/index.wml | 5 ++- .../elections/2000/results.wml | 5 ++- foundation.gnome.org/elections/2000/rules.wml | 5 ++- .../elections/2000/verify.wml | 5 ++- .../elections/2000/voters.wml | 5 ++- .../elections/2001/candidates.wml | 5 ++- foundation.gnome.org/elections/2001/index.wml | 5 ++- foundation.gnome.org/elections/2001/rules.wml | 7 ++-- .../elections/2001/verify.wml | 5 ++- .../elections/2001/voters.wml | 5 ++- .../elections/2002/candidates.wml | 5 ++- foundation.gnome.org/elections/2002/index.wml | 5 ++- .../elections/2002/preliminary-results.wml | 5 ++- foundation.gnome.org/elections/2002/rules.wml | 5 ++- .../elections/2002/verify.wml | 18 ++++---- .../elections/2002/voters.wml | 5 ++- .../elections/2003/candidates.wml | 5 ++- foundation.gnome.org/elections/2003/index.wml | 8 ++-- .../elections/2003/preliminary-results.wml | 5 ++- foundation.gnome.org/elections/2003/rules.wml | 5 ++- .../elections/2003/verify.wml | 13 +++--- .../elections/2003/voters.wml | 5 ++- foundation.gnome.org/elections/index.wml | 5 ++- foundation.gnome.org/elections/overview.wml | 5 ++- foundation.gnome.org/index.wml | 5 ++- foundation.gnome.org/legal/index.wml | 3 +- .../membership/application.wml | 11 +++-- foundation.gnome.org/membership/index.wml | 5 ++- foundation.gnome.org/membership/members.wml | 5 ++- foundation.gnome.org/news/index.wml | 5 ++- include/evilsedhack | 2 +- 37 files changed, 166 insertions(+), 84 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2240f7..1291ce8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,44 @@ +2004-04-18 Curtis Hovey + + * foundation.gnome.org/about/charter/index.wml: + * foundation.gnome.org/about/history/index.wml: + * foundation.gnome.org/about/index.wml: + * foundation.gnome.org/contact/index.wml: + * foundation.gnome.org/elections/2000/candidates.wml: + * foundation.gnome.org/elections/2000/index.wml: + * foundation.gnome.org/elections/2000/results.wml: + * foundation.gnome.org/elections/2000/rules.wml: + * foundation.gnome.org/elections/2000/verify.wml: + * foundation.gnome.org/elections/2000/voters.wml: + * foundation.gnome.org/elections/2001/candidates.wml: + * foundation.gnome.org/elections/2001/index.wml: + * foundation.gnome.org/elections/2001/rules.wml: + * foundation.gnome.org/elections/2001/verify.wml: + * foundation.gnome.org/elections/2001/voters.wml: + * foundation.gnome.org/elections/2002/candidates.wml: + * foundation.gnome.org/elections/2002/index.wml: + * foundation.gnome.org/elections/2002/preliminary-results.wml: + * foundation.gnome.org/elections/2002/rules.wml: + * foundation.gnome.org/elections/2002/verify.wml: + * foundation.gnome.org/elections/2002/voters.wml: + * foundation.gnome.org/elections/2003/candidates.wml: + * foundation.gnome.org/elections/2003/index.wml: + * foundation.gnome.org/elections/2003/preliminary-results.wml: + * foundation.gnome.org/elections/2003/rules.wml: + * foundation.gnome.org/elections/2003/verify.wml: + * foundation.gnome.org/elections/2003/voters.wml: + * foundation.gnome.org/elections/index.wml: + * foundation.gnome.org/elections/overview.wml: + * foundation.gnome.org/index.wml: + * foundation.gnome.org/legal/index.wml: + * foundation.gnome.org/membership/application.wml: + * foundation.gnome.org/membership/index.wml: + * foundation.gnome.org/membership/members.wml: + * foundation.gnome.org/news/index.wml: + * include/evilsedhack: + + Converted to UTF-8 and XHTML transitional. + 2004-02-12: Aaron Weber * foundation.gnome.org/index.wml: alphabetize the logos. diff --git a/foundation.gnome.org/about/charter/index.wml b/foundation.gnome.org/about/charter/index.wml index cfc6308..0a21355 100644 --- a/foundation.gnome.org/about/charter/index.wml +++ b/foundation.gnome.org/about/charter/index.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation Charter - + diff --git a/foundation.gnome.org/about/history/index.wml b/foundation.gnome.org/about/history/index.wml index 9b155e0..5a3f296 100644 --- a/foundation.gnome.org/about/history/index.wml +++ b/foundation.gnome.org/about/history/index.wml @@ -1,9 +1,10 @@ - + + The GNOME Foundation History - + diff --git a/foundation.gnome.org/about/index.wml b/foundation.gnome.org/about/index.wml index 815c044..5b4918d 100644 --- a/foundation.gnome.org/about/index.wml +++ b/foundation.gnome.org/about/index.wml @@ -1,9 +1,10 @@ - + + About the GNOME Foundation - + diff --git a/foundation.gnome.org/contact/index.wml b/foundation.gnome.org/contact/index.wml index f6e6154..31899be 100644 --- a/foundation.gnome.org/contact/index.wml +++ b/foundation.gnome.org/contact/index.wml @@ -1,9 +1,10 @@ - + + Contact the GNOME Foundation - + @@ -19,6 +20,6 @@
Email lists
Foundation mailing list
Foundation Announce mailing list
- + diff --git a/foundation.gnome.org/elections/2000/candidates.wml b/foundation.gnome.org/elections/2000/candidates.wml index 60018e8..1a079cb 100644 --- a/foundation.gnome.org/elections/2000/candidates.wml +++ b/foundation.gnome.org/elections/2000/candidates.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation Election Candidates - + diff --git a/foundation.gnome.org/elections/2000/index.wml b/foundation.gnome.org/elections/2000/index.wml index 0bdbe51..8deac4b 100644 --- a/foundation.gnome.org/elections/2000/index.wml +++ b/foundation.gnome.org/elections/2000/index.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation 2000 Election - + diff --git a/foundation.gnome.org/elections/2000/results.wml b/foundation.gnome.org/elections/2000/results.wml index 99d8398..0283c17 100644 --- a/foundation.gnome.org/elections/2000/results.wml +++ b/foundation.gnome.org/elections/2000/results.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation 2000 Election Results - + diff --git a/foundation.gnome.org/elections/2000/rules.wml b/foundation.gnome.org/elections/2000/rules.wml index 7c784fd..29688b6 100644 --- a/foundation.gnome.org/elections/2000/rules.wml +++ b/foundation.gnome.org/elections/2000/rules.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation Election Rules - + diff --git a/foundation.gnome.org/elections/2000/verify.wml b/foundation.gnome.org/elections/2000/verify.wml index 1219768..6c51069 100644 --- a/foundation.gnome.org/elections/2000/verify.wml +++ b/foundation.gnome.org/elections/2000/verify.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation 2000 Election Verification - + diff --git a/foundation.gnome.org/elections/2000/voters.wml b/foundation.gnome.org/elections/2000/voters.wml index d600b8a..24bebad 100644 --- a/foundation.gnome.org/elections/2000/voters.wml +++ b/foundation.gnome.org/elections/2000/voters.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation 2000 Election Voters - + diff --git a/foundation.gnome.org/elections/2001/candidates.wml b/foundation.gnome.org/elections/2001/candidates.wml index f198239..a2dcef1 100644 --- a/foundation.gnome.org/elections/2001/candidates.wml +++ b/foundation.gnome.org/elections/2001/candidates.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation Election Candidates - + diff --git a/foundation.gnome.org/elections/2001/index.wml b/foundation.gnome.org/elections/2001/index.wml index c42f9cc..7aa3760 100644 --- a/foundation.gnome.org/elections/2001/index.wml +++ b/foundation.gnome.org/elections/2001/index.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation 2001 Election - + diff --git a/foundation.gnome.org/elections/2001/rules.wml b/foundation.gnome.org/elections/2001/rules.wml index 1d83b6b..dfb22c5 100644 --- a/foundation.gnome.org/elections/2001/rules.wml +++ b/foundation.gnome.org/elections/2001/rules.wml @@ -1,14 +1,15 @@ - + + GNOME Foundation Election Rules - + -

GNOME Foundation Election Rules & Timeline

+

GNOME Foundation Election Rules & Timeline

Election Rules

diff --git a/foundation.gnome.org/elections/2001/verify.wml b/foundation.gnome.org/elections/2001/verify.wml index 1a7672a..9b1088b 100644 --- a/foundation.gnome.org/elections/2001/verify.wml +++ b/foundation.gnome.org/elections/2001/verify.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation 2001 Election Verification - + diff --git a/foundation.gnome.org/elections/2001/voters.wml b/foundation.gnome.org/elections/2001/voters.wml index 7950f7a..274bb39 100644 --- a/foundation.gnome.org/elections/2001/voters.wml +++ b/foundation.gnome.org/elections/2001/voters.wml @@ -1,10 +1,11 @@ - + + GNOME Foundation 2001 Election Voters - + diff --git a/foundation.gnome.org/elections/2002/candidates.wml b/foundation.gnome.org/elections/2002/candidates.wml index f6735d8..ca8991e 100644 --- a/foundation.gnome.org/elections/2002/candidates.wml +++ b/foundation.gnome.org/elections/2002/candidates.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation 2002 Election Candidates - + diff --git a/foundation.gnome.org/elections/2002/index.wml b/foundation.gnome.org/elections/2002/index.wml index 1fca6e1..cbc39e2 100644 --- a/foundation.gnome.org/elections/2002/index.wml +++ b/foundation.gnome.org/elections/2002/index.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation 2002 Election - + diff --git a/foundation.gnome.org/elections/2002/preliminary-results.wml b/foundation.gnome.org/elections/2002/preliminary-results.wml index fbdff34..8618d76 100644 --- a/foundation.gnome.org/elections/2002/preliminary-results.wml +++ b/foundation.gnome.org/elections/2002/preliminary-results.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation 2002 Preliminary Results - + diff --git a/foundation.gnome.org/elections/2002/rules.wml b/foundation.gnome.org/elections/2002/rules.wml index 24b80e2..f88712b 100644 --- a/foundation.gnome.org/elections/2002/rules.wml +++ b/foundation.gnome.org/elections/2002/rules.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation 2002 Election Rules - + diff --git a/foundation.gnome.org/elections/2002/verify.wml b/foundation.gnome.org/elections/2002/verify.wml index e058ef3..ace486b 100644 --- a/foundation.gnome.org/elections/2002/verify.wml +++ b/foundation.gnome.org/elections/2002/verify.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation 2002 Election Verification - +

Election Verification

@@ -43,12 +44,14 @@

Here are the steps to obtain the results: - 

$ gunzip 2002-November.txt.gz 2002-December.txt.gz
- 
$ cat 2002-November.txt 2002-December.txt > vote-archives.txt
- 
$ python list-addresses.py registered-voters.txt > addresses.txt
- 
$ python vote-counter.py vote-archives.txt dontforgettovote addresses.txt > results.txt

+ 
$ gunzip 2002-November.txt.gz 2002-December.txt.gz
+ 
$ cat 2002-November.txt 2002-December.txt > vote-archives.txt
+ 
$ python list-addresses.py registered-voters.txt > addresses.txt
+ 
$ python vote-counter.py vote-archives.txt dontforgettovote addresses.txt > results.txt
+ +

The results should be in results.txt. A list of errors will be generated at the top of the output, but note that many of those errors will @@ -60,8 +63,9 @@

If you want to replicate the posted results, you have to apply the diff file before running the scripts: - 

$ diff -p0 < vote-archives.diff

+ + 
$ diff -p0 < vote-archives.diff
diff --git a/foundation.gnome.org/elections/2002/voters.wml b/foundation.gnome.org/elections/2002/voters.wml index 8b58cc1..1259c4d 100644 --- a/foundation.gnome.org/elections/2002/voters.wml +++ b/foundation.gnome.org/elections/2002/voters.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation 2002 Election Voters - + diff --git a/foundation.gnome.org/elections/2003/candidates.wml b/foundation.gnome.org/elections/2003/candidates.wml index eefb2ae..a64ddce 100644 --- a/foundation.gnome.org/elections/2003/candidates.wml +++ b/foundation.gnome.org/elections/2003/candidates.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation 2003 Election Candidates - + diff --git a/foundation.gnome.org/elections/2003/index.wml b/foundation.gnome.org/elections/2003/index.wml index d849716..9a93ce6 100644 --- a/foundation.gnome.org/elections/2003/index.wml +++ b/foundation.gnome.org/elections/2003/index.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation 2003 Election - + @@ -34,8 +35,7 @@ December
  • - Instructions for running the vote counting - script + Instructions for running the vote counting script
  • List of candidates for Board of Directors diff --git a/foundation.gnome.org/elections/2003/preliminary-results.wml b/foundation.gnome.org/elections/2003/preliminary-results.wml index 7555a53..3835345 100644 --- a/foundation.gnome.org/elections/2003/preliminary-results.wml +++ b/foundation.gnome.org/elections/2003/preliminary-results.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation 2003 Preliminary Results - + diff --git a/foundation.gnome.org/elections/2003/rules.wml b/foundation.gnome.org/elections/2003/rules.wml index 3074a83..442d35b 100644 --- a/foundation.gnome.org/elections/2003/rules.wml +++ b/foundation.gnome.org/elections/2003/rules.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation Election Rules - + diff --git a/foundation.gnome.org/elections/2003/verify.wml b/foundation.gnome.org/elections/2003/verify.wml index b7b7707..e4f5205 100644 --- a/foundation.gnome.org/elections/2003/verify.wml +++ b/foundation.gnome.org/elections/2003/verify.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation 2003 Election Verification - + @@ -51,10 +52,12 @@

    Here are the steps to obtain the results: - 

    $ tar zxvf 2003-verif.tar.gz
    - 
    $ cd 2003-verif
    - 
    $ make

    + + 
    $ tar zxvf 2003-verif.tar.gz
    + 
    $ cd 2003-verif
    + 
    $ make
    +

    The results should be in results.txt. A list of errors will be generated diff --git a/foundation.gnome.org/elections/2003/voters.wml b/foundation.gnome.org/elections/2003/voters.wml index 3d326b5..6029a44 100644 --- a/foundation.gnome.org/elections/2003/voters.wml +++ b/foundation.gnome.org/elections/2003/voters.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation Voters - + diff --git a/foundation.gnome.org/elections/index.wml b/foundation.gnome.org/elections/index.wml index ec5838b..45e9b22 100644 --- a/foundation.gnome.org/elections/index.wml +++ b/foundation.gnome.org/elections/index.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation Elections - + diff --git a/foundation.gnome.org/elections/overview.wml b/foundation.gnome.org/elections/overview.wml index 0592748..7a2806d 100644 --- a/foundation.gnome.org/elections/overview.wml +++ b/foundation.gnome.org/elections/overview.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation Board of Director Overview - + diff --git a/foundation.gnome.org/index.wml b/foundation.gnome.org/index.wml index 3dfb207..22c3685 100644 --- a/foundation.gnome.org/index.wml +++ b/foundation.gnome.org/index.wml @@ -1,9 +1,10 @@ - + + The GNOME Foundation - + diff --git a/foundation.gnome.org/legal/index.wml b/foundation.gnome.org/legal/index.wml index 2a5e881..1894b94 100644 --- a/foundation.gnome.org/legal/index.wml +++ b/foundation.gnome.org/legal/index.wml @@ -1,4 +1,5 @@ - + + diff --git a/foundation.gnome.org/membership/application.wml b/foundation.gnome.org/membership/application.wml index 90e9b84..6b478d0 100644 --- a/foundation.gnome.org/membership/application.wml +++ b/foundation.gnome.org/membership/application.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation Membership Application - + @@ -189,7 +190,7 @@ checked /> + checked="checked" /> Previous GNOME Foundation member @@ -247,8 +248,10 @@ believe the committee should consider while reviewing your application:

    +

    - +

    +

    diff --git a/foundation.gnome.org/membership/index.wml b/foundation.gnome.org/membership/index.wml index f952aaf..2d17b8c 100644 --- a/foundation.gnome.org/membership/index.wml +++ b/foundation.gnome.org/membership/index.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation Membership - + diff --git a/foundation.gnome.org/membership/members.wml b/foundation.gnome.org/membership/members.wml index 6cc7e79..ab6d787 100644 --- a/foundation.gnome.org/membership/members.wml +++ b/foundation.gnome.org/membership/members.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation Membership List - + diff --git a/foundation.gnome.org/news/index.wml b/foundation.gnome.org/news/index.wml index 388f637..f4035a1 100644 --- a/foundation.gnome.org/news/index.wml +++ b/foundation.gnome.org/news/index.wml @@ -1,9 +1,10 @@ - + + GNOME Foundation News - + diff --git a/include/evilsedhack b/include/evilsedhack index 6ea1c1b..de6d801 100755 --- a/include/evilsedhack +++ b/include/evilsedhack @@ -2,7 +2,7 @@ PAGE=$1 ROOT=$2 -sed "s,,,i;s,]*>,
    ,i;/<\/body>/,//d" $PAGE +sed "s,,,i;s,]*>,
    ,i;/<\/body>/,//d" $PAGE cat <<-FOOT