8 files changed, 141 insertions, 24 deletions
diff --git a/www/contrib.md b/www/contrib.md
index 85b30ed8..b1089a39 100644
--- a/www/contrib.md
+++ b/www/contrib.md
@@ -30,7 +30,7 @@ Damien Zammit
 Maintains the Gigabyte GA-G41M-ES2L coreboot port, which is integrated
 in libreboot. Also works on other hardware for the benefit of the
 libreboot project. Contact **damo22** on the freenode IRC network. This
-persons website is [zammit.org](http://www.zammit.org/).
+person's website is [zammit.org](http://www.zammit.org/).
 
 Denis Carikli
 -------------
@@ -133,3 +133,9 @@ Vladimir Serbinenko
 Ported many of the thinkpads supported in libreboot, to coreboot, and
 made many fixes in coreboot which benefited the libreboot project.
 Contact **phcoder** in the \#coreboot IRC channel on freenode.
+
+Zyliwax
+-------------------
+
+Wrote the grubeditor.sh script and associated documentation. Contact
+**zyliwax** in the \#libreboot channel.
diff --git a/www/footer.md b/www/footer.md
new file mode 100644
index 00000000..dfddfd75
--- /dev/null
+++ b/www/footer.md
@@ -0,0 +1,7 @@
+
+[License](/docs/fdl-1.3.md)                 --
+[Template](/license.md)                     --
+[Authors](/contrib.md)                      --
+[Conduct Guidelines](/conduct.md)           --
+[Management Guidelines](/management.md)     --
+[Peers Community](https://peers.community/) --
diff --git a/www/global.css b/www/global.css
index fb265cd8..b325ef31 100644
--- a/www/global.css
+++ b/www/global.css
@@ -13,11 +13,8 @@ body {
 body {
     line-height: 1.6;
     font-family: Cantarell, sans-serif;
-    font-size: 1.1em; color: #222;
-}
-
-header {
-    text-align: center;
+    font-size: 1.1em;
+    color: #222;
 }
 
 #logo {
@@ -38,14 +35,10 @@ a:hover {
     display: block;
 }
 
-h1, h2, h3 {
+h1, h2, h3, .h:hover a {
     display: inline;
 }
 
 .h a {
     display: none;
 }
-
-.h:hover a {
-    display: inline;
-}
diff --git a/www/headercenter.css b/www/headercenter.css
new file mode 100644
index 00000000..6b8c294c
--- /dev/null
+++ b/www/headercenter.css
@@ -0,0 +1,3 @@
+header {
+    text-align: center;
+}
diff --git a/www/headerleft.css b/www/headerleft.css
deleted file mode 100644
index 645ab4ea..00000000
--- a/www/headerleft.css
+++ /dev/null
@@ -1,3 +0,0 @@
-header {
-    text-align: left !important;
-}
diff --git a/www/index.md b/www/index.md
index f15b3082..4f386ef4 100644
--- a/www/index.md
+++ b/www/index.md
@@ -14,11 +14,13 @@ mascot"){#logo}](faq.md#who-did-the-logo)
 [Bugs](https://notabug.org/libreboot/libreboot/issues)                      --
 [Contribute](git.md)                                                        --
 [Management](management.md)                                                 --
-[Tasks](https://notabug.org/libreboot/libreboot/milestones)
+[Tasks](https://notabug.org/libreboot/libreboot/milestones)                 --
+[Preinstalled systems](suppliers.md)
 
 Libreboot is a [free](https://www.gnu.org/philosophy/free-sw.html) (as in
 freedom) BIOS or UEFI replacement, initialising the hardware and booting your
-operating system.
+operating system. It also also available preinstalled from
+[these suppliers](suppliers.md).
 
 **[Community feedback is needed on whether libreboot.org domain name
 ownership should be transferred to the
diff --git a/www/publish.sh b/www/publish.sh
index 6ca0fcbc..e75ec332 100755
--- a/www/publish.sh
+++ b/www/publish.sh
@@ -35,18 +35,14 @@ if [ "${FILE}" != "./index" ]; then
         fi
 
         RETURN="<a href='$DEST'>Back to previous index</a>"
-        OPTS="--css /headerleft.css -T Libreboot"
+        OPTS="-T Libreboot"
+else
+        OPTS="--css /headercenter.css"
 fi
 
 
 if [ "${FILE}" != "./docs/fdl-1.3" ] && [ "${FILE}" != "./conduct" ]; then
-    echo "" >> temp.md
-    printf "[License](/docs/fdl-1.3.md) --\n" >> temp.md
-    printf "[Template](/license.md) --\n" >> temp.md
-    printf "[Authors](/contrib.md) --\n" >> temp.md
-    printf "[Conduct Guidelines](/conduct.md) --\n" >> temp.md
-    printf "[Management Guidelines](/management.md) --\n" >> temp.md
-    printf "[Peers Community](https://peers.community/) \n" >> temp.md
+    cat footer.md >> temp.md
 fi
 
 # change out .md -> .html
diff --git a/www/suppliers.md b/www/suppliers.md
new file mode 100644
index 00000000..8112b84c
--- /dev/null
+++ b/www/suppliers.md
@@ -0,0 +1,113 @@
+---
+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)
+
+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:
+-----------------------
+
+-   [Libreboot X220 laptop](https://minifree.org/product/libreboot-x220/)
+-   [Libreboot T400 laptop](https://minifree.org/product/libreboot-t400/) (FSF RYF certified)
+-   [Libreboot D16 desktop/workstation](https://minifree.org/product/libreboot-d16/)
+-   [Libreboot D16 server](https://minifree.org/product/libreboot-d16-server/)
+-   [Libreboot installation service](https://minifree.org/product/libreboot-installation-service/)
+-   [Libreboot X200/X220 docking station](https://minifree.org/product/docking-station-for-libreboot-x200/)
+-   [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
+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)
+-   [Technoethical X200 Tablet laptop](https://tehnoetic.com/tet-x200t)
+-   [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
+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)
+-   [Vikings X200 laptop](https://store.vikings.net/libre-friendly-hardware/x200-ryf-certfied) (FSF RYF certified)
+
+Other suppliers
+===============
+
+Sellers on eBay
+---------------
+
+On the eBay website, in various countries, you can search for libreboot and
+you may find some individual sellers providing Libreboot-preinstalled hardware.
+
+We cannot verify the quality of these suppliers, but they do exist.
+
+Some of them also provide choice of GNU+Linux distribution, or they may provide
+services where you can ship your Libreboot-compatible device to them and they
+would install Libreboot for you.
+
+This can be useful for some people, but due to the nature of eBay, we cannot
+link to them since eBay listings are regularly deleted due to expiration (some
+sellers may choose to have longer listings, or renew expired listings).
+
+There may also be other websites similar to eBay (e.g. mercado livre, available
+for several South American countries) that might have Libreboot hardware on
+them.
+
+**If you are considering purchasing from a supplier on eBay, make sure to read
+their feedback comments for other products that they sell, and check their
+seller rating. Don't get duped by a bad seller!**
+
+Workshops/hackerspaces
+----------------------
+
+You may have a GNU+Linux User Group, free software workshop or hackerspace near
+you that can help you with installing Libreboot, for instance.