From: Zak Rogoff Date: Thu, 19 Nov 2015 19:11:40 +0000 (-0500) Subject: Blocking out most of the major changes to the guide, especially adding new images. X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=42c99b232cdc0d93faaf212574cd5005802e49a7;p=fsf-giving-guide.git Blocking out most of the major changes to the guide, especially adding new images. --- diff --git a/README.md b/README.md index 356d715..592a7bc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ -# FSF Holiday Giving Guide +# FSF Holiday Giving Guide README + +## Adding images +Make sure that, for side-by-side comparisons, both images are a similar height -Give freely this holiday season! ## Hacking diff --git a/givingguide-dev.html b/givingguide-dev.html index 64fd8be..667234b 100755 --- a/givingguide-dev.html +++ b/givingguide-dev.html @@ -3,781 +3,742 @@ - 2014 Holiday Giving Guide | Free Software Foundation | Working together for free software + Holiday Giving Guide | Free Software Foundation | Working together for free software - + - - - + + + - - - + + + -
-
- -
- - - - -
- -
- - - - join - -
- -
- -
- Giving Guide -
- -
-

Are you giving your loved ones holiday gifts they can use freely, or gifts which put someone else in control?

-

Electronics are popular gifts for the holidays, 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. 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 (FSF) guide to smarter gifts, compared with their restrictive - counterparts. -

-

Like this guide? Download the printable version (translations welcome!) and organize a Giving - Guide Giveaway to share it with your community. And remember: donating to a charity in someone's name is at least as meaningful as buying them an electronic device.

-
-
- -
-
- - - -
- -
- - - - -
- - - - -
-

3D Printers

- -
-
- good - TAZ 4.0 -
- -

Lulzbot TAZ 4.0

-
    - - -
  • - Respects Your Freedom-certified by the FSF to run with all free software, making 3D printing more accessible and encouraging innovation. -
    • - -
  • - Supports tetherless printing, optional Dual Extruder upgrade, and exotic filaments including wood-, rubber- and stone-like materials. -
    • -
  • Hardware designs available to make modification and improvement easy.
    • - -
- -
- -
-
- bad - Makerbot Replicator 2 -
- -

Makerbot Replicator 2

-
    -
  • - MakerWare software is proprietary, restricting freedom and stifling innovation. -
    • - -
  • - Recently announced an increasingly proprietary approach, further distancing itself from the free software community. -
    • -
- -
- - -
-
-
- Buy - -
+
+
+ +
+ + + + +
+ +
+ -
- avoid + + join +
-
-
- -
+
+
+ Giving Guide +
- - -
-

Ebooks

- -
-
- good - Project Gutenberg -
- -

Project Gutenberg

- -
    -
  • All of the ebooks are gratis, including classics like Peter Pan and Huck Finn.
    • -
  • The original purveyor of eBooks free of DRM (Digital Restrictions Management), inspiring many others.
    • -
  • Enjoy the freedom to read your ebooks on any device.
    • -
- -
- -
-
- bad - Amazon -
- -

Amazon

- - -
- - -
-
-
- Download - -
- -
- avoid -
+
+

Are you giving your loved ones holiday gifts they can use freely, or gifts which put someone else in control?

+

Electronics are popular gifts for the holidays, 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. 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 (FSF) guide to smarter gifts, compared with their restrictive + counterparts. +

+

Like this guide? Download the printable version (translations welcome!) and organize a Giving + Guide Giveaway to share it with your community. And remember: donating to a charity in someone's name is at least as meaningful as buying them an electronic device.

+
+
+
-
- -
+ -
-
-

Laptops

- -
-
- good - ThinkPenguin GNU/Linux Notebook -
- -

ThinkPenguin GNU/Linux Notebook

- - - -
- -
-
- bad - Apple Macbook Pro - -
- -

Apple Macbook Pro

-
    -
  • - 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. -
    • -
  • Comes crawling with spyware.
    • -
  • - Planned obsolescence: business model forces you to buy new devices frequently. -
    • -
-
-
- - -
-
-
- Buy - -
- -
- avoid -
-
-
- - + + + - - - +
-
-

Graphic Design

- -
-
- good - GIMP and Inkscape -
- -

GIMP and 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.
    • -
- -
- -
-
- bad - Photoshop and Illustrator -
- -

Photoshop and Illustrator

-
    -
  • Proprietary software controlled by Adobe.
    • -
  • Prefers locked-down proprietary formats.
    • -
  • Requires costly upgrades to stay up to date.
    • -
- -
-
- - -
-
-
- Download - -
- -
- avoid -
-
-
- - -
-
-

Operating Systems

- -
-
- good - Trisquel GNU/Linux -
- -

Trisquel GNU/Linux

-
    -
  • - FSF-endorsed completely free operating system: transparent and modifiable. -
    • - -
  • - Break the cycle of forced upgrades and planned obsolescence. -
    • - -
  • - Comes with all the software you need and an easy software manager to find more. -
    • -
  • Works great with the Wi-Fi adapters in this guide.
    • -
- - - -
- -
-
- bad - Windows -
- -

Windows

-
    -
  • - Proprietary software that profits from controlling how you use your computer. -
    • - -
  • - Invades privacy and exposes personal data to Microsoft, the NSA, and other malicious attackers. -
    • - -
  • - Dependent on mandatory upgrades and devices that don't support older versions of Windows. -
    • -
+
+

3D Printers

-
+
+
+ good + TAZ 4.0 +
- -
-
-
- Download - -
+

Lulzbot TAZ 4.0

+
    -
    - avoid -
    -
-
- -
-
-
-

Gift Cards

+
  • + Respects Your Freedom-certified by the FSF to run with all free software, making 3D printing more accessible and encouraging innovation. +
    • -
    -
    - good - FSF Membership Card -
    - -

    FSF Membership Card

    - +
  • + Supports tetherless printing, optional Dual Extruder upgrade, and exotic filaments including wood-, rubber- and stone-like materials. +
    • +
  • Hardware designs available to make modification and improvement easy.
    • + +
    -
    - bad - iTunes Card -
    - -

    iTunes Card

    -
      -
    • DRM - on everything (except music) controls what you can do with your purchases. -
      • - -
    • Apple claims (wrongly) that you don't actually own anything you buy from the iTunes store.
      • - -
    • Requires proprietary software to use, even to download DRM-free music.
      • -
    - -
    -
    - - -
    -
    -
    - Buy - -
    - -
    - avoid -
    -
    -
    - - -
    - -
    -

    Mobile OS

    - -
    -
    - good - Replicant -
    - -

    Replicant

    -
      -
    • - Fully free software, based on Android. -
      • - -
    • - - Supported devices - include both phones and tablets. -
      • - -
    • - Works on used devices, so your dollars won't go to proprietary OS companies. (All commercially - available Android devices ship with some proprietary software.) -
      • -
    +
    + bad + Makerbot Replicator 2 +
    +

    Makerbot Replicator 2

    +
      +
    • + MakerWare software is proprietary, restricting freedom and stifling innovation. +
      • -
    +
  • + Recently announced an increasingly proprietary approach, further distancing itself from the free software community. +
    • + -
    -
    - bad - Apple iPhone, iPad and Watch
    -

    Apple iPhone, iPad and Watch

    -
      -
    • 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. -
      • - -
    -
    - - -
    -
    -
    - Download - -
    - -
    - avoid -
    + +
    +
    +
    + Buy + +
    + +
    + avoid +
    +
    -
    - +
    -
    -
    -

    Online Storage

    +
    +

    Routers

    -
    - good - Least Authority -
    - -

    Least Authority File System

    - -
      -
    • - Free software system guarantees that you control who sees your data. -
      • - -
    • - Decentralized infrastructure protects from attacks and give you flexibility in how your data is stored. -
      • - -
    • - Client side encryption to prevent snooping, unlike Google Drive, Dropbox, Apple iCloud, Microsoft SkyDrive, and Ubuntu One. -
      • -
    - -
    +
    + good + TAZ 4.0 +
    -
    -
    - bad - Google Drive -
    +

    ThinkPenguin Router

    +
      +
    • + High speed wireless router running FSF-endorsed LibreCMC operating system. +
      • -

      Google Drive

      - -
    • - Requires granting Google a virtually unlimited license to any public data, and also having your public and personal data mined for ads. -
      • +
    -
  • - Data may be accessed by - intelligence agencies. -
    • +
    +
    + bad + Linksys WRT1900AC Wireless AC Router +
    - +

    Linksys WRT1900AC Wireless AC Router

    +
      +
    • + PLACEHOLDER bullets that are bad. +
      • -
    -
    +
  • + Angry, angry placeholder bullets.
    • + - -
    -
    -
    - Try -
    -
    - avoid + +
    +
    +
    + Buy + +
    + +
    + avoid +
    +
    -
    -
    - + -
    +
    -
    -

    Media Hosting

    - -
    -
    - good - GNU MediaGoblin -
    - -

    GNU MediaGoblin

    - -
      -
    • - Soon-to-be federated to allow decentralized sharing. -
      • +

      Ebooks

      -
    • Supports free video formats and grants the ability to choose a copyleft license.
      • +
      +
      + good + Project Gutenberg +
      -
    • Source files can be attached to an upload, making it easy to remix people's work.
      • +

      Project Gutenberg

      +
        +
      • All of the ebooks are gratis, including classics like Peter Pan and Huck Finn.
        • +
      • The original purveyor of eBooks free of DRM (Digital Restrictions Management), inspiring many others.
        • +
      • Enjoy the freedom to read your ebooks on any device.
        • +
      -
    - -
    - -
    -
    - bad - YouTube
    -

    YouTube

    -
      -
    • - Uses proprietary Adobe Flash player and patent-encumbered H.264 codec by default. -
      • -
    • - Even the optional HTML5 player requires proprietary JavaScript. -
      • -
    • - Implements DRM to control access to videos by device and region. -
      • - -
    • - Imposes advertising on your uploads and polices copyright harshly. -
      • -
    +
    +
    + bad + Amazon +
    + +

    Amazon

    + + +
    + + +
    +
    +
    + Download + +
    + +
    + avoid +
    +
    +
    + -
    -
    -
    - - -
    -
    -
    - Try it - -
    - -
    - avoid -
    -
    -
    - +
    -
    +
    +
    +

    Larger Laptops

    + +
    +
    + good + Minifree T400 Notebook with Libreboot +
    + +

    Minifree GNU/Linux laptop with free boot firmware

    + +
      + +
    • + Comes installed with a free OS, and its Wi-Fi and 3D-accelerated graphics work with any other fully free GNU/Linux distribution. +
      • + +
    • PLACEHOLDER RYF certification/libreboot bullet. Maybe first commercially available...?
      • + +
    + +
    + +
    +
    + bad + Apple Macbook Pro + +
    + +

    Apple Macbook Pro

    +
      +
    • + 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. +
      • +
    • Comes crawling with spyware.
      • +
    • + Planned obsolescence: business model forces you to buy new devices frequently. +
      • +
    +
    +
    + + +
    +
    +
    + Buy + +
    + +
    + avoid +
    +
    +
    + - +
    -
    -

    More Recommended Products

    +
    +
    +

    Smaller Laptops

    + +
    +
    + good + Libiquity X200 Notebook with Libreboot +
    + +

    Libiquity GNU/Linux laptop with free boot firmware

    + +
      + +
    • + Comes installed with a free OS, and its Wi-Fi and 3D-accelerated graphics work with any other fully free GNU/Linux distribution. +
      • + +
    • PLACEHOLDER RYF certification/libreboot bullet. Maybe first commercially available...?
      • + +
    + +
    + +
    +
    + bad + Apple Macbook Pro + +
    + +

    Apple Macbook Pro

    +
      +
    • + 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. +
      • +
    • Comes crawling with spyware.
      • +
    • + Planned obsolescence: business model forces you to buy new devices frequently. +
      • +
    +
    +
    + + +
    +
    +
    + Buy + +
    + +
    + avoid +
    +
    +
    + -
    +
    -
    - Tehnoetic dongle Wi-Fi adapter -

    Tehnoetic dongle Wi-Fi adapter

    -

    Great for all-free-software installations on laptops with incompatible Wi-Fi hardware. Certified to Respect Your Freedom. Discount code: FSFGIVING.

    -
    - Buy - -
    -
    +
    +
    +

    Graphic Design

    + +
    +
    + good + GIMP and Inkscape +
    + +

    GIMP and 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.
      • +
    + +
    + +
    +
    + bad + Photoshop and Illustrator +
    + +

    Photoshop and Illustrator

    +
      +
    • Proprietary software controlled by Adobe.
      • +
    • Prefers locked-down proprietary formats.
      • +
    • Requires costly upgrades to stay up to date.
      • +
    + +
    +
    + + +
    +
    +
    + Download + +
    + +
    + avoid +
    +
    +
    + -
    - ThinkPenguin Wi-Fi N router -

    ThinkPenguin Wi-Fi N router

    -

    High speed wireless router running FSF-endorsed LibreCMC operating system. Certified to Respects Your Freedom. Discount code: FSFGIVING.

    +
    +
    +

    Operating Systems

    + +
    +
    + good + Trisquel GNU/Linux +
    + +

    Trisquel GNU/Linux

    +
      +
    • + FSF-endorsed completely free operating system: transparent and modifiable. +
      • + +
    • + Break the cycle of forced upgrades and planned obsolescence. +
      • + +
    • + Comes with all the software you need and an easy software manager to find more. +
      • +
    • Works great with the Wi-Fi adapters in this guide.
      • +
    + + + +
    + +
    +
    + bad + Windows +
    + +

    Windows

    +
      +
    • + Proprietary software that profits from controlling how you use your computer. +
      • + +
    • + Invades privacy and exposes personal data to Microsoft, the NSA, and other malicious attackers. +
      • + +
    • + Dependent on mandatory upgrades and devices that don't support older versions of Windows. +
      • +
    + + +
    + + +
    +
    +
    + Download + +
    + +
    + avoid +
    +
    +
    + -
    - Buy - -
    -
    +
    +
    +
    +

    Gift Cards

    + +
    +
    + good + FSF Membership Card +
    + +

    FSF Membership Card

    + + +
    + +
    +
    + bad + iTunes Card +
    + +

    iTunes Card

    +
      +
    • DRM + on everything (except music) controls what you can do with your purchases. +
      • + +
    • Apple claims (wrongly) that you don't actually own anything you buy from the iTunes store.
      • + +
    • Requires proprietary software to use, even to download DRM-free music.
      • +
    + +
    +
    + + +
    +
    +
    + Buy + +
    + +
    + avoid +
    +
    +
    + -
    - Tehnoetic dongle Wi-Fi adapter -

    ThinkPenguin dongle Wi-Fi adapter

    -

    Great for all-free-software installations on laptops with incompatible Wi-Fi hardware. Certified to Respect Your Freedom.

    -
    - Buy - -
    -
    -

    If you have ideas for more gifts that can be given freely, submit your recommendations to our - growing page. -

    - -
    - - - -

    Recommended charities for holiday donations

     -

    Electronic Frontier Foundation, - Creative Commons, - Wikimedia Foundation, - Software Freedom Conservancy, - Software Freedom Law Center, - GNOME Foundation and - Free Software Foundation.

    - - - -
    - - - -
    -

    More devices on h-node

    -

    To learn more about which hardware supports free software and which doesn't, explore the community-run h-node database.

    -
    - - - - -
    -

    Licenses

    -

    This page by the Free Software Foundation is licensed under a Creative Commons Attribution-ShareAlike 4.0 Unported. -

    -

    The graphics and photos used on this page have been modified by the Free Software Foundation and are licensed separately under the following terms:

    - - -
    - - - - - -
    - - +
    +

    Smartphone

    + +
    +
    + good + Replicant +
    + +

    Replicant

    +
      +
    • + Fully free software, based on Android. +
      • + +
    • + + Supported devices + include both phones and tablets. +
      • + +
    • + Works on used devices, so your dollars won't go to proprietary OS companies. (All commercially + available Android devices ship with some proprietary software.) +
      • +
    + + +
    + +
    +
    + bad + Apple iPhone +
    + +

    Apple iPhone

    +
      +
    • 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. +
      • + +
    +
    + + +
    +
    +
    + Download + +
    + +
    + avoid +
    +
    +
    + - - +
    + + +
    +

    More Recommended Products

    + +
    + +
    + Tehnoetic dongle Wi-Fi adapter +

    Tehnoetic dongle Wi-Fi adapter

    +

    Great for all-free-software installations on laptops with incompatible Wi-Fi hardware. Certified to Respect Your Freedom. Discount code: FSFGIVING.

    +
    + Buy + +
    +
    + +
    + Tehnoetic dongle Wi-Fi adapter +

    ThinkPenguin dongle Wi-Fi adapter

    +

    Great for all-free-software installations on laptops with incompatible Wi-Fi hardware. Certified to Respect Your Freedom.

    +
    + Buy + +
    +
    +

    If you have ideas for more gifts that can be given freely, submit your recommendations to our + growing page. +

    + +
    + + + +

    Recommended charities for holiday donations

     +

    Electronic Frontier Foundation, + Creative Commons, + Wikimedia Foundation, + Software Freedom Conservancy, + Software Freedom Law Center, + GNOME Foundation and + Free Software Foundation.

    + + + +
    + + + +
    +

    More devices on h-node

    +

    To learn more about which hardware supports free software and which doesn't, explore the community-run h-node database.

    +
    + + + + +
    +

    Licenses

    +

    This page by the Free Software Foundation is licensed under a Creative Commons Attribution-ShareAlike 4.0 Unported. +

    +

    The graphics and photos used on this page have been modified by the Free Software Foundation and are licensed separately under the following terms:

    + + +
    + + + + + + + + + diff --git a/stylesheet.css b/stylesheet.css index a0418a1..0e6aaad 100755 --- a/stylesheet.css +++ b/stylesheet.css @@ -70,7 +70,7 @@ h6 { font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b background-color: #2CAF8F; height: 486px; margin: auto; - width: 100%; + width: 100%; /*width: 1300px;*/ } @@ -375,7 +375,7 @@ h6 { font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b footer { display: block; background-color: #1a1a1a; - width: 100%; + width: 100%; /*width: 1300px;*/ }