www/philosophy categories.html

[Karl Berry]

CVSROOT:        /web/www
Module name:    www
Changes by:     Karl Berry <karl>       07/12/02 19:48:54

Modified files:
        philosophy     : categories.html 

Log message:
        license clarification of categories drawing from author (licensing 
ticket #339936)

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.html?cvsroot=www&r1=1.44&r2=1.45

Patches:
Index: categories.html
===================================================================
RCS file: /web/www/www/philosophy/categories.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- categories.html     2 Oct 2007 04:04:41 -0000       1.44
+++ categories.html     2 Dec 2007 19:48:48 -0000       1.45
@@ -13,13 +13,16 @@
 
 <p>Also note <a href="/philosophy/words-to-avoid.html">Confusing
        Words which You Might Want to Avoid</a>.</p>
-       <p><img src="/philosophy/category.jpg" alt=
-       " [diagram of a the different categories of software] " /> This
-       <a id="diagram" name="diagram">diagram</a> by Chao-Kuei explains
-       the different categories of software. It's available as an <a href=
-       "/philosophy/category.fig">XFig file</a>, as a <a href=
-       "/philosophy/category.jpg">JPEG picture</a> and as a 1.5 magnified
-       <a href="/philosophy/category.png">PNG image</a>.</p>
+
+<p><img src="/philosophy/category.jpg" alt="[diagram of a the different
+categories of software]" /> This <a id="diagram"
+name="diagram">diagram</a> by Chao-Kuei explains the different
+categories of software. It's available as an <a
+href="/philosophy/category.fig">XFig file</a>, as a <a
+href="/philosophy/category.jpg">JPEG picture</a> and as a 1.5 magnified
+<a href="/philosophy/category.png">PNG image</a>, under the terms of any
+of the GNU GPL v2 or later, the GNU FDL v1.2 or later, or the Creative
+Commons Attribution-Share Alike v2.0 or later.</p>
 
 <dl>
 <dt id="FreeSoftware"><strong>Free software</strong></dt>
@@ -410,7 +413,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2007/10/02 04:04:41 $
+$Date: 2007/12/02 19:48:48 $
 <!-- timestamp end -->
 </p>
 </div>