diff --git a/website/pages/git.md b/website/pages/contribute.md
similarity index 100%
rename from website/pages/git.md
rename to website/pages/contribute.md
diff --git a/website/pages/docs/bsd/index.md b/website/pages/docs/bsd/index.md
index 294f482..dab4876 100644
--- a/website/pages/docs/bsd/index.md
+++ b/website/pages/docs/bsd/index.md
@@ -60,7 +60,7 @@ payload. You can use *either* payload, to try to boot BSD operating
systems. If you do, please report your success or failure to the GNU
Boot project through a bug report. See the "Documentation and/or
testing" section in [Helping GNU
-Boot](git.md#documentation-andor-testing) page for more details on how
+Boot](contribute.md#documentation-andor-testing) page for more details on how
to do that.
SeaBIOS payload
diff --git a/website/pages/docs/grub/index.md b/website/pages/docs/grub/index.md
index 3dcaaef..08b61ab 100644
--- a/website/pages/docs/grub/index.md
+++ b/website/pages/docs/grub/index.md
@@ -49,4 +49,4 @@ file, before converting to a GRUB keymap file. Therefore, it would be unwise to
automatically add all keymaps in GRUB.
If you've added a keymap to lbmk, and it works,
-[please submit a patch!](../../git.md)
+[please submit a patch!](../../contribute.md)
diff --git a/website/pages/contrib.md b/website/pages/docs/history/authors.md
similarity index 94%
rename from website/pages/contrib.md
rename to website/pages/docs/history/authors.md
index 388955b..b89cf3e 100644
--- a/website/pages/contrib.md
+++ b/website/pages/docs/history/authors.md
@@ -1,21 +1,27 @@
---
-title: Project contributors
-x-unreviewed: true
+title: Libreboot project contributors
...
-This list does not necessarily reflect who is currently working on the project,
-but it lists some people who have contributed to the project in meaningful ways.
+This list was made by the Libreboot project at a time where it was
+still fully free software. At the time it didn't necessarily reflect
+who was currently working on the project, but it listed some people
+who did contribute to the Libreboot project in meaningful ways.
-If we forgot to mention you here, let us know and we'll add you. (or if
-you don't want to be mentioned, let us know and we'll remove your
-entry)
+The Libreboot project also told that if they forgot to mention you
+here, you should have let them known and they would have added
+you. (or if you didn't want to be mentioned, you could also have
+notified them and they would have removed your entry).
-Information about who maintains GNU Boot, and how the project is run,
-can be found on this page: [git.md](git.md).
+Since this page is now part of the continuation of the 100% free
+Libreboot project, which became GNU Boot, you can also send fixes to
+the GNU Boot project as well. How to contribute to GNU Boot is
+documented on the [contribute.md](contribute.md) page.
-You can know the history of the Libreboot project, simply by reading this page.
-It goes into detail about all of the major contributions to the project, and in
-general how the project was created (and who helped create it).
+As for putting foward the names of the people who contributed to GNU
+Boot, we are looking for help for finding the right schemes. So far we
+plan to mention people who help in the GNU Boot project news and also
+put forward all the contributors we can, especially for contributions
+that aren't patches and therefor that are harder to track.
Leah Rowe
---------
diff --git a/website/pages/docs/history/index.md b/website/pages/docs/history/index.md
index ed2f230..75bd438 100644
--- a/website/pages/docs/history/index.md
+++ b/website/pages/docs/history/index.md
@@ -30,6 +30,19 @@ Since some of the files have a very long history that spans through
multiple projects and repositories, we found the need to document the
complex history of the GNU Boot source code.
+In addition it would also be a good thing to go beyond just
+documenting the git and tarball releases history. For instance we lack
+the history of various projects somewhat related to Libreboot like
+retroboot, and we don't have any documentation on their precise
+relationship with the Libreboot project either.
+
+Researching all that ourselves is time consuming. So until now we
+tried to save what was useful for understanding the GNU Boot history
+without doing too much research (on the material) ourselves. Here are
+the pages we kept (and that we modified a bit to add more context):
+
+* [authors.md](authors.md)
+
Git history
===========
@@ -98,7 +111,7 @@ Incomplete history
The history of the projects presented in this page is incomplete. So
far we only have a partial code history. Contributions are
-welcome. See the [git.md](../../git.md) page about various ways to
+welcome. See the [contribute.md](../../contribute.md) page about various ways to
contribute to GNU Boot or to contact the project to update the
information in this page.
diff --git a/website/pages/docs/install/ich9utils.md b/website/pages/docs/install/ich9utils.md
index 55dfaf5..37ceb5b 100644
--- a/website/pages/docs/install/ich9utils.md
+++ b/website/pages/docs/install/ich9utils.md
@@ -15,7 +15,7 @@ fully disabled.
ich9utils is handled by the `lbmk` (libreboot-make) build system, but the code
itself is hosted in a separate repository. You can check the Git repositories
-linked on [../../git.md](../../git.md) if you wish to download and use it.
+linked on [../../contribute.md](../../contribute.md) if you wish to download and use it.
It is very *uncommon*, on GM45/ICH9M systems, to have an Intel Flash Descriptor
and GbE but *without* an Intel ME. On *most* of these systems (without Libreboot,
@@ -54,7 +54,7 @@ Another project:
ich9utils
=========
-You can find `ich9utils` on the [Git page](../../git.md) or you can download
+You can find `ich9utils` on the [Git page](../../contribute.md) or you can download
`lbmk` from the same page and run the following command in there:
./build module ich9utils
diff --git a/website/pages/docs/install/install.md b/website/pages/docs/install/install.md
index b6e4253..fd44aaf 100644
--- a/website/pages/docs/install/install.md
+++ b/website/pages/docs/install/install.md
@@ -339,7 +339,7 @@ Here are a list of targets:
* ThinkPad T60 with Intel GPU: flash the T60 ROM
Download and build flashrom, using the instructions
-on [the Git page](../../git.md), and download the `bucts` software using the
+on [the Git page](../../contribute.md), and download the `bucts` software using the
notes on that very same page.
You can replace Lenovo BIOS with GNU Boot, using flashrom running on the host
diff --git a/website/pages/docs/misc/codenames.md b/website/pages/docs/misc/codenames.md
index a030ab4..328e0c1 100644
--- a/website/pages/docs/misc/codenames.md
+++ b/website/pages/docs/misc/codenames.md
@@ -10,8 +10,9 @@ Introduction
This document lists product codenames for some hardware.
Please note that just because a certain device is listed here does NOT mean
-that it is supported in Libreboot. For supported devices refer to the
-installation documentation.
+that it is supported in GNU Boot nor that it was supported in Libreboot when
+it was fully free. For supported devices refer to the
+[GNU Boot status](status.md) or the [GNU Boot manual](manual/gnuboot.html).
### A note on GPUs
diff --git a/website/pages/download.md b/website/pages/download.md
index 42323c6..a6a44f1 100644
--- a/website/pages/download.md
+++ b/website/pages/download.md
@@ -7,7 +7,7 @@ Information about where to find new releases are announcements is in
the [news page](news.md).
If you're more interested in GNU Boot development, go to the
-[GNU Boot development page](../git.md), which also includes links to the
+[GNU Boot development page](../contribute.md), which also includes links to the
Git repositories. If you wish to build GNU Boot from source,
[read this page](docs/build/).
@@ -35,7 +35,7 @@ Links to regular release archives are listed on this page.
However, for the absolute most bleeding edge up-to-date version of GNU Boot,
there is a Git repository that you can download from. Go here:
-[How to download GNU Boot from Git](git.md)
+[How to download GNU Boot from Git](contribute.md)
FTP mirrors {#ftp}
-------------
diff --git a/website/pages/faq.md b/website/pages/faq.md
index 314d168..6976115 100644
--- a/website/pages/faq.md
+++ b/website/pages/faq.md
@@ -252,7 +252,7 @@ by doing some packaging work, testing, and writing some
documentation. This is relatively easy to do.
The documentation on how to send patches to GNU Boot is available in
-the [git.md](git.md) page.
+the [contribute.md](contribute.md) page.
Will the Purism laptops be supported?
----------------------------------------------------------------------
diff --git a/website/pages/footer.include.tmpl b/website/pages/footer.include.tmpl
index 8b25c15..d9e5a0d 100644
--- a/website/pages/footer.include.tmpl
+++ b/website/pages/footer.include.tmpl
@@ -1,11 +1,10 @@
-------------------------------------------------------------------------------
-* [Edit this page](/software/gnuboot/web/git.md)
+* [Edit this page](/software/gnuboot/web/contribute.md)
* [License](/software/gnuboot/web/license.md)
* [Template](/software/gnuboot/web/template-license.md)
* [Logo](/software/gnuboot/web/logo-license.md)
-* [Authors](/software/gnuboot/web/contrib.md)
-------------------------------------------------------------------------------
diff --git a/website/pages/template.include b/website/pages/template.include
index 10ba89f..9871df0 100644
--- a/website/pages/template.include
+++ b/website/pages/template.include
@@ -61,7 +61,7 @@ $endif$
News
Bugs
Savannah forge
-Helping GNU Boot
+Helping GNU Boot
Contact