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

diff --git a/ChangeLog b/ChangeLog
index c3099ed30462c39a93d4253b88ed321846b3ba1d..ce5e1f5941a7c45c59c327b0573677d3d4362879 100644 (file)
--- 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 78d7e2372a8f00a8e2a60a7c63e0519a426f75fc..588dc95ffdd343a9d75d37ec375fdfe422209577 100644 (file)
--- 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 6a21f16dd755a4aa4cf20755b0a64f6536f3a93d..7e3cedfb1f93341216329e815f951b3a85f86e16 100644 (file)
--- 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 <jean-philippe.guerard@tigreraye.org>.
 .\"
-.\" 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
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" * 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
+.\"   <http://www.gnu.org/licenses/>.
 .\"
 .\" 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 18c574d59d1a7dc1be8728fca342b84793930ae4..8fd52bd37f429de8880c0073b7402558e470921b 100644 (file)
--- 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 <jean-philippe.guerard@tigreraye.org>.
 .\"
-.\" 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
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" * 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
+.\"   <http://www.gnu.org/licenses/>.
 .\"
 .\" 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 8c524775b527dc3915de6f9b07d769bcc4e90403..603aed641ba02e42408c4b62997a6e81096842a6 100644 (file)
--- 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
 .\" <jean-philippe.guerard@tigreraye.org>.
 .\"
-.\" 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
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" * 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
+.\"   <http://www.gnu.org/licenses/>.
 .\"
 .\" 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 3fb1add3480d1a2d0bf7a392769206d12fcc967a..83399e1ee56fb4b635815339ebe20f72d2675f2f 100644 (file)
--- 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 <chrisa@asty.org>
 .\"
-.\" 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
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" * 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
+.\"   <http://www.gnu.org/licenses/>.
 .\"
 .\" $Id$
 .TH NANO 1 "version 2.0.0" "October 28, 2006"

diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index 8e29ac38337904dc370b0aed3f4b058db697fff2..7fde2e6699ecbf8e193268217544d848bff92f84 100644 (file)
--- 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
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" * 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
+.\"   <http://www.gnu.org/licenses/>.
 .\"
 .\" $Id$
 .TH NANORC 5 "version 2.0.0" "October 28, 2006"

diff --git a/doc/man/rnano.1 b/doc/man/rnano.1
index 667c87878093e4af760d6abc24fd6149ff3d6f1e..156c273cbdf8e07f8d327c0e0e82d3ba85cd0568 100644 (file)
--- a/doc/man/rnano.1
+++ b/doc/man/rnano.1
@@ -3,9 +3,21 @@
 .\" <thijs@kinkhorst.com>; skeleton based on nano-tiny.1.
 .\" nano-tiny.1 is Copyright (C) 2002 by Jordi Mallach <jordi@gnu.org>.
 .\"
-.\" 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
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" * 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
+.\"   <http://www.gnu.org/licenses/>.
 .\"
 .\" $Id$
 .TH RNANO 1 "version 2.0.0" "October 28, 2006"

diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index a4278bad914a2c0a3a30ffaa2b1e0e28cccafea6..e8cfdbe8db3917075e31dbbe1fd06fced972d171 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
+
+* 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 <http://www.gnu.org/licenses/>.
 
 You may contact the author by
 e-mail: @email{chrisa@@asty.org}@*