From 96ca7ee67a36605a33de8d57eb8e8d3998bc6427 Mon Sep 17 00:00:00 2001
From: Michał Masłowski <mtjm@mtjm.eu>
Date: Wed, 03 Sep 2014 14:30:21 -0400
Subject: Merge libreboot-6b6.

Conflicts:
	buildrom-withgrub
---
(limited to 'docs/howtos/x60_security.html')

diff --git a/docs/howtos/x60_security.html b/docs/howtos/x60_security.html
index 6abda98..660dbd6 100644
--- a/docs/howtos/x60_security.html
+++ b/docs/howtos/x60_security.html
@@ -207,12 +207,6 @@
 					</ul>
 				</li>
 				<li>
-					Software-based security hardening (GRUB trust/cryptomount, kernel LUKS/ecryptfs, etc).
-					<ul>
-						<li>modify grub to delay password attemps by a few seconds, and fail after a set time (and record all attemps in a counter, writing that to nvram)</li>
-					</ul>
-				</li>
-				<li>
 					General tips/advice and web links showing how to detect physical intrusions.
 				</li>
 				<li>
@@ -247,10 +241,17 @@
 				<li>Atheros PCI wifi: unknown, but lower than intel wifi.</li>
 				<li>Microphone: only problematic if the computer gets compromised.</li>
 				<li>Speakers: only problematic if the computer gets compromised.</li>
-				<li>EC: can be mitigated if following the <b>(not yet written)</b> guide on software security.</li>
+				<li>EC: can be mitigated if following the guide on software security.</li>
 			</ul>
 
 	<h1>
+		Further reading material (software security)
+	</h1>
+		<ul>
+			<li><a href="encrypted_trisquel.html">Installing Trisquel GNU/Linux with full disk encryption (including /boot)</a></li>
+		</ul>
+
+	<h1>
 		References
 	</h1>
 		<h2 id="ref1">[1] physical access</h2>
@@ -284,8 +285,15 @@
 <hr/>
 
 	<p>
-		Copyright &copy; 2014 Francis Rowe, All Rights Reserved.<br/>
-		See <a href="../license.html">../license.html</a> for license conditions.
+		Copyright &copy; 2014 Francis Rowe &lt;info@gluglug.org.uk&gt;<br/>
+		This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions.
+		A copy of the license can be found at <a href="../license.txt">../license.txt</a>.
+	</p>
+
+	<p>
+		This document is distributed in the hope that it will be useful,
+		but WITHOUT ANY WARRANTY; without even the implied warranty of
+		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See <a href="../license.txt">../license.txt</a> for more information.
 	</p>
 
 </body>
--
cgit v0.9.1