added a menu, some other small fixes

svn path=/trunk/; revision=6932
This commit is contained in:
coriordan 2006-08-20 19:09:18 +00:00
parent 855654fc65
commit 0581140b14
1 changed files with 100 additions and 53 deletions

View File

@ -2,7 +2,7 @@
<html>
<head>
<title>GPLv3 - The changes between draft 1 and draft 2</title>
<title>GPLv3 - The changes from draft 1 to draft 2</title>
</head>
<body>
@ -13,21 +13,63 @@
WIDTH="319" HEIGHT="130" /></a>
</div>
<h1>GPLv3 - The changes between draft 1 and draft 2</h1>
<h1>GPLv3 - The changes from draft 1 to draft 2</h1>
<p>For more information about GPLv3 and how to participate, see our
<p>For more information about the draft GPLv3 and how to participate
in the public consultation process, see our
<a href="gplv3.html">GPLv3 project</a> page.</p>
<p>Below shows a side-by-side comparison of draft 1 and draft 2 of GNU GPL
version 3. Text that was in the first draft, but which is no longer
in the second draft, is in <span style="color:red; font-weight:
bold;">bold red</span> in the left column, and text which is new in the second draft is in <span style="color:blue; font-weight:
bold;">bold blue</span> in the right column.</p>
<p>
Below is a side-by-side comparison of discussion draft 1 and
discussion draft 2 of GNU GPL version 3. Text that was in the first
draft but which is not in the second draft is in <span
style="color:red; font-weight: bold;">bold red</span> in the left
column, and text which is new in the second draft is in <span
style="color:blue; font-weight: bold;">bold blue</span> in the right
column. The section numbers used in version 2 of the GNU GPL are
shown in square brackets.
</p>
<h2>Licence section titles:</h2>
<ul>
<li><a href="#preamble">Preamble</a></li>
<li><a href="#definitions">0. Definitions</a></li>
<li><a href="#source-code">1. Source Code</a></li>
<li><a href="#basic-permissions">2. Basic Permissions</a></li>
<li><a href="#no-denying-rights">3. No Denying Users' Rights Through Technical Measures</a></li>
<li><a href="#verbatim-copying">4. Verbatim Copying</a></li>
<li><a href="#conveying-modified-source-versions">5. Conveying Modified Source Versions</a></li>
<li><a href="#conveying-non-source-forms">6. Conveying Non-Source Forms</a></li>
<li><a href="#additional-terms">7. Additional Terms</a></li>
<li><a href="#termination">8. Termination</a></li>
<li><a href="#acceptance-not-required">9. Acceptance Not Required for Having Copies</a></li>
<li><a href="#automatic-licensing">10. Automatic Licensing of Downstream Users</a></li>
<li><a href="#patents">11. Patents</a></li>
<li><a href="#no-surrender">12. No Surrender of Others' Freedom</a></li>
<li><a href="#geographical-limitations">13. Geographical Limitations</a></li>
<li><a href="#revised-versions">14. Revised Versions of this License</a></li>
<li><a href="#requesting-exceptions">15. Requesting-Exceptions</a></li>
<li><a href="#disclaimer-of-warranty">16. Disclaimer of Warranty</a></li>
<li><a href="#limitation-of-liability">17. Limitation of Liability</a></li>
</ul>
<table>
<tr>
<th>
First discussion draft
</th>
<th>
Second discussion draft
</th>
</tr><tr>
<td style="border: 1px solid black; margin: 1px;">
Discussion Draft <span style="color:red; font-weight: bold;">1</span> of Version 3, <span style="color:red; font-weight: bold;">16
@ -72,7 +114,7 @@ Copyright (c) 2006 Free Software Foundation, Inc. <br />
of this license document, but changing it is not allowed.
</td>
</tr><tr>
</tr><tr id="preamble">
<td style="border: 1px solid black; margin: 1px;">
@ -273,7 +315,7 @@ modification follow.</span>
<td style="border: 1px solid black; margin: 1px;">
<span style="color:red; font-weight: bold;">GNU GENERAL PUBLIC LICENSE</span>
<center><span style="color:red; font-weight: bold;">GNU GENERAL PUBLIC LICENSE</span></center>
</td>
<td style="border: 1px solid black; margin: 1px;">
@ -284,23 +326,23 @@ modification follow.</span>
<td style="border: 1px solid black; margin: 1px;">
TERMS AND CONDITIONS <span style="color:red; font-weight: bold;">FOR COPYING, DISTRIBUTION AND
MODIFICATION</span>
<center>TERMS AND CONDITIONS <span style="color:red; font-weight: bold;">FOR COPYING, DISTRIBUTION AND
MODIFICATION</span></center>
</td>
<td style="border: 1px solid black; margin: 1px;">
TERMS AND CONDITIONS
<center>TERMS AND CONDITIONS</center>
</td>
</tr><tr>
</tr><tr id="definitions">
<td style="border: 1px solid black; margin: 1px;">
<h3>Definitions.</h3>
<h3>0. Definitions.</h3>
</td>
<td style="border: 1px solid black; margin: 1px;">
<h3>Definitions.</h3>
<h3>0. Definitions.</h3>
</td>
</tr><tr>
@ -372,15 +414,15 @@ acquired or to be acquired, that would be infringed by making, using, or
selling the work.</span>
</td>
</tr><tr>
</tr><tr id="source-code">
<td style="border: 1px solid black; margin: 1px;">
<h3>Source Code.</h3>
<h3>1. Source Code.</h3>
</td>
<td style="border: 1px solid black; margin: 1px;">
<h3>Source Code.</h3>
<h3>1. Source Code.</h3>
</td>
</tr><tr>
@ -402,7 +444,9 @@ version of a work.
<td style="border: 1px solid black; margin: 1px;">
<span style="font-style: italic;">[Explanatory note: As well as being reworded, the &quot;system library
exception&quot; has been moved in draft 2. In the left column, draft
1's corresponding paragraph can be found further down in this section]</span>
</td>
<td style="border: 1px solid black; margin: 1px;">
@ -437,7 +481,7 @@ files associated with the program source files</span>.
</td>
<td style="border: 1px solid black; margin: 1px;">
The `` Corresponding Source '' for a work in
The ``Corresponding Source'' for a work in
object code form means all the source code needed to <span style="color: blue; font-weight: bold;">generate</span>, install, and
<span style="color: blue; font-weight: bold;">(for an executable work)</span> run the <span style="color: blue; font-weight: bold;">object code and to
modify the</span> work, <span style="color: blue; font-weight: bold;">except its System Libraries,
@ -536,18 +580,21 @@ available for software under this License.</span>
</td>
<td style="border: 1px solid black; margin: 1px;">
<span style="font-style: italic;">[Explanatory note: As well as being
reworded, the &quot;system library exception&quot; has been moved in
draft 2. In the right column, draft 2's corresponding paragraph can
be found further up in this section]</span>
</td>
</tr><tr>
</tr><tr id="basic-permissions">
<td style="border: 1px solid black; margin: 1px;">
<h3>Basic Permissions.</h3>
<h3>2. Basic Permissions.</h3>
</td>
<td style="border: 1px solid black; margin: 1px;">
<h3>Basic Permissions.</h3>
<h3>2. Basic Permissions.</h3>
</td>
</tr><tr>
@ -616,15 +663,15 @@ allowed; section 10 makes it unnecessary.</span> <span style="color: blue; fon
<span style="color: blue; font-weight: bold;">stated</span> below.
</td>
</tr><tr>
</tr><tr id="no-denying-rights">
<td style="border: 1px solid black; margin: 1px;">
<h3><span style="color:red; font-weight: bold;">Digital Restrictions Management</span> .</h3>
<h3><span style="color:red; font-weight: bold;">3. Digital Restrictions Management</span> .</h3>
</td>
<td style="border: 1px solid black; margin: 1px;">
<h3> <span style="color: blue; font-weight: bold;">No Denying
<h3> <span style="color: blue; font-weight: bold;">3. No Denying
Users' Rights Through Technical Measures</span>.</h3>
</td>
@ -673,15 +720,15 @@ modification of the work as a means of enforcing the legal rights of
third parties against the work's users.</span>
</td>
</tr><tr>
</tr><tr id="verbatim-copying">
<td style="border: 1px solid black; margin: 1px;">
<h3>Verbatim Copying.</h3>
<h3>4.[1] Verbatim Copying.</h3>
</td>
<td style="border: 1px solid black; margin: 1px;">
<h3>Verbatim Copying.</h3>
<h3>4.[1] Verbatim Copying.</h3>
</td>
</tr><tr>
@ -728,15 +775,15 @@ you convey</span>, and you may offer <span style="color: blue; font-weight: bol
warranty protection for a fee.
</td>
</tr><tr>
</tr><tr id="conveying-modified-source-versions">
<td style="border: 1px solid black; margin: 1px;">
<h3><span style="color:red; font-weight: bold;">Distributing</span> Modified Source Versions.</h3>
<h3>5.[2]<span style="color:red; font-weight: bold;">Distributing</span> Modified Source Versions.</h3>
</td>
<td style="border: 1px solid black; margin: 1px;">
<h3> <span style="color: blue; font-weight: bold;">Conveying</span> Modified Source Versions.</h3>
<h3>5.[2] <span style="color: blue; font-weight: bold;">Conveying</span> Modified Source Versions.</h3>
</td>
</tr><tr>
@ -745,7 +792,7 @@ warranty protection for a fee.
<td style="border: 1px solid black; margin: 1px;">
<span style="color:red; font-weight: bold;">Having modified a copy of the Program under the conditions of
section 2, thus forming a work based on the Program, you</span>
nnmay copy and <span style="color:red; font-weight: bold;">distribute</span> <span style="color:red; font-weight: bold;">such modifications
may copy and <span style="color:red; font-weight: bold;">distribute</span> <span style="color:red; font-weight: bold;">such modifications
or</span> work in the form of source code under the
terms of section 4 above, provided that you also meet all of these
conditions:
@ -753,7 +800,7 @@ conditions:
<td style="border: 1px solid black; margin: 1px;">
<span style="color: blue; font-weight: bold;">You</span>
nnmay copy and <span style="color: blue; font-weight: bold;">convey</span> <span style="color: blue; font-weight: bold;">a</span> work <span style="color: blue; font-weight: bold;">based on the Program, or the modifications
may copy and <span style="color: blue; font-weight: bold;">convey</span> <span style="color: blue; font-weight: bold;">a</span> work <span style="color: blue; font-weight: bold;">based on the Program, or the modifications
to produce it from the Program,</span> in the form of source code under the
terms of section 4 above, provided that you also meet all of these
conditions:
@ -905,15 +952,15 @@ what the individual works permit.
License to apply to the other parts of the aggregate.
</td>
</tr><tr>
</tr><tr id="conveying-non-source-forms">
<td style="border: 1px solid black; margin: 1px;">
<h3> Non-Source <span style="color:red; font-weight: bold;">Distribution</span> </h3>
<h3>6.[3] Non-Source <span style="color:red; font-weight: bold;">Distribution</span> </h3>
</td>
<td style="border: 1px solid black; margin: 1px;">
<h3><span style="color: blue; font-weight: bold;">Conveying</span> Non-Source <span style="color: blue; font-weight: bold;">Forms.</span></h3>
<h3>6.[3] <span style="color: blue; font-weight: bold;">Conveying</span> Non-Source <span style="color: blue; font-weight: bold;">Forms.</span></h3>
</td>
</tr><tr>
@ -993,7 +1040,7 @@ b) <span style="color: blue; font-weight: bold;">Convey</span> the
</td>
<td style="border: 1px solid black; margin: 1px;">
b1) [Reader note: this is an alternate "b" for consideration]
b1) <span style="font-style: italic;">[Explanatory note: this is an alternate "b" for consideration]</span>
<span style="color: blue; font-weight: bold;">Convey the object code in a physical product (including a
physical distribution medium), accompanied by a written offer,
valid for at least three years and valid for as long as you offer
@ -1131,15 +1178,15 @@ excluded from the Corresponding Source as a System Library, need not be
included in conveying the object code work.</span>
</td>
</tr><tr>
</tr><tr id="additional-terms">
<td style="border: 1px solid black; margin: 1px;">
<h3><span style="color:red; font-weight: bold;">License Compatibility</span>.</h3>
<h3>7. <span style="color:red; font-weight: bold;">License Compatibility</span>.</h3>
</td>
<td style="border: 1px solid black; margin: 1px;">
<h3><span style="color: blue; font-weight: bold;">Additional
<h3>7. <span style="color: blue; font-weight: bold;">Additional
Terms</span>.</h3>
</td>
@ -1540,7 +1587,7 @@ section must be listed, together, in a central list in the work.</span>
</td>
</tr><tr>
</tr><tr id="termination">
<td style="border: 1px solid black; margin: 1px;">
@ -1578,7 +1625,7 @@ copies, or rights, from you under this License will not have their
licenses terminated so long as they remain in full compliance.
</td>
</tr><tr>
</tr><tr id="acceptance-not-required">
<td style="border: 1px solid black; margin: 1px;">
@ -1615,7 +1662,7 @@ Program (or any covered work), you indicate your acceptance of this
License to do so, and all its terms and conditions.
</td>
</tr><tr>
</tr><tr id="automatic-licensing">
<td style="border: 1px solid black; margin: 1px;">
@ -1670,7 +1717,7 @@ Corresponding Source of the work from the party's predecessor in
interest.</span>
</td>
</tr><tr>
</tr><tr id="patents">
<td style="border: 1px solid black; margin: 1px;">
@ -1756,7 +1803,7 @@ otherwise be available to you under applicable patent
law.</span>
</td>
</tr><tr>
</tr><tr id="no-surrender">
<td style="border: 1px solid black; margin: 1px;">
@ -1820,7 +1867,7 @@ choice.</span>
</td>
</tr><tr>
</tr><tr id="geographical-limitations">
<td style="border: 1px solid black; margin: 1px;">
@ -1858,7 +1905,7 @@ License incorporates the limitation as if written in the body of this
License.]
</td>
</tr><tr>
</tr><tr id="revised-versions">
<td style="border: 1px solid black; margin: 1px;">
@ -1909,7 +1956,7 @@ specify a version number of this License, you may choose any version
ever published by the Free Software Foundation.
</td>
</tr><tr>
</tr><tr id="requesting-exceptions">
@ -1956,7 +2003,7 @@ of promoting the sharing and reuse of software generally.]
<h3>NO WARRANTY</h3>
</td>
</tr><tr>
</tr><tr id="disclaimer-of-warranty">
<td style="border: 1px solid black; margin: 1px;">
@ -1991,7 +2038,7 @@ of the Program is with you. Should the Program prove defective, you
assume the cost of all necessary servicing, repair or correction.
</td>
</tr><tr>
</tr><tr id="limitation-of-liability">
<td style="border: 1px solid black; margin: 1px;">