X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fwebserver%2Ffaq%2Fcopyright.html;h=009c313637aed873157cbc24ad999958f1a65b51;hb=5700aead3098beb0cc5a02bc0034a0d4194774a6;hp=dacc4dcf9750bb5cd973fb531b44f11ec8692c68;hpb=ba716001594e02b151c058333bee05e81c84e779;p=privoxy.git diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html index dacc4dcf..009c3136 100644 --- a/doc/webserver/faq/copyright.html +++ b/doc/webserver/faq/copyright.html @@ -1,11 +1,11 @@ + Privoxy Copyright, License and History7. Privoxy Copyright, License and History7. Privoxy Copyright, License and History

Copyright © 2001 - 2006 by Privoxy Developers Copyright © 2001-2011 by Privoxy Developers >

Some source code is based on code Copyright © 1997 by Anonymous Coders @@ -103,9 +106,9 @@ CLASS="SECT2" >

7.1. License

7.1. License

GNU General Public - License, version 2, as published by the Free Software Foundation.

GNU General Public License, version 2, + as published by the Free Software Foundation.

This program 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 - GNU General Public License for - - more details, which is available from the Free Software Foundation, Inc, 59 - Temple Place - Suite 330, Boston, MA 02111-1307, USA.

You should have received a copy of the GNU General Public License for details.

You should have received a copy of the GNU GPL along with this program; if not, write to the

 Free Software
 Foundation, Inc. 59 Temple Place - Suite 330
+>51 Franklin Street, Fifth Floor
 BostonMA 02111-130702110-1301
 

7.2. History

7.2. History

Along time ago, there was the +> A long time ago, there was the

But the web, its protocols and standards, and with it, the techniques for - forcing ads on users, give up autonomy over their browsing, and + forcing ads on users, give up autonomy over their browsing, and for tracking them, keeps evolving. Unfortunately, the Internet @@ -206,19 +205,14 @@ TARGET="_top" >. Fortunately, it had been released under the GNU GPL, which allowed further - development by others.

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. +> 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,