X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fwebserver%2Ffaq%2Fcopyright.html;h=9741d06504257caa1b5e5e53c4555b417efac712;hp=7992875d9f4415dab81b14aa8ae0363b901152b9;hb=32b80c1607bb8338384942a1ae9d9c22d1eb4f67;hpb=dd8fb8e27e27aa0aad57d6b887192f5285825f65 diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html index 7992875d..9741d065 100644 --- a/doc/webserver/faq/copyright.html +++ b/doc/webserver/faq/copyright.html @@ -27,13 +27,12 @@

7. Privoxy Copyright, License and History

Copyright © 2001-2020 by Privoxy Developers <privoxy-devel@lists.privoxy.org>

-

Some source code is based on code Copyright © 1997 by Anonymous Coders and Junkbusters, Inc. and licensed - under the GNU General Public License.

+

Some source code is based on code Copyright © 1997 by Anonymous Coders and Junkbusters, Inc.

Portions of this document are "borrowed" from the original Junkbuster (tm) FAQ, and modified as appropriate for Privoxy.

-

7.1. License

+

7.1. License

Privoxy is free software; you can redistribute and/or modify its source code under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the license, or (at your option) any later version.

@@ -48,7 +47,7 @@ "CITETITLE">license for details.

-

7.2. History

+

7.2. History

A long time ago, there was the Internet Junkbuster, by Anonymous Coders and Junkbusters Corporation. This saved many users a lot of pain in the early days of web advertising and user tracking.

@@ -56,7 +55,7 @@ autonomy over their browsing, and for tracking them, keeps evolving. Unfortunately, the Internet Junkbuster 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 GPL, which allowed further development + "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html" target="_top">GPL, which allowed further development by others.

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