From: David Lawrence Ramsey Date: Sun, 16 Apr 2006 22:13:10 +0000 (+0000) Subject: change nano.texi's the license to GPL, in order to match the rest of the X-Git-Tag: v1.3.12~291 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=51b1b2f1aacaf7d572f0b35f831c93d1ed3fb857;p=nano.git change nano.texi's the license to GPL, in order to match the rest of the documentation, and because the current license is incompatible with everything else in any case git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3387 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index a37f507a..5196a7db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,10 @@ CVS code - - Explicitly mention that all regexes should be extended regular expressions. (DLR, suggested by John M. Gabriele) - Miscellaneous minor fixes. (DLR) +- doc/nano.texi: + - Change license to GPL, in order to match the rest of the + documentation, and because the current license is incompatible + with everything else in any case. (DLR) - doc/man/fr/nano.1, doc/man/fr/nanorc.5, doc/man/fr/rnano.1: - Updated manpage translations by Jean-Philippe Guérard. - doc/nanorc.sample: diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi index 0579e0ea..2a4dce46 100644 --- a/doc/texinfo/nano.texi +++ b/doc/texinfo/nano.texi @@ -36,26 +36,8 @@ This manual is part of the GNU @code{nano} distribution.@* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by Chris Allegretta. -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. - -@iftex -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). -@end iftex - -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. - -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. +This is free documentation, see the latest version of the GNU General +Public License for copying conditions. There is NO warranty. You may contact the author by e-mail: @email{chrisa@@asty.org}@*