From 7422821855ea998c72d484b89547173c1502fb9d Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Thu, 23 Aug 2007 04:34:35 +0000 Subject: [PATCH] convert documentation to GPLv3/GFDLv1.2 git-svn-id: svn://svn.savannah.gnu.org/nano/branches/nano_2_0_branch/nano@4161 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 9 +++++++++ Makefile.am | 6 +++--- doc/man/fr/nano.1 | 18 +++++++++++++++--- doc/man/fr/nanorc.5 | 18 +++++++++++++++--- doc/man/fr/rnano.1 | 18 +++++++++++++++--- doc/man/nano.1 | 18 +++++++++++++++--- doc/man/nanorc.5 | 18 +++++++++++++++--- doc/man/rnano.1 | 18 +++++++++++++++--- doc/texinfo/nano.texi | 15 +++++++++++++-- 9 files changed, 115 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index c3099ed3..ce5e1f59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,11 @@ CVS code - has_blank_mbchars(). (DLR) - Relicense all source files to the GNU GPL version 3 or later. Changes to configure.ac, *.c, and *.h. (DLR) + - Relicense all documentation to the GNU GPL version 3 or + later/the GNU FDL version 1.2 or later with no Invariant + Sections, Front-Cover Texts, or Back-Cover Texts. Changes to + doc/man/*.1, doc/man/nanorc.5, doc/man/fr/*.1, + doc/man/fr/nanorc.5, and doc/texinfo/nano.texi. (DLR) - chars.c: nstrncasecmp(), mbstrncasecmp() - For efficiency, return zero immediately if s1 and s2 point to @@ -73,6 +78,10 @@ CVS code - - Update copyright notice to account for modifications. (DLR) - COPYING: - Add a copy of the GNU GPL version 3. (DLR) +- COPYING.DOC: + - Add a copy of the GNU FDL version 1.2. (DLR) +- Makefile.am: + - Add COPYING.DOC to EXTRA_DIST. (DLR) - doc/faq.html: - Update RPM links for nano 2.0.x. (DLR) - doc/man/fr/nano.1, doc/man/fr/nanorc.5, doc/man/fr/rnano.1: diff --git a/Makefile.am b/Makefile.am index 78d7e237..588dc95f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,8 +3,8 @@ AUTOMAKE_OPTIONS = gnu no-dependencies SUBDIRS = doc m4 po src -EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \ - README README.CVS THANKS TODO UPGRADE config.rpath \ - install-sh missing mkinstalldirs nano.spec +EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING COPYING.DOC ChangeLog \ + INSTALL NEWS README README.CVS THANKS TODO UPGRADE \ + config.rpath install-sh missing mkinstalldirs nano.spec ACLOCAL_AMFLAGS = -I m4 diff --git a/doc/man/fr/nano.1 b/doc/man/fr/nano.1 index 6a21f16d..7e3cedfb 100644 --- a/doc/man/fr/nano.1 +++ b/doc/man/fr/nano.1 @@ -5,9 +5,21 @@ .\" Adaptation française (C) 2003, 2004, 2005, 2006 par Jean-Philippe .\" Guérard . .\" -.\" This is free documentation, see the latest version of the GNU -.\" General Public License for copying conditions. There is NO -.\" warranty. +.\" This document is dual-licensed. You may distribute and/or modify it +.\" under the terms of either of the following licenses: +.\" +.\" * The GNU General Public License, as published by the Free Software +.\" Foundation, version 3 or (at your option) any later version. You +.\" should have received a copy of the GNU General Public License +.\" along with this program. If not, see +.\" . +.\" +.\" * The GNU Free Documentation License, as published by the Free +.\" Software Foundation, version 1.2 or (at your option) any later +.\" version, with no Invariant Sections, no Front-Cover Texts, and no +.\" Back-Cover Texts. You should have received a copy of the GNU Free +.\" Documentation License along with this program. If not, see +.\" . .\" .\" Ce document est libre. Reportez-vous à la dernière version de la .\" licence publique générale GNU (GNU GPL) pour connaître ses diff --git a/doc/man/fr/nanorc.5 b/doc/man/fr/nanorc.5 index 18c574d5..8fd52bd3 100644 --- a/doc/man/fr/nanorc.5 +++ b/doc/man/fr/nanorc.5 @@ -5,9 +5,21 @@ .\" Adaptation française (C) 2003, 2004, 2005, 2006 par Jean-Philippe .\" Guérard . .\" -.\" This is free documentation, see the latest version of the GNU -.\" General Public License for copying conditions. There is NO -.\" warranty. +.\" This document is dual-licensed. You may distribute and/or modify it +.\" under the terms of either of the following licenses: +.\" +.\" * The GNU General Public License, as published by the Free Software +.\" Foundation, version 3 or (at your option) any later version. You +.\" should have received a copy of the GNU General Public License +.\" along with this program. If not, see +.\" . +.\" +.\" * The GNU Free Documentation License, as published by the Free +.\" Software Foundation, version 1.2 or (at your option) any later +.\" version, with no Invariant Sections, no Front-Cover Texts, and no +.\" Back-Cover Texts. You should have received a copy of the GNU Free +.\" Documentation License along with this program. If not, see +.\" . .\" .\" Ce document est libre. Reportez-vous à la dernière version de la .\" licence publique générale GNU (GNU GPL) pour connaître ses diff --git a/doc/man/fr/rnano.1 b/doc/man/fr/rnano.1 index 8c524775..603aed64 100644 --- a/doc/man/fr/rnano.1 +++ b/doc/man/fr/rnano.1 @@ -6,9 +6,21 @@ .\" Adaptation française (C) 2006 par Jean-Philippe Guérard .\" . .\" -.\" This is free documentation, see the latest version of the GNU -.\" General Public License for copying conditions. There is NO -.\" warranty. +.\" This document is dual-licensed. You may distribute and/or modify it +.\" under the terms of either of the following licenses: +.\" +.\" * The GNU General Public License, as published by the Free Software +.\" Foundation, version 3 or (at your option) any later version. You +.\" should have received a copy of the GNU General Public License +.\" along with this program. If not, see +.\" . +.\" +.\" * The GNU Free Documentation License, as published by the Free +.\" Software Foundation, version 1.2 or (at your option) any later +.\" version, with no Invariant Sections, no Front-Cover Texts, and no +.\" Back-Cover Texts. You should have received a copy of the GNU Free +.\" Documentation License along with this program. If not, see +.\" . .\" .\" Ce document est libre. Reportez-vous à la dernière version de la .\" licence publique générale GNU (GNU GPL) pour connaître ses diff --git a/doc/man/nano.1 b/doc/man/nano.1 index 3fb1add3..83399e1e 100644 --- a/doc/man/nano.1 +++ b/doc/man/nano.1 @@ -2,9 +2,21 @@ .\" nano.1 is Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, .\" 2006 by Chris Allegretta .\" -.\" This is free documentation, see the latest version of the GNU -.\" General Public License for copying conditions. There is NO -.\" warranty. +.\" This document is dual-licensed. You may distribute and/or modify it +.\" under the terms of either of the following licenses: +.\" +.\" * The GNU General Public License, as published by the Free Software +.\" Foundation, version 3 or (at your option) any later version. You +.\" should have received a copy of the GNU General Public License +.\" along with this program. If not, see +.\" . +.\" +.\" * The GNU Free Documentation License, as published by the Free +.\" Software Foundation, version 1.2 or (at your option) any later +.\" version, with no Invariant Sections, no Front-Cover Texts, and no +.\" Back-Cover Texts. You should have received a copy of the GNU Free +.\" Documentation License along with this program. If not, see +.\" . .\" .\" $Id$ .TH NANO 1 "version 2.0.0" "October 28, 2006" diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5 index 8e29ac38..7fde2e66 100644 --- a/doc/man/nanorc.5 +++ b/doc/man/nanorc.5 @@ -2,9 +2,21 @@ .\" nanorc.5 is Copyright (C) 2003, 2004, 2005, 2006 by the Free .\" Software Foundation, Inc. .\" -.\" This is free documentation, see the latest version of the GNU -.\" General Public License for copying conditions. There is NO -.\" warranty. +.\" This document is dual-licensed. You may distribute and/or modify it +.\" under the terms of either of the following licenses: +.\" +.\" * The GNU General Public License, as published by the Free Software +.\" Foundation, version 3 or (at your option) any later version. You +.\" should have received a copy of the GNU General Public License +.\" along with this program. If not, see +.\" . +.\" +.\" * The GNU Free Documentation License, as published by the Free +.\" Software Foundation, version 1.2 or (at your option) any later +.\" version, with no Invariant Sections, no Front-Cover Texts, and no +.\" Back-Cover Texts. You should have received a copy of the GNU Free +.\" Documentation License along with this program. If not, see +.\" . .\" .\" $Id$ .TH NANORC 5 "version 2.0.0" "October 28, 2006" diff --git a/doc/man/rnano.1 b/doc/man/rnano.1 index 667c8787..156c273c 100644 --- a/doc/man/rnano.1 +++ b/doc/man/rnano.1 @@ -3,9 +3,21 @@ .\" ; skeleton based on nano-tiny.1. .\" nano-tiny.1 is Copyright (C) 2002 by Jordi Mallach . .\" -.\" This is free documentation, see the latest version of the GNU -.\" General Public License for copying conditions. There is NO -.\" warranty. +.\" This document is dual-licensed. You may distribute and/or modify it +.\" under the terms of either of the following licenses: +.\" +.\" * The GNU General Public License, as published by the Free Software +.\" Foundation, version 3 or (at your option) any later version. You +.\" should have received a copy of the GNU General Public License +.\" along with this program. If not, see +.\" . +.\" +.\" * The GNU Free Documentation License, as published by the Free +.\" Software Foundation, version 1.2 or (at your option) any later +.\" version, with no Invariant Sections, no Front-Cover Texts, and no +.\" Back-Cover Texts. You should have received a copy of the GNU Free +.\" Documentation License along with this program. If not, see +.\" . .\" .\" $Id$ .TH RNANO 1 "version 2.0.0" "October 28, 2006" diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi index a4278bad..e8cfdbe8 100644 --- a/doc/texinfo/nano.texi +++ b/doc/texinfo/nano.texi @@ -36,8 +36,19 @@ This manual is part of the GNU @code{nano} distribution.@* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by Chris Allegretta -This is free documentation, see the latest version of the GNU General -Public License for copying conditions. There is NO warranty. +This document is dual-licensed. You may distribute and/or modify it +under the terms of either of the following licenses: + +* The GNU General Public License, as published by the Free Software + Foundation, version 3 or (at your option) any later version. You + should have received a copy of the GNU General Public License along + with this program. If not, see . + +* The GNU Free Documentation License, as published by the Free Software + Foundation, version 1.2 or (at your option) any later version, with no + Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. + You should have received a copy of the GNU Free Documentation License + along with this program. If not, see . You may contact the author by e-mail: @email{chrisa@@asty.org}@* -- 2.39.5