Add a FAQ entry for tainted sockets

[privoxy.git] / doc / webserver / user-manual / configuration.html

diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index 9f25f72..ed73cac 100644 (file)
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -6,7 +6,7 @@
   <title>Privoxy Configuration</title>
   <meta name="GENERATOR" content=
   "Modular DocBook HTML Stylesheet Version 1.79">
-  <link rel="HOME" title="Privoxy 3.0.21 User Manual" href="index.html">
+  <link rel="HOME" title="Privoxy 3.0.25 User Manual" href="index.html">
   <link rel="PREVIOUS" title="Starting Privoxy" href="startup.html">
   <link rel="NEXT" title="The Main Configuration File" href="config.html">
   <link rel="STYLESHEET" type="text/css" href="../p_doc.css">
@@ -20,7 +20,7 @@
     <table summary="Header navigation table" width="100%" border="0"
     cellpadding="0" cellspacing="0">
       <tr>
-        <th colspan="3" align="center">Privoxy 3.0.21 User Manual</th>
+        <th colspan="3" align="center">Privoxy 3.0.25 User Manual</th>
       </tr>
 
       <tr>
@@ -46,8 +46,9 @@
     controlled easily with a web browser.</p>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="AEN1074" id="AEN1074">6.1. Controlling
-      Privoxy with Your Web Browser</a></h2>
+      <h2 class="SECT2"><a name="CONTROL-WITH-WEBBROWSER" id=
+      "CONTROL-WITH-WEBBROWSER">6.1. Controlling Privoxy with Your Web
+      Browser</a></h2>
 
       <p><span class="APPLICATION">Privoxy</span>'s user interface can be
       reached through the special URL <a href="http://config.privoxy.org/"
@@ -63,8 +64,10 @@
 
 </pre>
 
-            <h2 class="BRIDGEHEAD"><a name="AEN1082" id=
-            "AEN1082"></a>&nbsp;&nbsp;&nbsp;&nbsp;Privoxy Menu</h2>
+            <h2 class="BRIDGEHEAD"><a name="AEN821" id=
+            "AEN821"></a>&nbsp;&nbsp;&nbsp;&nbsp;Privoxy Menu</h2>
+            <pre>
+</pre>
 
             <table border="0">
               <tbody>
@@ -102,7 +105,7 @@
 
                 <tr>
                   <td>
-                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#9642;&nbsp;&nbsp;<a href="http://www.privoxy.org/3.0.21/user-manual/"
+                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#9642;&nbsp;&nbsp;<a href="http://www.privoxy.org/3.0.25/user-manual/"
                   target="_top">Documentation</a></td>
                 </tr>
               </tbody>
@@ -126,10 +129,7 @@
       "APPLICATION">Privoxy</span> causing the problem or not. <span class=
       "APPLICATION">Privoxy</span> continues to run as a proxy in this case,
       but all manipulation is disabled, i.e. <span class=
-      "APPLICATION">Privoxy</span> acts like a normal forwarding proxy. There
-      is even a toggle <a href="appendix.html#BOOKMARKLETS">Bookmarklet</a>
-      offered, so that you can toggle <span class=
-      "APPLICATION">Privoxy</span> with one click from your browser.</p>
+      "APPLICATION">Privoxy</span> acts like a normal forwarding proxy.</p>
 
       <p>Note that several of the features described above are disabled by
       default in <span class="APPLICATION">Privoxy</span> 3.0.7 beta and
@@ -145,7 +145,9 @@
       <p>For Unix, *BSD and Linux, all configuration files are located in
       <tt class="FILENAME">/etc/privoxy/</tt> by default. For MS Windows,
       OS/2, and AmigaOS these are all in the same directory as the
-      <span class="APPLICATION">Privoxy</span> executable.</p>
+      <span class="APPLICATION">Privoxy</span> executable. The name and
+      number of configuration files has changed from previous versions, and
+      is subject to change as development progresses.</p>
 
       <p>The installed defaults provide a reasonable starting point, though
       some settings may be aggressive by some standards. For the time being,
@@ -234,6 +236,12 @@
       "QUOTE">"wake up"</span> requests must obviously be sent to the
       <span class="emphasis"><i class="EMPHASIS">old</i></span> listening
       address.</p>
+
+      <p>While under development, the configuration content is subject to
+      change. The below documentation may not be accurate by the time you
+      read this. Also, what constitutes a <span class=
+      "QUOTE">"default"</span> setting, may change, so please check all your
+      configuration files on important issues.</p>
     </div>
   </div>