diff --git a/ChangeLog b/ChangeLog
index b7e9f738e6f189996d0f6066d1de5d53be0b6869..45bb1c953f12f3f79b9f0ec31befcd7b02148e99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-11 David Lawrence Ramsey <pooka109@gmail.com>
+
+ * doc/man/nano.1, doc/man/fr/nano.1, doc/texinfo/nano.texi,
+ src/*.c, src/*.h: Update copyright notices, as Chris
+ Allegretta's copyrights have now been assigned to the Free
+ Software Foundation.
+ * doc/man/nanorc.5, doc/man/fr/nanorc.5: Make copyright notices
+ for these files consistent in style.
+
2007-10-05 David Lawrence Ramsey <pooka109@gmail.com>
* src/*.c, src/*.h: Update copyright notices, as my copyrights
diff --git a/doc/man/fr/nano.1 b/doc/man/fr/nano.1
index 18bc4f9d881b784f4c72134d45fd8c3ff75c4b69..c5472c71a5e17cd33e8b72e27f876c10efa8e2d5 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 <chrisa@asty.org>.
+.\" 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 <jean-philippe.guerard@tigreraye.org>.
diff --git a/doc/man/fr/nanorc.5 b/doc/man/fr/nanorc.5
index f9f899f986f815b177105567b5ad00ddbf11a5b8..789cbc220b32eedcc04e569fa75166bfdc484839 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 <jean-philippe.guerard@tigreraye.org>.
diff --git a/doc/man/nano.1 b/doc/man/nano.1
index 3bd7171df555a6b287b0a775b10bcc79fc77cf73..04e2722add4ba00395db821d3dd1bd39318637ce 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 <chrisa@asty.org>.
+.\" 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 bee8298df44031c96fbe9391142b655d2d1ac1fa..7494df2cb50497b783bfbb6f607a6d8a25368c94 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 d954f183cca143c67e3c9870e0f5335a57dc869e..a4aac9af3d2d56397aa2d68f5a68e655137d5059 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 6c95b0d5d921dcce4df537157c0430b5b033d662..d7be9744b85bcaba4ffbcdf5ba804c9b5212ccab 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 4e97c4c8231b23c083164fbd07492af9abe9e64f..34e151bb907daf8096bbb209d68c04555a5cee00 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 9d67a73f9960f252e4672d336ff454ed5843e640..a998551b0b911c39a79c2b71fdb26c51d8cf05a6 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 387bec879b22e37f25ec2b6d7fd83284e722a763..57ba5c3c2331f48f2ed9d0f27f64af4a389f97d1 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 81a51a3aaa2ecd2df0a2403a151cc8cc2686ebc8..347d90a0ce1d09b88cff4cfe5c76c876e8955060 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 09be1ba8ad919f2f50a8940672dfe509feac9b0c..f4c827760c4ff95765f6deb93b5d0243f98a3d1a 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 e69a2641f05ebfdace5dc51b3c94d9fed432aac4..803cf1227bdd4d49cb7a6496ac5e95aaabfa804a 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 ebc443252414f796a6752db7b8a95909c702742c..05892e0318b66eb876c035896e9a9a94214ccdaf 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 cc144c312e83d3e4b4d06369e294a6aa63b32c02..1b0c53813607e58b621886f759775c3ceb91b489 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) *
@@ -883,8 +883,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 aa340c67055d8e08116d26575203d142b79472fe..370d6d33b94125783c2ea3fbed0b1c2a1fe41640 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 b31b3291a0caff74bff5a90ed0ebd9f2bfca6dac..745c4a658970f241e8a1f80279e771d820002f20 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 09547e90254e9183ef5d36b0ae9f543ab689610c..efa2332c94e36d63bd2596bb532a0343fa6ca78b 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 b54981d8b155859fb9e60adc68dc225b1d76d45d..7a4bf26e89c025df3347fcf4cd860e2efb3488af 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 5b277828419d9b1b223567db318152a69a7f490f..e7c4997c674c036b8902ede6f69a764720c60760 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 3aa7af0f3b1168433daba5814c60eecca46e295b..0ec884d0236a0ec2114f74678163dd2230147e30 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 34288eeceeebac3a833c957f7d8d0936dae10a00..658e418b8679d8d7f08319b577014688f6971b38 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 d0158b83f0644bfd4c90ad0e63f961a21d9c0255..135ec4712e665145f857c306700bf0b3941a996b 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.",
"",
"",
"",