X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Ffaq.sgml;h=274a6866840545f4de134f0ee7cdd56654aea2a0;hb=70b9ed04dec24ef32a00a14dbe2a1556275e9bd3;hp=e64c31591597bfc8d4f30b9b45411fdc60cc8a9b;hpb=7629bc44c1537497c2b33bef1332b9fedb7a83d7;p=privoxy.git

diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index e64c3159..274a6866 100644
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -8,7 +8,7 @@
 <!entity history SYSTEM "history.sgml">
 <!entity copyright SYSTEM "copyright.sgml">
 <!entity license SYSTEM "license.sgml">
-<!entity p-version "3.0.11">
+<!entity p-version "3.0.16">
 <!entity p-status "stable">
 <!entity % p-not-stable "IGNORE">
 <!entity % p-stable "INCLUDE">
@@ -27,7 +27,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: faq.sgml,v 2.58 2009/03/21 12:27:44 fabiankeil Exp $
+ $Id: faq.sgml,v 2.68 2010/01/30 19:51:28 fabiankeil Exp $
 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -73,12 +73,12 @@
  <subscript>
 <!-- Completely the wrong markup, but very little is allowed  -->
 <!-- in this part of an article. FIXME -->
- <link linkend="copyright">Copyright</link> &my-copy; 2001-2009 by 
+ <link linkend="copyright">Copyright</link> &my-copy; 2001-2010 by
  <ulink url="http://www.privoxy.org/">Privoxy Developers</ulink>
  </subscript>
 </pubdate>
 
-<pubdate>$Id: faq.sgml,v 2.58 2009/03/21 12:27:44 fabiankeil Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 2.68 2010/01/30 19:51:28 fabiankeil Exp $</pubdate>
 
 <!--
 
@@ -464,9 +464,9 @@ warranty? Registration?</title>
 </para>
 </sect2>
 
-<sect2 renderas="sect3" id="jointeam"><title>I would like to help you, what can I do?</title>
+<sect2 renderas="sect3" id="help-the-developers"><title id="jointeam">I would like to help you, what can I do?</title>
 
-<sect3 renderas="sect4" id="jointeam-work"><title>Would you like to participate?</title>
+<sect3 renderas="sect4" id="participate"><title id="jointeam-work">Would you like to participate?</title>
 <para>
    Well, we <emphasis>always</emphasis> need help. There is something for
    everybody who wants to help us. We welcome new developers, packagers,
@@ -475,21 +475,31 @@ warranty? Registration?</title>
    <quote>programmer</quote>. There are many other tasks available. In fact,
    the programmers often can't spend as much time programming because of some
    of the other, more mundane things that need to be done, like checking the
-   Tracker feedback sections. 
+   Tracker feedback sections or responding to user questions on the mailing
+   lists.
  </para>
  <para>
-  So first thing, <ulink
-   url="https://sourceforge.net/account/register.php">get an account on SourceForge.net</ulink>
-   and mail your id to the <ulink url="mailto:ijbswa-developers@lists.sourceforge.net">developers
-   mailing list</ulink>. Then, please read the <ulink
-   url="../developer-manual/index.html">Developer's Manual</ulink>, at least
-   the pertinent sections.
-</para>
+  So first thing, subscribe to the <ulink
+   url="https://lists.sourceforge.net/lists/listinfo/ijbswa-users">Privoxy Users</ulink>
+  or the <ulink url="https://lists.sourceforge.net/lists/listinfo/ijbswa-developers">Privoxy
+  Developers</ulink> mailing list, join the discussion, help out other users, provide general
+  feedback or report problems you noticed.
+ </para>
  <para>
-  You can also start helping out without SourceForge.net account,
-  simply by showing up on the mailing list, helping out other users,
-  providing general feedback or reporting problems you noticed.
+  If you intend to help out with the trackers, you also might want to <ulink
+   url="https://sourceforge.net/account/register.php">get an account on SourceForge.net</ulink>
+   so we don't confuse you with the other name-less users.
  </para>
+ <para>
+   We also have a <ulink
+   url="../developer-manual/index.html">Developer's Manual</ulink>.
+   While it is partly out of date, it's still worth reading.
+</para>
+<para>
+   Our <ulink url="http://ijbswa.cvs.sourceforge.net/viewvc/ijbswa/current/TODO?view=markup">TODO list</ulink>
+   may be of interest to you as well.
+   Please let us know if you want to work on one of the items listed.
+</para>
 </sect3>
 
 <sect3 renderas="sect4" id="donate"><title>Would you like to donate?</title>
@@ -527,7 +537,7 @@ warranty? Registration?</title>
  please have a look at
  <ulink url="http://www.spi-inc.org/donations">SPI's donation page</ulink>
  to see what the options are.
-<para>
+</para>
 </sect3>
 
 </sect2>
@@ -798,23 +808,8 @@ way to do this?</title>
 <title>There are several different <quote>actions</quote> files. What are
 the differences?</title>
 <para>
- Three actions files 
- are being included by the developers, to be used for 
- different purposes: These are 
- <filename>default.action</filename>, the <quote>main</quote> actions file
- which is actively maintained by the <application>Privoxy</application>
- developers and typically sets the default policies, <filename>user.action</filename>,
- where users are encouraged to make their private customizations.
- Please see <ulink url="../user-manual/actions-file.html">the actions chapter</ulink>
- in the <ulink url="../user-manual/index.html">User Manual</ulink> for a more
- detailed explanation.
-</para>
-
-<para>
- Earlier versions included three different versions of the 
- <filename>default.action</filename> file. The new scheme allows for 
- greater flexibility of local configuration, and for browser based 
- selection of pre-defined <quote>aggressiveness</quote> levels.
+ Please have a look at the <ulink url="../user-manual/actions-file.html">the actions chapter</ulink>
+ in the <ulink url="../user-manual/index.html">User Manual</ulink> for a detailed explanation.
 </para>
 
 </sect2>
@@ -2199,6 +2194,42 @@ and related issues?</title>
 </para>
 </sect2>
 
+<sect2 renderas="sect3" id="surprise-privoxy">
+<title>How did you manage to get Privoxy on my computer without my consent?</title>
+
+<para>
+ 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.
+</para>
+<para>
+ 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.
+</para>
+<para>
+ Privoxy's <link linkend="copyright">license</link> 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.
+</para>
+<para>
+ 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.
+</para>
+</sect2>
+
 
 </sect1>
 
@@ -2935,6 +2966,43 @@ browsing has slowed to a crawl. What gives? </title>
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 $Log: faq.sgml,v $
+Revision 2.68  2010/01/30 19:51:28  fabiankeil
+New FAQ entry: How did you manage to get Privoxy on my computer without my consent?
+
+Also bump copyright.
+
+Revision 2.67  2009/11/15 14:24:12  fabiankeil
+Prepare to generate docs for 3.0.16 UNRELEASED.
+
+Revision 2.66  2009/10/10 05:48:55  fabiankeil
+Prepare for 3.0.15 beta.
+
+Revision 2.65  2009/07/18 16:24:39  fabiankeil
+Bump entities for 3.0.14 beta.
+
+Revision 2.64  2009/07/18 12:18:52  fabiankeil
+Don't describe the action files in the FAQ when we can simply link to the description in the User Manual.
+
+Revision 2.63  2009/06/15 15:08:03  fabiankeil
+Patch #2806626 from Frédéric Crozat to fix a closing tag.
+
+Revision 2.62  2009/06/12 14:30:58  fabiankeil
+Update entities for 3.0.13 beta.
+
+Revision 2.61  2009/06/12 11:52:33  fabiankeil
+Mention the TODO list in the participate entry.
+
+Revision 2.60  2009/04/07 12:25:05  fabiankeil
+In the "I would like to help ..." entry:
+- Change the ids to more general ones as helping out doesn't require
+  joining the team (and joining the team requires significantly helping
+  out first, anyway).
+- Add links to the subscription pages for the main mailing lists.
+
+Revision 2.59  2009/03/28 15:33:41  fabiankeil
+Recommend the use of forward-socks5 when forwarding to Tor.
+The error messages are more detailed than with forward-socks4a.
+
 Revision 2.58  2009/03/21 12:27:44  fabiankeil
 Turn the donation entry title into a question,
 also rephrase the content a bit.