From: Dana Morgenstein Date: Tue, 21 Nov 2017 20:57:15 +0000 (-0500) Subject: minor copyedits X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=549f6298605b5fa22e2fe61649aacae243c83007;p=fsf-giving-guide.git minor copyedits --- diff --git a/v8/givingguide.html b/v8/givingguide.html index 9de561b..eedb386 100644 --- a/v8/givingguide.html +++ b/v8/givingguide.html @@ -202,7 +202,7 @@

Your smartphone is so much more than a phone: it's a tiny computer you carry with you every day, and for many people around the world, it's their only internet-enabled device. Choosing one of these phones lets you bring software freedom everywhere you go.

-

You can also get an S2 or S3, complete with replicant.

+

You can also get an S2 or S3, complete with Replicant.

@@ -294,7 +294,7 @@ @@ -463,7 +463,7 @@ @@ -787,7 +787,7 @@ @@ -829,7 +829,7 @@

There are a lot of options for where to get your literature fix without any pesky DRM. We're highlighting some publishers and shops who are offering deals for you!

  • Delphi Classics has a wide range of classic literature available in English, French, German, Italian, and Spanish. Use the code fsfdelphi for 30% off orders over $10 through the end of December.
  • Ediciones Babylon can supply you with all of your Spanish language needs for comics, art, novellas, and novels. Use the code FSFDISCOUNTEB for 5% off all the way through March 2018.
  • -
  • No Starch Press pecializes in educational, instructional, and how-to books on everything from arduinos to system administration. Use the code ETHICTECH for 40% off through January 10th, 2018.
  • +
  • No Starch Press specializes in educational, instructional, and how-to books on everything from arduinos to system administration. Use the code ETHICTECH for 40% off through January 10th, 2018.
  • @@ -858,7 +858,7 @@
    DRM-free Games
    @@ -1028,7 +1028,7 @@

    Respects Your Freedoms

    -

    The FSF certifies hardware that respecting your freedoms. These items arrive installed with free software, and you can see a complete list of RYF products on FSF.org.

    +

    The FSF certifies hardware that respects your freedoms. These items arrive installed with free software, and you can see a complete list of RYF products on FSF.org.

    We would never recommend you use, run, or give proprietary software. However, one part of RYF certification is the promise that one can install any software they wish on the device. This includes proprietary software. Free software is about many things, including the right to choose what is on your device. We urge you to keep your gifts and own devices fully free -- it's not only the responsible thing, but the right thing.

    diff --git a/v8/givingguide.html~ b/v8/givingguide.html~ index e903e44..eedb386 100644 --- a/v8/givingguide.html~ +++ b/v8/givingguide.html~ @@ -7,7 +7,7 @@ Ethical Tech | Giving Guide - + @@ -41,30 +41,6 @@ - @@ -76,13 +52,13 @@ @@ -98,7 +74,7 @@ Many of these items are FSF - + @@ -108,7 +84,7 @@ Many of these items are About the FSF
  • Campaigns
  • Donate
  • -
  • Shop +
  • Shop @@ -125,15 +101,11 @@ Many of these items are
    -

    Are you giving your loved ones tech gifts they can use freely?

    -

    Or gifts which put someone else in control?

    -

    - Electronics are popular gifts, but people often overlook the restrictions that manufacturers slip under the wrapping paper. From remote deletion of files to harsh rules about copying and sharing, some gifts take more than they give. -

    -

    More ethical options

    -

    - The good news is that there are ethical companies making better devices that your loved ones can enjoy with freedom and privacy. This is the Free Software Foundation's guide to smarter gift giving, compared with their restrictive counterparts. -

    +

    Give the gift of freedom!

    + +

    A new phone or computer can be the highlight of the holidays, but with proprietary software lurking under the wrapping paper, your thoughtful gift may be more naughty than nice.

    +

    This guide replaces these holiday humbugs with better devices from ethical companies -- no creepy remote deletion of files, no punitive and mean rules about copying and sharing. Just products and software that respect the freedom and privacy of your loved ones: gifts you can feel good about.

    +

    Plus, our crib notes below will help you explain why this version is better than the one they've heard of (and spread the word about software freedom, too).

    @@ -146,7 +118,7 @@ Many of these items are
    - Share + Tell your friends

    Use #givefreely. You might get a gift out of it!

    @@ -155,9 +127,9 @@ Many of these items are - Lead an event + Host a Giving Guide Giveaway

    - Print and distribute to holiday shoppers. + Download the printable version.

    @@ -165,9 +137,9 @@ Many of these items are - Donate instead + Support free software activism

    - Help a free software organization in a friend's name. + Donate to our suggested charities in your friend/family member's name

    @@ -183,11 +155,11 @@ Many of these items are -

    Smartphones

    +

    Smartphones

  • - Runs the Replicant free operating system, based on Android. Caveat: its modem hardware separately runs a nonfree system. +

    Your smartphone is so much more than a phone: it's a tiny computer you carry with you every day, and for many people around the world, it's their only internet-enabled device. Choosing one of these phones lets you bring software freedom everywhere you go.

    + +

    You can also get an S2 or S3, complete with Replicant.

    + + + + + + +
    +
      +
    • + Runs the Replicant free operating system, based on Android.
    • Features F-Droid, the free software catalogue that makes it easy to get all the applications you need without sacrificing control of your phone.
    • +
    • Note: While the main processor is exclusively running free software, the modem processor runs a Samsung nonfree system.
    -
    - -
    - iphone -
    iPhone
    +
    Stay away from: iPhones
    • Comes with no shortage of spyware.
    • iOS is a fully proprietary operating system, giving Apple control over the software on the devices.
    • - Apple uses DRM to block competing software. + Apple uses DRM to block competing software.
    @@ -255,15 +236,21 @@ Many of these items are Laptops, Tablets, and Desktops + + + + + + + +
    +
    • Runs the FSF-endorsed Trisquel operating system and libreboot firmware.
    • Durable hardware is meant to last and is easy to repair.
    • Created by a small business that replaces all restrictive components from a stock laptop.
    - -
    - - -
    - macbook -
    Apple Macbook Pro with macOS
    +
    Stay away from: Windows
      -
    • Runs on proprietary software that restricts the user's freedoms.
    • -
    • - Apple's App Store uses DRM to restrict what you can do with your purchases. +
    • Runs on proprietary software that profits from treating the user as a product -- each account is assigned an advertising ID to help Microsoft sell user + data.
    • -
    • Comes crawling with spyware.
    • + +
    • Mandatory Windows updates force users to test potentially unstable new versions. Read more about Windows's abuses.
    @@ -324,7 +322,7 @@ Many of these items are

    Compact Laptops

    @@ -333,6 +331,9 @@ Many of these items are
    X200 with GNU/Linux
    + + +
    Technoethical - + Vikings + + @@ -373,29 +379,38 @@ Many of these items are Technoethical - + Vikings + + + + -
    - lenovo -
    Lenovo U31 with Windows
    + +
    +
      +
    • Runs the FSF-endorsed Trisquel operating system with libreboot firmware. The X200 sold by Libiquity is also certified to Respect Your Freedom.
    • +
    • Durable hardware is meant to last and is easy to repair.
    • +
    • Created by a small business that replaces all restrictive components from a stock laptop.
    • +
      Stay away from: Apple
        -
      • Runs on proprietary software that profits from treating the user as a product -- each account is assigned an advertising ID to help Microsoft sell user - data. +
      • Runs on proprietary software that restricts the user's freedoms.
      • +
      • + Apple app stores use DRM to restrict what you can do with your purchases.
      • - -
      • Mandatory Windows updates force users to test potentially unstable new versions. Read more about Windows's abuses.
      • +
      • Comes crawling with spyware.
    @@ -404,93 +419,146 @@ Many of these items are - -
    -
  • -

    The Free Software Foundation, as a small publisher of - books, recommends not purchasing on Amazon. If you do, please use smile.amazon.com to designate a nonprofit to receive some of the money.

    -
  • - - - +
    -

    Graphic Design

    -
    - GIMP and Inskacape -
    GIMP and Inkscape
    - - - -
    -
    - GIMP - Inkscape -
    -
    - - - - -
      -
    • Free software, with thriving developer communities.
    • -
    • Designed for free formats, but can also open files created in other programs.
    • -
    • Wide variety of plugins grants limitless features.
    • -
    • Easy to install on all major operating systems.
    • -
    -
    - - -
    - adobe -
    Photoshop and Illustrator
    -
      -
    • Proprietary software controlled by Adobe.
    • -
    • Shuts down when its DRM is unable to verify the costly required subscription, even if it's actually up to date.
    • -
    • Prefers locked-down proprietary formats.
    • -
    -
    - -
    - -
    - - - - -