From 807a00dcb859f06370970826cdd3df0af7b28724 Mon Sep 17 00:00:00 2001 From: Zak Rogoff Date: Wed, 16 Nov 2016 14:57:45 -0500 Subject: [PATCH] Incorporating JohnH's feedback and various other tweaks. --- v7/givingguide.html | 221 +++++++++++++++++++++++--------------------- 1 file changed, 114 insertions(+), 107 deletions(-) diff --git a/v7/givingguide.html b/v7/givingguide.html index 76afd82..d4216fe 100644 --- a/v7/givingguide.html +++ b/v7/givingguide.html @@ -42,28 +42,28 @@ @@ -76,13 +76,13 @@ @@ -227,12 +227,12 @@ @@ -256,9 +256,9 @@ - +
-

Full-sized Laptops

+

Full-Sized Laptops

t400 @@ -339,7 +339,7 @@ Libiquity

- Sale details. + Sale details.

Minifree
@@ -355,14 +355,14 @@

Libiquity

- Sale details. + Sale details.

Minifree
@@ -402,11 +402,11 @@
LibreTea computer in modular chassis
- +
@@ -419,7 +419,7 @@
lulzbot -
Lulzbot Mini
+
LulzBot Mini
Lulzbot + LulzBot

Sale details.

@@ -448,7 +448,7 @@

Get it from

- Lulzbot + LulzBot

Sale details.

@@ -457,7 +457,7 @@
  • Respects Your Freedom-certified by the FSF to run with all free software, making 3D printing more accessible and encouraging innovation.
    • -
  • Performance and seamless interface earned it "Editor's Choice" in Tom's Guide's 2016 3D printer comparison.
    • +
  • Performance and seamless interface earned it "Editor's Choice" in Tom's Guide's 2016 3D printer comparison.
  • Hardware designs available to make customization easy. Standardized material format allows 3D printing with plastics, wood-, stone-, bamboo-, rubber-, and metal-like materials.
@@ -585,10 +585,9 @@
Long-Range Wi-Fi Adapter -
+
@@ -630,7 +629,6 @@ Amazon openly claims you don't actually own or control your ebooks. -
  • If you do purchase from Amazon, make sure to use smile.amazon.com to designate a nonprofit like the Free Software Foundation to receive some of the money.
    • @@ -639,6 +637,12 @@ +
    +
  • +

    If you do purchase from Amazon, make sure to use smile.amazon.com to designate a nonprofit like the Free Software Foundation to receive some of the money.

    +
    • +
    +

    Graphic Design

    @@ -695,57 +699,58 @@ - -
    - -
    -
    - VPN Router - - - -
    -
    - ThinkPenguin -

    - Sale details. -

    -
    -
    - - - - + +
    + +
    +
    + VPN Router -
    -
    -
    VPN Router
    -
      -
    • Designed to complement your existing router by providing an easy-to-set up VPN that enhances privacy and security and circumvents network controls.
      • -
    • Certified to Respect Your Freedom.
      • -
    -
    + + + - + + + + + +
    +
    +
    VPN Router
    +
      +
    • Designed to complement your existing router by providing a VPN that and enhances privacy and security and circumvents network controls.
      • +
    • Designed for easy set-up.
      • +
    • As free as can be: runs the FSF-endorsed LibreCMC operating system on hardware that is certified to Respect Your Freedom.
      • +
    +
    +
    + +
    +
    @@ -816,6 +821,9 @@
    ceata
    +
    + fsf +
    @@ -833,12 +841,11 @@
      - -
    • Libiquity: - Receive a 5% rebate off your subtotal price for any items you buy from the Web site. Ends at 00:00 EST on February 1st, 2017. Claim the rebate by sending the code FSFGIVING and your order number to . Libiquity will then credit the rebate amount to your payment method.
      • +
    • ThinkPenguin: Receive a 5% discount on any items you buy from the Web site. Ends at 00:00 EST on February 1st, 2017. Use the coupon code FSFGIVING16 at checkout.
      • +
    • Libiquity: Receive a 5% rebate off your subtotal price for any items you buy from the Web site. Ends at 00:00 EST on February 1st, 2017. Claim the rebate by sending the code FSFGIVING and your order number to sales@libiquity.com. Libiquity will then credit the rebate amount to your payment method.
    • Tehnoetical: Receive a 5% discount on any items you buy from the Web site. Ends at 00:00 EST on February 1st, 2017. Use the coupon code FSFHOLIDAYS at checkout.
      • -
    • LulzBot: Receive two gratis, 1 kilogram reels of nGen filament when you buy any 3D printer. Use the coupon code FSF2016. Ends at 00:00 EST on February 1st, 2017. Cannot be combined with other offers.
      • +
    • LulzBot: Receive two gratis, 1 kilogram reels of nGen filament when you buy any 3D printer. Ends at 00:00 EST on February 1st, 2017. Use the coupon code FSF2016. Cannot be combined with other offers.
    @@ -867,7 +874,7 @@

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

    @@ -937,7 +944,7 @@ // @license-end - + -- 2.25.1