From: Fabian Keil <fk@fabiankeil.de>
Date: Thu, 17 Mar 2016 18:21:37 +0000 (+0000)
Subject: Regenerate user manual with recent changes
X-Git-Tag: v_3_0_25~111
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=474793f5da05b90f24ac2b38a7d7774cb761ab35;hp=39aa7ec2d9d555d00de379563ada750f1c462863

Regenerate user manual with recent changes
---

diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index a7f1ac38..62005d4a 100644
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -117,7 +117,7 @@
         in <tt class="FILENAME">default.action</tt> are:</p>
 
         <div class="TABLE">
-          <a name="AEN2676" id="AEN2676"></a>
+          <a name="AEN2681" id="AEN2681"></a>
 
           <p><b>Table 1. Default Configurations</b></p>
 
@@ -1064,7 +1064,16 @@ example.org/blocked-example-page
                 <tr>
                   <td>
                     <pre class="SCREEN">
-+add-header{X-User-Tracking: sucks}
+# Add a DNT ("Do not track") header to all requests,
+# event to those that already have one.
+#
+# This is just an example, not a recommendation.
+#
+# There is no reason to believe that user-tracking websites care
+# about the DNT header and depending on the User-Agent, adding the
+# header may make user-tracking easier.
+{+add-header{DNT: 1}}
+/
 </pre>
                   </td>
                 </tr>
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index 96c6c735..604dbe74 100644
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -313,7 +313,7 @@
 
       <ul>
         <li>
-          <p>Privoxy main page:</p><a name="AEN5848" id="AEN5848"></a>
+          <p>Privoxy main page:</p><a name="AEN5853" id="AEN5853"></a>
 
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/" target=
@@ -328,8 +328,8 @@
 
         <li>
           <p>Show information about the current configuration, including
-          viewing and editing of actions files:</p><a name="AEN5856" id=
-          "AEN5856"></a>
+          viewing and editing of actions files:</p><a name="AEN5861" id=
+          "AEN5861"></a>
 
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-status" target=
@@ -338,8 +338,8 @@
         </li>
 
         <li>
-          <p>Show the source code version numbers:</p><a name="AEN5861" id=
-          "AEN5861"></a>
+          <p>Show the source code version numbers:</p><a name="AEN5866" id=
+          "AEN5866"></a>
 
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-version" target=
@@ -348,8 +348,8 @@
         </li>
 
         <li>
-          <p>Show the browser's request headers:</p><a name="AEN5866" id=
-          "AEN5866"></a>
+          <p>Show the browser's request headers:</p><a name="AEN5871" id=
+          "AEN5871"></a>
 
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-request" target=
@@ -358,8 +358,8 @@
         </li>
 
         <li>
-          <p>Show which actions apply to a URL and why:</p><a name="AEN5871"
-          id="AEN5871"></a>
+          <p>Show which actions apply to a URL and why:</p><a name="AEN5876"
+          id="AEN5876"></a>
 
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-url-info" target=
@@ -373,20 +373,20 @@
           <span class="QUOTE">"off"</span>, <span class=
           "QUOTE">"Privoxy"</span> continues to run, but only as a
           pass-through proxy, with no actions taking place:</p><a name=
-          "AEN5879" id="AEN5879"></a>
+          "AEN5884" id="AEN5884"></a>
 
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle" target=
             "_top">http://config.privoxy.org/toggle</a></p>
           </blockquote>
 
-          <p>Short cuts. Turn off, then on:</p><a name="AEN5883" id=
-          "AEN5883"></a>
+          <p>Short cuts. Turn off, then on:</p><a name="AEN5888" id=
+          "AEN5888"></a>
 
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle?set=disable" target=
             "_top">http://config.privoxy.org/toggle?set=disable</a></p>
-          </blockquote><a name="AEN5886" id="AEN5886"></a>
+          </blockquote><a name="AEN5891" id="AEN5891"></a>
 
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle?set=enable" target=
diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index 292aeaa3..fe2dce2c 100644
--- a/doc/webserver/user-manual/config.html
+++ b/doc/webserver/user-manual/config.html
@@ -3263,7 +3263,7 @@
             <dt>Default value:</dt>
 
             <dd>
-              <p>None</p>
+              <p>60</p>
             </dd>
 
             <dt>Notes:</dt>
@@ -3295,6 +3295,22 @@
               provides a "enable this tag temporarily" option. If it is used,
               the tag will be set until the client-tag-lifetime is over.</p>
             </dd>
+
+            <dt>Examples:</dt>
+
+            <dd>
+              <table border="0" bgcolor="#E0E0E0" width="90%">
+                <tr>
+                  <td>
+                    <pre class="SCREEN">
+      # Increase the time to life for temporarily enabled tags to 3 minutes
+      client-tag-lifetime 180
+
+</pre>
+                  </td>
+                </tr>
+              </table>
+            </dd>
           </dl>
         </div>
       </div>
diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index dbbf135a..4cf9a46c 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -23,7 +23,7 @@
       2001-2014 by <a href="http://www.privoxy.org/" target="_top">Privoxy
       Developers</a></sub><br></p>
 
-      <p class="PUBDATE">$Id: user-manual.sgml,v 2.204 2016/03/04 13:21:54
+      <p class="PUBDATE">$Id: user-manual.sgml,v 2.206 2016/03/17 10:43:07
       fabiankeil Exp $<br></p>
 
       <div>