X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Ffaq.sgml;h=db3472b49ac73ea5c9927473fdb785eb82be2347;hp=89663a4d195af5b0614f55e65816b14a404c8a58;hb=1a1ce97b01ae475e031816494e75309d2aceb176;hpb=8f2e5b9f70798ddd806db094d78e49d7d1fda1e5

diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 89663a4d..db3472b4 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.21">
-<!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 -->
@@ -27,7 +27,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: faq.sgml,v 2.90 2013/01/06 11:25:52 fabiankeil Exp $
+ $Id: faq.sgml,v 2.94 2013/06/21 14:46:46 fabiankeil Exp $
 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -78,7 +78,7 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: faq.sgml,v 2.90 2013/01/06 11:25:52 fabiankeil Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 2.94 2013/06/21 14:46:46 fabiankeil Exp $</pubdate>
 
 <!--
 
@@ -486,7 +486,7 @@ warranty? Registration?</title>
  </para>
  <para>
   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>
+   url="https://sourceforge.net/user/registration">get an account on SourceForge.net</ulink>
    so we don't confuse you with the other name-less users.
  </para>
  <para>
@@ -539,7 +539,7 @@ warranty? Registration?</title>
 
 <para>
  <application>Privoxy</application> has therefore become an associated
- project of <ulink url="http://www.spi-inc.org/about-spi/about-spi">Software
+ project of <ulink url="http://www.spi-inc.org/">Software
  in the Public Interest (SPI)</ulink>, which allows us to receive donations.
  In the United States they are tax-deductible, in a few other western countries
  they might be tax-deductible in the future.
@@ -867,13 +867,23 @@ the differences?</title>
 <sect2 renderas="sect3" id="difficult">
 <title>Why is the configuration so complicated?</title>
  <para>
-  <quote>Complicated</quote> is in the eye of the beholder. Those that are
-  familiar with some of the underlying concepts, such as regular expression
-  syntax, take to it like a fish takes to water. Also, software that tries
-  hard to be <quote>user friendly</quote>, often lacks sophistication and
-  flexibility. There is always that trade-off there between power vs.
-  easy-of-use. Furthermore, anyone is welcome to contribute ideas and
-  implementations to enhance &my-app;.
+  <quote>Complicated</quote> is in the eye of the beholder.
+ </para>
+ <para>
+  Privoxy is currently mainly written by and for people who are already
+  familiar with the underlying concepts like regular expressions, HTTP and HTML,
+  or are willing to become familiar with them to be able to get the most
+  out of a powerful and flexible tool such as Privoxy.
+ </para>
+ <para>
+  While everybody is expected to be able to get a Privoxy default installation
+  up and running, fine-tuning requires a certain amount of background
+  information and Privoxy's documentation mainly concentrates on the
+  Privoxy-specific parts while only providing references to the rest.
+ </para>
+ <para>
+  If you or anyone you know has the skills, time and energy to
+  reduce the barrier of entry, please <link linkend="participate">get involved</link>.
  </para>
 </sect2>
 
@@ -2990,6 +3000,22 @@ 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.94  2013/06/21 14:46:46  fabiankeil
+Link to the SPI homepage instead of the "About SPI" page which no longer exists
+
+Reported by Mark Nelson in #3614557.
+
+Revision 2.93  2013/06/21 14:46:09  fabiankeil
+Update link to the SF registration form
+
+Reported by Mark Nelson in #3614557.
+
+Revision 2.92  2013/03/01 17:44:24  fabiankeil
+Bump entities for 3.0.21 stable
+
+Revision 2.91  2013/02/26 15:09:35  fabiankeil
+Bump entities for 3.0.21 UNRELEASED
+
 Revision 2.90  2013/01/06 11:25:52  fabiankeil
 Set entities to 3.0.20 beta