From 000fe474f6cba44a6dc552e3d236ddcf7bf84cd3 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 28 May 2017 00:14:02 +0100 Subject: Tidy up the supplier page --- www/suppliers.md | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) (limited to 'www/suppliers.md') diff --git a/www/suppliers.md b/www/suppliers.md index a30e5b39..56cfcaf7 100644 --- a/www/suppliers.md +++ b/www/suppliers.md @@ -2,26 +2,12 @@ title: Suppliers selling or providing Libreboot pre-installed ... -For some, installing Libreboot can be an intimidating task, so several -companies and individuals have taken it upon themselves to provide systems with -Libreboot preinstalled. This is a list of those companies (sorted into -alphabetical order, to remove bias) along with lists of what Libreboot hardware -they provide (some of these companies also invest money/skills into Libreboot -development): - -These lists also include Libreboot-related merchendise, such as stickers. -Some of these hardware sellers also have endorsement from the Free Software -Foundation, via their *Respects Your Freedom* certification program. - Libiquity ========= Patrick McDermott, the founder of Libiquity, is also a former Libreboot contributor, having contributed several useful patches to the project. -List of what they sell: ----------------------- - - [Taurinus X200 laptop](https://shop.libiquity.com/product/taurinus-x200) (FSF RYF certified) - [Libreboot laptop palmrest stickers](https://shop.libiquity.com/product/libreboot-inside-case-badges-3-pack) - [Libreboot laptop lid / desktop chassis stickers](https://shop.libiquity.com/product/libreboot-stickers-shaped-matte-vinyl-2x2.25-3-pack) @@ -29,16 +15,9 @@ List of what they sell: Ministry of Freedom (Minifree) ============================== -Leah Rowe, the founder of Minifree, is also the founder of the Libreboot -project, and a current contributor to the project (but Leah is no longer leader -of the Libreboot project, although she still invests money into Libreboot -development, especially ports to newer hardware). Minifree is also the first -company to ever achieve FSF RYF status. - -Profits from Minifree sales are invested directly into Libreboot development. - -List of what they sell: ------------------------ +Leah Rowe, Minifree's founder, is also Libreboot's founder and is an active +Libreboot developer. Minifree is the first company to achieve FSF RYF +endorsement on a computer system, and invests money directly into Libreboot. - [Libreboot T400 laptop](https://minifree.org/product/libreboot-t400/) (FSF RYF certified) - [Libreboot D16 desktop/workstation](https://minifree.org/product/libreboot-d16/) @@ -54,9 +33,6 @@ Technoethical (formerly Tehnoetic) is a team of free software activists and developers that are selling hardware pre-installed with libreboot as a way to fund the activity within their nonprofit foundation. -List of what they sell: ----------------------- - - [Libreboot installation service](https://tehnoetic.com/tet-lis) - [Technoethical T500 laptop](https://tehnoetic.com/tet-t500) - [Technoethical T400 laptop](https://tehnoetic.com/tet-t400) @@ -70,9 +46,6 @@ Vikings is the first company to offer hosting on hardware pre-installed with libreboot and they are also selling the hardware itself to fund the building of their libreboot-powered datacenter. -List of what they sell: ----------------------- - - [Vikings D16 1U server](https://store.vikings.net/libre-friendly-hardware/the-server-1u) - [Vikings D16 mainboard](https://store.vikings.net/libre-friendly-hardware/d16-ryf-certfied) (FSF RYF certified) - [Vikings D16 workstation](https://store.vikings.net/libre-friendly-hardware/vikings-d16-workstation) -- cgit v1.2.3-70-g09d2 From 3f5985b51321265d1828a3e71cf6d7ca22a77da0 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 28 May 2017 00:40:28 +0100 Subject: further tidy up suppliers page, and categorize products --- www/suppliers.md | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) (limited to 'www/suppliers.md') diff --git a/www/suppliers.md b/www/suppliers.md index 56cfcaf7..0f28b434 100644 --- a/www/suppliers.md +++ b/www/suppliers.md @@ -5,8 +5,8 @@ title: Suppliers selling or providing Libreboot pre-installed Libiquity ========= -Patrick McDermott, the founder of Libiquity, is also a former Libreboot -contributor, having contributed several useful patches to the project. +Patrick McDermott, Libiquity's founder, is a former Libreboot +developer. - [Taurinus X200 laptop](https://shop.libiquity.com/product/taurinus-x200) (FSF RYF certified) - [Libreboot laptop palmrest stickers](https://shop.libiquity.com/product/libreboot-inside-case-badges-3-pack) @@ -19,11 +19,32 @@ Leah Rowe, Minifree's founder, is also Libreboot's founder and is an active Libreboot developer. Minifree is the first company to achieve FSF RYF endorsement on a computer system, and invests money directly into Libreboot. +Laptops +------- + - [Libreboot T400 laptop](https://minifree.org/product/libreboot-t400/) (FSF RYF certified) + +Desktops +-------- + - [Libreboot D16 desktop/workstation](https://minifree.org/product/libreboot-d16/) + +Servers +------- + - [Libreboot D16 server](https://minifree.org/product/libreboot-d16-server/) + +Services +-------- + - [Libreboot installation service](https://minifree.org/product/libreboot-installation-service/) -- [Libreboot X200/X220 docking station](https://minifree.org/product/docking-station-for-libreboot-x200/) + +Merchendise +----------- + +- [Libreboot T400 battery](https://minifree.org/product/libreboot-t400-battery/) +- [Libreboot X200 battery](https://minifree.org/product/libreboot-x200-battery/) +- [Libreboot X200 docking station](https://minifree.org/product/docking-station-for-libreboot-x200/) - [Libreboot stickers](https://minifree.org/product/libreboot-stickers/) Technoethical @@ -33,7 +54,14 @@ Technoethical (formerly Tehnoetic) is a team of free software activists and developers that are selling hardware pre-installed with libreboot as a way to fund the activity within their nonprofit foundation. +Services +-------- + - [Libreboot installation service](https://tehnoetic.com/tet-lis) + +Laptops +------- + - [Technoethical T500 laptop](https://tehnoetic.com/tet-t500) - [Technoethical T400 laptop](https://tehnoetic.com/tet-t400) - [Technoethical X200 Tablet laptop](https://tehnoetic.com/tet-x200t) @@ -46,9 +74,24 @@ Vikings is the first company to offer hosting on hardware pre-installed with libreboot and they are also selling the hardware itself to fund the building of their libreboot-powered datacenter. +Servers +------- + - [Vikings D16 1U server](https://store.vikings.net/libre-friendly-hardware/the-server-1u) + +Mainboards +---------- + - [Vikings D16 mainboard](https://store.vikings.net/libre-friendly-hardware/d16-ryf-certfied) (FSF RYF certified) + +Desktops +-------- + - [Vikings D16 workstation](https://store.vikings.net/libre-friendly-hardware/vikings-d16-workstation) + +Laptops +------- + - [Vikings X200 laptop](https://store.vikings.net/libre-friendly-hardware/x200-ryf-certfied) (FSF RYF certified) Other suppliers -- cgit v1.2.3-70-g09d2 From 0ea24df299cf4a4076a5f0b968c361efd46569ba Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 28 May 2017 00:53:00 +0100 Subject: suppliers page: for each supplier, state which locations they ship to --- www/suppliers.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'www/suppliers.md') diff --git a/www/suppliers.md b/www/suppliers.md index 0f28b434..db1a9bf1 100644 --- a/www/suppliers.md +++ b/www/suppliers.md @@ -6,7 +6,7 @@ Libiquity ========= Patrick McDermott, Libiquity's founder, is a former Libreboot -developer. +developer. **Ships to USA only** - [Taurinus X200 laptop](https://shop.libiquity.com/product/taurinus-x200) (FSF RYF certified) - [Libreboot laptop palmrest stickers](https://shop.libiquity.com/product/libreboot-inside-case-badges-3-pack) @@ -19,6 +19,8 @@ Leah Rowe, Minifree's founder, is also Libreboot's founder and is an active Libreboot developer. Minifree is the first company to achieve FSF RYF endorsement on a computer system, and invests money directly into Libreboot. +**Minifree ships worldwide, to all countries.** + Laptops ------- @@ -54,6 +56,8 @@ Technoethical (formerly Tehnoetic) is a team of free software activists and developers that are selling hardware pre-installed with libreboot as a way to fund the activity within their nonprofit foundation. +**Ships worldwide, to all countries.** + Services -------- @@ -74,6 +78,8 @@ Vikings is the first company to offer hosting on hardware pre-installed with libreboot and they are also selling the hardware itself to fund the building of their libreboot-powered datacenter. +**Ships worldwide, to all countries.** + Servers ------- -- cgit v1.2.3-70-g09d2 From e1c6c734aa638b801afabd12c5d5b1401ce17609 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 28 May 2017 01:17:43 +0100 Subject: further tidy suppliers.md: small headers, back to home link at bottom of page --- www/publish.sh | 22 +++++++++++++++------- www/suppliers.md | 44 ++++++++++++++++---------------------------- 2 files changed, 31 insertions(+), 35 deletions(-) (limited to 'www/suppliers.md') diff --git a/www/publish.sh b/www/publish.sh index e75ec332..fb891458 100755 --- a/www/publish.sh +++ b/www/publish.sh @@ -24,22 +24,30 @@ FILE=${1%.md} cat $1 > temp.md -OPTS= +OPTS="-T Libreboot" if [ "${FILE}" != "./index" ]; then - if [[ $FILE == *index ]] + if [[ $FILE == *suppliers ]] then - DEST="../" + RETURN="" else - DEST="./" - fi + if [[ $FILE == *index ]] + then + DEST="../" + else + DEST="./" + fi - RETURN="Back to previous index" - OPTS="-T Libreboot" + RETURN="Back to previous index" + OPTS="-T Libreboot" + fi else OPTS="--css /headercenter.css" fi +if [[ $FILE = *suppliers ]]; then + printf "\nBack to previous index\n" >> temp.md +fi if [ "${FILE}" != "./docs/fdl-1.3" ] && [ "${FILE}" != "./conduct" ]; then cat footer.md >> temp.md diff --git a/www/suppliers.md b/www/suppliers.md index db1a9bf1..e48e0f5f 100644 --- a/www/suppliers.md +++ b/www/suppliers.md @@ -3,17 +3,16 @@ title: Suppliers selling or providing Libreboot pre-installed ... Libiquity -========= +--------- Patrick McDermott, Libiquity's founder, is a former Libreboot developer. **Ships to USA only** - [Taurinus X200 laptop](https://shop.libiquity.com/product/taurinus-x200) (FSF RYF certified) -- [Libreboot laptop palmrest stickers](https://shop.libiquity.com/product/libreboot-inside-case-badges-3-pack) -- [Libreboot laptop lid / desktop chassis stickers](https://shop.libiquity.com/product/libreboot-stickers-shaped-matte-vinyl-2x2.25-3-pack) +- [Libreboot chassis](https://shop.libiquity.com/product/libreboot-stickers-shaped-matte-vinyl-2x2.25-3-pack) and [Libreboot Inside stickers](https://shop.libiquity.com/product/libreboot-inside-case-badges-3-pack) Ministry of Freedom (Minifree) -============================== +------------------------------ Leah Rowe, Minifree's founder, is also Libreboot's founder and is an active Libreboot developer. Minifree is the first company to achieve FSF RYF @@ -21,28 +20,23 @@ endorsement on a computer system, and invests money directly into Libreboot. **Minifree ships worldwide, to all countries.** -Laptops -------- +Laptops: - [Libreboot T400 laptop](https://minifree.org/product/libreboot-t400/) (FSF RYF certified) -Desktops --------- +Desktops: - [Libreboot D16 desktop/workstation](https://minifree.org/product/libreboot-d16/) -Servers -------- +Servers: - [Libreboot D16 server](https://minifree.org/product/libreboot-d16-server/) -Services --------- +Services: - [Libreboot installation service](https://minifree.org/product/libreboot-installation-service/) -Merchendise ------------ +Merchendise: - [Libreboot T400 battery](https://minifree.org/product/libreboot-t400-battery/) - [Libreboot X200 battery](https://minifree.org/product/libreboot-x200-battery/) @@ -50,7 +44,7 @@ Merchendise - [Libreboot stickers](https://minifree.org/product/libreboot-stickers/) Technoethical -============= +------------- Technoethical (formerly Tehnoetic) is a team of free software activists and developers that are selling hardware pre-installed with libreboot as a way to @@ -58,13 +52,11 @@ fund the activity within their nonprofit foundation. **Ships worldwide, to all countries.** -Services --------- +Services: - [Libreboot installation service](https://tehnoetic.com/tet-lis) -Laptops -------- +Laptops: - [Technoethical T500 laptop](https://tehnoetic.com/tet-t500) - [Technoethical T400 laptop](https://tehnoetic.com/tet-t400) @@ -72,7 +64,7 @@ Laptops - [Technoethical X200 laptop](https://tehnoetic.com/tet-x200) Vikings -======= +------- Vikings is the first company to offer hosting on hardware pre-installed with libreboot and they are also selling the hardware itself to fund the building @@ -80,23 +72,19 @@ of their libreboot-powered datacenter. **Ships worldwide, to all countries.** -Servers -------- +Servers: - [Vikings D16 1U server](https://store.vikings.net/libre-friendly-hardware/the-server-1u) -Mainboards ----------- +Mainboards: - [Vikings D16 mainboard](https://store.vikings.net/libre-friendly-hardware/d16-ryf-certfied) (FSF RYF certified) -Desktops --------- +Desktops: - [Vikings D16 workstation](https://store.vikings.net/libre-friendly-hardware/vikings-d16-workstation) -Laptops -------- +Laptops: - [Vikings X200 laptop](https://store.vikings.net/libre-friendly-hardware/x200-ryf-certfied) (FSF RYF certified) -- cgit v1.2.3-70-g09d2