# HG changeset patch # User Jerry James # Date 1265733642 25200 # Node ID bb6a375da086ec30b1a4ed0a95905a1bb6c16a4e # Parent ecdc03ef6e12ebdabebdad1502fe3b2da6945a1e Relicense J. Kean Johnston's emodules.texi as GPL v2 or later. See <870180fe1002080913m61bb2c1fy210bdafcc6c6893a@mail.gmail.com> in xemacs-patches. diff -r ecdc03ef6e12 -r bb6a375da086 man/ChangeLog --- a/man/ChangeLog Mon Feb 08 20:45:21 2010 -0500 +++ b/man/ChangeLog Tue Feb 09 09:40:42 2010 -0700 @@ -1,3 +1,8 @@ +2010-02-08 Jerry James + + * emodules.texi: Relicense as GPL v2 or later, using J. Kean + Johnston's blanket permission for such relicensing of his works. + 2010-02-05 Ben Wing * internals/internals.texi (A Summary of the Various XEmacs Modules): diff -r ecdc03ef6e12 -r bb6a375da086 man/emodules.texi --- a/man/emodules.texi Mon Feb 08 20:45:21 2010 -0500 +++ b/man/emodules.texi Tue Feb 09 09:40:42 2010 -0700 @@ -32,6 +32,8 @@ @set emacs XEmacs @end ifclear +@c TODO: Merge the info-only and TeX-only license text, since they are +@c identical. @ifinfo This file documents the module loading technology of @value{emacs}. @@ -41,35 +43,22 @@ manual provided the copyright notice and this permission notice are preserved on all copies. -@ignore -Permission is granted to process this file through TeX and print the -results, provided the printed document carries copying permission notice -identical to this one except for the removal of this paragraph (this -paragraph not being relevant to the printed manual). +This file is part of XEmacs. -@end ignore -Permission is granted to copy and distribute modified versions of this -manual under the conditions for verbatim copying, provided that the -entire resulting derived work is distributed under the terms of a -permission notice identical to this one. +XEmacs 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, or (at your option) any +later version. -Permission is granted to copy and distribute translations of this manual -into another language, under the above conditions for modified versions, -except that this permission notice may be stated in a translation -approved by the Foundation. +XEmacs 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. -Permission is granted to copy and distribute modified versions of this -manual under the conditions for verbatim copying, provided also that the -section entitled ``GNU General Public License'' is included exactly as -in the original, and provided that the entire resulting derived work is -distributed under the terms of a permission notice identical to this -one. - -Permission is granted to copy and distribute translations of this manual -into another language, under the above conditions for modified versions, -except that the section entitled ``GNU General Public License'' may be -included in a translation approved by the Free Software Foundation -instead of in the original English. +You should have received a copy of the GNU General Public License +along with XEmacs; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +Boston, MA 02110-1301, USA. @end ifinfo @c Combine indices. @@ -97,22 +86,22 @@ Version 1.0 @* September, 1998.@* -Permission is granted to make and distribute verbatim copies of this -manual provided the copyright notice and this permission notice are -preserved on all copies. +This file is part of XEmacs. + +XEmacs 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, or (at your option) any +later version. -Permission is granted to copy and distribute modified versions of this -manual under the conditions for verbatim copying, provided also that the -section entitled ``GNU General Public License'' is included -exactly as in the original, and provided that the entire resulting -derived work is distributed under the terms of a permission notice -identical to this one. +XEmacs 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. -Permission is granted to copy and distribute translations of this manual -into another language, under the above conditions for modified versions, -except that the section entitled ``GNU General Public License'' may be -included in a translation approved by the Free Software Foundation -instead of in the original English. +You should have received a copy of the GNU General Public License +along with XEmacs; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +Boston, MA 02110-1301, USA. @end titlepage @page