X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Ffaq.sgml;h=7474167d963e3b3b796a06fbfa0894ebdce2f781;hb=4c4af19863193dd2a1b504bcd627417e29d41b70;hp=6422f84189812c68f04bb1543f260e62286cd026;hpb=6b12a8f1704e127a1553e08541cd007dbdfc462e;p=privoxy.git

diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 6422f841..7474167d 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.27">
-<!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 -->
@@ -21,11 +21,9 @@
 <!entity  my-app "<application>Privoxy</application>">
 ]>
 <!--
- File        :  $Source: /cvsroot/ijbswa/current/doc/source/faq.sgml,v $
+ File        :  doc/source/faq.sgml
 
  Purpose     :  FAQ
-                This file belongs into
-                ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
  Copyright (C) 2001-2018 Privoxy Developers https://www.privoxy.org/
  See LICENSE.
@@ -76,8 +74,6 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: faq.sgml,v 2.135 2017/03/27 10:22:27 fabiankeil Exp $</pubdate>
-
 <!--
 
 Note: this should generate a separate page, and a live link to it.
@@ -489,7 +485,7 @@ warranty? Registration?</title>
    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>
+   Our <ulink url="https://www.privoxy.org/gitweb/?p=privoxy.git;a=blob_plain;f=TODO;hb=HEAD">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>
@@ -498,7 +494,7 @@ warranty? Registration?</title>
 <sect3 renderas="sect4" id="donate"><title>Would you like to donate?</title>
 <para>
  Donations are welcome. Our
- <ulink url="http://ijbswa.cvs.sourceforge.net/viewvc/ijbswa/current/TODO?view=markup">TODO list</ulink>
+ <ulink url="https://www.privoxy.org/gitweb/?p=privoxy.git;a=blob_plain;f=TODO;hb=HEAD">TODO list</ulink>
  is rather long and being able to pay one (or more) developers to work on Privoxy
  would make a huge difference, even if it was only for a couple of weeks. Donations may
  also be used for Privoxy-related travel expenses (for example to attend conferences),
@@ -687,7 +683,6 @@ special I have to do now?</title>
  details</ulink>. You should also flush your browser's memory and disk
  cache to get rid of any cached junk items, and remove any stored
  <ulink url="http://en.wikipedia.org/wiki/Browser_cookie">cookies</ulink>.
-
 </para>
 
 </sect2>
@@ -936,12 +931,10 @@ the differences?</title>
   for them in the <filename>user.action</filename> file. An example for yahoo might
   look like:
  </para>
- <para>
   <screen># Allow all cookies for Yahoo login:
 #
 { -<ulink url="../user-manual/actions-file.html#CRUNCH-INCOMING-COOKIES">crunch-incoming-cookies</ulink> -<ulink url="../user-manual/actions-file.html#CRUNCH-OUTGOING-COOKIES">crunch-outgoing-cookies</ulink> -<ulink url="../user-manual/actions-file.html#SESSION-COOKIES-ONLY">session-cookies-only</ulink> }
 .login.yahoo.com</screen>
- </para>
  <para>
   These kinds of sites are often quite complex and heavy with
   <ulink url="http://en.wikipedia.org/wiki/Javascript">Javascript</ulink> and
@@ -950,13 +943,11 @@ the differences?</title>
   url="../user-manual/actions-file.html#ALIASES">alias</ulink> just for such
   sticky situations:
  </para>
- <para>
   <screen># Gmail is a _fragile_ site:
 #
 { <literal>fragile</literal> }
  # Gmail is ...
  mail.google.com</screen>
- </para>
  <para>
   Be sure to flush your browser's caches whenever making these kinds of
   changes, just to make sure the changes <quote>take</quote>.
@@ -1107,10 +1098,8 @@ with a browser? Does that not raise security issues?</title>
  should look like:
 </para>
 
-<para>
  <screen>
   listen-address  192.168.1.1:8118</screen>
-</para>
 
 <para>
  Save the file, and restart <application>Privoxy</application>. Configure
@@ -1122,10 +1111,8 @@ with a browser? Does that not raise security issues?</title>
  all available interfaces:
 </para>
 
-<para>
  <screen>
   listen-address    :8118</screen>
-</para>
 
 <para>
  And then use <application>Privoxy's</application>
@@ -1221,7 +1208,7 @@ 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">
+ functionality. 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>
@@ -1398,11 +1385,9 @@ and thus avoid individual browser configuration?</title>
   To disable all cookie actions, so that cookies are allowed unrestricted,
   both in and out, for <literal>example.com</literal>:
 </para>
-<para>
  <screen>
  { -crunch-incoming-cookies -crunch-outgoing-cookies -session-cookies-only -filter{content-cookies} }
   .example.com</screen>
-</para>
 <para>
  Place the above in <filename>user.action</filename>. Note that some of these may
  be off by default anyway, so this might be redundant, but there is no harm
@@ -1493,16 +1478,13 @@ and thus avoid individual browser configuration?</title>
  can very easily over-ride <emphasis>all</emphasis> blocking with the
  following very simple rule in your <filename>user.action</filename>:
  </para>
- <para>
  <screen>
  # Unblock everybody, everywhere
  { <ulink url="../user-manual/actions-file.html#BLOCK">-block</ulink> }
  / # UN-Block *all* URLs</screen>
-</para>
 <para>
  Or even a more comprehensive reversing of various ad related actions:
 </para>
-<para>
  <screen>
  # Unblock everybody, everywhere, and turn off appropriate filtering, etc
  { <ulink url="../user-manual/actions-file.html#BLOCK">-block</ulink> \
@@ -1511,7 +1493,6 @@ and thus avoid individual browser configuration?</title>
   <literal>allow-popups</literal> \
  }
  / # UN-Block *all* URLs and allow ads</screen>
-</para>
 <para>
  This last <quote>action</quote> in this compound statement,
  <literal>allow-popups</literal>, is an <ulink
@@ -1535,7 +1516,7 @@ and thus avoid individual browser configuration?</title>
  during upgrades. You can, however, create completely new templates,
  place them in another directory and specify the alternate path in the main
  <filename>config</filename>. For details, have a look at the <ulink
- url="../user-manual/config.html#templdir">templdir</ulink> option.
+ url="../user-manual/config.html#TEMPLDIR">templdir</ulink> option.
 </para>
 </sect2>
 
@@ -1552,10 +1533,8 @@ the <emphasis>BLOCKED</emphasis> page?</title>
  available as compile-time options. You should
  <command>configure</command> the sources as follows:
 </para>
-<para>
  <screen>
  ./configure  --disable-toggle  --disable-editor  --disable-force</screen>
-</para>
 <para>
  This will create an executable with hard-coded security features so that
  &my-app; does not allow easy bypassing of blocked sites, or changing the
@@ -1856,11 +1835,9 @@ us help you. Your efforts are not wasted, and we do appreciate them.
  <ulink url="../user-manual/config.html#FORWARDING">forwarding section</ulink>
  and uncomment the line:
 </para>
-<para>
  <screen>
 #        forward-socks5t             /     127.0.0.1:9050 .
- </screen>
-</para>
+</screen>
 <para>
  Note that if you got Tor through one of the bundles, you may
  have to change the port from 9050 to 9150 (or even another one).
@@ -1873,13 +1850,11 @@ us help you. Your efforts are not wasted, and we do appreciate them.
  uncomment the following forward rules, to make sure your local network is still
  reachable through Privoxy:
 </para>
-<para>
  <screen>
 #        forward         192.168.*.*/     .
 #        forward            10.*.*.*/     .
 #        forward           127.*.*.*/     .
- </screen>
-</para>
+</screen>
 <para>
  Unencrypted connections to systems in these address ranges will
  be as (un)secure as the local network is, but the alternative is
@@ -1893,11 +1868,9 @@ us help you. Your efforts are not wasted, and we do appreciate them.
  network by using their names, you will need additional exceptions
  that look like this:
 </para>
-<para>
  <screen>
 #        forward           localhost/     .
- </screen>
-</para>
+</screen>
 <para>
  Save the modified configuration file and open
  <ulink url="http://config.privoxy.org/show-status">http://config.privoxy.org/show-status</ulink>
@@ -2242,14 +2215,12 @@ altered it! Yikes, what is wrong!</title>
  your hosts list is neglected by <application>Privoxy's </application>
  configuration, consider adding your list to your <filename>user.action</filename> file:
 </para>
-<para>
  <screen>
   { +block }
    www.ad.example1.com
    ad.example2.com
    ads.galore.example.com
    etc.example.com</screen>
-</para>
 </sect2>
 
 <sect2 renderas="sect3" id="seealso">
@@ -2345,7 +2316,6 @@ and related issues?</title>
 <para>
  There are several possibilities:
 </para>
-<para>
 <itemizedlist>
 <listitem><para>
 <application>Privoxy</application> is not running. Solution: verify
@@ -2365,7 +2335,6 @@ and related issues?</title>
   try disabling or removing the firewall as a simple test.
  </para></listitem>
 </itemizedlist>
-</para>
 
 </sect2>
 
@@ -2418,7 +2387,6 @@ still getting through. How?</title>
  our job a little easier. &my-app; has <quote>crunched</quote> (meaning caught
  and BLOCKED) quite a few items in this example, but perhaps missed a few as well.
 </para>
-<para>
 <screen>
 <![CDATA[
 Request: www.example.com/
@@ -2456,7 +2424,6 @@ Request: www.adtrak.net/adlog.php?bannerid=1309&clientid=439&zoneid=58&source=Ua
 Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua
 ]]>
 </screen>
-</para>
 <para>
  Despite 12 out of 32 requests being blocked, the page looked, and seemed to
  behave perfectly <quote>normal</quote> (minus some ads, of course).
@@ -2916,14 +2883,12 @@ browsing has slowed to a crawl. What gives? </title>
  To do that, enable logging to figure out which requests get blocked by
  &my-app; and add the hosts (no path patterns) to a section like this:
 </para>
-<para>
 <screen>
 <![CDATA[
 {+redirect{http://127.0.0.1:0/} -block -limit-connect}
 .ivwbox.de:443/
 ]]>
 </screen>
-</para>
 <para>
  Additionally you have to configure your browser to contact
  <quote>127.0.0.1:0</quote> directly (instead of through &my-app;).
@@ -3048,11 +3013,12 @@ browsing has slowed to a crawl. What gives? </title>
  Your userid probably isn't allowed to edit the file.
  <!--  show how to check permissions? -->
  On Windows you can use the windows equivalent of sudo:
- <screen>runas /user:administrator "notepad \privoxy\config.txt"</screen>
 </para>
+ <screen>runas /user:administrator "notepad \privoxy\config.txt"</screen>
 
 <para>
  or fix the file permissions:
+</para>
 <screen>C:\Privoxy>icacls config.txt
 config.txt BUILTIN\Administrators:(I)(F)
            NT AUTHORITY\SYSTEM:(I)(F)
@@ -3075,7 +3041,6 @@ config.txt I3668\Lee:(F)
 Successfully processed 1 files; Failed processing 0 files
 
 C:\Privoxy></screen>
-</para>
 
 <para>
  or try to point-n-click your way through adjusting the file