From 04b89b813bf37fd2fd6da8f473da306682d03da9 Mon Sep 17 00:00:00 2001 From: Fabian Keil <fk@fabiankeil.de> Date: Sat, 13 Feb 2010 16:39:07 +0000 Subject: [PATCH] Rebuilt with 'How did you manage to get Privoxy on my computer without my consent?' entry. --- doc/webserver/faq/copyright.html | 8 +++---- doc/webserver/faq/index.html | 19 +++++++++------ doc/webserver/faq/misc.html | 41 +++++++++++++++++++++++++++++++- doc/webserver/faq/trouble.html | 6 ++--- 4 files changed, 59 insertions(+), 15 deletions(-) diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html index e69b829e..0a110796 100644 --- a/doc/webserver/faq/copyright.html +++ b/doc/webserver/faq/copyright.html @@ -73,7 +73,7 @@ NAME="COPYRIGHT" >7. Privoxy Copyright, License and History</A ></H1 ><P -> Copyright © 2001-2009 by Privoxy Developers <CODE +> Copyright © 2001-2010 by Privoxy Developers <CODE CLASS="EMAIL" ><<A HREF="mailto:ijbswa-developers@lists.sourceforge.net" @@ -106,7 +106,7 @@ CLASS="SECT2" ><H2 CLASS="SECT2" ><A -NAME="AEN1447" +NAME="AEN1454" >7.1. License</A ></H2 ><P @@ -164,7 +164,7 @@ CLASS="SECT2" ><H2 CLASS="SECT2" ><A -NAME="AEN1463" +NAME="AEN1470" >7.2. History</A ></H2 ><P @@ -298,4 +298,4 @@ VALIGN="top" ></DIV ></BODY ></HTML -> \ No newline at end of file +> diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html index 3f9b0125..24908f56 100644 --- a/doc/webserver/faq/index.html +++ b/doc/webserver/faq/index.html @@ -38,7 +38,7 @@ CLASS="PUBDATE" > <A HREF="copyright.html" >Copyright</A -> © 2001-2009 by +> © 2001-2010 by <A HREF="http://www.privoxy.org/" TARGET="_top" @@ -48,7 +48,7 @@ TARGET="_top" ><BR></P ><P CLASS="PUBDATE" ->$Id: faq.sgml,v 2.67 2009/11/15 14:24:12 fabiankeil Exp $<BR></P +>$Id: faq.sgml,v 2.68 2010/01/30 19:51:28 fabiankeil Exp $<BR></P ><DIV ><DIV CLASS="ABSTRACT" @@ -702,6 +702,11 @@ CLASS="QUOTE" >"valid"</SPAN > HTML (or XHTML)?</A ></DT +><DT +>4.27. <A +HREF="misc.html#SURPRISE-PRIVOXY" +>How did you manage to get Privoxy on my computer without my consent?</A +></DT ></DL ></DD ><DT @@ -713,7 +718,7 @@ HREF="trouble.html" ><DL ><DT >5.1. <A -HREF="trouble.html#AEN1076" +HREF="trouble.html#AEN1083" >I cannot connect to any websites. Or, I am getting <SPAN CLASS="QUOTE" @@ -727,7 +732,7 @@ HREF="trouble.html#ERROR503" ></DT ><DT >5.3. <A -HREF="trouble.html#AEN1099" +HREF="trouble.html#AEN1106" >I just added a new rule, but the steenkin ad is still getting through. How?</A ></DT @@ -931,12 +936,12 @@ HREF="copyright.html" ><DL ><DT >7.1. <A -HREF="copyright.html#AEN1447" +HREF="copyright.html#AEN1454" >License</A ></DT ><DT >7.2. <A -HREF="copyright.html#AEN1463" +HREF="copyright.html#AEN1470" >History</A ></DT ></DL @@ -996,4 +1001,4 @@ VALIGN="top" ></DIV ></BODY ></HTML -> \ No newline at end of file +> diff --git a/doc/webserver/faq/misc.html b/doc/webserver/faq/misc.html index 53e619e6..5a9c2a13 100644 --- a/doc/webserver/faq/misc.html +++ b/doc/webserver/faq/misc.html @@ -1681,6 +1681,45 @@ CLASS="APPLICATION" should always conform to the HTML 4.01 specifications, it has not been validated against this or any other standard. </P ></DIV +><DIV +CLASS="SECT2" +><H3 +CLASS="SECT2" +><A +NAME="SURPRISE-PRIVOXY" +>4.27. How did you manage to get Privoxy on my computer without my consent?</A +></H3 +><P +> We didn't. We make Privoxy available for download, but we don't go + around installing it on other people's systems behind their back. + If you discover Privoxy running on your system and are sure you didn't + install it yourself, somebody else did. You may not even be running + the real Privoxy, but maybe something else that only pretends to be + Privoxy, or maybe something that is based on the real Privoxy, + but has been modified.</P +><P +> Lately there have been reports of problems with some kind of + Privoxy versions that come preinstalled on some Netbooks. + Some of the problems described are inconsistent with the behaviour + of official Privoxy versions, which suggests that the preinstalled + software may contain vendor modifications that we don't know about + and thus can't debug.</P +><P +> Privoxy's <A +HREF="copyright.html" +>license</A +> allows vendor + modifications, but the vendor has to comply with the license, + which involves informing the user about the changes and to make + the changes available under the same license as Privoxy itself.</P +><P +> If you are having trouble with a modified Privoxy version, + please try to talk to whoever made the modifications before + reporting the problem to us. Please also try to convince + whoever made the modifications to talk to us. If you think + somebody gave you a modified Privoxy version without complying + to the license, please let us know.</P +></DIV ></DIV ><DIV CLASS="NAVFOOTER" @@ -1742,4 +1781,4 @@ VALIGN="top" ></DIV ></BODY ></HTML -> \ No newline at end of file +> diff --git a/doc/webserver/faq/trouble.html b/doc/webserver/faq/trouble.html index c32a5251..c901cb0f 100644 --- a/doc/webserver/faq/trouble.html +++ b/doc/webserver/faq/trouble.html @@ -84,7 +84,7 @@ CLASS="SECT2" ><H3 CLASS="SECT2" ><A -NAME="AEN1076" +NAME="AEN1083" >5.1. I cannot connect to any websites. Or, I am getting <SPAN CLASS="QUOTE" @@ -163,7 +163,7 @@ CLASS="SECT2" ><H3 CLASS="SECT2" ><A -NAME="AEN1099" +NAME="AEN1106" >5.3. I just added a new rule, but the steenkin ad is still getting through. How?</A ></H3 @@ -1273,4 +1273,4 @@ VALIGN="top" ></DIV ></BODY ></HTML -> \ No newline at end of file +> -- 2.49.0