aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/contrib.md8
-rw-r--r--www/download.md16
-rw-r--r--www/footer.md8
-rw-r--r--www/git.md22
-rw-r--r--www/global.css15
-rw-r--r--www/headercenter.css3
-rw-r--r--www/headerleft.css3
-rw-r--r--www/index.md17
-rw-r--r--www/management.md2
-rw-r--r--www/news/fsf-domain-offer.md15
-rw-r--r--www/news/sfc-domain-offer.md36
-rwxr-xr-xwww/publish.sh35
-rw-r--r--www/suppliers.md122
13 files changed, 202 insertions, 100 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/download.md b/www/download.md
index a078ef51..c6abf394 100644
--- a/www/download.md
+++ b/www/download.md
@@ -17,7 +17,7 @@ GPG signing key
Releases are signed with GPG.
- $ gpg --recv-keys
+ $ gpg --recv-keys 0x05E8C5B2
The GPG key can also be downloaded with this exported dump of the
pubkey: [lbkey.asc](lbkey.asc).
@@ -45,19 +45,10 @@ university, USA)
<https://mirrors.peers.community/mirrors/libreboot/> (Peers Community
Project, USA)
-<https://mirrors.cicku.me/libreboot/> (CICKU FOSS Mirror Service,
-Germany)
-
<https://vimuser.org/libreboot/> (vimuser.org, Netherlands)
-<https://ginette.swordarmor.fr/libreboot/> (swordarmor.fr, France)
-
-<https://mirror.se.partyvan.eu/pub/libreboot/> (partyvan.eu, Sweden)
-
<https://elgrande74.net/libreboot/> (elgrande74.net, France)
-<https://nedson.net/libreboot> (nedson.net, USA)
-
HTTP mirrors {#http}
------------
@@ -69,15 +60,14 @@ if using HTTPS.
<http://mirrors.mit.edu/libreboot/> (MIT university, USA)
-<http://tpvj6abq225m5pcf.onion/pub/libreboot/> (Tor hidden server,
-Undisclosed location)
-
<http://mirror.linux.ro/libreboot/> (linux.ro, Romania)
<http://mirror.helium.in-berlin.de/libreboot/> (in-berlin.de, Germany)
<http://libreboot.mirror.si/> (mirror.si, Slovenia)
+<http://ginette.swordarmor.fr/libreboot/> (swordarmor.fr, France)
+
FTP mirrors {#ftp}
-----------
diff --git a/www/footer.md b/www/footer.md
new file mode 100644
index 00000000..30dea43b
--- /dev/null
+++ b/www/footer.md
@@ -0,0 +1,8 @@
+
+**[Edit this page](/git.md#editing-the-website-and-documentation-wiki-style)** --
+[License](/docs/fdl-1.3.md) --
+[Template](/license.md) --
+[Authors](/contrib.md) --
+[Conduct Guidelines](/conduct.md) --
+[Governance](/management.md) --
+[Peers Community](https://peers.community/)
diff --git a/www/git.md b/www/git.md
index a1ddd993..f6ebab77 100644
--- a/www/git.md
+++ b/www/git.md
@@ -11,6 +11,28 @@ Download Libreboot from the Git repository here:
**git clone https://notabug.org/libreboot/libreboot.git**
+Editing the website and documentation, wiki-style
+-------------------------------------------------
+
+The entire website on libreboot.org, including all of the Libreboot
+documentation, is hosted in the Git repository. The pages are written in
+Markdown, which is an easy-to-use markup language similar to the one used
+when, for instance, editing pages on WikiPedia or a MediaWiki-based website.
+
+Just download Libreboot's Git repository, make changes to the website under
+the ***www*** directory. Changes to the documentation section are made under
+the ***docs*** directory. Once you've made your changes, you can submit them
+for inclusion live on libreboot.org, using the instructions on the rest of this
+page.
+
+***You can use any standard text editor to edit and improve the entire
+Libreboot website. E.g. Vim, GNU Emacs, GNU Nano, Gedit or whatever you
+prefer to use.***
+
+We currently have a shortage of people who possess the skill to write and
+maintain good documentation for Libreboot, so we welcome any and all
+contributions!
+
General guidelines for submitting patches
-----------------------------------------
diff --git a/www/global.css b/www/global.css
index 0264e4ef..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 {
@@ -37,3 +34,11 @@ a:hover {
.date {
display: block;
}
+
+h1, h2, h3, .h:hover a {
+ display: inline;
+}
+
+.h a {
+ display: none;
+}
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 7e71f24e..dec3dc5e 100644
--- a/www/index.md
+++ b/www/index.md
@@ -8,24 +8,17 @@ mascot"){#logo}](faq.md#who-did-the-logo)
[FAQ](faq.md) --
[Download](download.md) --
[Install](docs/install/) --
-[Documentation](docs/) --
+[Docs](docs/) --
[News](news/) --
-[Discuss](https://webchat.freenode.net/?channels=libreboot) --
+[Chat](https://webchat.freenode.net/?channels=libreboot) --
[Bugs](https://notabug.org/libreboot/libreboot/issues) --
[Contribute](git.md) --
-[Management](management.md) --
-[Tasks](https://notabug.org/libreboot/libreboot/milestones)
+[Buy](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.
-
-**[Community feedback is needed on whether libreboot.org domain name
-ownership should be transferred to the
-Software Freedom Conservancy](news/sfc-domain-offer.md)**
-
-**[Libreboot has applied to re-join the GNU project,
-under new democratic leadership](news/formalised-structure.md)**
+operating system. It is also available preinstalled from
+[these suppliers](suppliers.md).
Why use Libreboot?
------------------
diff --git a/www/management.md b/www/management.md
index 629d5cd7..9c5f8ad0 100644
--- a/www/management.md
+++ b/www/management.md
@@ -1,5 +1,5 @@
---
-title: General management guidelines and leadership information
+title: General management guidelines
x-toc-enable: true
...
diff --git a/www/news/fsf-domain-offer.md b/www/news/fsf-domain-offer.md
deleted file mode 100644
index 486e4cfc..00000000
--- a/www/news/fsf-domain-offer.md
+++ /dev/null
@@ -1,15 +0,0 @@
-% Community feedback on whether to offer libreboot.org domain name to FSF
-% Leah Rowe
-% 26 Apr 2017
-
-I, Leah Rowe, have stepped down as leader of the Libreboot project. This means
-that I must also transfer ownership of the libreboot.org domain name to
-another entity. I have chosen to propose the FSF as that entity.
-
-This is something that could be offered to GNU as part of Libreboot's
-filed application to re-join GNU.
-
-Commenting will be taken on
-<https://www.reddit.com/r/libreboot/comments/67rd46/proposal_transfer_librebootorg_ownership_to_fsf/>
-as to whether this decision should be taken. Full reasoning is documented
-there.
diff --git a/www/news/sfc-domain-offer.md b/www/news/sfc-domain-offer.md
deleted file mode 100644
index f53ce283..00000000
--- a/www/news/sfc-domain-offer.md
+++ /dev/null
@@ -1,36 +0,0 @@
-% Community feedback on whether to offer libreboot.org domain name to SFC
-% Leah Rowe
-% 27 Apr 2017
-
-I, Leah Rowe, have stepped down as leader of the Libreboot project. This means
-that I must also transfer ownership of the libreboot.org domain name to
-another entity. I have chosen to propose the Software Freedom Conservancy (SFC)
-as that entity.
-
-Commenting will be taken on
-<https://www.reddit.com/r/libreboot/comments/67x3bs/proposal_transfer_librebootorg_domain_name/>
-as to whether this decision should be taken. Full reasoning is documented
-there.
-
-Software Freedom Conservancy is heavily affiliated with the FSF. Conservancy
-provides legal services, e.g. GPL enforcement, for those who violate the GNU
-General Public License. They generally offer legal services related to Free
-Software. Its founder, Bradley Kuhn, is also a former Executive Director of
-the FSF. (Karen Sandler, is SFC's current Executive Director).
-
-In addition to legal services, Conservancy also helps promote Free Software
-and provides certain infrastructure for Free Software projects, and does
-sometimes assist in development of projects.
-
-More information:
-<https://en.wikipedia.org/wiki/Software_Freedom_Conservancy>
-
-Conservancy website:
-<https://sfconservancy.org/>
-
-This is something that could be offered to GNU as part of Libreboot's
-filed application to re-join GNU.
-
-Previously, it was proposed that the domain name be transferred to the FSF, but
-this was vetoed by an opposing member of the core leadership, when I proposed
-it. SFC was then recommended as an alternative, hence this new proposal.
diff --git a/www/publish.sh b/www/publish.sh
index 55b6660a..606c1fc9 100755
--- a/www/publish.sh
+++ b/www/publish.sh
@@ -24,29 +24,33 @@ 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="--css /headerleft.css -T Libreboot"
+ RETURN="<strong><a href='/git.html#editing-the-website-and-documentation-wiki-style'>Edit this page</a></strong> -- <a href='$DEST'>Back to previous index</a>"
+ OPTS="-T Libreboot"
+ fi
+else
+ OPTS="--css /headercenter.css"
fi
+if [[ $FILE = *suppliers ]]; then
+ printf "\n<strong><a href=\"/git.html#editing-the-website-and-documentation-wiki-style\">Edit this page</a></strong> -- <a href=\"../\">Back to previous page</a>\n" >> temp.md
+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
@@ -65,3 +69,6 @@ pandoc $TOC $SMART temp.md -s --css /global.css $OPTS \
# additionally, produce bare file for RSS
pandoc $1 > $FILE.bare.html
+
+# generate section title anchors as [link]
+sed $FILE.html -i -e 's_^<h\([123]\) id="\(.*\)">\(.*\)</h\1>_<div class="h"><h\1 id="\2">\3</h\1><a aria-hidden="true" href="#\2">[link]</a></div>_'
diff --git a/www/suppliers.md b/www/suppliers.md
new file mode 100644
index 00000000..e48e0f5f
--- /dev/null
+++ b/www/suppliers.md
@@ -0,0 +1,122 @@
+---
+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 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
+endorsement on a computer system, and invests money directly into Libreboot.
+
+**Minifree ships worldwide, to all countries.**
+
+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/)
+
+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
+-------------
+
+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:
+
+- [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)
+- [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.
+
+**Ships worldwide, to all countries.**
+
+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
+===============
+
+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.