A bunch more final edits to bring the site up to ready to launch.

diff --git a/2016/index.html b/2016/index.html
index a8cae78979acc574a67f0103f3d363745e311824..35d30020c031a0397834f89c9e32ec289b300bb6 100755 (executable)
--- a/2016/index.html
+++ b/2016/index.html
@@ -21,7 +21,7 @@
                        <li class="item">
                                <img src="//static.fsf.org/nosvn/images/best-event-photos/lp2015-open-house-848x477.jpg"
                                alt="[ Open house at LibrePlanet 2015 ]">
-                               <p class="lead carousel-caption-bl"> <a href="https://my.fsf.org/associate/support_freedom">Join the Free Software Foundation</a> and get<br />gratis conference admission and other perks.
+                               <p class="lead carousel-caption-bl"> <a href="https://crm.fsf.org/join">Join the Free Software Foundation</a> and get<br />gratis conference admission and other perks.
                                </p>
                        </li>
 
@@ -156,9 +156,9 @@ Get excited for our keynote speakers!
 
 <!-- end of notification area -->
 
-<p class="lead">LibrePlanet is an annual conference for free software enthusiasts. LibrePlanet brings together software developers, policy experts, activists and computer users to learn skills, share accomplishments and face challenges to software freedom. Newcomers are always welcome, and LibrePlanet 2016 will feature programming for all ages and experience levels.</p>
+<p class="lead">LibrePlanet is an annual conference hosted by the <a href="https://www.fsf.org">Free Software Foundation</a>. It brings together software developers, policy experts, activists, and computer users to learn skills, share accomplishments, and address challenges facing the free software movement.</p>
 
-<p>This year, the theme of LibrePlanet is "Fork the System." Instead of focusing on software, we'll look at the role of forks in our lives. Big forks, small forks, forks stuck in pasta and forks in the Home & Bath section of National Wholesale Liquidators. If you wanted to come to a conference about free software, sorry!</p>
+<p>Organized around the theme "Fork the System," the conference's sessions will examine how free software creates the opportunity of a new path for its users, allows developers to fight the restrictions of a system dominated by proprietary software by creating free alternatives, and is the foundation of a philosophy of freedom, sharing, and change.</p>
 
 <p>FSF members and students attend LibrePlanet at no cost! <a href="https://crm.fsf.org/join">Become a member now</a>.<!-- Registration opens in October - sign up above to receive updates.--></p>
 

diff --git a/2016/safe-space-policy/index.html b/2016/safe-space-policy/index.html
index d29dc8b8bb15c3209cd1cbbb4ca89826d51ff3b8..fd94edcb21a0a6ca4a4d58cefa820c61b863c827 100755 (executable)
--- a/2016/safe-space-policy/index.html
+++ b/2016/safe-space-policy/index.html
@@ -20,7 +20,7 @@
 </li></ul>
 <ul><li> If a participant engages in harassing behavior, the conference organizers may take any action they deem appropriate, including warning the offender or expulsion from the conference.
 </li></ul>
-<ul><li> If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of the <a href="http://www.fsf.org/about/staff" class="external text" rel="nofollow">FSF staff</a> immediately. FSF staff are available in every conference track and at the information desk throughout the conference.
+<ul><li> If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of the FSF staff immediately. FSF staff are available in every conference track and at the information desk throughout the conference.
 </li></ul>
 <ul><li> Conference staff will be happy to help participants contact hotel/venue security or local law enforcement, provide escorts, or otherwise assist those experiencing harassment to feel safe for the duration of the conference.
 </li></ul>

diff --git a/server/2016/banner.html b/server/2016/banner.html
index 0b07c9b95234076c48e3eebd5f0a7d43caa976b3..b813d673c95071de9c88e6126e5b72134d7fbce6 100755 (executable)
--- a/server/2016/banner.html
+++ b/server/2016/banner.html
@@ -24,7 +24,7 @@
             <!-- Start of register button -->
                <div class="col-sm-offset-3 col-sm-3 col-xs-12">
                  <a class="btn btn-register btn-lg btn-block"
-                    href="https://my.fsf.org/civicrm/event/info?reset=1&amp;id=29">
+                    href="https://my.fsf.org/civicrm/event/register?id=29&reset=1">
                    Register now
                  </a>
                  <p class="text-muted text-center">