From fe370dea6391e65d636fe7b5a4423335474fcf96 Mon Sep 17 00:00:00 2001
From: zoe1 <zoe@fsf.org>
Date: Sun, 21 Mar 2021 13:21:33 +0100
Subject: [PATCH] sat/sun fun chill

---
 2021/fun/index.html              |  6 +--
 2021/registered/chill/index.html | 70 +++++++++++++++++++-------------
 2 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/2021/fun/index.html b/2021/fun/index.html
index 8ffdb5c5..e8a81a65 100755
--- a/2021/fun/index.html
+++ b/2021/fun/index.html
@@ -18,12 +18,12 @@ Contents
 </h2>
 </div>
 <div class="panel-body">
-<p><a href="#lightning-talks">Lightning Talks</a></p>
-<p><a href="#BoF">Birds of a Feather Social Events</a></p>
 <p><a href="#member-meeting">Member meeting</a></p>
 <p><a href="#job-board">Job board</a></p>
-<p><a href="#trivia">LibrePlanet trivia</a></p>
+<!--<p><a href="#trivia">LibrePlanet trivia</a></p>-->
 <p><a href="#minetest">Minetest</a></p>
+<p><a href="#BoF">Birds of a Feather Social Events</a></p>
+<p><a href="#lightning-talks">Lightning Talks</a></p>
 </div>
 </div>
 
diff --git a/2021/registered/chill/index.html b/2021/registered/chill/index.html
index 36e7d4a7..8b0a1f29 100755
--- a/2021/registered/chill/index.html
+++ b/2021/registered/chill/index.html
@@ -29,48 +29,29 @@ Contents
 </h2>
 </div>
 <div class="panel-body">
-  <p><a href="#BoF">Birds of a Feather (BoF) sessions</a></p>
-  <p><a href="#jobboard">Job Board</a></p>
+  <p><a href="#member-meeting">Member Meeting</a></p>
   <p><a href="#trivia">Trivia</a></p>
+  <p><a href="#jobboard">Job Board</a></p>
   <p><a href="#minetest">Minetest</a></p>
   <p><a href="#voicechat">Voice chat</a></p>
   <p><a href="#textchat">Text chat</a></p>
+  <p><a href="#BoF">Birds of a Feather (BoF) sessions</a></p>
 </div>
 </div>
 
-<a href="#BoF"><h3 id="BoF">Birds of a Feather</h3></a>
+<h2 id="member-meeting">Member Meeting</h2>
 
-<h4>Non-Code Contributors' BoF</h4>
-<ul>
-<h4>Hosted by Taowa</h4>
+<h3>Hosted by Jason Self, Devin Ulibarri, and Mariah Villarreal</h3>
 
-<p>There are lots of contributions that aren't code: artwork, translations, design, packaging, license review, community building, organizing, activism, mentorship, user support; to name a few. For those of you whose primary involvement with the free software community falls under that category, your work can often feel like it takes a secondary role to that of those contributing code. Let's talk! </p>
+<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 get more information if you missed the invitation. The link to join the videoconference will be posted in the channel topic, as well as on the LibrePlanet Web site. Please use the password shared via the invitation email. </p>
 
 <ul>
-<li><strong>Time:</strong> 12:55 - 13:40 EDT, Saturday 3/20</li>
-<li><strong>Location:</strong> <a href="https://testgreenlight.fsf.org/and-2x2-a3h">https://testgreenlight.fsf.org/and-2x2-a3h</a></li>
-<li><strong>Sign up:</strong> Not necessary</li>
-</ul>
+<li><strong>Time:</strong> 12:55 - 13:40 EDT, Sunday 3/21</li>
+<li><strong>Location:</strong> LINK TBA</li>
+<li><strong>Sign up:</strong> <a href="https://my.fsf.org/join">Become a member</a></li>
 </ul>
 <br>
-<h4>Calling all Free/Libre Founders</h4>
-<ul>
-<h4>Hosted by Wm Salt Hale</h4>
-<p>Have you (or a group of friends) started a free software project? How about a usergroup or conference? Maybe you haven't yet, but are definitely considering it. Or, have you tried to start something new and found it didn't work out the way you wanted? Have you witnessed the rise and decline of projects and events, and are you willing to share your stories? Come to the Free/Libre Founders BoF and discuss your experience!</p>
-
-<ul>
-<li><strong>Time:</strong> 14:45 - 15:30 EDT, Saturday 3/20</li>
-<li><strong>Location:</strong> <a href="https://testgreenlight.fsf.org/and-kam-342">https://testgreenlight.fsf.org/and-kam-342</a></li>
-<li><strong>Sign up:</strong> Not necessary </li>
-</ul>
-</ul>
 <hr>
-<a href="#jobboard"><h3 id="jobboard">Job Board</h3></a>
-
-<p>If you want to share something with everyone attending LibrePlanet, or if your organization is looking for qualified people, you can announce it on our <a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2021/JobBoard">job board</a>. The information will then be visible to everyone via LibreAdventure.</p>
-
-<hr>
-
 <a href="#trivia"><h3 id="trivia">LibrePlanet Trivia</h3></a>
 
 <p>Get your skull tool geared up for mental gymnastics at LibrePlanet
@@ -96,6 +77,11 @@ John Hsieh (FSF deputy director). The quiz is scheduled for Sunday the
   <li><strong>Third place:</strong> $50 GNU Press voucher; $50 for libre-friendly Web hosting from Vikings GmbH; $20 gift voucher for No Starch Press.</li></ul>
 <hr>
 
+<a href="#jobboard"><h3 id="jobboard">Job Board</h3></a>
+
+<p>If you want to share something with everyone attending LibrePlanet, or if your organization is looking for qualified people, you can announce it on our <a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2021/JobBoard">job board</a>. The information will then be visible to everyone via LibreAdventure.</p>
+
+<hr>
 <a href="#minetest"><h3 id="minetest">Minetest</h3></a>
 
 <p>We're running a <a href="https://www.minetest.net/">Minetest</a> game server
@@ -128,6 +114,34 @@ in the chat window below.</p>
     class="irc-client">
 </iframe>
 
+<a href="#BoF"><h3 id="BoF">Birds of a Feather</h3></a>
+
+<h4>Non-Code Contributors' BoF</h4>
+<ul>
+<h4>Hosted by Taowa</h4>
+
+<p>There are lots of contributions that aren't code: artwork, translations, design, packaging, license review, community building, organizing, activism, mentorship, user support; to name a few. For those of you whose primary involvement with the free software community falls under that category, your work can often feel like it takes a secondary role to that of those contributing code. Let's talk! </p>
+
+<ul>
+<li><strong>Time:</strong> 12:55 - 13:40 EDT, Saturday 3/20</li>
+<li><strong>Location:</strong> This BoF has ended</li>
+<li><strong>Sign up:</strong> Not necessary</li>
+</ul>
+</ul>
+<br>
+<h4>Calling all Free/Libre Founders</h4>
+<ul>
+<h4>Hosted by Wm Salt Hale</h4>
+<p>Have you (or a group of friends) started a free software project? How about a usergroup or conference? Maybe you haven't yet, but are definitely considering it. Or, have you tried to start something new and found it didn't work out the way you wanted? Have you witnessed the rise and decline of projects and events, and are you willing to share your stories? Come to the Free/Libre Founders BoF and discuss your experience!</p>
+
+<ul>
+<li><strong>Time:</strong> 14:45 - 15:30 EDT, Saturday 3/20</li>
+<li><strong>Location:</strong> This BoF has ended</li>
+<li><strong>Sign up:</strong> Not necessary </li>
+</ul>
+</ul>
+<hr>
+
 <!--#include virtual="/2021/includes/footer.html"-->
 <!--#include virtual="/2021/includes/common_js.html"-->
 <!--#include virtual="/2021/includes/close.html" -->
-- 
2.25.1