diff --git a/contrib/localnames-server.pl b/contrib/localnames-server.pl index 9831bc69..ea05baf8 100644 --- a/contrib/localnames-server.pl +++ b/contrib/localnames-server.pl @@ -3,7 +3,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -12,10 +12,7 @@ # 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 +# along with this program. If not, see . use CGI; use CGI::Carp qw(fatalsToBrowser); diff --git a/modules/near-links/moin-search.pl b/modules/near-links/moin-search.pl index d89f3d83..5ea9de4e 100755 --- a/modules/near-links/moin-search.pl +++ b/modules/near-links/moin-search.pl @@ -3,7 +3,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -12,10 +12,7 @@ # 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 +# along with this program. If not, see . use CGI qw/:standard/; use CGI::Carp qw(fatalsToBrowser); diff --git a/modules/near-links/phpwiki-search.pl b/modules/near-links/phpwiki-search.pl index ac84cd8a..b5fe0c1c 100755 --- a/modules/near-links/phpwiki-search.pl +++ b/modules/near-links/phpwiki-search.pl @@ -3,7 +3,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -12,10 +12,7 @@ # 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 +# along with this program. If not, see . use CGI qw/:standard/; use CGI::Carp qw(fatalsToBrowser); diff --git a/modules/near-links/usemod-search.pl b/modules/near-links/usemod-search.pl index b8b27898..53dd8885 100755 --- a/modules/near-links/usemod-search.pl +++ b/modules/near-links/usemod-search.pl @@ -3,7 +3,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -12,10 +12,7 @@ # 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 +# along with this program. If not, see . use CGI qw/:standard/; use CGI::Carp qw(fatalsToBrowser); diff --git a/modules/translations/national-days-de.pl b/modules/translations/national-days-de.pl index a5b4a7f1..f4390803 100644 --- a/modules/translations/national-days-de.pl +++ b/modules/translations/national-days-de.pl @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . # Die Daten stammen von der deutschen Ausgabe des Monde Diplomatique. # Falls der Wiki nur Deutsch ist, kann man diese Datei einfach als diff --git a/modules/translations/national-days.pl b/modules/translations/national-days.pl index 011e8df2..6b2094f1 100644 --- a/modules/translations/national-days.pl +++ b/modules/translations/national-days.pl @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . use utf8; use strict; diff --git a/scripts/action-list b/scripts/action-list index 9fb8bfb7..e1080355 100644 --- a/scripts/action-list +++ b/scripts/action-list @@ -3,19 +3,17 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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 +# 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 +# along with this program. If not, see . + use Time::ParseDate; while () { m/^(\S+) \S+ \S+ \[(.*?)\] "(.*?)" (\d+)/ or die "Cannot parse:\n$_"; diff --git a/scripts/avg-age b/scripts/avg-age index 8475f698..2d3021bb 100644 --- a/scripts/avg-age +++ b/scripts/avg-age @@ -3,7 +3,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -12,10 +12,7 @@ # 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 +# along with this program. If not, see . my $PageDir = 'page'; my $Now = time; diff --git a/scripts/changelog-to-rss b/scripts/changelog-to-rss index e6adba9e..6d735997 100755 --- a/scripts/changelog-to-rss +++ b/scripts/changelog-to-rss @@ -3,7 +3,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -12,10 +12,7 @@ # 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 +# along with this program. If not, see . use CGI; use CGI::Carp qw(fatalsToBrowser); diff --git a/scripts/cli/wikiadd b/scripts/cli/wikiadd index 655ad39b..dcd45dce 100755 --- a/scripts/cli/wikiadd +++ b/scripts/cli/wikiadd @@ -4,20 +4,18 @@ # Copyright (C) 2004 Jorgen Schaefer # Copyright (C) 2004 Alex Schroeder # -# 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 the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# +# 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 +# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see . import httplib, urllib, re, urlparse, sys, getopt from time import time diff --git a/scripts/cli/wikiappend b/scripts/cli/wikiappend index 3a3c95fe..bbe4f504 100755 --- a/scripts/cli/wikiappend +++ b/scripts/cli/wikiappend @@ -5,19 +5,16 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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 +# 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 +# along with this program. If not, see . use strict; use Getopt::Std; diff --git a/scripts/cli/wikicopy b/scripts/cli/wikicopy index 35a5baa3..2b743c23 100755 --- a/scripts/cli/wikicopy +++ b/scripts/cli/wikicopy @@ -4,19 +4,16 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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 +# 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 +# along with this program. If not, see . require LWP; use Getopt::Std; diff --git a/scripts/cli/wikiupload b/scripts/cli/wikiupload index 5af16ab0..c336c0f5 100755 --- a/scripts/cli/wikiupload +++ b/scripts/cli/wikiupload @@ -4,20 +4,18 @@ # Copyright (C) 2004 Jorgen Schaefer # Copyright (C) 2005 Alex Schroeder # -# 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 the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# +# 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 +# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see . # $Id: wikiupload,v 1.8 2010/02/08 13:40:59 as Exp $ diff --git a/scripts/contributors b/scripts/contributors index af0226ff..4df2c2ea 100644 --- a/scripts/contributors +++ b/scripts/contributors @@ -3,19 +3,17 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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 +# 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 +# along with this program. If not, see . + my $FS = "\x1e"; my %Total = (); my %Month = (); diff --git a/scripts/graph.pl b/scripts/graph.pl index 49a9309f..a3566ce7 100755 --- a/scripts/graph.pl +++ b/scripts/graph.pl @@ -3,7 +3,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -12,12 +12,8 @@ # 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 -# -# +# along with this program. If not, see . + # Usage: perl graph.pl URL StartPage depth breadth stop-regexp # All arguments are optional. # diff --git a/scripts/latin-1.pl b/scripts/latin-1.pl index 9980dc6f..5cb80d64 100755 --- a/scripts/latin-1.pl +++ b/scripts/latin-1.pl @@ -3,7 +3,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -12,10 +12,7 @@ # 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 +# along with this program. If not, see . use CGI qw/:standard/; use CGI::Carp qw(fatalsToBrowser); diff --git a/scripts/leech-detector b/scripts/leech-detector index b4cce0a5..1ab03dcc 100755 --- a/scripts/leech-detector +++ b/scripts/leech-detector @@ -4,7 +4,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -13,12 +13,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA -# -# $Id: leech-detector,v 1.1 2004/07/09 06:39:32 as Exp $

' +# along with this program. If not, see . use Time::ParseDate; while () { diff --git a/scripts/merge-banned-lists b/scripts/merge-banned-lists index ddcb0fb9..ef919cbb 100644 --- a/scripts/merge-banned-lists +++ b/scripts/merge-banned-lists @@ -4,7 +4,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -13,10 +13,7 @@ # 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 +# along with this program. If not, see . # This program copies the banned list from A to B, removing comments # from A and keeping comments from B, and adding a date to entries diff --git a/scripts/merge-list b/scripts/merge-list index c471c42e..716ce47b 100755 --- a/scripts/merge-list +++ b/scripts/merge-list @@ -4,7 +4,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -13,12 +13,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA - -# $Id: merge-list,v 1.2 2004/07/09 06:40:56 as Exp $

' +# along with this program. If not, see . use strict; use LWP::UserAgent; diff --git a/scripts/orphaned.pl b/scripts/orphaned.pl index 4f1bee37..545f406d 100755 --- a/scripts/orphaned.pl +++ b/scripts/orphaned.pl @@ -4,19 +4,16 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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 +# 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 +# along with this program. If not, see . use CGI qw/:standard/; use CGI::Carp qw(fatalsToBrowser); diff --git a/scripts/simplify.pl b/scripts/simplify.pl index 0e99fe94..849d1650 100755 --- a/scripts/simplify.pl +++ b/scripts/simplify.pl @@ -3,7 +3,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -12,10 +12,7 @@ # 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 +# along with this program. If not, see . use CGI qw/:standard/; use CGI::Carp qw(fatalsToBrowser); diff --git a/scripts/svn-wiki.pl b/scripts/svn-wiki.pl index da0e1be0..148cea76 100755 --- a/scripts/svn-wiki.pl +++ b/scripts/svn-wiki.pl @@ -4,7 +4,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -13,10 +13,7 @@ # 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 +# along with this program. If not, see . sub ParseData { my $data = shift; diff --git a/scripts/traffic b/scripts/traffic index 03506ab5..a54ffca2 100755 --- a/scripts/traffic +++ b/scripts/traffic @@ -4,7 +4,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -13,12 +13,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA -# -# $Id: traffic,v 1.2 2006/09/01 11:14:34 as Exp $

' +# along with this program. If not, see . while () { # 304 responses have - as bytes diff --git a/scripts/utf-8.pl b/scripts/utf-8.pl index 48d0911c..e26ac375 100755 --- a/scripts/utf-8.pl +++ b/scripts/utf-8.pl @@ -3,7 +3,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -12,10 +12,7 @@ # 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 +# along with this program. If not, see . use CGI qw/:standard/; use CGI::Carp qw(fatalsToBrowser); diff --git a/scripts/wanted.pl b/scripts/wanted.pl index f7f9cf60..94f306ee 100755 --- a/scripts/wanted.pl +++ b/scripts/wanted.pl @@ -4,19 +4,16 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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 +# 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 +# along with this program. If not, see . use CGI qw/:standard/; use CGI::Carp qw(fatalsToBrowser); diff --git a/stuff/wikiimg b/stuff/wikiimg index e1037aa4..a0bf27cd 100755 --- a/stuff/wikiimg +++ b/stuff/wikiimg @@ -3,20 +3,18 @@ # # Copyright (C) 2006 Alex Schroeder # -# 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 the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# +# 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 +# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see . if [ -z "$2" ]; then echo Usage: diff --git a/t/aggregate.t b/t/aggregate.t index 846f5cb7..9acefdf6 100644 --- a/t/aggregate.t +++ b/t/aggregate.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/bbcode.t b/t/bbcode.t index 05daa2b7..646415dc 100644 --- a/t/bbcode.t +++ b/t/bbcode.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/calendar.t b/t/calendar.t index 0acc633b..743300fe 100644 --- a/t/calendar.t +++ b/t/calendar.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/clusters.t b/t/clusters.t index 145e07c7..45e2e8a8 100644 --- a/t/clusters.t +++ b/t/clusters.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/config-page.t b/t/config-page.t index 606f3371..b301877c 100644 --- a/t/config-page.t +++ b/t/config-page.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/conflict.t b/t/conflict.t index 85cea2dd..bd535f35 100644 --- a/t/conflict.t +++ b/t/conflict.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/crumbs.t b/t/crumbs.t index 3e23b516..08c083aa 100644 --- a/t/crumbs.t +++ b/t/crumbs.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/despam.t b/t/despam.t index c447705f..96b454fe 100644 --- a/t/despam.t +++ b/t/despam.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/edit.t b/t/edit.t index 06fffb6e..c228ed55 100644 --- a/t/edit.t +++ b/t/edit.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/google-search.t b/t/google-search.t index 3ea533f2..dc0840f6 100644 --- a/t/google-search.t +++ b/t/google-search.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/history.t b/t/history.t index ea3c962c..742d1585 100644 --- a/t/history.t +++ b/t/history.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/hr.t b/t/hr.t index cbd45f02..ca634c8f 100644 --- a/t/hr.t +++ b/t/hr.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/include.t b/t/include.t index d392ac76..e0f2404b 100644 --- a/t/include.t +++ b/t/include.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/irc.t b/t/irc.t index c224b971..21359c63 100644 --- a/t/irc.t +++ b/t/irc.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/journal2.t b/t/journal2.t index 0e8a4fbf..c472e1e5 100644 --- a/t/journal2.t +++ b/t/journal2.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/languages.t b/t/languages.t index 89456d33..4e19150e 100644 --- a/t/languages.t +++ b/t/languages.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/link-all.t b/t/link-all.t index 5a28e57e..69165530 100644 --- a/t/link-all.t +++ b/t/link-all.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/localnames.t b/t/localnames.t index 2dec3066..3deda92b 100644 --- a/t/localnames.t +++ b/t/localnames.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/lock-expiration.t b/t/lock-expiration.t index 9ebfcd4f..ca0b72a4 100644 --- a/t/lock-expiration.t +++ b/t/lock-expiration.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/lock-on-creation.t b/t/lock-on-creation.t index 97b3cf36..9b6bda08 100644 --- a/t/lock-on-creation.t +++ b/t/lock-on-creation.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/lock.t b/t/lock.t index b75412df..c2004fa0 100644 --- a/t/lock.t +++ b/t/lock.t @@ -3,7 +3,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -12,10 +12,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/moin.t b/t/moin.t index c5b8c4ce..38a687e8 100644 --- a/t/moin.t +++ b/t/moin.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/pagenames.t b/t/pagenames.t index c233394a..9f622cde 100644 --- a/t/pagenames.t +++ b/t/pagenames.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/setext.t b/t/setext.t index 8ab195b0..b652a78e 100644 --- a/t/setext.t +++ b/t/setext.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/subscriberc.t b/t/subscriberc.t index 90f12adf..0ea9e9ba 100644 --- a/t/subscriberc.t +++ b/t/subscriberc.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/summary.t b/t/summary.t index db4fefc5..414b38d2 100644 --- a/t/summary.t +++ b/t/summary.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; @@ -22,18 +19,18 @@ use Test::More tests => 11; update_page('link', 'some [http://example.com content]'); update_page('long', q{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 the Free Software Foundation; either version 2 of -the License, or (at your option) any later version.}); -test_page(get_page('action=rc raw=1'), - 'description: some content', - "software; you", - "the terms", - "is >>free<< software", - "Public License as \\. \\. \\.\n"); -test_page(get_page('action=rss'), - "is &gt;&gt;free&lt;&lt; software"); +# 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 +# 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 . # second edit doesn't automatically set a summary update_page('link', 'fnord'); diff --git a/t/tables.t b/t/tables.t index 9c3401bb..10a507c2 100644 --- a/t/tables.t +++ b/t/tables.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/usemod-1.0.4.pl b/t/usemod-1.0.4.pl index 254e1dd6..235deb67 100644 --- a/t/usemod-1.0.4.pl +++ b/t/usemod-1.0.4.pl @@ -12,7 +12,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -21,10 +21,7 @@ # 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 +# along with this program. If not, see . package UseModWiki; use strict; diff --git a/t/usemod-options.t b/t/usemod-options.t index 2845300e..47a518eb 100644 --- a/t/usemod-options.t +++ b/t/usemod-options.t @@ -2,7 +2,7 @@ # # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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, @@ -11,10 +11,7 @@ # 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 +# along with this program. If not, see . require 't/test.pl'; package OddMuse;