From 23e9370115ed4a0222b9186c64de2bc7b096b966 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sun, 31 May 2015 17:22:53 -0400
Subject: download page: simplify and improve the text

---
diff --git a/site/download/index.php b/site/download/index.php
index 31a5376..c1305a6 100644
--- a/site/download/index.php
+++ b/site/download/index.php
@@ -60,10 +60,9 @@
 			</p>
 
 			<p>
-				<?php echo gettext("Download the SHA512 manifest and its corresponding GPG signature for the release that you are using, and put them in a directory."); ?>
-				<?php echo gettext("Put the src, util and docs archives in the root of that directory, alongside the SHA512 manifest file."); ?>
-				<?php echo gettext("Put your ROM image archives under <i>rom/</i> in that directory."); ?>
-				<?php echo gettext("Put your crossgcc tarballs under <i>crossgcc/</i> in that directory."); ?>
+				<?php echo gettext("Download the SHA512 manifest and its corresponding GPG signature, for the release that you are using."); ?>
+				<?php echo gettext("Put the src, util and docs archives in the same directory as the SHA512 manifest file."); ?>
+				<?php echo gettext("Put your ROM image archives under <i>rom/</i> in that directory, and crossgcc tarballs under <i>crossgcc/</i>."); ?>
 			</p>
 			<p>
 				<?php echo gettext("After you've done this, verify the SHA512 checksums:"); ?><br/>
@@ -81,10 +80,6 @@
 		<h1><?php echo gettext("Release archives"); ?></h1>
 
 			<p>
-				<?php echo gettext("Download libreboot from one of these mirrors."); ?>
-			</p>
-
-			<p>
 				<b>
 					<?php echo gettext("The latest release is:"); ?> <?php echo $lbRelease[0][0][0]; ?>.
 					<?php echo gettext("Release date:"); ?> <?php echo $lbRelease[0][0][1]; ?>.
@@ -108,7 +103,7 @@
 
 		<h1><?php echo gettext("Mirroring libreboot (via rsync)"); ?></h1>
 			<p>
-				<?php echo gettext("Create a directory in your web server document root (e.g. libreboot/), and add one of these to your crontab:"); ?>
+				<?php echo gettext("Create a directory in your web directory (e.g. libreboot/) and put one of these in your crontab:"); ?>
 			</p>
 
 			<?php
@@ -116,7 +111,7 @@
 			?>
 
 			<p>
-				<?php echo gettext("Are you running a mirror? Contact the libreboot project (details are on the home page), and the link will be added on this page."); ?>
+				<?php echo gettext("Are you running a mirror? Contact the libreboot project, and the link will be added to this page."); ?>
 			</p>
 
 	</div>
@@ -126,33 +121,27 @@
 		<h1><?php echo gettext("Git repositories (development)"); ?></h1>
 
 			<p>
-				<?php echo gettext("The git repositories are intended for developing libreboot."); ?>
 				<?php echo gettext("For a list of current tasks in libreboot, see:"); ?> <a href="../docs/tasks.html">../docs/tasks.html</a>.
+				There is also a <a href="http://projects.mtjm.eu/projects/libreboot"><?php echo gettext("bug tracker"); ?></a>
 			</p>
 
 			<p>
-				<?php echo gettext("Maintenance guides for libreboot can be found at <a href=\"../docs/maintain/index.html\">../docs/maintain/index.html</a> and <a href=\"../docs/git/index.html\">../docs/git/index.html</a>."); ?>
+				<?php echo gettext("Maintenance guides can be found at <a href=\"../docs/maintain/index.html\">../docs/maintain/index.html</a> and <a href=\"../docs/git/index.html\">../docs/git/index.html</a>."); ?>
 			</p>
 
 			<h2><?php echo gettext("How to download"); ?></h2>
 				<p>
-					<?php echo gettext("Firmware (coreboot distribution). <i>This also contains the documentation</i>:"); ?><br/>
+					<?php echo gettext("Coreboot distribution. <i>This also contains the documentation</i>:"); ?><br/>
 					$ <b>git clone <a href="<?php echo $lbFirmwareGitwebAddress; ?>"><?php echo $lbFirmwareGitRepoAddress; ?></a></b>
 				</p>
 				<p>
-					<?php echo gettext("Libreboot website. <i>The documentation is in the other repository linked above</i>:"); ?><br/>
+					<?php echo gettext("Website. <i>Documentation is in the other repository</i>:"); ?><br/>
 					$ <b>git clone <a href="<?php echo $lbWebsiteGitwebAddress; ?>"><?php echo $lbWebsiteGitRepoAddress; ?></a></b>
 				</p>
-				<p>
-					<?php echo gettext("You might not see a progress bar; it's still cloning, so just be patient."); ?>
-				</p>
-				<ul>
-					<li><a href="http://projects.mtjm.eu/projects/libreboot"><?php echo gettext("Bug tracker"); ?></a></li>
-				</ul>
 
-			<h2 id="contrib"><?php echo gettext("Submitting patches to libreboot"); ?></h2>
+			<h2 id="contrib"><?php echo gettext("Submitting patches"); ?></h2>
 				<p>
-					<?php echo gettext("The <a href=\"http://git-scm.com/doc\">git documentation</a> describes how to use git."); ?>
+					<?php echo gettext("The <a href=\"http://git-scm.com/doc\">git documentation</a> describes how to use git. The following notes include simple tips for how to use git, but it is a good idea to get fully acquainted with git."); ?>
 				</p>
 				<p>
 					<?php echo gettext("Make sure that you configured git so that your name and email address appear in the commits that you create:"); ?><br/>
@@ -181,8 +170,7 @@
 			<div>
 
 				<p>
-					<?php echo gettext("If you are modifying an existing file, make sure to update the copyright license header in that file; in source files or scripts, this would usually be at the top, and for documentation it is typically at the bottom of the document. It is good practise to use your real name in the commit logs."); ?><br/>
-					<?php echo gettext("Example: <i>Copyright (C) 20XX John Doe &lt;john@doe.com&gt;</i>"); ?>
+					<?php echo gettext("If you are modifying an existing file, then make sure to update the copyright license header in that file; in source files or scripts, this would usually be at the top, and for documentation it is typically at the bottom of the document. It is good practise to use your real name in the commit logs."); ?>
 				</p>
 				<p>
 					<?php echo gettext("Generally speaking, using the same license as the file that you are modifying is much simpler."); ?>
@@ -224,18 +212,18 @@
 				</p>
 				<h3><?php echo gettext("Method 1: host a repository"); ?></h3>
 					<p>
-						<?php echo gettext("One way of contribiting a patch for review is to host a repository containing your modified branch. Give the checkout details to the libreboot project, along with information on which commits in what branch contain your changes. Contact the libreboot project using the details on the home page."); ?>
+						<?php echo gettext("Give the checkout details to the libreboot project, along with information on which commits in what branch contain your changes."); ?>
 					</p>
 				<h3><?php echo gettext("Method 2: git format-patch -N"); ?></h3>
 					<p>
-						<?php echo gettext("Use this method (replace N with the number of commits that you made) and send the .patch files to the libreboot project, along with details on what branch and revision these were made on top of. Contact the libreboot project using the details on the home page."); ?>
+						<?php echo gettext("Use this method (replace N with the number of commits that you made) and send the .patch files to the libreboot project, along with details on what branch and revision these were made on top of."); ?>
 					</p>
-
-			<h2 id="gitbackup"><?php echo gettext("Backup repositories"); ?></h2>
 				<p>
-					<?php echo gettext("Generally speaking, you should use the main repositories. These repositories are provided as backups, in case the main repositories are down."); ?>
+					<?php echo gettext("Contact the libreboot project using the details on the home page, sending your patch(es). The mailing list is generally preferable, although IRC can also be just as good for small patches (you would probably put the patch on a paste site)."); ?>
 				</p>
 
+			<h2 id="gitbackup"><?php echo gettext("Backup repositories"); ?></h2>
+
 				<h3><?php echo gettext("Firmware (coreboot distribution)"); ?></h3>
 					<p>
 <?php
--
cgit v0.9.1