From 74b1753765138b23b31d088ce95c9817901a0761 Mon Sep 17 00:00:00 2001 From: swa Date: Thu, 4 Apr 2002 17:27:57 +0000 Subject: [PATCH] more single file to be included at multiple points. make maintaining easier --- doc/source/copyright.sgml | 48 ++++++++++++++ doc/source/developer-manual.sgml | 53 +++++++++------ doc/source/history.sgml | 36 +++++++++++ doc/source/user-manual.sgml | 107 ++++++++----------------------- 4 files changed, 147 insertions(+), 97 deletions(-) create mode 100644 doc/source/copyright.sgml create mode 100644 doc/source/history.sgml diff --git a/doc/source/copyright.sgml b/doc/source/copyright.sgml new file mode 100644 index 00000000..d3234259 --- /dev/null +++ b/doc/source/copyright.sgml @@ -0,0 +1,48 @@ + + + + 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. + + + + 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 5dc4bff6..9ecfc232 100644 --- a/doc/source/developer-manual.sgml +++ b/doc/source/developer-manual.sgml @@ -3,6 +3,10 @@ + + + + @@ -17,7 +21,7 @@ This file belongs into ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ - $Id: developer-manual.sgml,v 1.20 2002/04/04 03:28:27 david__schmidt Exp $ + $Id: developer-manual.sgml,v 1.21 2002/04/04 06:48:37 hal9 Exp $ Written by and Copyright (C) 2001 the SourceForge Privoxy team. http://www.privoxy.org/ @@ -31,7 +35,7 @@ Privoxy Developer Manual - $Id: developer-manual.sgml,v 1.20 2002/04/04 03:28:27 david__schmidt Exp $ + $Id: developer-manual.sgml,v 1.21 2002/04/04 06:48:37 hal9 Exp $ @@ -1320,7 +1324,7 @@ static void unload_re_filterfile( void *f ) { ... } Example for file comments: -const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.20 2002/04/04 03:28:27 david__schmidt Exp $"; +const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.21 2002/04/04 06:48:37 hal9 Exp $"; /********************************************************************* * * File : $Source$ @@ -1380,7 +1384,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.20 2002/04/04 03:28:27 david__schmidt Exp $" +#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.21 2002/04/04 06:48:37 hal9 Exp $" /********************************************************************* * * File : $Source$ @@ -2055,28 +2059,34 @@ zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg Contact the developers - - Please see the contact page in the user-manual for details. - + + &contacting; + Copyright and History - - Please see the user-manual for - information on Copyright and History. - + +Copyright + + ©right; + + + +History + + &history; + + + See also - - Please see the user-manual for others - references. - + + &seealso; + + + + + Privoxy is evolved, and derived from, + the Internet Junkbuster, with many + improvments and enhancements over the original. + + + + Junkbuster was originally written by Anonymous + Coders and Junkbuster's + Corporation, and was released as free open-source software under the + GNU GPL. Stefan + Waldherr made many improvements, and started the SourceForge project + Privoxy to rekindle development. There are now several active + developers contributing. The last stable release of + Junkbuster was v2.0.2, which has now + grown whiskers ;-). + + + diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml index 02874eaf..3c2b8276 100644 --- a/doc/source/user-manual.sgml +++ b/doc/source/user-manual.sgml @@ -6,6 +6,8 @@ + + @@ -22,7 +24,7 @@ This file belongs into ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ - $Id: user-manual.sgml,v 1.65 2002/04/03 19:52:07 swa Exp $ + $Id: user-manual.sgml,v 1.66 2002/04/04 06:48:37 hal9 Exp $ Written by and Copyright (C) 2001 the SourceForge Privoxy team. http://www.privoxy.org/ @@ -37,7 +39,7 @@ Privoxy User Manual -$Id: user-manual.sgml,v 1.65 2002/04/03 19:52:07 swa Exp $ +$Id: user-manual.sgml,v 1.66 2002/04/04 06:48:37 hal9 Exp $ @@ -60,15 +62,14 @@ The user manual gives users information on how to install, configure and use - Privoxy. Privoxy is a - web proxy with advanced filtering capabilities for protecting privacy, - filtering web page content, managing cookies, controlling access, and - removing ads, banners, pop-ups and other obnoxious Internet - Junk. Privoxy has a very flexible configuration - and can be customized to suit individual needs and - tastes. Privoxy has application for both - stand-alone systems and multi-user networks. - + Privoxy. + + + + &p-intro; + You can find the latest version of the user manual at http://www.privoxy.org/user-manual/. @@ -86,10 +87,6 @@ Introduction - - &p-intro; - - This documentation is included with the current &p-status; version of Privoxy and is mostly complete at this @@ -3174,42 +3171,10 @@ Requests Copyright and History - -License - - 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. - - - - 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. - - +Copyright + + ©right; + @@ -3217,41 +3182,18 @@ Requests - -History - - Privoxy is evolved, and derived from, - the Internet Junkbuster, with many - improvments and enhancements over the original. - - - - Junkbuster was originally written by Anonymous - Coders and Junkbuster's - Corporation, and was released as free open-source software under the - GNU GPL. Stefan - Waldherr made many improvements, and started the SourceForge project - Privoxy to rekindle development. There are now several active - developers contributing. The last stable release of - Junkbuster was v2.0.2, which has now - grown whiskers ;-). - - +History + + &history; + - See Also - - &seealso; - - - + @@ -3987,6 +3929,13 @@ Requests Temple Place - Suite 330, Boston, MA 02111-1307, USA. $Log: user-manual.sgml,v $ + Revision 1.66 2002/04/04 06:48:37 hal9 + Structural changes to allow for conditional inclusion/exclusion of content + based on entity toggles, e.g. 'entity % p-not-stable "INCLUDE"'. And + definition of internal entities, e.g. 'entity p-version "2.9.13"' that will + eventually be set by Makefile. + More boilerplate text for use across multiple docs. + Revision 1.65 2002/04/03 19:52:07 swa enhance squid section due to user suggestion -- 2.39.2