X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=doc%2Fwebserver%2Ffaq%2Fcopyright.html;h=80121e15fa5321607ddccc6964c26ec3f189b27a;hb=2a468ab6482020e6c842fddd3dc22839865cffc0;hp=177db393104996be0057098f23bf6283cdcc988b;hpb=4fef8970e4e382c21598949e7b035e596a4a8048;p=privoxy.git

diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html
index 177db393..80121e15 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-2013 by Privoxy Developers <code class=
+    <p>Copyright &copy; 2001-2015 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,33 +55,23 @@
     "APPLICATION">Privoxy</span>.</p>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="AEN1470" id="AEN1470">7.1. License</a></h2>
+      <h2 class="SECT2"><a name="AEN1469" id="AEN1469">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="AEN1486" id="AEN1486">7.2. History</a></h2>
+      <h2 class="SECT2"><a name="AEN1478" id="AEN1478">7.2. History</a></h2>
 
       <p>A long time ago, there was the <span class="APPLICATION">Internet
       Junkbuster</span>, by Anonymous Coders and Junkbusters Corporation.