From b23f17a6674aa7fd46acbab5c285993b397ec4f1 Mon Sep 17 00:00:00 2001 From: Frans Pop Date: Mon, 1 May 2006 08:40:29 +0000 Subject: More changes to the GPL --- en/appendix/gpl.xml | 76 +++++++++++++++++++---------------------------------- 1 file changed, 27 insertions(+), 49 deletions(-) (limited to 'en/appendix') diff --git a/en/appendix/gpl.xml b/en/appendix/gpl.xml index 4e8f8bb35..e0e6c69e4 100644 --- a/en/appendix/gpl.xml +++ b/en/appendix/gpl.xml @@ -422,35 +422,24 @@ to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - -one line to give the program's name and a brief idea of what it -does. + +one line to give the program's name and a brief idea of what it does. +Copyright (C) year name of author - +This program 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 2 +of the License, or (at your option) any later version. -Copyright (C) year name of author +This program 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. - - -This program 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 2 of the License, or (at -your option) any later version. - - - -This program 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 +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., 51 Franklin Street, Fifth Floor, Boston, -MA 02110-1301, USA. +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + @@ -462,19 +451,13 @@ mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - - -Gnomovision version 69, Copyright (C) year name of author - - - -Gnomovision comes with absolutely no warranty; for details type `show -w'. - - - -This is free software, and you are welcome to redistribute it under -certain conditions; type `show c' for details. + +Gnomovision version 69, Copyright (C) year name of author +Gnomovision comes with absolutely no warranty; for details +type `show w'. This is free software, and you are welcome +to redistribute it under certain conditions; type `show c' +for details. + @@ -490,19 +473,14 @@ You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: - - + Yoyodyne, Inc., hereby disclaims all copyright interest in the -program `Gnomovision' (which makes passes at compilers) written by -James Hacker. - - - -signature of Ty Coon, 1 April 1989 - - +program `Gnomovision' (which makes passes at compilers) written +by James Hacker. +signature of Ty Coon, 1 April 1989 Ty Coon, President of Vice + @@ -510,7 +488,7 @@ This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want -to do, use the gnu Library General Public License instead of this +to do, use the GNU Lesser General Public License instead of this License. -- cgit v1.2.3