Author: branden
Date: 2004-07-12 11:20:10 -0500 (Mon, 12 Jul 2004)
New Revision: 1627
Modified:
trunk/debian/CHANGESETS
trunk/debian/local/FAQ.xhtml
Log:
Clarify wording Debian X FAQ's license.
* Use the term "additional permissions" instead of "proviso".
* Remove extraneous word.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-07-12 05:28:21 UTC (rev 1626)
+++ trunk/debian/CHANGESETS 2004-07-12 16:20:10 UTC (rev 1627)
@@ -13,7 +13,7 @@
1606
Miscellaneous cosmetic fixes.
- 1607, 1608, 1624, 1626
+ 1607, 1608, 1624, 1626, 1627
Grab latest version of XTerm (#191) from Thomas Dickey's website.
1609
Modified: trunk/debian/local/FAQ.xhtml
===================================================================
--- trunk/debian/local/FAQ.xhtml 2004-07-12 05:28:21 UTC (rev 1626)
+++ trunk/debian/local/FAQ.xhtml 2004-07-12 16:20:10 UTC (rev 1627)
@@ -158,7 +158,7 @@
<p>This is free documentation; you may redistribute it and/or modify it under
the terms of the GNU General Public License, version 2, as published by the
Free
-Software Foundation, with the following proviso:</p>
+Software Foundation, with the following additional permissions:</p>
<ul>
<li>The copyright holder releases all licensees from the requirements of
@@ -182,8 +182,8 @@
since those restrictions never attached to this work; see section 6. This work
can be combined with another work licensed under the GNU General Public
License,
version 2, but any section 2a and 2c restrictions on the resulting work would
-only attach only due to the copyright license on the work(s) with which this
-work is combined and for which those restrictions are in force.</p>
+attach only due to the copyright license on the work(s) with which this work is
+combined and for which those restrictions are in force.</p>
<p>The copyright holder regards the <acronym>XHTML</acronym> form of this
document, along with any adjunct style sheets, as the Source Code of this Work
