[foundation-web] elections/2012: Renaming links to the new web scheme

[Tobias Mueller <tobiasmue src gnome org>]

commit 32b6d52fd3da8b1b5e4ef670e158ca806fb1150f
Author: Tobias Mueller <tobiasmue gnome org>
Date:   Tue Feb 21 01:05:02 2012 +0100

    elections/2012: Renaming links to the new web scheme
    
    I hope I catched them all.

 foundation.gnome.org/vote/2012/candidates.wml      |    4 ++--
 foundation.gnome.org/vote/2012/index.wml           |    2 +-
 foundation.gnome.org/vote/2012/rules.wml           |    6 +++---
 .../vote/2012/voting-instructions.txt              |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/foundation.gnome.org/vote/2012/candidates.wml b/foundation.gnome.org/vote/2012/candidates.wml
index 31890c3..791c2d7 100644
--- a/foundation.gnome.org/vote/2012/candidates.wml
+++ b/foundation.gnome.org/vote/2012/candidates.wml
@@ -34,7 +34,7 @@
 
     <p>
       Additional elections details can be found on the
-      <a href="../../">GNOME Foundation Web Site</a>.
+      <a href="http://foundation.gnome.org";>GNOME Foundation Web Site</a>.
     </p>
 
     <p>
@@ -259,7 +259,7 @@ help.
 
     <p>
       Note, that according to the
-      <a href="../../about/bylaws.pdf">Bylaws</a> Article VIII Section 2d
+      <a href="http://www.gnome.org/wp-content/uploads/2011/11/bylaws.pdf";>Bylaws</a> Article VIII Section 2d
       there is a 2-person maximum on the number of people affiliated with any
       one company that can be on the board: if more than 2 persons from one
       company get elected, only the top 2 vote getters will get on.
diff --git a/foundation.gnome.org/vote/2012/index.wml b/foundation.gnome.org/vote/2012/index.wml
index 11f76fe..5945c84 100644
--- a/foundation.gnome.org/vote/2012/index.wml
+++ b/foundation.gnome.org/vote/2012/index.wml
@@ -51,7 +51,7 @@
     
         <li>
             <a href="rules.html">Elections Rules and Timeline</a> (webcal <a
-            href="webcal://foundation.gnome.org/elections/2012/timeline.ics">timeline</a>)
+            href="webcal://vote.gnome.org/2012/timeline.ics">timeline</a>)
         </li>
     
         <li>
diff --git a/foundation.gnome.org/vote/2012/rules.wml b/foundation.gnome.org/vote/2012/rules.wml
index 4c40c0b..f792c03 100644
--- a/foundation.gnome.org/vote/2012/rules.wml
+++ b/foundation.gnome.org/vote/2012/rules.wml
@@ -15,7 +15,7 @@
 
     <ol>
       <li>
-        See the <a href="../../about/charter/">GNOME Foundation charter</a> for
+        See the <a href="https://live.gnome.org/Foundation/Charter";>GNOME Foundation charter</a> for
         general rules.
       </li>
       <li>
@@ -27,7 +27,7 @@
         
         are eligible to vote in the elections. Anyone who has made a 
         contribution to GNOME can apply for membership by completing the
-        <a href="../../membership/application.php">application</a>.
+        <a href="http://www.gnome.org/foundation/membership/apply/";>application</a>.
         Also, your membership needs to be valid at least until the end of the
         elections
         (<!-- CHALLENGE_CLOSED_DATE -->2012-06-19).
@@ -82,7 +82,7 @@
 	more than two of the top seven vote-getters be affiliated with the
 	same company, only the two with the most votes will be considered
 	elected. For a full definition of corporate affiliation, see the
-	<a href="../../about/charter/">GNOME Foundation charter</a>.
+	<a href="https://live.gnome.org/Foundation/Charter";>GNOME Foundation charter</a>.
       </li>
       <li>
         In the event of a tie for the final slot on the board, the Elections
diff --git a/foundation.gnome.org/vote/2012/voting-instructions.txt b/foundation.gnome.org/vote/2012/voting-instructions.txt
index ab277cd..73f0f51 100644
--- a/foundation.gnome.org/vote/2012/voting-instructions.txt
+++ b/foundation.gnome.org/vote/2012/voting-instructions.txt
@@ -4,11 +4,11 @@ The election of the GNOME Foundation Board will soon be open.
 
 Voting will run from 2012-05-27 (Sunday) until 2012-06-10, 23:59 UTC.
 
-To vote, please go to http://foundation.gnome.org/vote/vote.php?id=17
+To vote, please go to http://vote.gnome.org/vote.php?id=17
 and follow the instructions there.
 
 A list of candidates and their reasons for running is available at
-http://foundation.gnome.org/vote/2012/candidates.html
+http://vote.gnome.org/2012/candidates.html
 
 When instructed to do so, enter the following details: