Merge branch 'website-cleanup' of vimuser/libreboot into master

10 files changed, 49 insertions, 156 deletions

diff --git a/www/announce.md b/www/announce.md
deleted file mode 100644
index 88ec348d..00000000
--- a/www/announce.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-title: Libreboot release announcements
-...
-
-For information about current and past libreboot releases, see
-[../docs/release.html](../docs/release.html)
-
-If you want to be notified when a new version of libreboot is released,
-contact Leah Rowe [using her contact information on the contributors
-page](contrib.md), and she will add you to a list (in a script) that
-sends emails to people when a new Libreboot release is made, with a copy
-of the announcement and list of changes. You can unsubscribe any time by
-contacting Leah again and she will remove you from the list.
-
-This replaces the mailing lists, which were previously used for this
-purpose but the mailing list has been discontinued by the libreboot
-project.
-
-If you find a bug in a libreboot release, or in a beta release (or in
-the git reposities), [then please let us know!](tasks.md)
-
-Backup of old Libreboot mailing lists
--------------------------------------
-
-See [../lists/](lists.md)
-
diff --git a/www/contrib.md b/www/contrib.md
index e473f330..df05f4f3 100644
--- a/www/contrib.md
+++ b/www/contrib.md
@@ -15,6 +15,14 @@ Leah is also responsible for [vimuser.org](https://vimuser.org/)
 (personal website) and [transit.org.uk](https://transit.org.uk/)
 (support group for transgender people).
 
+Alyssa Rosenzweig
+-----------------
+
+Switched the website to use markdown in lieu of handwritten HTML and custom
+PHP. Additionally assisted with [booting
+Linux](https://blog.rosenzweig.io/blobless-linux-on-the-pi.md) on the Raspberry
+Pi without blobs. Current sysadmin and assists with project management.
+
 Timothy Pearson
 ---------------
 
@@ -83,14 +91,6 @@ this, sending her patches to test periodically until the bug was fixed
 in coreboot, and then helped her integrate the fix in libreboot. Contact
 **PaulePanter** in the \#libreboot IRC channel.
 
-Alyssa Rosenzweig
------------------
-
-Switched the website to use markdown in lieu of handwritten HTML and custom
-PHP. Additionally assisted with [booting
-Linux](https://blog.rosenzweig.io/blobless-linux-on-the-pi.md) on the Raspberry
-Pi without blobs.
-
 Jeroen Quint
 ------------
 
diff --git a/www/donate.md b/www/donate.md
deleted file mode 100644
index d0812c94..00000000
--- a/www/donate.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: Donate
-...
-
-The project is primarily funded by [Minifree Ltd](https://minifree.org/).
-Minifree is one of several vendors of libreboot machines; their profits support
-the project itself.
-
-We are not taking direct donations at the time.
diff --git a/www/download.md b/www/download.md
index c87e8eda..a0b5a64a 100644
--- a/www/download.md
+++ b/www/download.md
@@ -13,7 +13,15 @@ the TODO list.
 GPG signing key
 ---------------
 
-See [here](gpg/).
+Releases are signed with GPG.
+
+    $ gpg --recv-keys
+
+The GPG key can also be downloaded with this exported dump of the
+pubkey: [lbkey.asc](lbkey.asc).
+
+    $ sha512sum -c sha512sum.txt
+    $ gpg --verify sha512sum.txt.sig
 
 Do you have a mirror?
 ---------------------
diff --git a/www/faq.md b/www/faq.md
index b460f908..926aa6e3 100644
--- a/www/faq.md
+++ b/www/faq.md
@@ -687,6 +687,34 @@ 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?
+----------------------------------------------------------------
+
+See the [license information](logo/license.md).
+
+The Libreboot logo is available as a [bitmap](logo/logo.png), a
+[vector](logo/logo.svg), or a [greyscale vector](logo/logo_grey.svg).
+
+Libreboot Inside stickers are available as a
+[PDF](logo/stickers/libreboot-inside-simple-bold-1.60cmx2.00cm-diecut-3.pdf) or
+a
+[vector](logo/stickers/libreboot-inside-simple-bold-1.60cmx2.00cm-diecut-3.svg)
+
+
 Freedom questions
 =================
 
diff --git a/www/gpg.md b/www/gpg.md
deleted file mode 100644
index 9e2a30d6..00000000
--- a/www/gpg.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-title: GPG
-...
-
-    $ gpg --recv-keys
-
-The GPG key can also be downloaded with this exported dump of the
-pubkey: [lbkey.asc](lbkey.asc).
-
-    $ sha512sum -c sha512sum.txt
-    $ gpg --verify sha512sum.txt.sig
-
-Old GPG key (no longer used):
-
-    pub   4096R/656F212E 2014-07-04
-          Vingerafdruk van de sleutel = C923 4BA3 200C F688 9CC0  764D 6E97 D575 656F 212E
-          uid                  Libreboot Releases (signing key) <releases@libreboot.org>
-          sub   4096R/EC42160E 2014-07-04
-
diff --git a/www/index.md b/www/index.md
index 8951ef1b..e0771872 100644
--- a/www/index.md
+++ b/www/index.md
@@ -2,18 +2,17 @@
 title: Libreboot
 ...
 
-[![Libreboot
-logo](logo/logo.svg "Canteloupe, the libreboot mascot"){#logo}](logo-info.md)
+[![Libreboot logo](logo/logo.svg "Canteloupe, the libreboot
+mascot"){#logo}](faq.md#who-did-the-logo)
 
 [Downloads](download.md)                                                    --
 [Documentation](docs/)                                                      --
 [FAQ](faq.md)                                                               --
-[Donate](donate.md)                                                         --
 [Contributors](contrib.md)                                                  --
-[Report a bug](tasks.md)                                                    --
+[Report a bug](https://notabug.org/vimuser/libreboot/issues/new)            --
 [Submit a patch](git.md)                                                    --
 [Hardware Compatibility](docs/hcl/)                                         --
-[Installation Guide](docs/install/)                                         --
+[Install](docs/install/)                                                    --
 [Mirror](rsync.md)                                                          --
 [IRC](https://webchat.freenode.net/?channels=libreboot)
 
diff --git a/www/lists.md b/www/lists.md
deleted file mode 100644
index adb9c2a6..00000000
--- a/www/lists.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-title: Archives of the old Libreboot mailing lists
-...
-
-As part of this, we decided that it would be in the best interest of the
-libreboot project to no longer rely on any GNU infrastructure. We were
-initially contemplating hosting our own mailing lists, but then we
-realized that we could simply use the bug tracker on the
-[NotABug](https://notabug.org/vimuser/) page for the libreboot project.
-This uses NotABug's modified version of Gogs, which is a free
-GitHub replacement, and it also has pull requests. Bug
-reports and development discussions plus accepting patches is what we
-were using the old mailing lists for, but NotABug's bug tracker and
-pull request feature is far more efficient for this purpose.
-
-If you are interested in sending bug reports, see
-[../tasks/](tasks.md).
-
-If you wish to submit patches to libreboot, see [../git/](git.md).
-
-Backup of old Libreboot mailing lists
--------------------------------------
-
--   [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/)
-
diff --git a/www/logo-info.md b/www/logo-info.md
deleted file mode 100644
index 30f80250..00000000
--- a/www/logo-info.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-title: Logo Info
-...
-
-![Standard Logo](logo/logo.png) The Libreboot logo is available as a
-[bitmap](logo/logo.png), a [vector](logo/logo.svg), or a [greyscale
-vector](logo/logo_grey.svg).
-
-![Libreboot Inside
-Sticker](logo/stickers/libreboot-inside-simple-bold-1.60cmx2.00cm-diecut-3.svg)
-Libreboot Inside stickers are available as a
-[PDF](logo/stickers/libreboot-inside-simple-bold-1.60cmx2.00cm-diecut-3.pdf) or
-a
-[vector](logo/stickers/libreboot-inside-simple-bold-1.60cmx2.00cm-diecut-3.svg)
-
-See the [license information](logo/license.md).
diff --git a/www/tasks.md b/www/tasks.md
deleted file mode 100644
index 741d4bd2..00000000
--- a/www/tasks.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-title: Bugs
-...
-
-This page lists tasks for the next stable release of libreboot. [](../)
-
-Download the latest development tree from the [git repository](git.md)
-(page also contains instructions for sending patches)
-
-[Download untested releases](release/unstable.md) - volatile.
-
-[Download testing releases](release/testing.md) - beta, release
-candidate.
-
-Go to the libreboot development page for information about how to send
-your patches.
-
-How to send a bug report
-========================
-
-The bug tracker lists current tasks, with information on what is being
-done about them.
-
-<https://notabug.org/vimuser/libreboot/issues>
-
-People of interest {#tasks}
-------------------
-
-avph is unresponsive and damo22 has quit the project, so now it falls on
-Leah to montor their upstream patches, for integration in libreboot:\
-[damo22 open
-patches](https://review.coreboot.org/#/q/owner:%22Damien+Zammit%22+status:open)\
-[damo22 merged
-patches](https://review.coreboot.org/#/q/owner:%22Damien+Zammit%22+status:merged)\
-[avph open
-patches](https://review.coreboot.org/#/q/owner:%22Arthur+Heymans%22+status:open)\
-[avph merged
-patches](https://review.coreboot.org/#/q/owner:%22Arthur+Heymans%22+status:merged)
-