www/licenses compat.html

[Yavor Doganov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   08/08/13 14:07:52

Modified files:
        licenses       : compat.html 

Log message:
        Amend the link to the X11 license.  Don't include footer-min.  Misc
        cleanups.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/compat.html?cvsroot=www&r1=1.4&r2=1.5

Patches:
Index: compat.html
===================================================================
RCS file: /web/www/www/licenses/compat.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- compat.html 28 Dec 2007 19:01:24 -0000      1.4
+++ compat.html 13 Aug 2008 14:07:47 -0000      1.5
@@ -17,13 +17,15 @@
 <blockquote>A work licensed under p can be distributed under the terms
 of q.</blockquote>
 
-<p>For example, the <a href="http://www.x.org/Downloads_terms.html";>X11
-license</a> is compatible with the <a
-href="http://www.gnu.org/licenses/gpl.html";>GPL version 2</a>, because
-works licensed under the X11 license, can be distributed under the
-terms of the GPL.</p>
+<p>For example,
+the <a href="http://www.xfree86.org/3.3.6/COPYRIGHT2.html#3";>X11
+license</a> is compatible with
+the <a href="http://www.gnu.org/licenses/gpl.html";>GPL version 2</a>,
+because works licensed under the X11 license, can be distributed under
+the terms of the GPL.</p>
 
-<address><a href="mailto:address@hidden";>David Turner</a></address>
+<p>David Turner <a href="mailto:address@hidden";>
+&lt;address@hidden&gt;</a></p>
 
 <h4><a href="/licenses/licenses.html">More about licenses</a></h4>
 
@@ -36,17 +38,17 @@
 
 </div>
 
-<!--#include virtual="/server/footer-min.html" -->
+<!--#include virtual="/server/footer.html" -->
 
 <div id="footer">
 
 <p>
 Please send FSF &amp; GNU inquiries to
 <a href="mailto:address@hidden";><em>address@hidden</em></a>.
-There are also <a href="/home.html#ContactInfo">other ways to contact</a>
+There are also <a href="/contact/">other ways to contact</a>
 the FSF.
 <br />
-Please send broken links and other corrections (or suggestions) to
+Please send broken links and other corrections or suggestions to
 <a href="mailto:address@hidden";><em>address@hidden</em></a>.
 </p>
 
@@ -58,9 +60,10 @@
 </p>
 
 <p>
-Copyright &copy; 2003, 2007<br />
-Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 
02110-1301, USA
-<br />
+Copyright &copy; 2003, 2007, 2008 Free Software Foundation, Inc.,
+</p>
+<address>51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA</address>
+<p>
 Verbatim copying and distribution of this entire article is
 permitted in any medium without royalty provided this notice is
 preserved.
@@ -69,12 +72,13 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2007/12/28 19:01:24 $
+$Date: 2008/08/13 14:07:47 $
 <!-- timestamp end -->
 </p>
 </div>
+
 <div id="translations">
-<h3>Translations of this page</h3>
+<h4>Translations of this page</h4>
 
 <!-- Please keep this list alphabetical, and in the original -->
 <!-- language if possible, otherwise default to English -->
@@ -90,7 +94,9 @@
 <!--     http://www.w3.org/WAI/ER/IG/ert/iso639.htm -->
 
 <ul class="translations-list">
+<!-- English -->
 <li><a href="/licenses/compat.html">English</a>&nbsp;[en]</li>
+<!-- French -->
 <li><a href="/licenses/compat.fr.html">Fran&#x00e7;ais</a>&nbsp;[fr]</li>
 </ul>
 </div>