fund update

diff --git a/2022/fun/index.html b/2022/fun/index.html
index 3c646913d78d56ce8a4245d1ca97fb6f059fecf6..c744feac20cbff79cd8c3bc16ee3bf731ec73301 100755 (executable)
--- a/2022/fun/index.html
+++ b/2022/fun/index.html
@@ -43,6 +43,11 @@ Contents
 <br>
 <br>
 <hr>
+<h2 id="job-board">Job Board</h2>
+
+<p><a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2022/JobBoard">Post / check for free software-friendly jobs</a>.</p>
+<hr>
+
 <h2 id="lightning-talks">Lightning Talks</h2>
   <h3>SATURDAY 17:15 - 18:00 EDT (21:15 UTC)</h3>
 <table class="views-view-grid cols-3">
@@ -68,30 +73,10 @@ Contents
               </tr>
       </tbody>
 </table>
-
-
-<h2 id="member-meeting">Member Meeting</h2>
-
-<h3>Hosted by Jason Self, and Corwin Brust, more info will be posted on Sunday</h3>
-
-<!--<p>Get together with other FSF associate members to share your feedback with the FSF. To participate in the meeting, jump on the FSF member forum to join the discussion. Limited space is also available in the Big Blue Button sessio: <a href="https://greenlight.fsf.org/and-jxa-xme">https://greenlight.fsf.org/and-jxa-xme</a>.</p>
-<p>Our hosts will open the channel a few minutes before the start of the meeting and announce the start via IRC as well. You can also find the meeting link on the LibrePlanet Web site, and in /#fsf-members.</p>
-
-<ul>
-<li><strong>Time:</strong> 13:00 - 13:30 EDT (17:00 UTC), Sunday 3/20</li>
-<li><strong>Location:</strong><a href="https://greenlight.fsf.org/and-jxa-xme">https://greenlight.fsf.org/and-jxa-xme</a></li>
-<li><strong>Sign up:</strong> <a href="https://my.fsf.org/join">Become a member</a></li>
-<li>Please check the associate member IRC channel #fsf-member for more info at the time of the event.</li>
-</ul>-->
 <br>
 <hr>
 
-<h2 id="job-board">Job Board</h2>
-
-<p><a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2022/JobBoard">Post / check for free software-friendly jobs</a>.</p>
-<hr>
-
-<h2 id="trivia">LibrePlanet Trivia</h2> 
+<h2 id="trivia">LibrePlanet Trivia (Saturday)</h2> 
 
 <p>Supporters are invited to mental gymnastics at LibrePlanet 2022's free software trivia quiz! Win prizes and bragging rights while having a good time playing with your peers. Questions will vary in difficulty, and we expect all participants to play an honest game (no looking things up, please)!</p>
 
@@ -107,6 +92,35 @@ Craig Topham (FSF copyright and licensing associate & quizmaster). The quiz is s
 </ul>
 
 </hr>
+<a href="#after"><h2 id="after">LibrePlanet Afterparty (Saturday)</h2></a>
+<p>LibrePlanet Supporters, associate members, and stalwarts are invited to a private after-party, which will be held at 6:30pm EDT (22:30 UTC) on Saturday, March 19.</p>
+
+<p>We'll have pictures of food, cooperative Minetest and other games, and pleasant company. No RSVP required beyond this point. You can join the event here: <a href="https://greenlight.fsf.org/dav-6vv-mcf">https://greenlight.fsf.org/dav-6vv-mcf></a>, and you will be received by our host for the evening; operations assistant Davis Remmel (or another staff member). From here, you can navigate to other break-out areas where you can engage in all the after-party fun.</p>
+
+<ul>
+<li><strong>Time:</strong> 18:30 - 19:30 EDT (22:30 UTC), Saturday 3/19</li>
+<li><strong>Location:</strong><a href="https://greenlight.fsf.org/dav-6vv-mcf">https://greenlight.fsf.org/dav-6vv-mcf></a></li>
+<li><strong>Registration:</strong> <p>To participate in the afterparty, you will need to be <a href="https://my.fsf.org/civicrm/event/info?reset=1&id=99">registered at the "Supporter" or "Stalwart"level</a>.</p>
+</li>
+</ul>
+</hr>
+<hr>
+<br>
+<h2 id="member-meeting">Member Meeting</h2>
+
+<h3>Hosted by Jason Self, and Corwin Brust, more info will be posted on Sunday</h3>
+
+<p>Get together with other FSF associate members to share your feedback with the FSF. To participate in the meeting, jump on the FSF member forum to join the discussion. Limited space is also available in the Big Blue Button session<!--: <a href="https://greenlight.fsf.org/and-jxa-xme">https://greenlight.fsf.org/and-jxa-xme</a>.</p>-->
+<p>Our hosts will open the channel a few minutes before the start of the meeting and announce the start via IRC as well. You can also find the meeting link on the LibrePlanet Web site, and in #fsf-members.</p>
+
+<ul>
+<li><strong>Time:</strong> 13:00 - 13:30 EDT (17:00 UTC), Sunday 3/20</li>
+<li><strong>Location:</strong><a href="https://greenlight.fsf.org/and-jxa-xme">https://greenlight.fsf.org/and-jxa-xme</a></li>
+<li><strong>Sign up:</strong> <a href="https://my.fsf.org/join">Become a member</a></li>
+<li>Please check the associate member IRC channel #fsf-member for more info at the time of the event.</li>
+</ul>
+
+<hr>
 
 <a href="#minetest"><h2 id="minetest">Minetest</h2></a>
 
@@ -124,17 +138,7 @@ minetest</code></strong>. To connect to our server, use the <code>minetest.libre
 
 <hr>
 
-<a href="#after"><h2 id="after">LibrePlanet Afterparty (Saturday)</h2></a>
-<p>LibrePlanet Supporters, associate members, and stalwarts are invited to a private after-party, which will be held at 6:30pm EDT (22:30 UTC) on Saturday, March 19.</p>
-
-<p>We'll have pictures of food, cooperative Minetest and other games, and pleasant company. No RSVP required beyond this point. You can join the event here: <a href="https://greenlight.fsf.org/dav-6vv-mcf">https://greenlight.fsf.org/dav-6vv-mcf></a>, and you will be received by our host for the evening; operations assistant Davis Remmel (or another staff member). From here, you can navigate to other break-out areas where you can engage in all the after-party fun.</p>
 
-<ul>
-<li><strong>Time:</strong> 18:30 - 19:30 EDT (22:30 UTC), Saturday 3/19</li>
-<li><strong>Location:</strong><a href="https://greenlight.fsf.org/dav-6vv-mcf">https://greenlight.fsf.org/dav-6vv-mcf></a></li>
-<li><strong>Registration:</strong> <p>To participate in the afterparty, you will need to be <a href="https://my.fsf.org/civicrm/event/info?reset=1&id=99">registered at the "Supporter" or "Stalwart"level</a>.</p>
-</li>
-</ul>
 
 
 <h2>Organize your own social event!</h2>