From: Molly de Blanc <molly@fsf.org>
Date: Tue, 4 Sep 2018 21:20:13 +0000 (-0400)
Subject: updated for merge conflicts.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9e20778d9ae3426952c23941cbca65cb8b4a5c0e;p=libreplanet-static.git

updated for merge conflicts.
---

9e20778d9ae3426952c23941cbca65cb8b4a5c0e
diff --cc 2019/includes/banner.html
index 3fb9eab7,265d8ce6..684178ad
--- a/2019/includes/banner.html
+++ b/2019/includes/banner.html
@@@ -16,8 -16,8 +16,8 @@@
                              <!-- Heads up! When updating this date and place information,
                                   remember to update it in the small
                                   screen navbar too (see below) -->
- 			      <p><br><strong>March 23 - 24th, 2019<br />
- 			      Greater Boston Area</strong></p>
 -			      <p><br><strong>March 23rd - 24th<br />
++		      <p><br><strong>March 23rd - 24th<br />
+ 			      Greater Boston area</strong></p>
  			  </div>
                            <!-- #top-right-desktop start -->
                            <!--#include virtual="/2019/includes/join-list.html"-->
@@@ -49,7 -49,7 +49,7 @@@
              <p class="navbar-text">
                 <!-- Heads up! When updating date place, remember to
                 update it in the lp banner too (see above) -->
--	        <strong>March 23 - 24th<br />Greater Boston Area</strong>
++	        <strong>March 23rd - 24th<br />Greater Boston Area</strong>
  	    </p>
            </div>
  
diff --cc 2019/includes/home-content.html
index 2a5a4fb4,a1703d22..22b4247f
--- a/2019/includes/home-content.html
+++ b/2019/includes/home-content.html
@@@ -9,7 -9,10 +9,8 @@@
      freedom. Newcomers are always welcome, and LibrePlanet 2019
      will feature programming for all ages and experience levels.
  </p>
 -
 -<!--Theme paragraphs -->
  <p>
- LibrePlanet 2019's theme is <b>"Trailblazing Free Software</b>." In 1983, the free software movement was born with the publication of the GNU Manifesto. Free Software Foundation founder Richard Stallman saw that proprietary code -- that which could not be shared -- prevented people from changing the computer code they were using (for example, to fix a problem in the code, or to make it suit the user's purpose). And by emphasizing a community-oriented philosophy of sharing code freely, people could more easily make useful software -- new concepts were more easily brought to life because they could build off others' copylefted code, and they could pay forward those benefits by allowing others to view their code and offer their own changes. These packages have great potential to become widely used.
+ LibrePlanet 2019's theme is “<b>Trailblazing Free Software</b>.” In 1983, the free software movement was born with the publication of the GNU Manifesto. FSF founder Richard Stallman saw the dangers of proprietary code from the beginning: when code was kept secret from users, they would be controlled by the technology they used, instead of vice versa. In contrast, free software emphasized a community-oriented philosophy of sharing code freely, enabling people to understand how the programs they used worked, to build off of each other's code, to pay it forward by sharing their own code, and to create useful software that treated users fairly.</p>
+ <p>When he identified control over one's own computer as a requirement for ethical, trustworthy computing, Stallman anticipated some of the most toxic aspects of today's proprietary software-filled world, including Digital Restrictions Management (DRM), bulk surveillance, and Service as a Software Substitute (SaaSS). With a new and growing generation of free software enthusiasts, we can take this conference as an opportunity to discuss both the present and the future of the free software movement. Using the Four Freedoms as a litmus test for ethical computing, we ask, "How will free software continue to bring to life trailblazing, principled new technologies and new approaches to the world?"
  </p>