X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fwebserver%2Ffaq%2Fcopyright.html;h=9b27c3d324fc559ae98a9af9cccc1489de7ba16b;hp=5b11676ac0b414ec8bd97540ea435cf16d0b1299;hb=2d1af75a04189057eb4cf4949908a3cdf9ca2b6e;hpb=1c4bd7276a5f733e283c0484803bfca670f76654 diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html index 5b11676a..9b27c3d3 100644 --- a/doc/webserver/faq/copyright.html +++ b/doc/webserver/faq/copyright.html @@ -1,161 +1,92 @@ - + -
-- Privoxy Frequently Asked Questions - | -||
---|---|---|
- Prev - | -- | -- - | -
Privoxy Frequently Asked Questions | +||
---|---|---|
Prev | ++ | + |
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.
+Portions of this document are "borrowed" from the original Junkbuster (tm) FAQ, and modified as appropriate for Privoxy.
+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.
+The same is true for Privoxy binaries unless they are linked with a mbed TLS version that is licensed under the Apache 2.0 license in which + case you can redistribute and/or modify the Privoxy binaries under the terms of + the GNU General Public License as published by the Free Software Foundation, either + version 3 of the license, or (at your option) any later version.
+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 PURPOSE. See the + license for details.
- Copyright © 2001-2016 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. -
-- Portions of this document are "borrowed" - from the original Junkbuster (tm) - FAQ, and modified as appropriate for Privoxy. -
-- 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 - PURPOSE. See the license for details. -
-- 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 - 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 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 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. -
-- Then, some developers picked up the thread, and started - turning the software inside out, upside down, and then reassembled - it, adding many 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. -
-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 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 + 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 + 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.
+Then, some developers + picked up the thread, and started turning the software inside out, upside down, and then reassembled it, adding + many 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.