Clarify that Privoxy can also be used under the terms of a license later than the...

[privoxy.git] / doc / source / privoxy.sgml

diff --git a/doc/source/privoxy.sgml b/doc/source/privoxy.sgml
index 0128c6d..cdcb125 100644 (file)
--- a/doc/source/privoxy.sgml
+++ b/doc/source/privoxy.sgml
@@ -1,40 +1,63 @@
 <!--
- File        :  $Source: /cvsroot/ijbswa/current/doc/source/privoxy.sgml,v $
+ File        :  doc/source/privoxy.sgml
 
  Purpose     :  Entity included in other project documents.
-                
- $Id: privoxy.sgml,v 1.0 2002/04/01 16:24:49 hal9 Exp $
 
- Written by and Copyright (C) 2001 the SourceForge
- Privoxy team. http://www.privoxy.org/
+ Copyright (C) 2001-2018 Privoxy Developers https://www.privoxy.org/
+ See LICENSE.
+
+ ======================================================================
+  This file used for inclusion with other documents only.
+ ======================================================================
+
+ If you make changes to this file, please verify the finished
+ docs all display as intended.
+
+ This file is included into:
+
+  privoxy-man-page
+  user-manual
+  faq
+  developer-manual
+  README
+  webserver/index.sgml
 
- Based on the Internet Junkbuster originally written
- by and Copyright (C) 1997 Anonymous Coders and 
- Junkbusters Corporation.  http://www.junkbusters.com
 -->
 
 <para>
- <application>Privoxy</application> 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. <application>Privoxy</application> has a very
- flexible configuration and can be customized to suit individual needs and
- tastes. <application>Privoxy</application> has application for both
- stand-alone systems and multi-user networks.
+ Privoxy is a non-caching web proxy with advanced filtering capabilities
+ for enhancing privacy, modifying web page data and HTTP headers, controlling
+ access, and removing ads and other obnoxious Internet junk. Privoxy has a
+ flexible configuration and can be customized to suit individual needs and tastes.
+ It has application for both stand-alone systems and multi-user networks.
 </para>
 
 <para>
- <application>Privoxy</application> is based on the code of the 
- <application>Internet Junkbuster</application>.
- <application>Junkbuster</application> was originally written by JunkBusters
- Corporation, and was released as free open-source software under the GNU GPL.
- Stefan Waldherr made many improvements, and started the SourceForge project
- to continue development.
+ Privoxy is Free Software. You can redistribute it and/or modify it
+ under the terms of the GNU GPLv2 or (at your option) any later
+ version published by the FSF.
 </para>
 
 <para>
- <application>Privoxy</application> continues the
- <application>Junkbuster</application> tradition, but adds many 
- refinements and enhancements.
+ Privoxy is an associated project of Software in the Public Interest (SPI).
 </para>
 
+<para>
+ Helping hands and donations are welcome:
+</para>
+<para>
+ <itemizedlist>
+  <listitem>
+    <para>
+      <ulink url="https://www.privoxy.org/faq/general.html#PARTICIPATE">
+                  https://www.privoxy.org/faq/general.html#PARTICIPATE</ulink>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+     <ulink url="https://www.privoxy.org/faq/general.html#DONATE">
+                 https://www.privoxy.org/faq/general.html#DONATE</ulink>
+    </para>
+  </listitem>
+ </itemizedlist>
+</para>