X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Fhistory.sgml;h=c3a55b3d09c7f309ab075256bf43c4f71e2b1434;hp=2ed79fb18db164eccf5dabc219677c4977ef9477;hb=5a5807409ae15a99c2e7365f292a6de0054257e3;hpb=74b1753765138b23b31d088ce95c9817901a0761

diff --git a/doc/source/history.sgml b/doc/source/history.sgml
index 2ed79fb1..c3a55b3d 100644
--- a/doc/source/history.sgml
+++ b/doc/source/history.sgml
@@ -1,36 +1,71 @@
 <!--
- File        :  $Source: /cvsroot/ijbswa/current/doc/source/seealso.sgml,v $
+ File        :  $Source: /cvsroot/ijbswa/current/doc/source/history.sgml,v $
 
  Purpose     :  Entity included in other project documents.
                 
- $Id: seealso.sgml,v 1.1 2002/04/02 01:48:33 hal9 Exp $
+ $Id: history.sgml,v 1.7 2002/05/17 13:47:33 oes Exp $
 
- Written by and Copyright (C) 2001 the SourceForge
- Privoxy team. http://www.privoxy.org/
+  Copyright (C) 2001, 2002 Privoxy Developers <developers@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:
+
+  user-manual
+  developer-manual
+  faq
 
- 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 evolved, and derived from, 
- <application>the Internet Junkbuster</application>, with many 
- improvments and enhancements over the original.
+ In the beginning, there was the
+ <ulink url="http://www.junkbusters.com/ijb.html"><application>Internet Junkbuster</application></ulink>, 
+ by Anonymous Coders and <ulink url="http://www.junkbusters.com/">Junkbusters
+ Corporation</ulink>. It saved many users a lot of pain in the early days of
+ web advertising and user tracking.
+</para>
+
+<para>
+ But the web, its protocols and standards, and with it, the techniques for
+ forcing  users to consume ads, give up autonomy over their browsing, and
+ for spying on them, kept evolving. Unfortunately, the <application>Internet
+ Junkbuster</application> did not. Version 2.0.2, published in 1998, was 
+ (and is) the last official
+ <ulink url="http://www.junkbusters.com/ijbdist.html#release">release</ulink>
+ available from <ulink url="http://www.junkbusters.com">Junkbusters Corporation</ulink>.
+ Fortunately, it had been released under the GNU
+ <ulink url="http://www.gnu.org/licenses/gpl.html"> GPL</ulink>, which allowed further
+ development by others.
+</para>
+
+<para>
+ So Stefan Waldherr started maintaining an
+ <ulink url="http://www.waldherr.org/junkbuster/">improved version of the
+ software</ulink>, 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>
- <application>Junkbuster</application> was originally written by Anonymous
- Coders and <ulink
- url="http://www.junkbusters.com">Junkbuster's
- 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 ;-).
+ 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 release, 3.0, is due in May 2002.
+</para>