From 461002bfc4a72443e982eb00b1fd6a0c03421676 Mon Sep 17 00:00:00 2001 From: Reda Lazri Date: Sat, 22 Nov 2014 15:18:37 +0100 Subject: [PATCH] Fix div nesting --- givingguide.html | 924 +++++++++++++++++++++++------------------------ 1 file changed, 457 insertions(+), 467 deletions(-) diff --git a/givingguide.html b/givingguide.html index 9451a9d..3d81262 100755 --- a/givingguide.html +++ b/givingguide.html @@ -74,10 +74,13 @@ - +
-
+ + + +

Operating System

@@ -121,7 +124,7 @@
  • Invades privacy and exposes personal data to Microsoft, - the NSA, and other malicious attackers + the NSA, and other malicious attackers
  • @@ -132,7 +135,7 @@
    • - +
    @@ -145,523 +148,511 @@
    - + -
    +
    +
    +

    3D Printers

    -
    -

    3D Printers

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

    Lulzbot TAZ 4.0

    +
      +
    • + Contact Lulzbot sales and mention this guide to receive gratis shipping and filament with your TAZ. +
      • -

      Lulzbot TAZ 4.0

      -
        -
      • - Contact Lulzbot sales and mention this guide to receive gratis shipping and filament with your TAZ. -
        • +
      • + Respects Your Freedom-certified by the FSF to run with all free software, making 3D printing more accessible and encouraging innovation. +
        • -
      • - 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.
        • +
      -
    • - 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 -
      • - -
    • - Hardware patents threaten free printers like the Lulzbot -
      • - -
    • - Recently announced an increasingly proprietary approach, further distancing itself from the free software community -
      • -
    - -
    - - -
    -
    -
    - Buy -
    -
    - avoid -
    -
    -
    - - -
    - - - - -
    -

    Ebooks

    - -
    -
    - good - Project Gutenberg -
    - -

    Project Gutenberg

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

    Makerbot Replicator 2

    +
      +
    • + MakerWare software is proprietary, restricting freedom and stifling innovation +
      • -

      Amazon

      -
        -
      • - Amazon can remotely block or delete individual ebooks or your entire library with no warning or explanation (they've done - it before). -
        • +
      • + Hardware patents threaten free printers like the Lulzbot +
        • -
      • - Amazon uses DRM - to prevent you from sharing your favorite books with friends or moving them between readers. -
        • +
      • + Recently announced an increasingly proprietary approach, further distancing itself from the free software community +
        • +
      -
    • - Amazon openly claims - - you don't actually own or control your - ebooks. - -
      • -
    - -
    - - -
    -
    -
    - Buy -
    -
    - avoid + +
    +
    +
    + Buy + +
    + +
    + avoid +
    +
    -
    -
    - - -
    - -
    -

    Mobile OS

    - -
    -
    - good - Replicant -
    - -

    Replicant OS

    -
      -
    • - Fully free software, based on Android. -
      • - -
    • - - Supported devices - include both phones and tablets -
      • + -
    • - Works on used, so your dollars won't go to proprietary OS companies. -
      • -
    - - -
    - -
    -
    - bad - Apple iPhone, iPad and Watch -
    +
    -

    Apple iPhone, iPad and Watch

    -
      -
    • - iOS is a fully proprietary operating system, giving Apple ultimate control over devices. -
      • +
      +

      Ebooks

      -
    • - Apple uses DRM to block competing software. -
      • +
      +
      + good + Project Gutenberg +
      -
    • - The company claims to take away your freedom for your own good. -
      • -
    -
    +

    Project Gutenberg

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

    Laptops

    +
    +
    + bad + Amazon +
    + +

    Amazon

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

    ThinkPenguin GNU/Linux Notebook

    - -
      -
    • Save $5 on any purchase of $50 or more with coupon code FSFGIVING. ThinkPenguin will also donate $5 to the FSF (expires at the end of 2014).
      • -
    • - Comes installed with a free OS, and its Wi-Fi and 3D-accelerated graphics work with any other fully free GNU/Linux distribution. -
      • - -
    • While its proprietary firmware means it's not fully free, this laptop is one of the most freedom-supporting available. Browse more companies that sell free software-compatible computers.
      • -
    - -
    - -
    -
    - bad - Apple Macbook Pro + +
    +
    +
    + Buy + +
    + +
    + avoid +
    +
    + + +
    + + +
    +

    Mobile OS

    + +
    +
    + good + Replicant +
    + +

    Replicant OS

    +
      +
    • + Fully free software, based on Android. +
      • + +
    • + + Supported devices + include both phones and tablets +
      • + +
    • + Works on used, so your dollars won't go to proprietary OS companies. +
      • +
    + + +
    + +
    +
    + bad + Apple iPhone, iPad and Watch +
    + +

    Apple iPhone, iPad and Watch

    +
      +
    • + iOS is a fully proprietary operating system, giving Apple ultimate control over devices. +
      • + +
    • + Apple uses DRM to block competing software. +
      • + +
    • + The company claims to take away your freedom for your own good. +
      • +
    +
    + + +
    +
    +
    + Download + +
    + +
    + avoid +
    +
    +
    + + +
    + +
    +

    Laptops

    + +
    +
    + good + ThinkPenguin GNU/Linux Notebook +
    + +

    ThinkPenguin GNU/Linux Notebook

    + +
      +
    • Save $5 on any purchase of $50 or more with coupon code FSFGIVING. ThinkPenguin will also donate $5 to the FSF (expires at the end of 2014).
      • +
    • + Comes installed with a free OS, and its Wi-Fi and 3D-accelerated graphics work with any other fully free GNU/Linux distribution. +
      • + +
    • While its proprietary firmware means it's not fully free, this laptop is one of the most freedom-supporting available. Browse more companies that sell free software-compatible computers.
      • +
    + +
    + +
    +
    + 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. +
      • + +
    • + 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 +
    +
    +
    + + +
    + +
    +

    Gift Cards

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

    FSF Membership Card

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

    iTunes Card

    +
      +
    • DRM + on everything (except music) control 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 + +
    -

    Apple Macbook Pro

    -
      -
    • - Runs on proprietary software that restricts the user's freedoms. -
      • +
      + avoid +
      +
    +
    + + +
    + + +
    +

    Online Storage

    + +
    +
    + good + Least Authority +
    + +

    FSF Membership Card

    + +
      +
    • + 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. +
      • +
    + +
    + +
    +
    + bad + Google Drive +
    -
  • - Apple's App Store uses DRM to restrict what you can do with your purchases. -
    • +

    Google Drive

    +
      -
    • - 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 -
    -
    -
    - - -
    - -
    -
    -

    Gift Cards

    - -
    -
    - good - FSF Membership Card -
    - -

    FSF Membership Card

    - - -
    - -
    -
    - bad - iTunes Card -
    - -

    iTunes Card

    -
      -
    • DRM - on everything (except music) control 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 -
    -
    -
    - - -
    - -
    -
    -

    Online Storage

    - -
    -
    - good - Least Authority -
    - -

    FSF Membership Card

    - -
      -
    • - 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. -
      • +
    • + Requires granting Google a virtually unlimited license to any public data, and also having your public and personal data mined for ads. +
      • -
    • - Client side encryption to prevent snooping, unlike Google Drive, Dropbox, Apple iCloud, Microsoft SkyDrive, and Ubuntu One. -
      • -
    - -
    - -
    -
    - bad - Google Drive -
    - -

    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. +
      • -
    • - Data may be accessed by - intelligence agencies. -
      • +
    - +
    -
    -
    + +
    +
    +
    + Download + +
    - -
    -
    -
    - Download - -
    +
    + avoid +
    +
    +
    + -
    - avoid -
    -
    -
    - +
    -
    +
    +

    Media Hosting

    -
    -
    -

    Media Hosting

    +
    +
    + good + GNU MediaGoblin +
    -
    -
    - good - GNU MediaGoblin -
    +

    GNU MediaGoblin

    -

    GNU MediaGoblin

    +
      +
    • + Soon-to-be federated to allow decentralized sharing. +
      • -
        -
      • - Soon-to-be federated to allow decentralized sharing. -
        • +
      • Supports free video formats. And ability to choose a copyleft license.
        • -
      • Supports free video formats. And ability to choose a copyleft license.
        • +
      • Source files can be attached to an upload, making it easy to remix people's work.
        • -
      • Source files can be attached to an upload, making it easy to remix people's work.
        • +
      -
    +
    -
    +
    +
    + bad + YouTube +
    -
    -
    - bad - YouTube -
    +

    YouTube

    +
      +
    • + Uses proprietary Adobe Flash player and patent-encumbered H.264 codec. +
      • -

      YouTube

      -
        -
      • - Uses proprietary Adobe Flash player and patent-encumbered H.264 codec. -
        • +
      • + Implements DRM to control access to videos by device and region. +
        • -
      • - Implements DRM to control access to videos by device and region. -
        • +
      • + Imposes advertising on your uploads and polices copyright harshly. +
        • +
      +
    -
  • - Imposes advertising on your uploads and polices copyright harshly. -
    • - + +
    +
    +
    + Download + +
    -
    -
    -
    +
    + avoid +
    +
    +
    + - -
    -
    -
    - Download - -
    +
    -
    - avoid -
    -
    -
    - +
    -
    @@ -755,8 +746,6 @@
    - -
    @@ -778,6 +767,7 @@
    + -- 2.25.1