Update the licensing information to require version 2 of the GPL

(instead of version 2 or any later version).

svn path=/trunk/; revision=14190

23 files changed, 46 insertions, 46 deletions

diff --git a/e-util/e-bonobo-factory-util.c b/e-util/e-bonobo-factory-util.c
index 9b67f64fd1..da6cfc085f 100644
--- a/e-util/e-bonobo-factory-util.c
+++ b/e-util/e-bonobo-factory-util.c
@@ -4,9 +4,9 @@
  * Copyright (C) 2001 Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-bonobo-factory-util.h b/e-util/e-bonobo-factory-util.h
index e4aefd1f42..1ce471fba7 100644
--- a/e-util/e-bonobo-factory-util.h
+++ b/e-util/e-bonobo-factory-util.h
@@ -4,9 +4,9 @@
  * Copyright (C) 2001 Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-corba-utils.c b/e-util/e-corba-utils.c
index 8245b91986..3de17b1954 100644
--- a/e-util/e-corba-utils.c
+++ b/e-util/e-corba-utils.c
@@ -5,9 +5,9 @@
  * Author: Ettore Perazzoli <ettore@ximian.com>
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-corba-utils.h b/e-util/e-corba-utils.h
index 1281f86876..8dc8478fe1 100644
--- a/e-util/e-corba-utils.h
+++ b/e-util/e-corba-utils.h
@@ -5,9 +5,9 @@
  * Author: Ettore Perazzoli <ettore@ximian.com>
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index 68f0abfde8..890d5d5529 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -4,9 +4,9 @@
  * Copyright (C) 2001  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-dialog-utils.h b/e-util/e-dialog-utils.h
index b92808d386..bfd36890d6 100644
--- a/e-util/e-dialog-utils.h
+++ b/e-util/e-dialog-utils.h
@@ -4,9 +4,9 @@
  * Copyright (C) 2001  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-gtk-utils.c b/e-util/e-gtk-utils.c
index f865dabf8d..c85469af52 100644
--- a/e-util/e-gtk-utils.c
+++ b/e-util/e-gtk-utils.c
@@ -4,9 +4,9 @@
  * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-gtk-utils.h b/e-util/e-gtk-utils.h
index 4ab95e5b68..21097d5d36 100644
--- a/e-util/e-gtk-utils.h
+++ b/e-util/e-gtk-utils.h
@@ -4,9 +4,9 @@
  * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-host-utils.c b/e-util/e-host-utils.c
index 968063f398..d58b1ee737 100644
--- a/e-util/e-host-utils.c
+++ b/e-util/e-host-utils.c
@@ -4,9 +4,9 @@
  * Copyright (C) 2001  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-host-utils.h b/e-util/e-host-utils.h
index 948209f112..b2f08ca359 100644
--- a/e-util/e-host-utils.h
+++ b/e-util/e-host-utils.h
@@ -4,9 +4,9 @@
  * Copyright (C) 2001  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index 7593bb967e..e65e611cbe 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -4,9 +4,9 @@
  * Author: Dan Winship <danw@ximian.com>
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-html-utils.h b/e-util/e-html-utils.h
index 812fe06d58..dfec48e20d 100644
--- a/e-util/e-html-utils.h
+++ b/e-util/e-html-utils.h
@@ -5,9 +5,9 @@
  * Author: Dan Winship <danw@ximian.com>
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-memory.c b/e-util/e-memory.c
index 4a2764e407..1dd465cf68 100644
--- a/e-util/e-memory.c
+++ b/e-util/e-memory.c
@@ -5,9 +5,9 @@
  *	    Jacob Berkman <jacob@ximian.com>
  *
  * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
+ * modify it under the terms of version 2 of the GNU General Public 
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-memory.h b/e-util/e-memory.h
index c609a896be..e8e61bde4e 100644
--- a/e-util/e-memory.h
+++ b/e-util/e-memory.h
@@ -5,9 +5,9 @@
  *	    Jacob Berkman <jacob@ximian.com>
  *
  * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
+ * modify it under the terms of version 2 of the GNU General Public 
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-passwords.c b/e-util/e-passwords.c
index 363c5592c7..6cc216c2c0 100644
--- a/e-util/e-passwords.c
+++ b/e-util/e-passwords.c
@@ -8,9 +8,9 @@
 
 /*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-passwords.h b/e-util/e-passwords.h
index 30de524242..a5c7b5e8ac 100644
--- a/e-util/e-passwords.h
+++ b/e-util/e-passwords.h
@@ -6,9 +6,9 @@
 
 /*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-path.c b/e-util/e-path.c
index 22b370b436..bb3b5994d5 100644
--- a/e-util/e-path.c
+++ b/e-util/e-path.c
@@ -4,9 +4,9 @@
  * Copyright (C) 2001 Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-path.h b/e-util/e-path.h
index 50a3507363..13048411b8 100644
--- a/e-util/e-path.h
+++ b/e-util/e-path.h
@@ -3,9 +3,9 @@
  * Copyright (C) 2001 Ximian, Inc.
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-request.c b/e-util/e-request.c
index 09634eb32b..d920df6356 100644
--- a/e-util/e-request.c
+++ b/e-util/e-request.c
@@ -4,9 +4,9 @@
  * Copyright (C) 2000, 2001 Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-request.h b/e-util/e-request.h
index f4404b83d5..953e9da749 100644
--- a/e-util/e-request.h
+++ b/e-util/e-request.h
@@ -4,9 +4,9 @@
  * Copyright (C) 2000, 2001 Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-sexp.c b/e-util/e-sexp.c
index e8b100808f..72a68ff97c 100644
--- a/e-util/e-sexp.c
+++ b/e-util/e-sexp.c
@@ -7,9 +7,9 @@
  *  Michael Zucchi <notzed@ximian.com>
 
  * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
+ * modify it under the terms of version 2 of the GNU General Public 
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-url.c b/e-util/e-url.c
index 8054ba897a..1d7fe12ef3 100644
--- a/e-util/e-url.c
+++ b/e-util/e-url.c
@@ -11,9 +11,9 @@
 
 /*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/e-util/e-url.h b/e-util/e-url.h
index d776bb4b08..aa9c74c7c3 100644
--- a/e-util/e-url.h
+++ b/e-util/e-url.h
@@ -11,9 +11,9 @@
 
 /*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of version 2 of the GNU General Public
  * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of