Mike Gerwitz

Activist for User Freedom

diff options
authorMike Gerwitz <mike@mikegerwitz.com>2013-08-18 12:47:33 -0400
committerMike Gerwitz <mike@mikegerwitz.com>2013-08-18 12:47:33 -0400
commitfcd8eeea9a336d28cfc8986cf0ed21b20a965b5e (patch)
parenta79b9ccf43c76f2bacd97febf07a94a7c9218caf (diff)
:Replaced now out-of-date Windows 7 Sins image with EFF NSA Spying logo
-rw-r--r--images/eff-nsa-spying.pngbin0 -> 111988 bytes
-rw-r--r--images/win7sins.pngbin19076 -> 0 bytes
4 files changed, 9 insertions, 9 deletions
diff --git a/images/COPYING b/images/COPYING
index e31b699..e2ad8bd 100644
--- a/images/COPYING
+++ b/images/COPYING
@@ -4,6 +4,9 @@ licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License.
Information on the Creative Commons button image may be found at
+Use of the ``NSA Spying'' image is permitted by the EFF when used to link
+to their website; see <https://www.eff.org/copyright>.
The ``Cross satches'' background image, authored by Andrey Ovcharov, and is
licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License
by Subtle Patterns; more information may be found at
@@ -13,10 +16,6 @@ The ``Hollyweb'' image, authored by the Free Software Foundation, is licensed
under the Creative Commons Attribution-ShareAlike 3.0 Unported License; see
-The ``Windows 7 Sins'' and ``Close Windows, Open Doors'' images are authored by
-the Free Software Foundation; see <http://en.windows7sins.org/widget/> and
-<windows7sins.com> respectively.
The ``Heckert GNU'' head, authored by Aurelio A. Heckert, is licensed under the
Free Art License; see
diff --git a/images/eff-nsa-spying.png b/images/eff-nsa-spying.png
new file mode 100644
index 0000000..505976f
--- /dev/null
+++ b/images/eff-nsa-spying.png
Binary files differ
diff --git a/images/win7sins.png b/images/win7sins.png
deleted file mode 100644
index f6eced7..0000000
--- a/images/win7sins.png
+++ /dev/null
Binary files differ
diff --git a/tpl/.config b/tpl/.config
index 8251e64..8f68834 100644
--- a/tpl/.config
+++ b/tpl/.config
@@ -60,6 +60,12 @@ html_pre_index="$(
cat <<EOH
<div id="headline">
+ <a href="https://www.eff.org/nsa-spying">
+ <img src="/images/eff-nsa-spying.png"
+ alt="NSA Spying on Americans"
+ title="NSA Spying on Americans" />
+ </a>
<a href="http://upgradefromwindows8.com">
<img src="/images/win8-close.png"
alt="Close Windows, Open Doors" />
@@ -69,11 +75,6 @@ cat <<EOH
<img src="/images/hollywebshare.jpg"
alt="Stop the Hollyweb! No DRM in HTML5." />
- <a href="http://windows7sins.org">
- <img src="/images/win7sins.png"
- alt="Windows 7 Sins" title="Windows 7 Sins" />
- </a>