From ec636368885b210420016b3f544edcbab9189880 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 15 Mar 2012 14:46:50 -0400 Subject: [PATCH] More license declaration changes which omit the bit about getting in touch with confirmed communist Richard Stallman and his GNU/Nazi foundation. --- webcit/addressbook_popup.c | 9 ++------- webcit/auth.c | 9 ++------- webcit/autocompletion.c | 9 ++------- webcit/availability.c | 10 ++-------- webcit/bbsview_renderer.c | 10 ++-------- webcit/blogview_renderer.c | 10 ++-------- webcit/calendar.c | 14 +++++++------- webcit/calendar.h | 14 +++++++------- webcit/calendar_tools.c | 14 +++++++------- webcit/calendar_view.c | 14 +++++++------- webcit/config.guess | 8 ++++---- webcit/config.rpath | 8 ++++---- webcit/config.sub | 8 ++++---- webcit/context_loop.c | 2 +- webcit/cookie_conversion.c | 14 +++++++------- webcit/crypto.c | 14 +++++++------- webcit/dav_delete.c | 14 +++++++------- webcit/dav_get.c | 14 +++++++------- webcit/dav_main.c | 14 +++++++------- webcit/dav_options.c | 12 ++++++------ webcit/dav_put.c | 14 +++++++------- webcit/debian/copyright | 10 +++++----- webcit/decode.c | 14 +++++++------- webcit/downloads.c | 14 +++++++------- webcit/event.c | 14 +++++++------- webcit/feed_generator.c | 14 +++++++------- webcit/fmt_date.c | 14 +++++++------- webcit/graphics.c | 14 +++++++------- webcit/html2html.c | 12 ++++++------ webcit/ical_subst.c | 14 +++++++------- webcit/iconbar.c | 14 +++++++------- webcit/listsub.c | 14 +++++++------- webcit/locate_host.c | 14 +++++++------- webcit/messages.c | 14 +++++++------- webcit/missing | 6 +++--- webcit/openid.c | 14 +++++++------- webcit/paging.c | 14 +++++++------- webcit/paramhandling.c | 14 +++++++------- webcit/po/webcit/es.po | 2 +- webcit/preferences.c | 14 +++++++------- webcit/roomchat.c | 14 +++++++------- webcit/roomops.c | 14 +++++++------- webcit/roomtokens.c | 14 +++++++------- webcit/siteconfig.c | 2 +- webcit/sitemap.c | 14 +++++++------- webcit/static/util.js | 2 +- webcit/static/wclib.js | 8 ++++---- webcit/summary.c | 10 ++-------- webcit/sysdep.c | 14 +++++++------- webcit/sysmsgs.c | 14 +++++++------- webcit/tcp_sockets.c | 14 +++++++------- webcit/tests/test_main.c | 2 +- webcit/tiny_mce/license.txt | 2 +- webcit/useredit.c | 14 +++++++------- webcit/vcard_edit.c | 14 +++++++------- webcit/wiki.c | 14 +++++++------- 56 files changed, 301 insertions(+), 340 deletions(-) diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c index 8b5b97973..887198f57 100644 --- 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 . */ #include "webcit.h" diff --git a/webcit/auth.c b/webcit/auth.c index c21bf1374..e5275104d 100644 --- 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 . */ #include "webcit.h" diff --git a/webcit/autocompletion.c b/webcit/autocompletion.c index e1bf1ab97..009df2382 100644 --- 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 . */ #include "webcit.h" diff --git a/webcit/availability.c b/webcit/availability.c index 3d49f1f55..3e8bfa2e5 100644 --- 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 8bed3af37..a577bc95f 100644 --- 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 70fa908ae..3e05a377c 100644 --- 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 2897ba201..58b00a84e 100644 --- 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 b71786396..a5571a0e4 100644 --- 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 b6dd7390c..17dc4a739 100644 --- 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 c8820b22c..c5c140f3f 100644 --- 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 40eaed482..9f957ac76 100755 --- 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 4db13e50f..39a3e1508 100755 --- a/webcit/config.rpath +++ b/webcit/config.rpath @@ -7,17 +7,17 @@ # Originally by Gordon Matzigkeit , 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 30fdca812..d29b459eb 100755 --- 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 dc74601e1..785fdb6aa 100644 --- 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 b0dffbe58..1c7e72db1 100644 --- 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 61c2366f9..71d8bdfc1 100644 --- 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 126eadedd..6673172ba 100644 --- 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 178b0c3ea..204b71f1c 100644 --- 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 f923a37b7..8f16c0b24 100644 --- 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 250a3ce12..795794108 100644 --- 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 e2a29d15c..548699bd4 100644 --- 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 6776133ec..63d156d84 100644 --- 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 c079ac4a8..c3d0a8ed7 100644 --- 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 9c1050522..eb01d64d0 100644 --- 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 f5f1fecd0..756a8a250 100644 --- 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 7830eaae6..2be5e1f74 100644 --- 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 15e5673ca..d76f62273 100644 --- 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 00fc5f052..c4cd663e1 100644 --- 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 82962daed..659f454c3 100644 --- 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 003ce11ec..edd0ff150 100644 --- 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 7a6e39d1a..53dead7a2 100644 --- 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 d4de61bb2..9896b5811 100644 --- 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 0c173b504..416082678 100644 --- 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 6af7002b5..0c4786c87 100644 --- 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 cbe2b0ef0..c15067bf6 100755 --- a/webcit/missing +++ b/webcit/missing @@ -4,7 +4,7 @@ # Franc,ois Pinard , 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 eaaa40100..c9c0464e8 100644 --- 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 efece86ba..c5acde81f 100644 --- 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 aadadab9f..453ac052a 100644 --- 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 6f14e0687..622417644 100644 --- 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 25db016ee..bf7bacbe5 100644 --- 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 97e693c1e..e2acc7b0c 100644 --- 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 b6fdaa8df..0777eefe3 100644 --- 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 21b8cc4a3..52d0ad4a7 100644 --- 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 bdc3cc205..5cbd56c7d 100644 --- 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 cab60d43e..c5aad6b37 100644 --- 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 20c08831b..8a94c4f10 100644 --- 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 792928d79..3308e56f4 100644 --- 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 . */ diff --git a/webcit/summary.c b/webcit/summary.c index 172a15486..acdf2cdc4 100644 --- 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 9ccbc1cd2..a3cd5a6ee 100644 --- 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 693848c37..4e7e34334 100644 --- 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 30164144e..95dcd0efe 100644 --- 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 115bbda95..267d0db87 100644 --- 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 60d6d4c8f..d111efbbd 100644 --- 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 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 This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/webcit/useredit.c b/webcit/useredit.c index ef1be72b6..7ec8974fd 100644 --- 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 9c8bd3b0c..e33927340 100644 --- 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 ef1a44412..4f1413790 100644 --- 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" -- 2.30.2