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_heatsink.html')

diff --git a/docs/howtos/x60_heatsink.html b/docs/howtos/x60_heatsink.html
index 0feee77..22b55e1 100644
--- a/docs/howtos/x60_heatsink.html
+++ b/docs/howtos/x60_heatsink.html
@@ -134,8 +134,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