From 72f887936694f207778a580a0d099dccc4b72771 Mon Sep 17 00:00:00 2001 From: hal9 Date: Fri, 10 May 2002 01:53:04 +0000 Subject: [PATCH] More copyright related *proposed* changes. Copyright statement added to LICENSE. Man page updated as well. --- LICENSE | 14 +++++++++----- privoxy.1 | 30 ++++++++++++++++-------------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/LICENSE b/LICENSE index 1bcc46f5..f4645fa8 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,8 @@ - GNU GENERAL PUBLIC LICENSE + Copyright (C) 2001, 2002 Privoxy Developers , + and licensed uner the GNU General Public License. + + + GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. @@ -55,7 +59,7 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -168,7 +172,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +229,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -278,7 +282,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest diff --git a/privoxy.1 b/privoxy.1 index 3928b96b..6382e448 100644 --- a/privoxy.1 +++ b/privoxy.1 @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "PRIVOXY" "1" "05 May 2002" "Privoxy 2.9.15 beta" "" +.TH "PRIVOXY" "1" "09 May 2002" "Privoxy 2.9.15 beta" "" .SH NAME privoxy \- Privacy Enhancing Proxy .SH SYNOPSIS @@ -272,25 +272,27 @@ http://www.squid-cache.org/ .SH "COPYRIGHT AND LICENSE" .SS "COPYRIGHT" .PP -Permission is granted to copy, distribute and/or modify this document under -the terms of the \fIGNU Free -Documentation License\fR, Version 1.1 or any later version -published by the Free Software Foundation with no Invariant Sections, no -Front-Cover Texts, and no Back-Cover Texts. A copy of the license can be -found http://www.gnu.org/licenses/fdl.html. +Copyright (C) 2001, 2002 by Privoxy Developers +.PP +Some source code is based on code Copyright (C) 1997 by Anonymous Coders +and Junkbusters, Inc. and licensed under the \fIGNU General Public +License\fR. .SS "LICENSE" .PP \fBPrivoxy\fR 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. +redistribute it and/or modify it under the terms of the +\fIGNU General Public +License\fR, version 2, as published by the Free Software Foundation. .PP 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 +FITNESS FOR A PARTICULAR PURPOSE. See the +\fIGNU General Public License\fR for more details, which is available from the Free Software Foundation, Inc, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. .PP -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. +You should have received a copy of the \fIGNU General Public License\fR +along with this program; if not, write to the Free Software +Foundation, Inc. 59 Temple Place - Suite 330 +Boston, MA 02111-1307 +USA -- 2.39.2