* lib/version-etc.c (version_etc_va): Update license wording to

be more concise.  Recommended by Richard Stallman.

diff --git a/ChangeLog b/ChangeLog
index 727b724..bff2502 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-23  Eric Blake  <ebb9@byu.net>
+
+       * lib/version-etc.c (version_etc_va): Update license wording to
+       be more concise.  Recommended by Richard Stallman.
+

 2007-03-22  Bruno Haible  <bruno@clisp.org>
 
        * lib/poll.c (MSG_PEEK): New fallback definition.
 2007-03-22  Bruno Haible  <bruno@clisp.org>
 
        * lib/poll.c (MSG_PEEK): New fallback definition.

diff --git a/lib/version-etc.c b/lib/version-etc.c
index 65997d9..1ae82c4 100644 (file)
--- a/lib/version-etc.c
+++ b/lib/version-etc.c
@@ -67,8 +67,8 @@ version_etc_va (FILE *stream,
 
   fputs (_("\
 \n\
 
   fputs (_("\
 \n\

-This is free software.  You may redistribute copies of it under the terms of\n\
-the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n\
+License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n\
+This is free software: you are free to change and redistribute it.\n\

 There is NO WARRANTY, to the extent permitted by law.\n\
 \n\
 "),
 There is NO WARRANTY, to the extent permitted by law.\n\
 \n\
 "),