(option_parser): update to 2.7.40

[lilypond.git] / COPYING

diff --git a/COPYING b/COPYING
index da816022099e25d775851c80c863264f4972e891..18517aeb155c0943ba964e713609a245262ceb52 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,14 +1,38 @@
-This license applies to all files except:
 
-       - the included input files which explicitly state a different
-copyright policy
 
+*** NOTE
+
+
+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
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+     51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -310,8 +334,8 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with this program; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 
 Also add information on how to contact you by electronic and paper mail.