[Svnweb-commits] r710 - in windows7sins: branches/stable/i trunk trunk/i

[sysadmin]

Author: mattl
Date: Mon Sep 28 14:43:14 2009
New Revision: 710

Log:
remove monopoly image

Deleted:
   windows7sins/branches/stable/i/angrypixel-microsoft-monopoly.jpg
   windows7sins/trunk/i/angrypixel-microsoft-monopoly.jpg
Modified:
   windows7sins/trunk/base.inc
   windows7sins/trunk/index.php

Modified: windows7sins/trunk/base.inc
==============================================================================
--- windows7sins/trunk/base.inc Mon Sep 28 14:42:15 2009        (r709)
+++ windows7sins/trunk/base.inc Mon Sep 28 14:43:14 2009        (r710)
@@ -25,8 +25,14 @@
       <!-- <p class="netscape4">Microsoft Monopoly graphic, courtesy of <a 
href="http://theangrypixel.com";>The Angry Pixel</a>.</p> -->
 
       <p>This page is licensed under the Creative Commons <a href=
-      
"http://www.gnu.org/licenses/license-list.html#OpinionLicenses";>Attribution-No
-      Derivative Works 3.0 License</a>.</p>
+      "http://www.gnu.org/licenses/license-list.html#OpinionLicenses";
+      title="Works that express someone's opinion&mdash;memoirs,
+      editorials, and so on&mdash;serve a fundamentally different
+      purpose than works for practical use like software and
+      documentation. Because of this, we expect them to provide
+      recipients with a different set of permissions: just the
+      permission to copy and distribute the work
+      verbatim.">Attribution-No Derivative Works 3.0 License</a>.</p>
 
       <p class="print-only">To view a copy of this license, visit 
http://creativecommons.org/licenses/by-nd/3.0/us/ or send a letter to Creative 
Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, 
USA.</p>
 

Modified: windows7sins/trunk/index.php
==============================================================================
--- windows7sins/trunk/index.php        Mon Sep 28 14:42:15 2009        (r709)
+++ windows7sins/trunk/index.php        Mon Sep 28 14:43:14 2009        (r710)
@@ -16,12 +16,10 @@
 
                   <div id="education-more" class="more">
 
-                     <p><a href="/education/">Share this sin with 
others</a></p>
+                     <p><a href="/education/">Link to the 'Education' 
sin</a></p>
 
                      <?php include('education-more.html'); ?>
 
-                     <p><a href="/education/">Share this sin with 
others</a></p>
-
                   </div>
 
                 <div class="panel" title="DRM" id="p-drm">
@@ -36,6 +34,8 @@
 
                   <div id="drm-more" class="more">
 
+    <p><a href="/drm/">Link to the 'DRM' sin</a></p>
+
                      <?php include('drm-more.html'); ?>
                    
                  </div>
@@ -52,6 +52,8 @@
 
                  <div id="security-more" class="more">
 
+    <p><a href="/security/">Link to the 'Security' sin</a></p>
+
                      <?php include('security-more.html'); ?>
 
                  </div>
@@ -68,6 +70,9 @@
 
                  <div id="monopoly-more" class="more">
 
+    <p><a href="/monopoly/">Link to the 'Monopoly' sin</a></p>
+
+
                      <?php include('monopoly-more.html'); ?>
 
                  </div>
@@ -85,6 +90,8 @@
 
                  <div id="standards-more" class="more">
 
+    <p><a href="/standards/">Link to the 'Standards' sin</a></p>
+
                      <?php include('standards-more.html'); ?>
 
                  </div>
@@ -102,6 +109,8 @@
 
                  <div id="lockin-more" class="more">
 
+    <p><a href="/lockin/">Link to the 'Lock-in' sin</a></p>
+
                      <?php include('lockin-more.html'); ?>
 
                  </div>
@@ -118,6 +127,8 @@
 
                  <div id="privacy-more" class="more">
 
+    <p><a href="/privacy/">Link to the 'Privacy' sin</a></p>
+
                      <?php include('privacy-more.html'); ?>
 
                  </div>