X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=2014%2Fanti-harassment%2Findex.html;h=38edb478577965c65903775858f14f58cbf2499e;hb=00a85a99552fd09514bb0a41139d66b3370e5fc3;hp=e9e371b0fccfa755d4280b299b401d24eef5cc8c;hpb=b89eb61aaa23c32b08da00d48cbc568b96b13618;p=libreplanet-static.git

diff --git a/2014/anti-harassment/index.html b/2014/anti-harassment/index.html
index e9e371b0..38edb478 100644
--- a/2014/anti-harassment/index.html
+++ b/2014/anti-harassment/index.html
@@ -17,7 +17,7 @@
 		  <div class="row">
 			<div class="col-sm-7"> <!-- start of lp header -->
 			  <div class="lp-head">
-				<h1><a href="/2014/"> LibrePlanet <small>2014</small></a></h1>
+				<h1><a href="/server/staging/lpc14"> LibrePlanet <small>2014</small></a></h1>
 				<p><strong>March 23rd-24th 2014 in Cambridge, MA</strong></p>
 				<p class="text-muted">The yearly conference of the free software community.</p>
 			  </div>
@@ -73,8 +73,9 @@
 
 		  <div class="col-sm-3"> <!-- start of nav items -->
 			<ul class="nav nav-pills nav-stacked">
-			  <li><a href="#">Videos from LP 2013</a></li>
-			  <li><a href="#">Previous years</a></li>
+			  <li><a href="#">Call for proposals</a></li>
+			  <li><a href="http://libreplanet.org/wiki/LibrePlanet:Conference/2013/Video"> LibrePlanet 2013 videos</a></li>
+			  <li><a href="https://libreplanet.org/wiki/LibrePlanet:Conference">Previous conferences</a></li>
 			  <li class="active"><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>
 			</ul>
 			<div class="fsf-donate-button">
@@ -90,67 +91,43 @@
 
 			<h2> Anti-harassment policy </h2>
 
-			<p>
-			  <em>Libby Reinish, FSF campaigns manager, is the contact
-				person for any reports of violations of the
-				anti-harassment policy during LibrePlanet 2013. If you
-				need to file a report, find Libby or call her at
-				413-275-4786</em>
-			</p>
-
-			<p>
-			  The FSF is dedicated to providing a harassment-free LibrePlanet experience for everyone.
-			</p>
-
-			<ul>
-			  <li>
-				We do not tolerate harassment of conference
-				participants in any form. Offensive or graphic sexual
-				language and imagery is not appropriate for any
-				conference venue, including talks.</li>
-			  
-			  <li> Conference participants violating these rules may
-			  be sanctioned or expelled from the conference at the
-			  discretion of the conference organizers.</li>
-
-			  <li>Harassment includes offensive verbal comments
-			  related to gender, sexual orientation, disability,
-			  physical appearance, body size, race, religion, sexual
-			  images in public spaces, deliberate intimidation,
-			  stalking, following, harassing photography or recording,
-			  sustained disruption of talks or other events,
-			  inappropriate physical contact, and unwelcome sexual
-			  attention.</li>
-
-			  <li>Participants asked to stop any harassing behavior
-			  are expected to comply immediately.</li>
-
-			  <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>
-
-			  <li>If you are being harassed, notice that someone else
-			  is being harassed, or have any other concerns, please
-			  contact a member
-			  of <a href="http://www.fsf.org/about/staff"> FSF
-			  staff</a> immediately. FSF staff are available in every
-			  conference track and at the information desk throughout
-			  the conference.</li>
-
-			  <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>
-
-			  <p>
-				<strong>We value your attendance.</strong>
-			  </p>
-
-			  <hr />
+			<p><i>Libby Reinish, FSF campaigns manager, is the contact person for any reports of 
+	  violations of the anti-harassment policy during the event. If you need to file a 
+	  report, find Libby or call her at <strong>413-275-4786</strong>.</i>
+  </p>
+  <p>The FSF is dedicated to providing a harassment-free experience for everyone. 
+  </p>
+  <ul><li> We do not tolerate harassment of conference participants in any form. Offensive 
+	  or graphic sexual language and imagery is not appropriate for any conference venue, 
+	  including talks. 
+  </li></ul>
+  <ul><li> Conference participants violating these rules may be sanctioned or expelled from 
+	  the conference at the discretion of the conference organizers.
+  </li></ul>
+  <p>Harassment includes offensive verbal comments related to gender, sexual orientation, 
+	disability, physical appearance, body size, race, religion, sexual images in public 
+	spaces, deliberate intimidation, stalking, following, harassing photography or recording, 
+	sustained disruption of talks or other events, inappropriate physical contact, and 
+	unwelcome sexual attention. 
+  </p>
+  <ul><li> Participants asked to stop any harassing behavior are expected to comply 
+	  immediately.
+  </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 <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.
+  </li></ul>
+  <ul><li> Conference staff will be happy to help participants contact 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>
+  <p><strong>We value your attendance and hope you enjoy the conference.</strong></p>
+ 			  <hr />
 
 			  <p class="text-muted">This policy is based on several
 			  other policies, including the OLF anti-harassment
@@ -173,14 +150,11 @@
 		<p class="text-muted text-center">
 		  The <a href="http://www.fsf.org/">Free Software
 		  Foundation</a> is a nonprofit with a worldwide mission to
-		  advance software freedom learn about our history and
-		  work.</p>
+		  advance software freedom.</p>
 
-		  <p class="text-muted text-center"> Copyright &copy; 2013 Free Software Foundation, Inc.<br>
+		  <p class="text-muted text-center"><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a>  This page and its images, logos and videos are licensed under a<br><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>. Copyright &copy; 2013 Free Software Foundation.</p>
 
-<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a>  This page and its images, logos and videos are licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>. Credit: Free Software Foundation.<br>
-
-			<a href="/2014/javascript/" rel="jslicense">Javascript license information.</a>
+			<p class="text-muted text-center"><a href="/2014/javascript/" rel="jslicense">Javascript license information.</a>
 		</p>
 
 	  </div>