Regenerate docs
[privoxy.git] / doc / webserver / faq / copyright.html
index 177db39..5155548 100644 (file)
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
-
 <html>
 <head>
   <title>Privoxy Copyright, License and History</title>
@@ -12,9 +11,8 @@
   "Contacting the developers, Bug Reporting and Feature Requests" href=
   "contact.html">
   <link rel="STYLESHEET" type="text/css" href="../p_doc.css">
-  <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
-
 <body class="SECT1" bgcolor="#EEEEEE" text="#000000" link="#0000FF" vlink=
 "#840084" alink="#0000FF">
   <div class="NAVHEADER">
         <th colspan="3" align="center">Privoxy Frequently Asked
         Questions</th>
       </tr>
-
       <tr>
         <td width="10%" align="left" valign="bottom"><a href="contact.html"
         accesskey="P">Prev</a></td>
-
         <td width="80%" align="center" valign="bottom"></td>
-
         <td width="10%" align="right" valign="bottom">&nbsp;</td>
       </tr>
     </table>
     <hr align="left" width="100%">
   </div>
-
   <div class="SECT1">
     <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 � 2001-2017 by Privoxy Developers <code class=
     "EMAIL">&lt;<a href=
-    "mailto:ijbswa-developers@lists.sourceforge.net">ijbswa-developers@lists.sourceforge.net</a>&gt;</code></p>
-
-    <p>Some source code is based on code Copyright &copy; 1997 by Anonymous
-    Coders and Junkbusters, Inc. and licensed under the <i class=
-    "CITETITLE">GNU General Public License</i>.</p>
-
+    "mailto:privoxy-devel@lists.privoxy.org">privoxy-devel@lists.privoxy.org</a>&gt;</code></p>
+    <p>Some source code is based on code Copyright � 1997 by Anonymous Coders
+    and Junkbusters, Inc. and licensed under the <i class="CITETITLE">GNU
+    General Public License</i>.</p>
     <p>Portions of this document are <span class="QUOTE">"borrowed"</span>
     from the original <span class="APPLICATION">Junkbuster</span> (tm) FAQ,
     and modified as appropriate for <span class=
     "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="AEN1507" id="AEN1507">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=
+      "https://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="AEN1516" id="AEN1516">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.
       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
@@ -96,7 +71,6 @@
       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.
       It could already replace banners with a transparent image, and had a
       support, flexible per-site configuration, or content modification. The
       last release from this effort was version 2.0.2-10, published in
       2000.</p>
-
       <p>Then, some <a href=
-      "http://www.privoxy.org/user-manual/copyright.html#AUTHORS" target=
+      "https://www.privoxy.org/user-manual/copyright.html#AUTHORS" target=
       "_top">developers</a> picked up the thread, and started turning the
       software inside out, upside down, and then reassembled it, adding many
-      <a href="http://www.privoxy.org/user-manual/introduction.html#FEATURES"
+      <a href=
+      "https://www.privoxy.org/user-manual/introduction.html#FEATURES"
       target="_top">new features</a> along the way.</p>
-
       <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>
-
   <div class="NAVFOOTER">
     <hr align="left" width="100%">
-
     <table summary="Footer navigation table" width="100%" border="0"
     cellpadding="0" cellspacing="0">
       <tr>
         <td width="33%" align="left" valign="top"><a href="contact.html"
         accesskey="P">Prev</a></td>
-
         <td width="34%" align="center" valign="top"><a href="index.html"
         accesskey="H">Home</a></td>
-
         <td width="33%" align="right" valign="top">&nbsp;</td>
       </tr>
-
       <tr>
         <td width="33%" align="left" valign="top">Contacting the developers,
         Bug Reporting and Feature Requests</td>
-
         <td width="34%" align="center" valign="top">&nbsp;</td>
-
         <td width="33%" align="right" valign="top">&nbsp;</td>
       </tr>
     </table>