More license declaration changes which omit the bit about getting in touch with confi...

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index 8b5b97973cafec8c926a642fbc293f6302574546..887198f574d24d2a4dc9d51d9672c5b1ece91905 100644 (file)
--- a/webcit/addressbook_popup.c
+++ b/webcit/addressbook_popup.c
@@ -1,20 +1,15 @@
 /*
  * AJAX-powered auto-completion
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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, see <http://www.gnu.org/licenses/>.
  */
 
 #include "webcit.h"

diff --git a/webcit/auth.c b/webcit/auth.c
index c21bf1374a646fdf70f844715517519387e7903c..e5275104dc9c52d1d03b6427a73aebdf674fc930 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -1,20 +1,15 @@
 /*
  * These functions handle authentication of users to a Citadel server.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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, see <http://www.gnu.org/licenses/>.
  */
 
 #include "webcit.h"

diff --git a/webcit/autocompletion.c b/webcit/autocompletion.c
index e1bf1ab979d90ba5a1ec1bad38aa3a10127135f7..009df23821418e9e5638fe7d6d9eb382f1102bda 100644 (file)
--- a/webcit/autocompletion.c
+++ b/webcit/autocompletion.c
@@ -1,20 +1,15 @@
 /*
  * ajax-powered autocompletion...
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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, see <http://www.gnu.org/licenses/>.
  */
 
 #include "webcit.h"

diff --git a/webcit/availability.c b/webcit/availability.c
index 3d49f1f550c1ea5ba59f5a142404d1e474f7e028..3e8bfa2e51004a3a95cbbde85294b4c90bb9a59a 100644 (file)
--- a/webcit/availability.c
+++ b/webcit/availability.c
@@ -1,19 +1,13 @@
 /*
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
  */
 
 

diff --git a/webcit/bbsview_renderer.c b/webcit/bbsview_renderer.c
index 8bed3af37ddae02e57728da12e16119607de7b82..a577bc95f8ad3ee4a4fc05bc8e04ed9c7e114238 100644 (file)
--- a/webcit/bbsview_renderer.c
+++ b/webcit/bbsview_renderer.c
@@ -6,21 +6,15 @@
  * with it, go get commit dcf99fe61379b78436c387ea3f89ebfd4ffaf635 of
  * bbsview_renderer.c and have fun.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
  */
 
 #define RANGE 5

diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c
index 70fa908ae97b9e787a0c554a1cac6cba6e3d2e55..3e05a377cb0b93c1d893bf69347f32c4e401f2c2 100644 (file)
--- a/webcit/blogview_renderer.c
+++ b/webcit/blogview_renderer.c
@@ -1,21 +1,15 @@
 /* 
  * Blog view renderer module for WebCit
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
  */
 
 #include "webcit.h"

diff --git a/webcit/calendar.c b/webcit/calendar.c
index 2897ba20188d9a007eeb1623af1fee2709f5e3e7..58b00a84ef383cf208196bdf59a438ba2dc0fd4d 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -1,21 +1,21 @@
 /*
  * Functions which handle calendar objects and their processing/display.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/calendar.h b/webcit/calendar.h
index b71786396006194cdf845529dc0803100f20293f..a5571a0e49c98dff0e7afef05a606356d83965d2 100644 (file)
--- a/webcit/calendar.h
+++ b/webcit/calendar.h
@@ -1,19 +1,19 @@
 /*
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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 __CALENDAR_H__

diff --git a/webcit/calendar_tools.c b/webcit/calendar_tools.c
index b6dd7390cb83ae9f6608ffd407d0e8867391919c..17dc4a739a7e02d1ae17bc5700abfff27a74eb7a 100644 (file)
--- a/webcit/calendar_tools.c
+++ b/webcit/calendar_tools.c
@@ -1,21 +1,21 @@
 /*
  * Miscellaneous functions which handle calendar components.
  *
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index c8820b22c6333092e972889fc79f4bfaae8b7e6f..c5c140f3f25d1caf01837fd3465e854023004212 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -1,21 +1,21 @@
 /*
  * Handles the HTML display of calendar items.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/config.guess b/webcit/config.guess
index 40eaed4821ec09567afae2b5e90cdc7aa2a55082..9f957ac768efa37250e969fe00b64c5b8c8470c0 100755 (executable)
--- a/webcit/config.guess
+++ b/webcit/config.guess
@@ -7,17 +7,17 @@
 timestamp='2011-05-11'
 
 # This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
+# under the terms of the GNU General Public License, version 3.
 # the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# 
 #
 # 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., 51 Franklin Street - Fifth Floor, Boston, MA
 # 02110-1301, USA.
 #

diff --git a/webcit/config.rpath b/webcit/config.rpath
index 4db13e50f66ff3cb15db9f82394b13aa48a7d8e6..39a3e15084d9d940d4cf06c49e75cf55d36d4650 100755 (executable)
--- a/webcit/config.rpath
+++ b/webcit/config.rpath
@@ -7,17 +7,17 @@
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 #   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
+#   it under the terms of the GNU General Public License, version 3.
 #   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
+#   
 #
 #   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.
 #
 #   As a special exception to the GNU General Public License, if you

diff --git a/webcit/config.sub b/webcit/config.sub
index 30fdca81215f7b8a3e71430dc026507740b2c900..d29b459eb8002beae52c9258fe92b23b11179e8b 100755 (executable)
--- a/webcit/config.sub
+++ b/webcit/config.sub
@@ -11,17 +11,17 @@ timestamp='2011-03-23'
 # can handle that machine.  It does not imply ALL GNU software can.
 #
 # This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
+# it under the terms of the GNU General Public License, version 3.
 # the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# 
 #
 # 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., 51 Franklin Street - Fifth Floor, Boston, MA
 # 02110-1301, USA.
 #

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index dc74601e1b9ecdf4cb161275c7b046efc21ceb29..785fdb6aa4996b504d3709c9df80b99a9f8fba10 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -4,7 +4,7 @@
  * keep track of things.  If the HTTP request doesn't belong to any currently
  * active session, a new session is started.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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 version 3.

diff --git a/webcit/cookie_conversion.c b/webcit/cookie_conversion.c
index b0dffbe58247b2d217f43df6cc52b3aef31c5e6d..1c7e72db1c3169e5614d9416968d1d10b95d962a 100644 (file)
--- a/webcit/cookie_conversion.c
+++ b/webcit/cookie_conversion.c
@@ -1,19 +1,19 @@
 /*
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/crypto.c b/webcit/crypto.c
index 61c2366f9ec9ea509355fd02ddb0e559393bd013..71d8bdfc133e13d0bf4f3ba4eb70730c1c59063f 100644 (file)
--- a/webcit/crypto.c
+++ b/webcit/crypto.c
@@ -1,19 +1,19 @@
 /*
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "sysdep.h"

diff --git a/webcit/dav_delete.c b/webcit/dav_delete.c
index 126eadeddf0c53d41ce69bc4a36cc8c009adb292..6673172ba1119e076d0bd08565f5c316f9d8c31a 100644 (file)
--- a/webcit/dav_delete.c
+++ b/webcit/dav_delete.c
@@ -1,21 +1,21 @@
 /*
  * Handles GroupDAV DELETE requests.
  *
- * Copyright (c) 2005-2010 by the citadel.org team
+ * Copyright (c) 2005-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/dav_get.c b/webcit/dav_get.c
index 178b0c3ea712619c78bdb29c0bc8987187dc7406..204b71f1cc44df2a0c4640a3ffb1f426aba3c835 100644 (file)
--- a/webcit/dav_get.c
+++ b/webcit/dav_get.c
@@ -1,21 +1,21 @@
 /*
  * Handles GroupDAV GET requests.
  *
- * Copyright (c) 2005-2010 by the citadel.org team
+ * Copyright (c) 2005-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/dav_main.c b/webcit/dav_main.c
index f923a37b715e6e614964345d8d7232920c139f4f..8f16c0b24d4954786be1e62ea2827d41924f575d 100644 (file)
--- a/webcit/dav_main.c
+++ b/webcit/dav_main.c
@@ -1,21 +1,21 @@
 /*
  * Entry point for GroupDAV functions
  *
- * Copyright (c) 2005-2011 by the citadel.org team
+ * Copyright (c) 2005-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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/dav_options.c b/webcit/dav_options.c
index 250a3ce124b0453dac338e87d0f7fc6acef1cb6b..795794108e7c1af90461fae0b75601037dcf9408 100644 (file)
--- a/webcit/dav_options.c
+++ b/webcit/dav_options.c
@@ -4,18 +4,18 @@
  * Copyright (c) 2005-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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/dav_put.c b/webcit/dav_put.c
index e2a29d15cb64cf4c45ee83d7edd125dfaff7ce84..548699bd4626e04f2f499b16783f415325e74039 100644 (file)
--- a/webcit/dav_put.c
+++ b/webcit/dav_put.c
@@ -1,21 +1,21 @@
 /*
  * Handles GroupDAV PUT requests.
  *
- * Copyright (c) 2005-2010 by the citadel.org team
+ * Copyright (c) 2005-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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/debian/copyright b/webcit/debian/copyright
index 6776133ecb9df9cf3e20e69bd097186d1971cd59..63d156d8488e5d55fd092dfa7b75b5fbc5308a5a 100644 (file)
--- a/webcit/debian/copyright
+++ b/webcit/debian/copyright
@@ -68,7 +68,7 @@ TinyMCE license:
     This package is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
+    version 2 of the 
 
     This package is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -85,16 +85,16 @@ Public License can be found in `/usr/share/common-licenses/LGPL'.
 WebCit license:
 
    This package 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 of the License, or
-   (at your option) any later version.
+   it under the terms of the GNU General Public License, version 3.
+   
+   
 
    This package 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 package; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 

diff --git a/webcit/decode.c b/webcit/decode.c
index c079ac4a813d1f0a15e7c233037f90f025df6c5f..c3d0a8ed72a7fa6f17a775b9c6720f40cfedb824 100644 (file)
--- a/webcit/decode.c
+++ b/webcit/decode.c
@@ -1,19 +1,19 @@
 /*
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/downloads.c b/webcit/downloads.c
index 9c1050522d5a043bcf13d57ec6a80a307f0ee969..eb01d64d051404a6ce62308717ecd0496fa002e6 100644 (file)
--- a/webcit/downloads.c
+++ b/webcit/downloads.c
@@ -1,19 +1,19 @@
 /*
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/event.c b/webcit/event.c
index f5f1fecd0ebbee6a2194499c209007dbfb7a1da7..756a8a250dcd7b2617974c138a85fdb67ba83f1b 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -1,21 +1,21 @@
 /*
  * Editing calendar events.
  *
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/feed_generator.c b/webcit/feed_generator.c
index 7830eaae69a78f808a19bfd75c89fcba1cca3aeb..2be5e1f7492dd326e24ac4d454fd060ecdb55a9b 100644 (file)
--- a/webcit/feed_generator.c
+++ b/webcit/feed_generator.c
@@ -1,21 +1,21 @@
 /*
  * RSS feed generator (could be adapted in the future to feed both RSS and Atom)
  *
- * Copyright (c) 2010-2011 by the citadel.org team
+ * Copyright (c) 2010-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/fmt_date.c b/webcit/fmt_date.c
index 15e5673ca25756813f6529f6fff6d6aa4e21bb5e..d76f622737499d89445c20a5e6ae04ec2ab3c0bb 100644 (file)
--- a/webcit/fmt_date.c
+++ b/webcit/fmt_date.c
@@ -1,19 +1,19 @@
 /*
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 00fc5f052790864e7217d6d0f64cdb4a00f0c80b..c4cd663e13d2d86d3af4932bc6e7b5b103d1d027 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -1,21 +1,21 @@
 /*
  * Handles HTTP upload of graphics files into the system.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/html2html.c b/webcit/html2html.c
index 82962daed14417b5187a263bdf688058bad28b13..659f454c33e409c6c0a5521bd68a70fca3a1ffcd 100644 (file)
--- a/webcit/html2html.c
+++ b/webcit/html2html.c
@@ -2,20 +2,20 @@
  * Output an HTML message, modifying it slightly to make sure it plays nice
  * with the rest of our web framework.
  *
- * Copyright (c) 2005-2011 by the citadel.org team
+ * Copyright (c) 2005-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
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/ical_subst.c b/webcit/ical_subst.c
index 003ce11ec08645bf5b4c7002d8d7839ca70dc05f..edd0ff150f75f9daab5105fd8858f8be4e3a4156 100644 (file)
--- a/webcit/ical_subst.c
+++ b/webcit/ical_subst.c
@@ -1,19 +1,19 @@
 /*
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 7a6e39d1ac477d9da041872a5892a931e79d52a6..53dead7a2bbe9d5b2d796a082f83a64fb60a6171 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -1,21 +1,21 @@
 /*
  * Displays and customizes the iconbar.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/listsub.c b/webcit/listsub.c
index d4de61bb227897868d0538d07d9972146cd5c33e..9896b5811865595e37db36f43e421239ffd7d47f 100644 (file)
--- a/webcit/listsub.c
+++ b/webcit/listsub.c
@@ -1,21 +1,21 @@
 /*
  * Web forms for handling mailing list subscribe/unsubscribe requests.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/locate_host.c b/webcit/locate_host.c
index 0c173b50424998ee32aadfa5ffcebd2cce508225..416082678cf4d04dda7471abee06ac88be226e39 100644 (file)
--- a/webcit/locate_host.c
+++ b/webcit/locate_host.c
@@ -1,21 +1,21 @@
 /*
  * Given a socket, supply the name of the host at the other end.
  *
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/messages.c b/webcit/messages.c
index 6af7002b58a4d29288e74584395559587b5bae67..0c4786c87c8760850e2c86f96616d04baabcad07 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -1,21 +1,21 @@
 /*
  * Functions which deal with the fetching and displaying of messages.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/missing b/webcit/missing
index cbe2b0ef0e3aa005628a84fb179c341db985f7dc..c15067bf61363ff59e772bed654471fc78433d85 100755 (executable)
--- a/webcit/missing
+++ b/webcit/missing
@@ -4,7 +4,7 @@
 # Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # 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
+# it under the terms of the GNU General Public License, version 3.
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 
@@ -13,8 +13,8 @@
 # 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.
 

diff --git a/webcit/openid.c b/webcit/openid.c
index eaaa40100af4457f6b72ea34f8d8dd10426e9a5b..c9c0464e8f4b601d78ddde436580a18a5f2fcd95 100644 (file)
--- a/webcit/openid.c
+++ b/webcit/openid.c
@@ -1,19 +1,19 @@
 /*
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/paging.c b/webcit/paging.c
index efece86ba6d415e0cd3096b56bdae60e844e612a..c5acde81fb8a35c1d7f2ce796258e8e95f811959 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -1,21 +1,21 @@
 /*
  * This module handles instant message related functions.
  *
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/paramhandling.c b/webcit/paramhandling.c
index aadadab9f2a1fa7566e925ac7a7d8a8a2b31d850..453ac052a065408706613c801470dd1767ffa260 100644 (file)
--- a/webcit/paramhandling.c
+++ b/webcit/paramhandling.c
@@ -1,21 +1,21 @@
 /*
  * parse urlparts and post data
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/po/webcit/es.po b/webcit/po/webcit/es.po
index 6f14e0687a5088324777103dbd94edecd8021496..6224176449156fe4ec214c5bf7e80491fb6547f7 100644 (file)
--- a/webcit/po/webcit/es.po
+++ b/webcit/po/webcit/es.po
@@ -5,7 +5,7 @@
 # Spanish translation
 # Copyright (C) 2005 - 2009 By Gabriel C. Huertas
 # This file is distributed under the GNU General Public License;
-# either Version 2 or (at your option) any later version.
+# either Version 2 or 
 #
 msgid ""
 msgstr ""

diff --git a/webcit/preferences.c b/webcit/preferences.c
index 25db016ee6f7fda9cd0c47e08329d4d51094e82a..bf7bacbe59767c6f01f609f4faad3791a8ef683c 100644 (file)
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -1,21 +1,21 @@
 /*
  * Manage user preferences with a little help from the Citadel server.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 

diff --git a/webcit/roomchat.c b/webcit/roomchat.c
index 97e693c1e823808bc66e89c6cd9a9f16fe4c4735..e2acc7b0c6126afc943acbd3bb0940a22b0ada97 100644 (file)
--- a/webcit/roomchat.c
+++ b/webcit/roomchat.c
@@ -1,21 +1,21 @@
 /*
  * This module handles multiuser chat.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/roomops.c b/webcit/roomops.c
index b6fdaa8df8113f5154a3bddd45c2e60050fcb920..0777eefe33d619c4131500dfc54c0beffd06a084 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -1,21 +1,21 @@
 /*
  * Lots of different room-related operations.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/roomtokens.c b/webcit/roomtokens.c
index 21b8cc4a3a11d270f986643918183cff3fa733d7..52d0ad4a7001301cf0f56b56ee045c569bf49ab2 100644 (file)
--- a/webcit/roomtokens.c
+++ b/webcit/roomtokens.c
@@ -1,21 +1,21 @@
 /*
  * Lots of different room-related operations.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify it under the terms of the GNU General Public License, version 3.
+ * by 
+ * 
  *
  * 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index bdc3cc20576c288af5bf7d66b9aa481891f9ecf3..5cbd56c7d95000168c71ddf52172651ad8c32d1d 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -1,7 +1,7 @@
 /*
  * Administrative screen for site-wide configuration
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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, version 3.

diff --git a/webcit/sitemap.c b/webcit/sitemap.c
index cab60d43ec01307ceef379db619a34fe0a22c485..c5aad6b37a2e3880a49017156d4bba484d39fd81 100644 (file)
--- a/webcit/sitemap.c
+++ b/webcit/sitemap.c
@@ -1,21 +1,21 @@
 /*
  * XML sitemap generator
  *
- * Copyright (c) 2010-2011 by the citadel.org team
+ * Copyright (c) 2010-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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/static/util.js b/webcit/static/util.js
index 20c08831b98a3d4c82c8755da34bb511b836ac98..8a94c4f104018aaca02141c8b909553810e77e5f 100644 (file)
--- a/webcit/static/util.js
+++ b/webcit/static/util.js
@@ -25,7 +25,7 @@ Object.inspect = function(obj) {
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// version 2.1 of the 
 // See http://www.gnu.org/copyleft/lesser.html
 
 Array.flatten = function(array, excludeUndefined) {

diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js
index 792928d7969e0dc7d44c5abca52860a9603b8569..3308e56f45b2c22f6275d672f0e6747b411c08c4 100644 (file)
--- a/webcit/static/wclib.js
+++ b/webcit/static/wclib.js
@@ -1,19 +1,19 @@
 /*
  * JavaScript function library for WebCit.
  *
- * Copyright (c) 2005-2011 by the citadel.org team
+ * Copyright (c) 2005-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
+ * it under the terms of the GNU General Public License, version 3.
  * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 
  *
  * 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, see <http://www.gnu.org/licenses/>.
  */
 

diff --git a/webcit/summary.c b/webcit/summary.c
index 172a15486703d700279a37f4ee2abac124a1dee8..acdf2cdc44b723404a6f25641e3f7dfa59184615 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -1,21 +1,15 @@
 /*
  * Displays the "Summary Page"
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
  */
 
 #include "webcit.h"

diff --git a/webcit/sysdep.c b/webcit/sysdep.c
index 9ccbc1cd23e1edc84db6119ec462062f64d061a0..a3cd5a6ee2129f9ea1d64022ff42ce93c83b0af6 100644 (file)
--- a/webcit/sysdep.c
+++ b/webcit/sysdep.c
@@ -1,21 +1,21 @@
 /*
  * WebCit "system dependent" code.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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
+ * 
+ * 
+ * 
  */
 
 #include "sysdep.h"

diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index 693848c375750fd48127fa2fd8beedccf235aaf4..4e7e343348843a6b0f05122348e0def6d44f0e1c 100644 (file)
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -1,19 +1,19 @@
 /*
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index 30164144e35e0bbf223092e27d5c6100010265ab..95dcd0efedca8ea9bb776e30d75b99cfdb25b7ff 100644 (file)
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -1,19 +1,19 @@
 /*
- * Copyright (c) 1987-2011 by the citadel.org team
+ * Copyright (c) 1987-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
+ * 
+ * 
+ * 
  */
 
 /*

diff --git a/webcit/tests/test_main.c b/webcit/tests/test_main.c
index 115bbda95c22e06830db04ac4ed3f2cf1cfe2055..267d0db876e1a8cd84a248c05ee489de657212aa 100644 (file)
--- a/webcit/tests/test_main.c
+++ b/webcit/tests/test_main.c
@@ -3,7 +3,7 @@
  * waiting on the specified port for incoming HTTP connections.  When a
  * connection is established, it calls context_loop() from context_loop.c.
  *
- * Copyright (c) 1996-2010 by the citadel.org developers.
+ * Copyright (c) 1996-2012 by the citadel.org developers.
  * This program is released under the terms of the GNU General Public License v3.
  */
 

diff --git a/webcit/tiny_mce/license.txt b/webcit/tiny_mce/license.txt
index 60d6d4c8f51c5c3910583e84d96fdf9e219afdd2..d111efbbdc1929e28b5d7775983443ea2ad2b05b 100644 (file)
--- a/webcit/tiny_mce/license.txt
+++ b/webcit/tiny_mce/license.txt
@@ -476,7 +476,7 @@ convey the exclusion of warranty; and each file should have at least the
     This library is free software; you can redistribute it and/or\r
     modify it under the terms of the GNU Lesser General Public\r
     License as published by the Free Software Foundation; either\r
-    version 2.1 of the License, or (at your option) any later version.\r
+    version 2.1 of the \r
 \r
     This library is distributed in the hope that it will be useful,\r
     but WITHOUT ANY WARRANTY; without even the implied warranty of\r

diff --git a/webcit/useredit.c b/webcit/useredit.c
index ef1be72b6b50b7fd2653ef25249fff7963f8bfe7..7ec8974fd2ea9d9087d99a092f216a18a6c2aba0 100644 (file)
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -1,19 +1,19 @@
 /*
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 9c8bd3b0c4c76b899883eb610e0df2308d633a7e..e33927340886941a71dc7df1a5c405036a2e7bac 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -1,19 +1,19 @@
 /*
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"

diff --git a/webcit/wiki.c b/webcit/wiki.c
index ef1a4441212dad909e6ee031dd6df87b11319364..4f14137904ca34dd02172e3bf58535876b946c5e 100644 (file)
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -1,21 +1,21 @@
 /*
  * Functions pertaining to rooms with a wiki view
  *
- * Copyright (c) 2009-2011 by the citadel.org team
+ * Copyright (c) 2009-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.
+ * modify 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
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"