Boilerplate: update copyright blurbs for Squid tools

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 66d30c713b121a5ac2fb5755de4409cf2d2e7d72..26917904a65362c3b6ca032eb56445ad5fd2637a 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,8 +1,9 @@
-#
-#  Makefile for the Squid Object Cache server
-#
-#  Uncomment and customize the following to suit your needs:
-#
+## Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
 
 include $(top_srcdir)/src/Common.am
 

diff --git a/tools/cachemgr.cc b/tools/cachemgr.cc
index d5b998ee3d06927a49abcb644d6e2120baecb0a2..b852f11f182be09e50514bca4e7e29053f7dac6e 100644 (file)
--- a/tools/cachemgr.cc
+++ b/tools/cachemgr.cc
@@ -1,33 +1,9 @@
 /*
- * DEBUG: section --    CGI Cache Manager
- * AUTHOR: Duane Wessels
- *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
- *
- *  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 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, USA.
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
  *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
 #include "squid.h"

diff --git a/tools/cachemgr.cgi.8.in b/tools/cachemgr.cgi.8.in
index 0a0416100fd917f79e8756fb60780ef9afd5b5b9..1248f88bb53d51d0c062bc092af9186da40b2e44 100644 (file)
--- a/tools/cachemgr.cgi.8.in
+++ b/tools/cachemgr.cgi.8.in
@@ -55,7 +55,12 @@ National Laboratory for Applied Network Research and funded by
 the National Science Foundation.
 .
 .SH COPYRIGHT
-Distributed under the GNU General Public License (GNU GPL) version 2 or later (GPLv2+).
+.PP
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
 .
 .SH QUESTIONS
 Questions on the usage of this program can be sent to the

diff --git a/tools/helper-mux.pl b/tools/helper-mux.pl
index 49fcee5495a55fcaa35b61b4dac822286fc2ffc0..18028f67b5f14383ce053de5a01e89cec7941735 100755 (executable)
--- a/tools/helper-mux.pl
+++ b/tools/helper-mux.pl
@@ -1,4 +1,12 @@
 #!/usr/bin/perl
+#
+## Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
+#
 # helper multiplexer. Talks to squid using the multiplexed variant of
 # the helper protocol, and maintains a farm of synchronous helpers
 # helpers are lazily started, as many as needed.
@@ -6,14 +14,6 @@
 #
 # AUTHOR: Francesco Chemolli <kinkie@squid-cache.org>
 #
-# SQUID Web Proxy Cache          http://www.squid-cache.org/
-#  ----------------------------------------------------------
-# 
-#   Squid is the result of efforts by numerous individuals from
-#   the Internet community; see the CONTRIBUTORS file for full
-#   details.   Many organizations have provided support for Squid's
-#   development; see the SPONSORS file for full details.
-# 
 #   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

diff --git a/tools/helper-ok-dying.pl b/tools/helper-ok-dying.pl
index 30fc8d8bfaf9d574b6fcfe8691c3de08853c784e..5ee026d246ce3331d413d20ca668e66c24854192 100755 (executable)
--- a/tools/helper-ok-dying.pl
+++ b/tools/helper-ok-dying.pl
@@ -1,4 +1,11 @@
 #!/usr/bin/perl
+#
+## Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
 
 $|=1;
 while (<>) {

diff --git a/tools/helper-ok.pl b/tools/helper-ok.pl
index dd7af8ba5eb0b7d699428581ae60ab741ea5a93f..6f81e356a33d98837c1bff4598dcd86ff8a2a914 100755 (executable)
--- a/tools/helper-ok.pl
+++ b/tools/helper-ok.pl
@@ -1,4 +1,11 @@
 #!/usr/bin/perl
+#
+## Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
 
 $|=1;
 while (<>) {

diff --git a/tools/purge/Makefile.am b/tools/purge/Makefile.am
index 2cd43f1caf79db6c47311695c79c2c07818a618a..5b87ebc4e2f5e40d994435a4cf431568868d3b1e 100644 (file)
--- a/tools/purge/Makefile.am
+++ b/tools/purge/Makefile.am
@@ -1,3 +1,10 @@
+## Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
+
 include $(top_srcdir)/src/Common.am
 
 if !ENABLE_WIN32SPECIFIC

diff --git a/tools/purge/conffile.cc b/tools/purge/conffile.cc
index 7c4116156d8a7f6b2857a971da20bc99a306e5ed..ea6d36c9c0112d1125e99a0c0fd8a1e726ff504a 100644 (file)
--- a/tools/purge/conffile.cc
+++ b/tools/purge/conffile.cc
@@ -1,4 +1,10 @@
-#include "squid.h"
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
 
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
@@ -33,7 +39,8 @@
 // Revision 1.1  2000/09/21 09:44:53  voeckler
 // Initial revision
 //
-//
+
+#include "squid.h"
 #include "conffile.hh"
 
 #include <cerrno>

diff --git a/tools/purge/conffile.hh b/tools/purge/conffile.hh
index f34bf7168b08da48482b43eb349bfdd20e2cbc5c..1077b8fdec835b57962bde502bdeb977310ae9b1 100644 (file)
--- a/tools/purge/conffile.hh
+++ b/tools/purge/conffile.hh
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    conffile.hh

diff --git a/tools/purge/convert.cc b/tools/purge/convert.cc
index a2cf4fe378164ed55221307b3fc7258805432ce3..d019ae8ccacc3e80ca7125a5c17bb12f9b32457c 100644 (file)
--- a/tools/purge/convert.cc
+++ b/tools/purge/convert.cc
@@ -1,4 +1,10 @@
-#include "squid.h"
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
 
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
@@ -39,8 +45,8 @@
 // Revision 1.1  1998/08/13 21:38:04  voeckler
 // Initial revision
 //
-//
 
+#include "squid.h"
 #include "convert.hh"
 
 #include <cstdlib>

diff --git a/tools/purge/convert.hh b/tools/purge/convert.hh
index 5cd39b7454681021a749b856f90780231a11f92d..d9a821b0acea66de27b404eedf0706c544547c75 100644 (file)
--- a/tools/purge/convert.hh
+++ b/tools/purge/convert.hh
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    convert.hh

diff --git a/tools/purge/copyout.cc b/tools/purge/copyout.cc
index a8d62571a775494c6342cb5fc691e893caf4a0c2..9902ac2ebdbe8fd7e60210a151f7abe24b1e33b5 100644 (file)
--- a/tools/purge/copyout.cc
+++ b/tools/purge/copyout.cc
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    copyout.cc

diff --git a/tools/purge/copyout.hh b/tools/purge/copyout.hh
index 5440490900cc3893babc39e4f068b8f7abb89a32..1a769937e2fdf9dd99659665d4ad5474db6a011d 100644 (file)
--- a/tools/purge/copyout.hh
+++ b/tools/purge/copyout.hh
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    copyout.hh

diff --git a/tools/purge/purge.cc b/tools/purge/purge.cc
index 039a906c161e863c131634d97fc8bcdc929fad96..ff1c8fb3db889e706c88a895401b5917d934e0e4 100644 (file)
--- a/tools/purge/purge.cc
+++ b/tools/purge/purge.cc
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    purge.cc

diff --git a/tools/purge/signal.cc b/tools/purge/signal.cc
index 4672d9265d0aa57b4a6013251dd4ff5f64634331..77038639ae5954748034ec7ecb864ab55e53ccfb 100644 (file)
--- a/tools/purge/signal.cc
+++ b/tools/purge/signal.cc
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 // Author:   Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 // File:     signal.cc
 // Date:     Sat Feb 28 1998
@@ -40,7 +48,7 @@
 // Revision 1.1  1998/08/13 21:51:58  voeckler
 // Initial revision
 //
-//
+
 #include "squid.h"
 #include "signal.hh"
 

diff --git a/tools/purge/signal.hh b/tools/purge/signal.hh
index f43557b575f4f8156b707736b572223be763dc0f..c7716df1ed997313249eae6f2b4a6ffae102d249 100644 (file)
--- a/tools/purge/signal.hh
+++ b/tools/purge/signal.hh
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 // Author:   Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 // File:     signal.hh
 // Date:     Sat Feb 28 1998

diff --git a/tools/purge/socket.cc b/tools/purge/socket.cc
index 9450edd8918ad0ec366a29e60c8d5afdf211c088..352075a5e8c6aee8149f7d29998f2e304d101d87 100644 (file)
--- a/tools/purge/socket.cc
+++ b/tools/purge/socket.cc
@@ -1,4 +1,11 @@
-#include "squid.h"
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    socket.hh
@@ -41,7 +48,8 @@
 // Revision 1.1  1998/08/13 21:52:55  voeckler
 // Initial revision
 //
-//
+
+#include "squid.h"
 #include "socket.hh"
 
 #include <cerrno>

diff --git a/tools/purge/socket.hh b/tools/purge/socket.hh
index c1631bc74f0aeb41802adbee6da7673de5dd5935..57b64542b51043f05673532d0292f219264d0fdb 100644 (file)
--- a/tools/purge/socket.hh
+++ b/tools/purge/socket.hh
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    socket.hh

diff --git a/tools/purge/squid-tlv.cc b/tools/purge/squid-tlv.cc
index bf3d41d518f11056c06943b200c681f0fbaaa4c1..b1953b4720c95d3748e0817fd510764cd1a996ab 100644 (file)
--- a/tools/purge/squid-tlv.cc
+++ b/tools/purge/squid-tlv.cc
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    squid-tlv.cc
@@ -31,7 +39,7 @@
 // Revision 1.1  1999/06/15 21:10:16  voeckler
 // Initial revision
 //
-//
+
 #include "squid.h"
 #include "squid-tlv.hh"
 

diff --git a/tools/purge/squid-tlv.hh b/tools/purge/squid-tlv.hh
index fdaec97ffdd31e43cda5527f3624afeeeb4a6f18..08ddecc38a7affb790d463cce3bb79e78e86eb17 100644 (file)
--- a/tools/purge/squid-tlv.hh
+++ b/tools/purge/squid-tlv.hh
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    squid-tlv.hh

diff --git a/tools/squidclient/Makefile.am b/tools/squidclient/Makefile.am
index 499acf3db9a76a7e1b6d2ecb6622175783e54f24..bd0ab7322195b49f0e1d493f6b77bb5df97df86f 100644 (file)
--- a/tools/squidclient/Makefile.am
+++ b/tools/squidclient/Makefile.am
@@ -1,3 +1,10 @@
+## Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
+
 include $(top_srcdir)/src/Common.am
 
 AUTOMAKE_OPTIONS = subdir-objects

diff --git a/tools/squidclient/Parameters.h b/tools/squidclient/Parameters.h
index 27253cfefda833cdb045f96a8651b6fdcc70456a..e597fb3ae803f206a8a44152f59804d3174f7969 100644 (file)
--- a/tools/squidclient/Parameters.h
+++ b/tools/squidclient/Parameters.h
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 #ifndef _SQUID_TOOLS_SQUIDCLIENT_PARAMETERS_H
 #define _SQUID_TOOLS_SQUIDCLIENT_PARAMETERS_H
 

diff --git a/tools/squidclient/Ping.cc b/tools/squidclient/Ping.cc
index 46e5a4c828c6fdacbf26ac66ae744d1cdea7cdf6..9f5f9d09d1a17b8a85c7067b4f3eb709ed889dc9 100644 (file)
--- a/tools/squidclient/Ping.cc
+++ b/tools/squidclient/Ping.cc
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 #include "squid.h"
 #include "SquidTime.h"
 #include "tools/squidclient/Parameters.h"

diff --git a/tools/squidclient/Ping.h b/tools/squidclient/Ping.h
index 5e0319204695136729838ead88c511a087129c41..7e7ccdf9a3d2c0057bb68ce55ce5c0b11f9fb422 100644 (file)
--- a/tools/squidclient/Ping.h
+++ b/tools/squidclient/Ping.h
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 #ifndef _SQUID_TOOLS_CLIENT_PING_H
 #define _SQUID_TOOLS_CLIENT_PING_H
 

diff --git a/tools/squidclient/Transport.cc b/tools/squidclient/Transport.cc
index 1c62d088e121b11a2a5346e04858f33e449367bd..1abeada100a9730dd4327adebac107533a6accf3 100644 (file)
--- a/tools/squidclient/Transport.cc
+++ b/tools/squidclient/Transport.cc
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 #include "squid.h"
 #include "ip/Address.h"
 #include "tools/squidclient/Ping.h"

diff --git a/tools/squidclient/Transport.h b/tools/squidclient/Transport.h
index 2e9eb649e0be109a3198fc0afec56911b073fbae..7bc08dc8519afa22b00bd9bf7b05fd16441d48ca 100644 (file)
--- a/tools/squidclient/Transport.h
+++ b/tools/squidclient/Transport.h
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 #ifndef SQUID_TOOLS_SQUIDCLIENT_TRANSPORT_H
 #define SQUID_TOOLS_SQUIDCLIENT_TRANSPORT_H
 

diff --git a/tools/squidclient/gssapi_support.cc b/tools/squidclient/gssapi_support.cc
index 6440a06eb21c5e371302f1f88a3e48d0c52a3621..3733f9193e9d46dc3a1e994c813868915a7f049b 100644 (file)
--- a/tools/squidclient/gssapi_support.cc
+++ b/tools/squidclient/gssapi_support.cc
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 #include "squid.h"
 
 #if HAVE_GSSAPI

diff --git a/tools/squidclient/gssapi_support.h b/tools/squidclient/gssapi_support.h
index 7d2f598e1072aa973610c8c575d255a1129652d5..46d65d97cfdae7d338587c00b3a93c3ca0e5d0c8 100644 (file)
--- a/tools/squidclient/gssapi_support.h
+++ b/tools/squidclient/gssapi_support.h
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 #ifndef _SQUID_TOOLS_SQUIDCLIENT_GSSAPI_H
 #define _SQUID_TOOLS_SQUIDCLIENT_GSSAPI_H
 

diff --git a/tools/squidclient/squidclient.1 b/tools/squidclient/squidclient.1
index 2a1f95613b384ea82bc2889dcabb2d96d1076636..dcabebee7dc756f5bf97b8d3763998887875b7d7 100644 (file)
--- a/tools/squidclient/squidclient.1
+++ b/tools/squidclient/squidclient.1
@@ -233,7 +233,12 @@ National Laboratory for Applied Network Research and funded by
 the National Science Foundation.
 .
 .SH COPYRIGHT
-Distributed under the GNU General Public License (GNU GPL) version 2 or later (GPLv2+).
+.PP
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
 .
 .SH QUESTIONS
 Questions on the usage of this program can be sent to the

diff --git a/tools/squidclient/squidclient.cc b/tools/squidclient/squidclient.cc
index d36ac64bd750f486fc20c7554eb2fff4d28cb282..db62555cb6302f0963602e6919569c1327e7b17c 100644 (file)
--- a/tools/squidclient/squidclient.cc
+++ b/tools/squidclient/squidclient.cc
@@ -1,33 +1,9 @@
 /*
- * DEBUG: section --    WWW Client
- * AUTHOR: Harvest Derived
- *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
- *
- *  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 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, USA.
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
  *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
 #include "squid.h"