aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorLeah Rowe <info@minifree.org>2017-05-28 01:17:43 +0100
committerLeah Rowe <info@minifree.org>2017-05-28 01:17:43 +0100
commite1c6c734aa638b801afabd12c5d5b1401ce17609 (patch)
tree4b97da31eb4ab62c3979b422f584aaf567235af8 /www
parent0ea24df299cf4a4076a5f0b968c361efd46569ba (diff)
downloadlibrebootfr-e1c6c734aa638b801afabd12c5d5b1401ce17609.tar.gz
librebootfr-e1c6c734aa638b801afabd12c5d5b1401ce17609.zip
further tidy suppliers.md: small headers, back to home link at bottom of page
Diffstat (limited to 'www')
-rwxr-xr-xwww/publish.sh22
-rw-r--r--www/suppliers.md44
2 files changed, 31 insertions, 35 deletions
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="<a href='$DEST'>Back to previous index</a>"
- OPTS="-T Libreboot"
+ RETURN="<a href='$DEST'>Back to previous index</a>"
+ OPTS="-T Libreboot"
+ fi
else
OPTS="--css /headercenter.css"
fi
+if [[ $FILE = *suppliers ]]; then
+ printf "\n<a href=\"../\">Back to previous index</a>\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)