Merge with original repo

14 files changed, 373 insertions, 61 deletions

diff --git a/www/conduct.md b/www/conduct.md
index 313321c0..69dc0ae8 100644
--- a/www/conduct.md
+++ b/www/conduct.md
@@ -82,22 +82,20 @@ Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported by contacting one of the moderators privately via IRC private message
 (see list below):
 
-* Andrew Robbins: **and\_who** on Freenode, email <mailto:andrew@libreboot.org>
-* Jason Self: **jxself** on Freenode
-* Leah Rowe: **\_4of7** on Freenode, email <mailto:leah@libreboot.org>
+* Andrew Robbins: **and\_who** on Freenode, email
+  [andrew@libreboot.org](mailto:andrew@libreboot.org)
+* Leah Rowe: **unoccupied** on Freenode, email
+  [leah@libreboot.org](mailto:leah@libreboot.org)
 * Paul Kocialkowski: **paulk-X** Freenode (X is variable, for this
-  person, email <mailto:paul@libreboot.org>
+  person, email [paul@libreboot.org](mailto:paul@libreboot.org)
   check in the channel)
-* Swift Geek: **swiftgeek** on Freenode, email <mailto:swiftgeek@libreboot.org>
+* Swift Geek: **swiftgeek** on Freenode, email
+  [swiftgeek@libreboot.org](mailto:swiftgeek@libreboot.org)
 
 If the complaint is for abuses on the Libreboot subreddit at
 [r/libreboot](https://www.reddit.com/r/libreboot/) then there are a separate
 group of moderators whom you can contact, via private message on the Reddit
-website:
-
-* hexacat
-* pizzaiolo\_
-* libreleah
+website. The subreddit has a public list of moderators on it.
 
 If you deviate from these guidelines, make sure that it is with good reason.
 Treatment of each case will be handled pragmatically, on a case-by-case basis.
diff --git a/www/download.md b/www/download.md
index 9d1cff30..6250949e 100644
--- a/www/download.md
+++ b/www/download.md
@@ -17,7 +17,9 @@ GPG signing key
 
 Releases are signed with GPG.
 
-    $ gpg --recv-keys 0x05E8C5B2
+    gpg --recv-keys 0x969A979505E8C5B2
+
+Full key fingerprint: CDC9 CAE3 2CB4 B7FC 84FD  C804 969A 9795 05E8 C5B2
 
 The GPG key can also be downloaded with this exported dump of the
 pubkey: [lbkey.asc](lbkey.asc).
@@ -28,8 +30,10 @@ pubkey: [lbkey.asc](lbkey.asc).
 Do you have a mirror?
 ---------------------
 
-Let us know! We will add it here. Instructions for how to mirror
-libreboot releases can be found [on the mirrors](#https).
+Let us know! We will add it here.
+
+If you wish to create a new mirror of the Libreboot releases, you can use
+*rsync*. See: [rsync mirror list](#rsync).
 
 HTTPS mirrors {#https}
 -------------
@@ -42,23 +46,30 @@ of Kent, UK)
 <https://mirror.math.princeton.edu/pub/libreboot/> (Princeton
 university, USA)
 
-<https://mirrors.peers.community/mirrors/libreboot/> (Peers Community
-Project, USA)
+<https://mirror.sugol.org/libreboot/> (sugol.org)
+(formerly nephelai.zanity.net/mirror/libreboot)
 
 <https://vimuser.org/libreboot/> (vimuser.org, Netherlands)
 
 <https://elgrande74.net/libreboot/> (elgrande74.net, France)
 
-<https://nephelai.zanity.net/mirror/libreboot/> (zanity.net, New Zealand)
-
 <https://mirror.koddos.net/libreboot/> (koddos.net, Netherlands)
 
+<https://mirror.swordarmor.fr/libreboot/> (swordarmor.fr, France)
+
 <https://mirror-hk.koddos.net/libreboot/> (koddos.net, Hong Kong)
 
 RSYNC mirrors {#rsync}
 -------------
 
-Useful for mirroring Libreboot's entire set of release archives.
+Useful for mirroring Libreboot's entire set of release archives. You can put
+an rsync command into crontab and pull the files into a directory on your
+web server.
+
+*It is highly recommended that you use the libreboot.org mirror*, if you wish
+to host an official mirror. Otherwise, if you simply want to create your own
+local mirror, you should use one of the other mirrors, which sync from
+libreboot.org.
 
 <rsync://rsync.libreboot.org/mirrormirror/> (Libreboot project official mirror)
 
@@ -69,8 +80,6 @@ UK)
 
 <rsync://ftp.linux.ro/libreboot/> (linux.ro, Romania)
 
-<rsync://libreboot.mirror.si/libreboot/>
-
 <rsync://mirror.koddos.net/libreboot/> (koddos.net, Netherlands)
 
 <rsync://mirror-hk.koddos.net/libreboot/> (koddos.net, Hong Kong)
@@ -93,10 +102,6 @@ if using HTTPS.
 
 <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}
 -----------
 
@@ -107,8 +112,6 @@ of Kent, UK)
 
 <ftp://ftp.linux.ro/libreboot/> (linux.ro, Romania)
 
-<ftp://libreboot.mirror.si/libreboot> (mirror.si, Slovenia)
-
 Statically linked
 ------------------
 
diff --git a/www/faq.md b/www/faq.md
index 610f8093..ccbee214 100644
--- a/www/faq.md
+++ b/www/faq.md
@@ -6,6 +6,63 @@ x-toc-enable: true
 Important issues
 ================
 
+Is the Libreboot project still active?
+-------------------------------------------
+
+Yes! The [git repository](https://notabug.org/libreboot/libreboot) shows all of
+the work that we're currently doing. Libreboot is quite active.
+
+So when is the next version of Libreboot coming out?
+-------------------------------------------------------
+
+Short answer: It's out when it's out. If you want to help out and submit
+patches, refer to [the Git page](git.md).
+
+We don't issue ETAs.
+
+Long answer:
+
+We've been re-writing the entire Libreboot build system from scratch, since
+the previous release. This has taken longer than we expected, but the new
+build system is reaching maturity. We are polishing it.
+
+Once the new build system is stable, our next priority is ensuring that all
+currently supported build targets build properly in Libreboot.
+
+After that, the priority is to make sure that all current boards in Libreboot
+use the most up to date revision of coreboot, with all of the most recent fixes
+and improvements. Testing those boards will then be a matter of peer review,
+reaching out to the entire community via alpha/beta/RC releases.
+
+Generally, all major release-blocking issues must be addressed before a new
+release can be issued. See:
+<https://notabug.org/libreboot/libreboot/issues>
+
+The most important tasks now are as follows:
+
+- Study the build system of Libreboot (written in BASH), and make fixes to it.
+- Work on new improvements and help with testing once ROMs build for all
+  boards, when the build system is stable.
+- In particular, there are several new boards in coreboot that we can add to
+  Libreboot, as documented on the Libreboot bug tracker. These will also have
+  to be added, and fully tested. Instructions for setting up hardware-based
+  flashing tools can be found in
+  [the Libreboot installation guides](docs/install/)
+- Bugs! Report bugs! <https://notabug.org/libreboot/libreboot/issues>
+- A few new board ports will also come in handy ;)
+  If you've got the skills, we'd really appreciate that. Port them to coreboot
+  first, or make existing coreboot targets work without binary blobs.
+
+More generally:
+
+- Tell your friends about Libreboot! Libreboot wants to liberate as many people
+  as possible.
+- If you have ways to improve the documentation, you can do that too.
+  Refer to [the Git page](git.md) for instructions on submitting patches to the
+  documentation.
+- Encourage companies, or any persons with the skills/resources, to get
+  involved with Libreboot development.
+
 What version of libreboot do I have?
 ----------------------------------------------------------------
 
@@ -83,6 +140,15 @@ around this by running the following command:
 You can find *cbfstool* in the \_util archive with the libreboot release
 that you are using.
 
+What are the ata/ahci errors I see in libreboot's GRUB?
+-----------------------------------------------------------------------
+
+You can safely ignore those errors, they exist because we can't quiet down
+cryptomount command from `for` loop in libreboot's
+[grub.cfg](https://notabug.org/libreboot/libreboot/src/r20160907/resources/grub/config/menuentries/common.cfg#L66).
+It could be fixed in upstream grub by contributing patch that would add
+quiet flag to it.
+
 Hardware compatibility
 ======================
 
@@ -566,6 +632,9 @@ SPI flash chips can be programmed with the [BeagleBone
 Black](../docs/install/bbb_setup.md) or the [Raspberry
 Pi](../docs/install/rpi_setup.md).
 
+It's possible to use a 16-pin SOIC test clip on an 8-pin SOIC chip, if you
+align the pins properly. The connection is generally more sturdy.
+
 How do I set a boot password?
 -------------------------------------------------------------------
 
@@ -695,23 +764,23 @@ project.
 
 ### External GPUs
 
-The Video BIOS is present on most video hardware. On all current
-libreboot systems, this is implemented using free software. The Video
-BIOS is responsible for initializing any sort of visual display; without
-it, you'd have what's called a *headless* system.
-
-For integrated graphics, the VBIOS is usually embedded as an *option
-ROM* in the main boot firmware. For external graphics, the VBIOS is
+The Video BIOS is present on most video cards. For integrated graphics,
+the VBIOS (special kind of OptionROM) is usually embedded
+in the main boot firmware. For external graphics, the VBIOS is
 usually on the graphics card itself. This is usually proprietary; the
-only difference is that SeaBIOS executes it (alternatively, you embed it
+only difference is that SeaBIOS can execute it (alternatively, you embed it
 in a coreboot ROM image and have coreboot executes it, if you use a
 different payload, such as GRUB).
 
-We're going to tentatively say no, they're not OK. Unless you're
-actively working to replace the VBIOS, or find out how to get a visual
-display without it (possible in some cases, if the kernel driver can be
-modified to work without it, possibly only needing certain
-non-executable data).
+On current libreboot systems, instead of VBIOS, coreboot native GPU init is used,
+which is currently only implemented for Intel GPUs.
+Other cards with proper KMS drivers can be initialized once Linux boots,
+but copy of VBIOS may be still needed to fetch proper VRAM frequency
+and other similar parameters (without executing VBIOS code).
+
+In configurations where SeaBIOS and native GPU init are used together,
+a special shim VBIOS is added that uses coreboot linear framebuffer.
+
 
 ### EC (embedded controller) firmware 
 
@@ -737,8 +806,8 @@ libreboot. See: <https://github.com/lynxis/h8s-ec> (not ready yet).
 Most (all?) chromebooks have free EC firmware. Libreboot is currently
 looking into supporting a few ARM-based chromebooks.
 
-EC is only present on laptops. On desktop/server boards it is absent
-(not required).
+EC is present on nearly all laptops. Other devices use, depending on complexity,
+either EC or variant with firmware in Mask ROM - SuperIO.
 
 ### HDD/SSD firmware 
 
@@ -840,10 +909,8 @@ connect SATA HDDs via USB. Libreboot documents how to install several
 distributions with full disk encryption. You can adapt these for use
 with USB drives:
 
--   [Full disk encryption with
-    Debian](../docs/gnulinux/encrypted_debian.md)
--   [Full disk encryption with
-    Parabola](../docs/gnulinux/encrypted_parabola.md)
+-   [Full disk encryption with Debian](../docs/gnulinux/encrypted_debian.md)
+-   [Full disk encryption with Parabola](../docs/gnulinux/encrypted_parabola.md)
 
 The current theory (unproven) is that this will at least prevent
 malicious drives from wrongly manipulating data being read from or
@@ -952,6 +1019,14 @@ Absolutely! It is well-tested in libreboot, and highly recommended. See
 Any recent distribution should work, as long as it uses KMS (kernel mode
 setting) for the graphics.
 
+Fedora won't boot? (may also be applicable to Redhat/CentOS)
+-----------------------------------------------------------
+
+On Fedora, by default the grub.cfg tries to boot linux in 16-bit mode. You
+just have to modify Fedora's GRUB configuration.
+Refer to [the GNU+Linux page](docs/gnulinux/index.md#fedora-wont-boot).
+
+
 Can I use BSD?
 ----------------------------------
 
@@ -966,3 +1041,32 @@ Are other operating systems compatible?
 
 Unknown. Probably not.
 
+Where can I learn more about electronics
+==========================================
+
+* Basics of soldering and rework by PACE  
+    Both series of videos are mandatory regardless of your soldering skill.
+    * [Basic Soldering](https://www.youtube.com/watch?v=vIT4ra6Mo0s&list=PL926EC0F1F93C1837)
+    * [Rework and Repair](https://www.youtube.com/watch?v=HKX-GBe_lUI&list=PL958FF32927823D12)
+* [edX course on basics of electronics](https://www.edx.org/course/circuits-electronics-1-basic-circuit-mitx-6-002-1x-0)  
+    In most countries contents of this course is covered during
+    middle and high school. It will also serve well to refresh your memory
+    if you haven't used that knowledge ever since.
+* Impedance intro
+    * [Similiarities of Wave Behavior](https://www.youtube.com/watch?v=DovunOxlY1k)
+    * [Reflections in tranmission line](https://www.youtube.com/watch?v=y8GMH7vMAsQ)
+    * Stubs:
+        * [Wikipedia article on stubs](https://en.wikipedia.org/wiki/Stub_(electronics))
+        * [Polar Instruments article on stubs](http://www.polarinstruments.com/support/si/AP8166.html)  
+        With external SPI flashing we only care about unintended PCB stubs
+* Other YouTube channels with useful content about electronics
+    * [EEVblog](https://www.youtube.com/channel/UC2DjFE7Xf11URZqWBigcVOQ)
+    * [Louis Rossmann](https://www.youtube.com/channel/UCl2mFZoRqjw_ELax4Yisf6w)
+    * [mikeselectricstuff](https://www.youtube.com/channel/UCcs0ZkP_as4PpHDhFcmCHyA)
+    * [bigclive](https://www.youtube.com/channel/UCtM5z2gkrGRuWd0JQMx76qA)
+    * [ElectroBOOM](https://www.youtube.com/channel/UCJ0-OtVpF0wOKEqT2Z1HEtA)
+    * [Jeri Ellsworth](https://www.youtube.com/user/jeriellsworth/playlists)
+* Boardview files can be open with [OpenBoardview](https://github.com/OpenBoardView/OpenBoardView),
+which is free software under MIT license.
+
+Use of youtube-dl with mpv would be recommended for youtube links
diff --git a/www/git.md b/www/git.md
index 06aac3d0..375a9eda 100644
--- a/www/git.md
+++ b/www/git.md
@@ -13,6 +13,10 @@ You can submit your patches via
 Information about how the Libreboot project is governed is documented in our
 [general management guidelines](management.md).
 
+Libreboot development is done using the Git version control system.
+Refer to the [official Git documentation](https://git-scm.com/doc) if you don't
+know how to use Git.
+
 Editing the website and documentation, wiki-style
 -------------------------------------------------
 
diff --git a/www/global.css b/www/global.css
index 80309059..87df287d 100644
--- a/www/global.css
+++ b/www/global.css
@@ -18,7 +18,20 @@ body {
 }
 
 pre {
-    margin-left: 2.5em
+    padding: 0.3em;
+}
+
+pre,table {
+    overflow-x: auto;
+    display: block;
+}
+
+code, pre {
+    background-color: #DDD;
+}
+
+img {
+    max-width: 100%;
 }
 
 #logo {
@@ -31,6 +44,11 @@ a {
     color: #22D;
 }
 
+/* probably generated with autolink_bare_uris extension */
+a.uri {
+    word-wrap: break-word;
+}
+
 a:hover {
     color: #008;
 }
diff --git a/www/index.md b/www/index.md
index 8fd886e1..9181a429 100644
--- a/www/index.md
+++ b/www/index.md
@@ -36,12 +36,11 @@ libreboot is fully free software, where anyone can contribute or inspect its
 code.
 
 Libreboot is faster, more secure and more reliable than most non-free
-firmware, and can provide many advanced feature, like encrypted
-/boot/, GPG signature checking before booting your kernel, ability to
-load an OS *from the flash chip*, and more.
+firmware. Libreboot provides many advanced features, like encrypted
+/boot/, GPG signature checking before booting your kernel and more!
 
 Libreboot's main upstream provider is [coreboot](https://www.coreboot.org/),
 which we deblob. We upstream our custom patches to projects like coreboot,
 depthcharge, GRUB, and flashrom where possible. Together, we provide an
-automated build and installation system with nontechnical documentation,
-allowing Libreboot to be widely used. 
+automated build and installation system with non-technical documentation,
+allowing Libreboot to be widely used.
diff --git a/www/management.md b/www/management.md
index b05a1826..f09ce9b7 100644
--- a/www/management.md
+++ b/www/management.md
@@ -28,13 +28,14 @@ List of members in the core management team
 In alphabetical order:
 
 - Andrew Robbins is a core developer. IRC nick **and\_who**, email
-  <mailto:andrew@libreboot.org>
+  [andrew@libreboot.org](mailto:andrew@libreboot.org)
 - Paul Kocialkowski is a core developer. IRC nick **paulk-X** 
-  (**X** is variable, and changes over time), email <mailto:paul@libreboot.org>
+  (**X** is variable, and changes over time), email
+  [paul@libreboot.org](mailto:paul@libreboot.org)
 - Leah Rowe is a core developer (and project founder). IRC nick
-  **\_4of7**, email <mailto:leah@libreboot.org>
+  **unoccupied**, email [leah@libreboot.org](mailto:leah@libreboot.org)
 - Swift Geek is a core developer. IRC nick **swiftgeek**, email
-  <mailto:swiftgeek@libreboot.org>
+  [swiftgeek@libreboot.org](mailto:swiftgeek@libreboot.org)
 
 Generally, the people on this list have these responsibilities:
 
@@ -56,8 +57,8 @@ These people are not part of core management, but still have influence.
 Other IRC channel moderators:
 
 - IRC nick **specing** on the Libreboot IRC channel.
-- IRC nick **pizzaiolo** on the Libreboot IRC channel.
-- IRC nick **jxself** on the Libreboot IRC channel.
+
+specing occasionally provides assistance, and moderates the IRC channel.
 
 Additionally, Libreboot has a separate set of operators on the subreddit
 r/libreboot. Check Reddit for more information. Actions taken by moderators
diff --git a/www/news/MANIFEST b/www/news/MANIFEST
index b092d469..0e7cc034 100644
--- a/www/news/MANIFEST
+++ b/www/news/MANIFEST
@@ -1,3 +1,6 @@
+news/leah-fundraiser.md
+news/libreplanet2018-workshop.md
+news/release-testing-20171221.md
 news/lenovo-recall.md
 news/alyssa-resignation.md
 news/talos.md
diff --git a/www/news/andrew-robbins-new-maintainer.md b/www/news/andrew-robbins-new-maintainer.md
index 50c43d3a..65fd8a3c 100644
--- a/www/news/andrew-robbins-new-maintainer.md
+++ b/www/news/andrew-robbins-new-maintainer.md
@@ -9,7 +9,7 @@ voted on by the maintainers with community input. These policies formalise our
 democratic standards.
 
 Today, we welcome Andrew Robbins (IRC nick `and_who` and
-[NotABug](https://notabug.org) user [kragle](https://notabug.org/kragle)) as
+[NotABug](https://notabug.org) user [and_who](https://notabug.org/and_who)) as
 our first new maintainer under the new policy. Going forward, Andrew will gain
 push access to Libreboot in order to review patches, as well as voting rights
 and IRC operator status.
diff --git a/www/news/leah-fundraiser.md b/www/news/leah-fundraiser.md
new file mode 100644
index 00000000..529547eb
--- /dev/null
+++ b/www/news/leah-fundraiser.md
@@ -0,0 +1,45 @@
+% Help Leah, founder of Libreboot, get Gender Reassignment Surgery
+% Leah Rowe
+% 19 April 2018
+
+I spoke with Andrew Robbins and Swift Geek on #libreboot IRC. These are two
+other members of the core Libreboot community. This news post was submitted to
+Pull Request, subject to their approval before publishing on libreboot.org.
+
+My name is Leah Rowe, and I'm the founder of the Libreboot project. I’m a 26
+year old British trans woman, living in the UK. After a lifetime of
+repression and denial, I came out as transgender in June 2016; I
+began living full-time as my true self for the first time. This was my coming
+out message to the Libreboot community:
+<https://lists.nongnu.org/archive/html/libreboot/2016-05/msg00004.html>
+
+I need help from the community in order to to pay for my Gender Reassignment
+Surgery. Here is my fundraiser:
+<https://vimuser.org/surgery/>
+
+I'm unable to pay for it myself. 2 years ago, I paid 90,000 USD to Raptor
+Engineering to port the ASUS KGPE-D16 and KCMA-D8 to Libreboot as well as 4000
+AUD to Damien Zammit for the Gigabyte GA-G41M-ES2L and Intel D510MO ports.
+Besides this, I've spent huge amounts of money in general on development of my
+own and I've dedicated countless hours to this project. I love Libreboot
+and I love working on it. For instance, I ported the ThinkPad X200 (later T400,
+T500 etc) to Libreboot myself, working alongside Steve Shenton to free it from
+the Intel ME firmware. Unfortunately, this has left me severely out of pocket
+and, even now, I can't afford to pay for the things I need for myself such as
+this.
+
+As a direct result of my contributions, the Free Software community is in a
+much better state than it was.
+The [Free Software Foundation](https://www.fsf.org/) now hosts fsf.org and
+[gnu.org](https://www.gnu.org/), as well as
+[GNU Savannah](https://savannah.gnu.org/) (used by many GNU projects, for code
+hosting and collaboration) on ASUS KGPE-D16
+servers, running Libreboot. Additionally, both the Free Software Foundation and
+[Software Freedom Conservancy](https://sfconservancy.org/) use Libreboot laptops
+almost exclusively in their offices. Thousands of people now use Libreboot.
+Projects inspired by Libreboot have also appeared such as the
+[TALOS II workstation](https://www.raptorcs.com/TALOSII/).
+
+I greatly appreciate any help that the community can give me, no matter how
+big or small. It will mean a great deal to me, and allow me to focus on my
+passions, including Libreboot.
diff --git a/www/news/libreplanet2018-workshop.md b/www/news/libreplanet2018-workshop.md
new file mode 100644
index 00000000..0de75670
--- /dev/null
+++ b/www/news/libreplanet2018-workshop.md
@@ -0,0 +1,99 @@
+% Libreboot installation workshop at FSF LibrePlanet 2018 conference
+% Leah Rowe
+% 21 March 2018
+
+LibrePlanet is the annual conference held by the Free Software Foundation in
+Boston, MA, USA. This year, it's being held at MIT university on March 24th
+and 25th. More details about it are here:
+<https://libreplanet.org/2018/>
+
+The FSF isn't officially hosting a Libreboot workshop at LibrePlanet
+this year. At the 2015 and 2016 LibrePlanet conference, there were workshops
+there run by myself and Patrick McDermott, a former member of the Libreboot
+project. The FSF has confirmed that they don't have a dedicated room for it
+this year, due to increasing number of conference goers.
+
+Therefore, an unofficial workshop is being set up. I've already issued a news
+post about this on the libreplanet-discuss mailing list:
+<https://lists.gnu.org/archive/html/libreplanet-discuss/2018-03/msg00037.html>
+
+With John Sullivan's blessing:
+<https://lists.gnu.org/archive/html/libreplanet-discuss/2018-03/msg00039.html>
+
+If you, the reader, are attending LibrePlanet this year, and you would like to
+get a Libreboot system flashed for you, then take it with you to LibrePlanet.
+There will be knowledgeable people there who can flash Libreboot for you.
+
+Find one of the people on the list below (list will be updated if more people
+volunteer to flash). If it's Kurt, they'll flash for you at the Technoethical
+booth. If it's someone else, they can take you into the speakers' lounge (it does
+not matter if they're not a speaker). John Sullivan of FSF has approved this.
+There are tables, chairs and power sockets in that room.
+There are also tables and chairs outside the speakers' lounge, in the common
+area at the conference, but I highly recommend using the speakers' lounge.
+That's where I took people, on LibrePlanet 2015 and 2016 :)
+It's really comfy in there.
+
+John Sullivan of FSF has also confirmed that that there is a dedicated
+*alcohol-free social and hacking time* at the FSF office on Saturday 24th
+March, between 1900-2130 (7-9:30 PM). You could also flash someone's laptop for
+them there, in the conference room at the FSF, or on a table outside. Or the
+sysadmin room, if that's OK with them.
+
+I've been asking around. The following people have confirmed so far that they
+will be providing Libreboot flashing services at the conference:
+
+- Kurt from Technoethical, an FSF-endorsed Libreboot hardware seller. They will
+  also have their own samples. They'll be at the Technoethical booth there.
+  IRC nick sensiblemn\_ or sensiblemn on #libreboot IRC
+- zyliwax from #libreboot IRC - has confirmed that they will be there
+- Patrick McDermott (pehjota) of Libiquity. Patrick is also present at
+  LibrePlanet, and has brought flashing equipment. What Patrick said on the
+  libreplanet-discuss mailing list: look for the person that is wearing a
+  grey Libiquity polo shirt. They posted this picture on the mailing list,
+  so you know how to find this person:
+  <http://www.libiquity.com/media/images/patrick-mcdermott.jpg>
+  - of note: Patrick is bringing CH341A-based programmer, and can flash D8/D16
+- You could also find an FSF sysadmin and ask them to flash Libreboot for you.
+
+I would be grateful if anyone else would also be willing to provide flashing.
+I myself am not attending the conference physically, unfortunately.
+
+See mailing list post for more info. If you would like to help Kurt and
+zyliwax out, please either reply to that mailing list post on
+libreplanet-discuss or email me directly:
+[leah@libreboot.org](mailto:leah@libreboot.org) and I'll add your name in
+the above list.
+
+Basically, all you need for flashing someone's laptop at the conference is:
+
+- Portable SPI flasher (USB powered. SSH into it via your laptop, use the SPI
+  flasher's own 3v3, etc). Make sure to use the workaround-mx patch on
+  flashrom, so that you can use `--workaround-mx` on Macronix chips, if flashing
+  an X200, otherwise flashing will be unreliable (see mailing list post linked
+  above) - portability is important, in case you sit down with someone in
+  a place without power sockets.
+  See guides on libreboot.org for setting up SPI flashers, but ignore the notes
+  about external PSUs and instead just wire up the flasher's own 3v3 connection.
+  The workaround-mx patch is here:
+  <https://notabug.org/consts/libreboot/raw/2caaac00972d9ea56b0fcd7c95897e90283b05b8/projects/flashrom/patches/0005-Workaround-MX25-reliable-operation.patch>
+  apply this on flashrom src and build with that. To use it, just pass the
+  `--workaround-mx` option in flashrom.
+- Screwdrivers (phillips head 0 *and* 00 - sometimes labelled PH0 or PH00,
+  respectively)
+- Thermal paste and thermal cleaning material, for T400 flashing
+  - arctic mx-4 paste recommended. For cleaning material, use anti-static cloth
+  and isopropyl alcohol - as pure as possible! ideally close to 100%! 70%
+  rubbing alcohol is common in USA, and not suitable for electronics
+- Anti-ESD wrist/ankle strap, to protect against damage from electrostatic
+  discharge when working with circuit boards.
+
+Optionally:
+
+- Bring DIP8 25xx SPI chips with Libreboot, for ASUS KCMA-D8 or KGPE-D16, for the
+  conference goer to put in their D8/D16 when they get home. Also PLCC32 LPC
+  1MB (or bigger, with padding at the beginning) chips for ASUS KFSN4-DRE
+- Soldering equipment (knife tip, hot air, etc) for X200T flashing. NOTE: FSF has
+  soldering equipment in their office, you could ask them to lend it to you
+  if you're flashing a laptop there at the FSF office. NOTE2: Kurt from
+  Technoethical is also bringing soldering equipment.
diff --git a/www/news/release-testing-20171221.md b/www/news/release-testing-20171221.md
new file mode 100644
index 00000000..28c23ca0
--- /dev/null
+++ b/www/news/release-testing-20171221.md
@@ -0,0 +1,19 @@
+% Testers needed for a new upcoming Libreboot release
+% Leah Rowe
+% 21 Dec 2017
+
+We need testers, especially hardware testers, for a new upcoming release of
+Libreboot.
+
+Andrew Robbins, one of the developers, has done extensive work on the build
+system in Libreboot and now we are rebasing all boards in Libreboot onto the
+latest version of coreboot. Upstream coreboot has many bugfixes, which the
+version that Libreboot uses (an older revision) does not have.
+
+We are currently assembling a team of testers. If you wish to participate,
+then reply on this thread in our bug tracker:
+
+<https://notabug.org/libreboot/libreboot/issues/373>
+
+Any help would be appreciated. In general, testing is also needed (e.g.
+build testing, documentation testing/improvements, etc).
diff --git a/www/suppliers.md b/www/suppliers.md
index 2c61164f..4432d86b 100644
--- a/www/suppliers.md
+++ b/www/suppliers.md
@@ -22,19 +22,33 @@ endorsement on a computer system, and invests money directly into Libreboot.
 
 Laptops:
 
+-   [Libreboot X200 Tablet laptop](https://minifree.org/product/libreboot-x200-tablet/) (FSF RYF certified)
+-   [Libreboot X200 laptop](https://minifree.org/product/libreboot-x200/) (FSF RYF certified)
 -   [Libreboot T400 laptop](https://minifree.org/product/libreboot-t400/) (FSF RYF certified)
 
 Services:
 
 -   [Libreboot installation service](https://minifree.org/product/libreboot-installation-service/)
+-   [Libreboot chip flashing service for ASUS KGPE-D16 and KCMA-D8](https://minifree.org/product/d8-d16-chipflash/)
 
-Merchendise:
+Merchandise:
 
 -   [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 X200 Tablet battery](https://minifree.org/product/libreboot-x200-tablet-battery/)
+-   [Libreboot X200/X200T docking station](https://minifree.org/product/docking-station-for-libreboot-x200/)
 -   [Libreboot stickers](https://minifree.org/product/libreboot-stickers/)
 
+Phreedom 2600
+------------------
+
+Phreedom 2600 sells the BeagleBone Black (which can be used for flashing Libreboot)
+and the Thinkpad X200. All computers come with Parabola GNU/Linux preinstalled.
+All products meets the criteria for [Respects Your Freedom](https://fsf.org/ryf).
+
+The webshop is here:
+<https://shop.phreedom2600.net/>
+
 Raptor Engineering
 ------------------
 
@@ -44,6 +58,12 @@ firmware and operating system preinstalled, *from the factory*.
 Website for pre-orders:
 <https://www.raptorcs.com/TALOSII/>
 
+They have 2 systems available:
+
+- [TALOS II Lite](https://secure.raptorcs.com/content/TL1BC1/purchase.html)
+  (this is the cheaper version)
+- [TALOS II](https://secure.raptorcs.com/content/TL2WK2/intro.html)
+
 NOTE: this isn't technically Libreboot, but the boot firmware is entirely free.
 
 This is the same company that ported the ASUS KFSN4-DRE, KGPE-D16 and KCMA-D8
diff --git a/www/template.html b/www/template.html
index 4ce72774..c2bdcda0 100644
--- a/www/template.html
+++ b/www/template.html
@@ -14,7 +14,6 @@ $if(keywords)$
   <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$">
 $endif$
   <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
-  <style type="text/css">code{white-space: pre;}</style>
 $if(quotes)$
   <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
 $endif$