X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fwebserver%2Ffaq%2Fcopyright.html;h=f4d5f9f7613becafc7ded4b5d8d631d7e9209ebe;hb=572a36c86b0873e9624908e893d1b9ed41e942bc;hp=be6c2534b7cb8f08c3777ef833a9e9128753fca2;hpb=d9813d602eb59d009d10e6d3861cd99821a6db70;p=privoxy.git diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html index be6c2534..f4d5f9f7 100644 --- a/doc/webserver/faq/copyright.html +++ b/doc/webserver/faq/copyright.html @@ -7,7 +7,7 @@ - +
@@ -25,15 +25,15 @@

7. Privoxy Copyright, License and History

-

Copyright � 2001-2017 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.

+

Copyright © 2001-2018 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.

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 it and/or modify it under the terms of the GNU General Public License, version 2, as published by the Free Software Foundation.

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