[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test9 layout5.css gp...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/nav-bar/test9 layout5.css gp... |
|
Date: |
Sun, 16 Mar 2014 21:00:44 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 14/03/16 21:00:44
Modified files:
server/staging/nav-bar/test9: layout5.css
Added files:
server/staging/nav-bar/test9: gpl-faq-table.html
Log message:
gpl-faq table to test printing.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout5.css?cvsroot=www&r1=1.55&r2=1.56
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/gpl-faq-table.html?cvsroot=www&rev=1.1
Patches:
Index: layout5.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout5.css,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- layout5.css 16 Mar 2014 20:40:23 -0000 1.55
+++ layout5.css 16 Mar 2014 21:00:44 -0000 1.56
@@ -633,7 +633,7 @@
#outdated {
text-align: left;
padding: .7em 3%;
- margin: .5em -1%;
+ margin: .4em -1%;
background-color: #f0f2f4;
border-bottom: .3em solid #d1d4d7;
}
Index: gpl-faq-table.html
===================================================================
RCS file: gpl-faq-table.html
diff -N gpl-faq-table.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gpl-faq-table.html 16 Mar 2014 21:00:44 -0000 1.1
@@ -0,0 +1,326 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+
+<head>
+<!-- start of server/head-include-1.html -->
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<link rev="made" href="mailto:address@hidden"; />
+<link rel="icon" type="image/png" href="/graphics/gnu-head-mini.png" />
+<meta name="ICBM" content="42.355469,-71.058627" />
+<meta name="DC.title" content="gnu.org" />
+<!-- end of server/head-include-1.html -->
+<!-- end of server/header.html -->
+<!-- Parent-Version: 1.75 -->
+<title>Frequently Asked Questions about the GNU Licenses
+- GNU Project - Free Software Foundation</title>
+<!--#include virtual="/licenses/po/gpl-faq.translist" -->
+<!-- start of server/banner.html -->
+<!-- start of head-include-2.html -->
+
+<link rel="stylesheet" href="combo.css" media="screen" />
+<link rel="stylesheet" href="layout5.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>
+<div class="inner">
+
+<!--#include virtual="body-include-1.html" -->
+<!--#include virtual="body-include-2.html" -->
+
+<div id="content">
+
+<!-- end of server/banner.html -->
+<br />
+<table id="gpl-compat-matrix">
+<tbody><tr>
+<th rowspan="2" colspan="2"><br /></th>
+<th colspan="6">I want to license my code under:</th>
+</tr>
+
+<tr>
+<th class="gpl-matrix-border">GPLv2 only</th>
+<th class="gpl-matrix-border">GPLv2 or later</th>
+<th class="gpl-matrix-border">GPLv3 or later</th>
+<th class="gpl-matrix-border">LGPLv2.1 only</th>
+<th class="gpl-matrix-border">LGPLv2.1 or later</th>
+<th class="gpl-matrix-border">LGPLv3 or later</th>
+</tr>
+
+<tr>
+<th rowspan="6">I want to copy code under:</th>
+<th class="gpl-matrix-license gpl-matrix-border">GPLv2 only</th>
+<td class="ok">OK</td>
+<td class="ok">OK <a href="#compat-matrix-footnote-2">[2]</a></td>
+<td class="nok">NO</td>
+<td class="mok">OK: Combination is under GPLv2 only <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Combination is under GPLv2 only <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-2">[2]</a></td>
+<td class="nok">NO</td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">GPLv2 or later</th>
+<td class="ok">OK <a href="#compat-matrix-footnote-1">[1]</a></td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="mok">OK: Combination is under GPLv2 or later <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Combination is under GPLv2 or later <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Combination is under GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">GPLv3</th>
+<td class="nok">NO</td>
+<td class="mok">OK: Combination is under GPLv3 <a
href="#compat-matrix-footnote-3">[3]</a></td>
+<td class="ok">OK</td>
+<td class="mok">OK: Combination is under GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Combination is under GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Combination is under GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">LGPLv2.1
+only</th>
+<td class="mok">OK: Convey copied code under GPLv2 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Convey copied code under GPLv2 or later <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Convey copied code under GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="ok">OK</td>
+<td class="ok">OK <a href="#compat-matrix-footnote-6">[6]</a></td>
+<td class="mok">OK: Convey copied code under GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-8">[8]</a></td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">LGPLv2.1
+or later</th>
+<td class="mok">OK: Convey copied code under GPLv2 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-1">[1]</a></td>
+<td class="mok">OK: Convey copied code under GPLv2 or later <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Convey code under GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="ok">OK <a href="#compat-matrix-footnote-5">[5]</a></td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">LGPLv3</th>
+<td class="nok">NO</td>
+<td class="mok">OK: Combination is under GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a><a
href="#compat-matrix-footnote-3">[3]</a></td>
+<td class="mok">OK: Combination is under GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
+<td class="mok">OK: Combination is under GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-8">[8]</a></td>
+<td class="mok">OK: Combination is under LGPLv3 <a
href="#compat-matrix-footnote-4">[4]</a></td>
+<td class="ok">OK</td>
+</tr>
+
+<tr class="gpl-matrix-use-type">
+<th rowspan="6">I want to use a library under:</th>
+<th class="gpl-matrix-license gpl-matrix-border">GPLv2 only</th>
+<td class="ok">OK</td>
+<td class="ok">OK <a href="#compat-matrix-footnote-2">[2]</a></td>
+<td class="nok">NO</td>
+<td class="mok">OK: Combination is under GPLv2 only <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Combination is under GPLv2 only <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-2">[2]</a></td>
+<td class="nok">NO</td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">GPLv2 or later</th>
+<td class="ok">OK <a href="#compat-matrix-footnote-1">[1]</a></td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="mok">OK: Combination is under GPLv2 or later <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Combination is under GPLv2 or later <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Combination is under GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">GPLv3</th>
+<td class="nok">NO</td>
+<td class="mok">OK: Combination is under GPLv3 <a
href="#compat-matrix-footnote-3">[3]</a></td>
+<td class="ok">OK</td>
+<td class="mok">OK: Combination is under GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Combination is under GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Combination is under GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">LGPLv2.1 only</th>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">LGPLv2.1 or later</th>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">LGPLv3</th>
+<td class="nok">NO</td>
+<td class="mok">OK: Combination is under GPLv3 <a
href="#compat-matrix-footnote-9">[9]</a></td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+</tr>
+</tbody></table>
+<p><a href="#matrix-skip-target">Skip footnotes</a></p>
+
+<p id="compat-matrix-footnote-1">1: You must follow the terms of GPLv2
+when incorporating the code in this case. You cannot take advantage of
+terms in later versions of the GPL.</p>
+
+<p id="compat-matrix-footnote-2">2: While you may release your project
+(either your original work and/or work that you received and modified)
+under GPLv2-or-later in this case, note that the other code you're
+using must remain under GPLv2 only. As long as your project depends
+on that code, you won't be able to upgrade the license of your project
+to GPLv3-or-later, and the work as a whole (any combination of both
+your project and the other code) can only be conveyed under the terms
+of GPLv2.</p>
+
+<p id="compat-matrix-footnote-3">3: If you have the ability to release
+the project under GPLv2 or any later version, you can choose to
+release it under GPLv3 or any later version—and once you do
+that, you'll be able to incorporate the code released under GPLv3.</p>
+
+<p id="compat-matrix-footnote-4">4: If you have the ability to release
+the project under LGPLv2.1 or any later version, you can choose to
+release it under LGPLv3 or any later version—and once you do
+that, you'll be able to incorporate the code released under
+LGPLv3.</p>
+
+<p id="compat-matrix-footnote-5">5: You must follow the terms of
+LGPLv2.1 when incorporating the code in this case. You cannot take
+advantage of terms in later versions of the LGPL.</p>
+
+<p id="compat-matrix-footnote-6">6: If you do this, as long as the
+project contains the code released under LGPLv2.1 only, you will not
+be able to upgrade the project's license to LGPLv3 or later.</p>
+
+<p id="compat-matrix-footnote-7">7: LGPLv2.1 gives you permission to
+relicense the code under any version of the GPL since GPLv2. If you
+can switch the LGPLed code in this case to using an appropriate
+version of the GPL instead (as noted in the table), you can make this
+combination.</p>
+
+<p id="compat-matrix-footnote-8">8: LGPLv3 is GPLv3 plus extra
+permissions that you can ignore in this case.</p>
+
+<p id="compat-matrix-footnote-9">9: Because GPLv2 does not permit
+combinations with LGPLv3, you must convey the project under GPLv3's
+terms in this case, since it will allow that combination.</p>
+
+<div id="matrix-skip-target"></div></dd>
+
+</dl>
+
+</div><!-- for id="content", starts in the include above -->
+<!-- begin server/footer-text.html -->
+
+<div id="fsf-links">
+ <ul>
+ <li><a href="/">GNU home page</a></li>
+ <li><a
href="http://www.fsf.org/";>FSF home page</a></li>
+ <li><a href="/graphics/graphics.html">GNU Art</a></li>
+ <li><a href="/fun/fun.html">GNU Fun</a></li>
+ <li><a href="/people/people.html">GNU's Who?</a></li>
+ <li><a
href="http://directory.fsf.org";>Free Software Directory</a></li>
+ <li><a href="/server/sitemap.html">Site map</a></li>
+ </ul>
+</div><!-- /fsf-links -->
+
+<div id="mission-statement">
+
+<blockquote>
+<a href="http://www.fsf.org";><img id="fsfbanner" src="logo-fsf.org-notext.png"
alt=" [FSF logo] "/></a><strong>âOur mission is to preserve, protect and
promote the freedom to use, study, copy, modify, and redistribute computer
software, and to defend the rights of Free Software users.â</strong>
+</blockquote>
+
+<p>The <a href="http://www.fsf.org";>Free Software Foundation</a> is the
principal organizational sponsor of the GNU Operating System. <strong>Support
GNU and the FSF</strong> by</p>
+<div id="support-items">
+<p>* <a href="http://shop.fsf.org/";>buying manuals and gear</a>,</p>
+<p>* <a href="https://my.fsf.org/associate/support_freedom?referrer=4052";>
+ <strong>joining the FSF</strong></a> as an associate member, or</p>
+<p>* making a <strong>donation</strong>,
+ either <a href="http://donate.fsf.org/";>directly to the FSF</a>
+ or <a href="http://flattr.com/thing/313733/gnuproject-on-Flattr";>via
Flattr</a>.</p>
+</div> <!-- /support-gnu-fsf -->
+
+<p id="backtotop"><a href="#header">Back to Top</a></p>
+
+</div> <!-- /mission-statement -->
+
+<!-- end server/footer-text.html -->
+<div id="footer">
+
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:address@hidden";><address@hidden></a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";><address@hidden></a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden";>
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) 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. For web pages, it is ok to list just the latest year the
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
+
+<p>Copyright © 2013 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>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2014/03/16 21:00:44 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/server/staging/nav-bar/test9 layout5.css gp...,
Therese Godefroy <=