www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/server/staging/nav-bar/test7 edu-cases.html...


From: Matas Croce
Subject: www/server/staging/nav-bar/test7 edu-cases.html...
Date: Thu, 19 Jan 2012 02:04:34 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Matías Croce <matux>    12/01/19 02:04:34

Modified files:
        server/staging/nav-bar/test7: edu-cases.html edu-contents.html 
                                      edu-faq.html edu-projects.html 
                                      edu-resources.html edu-team.html 
                                      education.html home.html 
                                      layout.css licenses.html 
                                      philosophy.html 

Log message:
        changes to the new nav-bar proposal

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test7/edu-cases.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test7/edu-contents.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test7/edu-faq.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test7/edu-projects.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test7/edu-resources.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test7/edu-team.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test7/education.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test7/home.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test7/layout.css?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test7/licenses.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test7/philosophy.html?cvsroot=www&r1=1.1&r2=1.2

Patches:
Index: edu-cases.html
===================================================================
RCS file: /web/www/www/server/staging/nav-bar/test7/edu-cases.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-cases.html      16 Dec 2011 21:42:00 -0000      1.1
+++ edu-cases.html      19 Jan 2012 02:04:33 -0000      1.2
@@ -64,7 +64,7 @@
 
   <ul>
    <li id="tabPhilosophy"><a href="philosophy.html">Philosophy</a></li>
-   <li id="tabLicenses"><a href="licenses.html">Licenses</a></li>
+   <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
    <li id="tabEducation" class="selected"><a 
href="education.html">Education</a></li>
    <li id="tabSoftware"><a href="/software/software.html">Downloads</a></li>
    <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
@@ -112,13 +112,13 @@
 </div> <!-- id="translations" -->
 <!-- end translinks file -->
 
+<p class="edu-breadcrumb">
+<a href="education.html">Education</a> &rarr; Case Studies</p>
+
 <div id="education-content">           
 <h2>Case Studies</h2>
 </div> <!-- id="education-content" -->
                
-<p class="edu-breadcrumb">
-<a href="education.html">Education</a> &rarr; Case Studies</p>
-               
 <p>We perform worldwide research to examine cases of private and public 
 educational institutions as well as informal educational environments
 that have successfully implemented the use of Free Software. We do not
@@ -249,7 +249,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2011/12/16 21:42:00 $
+$Date: 2012/01/19 02:04:33 $
 <!-- timestamp end -->
 </p>
 </div>

Index: edu-contents.html
===================================================================
RCS file: /web/www/www/server/staging/nav-bar/test7/edu-contents.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-contents.html   16 Dec 2011 21:42:00 -0000      1.1
+++ edu-contents.html   19 Jan 2012 02:04:33 -0000      1.2
@@ -65,7 +65,7 @@
 
   <ul>
    <li id="tabPhilosophy"><a href="philosophy.html">Philosophy</a></li>
-   <li id="tabLicenses"><a href="licenses.html">Licenses</a></li>
+   <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
    <li id="tabEducation" class="selected"><a 
href="education.html">Education</a></li>
    <li id="tabSoftware"><a href="/software/software.html">Downloads</a></li>
    <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
@@ -113,15 +113,15 @@
 </div> <!-- id="translations" -->
 <!-- end translinks file -->
 
+<p class="edu-breadcrumb"><a href="education.html">Education</a> &rarr; 
+Education Contents</p>
+
 <div id="education-content">           
 
 <h2>Free Software and Education - Table of Contents</h2>
 
 </div> <!-- id="education-content" -->
 
-<p class="edu-breadcrumb"><a href="education.html">Education</a> &rarr; 
-Education Contents</p>
-               
 <p>The Education section of the GNU Project is about the importance of 
 using and teaching exclusively Free Software in all educational 
 institutions. It presents articles on the subject, cases of success in 
@@ -253,7 +253,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2011/12/16 21:42:00 $
+$Date: 2012/01/19 02:04:33 $
 <!-- timestamp end -->
 </p>
 </div>

Index: edu-faq.html
===================================================================
RCS file: /web/www/www/server/staging/nav-bar/test7/edu-faq.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-faq.html        16 Dec 2011 21:42:00 -0000      1.1
+++ edu-faq.html        19 Jan 2012 02:04:33 -0000      1.2
@@ -16,7 +16,8 @@
 <link rel="stylesheet" href="mini.css" media="handheld" />
 
 <link rel="stylesheet" href="print.css" media="print" />
-<!-- end of head-include-2.html -->
+<!-- end of head-inc<p class="edu-breadcrumb"><a 
href="education.html">Education</a> &rarr; 
+FAQ</p>lude-2.html -->
 </head>
 <body>
 <!-- start of server/body-include-1.html -->
@@ -64,7 +65,7 @@
 
   <ul>
    <li id="tabPhilosophy"><a href="philosophy.html">Philosophy</a></li>
-   <li id="tabLicenses"><a href="licenses.html">Licenses</a></li>
+   <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
    <li id="tabEducation" class="selected"><a 
href="education.html">Education</a></li>
    <li id="tabSoftware"><a href="/software/software.html">Downloads</a></li>
    <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
@@ -112,13 +113,13 @@
 </div> <!-- id="translations" -->
 <!-- end translinks file -->
 
+<p class="edu-breadcrumb"><a href="education.html">Education</a> &rarr; 
+FAQ</p>
+
 <div id="education-content">           
 <h2>Educational Frequently Asked Questions</h2>
 </div> <!-- id="edu-content" -->
        
-<p class="edu-breadcrumb"><a href="education.html">Education</a> &rarr; 
-FAQ</p>
-               
 <p>Many Free Software advocates encounter difficulties when talking to 
 the administrators of educational institutions about the advantages of 
 using and teaching Free Software. Often school administrators have never 
@@ -264,7 +265,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2011/12/16 21:42:00 $
+$Date: 2012/01/19 02:04:33 $
 <!-- timestamp end -->
 </p>
 </div>

Index: edu-projects.html
===================================================================
RCS file: /web/www/www/server/staging/nav-bar/test7/edu-projects.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-projects.html   16 Dec 2011 21:42:00 -0000      1.1
+++ edu-projects.html   19 Jan 2012 02:04:33 -0000      1.2
@@ -64,7 +64,7 @@
 
   <ul>
    <li id="tabPhilosophy"><a href="philosophy.html">Philosophy</a></li>
-   <li id="tabLicenses"><a href="licenses.html">Licenses</a></li>
+   <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
    <li id="tabEducation" class="selected"><a 
href="education.html">Education</a></li>
    <li id="tabSoftware"><a href="/software/software.html">Downloads</a></li>
    <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
@@ -112,13 +112,13 @@
 </div> <!-- id="translations" -->
 <!-- end translinks file -->
 
+<p class="edu-breadcrumb"><a href="education.html">Education</a> &rarr; 
+Education Projects</p>
+
 <div id="education-content">           
 <h2>Other Education Groups and Projects</h2>
 </div> <!-- id="edu-content" -->
                
-<p class="edu-breadcrumb"><a href="education.html">Education</a> &rarr; 
-Education Projects</p>
-               
 <p>There are several groups and organizations around the world who 
 follow the GNU Philosophy and are working on projects aimed at bringing 
 Free Software to the education field. A few of them are listed below. If 
@@ -289,7 +289,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2011/12/16 21:42:00 $
+$Date: 2012/01/19 02:04:33 $
 <!-- timestamp end -->
 </p>
 </div>

Index: edu-resources.html
===================================================================
RCS file: /web/www/www/server/staging/nav-bar/test7/edu-resources.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-resources.html  16 Dec 2011 21:42:00 -0000      1.1
+++ edu-resources.html  19 Jan 2012 02:04:33 -0000      1.2
@@ -64,7 +64,7 @@
 
   <ul>
    <li id="tabPhilosophy"><a href="philosophy.html">Philosophy</a></li>
-   <li id="tabLicenses"><a href="licenses.html">Licenses</a></li>
+   <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
    <li id="tabEducation" class="selected"><a 
href="education.html">Education</a></li>
    <li id="tabSoftware"><a href="/software/software.html">Downloads</a></li>
    <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
@@ -112,13 +112,13 @@
 </div> <!-- id="translations" -->
 <!-- end translinks file -->
 
+<p class="edu-breadcrumb">
+<a href="education.html">Education</a> &rarr; Educational Resources</p>
+
 <div id="education-content">           
 <h2>Free Learning Resources</h2>
 </div> <!-- id="edu-content" -->
                
-<p class="edu-breadcrumb">
-<a href="education.html">Education</a> &rarr; Educational Resources</p>
-
 <h3><a href="/education/edu-software.html">Educational Free Software</a></h3>
 
 <p>In our <a href="/education/edu-software.html">Educational 
@@ -277,7 +277,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2011/12/16 21:42:00 $
+$Date: 2012/01/19 02:04:33 $
 <!-- timestamp end -->
 </p>
 </div>

Index: edu-team.html
===================================================================
RCS file: /web/www/www/server/staging/nav-bar/test7/edu-team.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-team.html       16 Dec 2011 21:42:00 -0000      1.1
+++ edu-team.html       19 Jan 2012 02:04:33 -0000      1.2
@@ -64,7 +64,7 @@
 
   <ul>
    <li id="tabPhilosophy"><a href="philosophy.html">Philosophy</a></li>
-   <li id="tabLicenses"><a href="licenses.html">Licenses</a></li>
+   <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
    <li id="tabEducation" class="selected"><a 
href="education.html">Education</a></li>
    <li id="tabSoftware"><a href="/software/software.html">Downloads</a></li>
    <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
@@ -112,14 +112,14 @@
 </div> <!-- id="translations" -->
 <!-- end translinks file -->
 
+<p class="edu-breadcrumb">
+<a href="education.html">Education</a> &rarr; The Education Team</p>
+
 <div id="education-content">           
 <h2>The Education Team</h2>
 
 </div> <!-- id="edu-content" -->
                
-<p class="edu-breadcrumb">
-<a href="education.html">Education</a> &rarr; The Education Team</p>
-               
 <p>The Education Team was initially created to carry out the task of 
 building a section within the gnu.org website to specifically address 
 the importance of using Free Software in the education field. We believe 
@@ -253,7 +253,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2011/12/16 21:42:00 $
+$Date: 2012/01/19 02:04:33 $
 <!-- timestamp end -->
 </p>
 </div>

Index: education.html
===================================================================
RCS file: /web/www/www/server/staging/nav-bar/test7/education.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- education.html      16 Dec 2011 21:42:00 -0000      1.1
+++ education.html      19 Jan 2012 02:04:33 -0000      1.2
@@ -33,7 +33,6 @@
         <h1 id="logo"><a href="/">The GNU Operating System</a></h1>
 
 
-
        <div id="fssbox">
          <h4>Sign up for the <a href="http://www.fsf.org/fss";>Free Software 
Supporter</a></h4>
          <p>A monthly email newsletter about GNU and Free Software</p>
@@ -64,6 +63,7 @@
   </div><!-- /searcher -->
 
   <ul>
+   <li id="tabHome"><a href="home.html">Home</a></li>
    <li id="tabPhilosophy"><a href="philosophy.html">Philosophy</a></li>
    <li id="tabLicenses"><a href="licenses.html">Licenses</a></li>
    <li id="tabEducation" class="selected"><a 
href="education.html">Education</a></li>
@@ -281,7 +281,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2011/12/16 21:42:00 $
+$Date: 2012/01/19 02:04:33 $
 <!-- timestamp end -->
 </p>
 </div>

Index: home.html
===================================================================
RCS file: /web/www/www/server/staging/nav-bar/test7/home.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- home.html   16 Dec 2011 21:41:59 -0000      1.1
+++ home.html   19 Jan 2012 02:04:33 -0000      1.2
@@ -36,8 +36,11 @@
 <body>
 
 <!-- start of server/body-include-1.html -->
-<div id="toplinks"><span class="netscape4"><a href="#content">Skip to 
content</a> | <a href="#navigation">Skip to navigation</a> | <a 
href="#searcher">Skip to search</a>| </span><a 
href="#translations">Translations of this page</a> | <a 
href="/accessibility/">Accessibility</a></div>
+<div id="toplinks"><span class="netscape4"><a href="#content">Skip to 
content</a> | <a href="#navigation">Skip to navigation</a> | <a 
href="#searcher">Skip to search</a>| </span>
+</div>
 
+<!-- start of server/body-include-1.html -->
+<div id="toplinks"><span class="netscape4"><a href="#content">Skip to 
content</a> | <a href="#navigation">Skip to navigation</a> | <a 
href="#searcher">Skip to search</a>| </span><a 
href="#translations">Translations of this page</a> | <a 
href="/accessibility/">Accessibility</a></div>
 <!-- end of server/body-include-1.html -->
 
 <div id="null-wrapper">
@@ -49,7 +52,6 @@
         <h1 id="logo"><a href="/">The GNU Operating System</a></h1>
 
 
-
        <div id="fssbox">
          <h4>Sign up for the <a href="http://www.fsf.org/fss";>Free Software 
Supporter</a></h4>
          <p>A monthly email newsletter about GNU and Free Software</p>
@@ -67,6 +69,7 @@
        </div>
       </div>
 
+      
 <div id="navigation">
  <div class="inner">
 
@@ -80,8 +83,9 @@
   </div><!-- /searcher -->
 
   <ul>
+   <li id="tabHome" class="selected"><a href="home.html">Home</a></li>
    <li id="tabPhilosophy"><a href="philosophy.html">Philosophy</a></li>
-   <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
+   <li id="tabLicenses"><a href="licenses.html">Licenses</a></li>
    <li id="tabEducation"><a href="education.html">Education</a></li>
    <li id="tabSoftware"><a href="/software/software.html">Downloads</a></li>
    <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
@@ -108,7 +112,6 @@
 <div id="content" class="inner">
 <!-- end of server/banner.html -->
 <!-- begin translinks file -->
-
 <div id="translations">
 <ul class="translations-list">
 
@@ -153,10 +156,8 @@
 </div>
 
 
-
-
 <div id="education-content">           
-<h2></h2>
+
 </div> <!-- id="education-content" -->
                
 <p class="netscape4">Richard Stallman announced in September 1983 the plan to 
develop a free software Unix-like operating system called GNU. GNU is the only 
operating system developed specifically for the sake of users' freedom.</p>
@@ -464,7 +465,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2011/12/16 21:41:59 $
+$Date: 2012/01/19 02:04:33 $
 <!-- timestamp end -->
 </p>
 </div>

Index: layout.css
===================================================================
RCS file: /web/www/www/server/staging/nav-bar/test7/layout.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- layout.css  16 Dec 2011 21:42:01 -0000      1.1
+++ layout.css  19 Jan 2012 02:04:34 -0000      1.2
@@ -33,6 +33,8 @@
 a[href]:visited { color: purple }
 a[href]:active, a[href]:hover { color: red }
 
+
+
 /* For outdated translations  */
 #outdated {
   margin-top: 0.5em ;
@@ -98,34 +100,36 @@
 
 #content:lang(ar), #content:lang(fa), #searcher:lang(he) {text-align: right;}
 
-#navigation { background-color: #bd0000; border-bottom: 4px solid #bd0000; 
clear: both; }
+/* Definitions for new navigation bar with sub-navigation */
+#navigation {background-color: #b22222;  clear: both; }
 
 #navigation:after{ clear: both; content: ""; display: block; height: 0px; 
visibility: hidden; width: 0px; }
 
-#navigation ul{font-size: 0.8em; margin: 0.9em auto; padding-top: 1.1em }
+#navigation ul{font-size: 0.9em; margin: 0.9em auto; padding-top: 1.2em;}
 
-#navigation li{display: inline; }
+#navigation li{ display: inline; }
 
-#navigation li a {color: white; text-decoration: none; font-weight: bold; 
padding: .9em;}
+#navigation li a { color: white; text-decoration: none; font-weight: bold; 
padding: .9em; border-width:2px 2px 0px 2px; border-style:solid; 
border-color:#B22222; -moz-border-radius-topleft: .6em; 
-moz-border-radius-topright: .6em; -khtml-border-radius-topleft: .6em; 
-khtml-border-radius-topright: .6em; border-top-left-radius: .6em; 
border-top-right-radius: .6em; }
 
-#navigation li a:hover, #navigation li.selected a{ font-size: 1.1em 
!important; background-color: #F3DEB3; color: #0000FF; border-left: 3px solid 
white; border-right: 3px solid white; border-top: 2px solid #F5DEB3; 
border-bottom: 3px solid #F5DEB3;}
+#navigation li a:hover, #navigation li.selected a { background: #EAC99C; 
color: #1a0000; border-color:white; border-style:solid; border-bottom:2px solid 
#EAC99C !important; }
 
-#sub-nav { background: #F5DEB3; margin-bottom:0 !important; padding:.5em 0 
!important; border-top: 3px solid white; border-bottom: 3px solid white; }
+#sub-nav { background: #EAC99C; margin-bottom: 0 !important; padding:.5em 
!important;  border-bottom: 1px solid #9c0204; border-top: 2px solid white; }
 
-#sub-nav ul { padding:0 !important;margin:0 !important; }
+#sub-nav ul { padding:0 !important; margin:0 !important; }
 
 #sub-nav li {display: inline; }
 
-#sub-nav li a {color: maroon; text-decoration: none; font-weight: bold; 
padding: .4em .9em;}
+#sub-nav li a {color: #1a0000; text-decoration: underline !important;  
font-weight: bold; padding: .4em .9em; border:none !important; background: none 
!important;}
 
-#sub-nav li a:hover, #sub-nav li.selected a { color: #0000FF; border-top: 0px; 
border-right: 0px; border-left: 0px; border-bottom: 0px; }
+#sub-nav li a:hover, #sub-nav li.selected a { text-decoration: none 
!important; }
 
-#joinfsftab a{color: yellow !important; }
+#navigation #joinfsftab a { color: yellow !important; border:none !important; }
 
-#joinfsftab a:hover {color: blue !important; }
+#navigation #joinfsftab a:hover { background: #b22222 !important;border:none 
!important; }
+/* End definitions for new navigation bar with sub-navigation */
 
 #content h2 {
- background-color: #3465a4; color: white; font-size: 2em;
+ background-color: #3465a4;color: white; font-size: 2em;
  margin-bottom: 0.3em; font-weight:bold; text-align: center; margin: 0; 
margin-bottom: 12px; }
 
 #content h3, #content h4, #content h5, #content h6 {line-height: 1.5em;}
@@ -268,9 +272,10 @@
 
 .highlight, .highlight-para{background-color: #ff6;}
 
+/* new background-color for #takeactionhomepage */
 #takeactionhomepage{ 
 
-   background-color: #fdb144;
+   background-color: #f4ab40;
    color: black; 
    margin-bottom: 0.5em;
    font-size: 90%;
@@ -382,7 +387,8 @@
 
 #fsf-links ul { padding: 0; margin: 0; text-align: center; }
 
-.button { border: 3px solid #999;
+/* new background-color and border for large button */
+.button { border: 4px solid #808080;
     border-left-color: #ccc;
     border-top-color: #ccc;
     font-weight: bold;
@@ -391,11 +397,11 @@
     -khtml-border-radius: 0.4em;
  }
 
-.button a{ display: block;  text-decoration: none; color: #333; padding: 
0.25em;}
+.button a{ display: block;  text-decoration: none; color: black; padding: 
0.25em;}
 
-.button a:hover{ color: red;}
+.button a:hover{ color: purple;}
 
-.large { font-size: 36px; background-color: #aacb50; }
+.large { font-size: 36px; background-color: #bdb76b; }
 
 .small { font-size: 22px; background-color: #89b1bd; }
 

Index: licenses.html
===================================================================
RCS file: /web/www/www/server/staging/nav-bar/test7/licenses.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- licenses.html       16 Dec 2011 21:42:00 -0000      1.1
+++ licenses.html       19 Jan 2012 02:04:34 -0000      1.2
@@ -13,34 +13,25 @@
 
 <!-- end of server/header.html -->
 
-
-<title>The GNU Operating System</title>
-
-<meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, GNU Hurd" 
/>
-<meta http-equiv="Description" content="Since 1983, developing the free Unix 
style operating system GNU, so that computer users can have the freedom to 
share and improve the software they use." />
-<link rel="alternate" title="Planet GNU" 
href="http://planet.gnu.org/rss20.xml"; type="application/rss+xml" />
-<link rel="alternate" title="What's New" 
href="http://www.gnu.org/rss/whatsnew.rss"; type="application/rss+xml" />
-<link rel="alternate" title="New Free Software" 
href="http://www.gnu.org/rss/quagga.rss"; type="application/rss+xml" />
+<title>Licenses - GNU Project - Free Software Foundation (FSF)</title>
 
 <!-- start of server/banner.html -->
 <!-- start of head-include-2.html -->
 
 <link rel="stylesheet" href="combo.css" media="screen" />
 <link rel="stylesheet" href="layout.css" media="screen" />
-
 <link rel="stylesheet" href="mini.css" media="handheld" />
-
 <link rel="stylesheet" href="print.css" media="print" />
 <!-- end of head-include-2.html -->
 
 </head>
 <body>
 <!-- start of server/body-include-1.html -->
+
 <div id="toplinks"><span class="netscape4"><a href="#content">Skip to 
content</a> | <a href="#navigation">Skip to navigation</a> | <a 
href="#searcher">Skip to search</a>| </span><a 
href="#translations">Translations of this page</a> | <a 
href="/accessibility/">Accessibility</a></div>
 
 <!-- end of server/body-include-1.html -->
 
-
 <div id="null-wrapper">
 
 <!-- start of server/body-include-2 -->
@@ -79,26 +70,26 @@
     <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
            value="Why GNU/Linux?" onfocus="this.value=''" />
 
-    <input type="submit" value="Search" /></div><!-- unnamed label -->
+    <input type="submit" value="Search" />
+    </div><!-- unnamed label -->
    </form>
   </div><!-- /searcher -->
 
   <ul>
+   <li id="tabHome"><a href="home.html">Home</a></li>
    <li id="tabPhilosophy"><a href="philosophy.html">Philosophy</a></li>
    <li id="tabLicenses" class="selected"><a 
href="licenses.html">Licenses</a></li>
    <li id="tabEducation"><a href="education.html">Education</a></li>
-
    <li id="tabSoftware"><a href="/software/software.html">Downloads</a></li>
    <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
    <li id="tabHelp"><a href="/help/help.html">Help&nbsp;GNU</a></li>
    <li id="joinfsftab"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>Join&nbsp;the&nbsp;FSF!</a></li>
   </ul>
-
  </div><!-- /inner -->
  
- <!-- begin edu navigation bar -->
+<!-- begin edu navigation bar -->
  <div id="sub-nav">
-<div class="inner">
+   <div class="inner">
 
 <ul>
                                <li><a href="edu-contents.html">Title 1</a></li>
@@ -108,317 +99,486 @@
                                <li><a href="edu-faq.html">Title 5</a></li>
                                <li><a href="edu-team.html">Title 6</a></li>
 </ul>
-</div>
-</div>
-<!-- end edu navigation bar -->
+</div><!-- /inner -->
+</div><!-- /sub-nav -->
  
 </div><!--  /navigation -->
 <!-- end of server/body-include-2 -->
 
+
 <div id="content" class="inner">
 <!-- end of server/banner.html -->
-<!-- begin translinks file -->
 
+<!-- begin translinks file -->
 <div id="translations">
-<!-- Please keep this list alphabetical by language code.
-     Comment what the language is for each type, i.e. de is German.
-     Write the language name in its own language (Deutsch) in the text.
-     If you add a new language here, please
-     advise address@hidden and add it to
-      - /home/www/html/server/standards/README.translations.html
-      - one of the lists under the section "Translations Underway"
-      - if there is a translation team, you also have to add an alias
-      to mail.gnu.org:/com/mailer/aliases
-     Please also check you have the language code right; see:
-     http://www.loc.gov/standards/iso639-2/php/code_list.php
-     If the 2-letter ISO 639-1 code is not available,
-     use the 3-letter ISO 639-2.
-     Please use W3C normative character entities.
-     See also '(web-trans)Capitalization':
-     
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
-      -->
-         <!-- ZCZC START MARK by RMS46 031117 -->
-
-         <ul class="translations-list">
-
-    <li><a href="/home.ar.html" 
title="Arabic">&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;</a> [ar]</li>
-    <li><a href="/home.bg.html" 
title="Bulgarian">&#x431;&#x44A;&#x43B;&#x433;&#x430;&#x440;&#x441;&#x43A;&#x438;</a>
 [bg]</li>
-    <li><a href="/home.ca.html" title="Catalan">catal&#x00e0;</a> [ca]</li>
-    <li><a href="/home.de.html" title="German">Deutsch</a> [de]</li>
-
-    <li><a href="/home.el.html" 
title="Greek">&#x03b5;&#x03bb;&#x03bb;&#x03b7;&#x03bd;&#x03b9;&#x03ba;&#x03ac;</a>
 [el]</li>
-    <li><a href="/home.html" title="English">English</a> [en]</li>
-    <li><a href="/home.es.html" title="Spanish">espa&#x00f1;ol</a> [es]</li>
-    <li><a href="/home.fa.html" 
title="Farsi/Persian">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc;</a> [fa]</li>
-
-    <li><a href="/home.fi.html" title="Finnish">suomi</a> [fi]</li>
-    <li><a href="/home.fr.html" title="French">fran&#x00e7;ais</a> [fr]</li>
-    <li><a href="/home.id.html" title="Indonesian">Bahasa Indonesia</a> 
[id]</li>
-    <li><a href="/home.it.html" title="Italian">italiano</a> [it]</li>
-
-    <li><a href="/home.ja.html" title="Japanese">&#26085;&#26412;&#35486;</a> 
[ja]</li>
-    <li><a href="/home.kn.html" 
title="Kannada">&#xC95;&#xCA8;&#xCCD;&#xCA8;&#xCA1;</a> [kn]</li>
-    <li><a href="/home.nb.html" title="Norwegian (Bokm&aring;l)">norsk 
(bokm&aring;l)</a> [nb]</li>
-    <li><a href="/home.nl.html" title="Dutch">Nederlands</a> [nl]</li>
-
-    <li><a href="/home.nn.html" title="Norwegian (Nynorsk)">norsk 
(nynorsk)</a> [nn]</li>
-    <li><a href="/home.pl.html" title="Polish">polski</a> [pl]</li>
-    <li><a href="/home.pt-br.html" title="Brazilian 
Portuguese">portugu&ecirc;s do Brasil</a> [pt-br]</li>
-    <li><a href="/home.ro.html" title="Romanian">rom&#x00e2;n&#x0103;</a> 
[ro]</li>
-
-    <li><a href="/home.ru.html" 
title="Russian">&#x0440;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a> 
[ru]</li>
-    <li><a href="/home.sr.html" 
title="Serbian">&#x0441;&#x0440;&#x043f;&#x0441;&#x043a;&#x0438;</a> [sr]</li>
-    <li><a href="/home.sv.html" title="Swedish">svenska</a> [sv]</li>
-    <li><a href="/home.ta.html" 
title="Tamil">&#2980;&#2990;&#3007;&#2996;&#3021;</a> [ta]</li>
-
-    <li><a href="/home.tr.html" title="Turkish">T&uuml;rk&ccedil;e</a> 
[tr]</li>
-    <li><a href="/home.uk.html" 
title="Ukrainian">&#x443;&#x043a;&#x0440;&#x0430;&#x0457;&#x043d;&#x0441;&#x044c;&#x043a;&#x0430;</a>
 [uk]</li>
-    <li><a href="/home.zh-cn.html" title="Chinese 
(Simplified)">&#x7b80;&#x4f53;&#x4e2d;&#x6587;</a> [zh-cn]</li>
+<ul class="translations-list">
+<!-- Arabic -->
+<li><a href="/licenses/licenses.ar.html">العربية</a>&nbsp;[ar]</li>
+
+<!-- Catalan -->
+<li><a href="/licenses/licenses.ca.html">català</a>&nbsp;[ca]</li>
+<!-- German -->
+<li><a href="/licenses/licenses.de.html">Deutsch</a>&nbsp;[de]</li>
+<!-- Greek -->
+<li><a href="/licenses/licenses.el.html">ελληνικά</a>&nbsp;[el]</li>
+<!-- English -->
+<li><a href="/licenses/licenses.en.html">English</a>&nbsp;[en]</li>
+<!-- Spanish -->
+
+<li><a href="/licenses/licenses.es.html">español</a>&nbsp;[es]</li>
+<!-- French -->
+<li><a href="/licenses/licenses.fr.html">français</a>&nbsp;[fr]</li>
+<!-- Italian -->
+<li><a href="/licenses/licenses.it.html">italiano</a>&nbsp;[it]</li>
+<!-- Japanese -->
+<li><a href="/licenses/licenses.ja.html">日本語</a>&nbsp;[ja]</li>
+<!-- Dutch -->
+<li><a href="/licenses/licenses.nl.html">Nederlands</a>&nbsp;[nl]</li>
+
+<!-- Polish -->
+<li><a href="/licenses/licenses.pl.html">polski</a>&nbsp;[pl]</li>
+<!-- Brazilian Portuguese -->
+<li><a href="/licenses/licenses.pt-br.html">português do 
Brasil</a>&nbsp;[pt-br]</li>
+<!-- Serbian -->
+<li><a href="/licenses/licenses.sr.html">српски</a>&nbsp;[sr]</li>
+<!-- Chinese (Simplified) -->
+<li><a href="/licenses/licenses.zh-cn.html">简体中文</a>&nbsp;[zh-cn]</li>
+<!-- Chinese (Traditional) -->
 
-         </ul>
+<li><a href="/licenses/licenses.zh-tw.html">繁體中文</a>&nbsp;[zh-tw]</li>
+</ul>
+</div> <!-- id="translations" -->
+<!-- end translinks file -->
 
-         <!-- NNNN END MARK by RMS46 031117 -->
+<h2>Licenses</h2>
 
-</div>
+<p>
+Published software should be <a href="/philosophy/free-sw.html">free
+software</a>.  To make it free software, you need to release it
+under a free software license.  We normally use the <a
+href="#GPL">GNU General Public License</a> (GNU GPL),
+but occasionally we use <a 
href="/licenses/license-list.html#SoftwareLicenses">other
+free software licenses</a>.  We use only licenses that are compatible
+with the GNU GPL for GNU software.
+
+</p>
+
+<p>
+Documentation for free software should be
+<a href="/philosophy/free-doc.html">free documentation</a>, so that
+people can redistribute it and improve it along with the software
+it describes.  To make it free documentation, you need to release
+it under a free documentation license.  We normally use the
+<a href="#FDL">GNU Free Documentation License</a> (GNU
+FDL), but occasionally we use
+<a href="/licenses/license-list.html#DocumentationLicenses">other free
+documentation licenses</a>.
+</p>
+
+<p>If you've started a new project and you're not sure what license to
+use, <a href="/licenses/license-recommendations.html">&ldquo;How to
+choose a license for your own work&rdquo;</a> details our
+recommendations in an easy-to-follow guide.  If you just want a quick
+list reference, we have a page that names
+our <a href="/licenses/recommended-copylefts.html">recommended
+copyleft licenses</a>.</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";>our license update site</a> to
+read the current drafts and participate in the process.
+</p>
 
+<h3>Common Resources for our Software Licenses</h3>
 
-<p class="netscape4">Richard Stallman announced in September 1983 the plan to 
develop a free software Unix-like operating system called GNU. GNU is the only 
operating system developed specifically for the sake of users' freedom.</p>
+<p>We have a number of resources to help people understand and use our
+various licenses:</p>
 
-<div id="takeactionhomepage">
 <ul>
-<li><a
-href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/";>Stand
-up for your freedom to install free software!</a></li>
-<li><a
-href="http://www.aful.org/communiques/univ-offers-me-windows";>Students!
-   Claim a refund on your unused Microsoft Windows licences</a></li> 
+
+  <li><a href="/licenses/gpl-faq.html">Frequently Asked
+  Questions about the GNU licenses</a></li>
+
+  <li><a href="/licenses/gpl-howto.html">How to use GNU licenses for your
+  own software</a></li>
+  <li><a href="/licenses/gpl-violation.html">What to do if you see a
+  violation of a GNU license</a></li>
+  <li><a href="/philosophy/university.html">Releasing Free Software if
+  you work at a university</a></li>
+  <li><a href="/licenses/why-assign.html">Why the FSF gets copyright
+  assignments from contributors</a></li>
+  <li><a href="/graphics/license-logos.html">GNU license logos</a> to use
+  with your project</li>
+
+  <li><a
+href="/licenses/license-list.html#LicensingMailingList">&lt;address@hidden&gt;
+mailing list</a> for general licensing help
+  </li>
+
 </ul>
-</div>
 
-<div class="yui-g home">
-    <div class="yui-u first">
+<h3 id="GPL">The GNU General Public License</h3>
+
+<p>
+The GNU General Public License is often called the GNU GPL for short;
+it is used by most GNU programs, and by more than half of all free
+software packages.  The latest version is version 3.
+</p>
+
+<ul>
+  <li>The GNU General Public License is available in these formats:
+      <a href="/licenses/gpl.html">HTML</a>,
+      <a href="/licenses/gpl.txt">plain text</a>,
+      <a href="/licenses/gpl.odt">ODF</a>,
+      <a href="/licenses/gpl.dbk">Docbook</a>,
+      <a href="/licenses/gpl.texi">Texinfo</a>, and
+      <a href="/licenses/gpl.tex">LaTeX</a>.
+These documents are not formatted for standalone publishing, and
+are intended to be included in another document.</li>
+  <li><a href="/licenses/quick-guide-gplv3.html">A Quick Guide to
+      GPLv3</a></li>
 
-      <h2>What is GNU?</h2>
+  <li><a href="/licenses/old-licenses/old-licenses.html#GPL">Older
+  versions of the GNU GPL</a></li>
+</ul>
 
-<p><a href="/gnu/gnu.html">The GNU Project</a> was launched in 1984 to
-develop the GNU operating system, a complete Unix-like operating system 
-which is <a href="/philosophy/free-sw.html">free software</a>&mdash;software 
-which respects your freedom.</p>
-
-<p class="c"><a href="/distros/screenshot.html"><img
-   src="/graphics/t-desktop-4-small.jpg" alt="Screenshot of GNU"
-   /></a></p>
-
-<p>Unix-like operating systems are built from a <a
-href="/software/">software collection</a> of applications, libraries,
-and developer tools&mdash;plus a program to allocate resources and talk
-to the hardware, known as a kernel.</p>
-
-<p>GNU is <a href="/gnu/gnu-linux-faq.html">often used with a kernel
-called Linux</a>, and here is a <a
-href="/distros/free-distros.html">list of ready-to-install GNU/Linux
-distributions</a> which are entirely free software.  <a
-href="/software/hurd/hurd.html">The Hurd, GNU's kernel</a>, is actively
-developed, but is still some way from being ready for daily use.</p>
-
-<p>The combination of <a href="/gnu/linux-and-gnu.html">GNU and
-Linux</a> is the <strong>GNU/Linux operating system</strong>, now used
-by millions and sometimes incorrectly called simply
-&ldquo;Linux&rdquo;.</p>
-
-<p>The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's
-Not Unix!&rdquo;; <a href="/pronunciation/pronunciation.html">it is pronounced 
<em>g-noo</em></a>, as one
-syllable with no vowel sound between the <em>g</em> and the
-
-<em>n</em>.</p>
-
-<!--
-   Keep link lines at 72 characters or lynx will break them poorly.
-   Obviously, we list ONLY the most useful/important URLs here.
-   Keep it short and sweet: 3 lines and 2 columns is already enough
--->
+<h3 id="LGPL">The GNU Lesser General Public License</h3>
 
-<!-- BEGIN GNUmenu -->
+<p>
+The GNU Lesser General Public License is used by a few (not by any means
+all) GNU libraries.  The latest version is version 3.
+</p>
 
-           </div>
+<ul>
+  <li>The GNU Lesser General Public License text is available in
+      these formats:
+      <a href="/licenses/lgpl.html">HTML</a>,
+      <a href="/licenses/lgpl.txt">plain text</a>,
+      <a href="/licenses/lgpl.dbk">Docbook</a>, and
+      <a href="/licenses/lgpl.texi">Texinfo</a>.
+These documents are not formatted for standalone publishing, and
+are intended to be included in another document.</li>
+
+  <li><a href="/licenses/why-not-lgpl.html">Why you shouldn't use
+  the Lesser GPL for your next library</a></li>
+  <li><a href="/licenses/old-licenses/old-licenses.html#GPL">Older
+  versions of the GNU LGPL</a></li>
+</ul>
            
-      <div class="yui-u">
+<h3 id="AGPL">The GNU Affero General Public License</h3>
 
-      <p class="button c large"><a
-      href="/distros/free-distros.html">Download GNU now</a></p>
+<p>
+The GNU Affero General Public License is based on the GNU GPL, but has an
+additional term to allow users who interact with the licensed software over
+a network to receive the source for that program.  We recommend that people
+consider using the GNU AGPL for any software which will commonly be run
+over a network.  The latest version is version 3.
+</p>
 
-      <div class="emph-box">
+<ul>
+  <li>The GNU Affero General Public License text is available in
+      these formats:
+      <a href="/licenses/agpl.html">HTML</a>,
+      <a href="/licenses/agpl.txt">plain text</a>,
+      <a href="/licenses/agpl.dbk">Docbook</a>,
+      <a href="/licenses/agpl.texi">Texinfo</a>, and
+      <a href="/licenses/agpl.tex">LaTeX</a>.
+These documents are not formatted for standalone publishing, and
+are intended to be included in another document.</li>
 
-<!-- END content -->
+  <li><a href="/licenses/why-affero-gpl.html">Why the Affero GPL</a></li>
+</ul>
 
-<!-- BEGIN Articles -->
-<!--   GNUs Flash is a pun on News Flash.
-   Please don't make it GNU's Flash.
--->
-<h4 id="Flashes"><a href="http://planet.gnu.org/";>Planet GNU</a> <a 
href="http://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png" alt="RSS 
Feed" /></a></h4>
-
-<!--
-   FOR ENTRIES ADDED TO GNUs FLASHES:
-   Please make sure an announcement is sent to address@hidden
-   Include announcements in /server/whatsnew.html
--->
-
-<!--
-   Please do not use anchor ids in this. They will be deleted and
-   hrefs pointing at them will fail. Instead use /home.html#Flashes
--->
-
-<!--
-   rms SEZ:
-   DO NOT MAKE THIS MORE THAN 5 LINES, AND DO NOT PUT
-   MORE THAN 2 ITEMS HERE.
--->
-
-<!-- Autogenerated File by planetrss.pl 
http://web.cvs.savannah.gnu.org/viewvc/www/server/source/planetrss/?root=www -->
-<p><a href='http://savannah.gnu.org/forum/forum.php?forum_id=7050'>GNU Stow 
2.1.1 released</a>: This is a minor release which fixes a couple of 
installation issues and improves some of the documentation... <a 
href='http://savannah.gnu.org/forum/forum.php?forum_id=7050'>more</a></p>
-<p><a href='http://libreplanet.org/wiki/LibrePlanet2012/CFP'>LibrePlanet 2012: 
Call For Papers</a>: People are invited to submit papers and talks for the 
upcoming LibrePlanet 2012 conference in Boston, MA. See 
http://libreplanet.org/wiki/LibrePlanet2012/CFP... <a 
href='http://libreplanet.org/wiki/LibrePlanet2012/CFP'>more</a></p>
-<p><a href='http://libreplanet.org/wiki/LibrePlanet2012'>LibrePlanet 2012: 
March 24 &amp; 25 2012</a>: More details to follow. Make sure you are on the 
mailing list for more information... <a 
href='http://libreplanet.org/wiki/LibrePlanet2012'>more</a></p>
-
-
-<p>For more news, see <a href="http://planet.gnu.org/";>Planet GNU</a>.</p>
-
-<!-- END GNUFlashes -->
-
-<h4>GNU Guile</h4>
-<p><a href="http://www.gnu.org/software/guile/";>GNU Guile</a> is the
-official extension language for the GNU Operating System. Version 2.0
-was released February 16, 2011 with a 
-<a href="http://www.gnu.org/software/guile/news.html";>wealth of new 
-features.</a> Its compiler infrastructure, libraries, and dynamic 
-programming environment make it a great language to write applications in. 
-<a href="http://www.gnu.org/software/guile/community.html";>Join the
-community now!</a></p>
-
-<h4>GNUstep</h4>
-
-<p><a href="http://www.gnustep.org/";>GNUstep</a> is a fully-functional
-object-oriented development environment. We need developers to write and
-port applications to GNUstep so that we can make it a great experience
-for users.</p>
+<h3 id="FDL">The GNU Free Documentation License</h3>
 
-         </div>
-          </div>
-           </div>
+<p>
+The GNU Free Documentation License is a form of copyleft intended
+for use on a manual, textbook or other document to assure everyone
+the effective freedom to copy and redistribute it, with or without
+modifications, either commercially or non-commercially.  The latest version
+is 1.3.
+</p>
 
-<!-- BEGIN GetInvolved -->
+<ul>
+  <li>The GNU Free Documentation License text is available in these formats:
+      <a href="/licenses/fdl.html">HTML</a>,
+      <a href="/licenses/fdl.txt">plain text</a>,
+      <a href="/licenses/fdl.xml">Docbook</a>,
+      <a href="/licenses/fdl.texi">Texinfo</a>, and
+      <a href="/licenses/fdl.tex">LaTeX</a>.
+These documents are not formatted for standalone publishing, and
+are intended to be included in another document.</li>
+
+  <li><a href="/licenses/why-gfdl.html">Why publishers should use
+  the GNU FDL</a></li>
+  <li><a href="/licenses/fdl.html#addendum">How to use
+  the GNU FDL for your documentation</a></li>
+  <li><a href="/licenses/fdl-howto.html">Tips on using the GNU FDL</a></li>
+  <li><a href="/licenses/fdl-howto-opt.html">How to use the optional
+      features of the GNU FDL</a></li>
+      <li><a href="/licenses/old-licenses/old-licenses.html#FDL">
+      Older versions of the GNU FDL</a></li>
 
-<div class="yui-gc">
-    <div class="yui-u first">
+</ul>
 
-<h2>What is Free Software?</h2>
+<h3 id="Exceptions">Exceptions to GNU Licenses</h3>
 
-<p>&ldquo;<a href="/philosophy/free-sw.html">Free software</a>&rdquo;
-is a matter of liberty, not price.  To understand the concept, you
-should think of &ldquo;free&rdquo; as in &ldquo;free speech&rdquo;,
-not as in &ldquo;free beer&rdquo;.</p>
-
-<p><strong>Free software is a matter of the users' freedom to run,
-copy, distribute, study, change and improve the software.</strong>  More
-precisely, it refers to four kinds of freedom, for the users of the
-software:</p>
+<p>Some GNU programs have additional permissions or special exceptions
+  to specific terms in one of the main licenses.  Since some of those
+  are commonly used or inspire a lot of questions on their own, we've
+  started collecting them on
+  our <a href="/licenses/exceptions.html">exceptions page</a>.</p>
+
+<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 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.  In those situations, you can use the following links
+[<a href="#urlskip">skip links</a>]:</p>
+
+<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.html";>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>  (The <a
+    href="http://www.affero.org/oagpl.html";>Affero General 
+    Public License version 1</a> is not a GNU license, but it was
+    designed to serve a purpose much like the GNU AGPL's.)</dd>
+
+<dt>GNU Free Documentation License (FDL)</dt>
+<dd><a href="http://www.gnu.org/licenses/fdl-1.3.html";>FDLv1.3</a>,
+<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>
+
+<p>
+Legally speaking, the original (English) version of the licenses is what
+specifies the actual distribution terms for GNU programs and others that
+use them. But to help people better understand the licenses, we give
+permission to publish translations into other languages provided that
+they follow our regulations for unofficial translations:
+</p>
 
 <ul>
-<li>The freedom to run the program, for any purpose (freedom 0).</li>
-<li>The freedom to study how the program works, and adapt it to your needs
-    (freedom 1).   Access to the source code is a precondition for this.</li>
-<li>The freedom to redistribute copies so you can help your neighbor
-    (freedom 2).</li>
-<li>The freedom to improve the program, and release your improvements
-   to the public, so that the whole community benefits
-    (freedom 3).   Access to the source code is a precondition for this.</li>
+  <li>
+    <a href="/licenses/translations.html">List of unofficial translations</a>
+  </li>
+  <li><a href="/licenses/translations.html#rules">How to create an unofficial
+      translation</a></li>
 </ul>
 
-</div>
+<h3 id="VerbatimCopying">Verbatim Copying and Distribution</h3>
 
-<div class="yui-u">
-<!-- BEGIN TakeAction -->
+<p>The standard copyright terms for GNU web pages is now the <a
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.  It used to
+be (and for a few pages still is): <em><span class="highlight">Verbatim
+copying and distribution of this entire article are permitted worldwide,
+without royalty, in any medium, provided this notice is
+preserved</span>.</em> Please note the following commentary about this
+&ldquo;verbatim license&rdquo; by Eben Moglen:</p>
+
+<p>
+
+&ldquo;Our intention in using the phrase &lsquo;verbatim copying in
+any medium&rsquo; is not to require retention of page headings and
+footers or other formatting features.  Retention of weblinks in both
+hyperlinked and non-hyperlinked media (as notes or some other form of
+printed URL in non-HTML media) is required&rdquo;.
+</p>
+
+<h3>List of Free Software Licenses</h3>
 
-<h2 id="Action">Take Action</h2>
 <ul>
-<li><strong><a href="http://www.fsf.org/campaigns";>Support current FSF
-campaigns</a></strong>.</li>
+  <li>
+    <a href="/licenses/license-list.html">List of Free Software Licenses</a>
 
-<li><strong>Watch and share this movie:</strong> <a
-href="http://patentabsurdity.com";>Patent Absurdity</a>&mdash;made
-possible by <a href="http://www.fsf.org/associate/";>FSF associate
-members</a> like <a href="http://fsf.org/jfb";>you</a>.</li>
+<p> If you are contemplating writing a new license, please contact the
+FSF by writing to <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. The
+proliferation of different free software licenses means increased work
+for users in understanding the licenses; we may be able to help you
+find an existing Free Software license that meets your needs.
+</p>
 
-<li><strong>Fight against software patents:</strong>
-<a href="http://www.endsoftpatents.org";>worldwide</a>,
-<a href="/server/takeaction.html#swpat">and Europe</a>.</li>
+<p>
+If that isn't possible, if you really need a new license, with our
+help you can ensure that the license really is a Free Software license
+and avoid various practical problems.
+</p>
 
-<li><strong><a href="/server/takeaction.html#wipochange">Call
-on WIPO</a></strong> to change its name and mission.</li>
+  </li>
+ </ul>
 
-<li>Support the efforts on net neutrality in Europe,
-<a href="http://www.savetheinternet.com"; title="Net
-neutrality in the United States of America">in the USA</a>
 
-and <a href="http://www.neutrality.ca"; title="Net neutrality in
-Canada">in Canada</a>.</li>
+<h3 id="WhatIsCopyleft">What Is Copyleft?</h3>
 
-<li><a href="/server/takeaction.html#directory">Add to the Free Software
-Directory</a>.</li>
+<p>
+<a href="/copyleft/copyleft.html"><em>Copyleft</em></a> is a general
+method for making a program free
+software and requiring all modified and extended versions of the
+program to be free software as well.
+</p>
 
-<li><a href="/server/takeaction.html">More action items.</a></li>
+<p>
+The simplest way to make a program free is to put it in the
+<a href="/philosophy/categories.html#PublicDomainSoftware">public
+domain</a>, uncopyrighted.  This allows people to share the program
+and their improvements, if they are so minded.  But it also allows
+uncooperative people to convert the program into
+<a href="/philosophy/categories.html#ProprietarySoftware">proprietary
+software</a>.  They can make changes, many or few, and distribute the
+result as a proprietary product.  People who receive the program in
+that modified form do not have the freedom that the original author
+gave them; the middleman has stripped it away.
+</p>
 
-</ul>
+<p>
+In the <a href="/gnu/thegnuproject.html">GNU project</a>, our aim is
+to give <em>all</em> users the freedom to redistribute and change GNU
+software.  If middlemen could strip off the freedom, we might have
+many users, but those users would not have freedom.  So instead of
+putting GNU software in the public domain, we &ldquo;copyleft&rdquo;
+
+it.  Copyleft says that anyone who redistributes the software, with or
+without changes, must pass along the freedom to further copy and
+change it.  Copyleft guarantees that every user has freedom.
+</p>
 
-<!-- END TakeAction -->
-</div>
-</div>
+<p>
+Copyleft also provides an
+<a href="/philosophy/pragmatic.html">incentive</a>
+for other programmers to add to free software.
+Important free programs such as the GNU C++ compiler exist
+only because of this.
+</p>
 
-<div class="yui-g highlight-para">
+<p>
+Copyleft also helps programmers who want to contribute
+<a href="/software/software.html#HelpWriteSoftware">improvements</a> to
+<a href="/philosophy/free-sw.html">free software</a> get permission to
+do that.  These programmers often work for companies or universities
+that would do almost anything to get more money.  A programmer may
+want to contribute her changes to the community, but her employer may
+want to turn the changes into a proprietary software product.
 
-<p><strong>Can you contribute to any of
-these <a href="http://www.fsf.org/campaigns/priority-projects/";>High
-Priority Projects</a>?</strong> Gnash, coreboot, free distributions of
-GNU/Linux, GNU Octave, drivers for network routers, reversible
-debugging in GDB, automatic transcription, PowerVR drivers, and also
-free software replacements for Skype, OpenDWG libraries, and Oracle
-Forms.</p>
-
-<p id="unmaint"><strong>Can you take over an <a
-href="/server/takeaction.html#unmaint">unmaintained GNU
-package</a>?</strong>
-  <a href="/software/alive/">alive</a>,
-  <a href="/software/dotgnu-forum/">dotgnu-forum</a>,
-  <a href="/software/dr-geo/">dr-geo</a>,
-  <a href="/software/ggradebook/">ggradebook</a>,
-  <a href="/software/gleem/">gleem</a>,
-  <a href="/software/gnu-queue/">gnu-queue</a>,
-  <a href="/software/goldwater/">goldwater</a>,
-  <a href="/software/halifax/">halifax</a>,
-  <a href="/software/metahtml/">metahtml</a>,
-  <a href="/software/orgadoc/">orgadoc</a>,
-  <a href="/software/pgccfd/">pgccfd</a>,
-  <a href="/software/polyxmass/">polyxmass</a>,
-  <a href="/software/quickthreads/">quickthreads</a>,
-  <a href="/software/snakecharmer/">snakecharmer</a>,
-  <a href="/software/sxml/">sxml</a>,
-  <a href="/software/trueprint/">trueprint</a>
-
-are all <a href="/server/takeaction.html#unmaint">looking for
-maintainers</a>.  We also need <a
-href="/server/takeaction.html#python_configure">GNU configure for Python
-packages</a>.</p>
+</p>
+
+<p>
+When we explain to the employer that it is illegal to distribute the
+improved version except as free software, the employer usually decides
+to release it as free software rather than throw it away.
+</p>
+
+<p>
+To copyleft a program, we first state that it is copyrighted; then
+we add distribution terms, which are a legal instrument that gives
+everyone the rights to use, modify, and redistribute the program's
+code <em>or any program derived from it</em> but only if the
+distribution terms are unchanged.  Thus, the code and the freedoms
+become legally inseparable.
+</p>
+
+<p>
+Proprietary software developers use copyright to take away the users'
+freedom; we use copyright to guarantee their freedom.  That's why we
+reverse the name, changing &ldquo;copyright&rdquo; into
+
+&ldquo;copyleft&rdquo;.
+</p>
+
+<p>
+Copyleft is a general concept; there are many ways to fill in the
+details.  In the GNU Project, the specific distribution terms that we
+use are contained in the GNU General Public License, the GNU Lesser
+General Public License and the GNU Free Documentation License.
+</p>
+
+<p>
+The appropriate license is included in many manuals and in each GNU
+source code distribution.
+</p>
+
+<p>
+The GNU GPL is designed so that you can easily apply it to your own
+program if you are the copyright holder.  You don't have to modify the
+GNU GPL to do this, just add notices to your program which refer
+properly to the GNU GPL. Please note that you must use the
+entire text of the GPL, if you use it.  It is an integral whole, and
+partial copies are not permitted.  (Likewise for the LGPL, AGPL, and FDL.)
+</p>
+
+<p>
+
+Using the same distribution terms for many different programs makes it
+easy to copy code between various different programs.  Since they all
+have the same distribution terms, there is no need to think about
+whether the terms are compatible.  The Lesser GPL includes a
+provision that lets you alter the distribution terms to the ordinary
+GPL, so that you can copy code into another program covered by the GPL.
+</p>
+
+<h3>Licenses for Other Types of Works</h3>
+
+<p>
+We believe that published software and documentation should be
+<a href="/philosophy/free-doc.html">free software and free documentation</a>.
+We recommend making all sorts of educational and reference works free
+also, using free documentation licenses such as the
+<a href="#FDL">GNU Free Documentation License</a> (GNU FDL).
+</p>
+
+<p>For essays of opinion and scientific papers, we recommend
+either the <a
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>, or the
+simple &ldquo;verbatim copying only&rdquo; license stated above.</p>
 
-</div>
-</div>
-</div>
 
+<p>
+We don't take the position that artistic or entertainment works must
+be free, but if you want to make one free, we recommend
+the <a href="http://artlibre.org/licence/lalgb.html";>Free Art
+License</a>.</p>
+
+<!-- If needed, change the copyright block at the bottom. In general,
+     pages on the GNU web server should be under CC BY-ND 3.0 US.
+     Please do NOT change or remove this without talking
+     with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the document
+     and that it is like this: "2001, 2002", not this: "2001-2002". -->
+</div><!-- for id="content", starts in the include above -->
 
               <!-- begin server/footer-text.html -->
 <div class="inner">
     
 <div class="yui-g" id="fsf-links">
-
        <ul>
+
                <li><a href="/">GNU&nbsp;home&nbsp;page</a></li>
                <li><a 
href="http://www.fsf.org/";>FSF&nbsp;home&nbsp;page</a></li>
                <li><a href="/graphics/graphics.html">GNU&nbsp;Art</a></li>
@@ -456,39 +616,34 @@
 </div>
 <!-- end server/footer-text.html -->
 
-<!-- BEGIN copyleft -->
 <div id="footer">
-<!--
-  this anchor is referred to from the default
-  gendocs_template (available as part of Texinfo) used for
-  generating GNU manuals online, so please don't remove it.
--->
-
-<p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 <a
-href="http://www.fsf.org";>Free Software Foundation</a>, Inc.</p>
-
-<p>The <a href="http://www.fsf.org/";>FSF</a> also has sister
-organizations in <a href="http://www.fsfe.org";>Europe</a>, <a
-href="http://www.fsfla.org/";>Latin America</a> and <a
-href="http://fsf.org.in/";>India</a>.</p>
+
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</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
+<a href="mailto:address@hidden";><em>address@hidden</em></a>.</p>
+
+<p>Please see the
+<a href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting
+translations of this article.</p>
+
+<p>Copyright &copy; 2011 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.
-</p>
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
 
 <p>Updated:
+
 <!-- timestamp start -->
-$Date: 2011/12/16 21:42:00 $
+$Date: 2012/01/19 02:04:34 $
 <!-- timestamp end -->
 </p>
-
 </div>
-<!-- END copyleft -->
-
+</div>
 </body>
 </html>
 
-<!-- END layout -->
-

Index: philosophy.html
===================================================================
RCS file: /web/www/www/server/staging/nav-bar/test7/philosophy.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy.html     16 Dec 2011 21:42:00 -0000      1.1
+++ philosophy.html     19 Jan 2012 02:04:34 -0000      1.2
@@ -78,11 +78,10 @@
   </div><!-- /searcher -->
 
   <ul>
-   <li id="tabPhilosophy" class="selected"><a href=
-                           "philosophy.html">Philosophy</a></li>
+   <li id="tabHome"><a href="home.html">Home</a></li>
+   <li id="tabPhilosophy" class="selected"><a 
href="philosophy.html">Philosophy</a></li>
    <li id="tabLicenses"><a href="licenses.html">Licenses</a></li>
    <li id="tabEducation"><a href="education.html">Education</a></li>
-
    <li id="tabSoftware"><a href="/software/software.html">Downloads</a></li>
    <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
    <li id="tabHelp"><a href="/help/help.html">Help&nbsp;GNU</a></li>
@@ -321,7 +320,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2011/12/16 21:42:00 $
+$Date: 2012/01/19 02:04:34 $
 <!-- timestamp end -->
 </p>
 </div>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]