X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Fhistory.sgml;h=1606103ffc313816a085bf7b659b7f340d8120ee;hb=9e8218ff00c020b0d3216744fb3f26242326ada5;hp=7b2e1f4e40f2698adf4432a19797b898ed349285;hpb=fa02cdaa2e86edacdb377430dce8c46187f49a65;p=privoxy.git

diff --git a/doc/source/history.sgml b/doc/source/history.sgml
index 7b2e1f4e..1606103f 100644
--- a/doc/source/history.sgml
+++ b/doc/source/history.sgml
@@ -2,21 +2,17 @@
  File        :  $Source: /cvsroot/ijbswa/current/doc/source/history.sgml,v $
 
  Purpose     :  Entity included in other project documents.
-                
- $Id: history.sgml,v 1.3 2002/04/07 08:10:12 swa Exp $
 
- Written by and Copyright (C) 2001 the SourceForge
- Privoxy team. http://www.privoxy.org/
+ $Id: history.sgml,v 2.8 2011/09/04 11:10:12 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-2009 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 
+ If you make changes to this file, please verify the finished
  docs all display as intended.
 
  This file is included into:
@@ -29,23 +25,48 @@
 -->
 
 <para>
- <application>Privoxy</application> is evolved, and derived from, 
- <application>the Internet Junkbuster</application>, with many 
- improvments and enhancements over the original.
+ A long time ago, there was the <application>Internet Junkbuster</application>,
+ by Anonymous Coders and Junkbusters Corporation. This saved many users a lot of
+ pain in the early days of  web advertising and user tracking.
 </para>
 
 <para>
- <application>Junkbuster</application> was originally written by Anonymous
- Coders and <ulink
- url="http://www.junkbusters.com">Junkbusters
- Corporation</ulink>, and was released as free open-source software under the
- GNU GPL. <ulink url="http://www.waldherr.org/junkbuster/">Stefan
- Waldherr</ulink> made many improvements, and started the <ulink
- url="http://sourceforge.net/projects/ijbswa/">SourceForge project
- Privoxy</ulink> to rekindle development. There are now several active
- developers contributing.  The last stable release of
- <application>Junkbuster</application> was v2.0.2, which has now
- grown whiskers ;-).
+ But the web, its protocols and standards, and with it, the techniques for
+ forcing ads on users, give up autonomy over their browsing, and
+ for tracking them, keeps evolving. Unfortunately, the <application>Internet
+ Junkbuster</application> did not. Version 2.0.2, published in 1998, was
+ the last official release, available from Junkbusters Corporation.
+ Fortunately, it had been released under the GNU
+ <ulink url="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GPL</ulink>,
+ which allowed further development by others.
 </para>
 
+<para>
+ So Stefan Waldherr started maintaining an improved version of the
+ software, to which eventually a number of people contributed patches.
+ It could already replace banners with a transparent image, and had a first
+ version of pop-up killing, but it was still very closely based on the
+ original, with all its limitations, such as the lack of HTTP/1.1 support,
+ flexible per-site configuration, or content modification. The last release
+ from this effort was version 2.0.2-10, published in 2000.
+</para>
+
+<para>
+ Then, some
+ <ulink url="http://www.privoxy.org/user-manual/copyright.html#AUTHORS">developers</ulink>
+ picked up the thread, and started turning the software inside out, upside down,
+ and then reassembled it, adding many
+ <ulink url="http://www.privoxy.org/user-manual/introduction.html#FEATURES">new
+ features</ulink> along the way.
+</para>
 
+<para>
+ The result of this is <application>Privoxy</application>, whose first
+ stable version, 3.0, was released August, 2002.
+ <!-- Cautious!!!!!!!!! ;) -->
+</para>
+
+<para>
+ As of 2012 the Junkbusters Corporation's website (http://www.junkbusters.com/)
+ has been shut down, but Privoxy is still actively maintained.
+</para>