Updated copyright notices.

51 files changed, 284 insertions, 82 deletions

diff --git a/FAQ b/FAQ
index ddd87ea..24f94ca 100644
--- a/FAQ
+++ b/FAQ
@@ -1,6 +1,12 @@
 -*- outline -*-
 Ratpoison Frequently Asked Questions
 
+Copyright (C) 2000-2004 Shawn Betts
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.
+
 * Conceptual Questions
 ** Where does the name `ratpoison' come from?
 
diff --git a/Makefile.am b/Makefile.am
index ae76319..8069b93 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-## Copyright (C) 2000, 2001 Shawn Betts <sabetts@users.sourceforge.net>
+## Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
 ##
 ## This file is part of ratpoison.
 ##
@@ -17,7 +17,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
-## $Id: Makefile.am,v 1.9 2001/09/16 09:48:43 sabetts Exp $
+## $Id: Makefile.am,v 1.10 2004/12/02 00:22:38 sabetts Exp $
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
diff --git a/NEWS b/NEWS
index 532178a..6c2a15b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 ratpoison NEWS --- history of user-visible changes.  -*- outline -*-
 
+Copyright (C) 2000-2004 Shawn Betts
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.
+
 * Changes since 1.3.0
 ** version now displays the date and time
 
diff --git a/README b/README
index 1e5cdea..83bd162 100644
--- a/README
+++ b/README
@@ -1,6 +1,12 @@
 Ratpoison - Say good-bye to the rodent
 --------------------------------------
 
+Copyright (C) 2000-2004 Shawn Betts
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.
+
 About
 -----
 
diff --git a/autogen.sh b/autogen.sh
index af80ec0..1071eac 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,24 @@
 #!/bin/sh
-
+# Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
+#
+# This file is part of ratpoison.
+#
+# ratpoison 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 2 of the License, or
+# (at your option) any later version.
+#
+# ratpoison is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# $Id: autogen.sh,v 1.6 2004/12/02 00:22:38 sabetts Exp $
+#
 # usage: ./autogen.sh [-f]
 # option "-f" means forcefully create symlinks for missing files
 #                   (by default: copies are made only if necessary)
diff --git a/configure.in b/configure.in
index 5bc3ffa..b50a25f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl Copyright (C) 2000, 2001 Shawn Betts <sabetts@users.sourceforge.net>
+dnl Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
 dnl
 dnl This file is part of ratpoison.
 dnl
@@ -17,7 +17,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 dnl
-dnl $Id: configure.in,v 1.47 2004/11/12 01:55:04 sabetts Exp $
+dnl $Id: configure.in,v 1.48 2004/12/02 00:22:38 sabetts Exp $
 
 AC_INIT(src/main.c)
 AM_INIT_AUTOMAKE(ratpoison, 1.3.1-CVS)
diff --git a/doc/ratpoison.texi b/doc/ratpoison.texi
index c9a35b8..a555136 100644
--- a/doc/ratpoison.texi
+++ b/doc/ratpoison.texi
@@ -13,11 +13,14 @@
 @ifinfo
 This is the ratpoison user manual.
 
-Copyright @copyright{} 2000, 2001 Shawn Betts
+Copyright @copyright{} 2000-2004 Shawn Betts
 
-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.
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
+copy of the license is included in the section entitled "GNU Free
+Documentation License".
 
 @ignore
 Permission is granted to process this file through TeX
@@ -27,20 +30,12 @@ one except for the removal of this paragraph (this
 paragraph not being relevant to the printed manual).
 
 @end ignore
-Permission is granted to copy and distribute modified
-versions of this manual under the conditions for
-verbatim copying, provided also that the sections
-entitled ``Copying'' and ``GNU General Public License''
-are included exactly as in the original, and 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 Free Software Foundation.
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
+copy of the license is included in the section entitled "GNU Free
+Documentation License".
 @end ifinfo
 
 @titlepage
@@ -50,26 +45,14 @@ translation approved by the Free Software Foundation.
 
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 2000, 2001 Shawn Betts
-
-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.
-
-Permission is granted to copy and distribute modified
-versions of this manual under the conditions for
-verbatim copying, provided also that the sections
-entitled ``Copying'' and ``GNU General Public License''
-are included exactly as in the original, and 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 Free Software Foundation.
+Copyright @copyright{} 2000-2004 Shawn Betts
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
+copy of the license is included in the section entitled "GNU Free
+Documentation License".
 @end titlepage
 
 @node Top, About, (dir), (dir)
diff --git a/src/Makefile.am b/src/Makefile.am
index c295497..3efb703 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-## Copyright (C) 2000, 2001 Shawn Betts <sabetts@users.sourceforge.net>
+## Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
 ##
 ## This file is part of ratpoison.
 ##
@@ -17,7 +17,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
-## $Id: Makefile.am,v 1.20 2004/02/27 08:28:17 sabetts Exp $
+## $Id: Makefile.am,v 1.21 2004/12/02 00:22:39 sabetts Exp $
 
 bin_PROGRAMS		= ratpoison
 
diff --git a/src/actions.c b/src/actions.c
index 0cfe727..f47c3d8 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+/* Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/actions.h b/src/actions.h
index 84237a7..67d3157 100644
--- a/src/actions.h
+++ b/src/actions.h
@@ -1,5 +1,5 @@
 /* Prototypes of all actions that can be performed with keystrokes.
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/bar.c b/src/bar.c
index bbd39a2..080bf9b 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -1,7 +1,7 @@
 /* Functionality for a bar across the bottom of the screen listing the
  * windows currently managed. 
  *
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/bar.h b/src/bar.h
index e1e13fc..26232c0 100644
--- a/src/bar.h
+++ b/src/bar.h
@@ -1,5 +1,5 @@
 /* functions for managing the program bar
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/communications.c b/src/communications.c
index 58a6841..6926053 100644
--- a/src/communications.c
+++ b/src/communications.c
@@ -1,5 +1,5 @@
 /* communications.c -- Send commands to a running copy of ratpoison.
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/communications.h b/src/communications.h
index c371282..f24d6ae 100644
--- a/src/communications.h
+++ b/src/communications.h
@@ -1,5 +1,5 @@
 /* communications.h -- Send commands to a running copy of ratpoison.
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/completions.c b/src/completions.c
index 1347e7c..e537a05 100644
--- a/src/completions.c
+++ b/src/completions.c
@@ -1,3 +1,23 @@
+/* Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
+ *
+ * This file is part of ratpoison.
+ *
+ * ratpoison 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 2, or (at your option)
+ * any later version.
+ *
+ * ratpoison is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
+ */
+
 #include <string.h>
 
 #include "ratpoison.h"
diff --git a/src/completions.h b/src/completions.h
index 807bc97..8496995 100644
--- a/src/completions.h
+++ b/src/completions.h
@@ -1,4 +1,21 @@
-/* Function prototypes.
+/* Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
+ *
+ * This file is part of ratpoison.
+ *
+ * ratpoison 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 2, or (at your option)
+ * any later version.
+ *
+ * ratpoison is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
  */
 
 #ifndef _RATPOISON_COMPLETIONS_H
diff --git a/src/conf.h b/src/conf.h
index c47cc8b..6bd6e3e 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,5 +1,5 @@
 /* Config file for ratpoison. Edit these values and recompile. 
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/data.h b/src/data.h
index f8086e5..3aa1d64 100644
--- a/src/data.h
+++ b/src/data.h
@@ -1,5 +1,5 @@
 /* our datatypes and global variables 
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/editor.c b/src/editor.c
index 3828d2f..b02cd6a 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -1,3 +1,23 @@
+/* Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
+ *
+ * This file is part of ratpoison.
+ *
+ * ratpoison 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 2, or (at your option)
+ * any later version.
+ *
+ * ratpoison is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
+ */
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/editor.h b/src/editor.h
index fdcc08b..605b2cd 100644
--- a/src/editor.h
+++ b/src/editor.h
@@ -1,3 +1,23 @@
+/* Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
+ *
+ * This file is part of ratpoison.
+ *
+ * ratpoison 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 2, or (at your option)
+ * any later version.
+ *
+ * ratpoison is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
+ */
+
 #ifndef _RATPOISON_EDITOR_H
 #define _RATPOISON_EDITOR_H 1
 
diff --git a/src/events.c b/src/events.c
index 98f3a17..d41b113 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1,5 +1,5 @@
 /* Ratpoison X events
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/events.h b/src/events.h
index de7284d..e9489a1 100644
--- a/src/events.h
+++ b/src/events.h
@@ -1,5 +1,5 @@
 /* Function prototypes
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/frame.c b/src/frame.c
index b44f7c5..0ea4b3f 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1,5 +1,5 @@
 /* functions that manipulate the frame structure.
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/frame.h b/src/frame.h
index e3147c7..66f10f9 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+/* Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/globals.c b/src/globals.c
index d57721e..7f419e7 100644
--- a/src/globals.c
+++ b/src/globals.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+/* Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/globals.h b/src/globals.h
index 6dd0136..d854345 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+/* Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/group.c b/src/group.c
index 43fab12..45ae710 100644
--- a/src/group.c
+++ b/src/group.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+/* Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/group.h b/src/group.h
index c314f20..7da1816 100644
--- a/src/group.h
+++ b/src/group.h
@@ -1,3 +1,23 @@
+/* Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
+ *
+ * This file is part of ratpoison.
+ *
+ * ratpoison 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 2, or (at your option)
+ * any later version.
+ *
+ * ratpoison is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
+ */
+
 #ifndef GROUP_H
 #define GROUP_H
 
diff --git a/src/history.c b/src/history.c
index 668d9c4..cf427cf 100644
--- a/src/history.c
+++ b/src/history.c
@@ -1,3 +1,23 @@
+/* Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
+ *
+ * This file is part of ratpoison.
+ *
+ * ratpoison 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 2, or (at your option)
+ * any later version.
+ *
+ * ratpoison is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
+ */
+
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>
diff --git a/src/history.h b/src/history.h
index f206cba..0f5c0e7 100644
--- a/src/history.h
+++ b/src/history.h
@@ -1,3 +1,23 @@
+/* Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
+ *
+ * This file is part of ratpoison.
+ *
+ * ratpoison 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 2, or (at your option)
+ * any later version.
+ *
+ * ratpoison is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
+ */
+
 #ifndef _RATPOISON_HISTORY_H
 #define _RATPOISON_HISTORY_H 1
 
diff --git a/src/hook.c b/src/hook.c
index 071a023..f3a1b35 100644
--- a/src/hook.c
+++ b/src/hook.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+/* Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/hook.h b/src/hook.h
index 60f37ae..e14d5a8 100644
--- a/src/hook.h
+++ b/src/hook.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+/* Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/input.c b/src/input.c
index 626acad..8cf0ef5 100644
--- a/src/input.c
+++ b/src/input.c
@@ -1,5 +1,5 @@
 /* Read kdb input from the user.
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/input.h b/src/input.h
index 149979f..d1b3fa3 100644
--- a/src/input.h
+++ b/src/input.h
@@ -1,5 +1,5 @@
 /* Function prototypes.
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/linkedlist.c b/src/linkedlist.c
index 21df745..ecb56eb 100644
--- a/src/linkedlist.c
+++ b/src/linkedlist.c
@@ -1,3 +1,27 @@
+/* This file was taken from the Linux kernel and is 
+ * Copyright (C) 2003 Linus Torvalds
+ *
+ * Modified by Shawn Betts. Portions created by Shawn Betts are
+ * Copyright (C) 2003-2004 Shawn Betts
+ *
+ * This file is part of ratpoison.
+ *
+ * ratpoison 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 2, or (at your option)
+ * any later version.
+ * 
+ * ratpoison is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
+ */
+
 #include "linkedlist.h"
 
 void
diff --git a/src/linkedlist.h b/src/linkedlist.h
index a056093..e8d1322 100644
--- a/src/linkedlist.h
+++ b/src/linkedlist.h
@@ -1,5 +1,25 @@
-/*
- * Borrowed from the Linux kernel.
+/* This file was taken from the Linux kernel and is 
+ * Copyright (C) 2003 Linus Torvalds
+ *
+ * Modified by Shawn Betts. Portions created by Shawn Betts are
+ * Copyright (C) 2003-2004 Shawn Betts
+ *
+ * This file is part of ratpoison.
+ *
+ * ratpoison 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 2, or (at your option)
+ * any later version.
+ * 
+ * ratpoison is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
  */
 
 #ifndef _RATPOISON_LINKLIST_H
diff --git a/src/main.c b/src/main.c
index 90f2ab9..8742acf 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /* Ratpoison.
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/manage.c b/src/manage.c
index 3ee8b21..87407d1 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -1,6 +1,7 @@
 /* Manage windows, such as Mapping them and making sure the proper key
  * Grabs have been put in place.
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ *
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/manage.h b/src/manage.h
index cfd44ed..69fcd3f 100644
--- a/src/manage.h
+++ b/src/manage.h
@@ -1,5 +1,5 @@
 /* manage.h 
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/messages.h b/src/messages.h
index 649a3be..5c7f46c 100644
--- a/src/messages.h
+++ b/src/messages.h
@@ -1,5 +1,5 @@
 /* Ratpoison messages.
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/number.c b/src/number.c
index 37e0293..27f57d0 100644
--- a/src/number.c
+++ b/src/number.c
@@ -1,5 +1,5 @@
 /* handles the handing out of and uniqueness of window numbers.
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/number.h b/src/number.h
index 53bf4d2..3b89b37 100644
--- a/src/number.h
+++ b/src/number.h
@@ -1,5 +1,5 @@
 /* Function prototypes.
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/ratpoison.h b/src/ratpoison.h
index 26ee77a..8896f4a 100644
--- a/src/ratpoison.h
+++ b/src/ratpoison.h
@@ -1,5 +1,5 @@
 /* Standard header for ratpoison.
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/sbuf.c b/src/sbuf.c
index 52af83e..662fd64 100644
--- a/src/sbuf.c
+++ b/src/sbuf.c
@@ -1,5 +1,5 @@
 /* Functions for handling string buffers.
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/sbuf.h b/src/sbuf.h
index 22fe975..23d56d1 100644
--- a/src/sbuf.h
+++ b/src/sbuf.h
@@ -1,5 +1,5 @@
 /* Function prototypes for handling string buffers.
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/screen.c b/src/screen.c
index cf88895..095bb48 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+/* Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/screen.h b/src/screen.h
index b7c4fc1..04fbd8c 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+/* Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/split.c b/src/split.c
index 3d5c3a1..8eb00e0 100644
--- a/src/split.c
+++ b/src/split.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+/* Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/split.h b/src/split.h
index fee3af8..e0f7983 100644
--- a/src/split.h
+++ b/src/split.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+/* Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/window.c b/src/window.c
index 5ba5454..3cfa107 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1,5 +1,5 @@
 /* functions for handling the window list 
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *
diff --git a/src/window.h b/src/window.h
index f0ec828..a778cee 100644
--- a/src/window.h
+++ b/src/window.h
@@ -1,5 +1,5 @@
 /* functions for managing the window list 
- * Copyright (C) 2000, 2001, 2002, 2003 Shawn Betts
+ * Copyright (C) 2000-2004 Shawn Betts <sabetts@vcn.bc.ca>
  *
  * This file is part of ratpoison.
  *