From 764f4742818be0bce6cb6b21a8ab0ef781a4ac4e Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Thu, 15 Oct 2015 05:10:45 -0400
Subject: consolidate sections of the page

---
(limited to 'site')

diff --git a/site/index.php b/site/index.php
index 7638830..38e7011 100644
--- a/site/index.php
+++ b/site/index.php
@@ -77,6 +77,27 @@
 			<ul>
 				<li><b><a href="faq/">Frequently Asked Questions (and answers to those questions)</a></b></li>
 			</ul>
+			<h1 id="howtohelp">How to help?</h1>
+				<ul>
+					<li><a href="docs/tasks.html">List of tasks that need to be completed</a></li>
+					<li><a href="docs/maintain/index.html">How to maintain libreboot</a></li>
+				</ul>
+			<h2 id="contact"><?php echo gettext("Contact the libreboot project"); ?></h2>
+				<ul>
+					<li><a href="contrib/"><?php echo gettext("List of maintainers"); ?></a></li>
+					<li><a href="<?php echo $userMailingListAddress; ?>"><?php echo gettext("Mailing list"); ?></a></li>
+					<li><a href="<?php echo $devMailingListAddress; ?>"><?php echo gettext("Dev mailing list"); ?></a></li>
+					<li><a href="<?php echo $ircChannelAddress; ?>"><?php echo $ircChannelName; ?></a></li>
+				</ul>
+			<h2>Laptops with libreboot and GNU/Linux preinstalled</h2>
+				<p>
+					<a href="suppliers/">Laptops with libreboot and GNU/Linux preinstalled</a> are also available.
+				</p>
+				<p>
+					These systems come with libreboot and GNU/Linux preinstalled, where everything works out of the box. This is useful, for those who
+					do not want to install the software on their own, but still want to use it. These systems are fully endorsed by the Free Software Foundation,
+					under their <i>Respects your Freedom</i> certification.
+				</p>
 	</div>
 	<div>
 		<h1>
@@ -96,33 +117,6 @@
 				</p>
 	</div>
 
-	<div>
-
-
-			<h2 id="howtohelp">How to help?</h2>
-				<ul>
-					<li><a href="docs/tasks.html">List of tasks that need to be completed</a></li>
-					<li><a href="docs/maintain/index.html">How to maintain libreboot</a></li>
-				</ul>
-			<h2>Laptops with libreboot and GNU/Linux preinstalled</h2>
-				<p>
-					<a href="suppliers/">Laptops with libreboot and GNU/Linux preinstalled</a> are also available.
-				</p>
-				<p>
-					These systems come with libreboot and GNU/Linux preinstalled, where everything works out of the box. This is useful, for those who
-					do not want to install the software on their own, but still want to use it. These systems are fully endorsed by the Free Software Foundation,
-					under their <i>Respects your Freedom</i> certification.
-				</p>
-			<h2 id="contact"><?php echo gettext("Contact the libreboot project"); ?></h2>
-				<ul>
-					<li><a href="contrib/"><?php echo gettext("List of maintainers"); ?></a></li>
-					<li><a href="<?php echo $userMailingListAddress; ?>"><?php echo gettext("Mailing list"); ?></a></li>
-					<li><a href="<?php echo $devMailingListAddress; ?>"><?php echo gettext("Dev mailing list"); ?></a></li>
-					<li><a href="<?php echo $ircChannelAddress; ?>"><?php echo $ircChannelName; ?></a></li>
-				</ul>
-
-	</div>
-
 <?php
 	include "common/footer.php";
 ?>
--
cgit v0.9.1