From 97c15a26185bd3c99025010fd123849545f48cc1 Mon Sep 17 00:00:00 2001 From: hal9 Date: Sun, 5 May 2002 20:26:02 +0000 Subject: [PATCH] Sorting out license vs copyright in these docs. --- doc/source/copyright.sgml | 46 +++-------------- doc/source/developer-manual.sgml | 54 +++++++++++++++++--- doc/source/faq.sgml | 86 ++++++++++++++++++++++++-------- doc/source/privoxy-man-page.sgml | 12 ++++- doc/source/user-manual.sgml | 45 +++++++++++++++-- doc/source/webserver/index.sgml | 44 +++++++++------- 6 files changed, 198 insertions(+), 89 deletions(-) diff --git a/doc/source/copyright.sgml b/doc/source/copyright.sgml index 05a715c2..db8a4f11 100644 --- a/doc/source/copyright.sgml +++ b/doc/source/copyright.sgml @@ -3,7 +3,7 @@ Purpose : Entity included in other project documents. - $Id: copyright.sgml,v 1.3 2002/04/07 08:10:12 swa Exp $ + $Id: copyright.sgml,v 1.4 2002/04/26 05:25:23 hal9 Exp $ Written by and Copyright (C) 2001 the SourceForge Privoxy team. http://www.privoxy.org/ @@ -25,48 +25,16 @@ user-manual developer-manual faq - webserver/index.sgml --> - Privoxy 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. + Permission is granted to copy, distribute and/or modify this document under + the terms of the GNU Free + Documentation License, 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. - - 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, which is available from the Free Software Foundation, Inc, 59 - Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - - - 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/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml index 9a2ebc2c..6fd323e2 100644 --- a/doc/source/developer-manual.sgml +++ b/doc/source/developer-manual.sgml @@ -7,6 +7,7 @@ + @@ -21,7 +22,7 @@ This file belongs into ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ - $Id: developer-manual.sgml,v 1.40 2002/05/04 00:43:43 hal9 Exp $ + $Id: developer-manual.sgml,v 1.41 2002/05/04 08:44:44 swa Exp $ Written by and Copyright (C) 2001 the SourceForge Privoxy team. http://www.privoxy.org/ @@ -44,8 +45,32 @@ Privoxy Developer Manual - $Id: developer-manual.sgml,v 1.40 2002/05/04 00:43:43 hal9 Exp $ + $Id: developer-manual.sgml,v 1.41 2002/05/04 08:44:44 swa Exp $ + + 2001 + 2002 + Privoxy Developers + + + + + @@ -1711,7 +1736,7 @@ static void unload_re_filterfile( void *f ) { ... } Example for file comments: -const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.40 2002/05/04 00:43:43 hal9 Exp $"; +const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.41 2002/05/04 08:44:44 swa Exp $"; /********************************************************************* * * File : $Source$ @@ -1771,7 +1796,7 @@ const char FILENAME_h_rcs[] = FILENAME_H_VERSION; #ifndef _FILENAME_H #define _FILENAME_H -#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.40 2002/05/04 00:43:43 hal9 Exp $" +#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.41 2002/05/04 08:44:44 swa Exp $" /********************************************************************* * * File : $Source$ @@ -2627,8 +2652,9 @@ zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg - - Copyright and History + + +Copyright, License and History Copyright @@ -2636,13 +2662,22 @@ zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg + +License + + &license; + + + + + History &history; - + See also @@ -2673,6 +2708,9 @@ zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg Temple Place - Suite 330, Boston, MA 02111-1307, USA. $Log: developer-manual.sgml,v $ + Revision 1.41 2002/05/04 08:44:44 swa + bumped version + Revision 1.40 2002/05/04 00:43:43 hal9 -Remove TOC/first page kludge with proper stylesheet fix. -Combined the two very brief sections: Intro and Quickstart. diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml index 30be80a7..26555c33 100644 --- a/doc/source/faq.sgml +++ b/doc/source/faq.sgml @@ -7,6 +7,7 @@ + @@ -22,7 +23,7 @@ This file belongs into ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ - $Id: faq.sgml,v 1.55 2002/05/04 00:41:56 hal9 Exp $ + $Id: faq.sgml,v 1.56 2002/05/04 08:44:44 swa Exp $ Written by and Copyright (C) 2001 the SourceForge Privoxy team. http://www.privoxy.org/ @@ -61,8 +62,33 @@ Privoxy Frequently Asked Questions -$Id: faq.sgml,v 1.55 2002/05/04 00:41:56 hal9 Exp $ +$Id: faq.sgml,v 1.56 2002/05/04 08:44:44 swa Exp $ + + + 2001 + 2002 + Privoxy Developers + + + + + @@ -288,8 +314,9 @@ warranty? Registration? Privoxy is licensed under the GNU General Public License (GPL). It is free to use, copy, modify or distribute as you wish - under the terms of this license. Please see the Copyright section for more - information on the license and copyright. + under the terms of this license. Please see the Copyright section for more information on the + license and copyright. @@ -1412,22 +1439,38 @@ FIXME: Commented out until we have something to put here. HB 03/18/02. - - Copyright and History - -Copyright - - ©right; - - - -History - - &history; - - + +Copyright, License and History - + Copyright + + ©right; + + + Portions of this document are borrowed from the original + Junkbuster (tm) FAQ, and modified as + appropriate for Privoxy. + + + + + License + + &license; + + + + + + History + + &history; + + + + + + Copyright and License + +Copyright ©right; + + +License + + &license; + + diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml index b219e284..3ca63862 100644 --- a/doc/source/user-manual.sgml +++ b/doc/source/user-manual.sgml @@ -8,6 +8,7 @@ + @@ -25,7 +26,7 @@ This file belongs into ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ - $Id: user-manual.sgml,v 1.103 2002/05/04 00:40:53 hal9 Exp $ + $Id: user-manual.sgml,v 1.104 2002/05/04 08:44:45 swa Exp $ Written by and Copyright (C) 2001 the SourceForge Privoxy team. http://www.privoxy.org/ @@ -44,10 +45,36 @@
+ Privoxy User Manual -$Id: user-manual.sgml,v 1.103 2002/05/04 00:40:53 hal9 Exp $ +$Id: user-manual.sgml,v 1.104 2002/05/04 08:44:45 swa Exp $ + + + 2001 + 2002 + Privoxy Developers + + + + + + @@ -5009,14 +5036,21 @@ Requests -Copyright and History +Copyright, License and History Copyright ©right; + + +License + + &license; + + @@ -5922,6 +5956,9 @@ Requests Temple Place - Suite 330, Boston, MA 02111-1307, USA. $Log: user-manual.sgml,v $ + Revision 1.104 2002/05/04 08:44:45 swa + bumped version + Revision 1.103 2002/05/04 00:40:53 hal9 -Remove the TOC first page kludge. It's fixed proper now in ldp.dsl.in. -Some minor additions to Quickstart. diff --git a/doc/source/webserver/index.sgml b/doc/source/webserver/index.sgml index 30e8ce31..71d6a823 100644 --- a/doc/source/webserver/index.sgml +++ b/doc/source/webserver/index.sgml @@ -4,6 +4,7 @@ + @@ -19,7 +20,7 @@ This file belongs into ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ - $Id: index.sgml,v 1.10 2002/04/26 17:24:31 swa Exp $ + $Id: index.sgml,v 1.11 2002/05/04 08:44:45 swa Exp $ Written by and Copyright (C) 2001, 2002 the SourceForge Privoxy team. http://www.privoxy.org/ @@ -43,7 +44,7 @@ -Privoxy - Homepage + stop, junk, privoxy, ad, advertisement, werbung, busters, junkbusters, junkbuster, mail, email, e-mail, direct, spam, spamoff, declare, telemarketing, telemarketers, privacy, sharing, names, renting, direct, marketing, database, databases, junk mail, lists, environment, conservation, recycling, catalogs, consumer, sending, opt out @@ -77,7 +78,7 @@ - + The project page on Sourceforge @@ -88,17 +89,17 @@ page on Sourceforge - + Stefan Waldherr's site - + Junkbusters Corporation - + @@ -111,17 +112,17 @@ page on Sourceforge - + Download recent releases - + Quickstart after installation - + Browse our CVS repository @@ -134,27 +135,27 @@ page on Sourceforge - + User manual - + Frequently Asked Questions - + Classic Man Page - + Pictures of the Privoxy Team - + Developer Manual @@ -171,9 +172,9 @@ page on Sourceforge -Copyright +License - ©right; + &license; @@ -187,8 +188,8 @@ page on Sourceforge - + @@ -207,6 +208,7 @@ page on Sourceforge + + + + Copyright © 2001, 2002 by Privoxy Developers + +