trans-coord/gnun home.shtml licenses/license-li...

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   08/09/06 18:11:50

Modified files:
        gnun           : home.shtml 
        gnun/licenses  : license-list.html 
        gnun/server    : takeaction.html 

Log message:
        Automatic sync from the master www repository.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/home.shtml?cvsroot=trans-coord&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/licenses/license-list.html?cvsroot=trans-coord&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/takeaction.html?cvsroot=trans-coord&r1=1.23&r2=1.24

Patches:
Index: home.shtml
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/home.shtml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- home.shtml  2 Sep 2008 18:11:43 -0000       1.34
+++ home.shtml  6 Sep 2008 18:11:49 -0000       1.35
@@ -204,9 +204,6 @@
      in the drafting of the GFDL and GSFDL.</li>
   <li><a href="/server/takeaction.html#directory">Add to the Free Software
      Directory</a>.</li>
-  <li><strong>Worldwide:</strong>
-     <a href="/server/takeaction.html#doom">Sign the Doom community's
-     petition</a> to free the source code to the games Heretic and Hexen.</li>
   <li><strong>Priority projects:</strong>
           <a href="http://www.fsf.org/campaigns/priority.html";>Contribute</a>
       to these free software projects we are emphasizing:
@@ -300,7 +297,7 @@
 
 <p>Last Updated:
    <!-- timestamp start -->
-   $Date: 2008/09/02 18:11:43 $
+   $Date: 2008/09/06 18:11:49 $
    <!-- timestamp end -->
 </p>
   

Index: licenses/license-list.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/licenses/license-list.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- licenses/license-list.html  24 Aug 2008 18:11:32 -0000      1.11
+++ licenses/license-list.html  6 Sep 2008 18:11:50 -0000       1.12
@@ -374,8 +374,7 @@
   for their own works.  The <a href="#FreeBSD">FreeBSD License</a> is
   similarly permissive and brief.</p></dd>
 
-<dt><a id="ms-pl" 
href="http://www.microsoft.com/resources/sharedsource/licensingbasics/publiclicense.mspx";>Microsoft
 Public License (Ms-PL)</a></dt>
-
+<dt><a id="ms-pl" 
href="http://www.microsoft.com/opensource/licenses.mspx";>Microsoft Public 
License (Ms-PL)</a></dt>
 <dd><p>This is a free software license, compatible with version 3 of
     the GNU GPL.  It is incompatible with version 2 of the GNU GPL
     because of the conditions in sections 3(B) and 3(C).</p>
@@ -1455,7 +1454,7 @@
 works that provide information for practical use.</p></dd>
 
 
-<dt><a href="http://creativecommons.org/licenses/by/2.0/legalcode";>
+<dt><a id="ccby" href="http://creativecommons.org/licenses/by/2.0/legalcode";>
     Creative Commons Attribution 2.0 license</a> (a.k.a. CC-BY)</dt>
 <dd>
 <p>This is a non-copyleft free license that is good for art and
@@ -1473,7 +1472,7 @@
 immediately, &ldquo;Which one?&rdquo;</p>
 </dd>
 
-<dt><a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode";>
+<dt><a id="ccbysa" 
href="http://creativecommons.org/licenses/by-sa/2.0/legalcode";>
     Creative Commons Attribution-Sharealike 2.0 license</a> (a.k.a. 
CC-BY-SA)</dt>
 <dd>
 <p>This is a copyleft free license that is good for artistic and
@@ -1484,7 +1483,7 @@
     Commons license is being used</a>.</p></dd>
 
 
-<dt><a href="/licenses/dsl.html">
+<dt><a id="dsl" href="/licenses/dsl.html">
     Design Science License (DSL)</a></dt>
 <dd>
 <p>This is a free and copyleft license meant for general data.
@@ -1624,7 +1623,7 @@
   <p>
     Updated:
     <!-- timestamp start -->
-    $Date: 2008/08/24 18:11:32 $
+    $Date: 2008/09/06 18:11:50 $
     <!-- timestamp end -->
   </p>
 </div>

Index: server/takeaction.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/takeaction.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/takeaction.html      5 Sep 2008 18:11:47 -0000       1.23
+++ server/takeaction.html      6 Sep 2008 18:11:50 -0000       1.24
@@ -69,17 +69,6 @@
 </dl>
 
 <dl>
-  <dt><a id="doom"><strong>Sign petition to free Heretic/Hexen source
-  code</strong></a></dt>
-  <dd>The online Doom game community has a
-      <a href="http://www.doomworld.com/eternity/letter.html";>open
-      letter and petition to Raven Software and Activision</a> to apply
-      the GNU GPL to previously released source code for the games
-      Heretic and Hexen.
-</dd>
-</dl>
-
-<dl>
   <dt><a id="broadcast"><b>Support Public Knowledge against the
   &ldquo;broadcast flag&rdquo;</b></a></dt>
   <dd>Public Knowledge won a court case to overturn the FCC's
@@ -237,7 +226,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2008/09/05 18:11:47 $
+$Date: 2008/09/06 18:11:50 $
 <!-- timestamp end -->
 </p>
 </div>