From: W. Trevor King <wking@tremily.us>
Date: Fri, 17 Jan 2014 23:18:17 +0000 (-0800)
Subject: Replace Medusa image with Alex Schenck's Beowulf image
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c3c2c4d291a314f8d753810486424943f0fd8e1;p=reveal.js.git

Replace Medusa image with Alex Schenck's Beowulf image

To clear up licensing issues, change to an image used on the Wikimedia
Commons [1].  The image is copyright Alex Schenck [2], and licensed
under under the terms of the GNU General Public License as published
by the Free Software Foundation [3]; either version 2 of the License
[4], or any later version.

The Medusa image was posted with a:

  © 2009-2014 Rich Townsend

footer [5].  I think showing that image with a link to its original
counts as fair use [6], but using an explicitly licensed work is
better.

[1]: http://commons.wikimedia.org/wiki/File:Beowulf.jpg
[2]: http://en.wikipedia.org/wiki/User:Linuxbeak
[3]: https://fsf.org/
[4]: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
[5]: http://www.astro.wisc.edu/~townsend/news.php
[6]: http://en.wikipedia.org/wiki/Fair_use
---

diff --git a/Makefile b/Makefile
index a7d5164..0cc4bf3 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,8 @@ THUMBNAILS = \
 	$(DEST)/uss-enterprise-tw-th.png \
 	$(DEST)/columbia-fw-fh.png \
 	$(DEST)/columbia-hw-hh.png \
-	$(DEST)/medusa-fw-fh.png \
-	$(DEST)/medusa-hw-hh.png
+	$(DEST)/beowulf-fw-fh.png \
+	$(DEST)/beowulf-hw-hh.png
 
 
 .PRECIOUS: $(DEST)/% $(DEST)/%.png $(DEST)/%.pdf
diff --git a/index.html b/index.html
index 3437821..1cdbd35 100644
--- a/index.html
+++ b/index.html
@@ -254,8 +254,8 @@
 					<section>
 						<h3>Grim Reality</h3>
 
-						<a href="http://www.astro.wisc.edu/~townsend/news.php#medusa-first">
-							<img src="media/build/medusa-fw-fh.png" />
+						<a href="http://commons.wikimedia.org/wiki/File:Beowulf.jpg">
+							<img src="media/build/beowulf-fw-fh.png" />
 						</a>
 					</section>
 
@@ -276,8 +276,8 @@
 									</a>
 								</td>
 								<td>
-									<a href="http://www.astro.wisc.edu/~townsend/news.php#medusa-first">
-										<img src="media/build/medusa-hw-hh.png" />
+									<a href="http://commons.wikimedia.org/wiki/File:Beowulf.jpg">
+										<img src="media/build/beowulf-hw-hh.png" />
 									</a>
 								</td>
 							</tbody>
diff --git a/media/src/binary/beowulf.jpg b/media/src/binary/beowulf.jpg
new file mode 100644
index 0000000..c39611d
Binary files /dev/null and b/media/src/binary/beowulf.jpg differ
diff --git a/media/src/binary/medusa.jpg b/media/src/binary/medusa.jpg
deleted file mode 100644
index 41571cf..0000000
Binary files a/media/src/binary/medusa.jpg and /dev/null differ