Catch up on recent source changes.

[privoxy.git] / doc / webserver / developer-manual / copyright.html

diff --git a/doc/webserver/developer-manual/copyright.html b/doc/webserver/developer-manual/copyright.html
index 783b6f7..f409341 100644 (file)
--- a/doc/webserver/developer-manual/copyright.html
+++ b/doc/webserver/developer-manual/copyright.html
@@ -93,7 +93,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1061"
+NAME="AEN1121"
 >9.1. License</A
 ></H2
 ><P
@@ -155,47 +155,86 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1077"
+NAME="AEN1137"
 >9.2. History</A
 ></H2
 ><P
-> <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> is evolved, and derived from, 
- <SPAN
+> In the beginning, there was the
+ <A
+HREF="http://www.junkbusters.com/ijb.html"
+TARGET="_top"
+><SPAN
 CLASS="APPLICATION"
->the Internet Junkbuster</SPAN
->, with many 
- improvments and enhancements over the original.</P
+>Internet Junkbuster</SPAN
+></A
+>, 
+ by Anonymous Coders and <A
+HREF="http://www.junkbusters.com/"
+TARGET="_top"
+>Junkbusters
+ Corporation</A
+>. It saved many users a lot of pain in the early days of
+ web advertising and user tracking.</P
 ><P
-> <SPAN
+> 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 <SPAN
 CLASS="APPLICATION"
->Junkbuster</SPAN
-> was originally written by Anonymous
- Coders and <A
+>Internet
+ Junkbuster</SPAN
+> did not. Version 2.0.2, published in 1998, was 
+ (and is) the last official
+ <A
+HREF="http://www.junkbusters.com/ijbdist.html#release"
+TARGET="_top"
+>release</A
+>
+ available from <A
 HREF="http://www.junkbusters.com"
 TARGET="_top"
->Junkbusters
- Corporation</A
->, and was released as free open-source software under the
- GNU GPL. <A
+>Junkbusters Corporation</A
+>.
+ Fortunately, it had been released under the GNU
+ <A
+HREF="http://www.gnu.org/licenses/gpl.html"
+TARGET="_top"
+> GPL</A
+>, which allowed further
+ development by others.</P
+><P
+> So Stefan Waldherr started maintaining an
+ <A
 HREF="http://www.waldherr.org/junkbuster/"
 TARGET="_top"
->Stefan
- Waldherr</A
-> made many improvements, and started the <A
-HREF="http://sourceforge.net/projects/ijbswa/"
+>improved version of the
+ software</A
+>, 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.</P
+><P
+> Then, some
+ <A
+HREF="http://www.privoxy.org/user-manual/copyright.html#AUTHORS"
+TARGET="_top"
+>developers</A
+>
+ picked up the thread, and started turning the software inside out, upside down,
+ and then reassembled it, adding many
+ <A
+HREF="http://www.privoxy.org/user-manual/introduction.html#FEATURES"
 TARGET="_top"
->SourceForge project
- Privoxy</A
-> to rekindle development. There are now several active
- developers contributing.  The last stable release of
- <SPAN
+>new
+ features</A
+> along the way.</P
+><P
+> The result of this is <SPAN
 CLASS="APPLICATION"
->Junkbuster</SPAN
-> was v2.0.2, which has now
- grown whiskers ;-).</P
+>Privoxy</SPAN
+>, whose first
+ stable release, 3.0, is due in May 2002.</P
 ></DIV
 ></DIV
 ><DIV