Merge branch 'leahleah' of libreboot/libreboot into master

6 files changed, 50 insertions, 223 deletions

diff --git a/www/faq.md b/www/faq.md
index 926aa6e3..cf471ce6 100644
--- a/www/faq.md
+++ b/www/faq.md
@@ -21,15 +21,6 @@ this issue on some CCFL panels, but not LED panels.
 You can work around this in your distribution, by following the notes at
 [../docs/misc/\#backlight%20control](../docs/misc/#backlight%20control).
 
-My computer thinks it's 1970-01-01 (GM45 laptops) 
---------------------------------------------------
-
-Use Libreboot 20160818 or higher. This was a bug in coreboot, fixed
-upstream and merged in Libreboot 20160818.
-
-Alternatively, you can use kernel version 4.2 or older, if you wish to
-use libreboot 20150518 or earlier.
-
 The ethernet doesn't work on my X200/T400/X60/T60 when I plug in it 
 -------------------------------------------------------------------
 
@@ -39,7 +30,6 @@ hardware. On debian systems, a workaround is to restart the networking
 service when you connect the ethernet cable:
 
     sudo service network-manager restart
-    
 
 On Parabola, you can try:
 
@@ -80,51 +70,14 @@ What systems are compatible with libreboot?
 
 See [../docs/hcl/](docs/hcl/).
 
-Several supported systems are also available with libreboot
-preinstalled. Check the [suppliers](suppliers.md) page for more
-information.
-
-Will the Purism Librem laptops be supported?
-----------------------------------------------------------------------
-
-Probably not. There are several privacy, security and freedom issues
-with these laptops, due to the Intel chipsets that they use. See
-
-replaced (e.g. [Intel Management Engine](#intelme) and [CPU microcode
-updates](#microcode)). It uses the proprietary [Intel FSP](#fsp) blob
-for the entire hardware initialization, which Intel [won't
-provide](#intel-is-uncooperative) the source code for. The Video BIOS
-(initialization firmware for the graphics hardware) is also proprietary.
-The libreboot project recommends avoiding this hardware entirely.
-
-It will likely take many years to replace even one of these blobs, let
-alone all of them. Some of them (ME firmware and microcode) can't even
-be replaced, which immediately disqualifies these laptops from being
-added to libreboot. Google engineers have tried for many years to get
-source code from Intel, and to reverse engineer the blobs that Intel
-provides. So far, they have been unsuccessful. Google is also one of the
-companies that funds the coreboot project, and they hire a lot of the
-core developers, so it's not like they don't have vast resources at
-their disposal. Smaller companies have no chance.
-
-The librem does have coreboot support, but it's pretty meaningless
-(it's shimboot, which means that coreboot is just incorporating blobs.
-It's not real coreboot support, but rather, what is shamelessly passed
-off as coreboot support these days, where binary blobs for **the
-entire** hardware initialization is considered acceptable in the
-coreboot project). It should be noted, that the coreboot port for librem
-was done by a lone Google software developer (Duncan Laurie), not
-Purism, working independently. Purism had nothing to do with the port.
-
 Why is the latest Intel hardware unsupported in libreboot? {#intel}
 -----------------------------------------------------------
 
-It is extremely unlikely that any post-2008 Intel hardware will ever be
-supported in libreboot, due to severe security and freedom issues; so
-severe, that *the libreboot project recommends avoiding all modern Intel
-hardware. If you have an Intel based system affected by the problems
-described below, then you should get rid of it as soon as possible*. The
-main issues are as follows:
+It is unlikely that any post-2008 Intel hardware will ever be supported in
+libreboot, due to severe security and freedom issues; so severe, that *the
+libreboot project recommends avoiding all modern Intel hardware. If you have an
+Intel based system affected by the problems described below, then you should
+get rid of it as soon as possible*. The main issues are as follows:
 
 ### Intel Management Engine (ME) {#intelme}
 
@@ -506,21 +459,6 @@ GPU. Therefore, the ATI GPU is completely disabled on these laptops.
 Intel is used instead, with the free native graphics initialization
 (VBIOS replacement) that exists in coreboot.
 
-Will the latest ThinkPad models be supported?
------------------------------------------------------------------------------
-
-The latest ThinkPad generation supported in libreboot are the ones using the
-GM45 (ICH9) chipsets, such as the ThinkPad X200 or T400. ThinkPads newer than
-this generation will probably never be supported in libreboot, due to the fact
-that there are signed blobs that cannot be removed or replaced (e.g. Intel
-Management Engine]. Newer laptops are starting to
-[use](https://www.phoronix.com/scan.php?page=news_item&px=Intel-Boot-Guard-Kills-Coreboot)
-the [Intel Boot Guard](https://mjg59.dreamwidth.org/33981.html), which
-specifically blocks the use of firmware that has not been signed by the OEM.
-
-Coreboot does have support for some more recent Lenovo laptops, but libreboot
-cannot support most of these.
-
 Will desktop/server hardware be supported?
 ------------------------------------------------------------------------
 
@@ -575,15 +513,12 @@ How do I install libreboot?
 
 See [../docs/install/](docs/install/)
 
-How do I program an SPI flash chip with the BeagleBone Black?
+How do I program an SPI flash chip?
 ---------------------------------------------------------------------------------
 
-See [../docs/install/bbb\_setup.html](../docs/install/bbb_setup.html).
-
-How do I program an SPI flash chip with the Raspberry Pi?
------------------------------------------------------------------------------
-
-See [../docs/install/rpi\_setup.html](../docs/install/rpi_setup.html).
+SPI flash chips can be programmed with the [BeagleBone
+Black](../docs/install/bbb_setup.html) or the [Raspberry
+Pi](../docs/install/rpi_setup.html).
 
 How do I set a boot password?
 -------------------------------------------------------------------
@@ -609,17 +544,10 @@ it is rendered read-only at the OS level (external flashing is still
 possible, using dedicated hardware). For example, on current GM45
 laptops (e.g. ThinkPad X200, T400), you can write-protect (see
 [../docs/hcl/gm45\_remove\_me.html\#ich9gen](../docs/hcl/gm45_remove_me.html#ich9gen)).
-Depending on your flash chip, you can also write-protect the i945
-laptops, such as the ThinkPad X60 or T60 (see
-[../docs/hardware/x60\_security.html](../docs/hardware/x60_security.html))
-and
-[../docs/hardware/t60\_security.html](../docs/hardware/t60_security.html)
-for links to a video explaining it).
 
-It's possible to write-protect on all libreboot systems, but the
-instructions need to be written. The documentation is in the main git
-repository, so you are welcome to submit patches adding these
-instructions.
+It's possible to write-protect on all libreboot systems, but the instructions
+need to be written. The documentation is in the main git repository, so you are
+welcome to submit patches adding these instructions.
 
 How do I change the BIOS settings?
 ------------------------------------------------------------------------
@@ -687,20 +615,6 @@ SOIC-16 SPI flash chip:
 
 ![SOIT-8 SPI flash chip](images/soic16.jpg)
 
-Is there a backup of the old mailing list?
---------------------------------------------------------------
-
-Yes. We no longer use a mailing list, but archives can be found here:
-
--   [User mailing list
-    (HTML)](old/libreboot/html/lists.gnu.org/archive/html/libreboot)
--   [User mailing list (mbox
-    format)](old/libreboot/mbox/lists.gnu.org/libreboot/)
--   [Developer mailing list
-    (HTML)](old/libreboot-dev/html/lists.gnu.org/archive/html/libreboot-dev/)
--   [Developer mailing list (mbox
-    format)](old/libreboot-dev/mbox/lists.gnu.org/libreboot-dev/)
-
 Who did the logo?
 ----------------------------------------------------------------
 
@@ -714,12 +628,26 @@ Libreboot Inside stickers are available as a
 a
 [vector](logo/stickers/libreboot-inside-simple-bold-1.60cmx2.00cm-diecut-3.svg)
 
+What other firmware exists outside of libreboot?
+==================================================
 
-Freedom questions
-=================
+The main freedom issue on any system, is the boot firmware (usually
+referred to as a BIOS or UEFI). Libreboot replaces the boot firmware
+with fully free code, but even with libreboot, there may still be other
+hardware components in the system (e.g. laptop) that run their own
+dedicated firmware, sometimes proprietary. These are on secondary
+processors, where the firmware is usually read-only, written for very
+specific tasks. While these are unrelated to libreboot, technically
+speaking, it makes sense to document some of the issues here.
 
-Are external GPUs (e.g. PCI-E) OK?
-------------------------------------------------------------------------
+Note that these issues are not unique to libreboot systems. They apply
+universally, to most systems. The issues described below are the most
+common (or otherwise critical).
+
+Dealing with these problems will most likely be handled by a separate
+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
@@ -739,25 +667,6 @@ 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).
 
-What other firmware exists outside of libreboot?
-----------------------------------------------------------------------------------------
-
-The main freedom issue on any system, is the boot firmware (usually
-referred to as a BIOS or UEFI). Libreboot replaces the boot firmware
-with fully free code, but even with libreboot, there may still be other
-hardware components in the system (e.g. laptop) that run their own
-dedicated firmware, sometimes proprietary. These are on secondary
-processors, where the firmware is usually read-only, written for very
-specific tasks. While these are unrelated to libreboot, technically
-speaking, it makes sense to document some of the issues here.
-
-Note that these issues are not unique to libreboot systems. They apply
-universally, to most systems. The issues described below are the most
-common (or otherwise critical).
-
-Dealing with these problems will most likely be handled by a separate
-project.
-
 ### EC (embedded controller) firmware 
 
 Most (all?) laptops have this. The EC (embedded controller) is a small,
@@ -1038,23 +947,6 @@ out of the box.
 We would like to merge instructions for installing and booting BSD on
 libreboot systems. [Patches are welcome!](https://libreboot.org/git/)
 
-Can I use Windows?
-----------------------------------------------
-
-Windows is incompatible with libreboot, and will probably remain so. You
-should not use Windows, because it is non-free and therefore bad for
-freedom. It is also known to have several severe security and privacy
-issues, both intentional and unintentional. It is known to contact
-backdoors, in addition to other nasty anti-features like DRM.
-
-Windows incompatibility is a feature, not a bug.
-
-Incompatible Time Sharing System?
------------------------------------------------------
-
-jxself asked this in the IRC channel. As far as we know, this won't
-work in libreboot systems, or indeed any modern system.
-
 Are other operating systems compatible?
 -------------------------------------------------------------------
 
diff --git a/www/favicon.ico b/www/favicon.ico
new file mode 100644
index 00000000..db19245b
--- /dev/null
+++ b/www/favicon.ico
diff --git a/www/global.css b/www/global.css
index 91547655..681ae26c 100644
--- a/www/global.css
+++ b/www/global.css
@@ -18,13 +18,12 @@ body {
     color: #222;
 }
 
-h1 {
-    font-size: 2.0em;
+header {
     text-align: center;
 }
 
 #logo {
-    width: 25%;
+    width: 20%;
     float: right;
 }
 
diff --git a/www/index.md b/www/index.md
index 252eebdf..e878aabc 100644
--- a/www/index.md
+++ b/www/index.md
@@ -5,16 +5,16 @@ title: Libreboot
 [![Libreboot logo](logo/logo.svg "Canteloupe, the libreboot
 mascot"){#logo}](faq.md#who-did-the-logo)
 
-[Downloads](download.md)                                                    --
-[Documentation](docs/)                                                      --
-[FAQ](faq.md)                                                               --
-[Contributors](contrib.md)                                                  --
-[Report a bug](https://notabug.org/libreboot/libreboot/issues/new)            --
-[Submit a patch](git.md)                                                    --
-[Hardware Compatibility](docs/hcl/)                                         --
+[Download](download.md)                                                     --
 [Install](docs/install/)                                                    --
+[Contribute](git.md)                                                        --
 [Mirror](rsync.md)                                                          --
-[IRC](https://webchat.freenode.net/?channels=libreboot)
+[FAQ](faq.md)                                                               --
+[Docs](docs/)                                                               --
+[Authors](contrib.md)                                                       --
+[Bugs](https://notabug.org/libreboot/libreboot/issues)                      --
+[Compatibility](docs/hcl/)                                                  --
+[Support](https://webchat.freenode.net/?channels=libreboot)
 
 Libreboot is a [free](https://en.wikipedia.org/wiki/Free_software) and Open
 Source BIOS or UEFI replacement, initialising the hardware and booting your
@@ -80,7 +80,7 @@ Transparency and collaboration are the way forward.
 
 ~Alyssa Rosenzweig
 
-A message from Leah, to further compliment Alyssa's submission:
+### A message from Leah, to further complement Alyssa's submission:
 
 I acknowledge that what I did was wrong. Although I felt justified at the time,
 I ended up hurting a lot of people, most of whom were uninvolved with any of
diff --git a/www/publish.sh b/www/publish.sh
index 6de15662..c8838f17 100755
--- a/www/publish.sh
+++ b/www/publish.sh
@@ -3,23 +3,26 @@
 echo $1
 FILE=${1%.md}
 
-# if not homepage, add a link back to the homepage
+cat $1 > temp.md
+
+# add footer
+
+echo '' >> temp.md
+
 if [ "${FILE}" != "./index" ]; then
-        RETURN="<p><a href='/index.html'>Go back to homepage</a></p>"
+        echo -ne '[Back to home](/index.html) -- ' >> temp.md
 fi
 
-cat $1 > temp.md
 echo "[License](license.md)" >> temp.md
 
 # change out .md -> .html
 sed temp.md -i -e 's/\.md\(#[a-z\-]*\)*)/.html\1)/g'
 
 # work around issue #2872
-TOC=$(grep -q "^x-toc-enable: true$" temp.md && echo "--toc")
+TOC=$(grep -q "^x-toc-enable: true$" temp.md && echo "--toc --toc-depth=2")
 
 # work around heterogenous pandoc versions
 SMART=$(pandoc -v | grep -q '2\.0' || echo "--smart")
 
 # chuck through pandoc
-pandoc $SMART temp.md -s --css /global.css --section-divs -T Libreboot $TOC \
-       --template=template.html --metadata "return=$RETURN" > $FILE.html
+pandoc $TOC $SMART temp.md -s --css /global.css -T Libreboot > $FILE.html
diff --git a/www/template.html b/www/template.html
deleted file mode 100644
index 2fc9b28d..00000000
--- a/www/template.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<html$if(lang)$ lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$>
-<head>
-  <meta charset="utf-8">
-  <meta name="generator" content="pandoc">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
-$for(author-meta)$
-  <meta name="author" content="$author-meta$">
-$endfor$
-$if(date-meta)$
-  <meta name="dcterms.date" content="$date-meta$">
-$endif$
-$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$
-$if(highlighting-css)$
-  <style type="text/css">
-$highlighting-css$
-  </style>
-$endif$
-$for(css)$
-  <link rel="stylesheet" href="$css$">
-$endfor$
-$if(math)$
-  $math$
-$endif$
-$for(header-includes)$
-  $header-includes$
-$endfor$
-</head>
-<body>
-$for(include-before)$
-$include-before$
-$endfor$
-$if(title)$
-<header>
-<h1 class="title">$title$</h1>
-$if(subtitle)$
-<p class="subtitle">$subtitle$</p>
-$endif$
-$for(author)$
-<p class="author">$author$</p>
-$endfor$
-$if(date)$
-<p class="date">$date$</p>
-$endif$
-</header>
-$endif$
-$if(return)$
-$return$
-$endif$
-$if(toc)$
-<nav id="$idprefix$TOC">
-$toc$
-</nav>
-$endif$
-$body$
-$for(include-after)$
-$include-after$
-$endfor$
-</body>
-</html>