Updated the copyright declaration in several modules, removing any language which...

diff --git a/citadel/COPYING b/citadel/COPYING
index 042bd7127ef602c477301874ea2b410d36f79016..6b5859481fafff60c7d5d003acbe59a53d2e1192 100644 (file)
--- a/citadel/COPYING
+++ b/citadel/COPYING
@@ -34,14 +34,13 @@ Copyright for RFC 2739 openldap schema:
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+Everyone is permitted to copy and distribute verbatim copies of this
+license document.
 
                             Preamble
 
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
+  The GNU General Public License is an open source license for software.
 
   The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,

diff --git a/citadel/event_client.h b/citadel/event_client.h
index 320beb746cb3a6e7d72e53e6a399050261030ef2..9c13039914c6338c49512a456629913828333470 100644 (file)
--- a/citadel/event_client.h
+++ b/citadel/event_client.h
@@ -3,18 +3,12 @@
  * Copyright (c) 1998-2012 by the citadel.org team
  *
  *  This program is open source 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 of the License, or
- *  (at your option) any later version.
+ *  it under the terms of the GNU General Public License, version 3.
  *
  *  This program 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
  */
 
 #ifndef __EVENT_CLIENT_H__