X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fwebserver%2Ffaq%2Fcopyright.html;h=428024e282f330a82aa47958bbef0a747af1e5a7;hp=32f6b2ea0e5cf68c7ff2b3a05ef960d159f27009;hb=6de6bda5b29cbb5a8aef6863c1b5ca999ab4887b;hpb=7d0d8bdd53947864c64d968062ca132b65f2e162 diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html index 32f6b2ea..428024e2 100644 --- a/doc/webserver/faq/copyright.html +++ b/doc/webserver/faq/copyright.html @@ -1,6 +1,5 @@ - Privoxy Copyright, License and History @@ -12,9 +11,8 @@ "Contacting the developers, Bug Reporting and Feature Requests" href= "contact.html"> - + - -

7. Privoxy Copyright, License and History

- -

Copyright © 2001-2016 by Privoxy Developers Copyright � 2001-2016 by Privoxy Developers

- -

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. and licensed under the GNU + General Public License.

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

-

7.1. License

-

Privoxy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as published by the Free Software Foundation.

-

Privoxy is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -69,15 +57,12 @@ "https://www.privoxy.org/user-manual/copyright.html#LICENSE" target= "_top">license for details.

-

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.

-

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 @@ -86,7 +71,6 @@ Junkbusters Corporation. Fortunately, it had been released under the GNU 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 @@ -95,7 +79,6 @@ support, flexible per-site configuration, or content modification. The last release from this effort was version 2.0.2-10, published in 2000.

-

Then, some developers picked up the thread, and started turning the @@ -103,37 +86,28 @@ new features along the way.

-

The result of this is Privoxy, whose first stable version, 3.0, was released August, 2002.

-

As of 2012 the Junkbusters Corporation's website (http://www.junkbusters.com/) has been shut down, but Privoxy is still actively maintained.

-