slight adjustments

[fsf-giving-guide.git] / v13 / givingguide.html

diff --git a/v13/givingguide.html b/v13/givingguide.html
index 42402942d409019b87d174b6cf480e8a8a6e524a..7be4070d3028441bf9133661a71e49f59e7163c9 100644 (file)
--- a/v13/givingguide.html
+++ b/v13/givingguide.html
@@ -515,7 +515,7 @@ window.addEventListener("keydown",  function  (event)  {
         <ul class="nav navbar-nav">
           <li><a class="animated fadeIn" href="https://www.fsf.org/about/">About the FSF</a></li>
           <li><a class="animated fadeIn" href="https://www.fsf.org/campaigns/">Campaigns</a></li>
-          <li><a class="animated fadeIn" href="https://my.fsf.org/join?pk_campaign=fall22&pk_kwd=ggjoin">Join</a></li>
+          <li><a class="animated fadeIn" href="https://my.fsf.org/join?mtm_campaign=fall22&mtm_kwd=ggjoin">Join</a></li>
           <li><a class="animated fadeIn" href="https://shop.fsf.org/">Shop</a>
           </ul>
 
@@ -962,11 +962,12 @@ it's the laptop that's most frequently used in the FSF office!</p>
             <div class="good col-md-6 col-sm-6">
              <h5 class="text-center">Promising Communities & Companies</h5>
              <ul class="pros">
-               <p>Each and every day, free software reaches more devices and is used in more and more interesting contexts. While we haven't evaluated these products specifically in our <a href="https://ryf.fsf.org">RYF program</a>, we're including mentions of certain communities who are going in the right direction when it comes to freedom, but who aren't fully there yet. They're already making waves, but need the help of technical users in crossing the freedom "finish line" to full acceptability.</p>
+               <p>Each and every day, free software reaches more devices and is used in more interesting contexts. While we haven't evaluated these products specifically in our <a href="https://ryf.fsf.org">RYF program</a>, we're including mentions of certain communities who are going in the right direction when it comes to freedom, but who aren't fully there yet. They're already making waves, but need the help of developers or technical users in crossing the freedom "finish line" to full acceptability.</p>
                <li><a href="https://mntre.com/">MNT</a>'s Reform laptop is promising from a free software perspective. If the nonfree RAM training were to be replaced by the community, we have reason to believe it would be fully compatible with your freedom.</li>
-               <li><a href="https://pine64.org">PINE64</a> is a company and user community making a variety of laptops, smartwatches, ereaders, and more.</li>
                <li><a href="https://puri.sm">Purism</a>'s devices ship with the PureOS distribution of the GNU/Linux operating system, one that is more freedom-friendly than popular distributions like Mint or Ubuntu.</li>
+               <li><a href="https://pine64.org">PINE64</a> is a company and user community making a variety of laptops, smartwatches, ereaders, and more. The freedom status of these devices vary, but the project has made positive progress in a short time, piquing the interest of many in the free software community.</li>
              </ul>
+             <p>If you know of a project or company we've missed who are <em>earnestly</em> working to free their devices, but who need a little help in doing so, <a href="mailto:campaigns@fsf.org">please let us know!</a></p>
            </div>
            <div class="good col-md-6 col-sm-6">
              <h5 class="text-center">Caveats</h5>
@@ -1098,7 +1099,7 @@ it's the laptop that's most frequently used in the FSF office!</p>
          <div class="good col-md-6 col-sm-6" style="position:relative">
            <h2 class="text-center">Help the FSF</h2>
            <p>
-             If you're in the Boston area and would like to volunteer some time in support of free software and the FSF's mission, get in touch with us! We're always in need of help stuffing envelopes, scanning copyright assignments, and more.</p>
+             If you're in the Boston area and would like to volunteer some time in support of free software and the FSF's mission, get in touch with us! We're always in need of help stuffing envelopes, scanning copyright assignments, and more. One great place to get involved in volunteering is our upcoming <a href="https://libreplanet.org/2023/">LibrePlanet 2023</a> conference.</p>
            <p>Do you have a product that you think is eligible for RYF certification? Read our <a href="https://ryf.fsf.org/about/vendors">information for hardware vendors</a> to find out.</p>
          </div>
 <!--           <div class="good col-md-6 col-sm-6" style="position:relative"> -->