we've been assimilated

4 files changed, 84 insertions, 128 deletions

diff --git a/site/download/index.php b/site/download/index.php
index 3c4b5e0..d2b854f 100644
--- a/site/download/index.php
+++ b/site/download/index.php
@@ -110,11 +110,6 @@
     				also includes links to the Git repositories. This shows how to submit patches.
     			</p>
                 <p>
-                    Get in GNU. See <a href="../gnu/">../gnu/</a>. PaulK is working on the build system changes,
-                    we still need to finish transitioning over to Texinfo for the documentation.
-                    <strong>Becoming part of GNU is a #1 priority for the libreboot project.</strong>
-                </p>
-                <p>
                     D16 and D8 doesn't boot with GRUB payload, see
                     <a href="https://ticket.coreboot.org/issues/48">https://ticket.coreboot.org/issues/48</a>
                     - workaround: seabios as main payload, compress grub and put that in cbfs too, configure
@@ -166,6 +161,82 @@
                     found in the <a href="../contrib/">contrib</a> page.
                     This could take months though, so probably won't be done before the next release.
                 </p>
+				<ul class="c">
+					<li>
+						Convert the documentation to texinfo - partially complete. The docs have been converted using pandoc, 
+						but now require a serious cleanup.
+						We wish to merge these into 1 documentation file (manual) in texinfo file. 
+						The <a href="https://www.gnu.org/software/texinfo/manual/texinfo/">texinfo manual</a> itself
+						is an example of how we would like to implement the new libreboot documentation. One file, but we 
+						will distribute it separated into separate pages/sections, 
+						and in other formats in addition to HTML. (info, PDF, etc). The current live documentation on the 
+						libreboot website is the old pre-conversion documentation,
+						written in raw HTML. To encourage the transition, we are now refusing all new documentation submissions 
+						that are not in texinfo format.
+						<ul>
+							<li>Texinfo is the official documentation format, for all GNU software.</li>
+							<li>GNU Emacs has decent integration for editing Texinfo documents. See <em>Texinfo mode</em>.
+							However, any text editor should be fine (the lead developer of libreboot uses Vim).</li>
+							<li>
+								i18n should be implemented from the start, so that we can start maintaining versions of the documentation
+								in non-English languages. GNU Gettext can be used for this.
+							</li>
+						</ul>
+					</li>
+					<li>
+						Modify the build system, to make use of standard GNU utilities: make, autoconf and so on. The current build system is 
+						non-standard (but well documented), written mostly in BASH.Read these documents:
+						<ul>
+							<li><a href="https://www.gnu.org/prep/standards/html_node/Standard-Targets.html">https://www.gnu.org/prep/standards/html_node/Standard-Targets.html</a></li>
+							<li><a href="https://www.gnu.org/prep/maintain/maintain.html#Distributions">https://www.gnu.org/prep/maintain/maintain.html#Distributions</a></li>
+						</ul>
+					</li>
+					<li>
+                                        Modify the build system, to
+					directly download the
+					build dependencies
+					that libreboot
+					currently tells the
+					user to install from
+					their distribution
+					package repository.
+					(Only in Git. Release
+					archives would have
+					them already). Build
+					these from source,
+					with our own GCC
+					(re-using coreboot's
+					GCC, which libreboot
+					already uses). This
+					will make <em>complete
+					corresponding
+					source</em> provision
+					easier, because it
+					would be automated;
+					this is in contrast to
+					the present setup,
+					where the person
+					distributing binaries
+					has to include the
+					sources for build
+					dependencies from the
+					distribution that they
+					happened to use for
+					compiling those
+					packages.
+                                                
+						<ul>
+							<li>This will also make everything self-contained, and coreboot already has integration for cross-compiling. We can make cross compilation
+							of utilities for non-x86 architectures much easier, without relying on quirks from the user's GNU/Linux distribution, where the
+							only thing we need from their distribution is the necessary toolchain for building <em>libreboot's own version of GCC</em>, which would then take over</li>
+							<li>
+								However, do not install these dependencies, only self-host them in the libreboot source archive. Also provide an option for the user to ignore libreboot's
+								GCC and dependencies, and use what their GNU/Linux distribution provides, when building from source.
+							</li>
+						</ul>
+					</li>
+				</ul>
+
 	</div>
 
 <?php
diff --git a/site/git/index.php b/site/git/index.php
index 9af2f56..d43986a 100644
--- a/site/git/index.php
+++ b/site/git/index.php
@@ -55,9 +55,6 @@
 	<div>
 
 		<h2 id="howtohelp">How can I help the libreboot project? <span class="r"><a href="#howtohelp">#howtohelp</a></span></h2>
-			<p>
-				<strong>Libreboot is becoming part of the GNU project, and we need help with the transition. <a href="../gnu/">Click here</a> for more information</strong>
-			</p>
             <p>
                 <strong>At any given time, here is a list of tasks if there are any, for the next stable release of libreboot:
                 <a href="../download/#tasks">click here</a></strong>
diff --git a/site/gnu/index.php b/site/gnu/index.php
index 80bf282..5e0e47f 100644
--- a/site/gnu/index.php
+++ b/site/gnu/index.php
@@ -1,7 +1,7 @@
 <?php
 /*
     Frequently asked questions
-    Copyright (C) 2015  Leah Woods <info@minifree.org>
+    Copyright (C) 2015, 2016  Leah Woods <info@minifree.org>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as
@@ -31,123 +31,10 @@
 <body>
 
 	<div id="pagetop">
-
-		<h1>GNU Libreboot</h1>
-			<p>
-				We are working to make libreboot eligible to be added to the <a href="https://gnu.org/">GNU system</a>,
-				and call on the community to help with this effort. <a href="../">Back to home page</a>
-			</p>
-			<p>
-				Firstly, the git repositories (for development) can be found on the <a href="../git/">git page</a>.
-			</p>
-			<p>
-				Libreboot has been 100% philosophically compatible with GNU, from the day the project was founded (our goal is identical to GNU,
-				and our philosophy is identical to the one held by that project), but there are some
-				technical issues with it that make it incompatible with GNU at present.
-			</p>
-			<h2>
-				So far, we have the following tasks to complete (there may be other tasks):
-			</h2>
-				<ul class="c">
-					<li>
-						Convert the documentation to texinfo - partially complete. The docs have been converted using pandoc, 
-						but now require a serious cleanup.
-						We wish to merge these into 1 documentation file (manual) in texinfo file. 
-						The <a href="https://www.gnu.org/software/texinfo/manual/texinfo/">texinfo manual</a> itself
-						is an example of how we would like to implement the new libreboot documentation. One file, but we 
-						will distribute it separated into separate pages/sections, 
-						and in other formats in addition to HTML. (info, PDF, etc). The current live documentation on the 
-						libreboot website is the old pre-conversion documentation,
-						written in raw HTML. To encourage the transition, we are now refusing all new documentation submissions 
-						that are not in texinfo format.
-						<ul>
-							<li>Texinfo is the official documentation format, for all GNU software.</li>
-							<li>GNU Emacs has decent integration for editing Texinfo documents. See <em>Texinfo mode</em>.
-							However, any text editor should be fine (the lead developer of libreboot uses Vim).</li>
-							<li>
-								i18n should be implemented from the start, so that we can start maintaining versions of the documentation
-								in non-English languages. GNU Gettext can be used for this.
-							</li>
-						</ul>
-					</li>
-					<li>
-						Modify the build system, to make use of standard GNU utilities: make, autoconf and so on. The current build system is 
-						non-standard (but well documented), written mostly in BASH.Read these documents:
-						<ul>
-							<li><a href="https://www.gnu.org/prep/standards/html_node/Standard-Targets.html">https://www.gnu.org/prep/standards/html_node/Standard-Targets.html</a></li>
-							<li><a href="https://www.gnu.org/prep/maintain/maintain.html#Distributions">https://www.gnu.org/prep/maintain/maintain.html#Distributions</a></li>
-						</ul>
-					</li>
-					<li>
-						<s>Document, extensively (and keep it up to date!) full and accurate information about package dependencies, libraries used, etc.
-						We already do this to a great extent (via an installation script for Trisquel and Parabola, and the overall build system in libreboot),
-						but we can do a better job documentation-wise.</s>
-					</li>
-					<li>
-						<s>Include ChangeLog and NEWS files in the distribution (in the release archives, but probably uncessary in the git repository).
-						ChangeLog entries can be generated automatically, using the gnulib gitlog-to-changelog script, and the NEWS file can be generated
-						from commit messages.</s> - DONE!
-					</li>
-					<li>
-						<s>Re-license the documentation under GNU FDL.</s> - DONE!
-					</li>
-					<li>
-						<s>Make libreboot possible to build from source without network access.</s> - DONE! (Only in release archives. 
-						Development in Git requires network access, for downloading the extra modules that go into the release archives. There is no way to avoid
-						this, due to what libreboot actually is - a boot firmware distribution, combining several projects, much like you have <em>GNU/Linux</em> distributions
-						which are identical in concept). 
-					</li>
-				</ul>
-			<h2>
-				Not required, technically, but will make things easier in general, not just for GNU:
-			</h2>
-				<ul class="c">
-					<li>
-                                        Modify the build system, to
-					directly download the
-					build dependencies
-					that libreboot
-					currently tells the
-					user to install from
-					their distribution
-					package repository.
-					(Only in Git. Release
-					archives would have
-					them already). Build
-					these from source,
-					with our own GCC
-					(re-using coreboot's
-					GCC, which libreboot
-					already uses). This
-					will make <em>complete
-					corresponding
-					source</em> provision
-					easier, because it
-					would be automated;
-					this is in contrast to
-					the present setup,
-					where the person
-					distributing binaries
-					has to include the
-					sources for build
-					dependencies from the
-					distribution that they
-					happened to use for
-					compiling those
-					packages.
-                                                
-						<ul>
-							<li>This will also make everything self-contained, and coreboot already has integration for cross-compiling. We can make cross compilation
-							of utilities for non-x86 architectures much easier, without relying on quirks from the user's GNU/Linux distribution, where the
-							only thing we need from their distribution is the necessary toolchain for building <em>libreboot's own version of GCC</em>, which would then take over</li>
-							<li>
-								However, do not install these dependencies, only self-host them in the libreboot source archive. Also provide an option for the user to ignore libreboot's
-								GCC and dependencies, and use what their GNU/Linux distribution provides, when building from source.
-							</li>
-						</ul>
-					</li>
-				</ul>
-
+        <p>
+            This page used to list tasks for joining the GNU project. Libreboot
+            is since 14 May 2016 an official part of the GNU project.
+        </p>
 	</div>
 
 <?php
diff --git a/site/index.php b/site/index.php
index 4b83dfe..f4e6db4 100644
--- a/site/index.php
+++ b/site/index.php
@@ -25,7 +25,7 @@
 <html>
 <head>
 	<link rel="stylesheet" type="text/css" href="common/css/main.css" />
-	<title><?php echo gettext("Libreboot project"); ?></title>
+	<title><?php echo gettext("GNU Libreboot"); ?></title>
 </head>
 
 <body>
@@ -34,13 +34,14 @@
 		<p>
 			<a href="logo/"><img src="logo/logo.svg" alt="Libreboot logo" title="Canteloupe, the libreboot mascot" style="width:25%;float:right" /></a>
 		</p>
-		<h1><?php echo gettext("Libreboot project"); ?></h1>
+		<h1><?php echo gettext("GNU Libreboot"); ?></h1>
 			<p>
 				Libreboot is a free BIOS or UEFI replacement (<a href="https://www.gnu.org/philosophy/free-sw.html">free as in freedom</a>);
 				libre <em>boot firmware</em> that initializes the hardware and starts a bootloader for your operating
 				system.
 				It's also an open source BIOS, but open source <a href="https://www.gnu.org/philosophy/open-source-misses-the-point.html">fails</a> to
 				promote freedom; <em>please call libreboot <strong><a href="https://www.gnu.org/philosophy/free-sw.html">free software</a></strong></em>.
+                Since 14 May 2016, Libreboot is part of the <a href="https://www.gnu.org/">GNU project</a>.
 			</p>
             <p>
                 <strong>Libreboot is working on a new release, and we need help. See <a href="download/#tasks">download/#tasks</a></strong>