X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Fprivoxy.sgml;h=0d4836915e484b6506af6695050b0ec00d521b78;hb=c69d804f689724964dcc46afb1e61a72373bda15;hp=d6174e512e40489ee8935b96b6b2e32b335fb0dc;hpb=d7cc11956d778be9da159f012e80733d2d082706;p=privoxy.git

diff --git a/doc/source/privoxy.sgml b/doc/source/privoxy.sgml
index d6174e51..0d483691 100644
--- a/doc/source/privoxy.sgml
+++ b/doc/source/privoxy.sgml
@@ -2,48 +2,60 @@
  File        :  $Source: /cvsroot/ijbswa/current/doc/source/privoxy.sgml,v $
 
  Purpose     :  Entity included in other project documents.
-                
- $Id: privoxy.sgml,v 1.1 2002/04/02 00:54:19 hal9 Exp $
 
- Written by and Copyright (C) 2001 the SourceForge
- Privoxy team. http://www.privoxy.org/
+ $Id: privoxy.sgml,v 2.11 2011/08/18 11:42:50 fabiankeil Exp $
 
- Based on the Internet Junkbuster originally written
- by and Copyright (C) 1997 Anonymous Coders and 
- Junkbusters Corporation.  http://www.junkbusters.com
-
--->
-
-<!--
+ Copyright (C) 2001-2011 Privoxy Developers http://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
+
 -->
 
 <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 and licensed under the GNU GPLv2.
 </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:
+ <itemizedlist>
+  <listitem>
+    <para>
+      <ulink url="http://www.privoxy.org/faq/general.html#PARTICIPATE"
+        >http://www.privoxy.org/faq/general.html#PARTICIPATE</ulink>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+     <ulink url="http://www.privoxy.org/faq/general.html#DONATE"
+        >http://www.privoxy.org/faq/general.html#DONATE</ulink>
+    </para>
+  </listitem>
+ </itemizedlist>
+</para>