From: Han-Wen Nienhuys Date: Fri, 13 Oct 2006 13:46:58 +0000 (+0000) Subject: * COPYING: clarify exception note. X-Git-Tag: release/2.10.0-2~178 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f8576bb43c014eb516ed3fab8eb8c11ef2e1ac21;p=lilypond.git * COPYING: clarify exception note. * lily/main.cc: remove remark about "COPYING". --- diff --git a/COPYING b/COPYING index 18517aeb15..30e82d4603 100644 --- a/COPYING +++ b/COPYING @@ -1,32 +1,21 @@ +LilyPond is distributed with under the GNU General Public License +(reproduced below), with the following exceptions: +- It does not apply to example input files (which are in +the subdirectory input/) that explicitly specify another license. -*** NOTE +- If you create a document which uses fonts included in LilyPond, and +embed this font or unaltered portions of this font into the document, +then this font does not by itself cause the resulting document to be +covered by the GNU General Public License. This exception does not +however invalidate any other reasons why the document might be covered +by the GNU General Public License. If you modify this font, you may +extend this exception to your version of the font, but you are not +obligated to do so. If you do not wish to do so, delete this exception +statement from your version. -1. This license does not apply to the included example input files -(which are in the subdirectory input/). -2. The following addition applies to the fonts included in this -package. - - As a special exception, if you create a document which uses - this font, and embed this font or unaltered portions of this - font into the document, this font does not by itself cause the - resulting document to be covered by the GNU General Public - License. This exception does not however invalidate any other - reasons why the document might be covered by the GNU General - Public License. If you modify this font, you may extend this - exception to your version of the font, but you are not - obligated to do so. If you do not wish to do so, delete this - exception statement from your version. - -Sources of the included fonts are in the subdirectory mf/ - -3. This license applies to all other files that do not explicitly -specify another license. - - -*** END NOTE GNU GENERAL PUBLIC LICENSE Version 2, June 1991 diff --git a/ChangeLog b/ChangeLog index 221250c984..4f7efe1aed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2006-10-13 Han-Wen Nienhuys + * COPYING: clarify exception note. + * lily/main.cc: remove remark about "COPYING". * scm/framework-ps.scm (clip-system-EPSes): change ordering, so