X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Ffaq.sgml;h=38f3cb55ba1dcdaa2c1895e89572a978d9e821d3;hp=7198409ed27508a1799d756019ac1d64daab1532;hb=fffc14960c46cad19117f5d07aa16d4a03a0c862;hpb=53d051e3fe82967a009b078caa31b01fe6a8e16e

diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 7198409e..38f3cb55 100644
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -9,9 +9,9 @@
 <!entity copyright SYSTEM "copyright.sgml">
 <!entity license SYSTEM "license.sgml">
 <!entity p-version "3.0.29">
-<!entity p-status "UNRELEASED">
-<!entity % p-not-stable "INCLUDE">
-<!entity % p-stable "IGNORE">
+<!entity p-status "stable">
+<!entity % p-not-stable "IGNORE">
+<!entity % p-stable "INCLUDE">
 <!entity % p-text "IGNORE">        <!-- define we are not a text only doc -->
 <!entity % p-doc "INCLUDE">        <!-- and we are a formal doc           -->
 <!entity % p-supp-userman "INCLUDE"> <!-- Include all from supported.sgml -->
@@ -115,10 +115,6 @@ Hal.
  <ulink url="https://www.privoxy.org/">Privoxy</ulink>.
  It is not a substitute for the
  <ulink url="../user-manual/index.html"><citetitle>Privoxy User Manual</citetitle></ulink>.
-<!--
- This works, at least in some situations:
- Test: <ulink url="privoxy-user-manual.pdf"><citetitle>User Manual</citetitle></ulink>.
--->
  </para>
 
 <!-- Include privoxy.sgml boilerplate: -->
@@ -512,31 +508,6 @@ warranty? Registration?</title>
  <ulink url="https://www.spi-inc.org/donations">SPI's general donation page</ulink>.
 </para>
 
-<para>
- You can also donate to Privoxy using a bank account or a "Paypal" address:
-</para>
-<literallayout>
- Name on account: <ulink url="https://www.zwiebelfreunde.de/">Zwiebelfreunde e.V.</ulink>
- IBAN: DE95430609671126825604
- BIC: GENODEM1GLS
- Bank: GLS Bank
-</literallayout>
-<literallayout>
- "Paypal" address: privoxy@zwiebelfreunde.de
-</literallayout>
-<para>
- Donations made through Zwiebelfreunde e.V. are tax-deductible in Germany
- and other countries that recognize German charitable clubs. Feel free to
- use the Subject field to provide a name to be credited and a list of TODO
- list items you are interested in the most. For example: Max Mustermann: #16, #1, #14.
-</para>
-
-<para>
- Note that donations made through Zwiebelfreunde e.V. currently can't be checked
- automatically so you may not get credited right away. The credits currently
- reflect donations received before 2016-01-14.
-</para>
-
 <para>
  If you have any questions regarding donations please mail to either the
  public user mailing list or, if it's a private matter, to
@@ -554,7 +525,7 @@ warranty? Registration?</title>
   <term>Gold (12000 USD/year)</term>
   <listitem>
    <para>
-    Logo shown at the bottom of the
+    Logo or text link shown at the bottom of the
     <ulink url="https://www.privoxy.org/">Privoxy homepage</ulink>.
     Logo, link and self description on the
     <ulink url="https://www.privoxy.org/sponsors/">sponsor page</ulink>.
@@ -565,7 +536,7 @@ warranty? Registration?</title>
   <term>Silver (1200 USD/year)</term>
   <listitem>
    <para>
-    Logo shown randomly at the bottom of the
+    Logo or text link shown at the bottom of the
     <ulink url="https://www.privoxy.org/">Privoxy homepage</ulink>.
     Logo, link and self description on the
     <ulink url="https://www.privoxy.org/sponsors/">sponsor page</ulink>.
@@ -586,13 +557,18 @@ warranty? Registration?</title>
  our server, no requests are made to the sponsor website unless
  the links are being used.
 </para>
+<para>
+ Link targets are without path (<quote>https://www.example.org/</quote>
+ not <quote>https://www.example.org/seo/keyword/spam/</quote>).
+</para>
 <para>
  The details may change over time but changes will only affect new sponsors
  (or existing sponsors that explicitly agreed to the changes).
 </para>
 <para>
  If you want to become a sponsor, please contact
- <ulink url="mailto:fk@fabiankeil.de">Fabian Keil</ulink>.
+ <ulink url="mailto:fk@fabiankeil.de">Fabian Keil</ulink>
+ and include the link target in the mail.
  New sponsors are only accepted if no developer objects.
 </para>
 
@@ -859,7 +835,7 @@ way to do this?</title>
 </sect2>
 
 
-<sect2 renderas="sect3">
+<sect2 renderas="sect3" id="actionfile-differences">
 <title>There are several different <quote>actions</quote> files. What are
 the differences?</title>
 <para>
@@ -872,10 +848,9 @@ the differences?</title>
 <sect2 renderas="sect3" id="getupdates"><title>Where can I get updated Actions Files?</title>
  <para>
   Based on your feedback and the continuing development, updates of
-  <filename>default.action</filename> will be
-  made available from time to time on the <ulink
-  url="https://sourceforge.net/project/showfiles.php?group_id=11118">files section</ulink> of
-  our <ulink url="https://sourceforge.net/projects/ijbswa/">project page</ulink>.
+  <filename>default.action</filename> are available from
+  <ulink
+  url="https://www.privoxy.org/gitweb/?p=privoxy.git;a=blob_plain;f=default.action.master;hb=HEAD">git</ulink>.
  </para>
 
  <para>
@@ -1206,18 +1181,12 @@ instead of the checkerboard image. Why and how do I get rid of this?</title>
 <title>Can Privoxy run as a service
 on Win2K/NT/XP?</title>
 <para>
-<![%p-newstuff;[
- Yes. Version 3.0.5 introduces full <application>Windows</application> service
- functionality. See <ulink url="../user-manual/installation.html#INSTALLATION-PACK-WIN">
+ Yes. Full <application>Windows</application> service
+ functionality was introduced in <application>Privoxy</application> 3.0.5.
+ See <ulink url="../user-manual/installation.html#INSTALLATION-PACK-WIN">
  the <citetitle>User Manual</citetitle></ulink> for details on how to install and configure
  <application>Privoxy</application> as a service.
 </para>
-<para>
- Earlier ]]>3.x versions could run as a system service using <command>srvany.exe</command>.
- See the discussion at <ulink
- url="https://sourceforge.net/tracker/?func=detail&#38;atid=361118&#38;aid=485617&#38;group_id=11118">https://sourceforge.net/tracker/?func=detail&#38;atid=361118&#38;aid=485617&#38;group_id=11118</ulink>,
- for details, and a sample configuration.
-</para>
 </sect2>
 
 
@@ -1321,7 +1290,8 @@ and thus avoid individual browser configuration?</title>
 <para>
  For a good discussion of some of the issues involved (including privacy and
  security issues), see
- <ulink url="https://sourceforge.net/tracker/?func=detail&#38;atid=211118&#38;aid=629518&#38;group_id=11118">https://sourceforge.net/tracker/?func=detail&#38;atid=211118&#38;aid=629518&#38;group_id=11118</ulink>.
+ <ulink url="https://sourceforge.net/p/ijbswa/support-requests/107/"
+  >https://sourceforge.net/p/ijbswa/support-requests/107/</ulink>.
 </para>
 </sect2>
 
@@ -2723,7 +2693,7 @@ Why?</title>
 <para>
  Upgrading <application>Privoxy</application>, or going to the most recent
  <filename>default.action</filename> file available from <ulink
- url="https://sourceforge.net/project/showfiles.php?group_id=11118">SourceForge</ulink>
+ url="https://www.privoxy.org/gitweb/?p=privoxy.git;a=blob_plain;f=default.action.master;hb=HEAD">git</ulink>
  might be worth a try, too.
 </para>
 </sect2>
@@ -3082,7 +3052,7 @@ C:\Privoxy></screen>
   </para>
 
  <!--   ~~~~~       New section      ~~~~~     -->
- <sect2><title>License</title>
+ <sect2 id="privoxy-license"><title>License</title>
  <!-- Include copyright.sgml: -->
   &license;
  <!-- end copyright -->
@@ -3090,7 +3060,7 @@ C:\Privoxy></screen>
  <!--  ~  End section  ~  -->
 
  <!--   ~~~~~       New section      ~~~~~     -->
- <sect2><title>History</title>
+ <sect2 id="history"><title>History</title>
  <!-- Include history.sgml -->
   &history;
  <!-- end -->