rebuild docs

[privoxy.git] / doc / webserver / faq / copyright.html

diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html
index 81e2531..ae5b5c3 100644 (file)
--- a/doc/webserver/faq/copyright.html
+++ b/doc/webserver/faq/copyright.html
@@ -73,11 +73,11 @@ NAME="COPYRIGHT"
 >7. Privoxy Copyright, License and History</A
 ></H1
 ><P
-> Copyright © 2001-2010 by Privoxy Developers <CODE
+> Copyright © 2001-2017 by Privoxy Developers <CODE
 CLASS="EMAIL"
 >&#60;<A
-HREF="mailto:ijbswa-developers@lists.sourceforge.net"
->ijbswa-developers@lists.sourceforge.net</A
+HREF="mailto:privoxy-devel@lists.privoxy.org"
+>privoxy-devel@lists.privoxy.org</A
 >&#62;</CODE
 ></P
 ><P
@@ -95,7 +95,7 @@ CLASS="QUOTE"
    <SPAN
 CLASS="APPLICATION"
 >Junkbuster</SPAN
-> (tm) FAQ, and modified as 
+> (tm) FAQ, and modified as
    appropriate for <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -106,7 +106,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1461"
+NAME="AEN1501"
 >7.1. License</A
 ></H2
 ><P
@@ -114,76 +114,43 @@ NAME="AEN1461"
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > is free software; you can
- redistribute it and/or modify it under the terms of the 
+ 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"
+> <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"
->GNU General Public License</I
+>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
-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
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1477"
+NAME="AEN1510"
 >7.2. History</A
 ></H2
 ><P
-> A long time ago, there was the
- <A
-HREF="http://www.junkbusters.com/ijb.html"
-TARGET="_top"
-><SPAN
+> A long time ago, there was the <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
+>,
+ 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
@@ -191,18 +158,8 @@ TARGET="_top"
 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
->.
+> did not. Version 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"
@@ -221,14 +178,14 @@ TARGET="_top"
 ><P
 > Then, some
  <A
-HREF="http://www.privoxy.org/user-manual/copyright.html#AUTHORS"
+HREF="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"
+HREF="https://www.privoxy.org/user-manual/introduction.html#FEATURES"
 TARGET="_top"
 >new
  features</A
@@ -238,8 +195,11 @@ TARGET="_top"
 CLASS="APPLICATION"
 >Privoxy</SPAN
 >, whose first
- stable version, 3.0, was released August, 2002. 
+ 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