summaryrefslogtreecommitdiffstats
path: root/docs/howtos/x60_heatsink.html
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2014-09-03 14:30:21 (EDT)
committer Michał Masłowski <mtjm@mtjm.eu>2014-09-03 14:30:21 (EDT)
commit96ca7ee67a36605a33de8d57eb8e8d3998bc6427 (patch)
tree07202c5fe7d366f50d9d17010f3bbf0a44c08ee8 /docs/howtos/x60_heatsink.html
parent4e8051dfaa0ba5617961481056eb7e79d7b50861 (diff)
parent9a321884379a71b5f0986fdfb97a2b6c5bdccd8a (diff)
downloadlibreboot-96ca7ee67a36605a33de8d57eb8e8d3998bc6427.zip
libreboot-96ca7ee67a36605a33de8d57eb8e8d3998bc6427.tar.gz
libreboot-96ca7ee67a36605a33de8d57eb8e8d3998bc6427.tar.bz2
Merge libreboot-6b6.
Conflicts: buildrom-withgrub
Diffstat (limited to 'docs/howtos/x60_heatsink.html')
-rw-r--r--docs/howtos/x60_heatsink.html11
1 files changed, 9 insertions, 2 deletions
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>