From 8bfcb703bbafc090e7305bd53274ef4ef04a15f8 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Thu, 11 Oct 2007 05:01:32 +0000 Subject: [PATCH] update copyright notices, as Chris Allegretta's copyrights have now been assigned to the Free Software Foundation; also, make copyright notices consistent in style git-svn-id: svn://svn.savannah.gnu.org/nano/branches/nano_2_0_branch/nano@4173 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 6 ++++++ doc/man/fr/nano.1 | 4 ++-- doc/man/fr/nanorc.5 | 4 ++-- doc/man/nano.1 | 4 ++-- doc/man/nanorc.5 | 4 ++-- doc/texinfo/nano.texi | 4 ++-- src/browser.c | 4 ++-- src/chars.c | 4 ++-- src/color.c | 4 ++-- src/cut.c | 4 ++-- src/files.c | 4 ++-- src/global.c | 4 ++-- src/help.c | 4 ++-- src/move.c | 4 ++-- src/nano.c | 8 ++++---- src/nano.h | 4 ++-- src/prompt.c | 4 ++-- src/proto.h | 4 ++-- src/rcfile.c | 4 ++-- src/search.c | 4 ++-- src/text.c | 4 ++-- src/utils.c | 8 ++++---- src/winio.c | 8 ++++---- 23 files changed, 56 insertions(+), 50 deletions(-) diff --git a/ChangeLog b/ChangeLog index 254ba301..53703e2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,12 @@ CVS code - - Update copyright notices, as my copyrights have now been assigned to the Free Software Foundation. Changes to *.c and *.h. (DLR) + - Update copyright notices, as Chris Allegretta's copyrights + have now been assigned to the Free Software Foundation. + Changes to doc/man/nano.1, doc/man/fr/nano.1, + doc/texinfo/nano.texi, *.c and *.h. (DLR) + - Make copyright notices consistent in style. Changes to + doc/man/nanorc.5 and doc/man/fr/nanorc.5. (DLR) - chars.c: nstrncasecmp(), mbstrncasecmp() - For efficiency, return zero immediately if s1 and s2 point to diff --git a/doc/man/fr/nano.1 b/doc/man/fr/nano.1 index 18bc4f9d..c5472c71 100644 --- a/doc/man/fr/nano.1 +++ b/doc/man/fr/nano.1 @@ -1,6 +1,6 @@ .\" Hey, EMACS: -*- nroff -*- -.\" nano.1 is Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, -.\" 2006 by Chris Allegretta . +.\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 +.\" Free Software Foundation, Inc. .\" .\" Adaptation française (C) 2003, 2004, 2005, 2006, 2007 par .\" Jean-Philippe Guérard . diff --git a/doc/man/fr/nanorc.5 b/doc/man/fr/nanorc.5 index f9f899f9..789cbc22 100644 --- a/doc/man/fr/nanorc.5 +++ b/doc/man/fr/nanorc.5 @@ -1,6 +1,6 @@ .\" Hey, EMACS: -*- nroff -*- -.\" nanorc.5 is Copyright (C) 2003, 2004, 2005, 2006 by the Free -.\" Software Foundation, Inc. +.\" Copyright (C) 2003, 2004, 2005, 2006, 2007 +.\" Free Software Foundation, Inc. .\" .\" Adaptation française (C) 2003, 2004, 2005, 2006, 2007 par .\" Jean-Philippe Guérard . diff --git a/doc/man/nano.1 b/doc/man/nano.1 index 3bd7171d..04e2722a 100644 --- a/doc/man/nano.1 +++ b/doc/man/nano.1 @@ -1,6 +1,6 @@ .\" Hey, EMACS: -*- nroff -*- -.\" nano.1 is Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, -.\" 2006, 2007 by Chris Allegretta . +.\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 +.\" Free Software Foundation, Inc. .\" .\" This document is dual-licensed. You may distribute and/or modify it .\" under the terms of either of the following licenses: diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5 index bee8298d..7494df2c 100644 --- a/doc/man/nanorc.5 +++ b/doc/man/nanorc.5 @@ -1,6 +1,6 @@ .\" Hey, EMACS: -*- nroff -*- -.\" nanorc.5 is Copyright (C) 2003, 2004, 2005, 2006, 2007 by the Free -.\" Software Foundation, Inc. +.\" Copyright (C) 2003, 2004, 2005, 2006, 2007 +.\" Free Software Foundation, Inc. .\" .\" This document is dual-licensed. You may distribute and/or modify it .\" under the terms of either of the following licenses: diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi index 6c33e67f..e44164b3 100644 --- a/doc/texinfo/nano.texi +++ b/doc/texinfo/nano.texi @@ -33,8 +33,8 @@ editor. This manual is part of the GNU @code{nano} distribution.@* @sp4 -Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 by -Chris Allegretta +Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 +Free Software Foundation, Inc. This document is dual-licensed. You may distribute and/or modify it under the terms of either of the following licenses: diff --git a/src/browser.c b/src/browser.c index 6c95b0d5..d7be9744 100644 --- a/src/browser.c +++ b/src/browser.c @@ -2,8 +2,8 @@ /************************************************************************** * browser.c * * * - * Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta * - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. * + * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Free Software Foundation, Inc. * * 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 3, or (at your option) * diff --git a/src/chars.c b/src/chars.c index 4e97c4c8..34e151bb 100644 --- a/src/chars.c +++ b/src/chars.c @@ -2,8 +2,8 @@ /************************************************************************** * chars.c * * * - * Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta * - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. * + * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Free Software Foundation, Inc. * * 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 3, or (at your option) * diff --git a/src/color.c b/src/color.c index 9d67a73f..a998551b 100644 --- a/src/color.c +++ b/src/color.c @@ -2,8 +2,8 @@ /************************************************************************** * color.c * * * - * Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta * - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. * + * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Free Software Foundation, Inc. * * 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 3, or (at your option) * diff --git a/src/cut.c b/src/cut.c index 387bec87..57ba5c3c 100644 --- a/src/cut.c +++ b/src/cut.c @@ -2,8 +2,8 @@ /************************************************************************** * cut.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Free Software Foundation, Inc. * * 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 3, or (at your option) * diff --git a/src/files.c b/src/files.c index 81a51a3a..347d90a0 100644 --- a/src/files.c +++ b/src/files.c @@ -2,8 +2,8 @@ /************************************************************************** * files.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Free Software Foundation, Inc. * * 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 3, or (at your option) * diff --git a/src/global.c b/src/global.c index d923f29f..5ddb322d 100644 --- a/src/global.c +++ b/src/global.c @@ -2,8 +2,8 @@ /************************************************************************** * global.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Free Software Foundation, Inc. * * 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 3, or (at your option) * diff --git a/src/help.c b/src/help.c index 33cd893c..a694a970 100644 --- a/src/help.c +++ b/src/help.c @@ -2,8 +2,8 @@ /************************************************************************** * help.c * * * - * Copyright (C) 2000, 2001, 2002, 2003, 2004 Chris Allegretta * - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. * + * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Free Software Foundation, Inc. * * 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 3, or (at your option) * diff --git a/src/move.c b/src/move.c index ebc44325..05892e03 100644 --- a/src/move.c +++ b/src/move.c @@ -2,8 +2,8 @@ /************************************************************************** * move.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Free Software Foundation, Inc. * * 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 3, or (at your option) * diff --git a/src/nano.c b/src/nano.c index b1c55b07..247d1ef3 100644 --- a/src/nano.c +++ b/src/nano.c @@ -2,8 +2,8 @@ /************************************************************************** * nano.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Free Software Foundation, Inc. * * 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 3, or (at your option) * @@ -881,8 +881,8 @@ void version(void) { printf(_(" GNU nano version %s (compiled %s, %s)\n"), VERSION, __TIME__, __DATE__); - printf(" (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta\n"); - printf(" (C) 2005, 2006, 2007 Free Software Foundation, Inc.\n"); + printf(" (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007\n"); + printf(" Free Software Foundation, Inc.\n"); printf( _(" Email: nano@nano-editor.org Web: http://www.nano-editor.org/")); printf(_("\n Compiled options:")); diff --git a/src/nano.h b/src/nano.h index aa340c67..370d6d33 100644 --- a/src/nano.h +++ b/src/nano.h @@ -2,8 +2,8 @@ /************************************************************************** * nano.h * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Free Software Foundation, Inc. * * 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 3, or (at your option) * diff --git a/src/prompt.c b/src/prompt.c index b31b3291..745c4a65 100644 --- a/src/prompt.c +++ b/src/prompt.c @@ -2,8 +2,8 @@ /************************************************************************** * prompt.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Free Software Foundation, Inc. * * 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 3, or (at your option) * diff --git a/src/proto.h b/src/proto.h index 09547e90..efa2332c 100644 --- a/src/proto.h +++ b/src/proto.h @@ -2,8 +2,8 @@ /************************************************************************** * proto.h * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Free Software Foundation, Inc. * * 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 3, or (at your option) * diff --git a/src/rcfile.c b/src/rcfile.c index b54981d8..7a4bf26e 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -2,8 +2,8 @@ /************************************************************************** * rcfile.c * * * - * Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta * - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. * + * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Free Software Foundation, Inc. * * 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 3, or (at your option) * diff --git a/src/search.c b/src/search.c index 5b277828..e7c4997c 100644 --- a/src/search.c +++ b/src/search.c @@ -2,8 +2,8 @@ /************************************************************************** * search.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Free Software Foundation, Inc. * * 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 3, or (at your option) * diff --git a/src/text.c b/src/text.c index 3aa7af0f..0ec884d0 100644 --- a/src/text.c +++ b/src/text.c @@ -2,8 +2,8 @@ /************************************************************************** * text.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Free Software Foundation, Inc. * * 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 3, or (at your option) * diff --git a/src/utils.c b/src/utils.c index 34288eec..658e418b 100644 --- a/src/utils.c +++ b/src/utils.c @@ -2,8 +2,8 @@ /************************************************************************** * utils.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Free Software Foundation, Inc. * * 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 3, or (at your option) * @@ -165,8 +165,8 @@ void sunder(char *str) * Foundation's address and the copyright years updated: * * GNU Mailutils -- a suite of utilities for electronic mail - * Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007 Free - * Software Foundation, Inc. + * Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007 + * Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/winio.c b/src/winio.c index d0158b83..135ec471 100644 --- a/src/winio.c +++ b/src/winio.c @@ -2,8 +2,8 @@ /************************************************************************** * winio.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Free Software Foundation, Inc. * * 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 3, or (at your option) * @@ -3338,8 +3338,8 @@ void do_credits(void) "", "", "", - "(C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta", - "(C) 2005, 2006, 2007 Free Software Foundation, Inc.", + "(C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007", + "Free Software Foundation, Inc.", "", "", "", -- 2.39.5