Doc-es: update CHANGES.

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index 8141a87cd1864f33f62aea45351c1c299a245f57..9e33ec13dcdd56139db961355b9ab6885daf4962 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -1,9 +1,20 @@
 /*
-  main.cc -- implement main () entrypoint.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "main.hh"
@@ -102,8 +113,9 @@ static char const *NOTICE
 
 static char const *WARRANTY
 = _i ("    This program is free software; you can redistribute it and/or\n"
-      "modify it under the terms of the GNU General Public License version 2\n"
-      "as published by the Free Software Foundation.\n"
+      "modify it under the terms of the GNU General Public License as \n"
+      "published by the Free Software Foundation, either version 3 of\n"
+      "the License, or (at your option) any later version.\n"
       "\n"
       "    This program is distributed in the hope that it will be useful,\n"
       "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -223,8 +235,8 @@ dir_info (FILE *out)
 static void
 copyright ()
 {
-  /* Do not update the copyright years here, run grand-replace.sh.  */
-  printf ("%s", (_f ("Copyright (c) %s by\n%s  and others.", "1996--2009",
+  /* Do not update the copyright years here, run `make grand-replace'  */
+  printf ("%s", (_f ("Copyright (c) %s by\n%s  and others.", "1996--2011",
                      AUTHORS).c_str ()));
   printf ("\n");
 }