X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fwebserver%2Ffaq%2Fcopyright.html;h=88e8582e1e97398969abc2cdb37c081d7b6d8d40;hp=5d53a4da175d8e5a3c91c34354f6fbae2f57ea72;hb=7a99a61ab1a3ce0401821aedcd06eba19a698b2a;hpb=69b45dc21f48175fb34a8e1e2f45d46870e37941

diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html
index 5d53a4da..88e8582e 100644
--- a/doc/webserver/faq/copyright.html
+++ b/doc/webserver/faq/copyright.html
@@ -41,7 +41,7 @@
     <h1 class="SECT1"><a name="COPYRIGHT" id="COPYRIGHT">7. Privoxy
     Copyright, License and History</a></h1>
 
-    <p>Copyright &copy; 2001-2011 by Privoxy Developers <code class=
+    <p>Copyright &copy; 2001-2016 by Privoxy Developers <code class=
     "EMAIL">&lt;<a href=
     "mailto:ijbswa-developers@lists.sourceforge.net">ijbswa-developers@lists.sourceforge.net</a>&gt;</code></p>
 
@@ -55,52 +55,37 @@
     "APPLICATION">Privoxy</span>.</p>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="AEN1475" id="AEN1475">7.1. License</a></h2>
+      <h2 class="SECT2"><a name="AEN1484" id="AEN1484">7.1. License</a></h2>
 
       <p><span class="APPLICATION">Privoxy</span> is free software; you can
       redistribute it and/or modify it under the terms of the <i class=
       "CITETITLE">GNU General Public License</i>, version 2, as published by
       the Free Software Foundation.</p>
 
-      <p>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 <a href=
-      "http://www.gnu.org/licenses/old-licenses/gpl-2.0.html" target=
-      "_top"><i class="CITETITLE">GNU General Public License</i></a> for
-      details.</p>
-
-      <p>You should have received a copy of the <i class="CITETITLE">GNU
-      GPL</i> along with this program; if not, write to the</p>
-
-      <p class="ADDRESS">&nbsp;Free&nbsp;Software<br>
-      &nbsp;Foundation,&nbsp;Inc.&nbsp;<span class="STREET">51 Franklin
-      Street, Fifth Floor</span><br>
-      &nbsp;<span class="CITY">Boston</span>,&nbsp;<span class=
-      "STATE">MA</span>&nbsp;<span class="POSTCODE">02110-1301</span><br>
-      &nbsp;<span class="COUNTRY">USA</span>&nbsp;</p>
+      <p><span class="APPLICATION">Privoxy</span> 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 <a href=
+      "http://www.privoxy.org/user-manual/copyright.html#LICENSE" target=
+      "_top"><i class="CITETITLE">license</i></a> for details.</p>
     </div>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="AEN1491" id="AEN1491">7.2. History</a></h2>
+      <h2 class="SECT2"><a name="AEN1493" id="AEN1493">7.2. History</a></h2>
 
-      <p>A long time ago, there was the <a href=
-      "http://www.junkbusters.com/ijb.html" target="_top"><span class=
-      "APPLICATION">Internet Junkbuster</span></a>, by Anonymous Coders and
-      <a href="http://www.junkbusters.com/" target="_top">Junkbusters
-      Corporation</a>. This saved many users a lot of pain in the early days
-      of web advertising and user tracking.</p>
+      <p>A long time ago, there was the <span class="APPLICATION">Internet
+      Junkbuster</span>, by Anonymous Coders and Junkbusters Corporation.
+      This saved many users a lot of pain in the early days of web
+      advertising and user tracking.</p>
 
       <p>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
       <span class="APPLICATION">Internet Junkbuster</span> did not. Version
-      2.0.2, published in 1998, was (and is) the last official <a href=
-      "http://www.junkbusters.com/ijbdist.html#release" target=
-      "_top">release</a> available from <a href="http://www.junkbusters.com"
-      target="_top">Junkbusters Corporation</a>. Fortunately, it had been
-      released under the GNU <a href=
-      "http://www.gnu.org/licenses/old-licenses/gpl-2.0.html" target=
-      "_top">GPL</a>, which allowed further development by others.</p>
+      2.0.2, published in 1998, was the last official release, available from
+      Junkbusters Corporation. Fortunately, it had been released under the
+      GNU <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+      target="_top">GPL</a>, which allowed further development by others.</p>
 
       <p>So Stefan Waldherr started maintaining an improved version of the
       software, to which eventually a number of people contributed patches.
@@ -120,6 +105,10 @@
 
       <p>The result of this is <span class="APPLICATION">Privoxy</span>,
       whose first stable version, 3.0, was released August, 2002.</p>
+
+      <p>As of 2012 the Junkbusters Corporation's website
+      (http://www.junkbusters.com/) has been shut down, but Privoxy is still
+      actively maintained.</p>
     </div>
   </div>