Libreboot release 6 beta 5 correction 1.

- Fixed typo where revision list for 5th beta was listed as March 11th
  2014, when in fact it was August 11th 2014
- Fixed incorrect grub.cfg that was actually placed in
  resources/grub/config/x60/grub_usqwerty.cfg which broke the default
  GRUB menu entry on X60

3 files changed, 35 insertions, 22 deletions

diff --git a/docs/index.html b/docs/index.html
index aac63a5f..b4289722 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -859,12 +859,12 @@
 				Specifically (Order No. / Model No. / CPU):
 			</p>
 			<ul>
-				<li>MA699LL/A / A1181 (EMC 2121) / Intel Core 2 Duo T5600</li>
-				<li>MA701LL/A / A1181 (EMC 2121) / Intel Core 2 Duo T7200</li>
-				<li>MB061LL/A / A1181 (EMC 2139) / Intel Core 2 Duo T7200</li>
-				<li>MA700LL/A / A1181 (EMC 2121) / Intel Core 2 Duo T7200</li>
-				<li>MB063LL/A / A1181 (EMC 2139) / Intel Core 2 Duo T7400</li>
-				<li>MB062LL/A / A1181 (EMC 2139) / Intel Core 2 Duo T7400</li>
+				<li>MA699LL/A / A1181 (EMC 2121) / Intel Core 2 Duo T5600 <b>(tested - working)</li>
+				<li>MA701LL/A / A1181 (EMC 2121) / Intel Core 2 Duo T7200 (untested)</li>
+				<li>MB061LL/A / A1181 (EMC 2139) / Intel Core 2 Duo T7200 (untested)</li>
+				<li>MA700LL/A / A1181 (EMC 2121) / Intel Core 2 Duo T7200 (untested)</li>
+				<li>MB063LL/A / A1181 (EMC 2139) / Intel Core 2 Duo T7400 (untested)</li>
+				<li>MB062LL/A / A1181 (EMC 2139) / Intel Core 2 Duo T7400 <b>(tested - working)</b></li>
 			</ul>
 
 		<p>
@@ -1166,6 +1166,13 @@
 				If you see that, great! Shut down now (power off). Wait a few seconds and then boot!
 			</p>
 
+			<p>
+				<b>
+					If you boot and you see nothing, try turning up the backlight (F2 for macbook21). 
+				</b>
+			</p>
+
+
 		</div>
 
 		<p><a href="#pagetop">Back to top of page.</a></p>
@@ -1230,7 +1237,7 @@
 
 			<p>
 				<b>
-					If you boot and you see nothing, try turning up the backlight (Fn+Home). 
+					If you boot and you see nothing, try turning up the backlight (Fn+Home for X60/X60S/X60T/T60, F2 for macbook21). 
 					If this is a ThinkPad X60 and backlight resets to zero when turning it up while at max, look at <a href="#tft_brightness">#tft_brightness</a>.
 				</b>
 			</p>
diff --git a/docs/release.html b/docs/release.html
index 32d8c297..15b23426 100644
--- a/docs/release.html
+++ b/docs/release.html
@@ -72,7 +72,7 @@
 			<li>Revised (pre-release, 2nd beta) 2014 July 16th</li>
 			<li>Revised (pre-release, 3rd beta) 2014 July 20th</li>
 			<li>Revised (pre-release, 4th beta) 2014 July 29th</li>
-			<li>Revised (pre-release, 5th beta) 2014 August 11th</li>
+			<li>Revised (pre-release, 5th beta) 2014 August 11th (corrected 2014 August 11th)</li>
 		</ul>
 
 		<div class="important">
@@ -87,21 +87,21 @@
 
 		<h2>Binaries (for flashing) (right-click save as, or use wget)</h2>
 			<ul>
-				<li><a href="http://libreboot.org/release/5/prerelease_beta5/libreboot_bin.tar.gz">http://libreboot.org/release/5/prerelease_beta5/libreboot_bin.tar.gz</a></li>
-				<li><a href="http://libreboot.org/release/5/prerelease_beta5/libreboot_bin.tar.gz.sig">http://libreboot.org/release/5/prerelease_beta5/libreboot_bin.tar.gz.sig</a></li>
-				<li><a href="http://libreboot.org/release/5/prerelease_beta5/libreboot_bin.tar.gz.sha512sum.txt">http://libreboot.org/release/5/prerelease_beta5/libreboot_bin.tar.gz.sha512sum.txt</a></li>
+				<li><a href="http://libreboot.org/release/5/prerelease_beta5/correction/libreboot_bin.tar.gz">http://libreboot.org/release/5/prerelease_beta5/correction/libreboot_bin.tar.gz</a></li>
+				<li><a href="http://libreboot.org/release/5/prerelease_beta5/correction/libreboot_bin.tar.gz.sig">http://libreboot.org/release/5/prerelease_beta5/correction/libreboot_bin.tar.gz.sig</a></li>
+				<li><a href="http://libreboot.org/release/5/prerelease_beta5/correction/libreboot_bin.tar.gz.sha512sum.txt">http://libreboot.org/release/5/prerelease_beta5/correction/libreboot_bin.tar.gz.sha512sum.txt</a></li>
 			</ul>
 		<h2>Source code (for hacking) (right-click save as, or use wget)</h2>
 			<ul>
-				<li><a href="http://libreboot.org/release/5/prerelease_beta5/libreboot_src.tar.gz">http://libreboot.org/release/5/prerelease_beta5/libreboot_src.tar.gz</a></li>
-				<li><a href="http://libreboot.org/release/5/prerelease_beta5/libreboot_src.tar.gz.sig">http://libreboot.org/release/5/prerelease_beta5/libreboot_src.tar.gz.sig</a></li>
-				<li><a href="http://libreboot.org/release/5/prerelease_beta5/libreboot_src.tar.gz.sha512sum.txt">http://libreboot.org/release/5/prerelease_beta5/libreboot_src.tar.gz.sha512sum.txt</a></li>
+				<li><a href="http://libreboot.org/release/5/prerelease_beta5/correction/libreboot_src.tar.gz">http://libreboot.org/release/5/prerelease_beta5/correction/libreboot_src.tar.gz</a></li>
+				<li><a href="http://libreboot.org/release/5/prerelease_beta5/correction/libreboot_src.tar.gz.sig">http://libreboot.org/release/5/prerelease_beta5/correction/libreboot_src.tar.gz.sig</a></li>
+				<li><a href="http://libreboot.org/release/5/prerelease_beta5/correction/libreboot_src.tar.gz.sha512sum.txt">http://libreboot.org/release/5/prerelease_beta5/correction/libreboot_src.tar.gz.sha512sum.txt</a></li>
 			</ul>
 		<h2>Metadata (for re-creating the source archive) (right-click save as, or use wget)</h2>
 			<ul>
-				<li><a href="http://libreboot.org/release/5/prerelease_beta5/libreboot_meta.tar.gz">http://libreboot.org/release/5/prerelease_beta5/libreboot_meta.tar.gz</a></li>
-				<li><a href="http://libreboot.org/release/5/prerelease_beta5/libreboot_meta.tar.gz.sig">http://libreboot.org/release/5/prerelease_beta5/libreboot_meta.tar.gz.sig</a></li>
-				<li><a href="http://libreboot.org/release/5/prerelease_beta5/libreboot_meta.tar.gz.sha512sum.txt">http://libreboot.org/release/5/prerelease_beta5/libreboot_meta.tar.gz.sha512sum.txt</a></li>
+				<li><a href="http://libreboot.org/release/5/prerelease_beta5/correction/libreboot_meta.tar.gz">http://libreboot.org/release/5/prerelease_beta5/correction/libreboot_meta.tar.gz</a></li>
+				<li><a href="http://libreboot.org/release/5/prerelease_beta5/correction/libreboot_meta.tar.gz.sig">http://libreboot.org/release/5/prerelease_beta5/correction/libreboot_meta.tar.gz.sig</a></li>
+				<li><a href="http://libreboot.org/release/5/prerelease_beta5/correction/libreboot_meta.tar.gz.sha512sum.txt">http://libreboot.org/release/5/prerelease_beta5/correction/libreboot_meta.tar.gz.sha512sum.txt</a></li>
 			</ul>
 
 		<h2>Machines still supported (compared to previous release):</h2>
@@ -441,7 +441,7 @@
 			</ul>
 
 		<h2>
-			Revisions for 5th beta (2014 March 11th)
+			Revisions for 5th beta (2014 August 11th)
 		</h2>
 			<ul>
 				<li>build: added 'luks', 'lvm', 'cmosdump' and 'cmostest' to the list of modules for grub.elf</li>
@@ -470,6 +470,14 @@
 				<li>Fixed the oversight where macbook21_firstflash wasn't included in binary archives</li>
 			</ul>
 
+		<h2>
+			Corrections to 5th beta (2014 August 2014)
+		</h2>
+			<ul>
+				<li>Fixed typo where revision list for 5th beta was listed as March 11th 2014, when in fact it was August 11th 2014</li>
+				<li>Fixed incorrect grub.cfg that was actually placed in resources/grub/config/x60/grub_usqwerty.cfg which broke the default GRUB menu entry on X60</li>
+			</ul>
+
 		<div class="important">
 			<h2>
 				Other tasks (to be completed before declaring the initial stable release)
diff --git a/resources/grub/config/x60/grub_usqwerty.cfg b/resources/grub/config/x60/grub_usqwerty.cfg
index 414d2d21..cce7a44b 100644
--- a/resources/grub/config/x60/grub_usqwerty.cfg
+++ b/resources/grub/config/x60/grub_usqwerty.cfg
@@ -24,11 +24,9 @@ set pager=1
 background_image (cbfsdisk)/background.jpg
 loadfont (cbfsdisk)/dejavusansmono.pf2
 
-keymap ukqwerty
-
 menuentry 'Load Operating System' {
-	linux  (ahci0,2)/vmlinuz-linux-lts root=/dev/mapper/v-rootvol rw cryptdevice=/dev/sda3:lvm root=/dev/mapper/v-rootvol
-	initrd  (ahci0,2)/initramfs-linux-lts.img
+	linux  (ahci0,1)/vmlinuz root=/dev/sda1
+	initrd  (ahci0,1)/initrd.img
 }
 menuentry 'Parse ISOLINUX menu (USB)' {
 	set root='usb0'