www/licenses .symlinks fdl-1.2.html gpl-faq.htm...

[Brett Smith]

CVSROOT:        /web/www
Module name:    www
Changes by:     Brett Smith <brett>     08/04/10 19:42:43

Modified files:
        licenses       : .symlinks fdl-1.2.html gpl-faq.html 
                         licenses.html 

Log message:
        Update the stable URLs section to advertise everything and be more 
accessible.
        
        RMS asked for the GNU AGPL to be advertised in this section.  When I
        went to add it, I was concerned about the accessibility of the
        section: having URLs in the body text can be frustrating for people
        using audio browsers because the entire URL has to be read to them.
        
        So, I switched this to a pseudo-table of links to every license's main
        HTML, using the complete stable URL.  That way people can just copy
        the link address.  If they want a different format, they can visit the
        page and use what's there: we always use the stable URLs for those (as
        part of this update, I made our URLs and symlinks for the FDL work the
        same way as the other licenses).  This is all explained on the page.
        
        I also added a link for screen reader users who want to skip this
        pseudo-table, since it's still a little long and will get longer as we
        release more licenses (new FDL and SFDL).
        
        Any absolute links that appear in the HTML of licensing pages will now
        appear as absolute links in the fsf.org versions too.  So I fixed some
        links in the FAQ that were absolute and didn't need to be.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/.symlinks?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/fdl-1.2.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.html?cvsroot=www&r1=1.132&r2=1.133
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.html?cvsroot=www&r1=1.64&r2=1.65

Patches:
Index: .symlinks
===================================================================
RCS file: /web/www/www/licenses/.symlinks,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- .symlinks   8 Apr 2008 23:04:03 -0000       1.25
+++ .symlinks   10 Apr 2008 19:42:22 -0000      1.26
@@ -38,6 +38,11 @@
 old-licenses/lgpl-2.1.html lgpl-2.1.html
 old-licenses/lgpl-2.1.texi lgpl-2.1.texi
 old-licenses/lgpl-2.1.txt lgpl-2.1.txt
+old-licenses/fdl-1.1.html fdl-1.1.html
+old-licenses/fdl-1.1.tex fdl-1.1.tex
+old-licenses/fdl-1.1.txt fdl-1.1.txt
+old-licenses/fdl-1.1.sgml fdl-1.1.sgml
+old-licenses/fdl-1.1.texi fdl-1.1.texi
 agpl-3.0.dbk agpl.dbk
 agpl-3.0.html agpl.html
 agpl-3.0.tex agpl.tex

Index: fdl-1.2.html
===================================================================
RCS file: /web/www/www/licenses/fdl-1.2.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- fdl-1.2.html        19 Jun 2007 23:21:47 -0000      1.1
+++ fdl-1.2.html        10 Apr 2008 19:42:22 -0000      1.2
@@ -31,13 +31,13 @@
   <li><a href="/licenses/translations.html"><em>Translations
   of the GFDL</em></a></li>
   <li>The GNU Free Documentation License
-  <a href="/licenses/fdl.txt">in plain text format</a></li>
+  <a href="/licenses/fdl-1.2.txt">in plain text format</a></li>
   <li>The GNU Free Documentation License
-  <a href="/licenses/fdl.texi">in Texinfo format</a></li>
+  <a href="/licenses/fdl-1.2.texi">in Texinfo format</a></li>
   <li>The GNU Free Documentation License
-  <a href="/licenses/fdl.xml">in DocBook/XML format</a></li>
+  <a href="/licenses/fdl-1.2.xml">in DocBook/XML format</a></li>
   <li>The GNU Free Documentation License
-  <a href="/licenses/fdl.tex">in LaTeX format</a></li>
+  <a href="/licenses/fdl-1.2.tex">in LaTeX format</a></li>
 
   <li><a href="/licenses/why-gfdl.html">Why publishers should use the GNU Free 
Documentation License</a></li>
   <li><a href="/licenses/fdl-howto.html">Tips on how to use the FDL</a></li>
@@ -609,7 +609,7 @@
   <p>
     Updated:
     <!-- timestamp start -->
-    $Date: 2007/06/19 23:21:47 $
+    $Date: 2008/04/10 19:42:22 $
     <!-- timestamp end -->
   </p>
 </div>

Index: gpl-faq.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.html,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- gpl-faq.html        20 Mar 2008 13:56:09 -0000      1.132
+++ gpl-faq.html        10 Apr 2008 19:42:22 -0000      1.133
@@ -2235,9 +2235,8 @@
 </p></blockquote></dd>
 
 
-<dt><b><a name="WMS">
-I am writing a website maintenance system</a> (called a &ldquo;<a
-href="http://www.gnu.org/philosophy/words-to-avoid.html";>content
+<dt><b><a name="WMS">I am writing a website maintenance system</a>
+(called a &ldquo;<a href="/philosophy/words-to-avoid.html">content
 management system</a>&rdquo; by some), or some other application which
 generates web pages from templates.  What license should I use for
 those templates?</b></dt>
@@ -2402,13 +2401,13 @@
 <dt><b><a name="WhoHasThePower">Who has the
 power to enforce the GPL?</a></b></dt>
 
-<dd><p>Since the GPL is a copyright license, the copyright holders of the
-software are the ones who have the power to enforce the GPL.  If you
-see a violation of the GPL, you should inform the developers of the
-GPL-covered software involved.  They either are the copyright holders,
-or are connected with the copyright holders.  <a
-href="http://www.fsf.org/licenses/gpl-faq.html#ReportingViolation";>Learn
-more about reporting GPL violations.</a>
+<dd><p>Since the GPL is a copyright license, the copyright holders of
+the software are the ones who have the power to enforce the GPL.  If
+you see a violation of the GPL, you should inform the developers of
+the GPL-covered software involved.  They either are the copyright
+holders, or are connected with the copyright
+holders.  <a href="#ReportingViolation">Learn more about reporting GPL
+violations.</a>
 </p></dd>
 
 
@@ -3307,7 +3306,7 @@
   <p>
     Updated:
     <!-- timestamp start -->
-    $Date: 2008/03/20 13:56:09 $
+    $Date: 2008/04/10 19:42:22 $
     <!-- timestamp end -->
   </p>
 </div>

Index: licenses.html
===================================================================
RCS file: /web/www/www/licenses/licenses.html,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- licenses.html       8 Apr 2008 23:08:09 -0000       1.64
+++ licenses.html       10 Apr 2008 19:42:22 -0000      1.65
@@ -28,10 +28,10 @@
 </p>
 
 <p>
-Our documentation licenses are currently being revised, and we welcome your
-comments on the proposed texts. Please visit <a
-href="http://gplv3.fsf.org";>http://gplv3.fsf.org</a> to read the current
-drafts and participate in the process.
+Our documentation licenses are currently being revised, and we welcome
+your comments on the proposed texts. Please
+visit <a href="http://gplv3.fsf.org";>our license update site</a> to
+read the current drafts and participate in the process.
 </p>
 
 <h3>Common Resources for our Software Licenses</h3>
@@ -158,31 +158,38 @@
 <h3 id="LicenseURLs">License URLs</h3>
 
 <p>When linking to our licenses, it's usually best to link to the latest
-version, hence the standard url's such as
+version; hence the standard URLs such as
 <tt>http://www.gnu.org/licenses/gpl.html</tt> have no version number.
 Occasionally, however, you may want to link to a specific version of a
-given license.  We maintain stable links for each version of each
-license with the general form
-<tt>http://www.gnu.org/licenses/<i>license</i>-<i>version</i>.<i>format</i></tt>.
-Here are a few examples:
-
-<pre>
-http://www.gnu.org/licenses/gpl-3.0.html
-http://www.gnu.org/licenses/gpl-3.0.txt
-http://www.gnu.org/licenses/gpl-2.0.html
-http://www.gnu.org/licenses/gpl-2.0.txt
-http://www.gnu.org/licenses/gpl-1.0.txt
-http://www.gnu.org/licenses/lgpl-3.0.html
-http://www.gnu.org/licenses/lgpl-2.1.html
-http://www.gnu.org/licenses/fdl-1.2.html
-http://www.gnu.org/licenses/fdl-1.1.html
-</pre>
-
-<p>Not every version of every license is available in every format.  If
-you need one that is missing, <a href="mailto:address@hidden";>email
-us</a>.
+given license.  In those situations, you can use the following links
+[<a href="#urlskip">skip links</a>]:</p>
 
-<p>See also the <a href="old-licenses/">old licenses page</a>.
+<dl>
+<dt>GNU General Public License (GPL)</dt>
+<!-- Please keep these links absolute.  I'm depending on that for the --
+     XSLT to generate pages on fsf.org.  Thanks. -brett -->
+<dd><a href="http://www.gnu.org/licenses/gpl-3.0.html";>GPLv3</a>,
+<a href="http://www.gnu.org/licenses/gpl-2.0.html";>GPLv2</a>,
+<a href="http://www.gnu.org/licenses/gpl-1.0.txt";>GPLv1</a></dd>
+
+<dt>GNU Lesser General Public License (LGPL)</dt>
+<dd><a href="http://www.gnu.org/licenses/lgpl-3.0.html";>LGPLv3</a>,
+<a href="http://www.gnu.org/licenses/lgpl-2.1.html";>LGPLv2.1</a></dd>
+
+<dt>GNU Affero General Public License (AGPL)</dt>
+<dd><a href="http://www.gnu.org/licenses/agpl-3.0.html";>GNU AGPLv3</a></dd>
+
+<dt>GNU Free Documentation License (FDL)</dt>
+<dd><a href="http://www.gnu.org/licenses/fdl-1.2.html";>FDLv1.2</a>,
+<a href="http://www.gnu.org/licenses/fdl-1.1.html";>FDLv1.1</a></dd>
+</dl>
+
+<p><a name="urlskip"></a>Stable links to each license's alternative
+  formats are available on its respective page.  Not every version of
+  every license is available in every format.  If you need one that is
+  missing, please <a href="mailto:address@hidden";>email us</a>.</p>
+
+<p>See also the <a href="old-licenses/">old licenses page</a>.</p>
 
 
 <h3>Unofficial Translations</h3>
@@ -410,7 +417,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2008/04/08 23:08:09 $
+$Date: 2008/04/10 19:42:22 $
 <!-- timestamp end -->
 </p>
 </div>