Merge branch 'website-overhaul'

4 files changed, 4 insertions, 63 deletions

diff --git a/www/footer.md b/www/footer.md
index dfddfd75..be252407 100644
--- a/www/footer.md
+++ b/www/footer.md
@@ -3,5 +3,5 @@
 [Template](/license.md)                     --
 [Authors](/contrib.md)                      --
 [Conduct Guidelines](/conduct.md)           --
-[Management Guidelines](/management.md)     --
-[Peers Community](https://peers.community/) --
+[Governance](/management.md)                --
+[Peers Community](https://peers.community/)
diff --git a/www/index.md b/www/index.md
index c7847f9d..67e3b024 100644
--- a/www/index.md
+++ b/www/index.md
@@ -10,25 +10,17 @@ mascot"){#logo}](faq.md#who-did-the-logo)
 [Install](docs/install/)                                                    --
 [Docs](docs/)                                                               --
 [News](news/)                                                               --
-[IRC](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)                 --
-[Preinstalled systems](suppliers.md)
+[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. It is also available preinstalled from
 [these suppliers](suppliers.md).
 
-**[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)**
-
 Why use Libreboot?
 ------------------
 
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.