Merge branch 'stable' of vcs.fsf.org:libreplanet-static into stable
[libreplanet-static.git] / 2014 / anti-harassment / index.html
index 1f694183ad0a5ddcc17d51c86fe994b42ceac341..0033953d5758b3cdd64474d4c7ef9281df52340f 100644 (file)
@@ -17,9 +17,9 @@
                  <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>
+                               <p class="text-muted">The yearly conference of the free software community</p>
                          </div>
                        </div><!-- end of lp header -->
                        <div class="col-sm-5"> <!-- start of signup form -->
@@ -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">
                        <h2> Anti-harassment policy </h2>
 
                        <p><i>Libby Reinish, FSF campaigns manager, is the contact person for any reports of 
-         violations of the anti-harassment policy during the celebration. If you need to file a 
-         report, find Libby or call her at 413-275-4786.</i>
+         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>The FSF is dedicated to providing a harassment-free experience for everyone. 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> 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 
+  </li>
+<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 
                                                                                                                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 hotel/venue security 
+  <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>
                  Foundation</a> is a nonprofit with a worldwide mission to
                  advance software freedom.</p>
 
-                 <p class="text-muted text-center"> Copyright &copy; 2013 Free Software Foundation, Inc.<br>
-
-<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><br>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>. Credit: Free Software Foundation.</p>
+                 <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>
 
                        <p class="text-muted text-center"><a href="/2014/javascript/" rel="jslicense">Javascript license information.</a>
                </p>