summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-09-29 02:48:08 (EDT)
committer Francis Rowe <info@gluglug.org.uk>2015-09-29 02:48:08 (EDT)
commit602aba82e59535d096ba861f07b0e723e53db7f0 (patch)
tree88d1d89d5975f4b6bc5882df415d960b027947ca
parentfd79f21f425e88e97b8e6b9bfbbb7eb6fe7c8f71 (diff)
downloadlibreboot.org-602aba82e59535d096ba861f07b0e723e53db7f0.zip
libreboot.org-602aba82e59535d096ba861f07b0e723e53db7f0.tar.gz
libreboot.org-602aba82e59535d096ba861f07b0e723e53db7f0.tar.bz2
Add link to Libiquity X200 on the suppliers page
-rw-r--r--site/faq/index.php6
-rw-r--r--site/index.php2
-rw-r--r--site/suppliers/index.php7
3 files changed, 8 insertions, 7 deletions
diff --git a/site/faq/index.php b/site/faq/index.php
index 1e8d6d4..f593811 100644
--- a/site/faq/index.php
+++ b/site/faq/index.php
@@ -104,7 +104,7 @@
See <a href="../docs/hcl/index.html">../docs/hcl/index.html</a>.
</p>
<p>
- Several supported systems are also available with libreboot pre-installed.
+ Several supported systems are also available with libreboot preinstalled.
Check the <a href="../suppliers/">suppliers</a> page for more information.
</p>
<p>
@@ -151,7 +151,7 @@
Logic, sells licenses and source code for ThreadX. Customers such as Intel are
forbidden from disclosing or sublicensing the ThreadX source code. Another
module is the Dynamic Application Loader (DAL), which consists of a <b><i>Java
- virtual machine</i></b> and set of pre-installed Java classes for cryptography,
+ virtual machine</i></b> and set of preinstalled Java classes for cryptography,
secure storage, etc. The DAL module can load and execute additional ME modules
from the PC's HDD or SSD. The ME firmware also includes a number of native
application modules within its flash memory space, including Intel Active
@@ -299,7 +299,7 @@
<p>
For years, coreboot has been struggling against Intel. Intel has been shown to be extremely uncooperative in general.
Many coreboot developers, and companies, have tried to get Intel to cooperate; namely, releasing source code
- for the firmware components. Even Google, which sells millions of <i>chromebooks</i> (coreboot pre-installed)
+ for the firmware components. Even Google, which sells millions of <i>chromebooks</i> (coreboot preinstalled)
have been unable to persuade them.
</p>
<p>
diff --git a/site/index.php b/site/index.php
index 213f0b8..d5ca9ed 100644
--- a/site/index.php
+++ b/site/index.php
@@ -80,7 +80,7 @@
<?php echo gettext("Pre-configured libreboot systems are also available, from several <a href='suppliers/'>commercial suppliers</a>."); ?>
</p>
<p>
- These systems come with libreboot pre-installed, where everything works out of the box. This is useful, for those who
+ These systems come with libreboot and GNU/Linux preinstalled, where everything works out of the box. This is useful, for those who
do not want to install the software on their own, but still want to use it. All of the companies on this list are
dedicated to the GNU free software philosophy, and are actively contributing to the libreboot project.
</p>
diff --git a/site/suppliers/index.php b/site/suppliers/index.php
index e8e1101..633724a 100644
--- a/site/suppliers/index.php
+++ b/site/suppliers/index.php
@@ -46,14 +46,14 @@
<div>
<h1>Ministry of Freedom (UK)</h1>
<p>
- Operating since 2013, the Ministry of Freedom (formerly Gluglug) sells laptops with libreboot and <a href="https://trisquel.info/">Trisquel GNU/Linux</a> pre-installed.
+ Operating since 2013, the Ministry of Freedom (formerly Gluglug) sells laptops with libreboot and <a href="https://trisquel.info/">Trisquel GNU/Linux</a> preinstalled.
You can also ship your libreboot-compatible system to this company and have libreboot installed, as part of a libreboot <i>installation service</i>.
</p>
<p>
This company ships <b>worldwide</b>, to all countries.
</p>
<p>
- The director, Francis Rowe, is also the lead maintainer of libreboot.
+ The director, Francis Rowe, is also the lead maintainer of libreboot. Profits directly fund the libreboot project.
</p>
<h2>Products available</h2>
<ul class="c">
@@ -72,7 +72,7 @@
<div>
<h1>Libiquity LLC (USA)</h1>
<p>
- Operating since 2015, Libiquity sells Libreboot and ProteanOS stickers, and services related to ProteanOS. <i>Pre-configured libreboot laptops and libreboot installation service not yet available.</i>
+ Operating since 2015, Libiquity sells libreboot laptops, various stickers, and services related to <a href="http://proteanos.com/">ProteanOS</a>. <i>Libreboot installation service not yet available.</i>
</p>
<p>
This company ships to the USA.
@@ -82,6 +82,7 @@
</p>
<h2>Products available</h2>
<ul class="c">
+ <li><a href="https://shop.libiquity.com/product/taurinus-x200">Libreboot X200 laptop</a></li>
<li><a href="https://shop.libiquity.com/product/libreboot-inside-case-badges-3-pack">&quot;Libreboot inside&quot; palm rest stickers (matte vinyl, shaped)</a></li>
<li><a href="https://shop.libiquity.com/product/libreboot-stickers-shaped-matte-vinyl-2x2.25-3-pack">Libreboot lid stickers (matte vinyl, shaped)</a></li>
<li><a href="https://shop.libiquity.com/product/proteanos-stickers-glossy-3x1-3-pack">ProteanOS stickers (glossy, rectangular)</a></li>