From c7b04d907e83fdb5a7fb8093879396ce252c298e Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Tue, 21 Oct 2014 15:31:49 +0000
Subject: [PATCH] Regenerate docs

---
 doc/webserver/faq/index.html                 |   2 +-
 doc/webserver/user-manual/actions-file.html  |  16 +--
 doc/webserver/user-manual/appendix.html      | 102 ++++---------------
 doc/webserver/user-manual/configuration.html |   5 +-
 doc/webserver/user-manual/filter-file.html   |   2 +-
 doc/webserver/user-manual/index.html         |  25 ++---
 6 files changed, 39 insertions(+), 113 deletions(-)

diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html
index faa17fff..8e40b151 100644
--- a/doc/webserver/faq/index.html
+++ b/doc/webserver/faq/index.html
@@ -22,7 +22,7 @@
       2001-2014 by <a href="http://www.privoxy.org/" target="_top">Privoxy
       Developers</a></sub><br></p>
 
-      <p class="PUBDATE">$Id: faq.sgml,v 2.102 2014/10/06 10:20:09 fabiankeil
+      <p class="PUBDATE">$Id: faq.sgml,v 2.104 2014/10/21 12:05:12 fabiankeil
       Exp $<br></p>
 
       <div>
diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index c9652e6c..66f9790b 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="AEN2888" id="AEN2888"></a>
+          <a name="AEN2886" id="AEN2886"></a>
 
           <p><b>Table 1. Default Configurations</b></p>
 
@@ -314,7 +314,7 @@
     actions</a>.</p>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="AEN2987" id="AEN2987">8.1. Finding the Right
+      <h2 class="SECT2"><a name="AEN2985" id="AEN2985">8.1. Finding the Right
       Mix</a></h2>
 
       <p>Note that some <a href="actions-file.html#ACTIONS">actions</a>, like
@@ -339,7 +339,7 @@
     </div>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="AEN2994" id="AEN2994">8.2. How to
+      <h2 class="SECT2"><a name="AEN2992" id="AEN2992">8.2. How to
       Edit</a></h2>
 
       <p>The easiest way to edit the actions files is with a browser by using
@@ -644,7 +644,7 @@
       </div>
 
       <div class="SECT3">
-        <h3 class="SECT3"><a name="AEN3188" id="AEN3188">8.4.2. The Path
+        <h3 class="SECT3"><a name="AEN3186" id="AEN3186">8.4.2. The Path
         Pattern</a></h3>
 
         <p><span class="APPLICATION">Privoxy</span> uses <span class=
@@ -4489,7 +4489,7 @@ TAG:^image/
       </div>
 
       <div class="SECT3">
-        <h3 class="SECT3"><a name="AEN4920" id="AEN4920">8.5.36.
+        <h3 class="SECT3"><a name="AEN4918" id="AEN4918">8.5.36.
         Summary</a></h3>
 
         <p>Note that many of these actions have the potential to cause a page
@@ -4648,7 +4648,7 @@ TAG:^image/
       together:</p>
 
       <div class="SECT3">
-        <h3 class="SECT3"><a name="AEN4984" id="AEN4984">8.7.1.
+        <h3 class="SECT3"><a name="AEN4982" id="AEN4982">8.7.1.
         match-all.action</a></h3>
 
         <p>Remember <span class="emphasis"><i class="EMPHASIS">all actions
@@ -4697,7 +4697,7 @@ TAG:^image/
       </div>
 
       <div class="SECT3">
-        <h3 class="SECT3"><a name="AEN5006" id="AEN5006">8.7.2.
+        <h3 class="SECT3"><a name="AEN5004" id="AEN5004">8.7.2.
         default.action</a></h3>
 
         <p>If you aren't a developer, there's no need for you to edit the
@@ -5040,7 +5040,7 @@ wiki.
       </div>
 
       <div class="SECT3">
-        <h3 class="SECT3"><a name="AEN5119" id="AEN5119">8.7.3.
+        <h3 class="SECT3"><a name="AEN5117" id="AEN5117">8.7.3.
         user.action</a></h3>
 
         <p>So far we are painting with a broad brush by setting general
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index 038b1760..4d192424 100644
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -293,7 +293,7 @@
     </div>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="AEN6038" id="AEN6038">14.2. Privoxy's
+      <h2 class="SECT2"><a name="AEN6036" id="AEN6036">14.2. Privoxy's
       Internal Pages</a></h2>
 
       <p>Since <span class="APPLICATION">Privoxy</span> proxies each
@@ -313,7 +313,7 @@
 
       <ul>
         <li>
-          <p>Privoxy main page:</p><a name="AEN6052" id="AEN6052"></a>
+          <p>Privoxy main page:</p><a name="AEN6050" id="AEN6050"></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="AEN6060" id=
-          "AEN6060"></a>
+          viewing and editing of actions files:</p><a name="AEN6058" id=
+          "AEN6058"></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="AEN6065" id=
-          "AEN6065"></a>
+          <p>Show the source code version numbers:</p><a name="AEN6063" id=
+          "AEN6063"></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="AEN6070" id=
-          "AEN6070"></a>
+          <p>Show the browser's request headers:</p><a name="AEN6068" id=
+          "AEN6068"></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="AEN6075"
-          id="AEN6075"></a>
+          <p>Show which actions apply to a URL and why:</p><a name="AEN6073"
+          id="AEN6073"></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=
-          "AEN6083" id="AEN6083"></a>
+          "AEN6081" id="AEN6081"></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="AEN6087" id=
-          "AEN6087"></a>
+          <p>Short cuts. Turn off, then on:</p><a name="AEN6085" id=
+          "AEN6085"></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="AEN6090" id="AEN6090"></a>
+          </blockquote><a name="AEN6088" id="AEN6088"></a>
 
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle?set=enable" target=
@@ -394,69 +394,6 @@
           </blockquote>
         </li>
       </ul>
-
-      <p>These may be bookmarked for quick reference. See next.</p>
-
-      <div class="SECT3">
-        <h3 class="SECT3"><a name="BOOKMARKLETS" id="BOOKMARKLETS">14.2.1.
-        Bookmarklets</a></h3>
-
-        <p>Below are some <span class="QUOTE">"bookmarklets"</span> to allow
-        you to easily access a <span class="QUOTE">"mini"</span> version of
-        some of <span class="APPLICATION">Privoxy's</span> special pages.
-        They are designed for MS Internet Explorer, but should work equally
-        well in Netscape, Mozilla, and other browsers which support
-        JavaScript. They are designed to run directly from your bookmarks -
-        not by clicking the links below (although that should work for
-        testing).</p>
-
-        <p>To save them, right-click the link and choose <span class=
-        "QUOTE">"Add to Favorites"</span> (IE) or <span class="QUOTE">"Add
-        Bookmark"</span> (Netscape). You will get a warning that the bookmark
-        <span class="QUOTE">"may not be safe"</span> - just click OK. Then
-        you can run the Bookmarklet directly from your favorites/bookmarks.
-        For even faster access, you can put them on the <span class=
-        "QUOTE">"Links"</span> bar (IE) or the <span class="QUOTE">"Personal
-        Toolbar"</span> (Netscape), and run them with a single click.</p>
-
-        <ul>
-          <li>
-            <p><a href=
-            "javascript:void(window.open('http://config.privoxy.org/toggle?mini=y&amp;set=enabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
-            target="_top">Privoxy - Enable</a></p>
-          </li>
-
-          <li>
-            <p><a href=
-            "javascript:void(window.open('http://config.privoxy.org/toggle?mini=y&amp;set=disabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
-            target="_top">Privoxy - Disable</a></p>
-          </li>
-
-          <li>
-            <p><a href=
-            "javascript:void(window.open('http://config.privoxy.org/toggle?mini=y&amp;set=toggle','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
-            target="_top">Privoxy - Toggle Privoxy</a> (Toggles between
-            enabled and disabled)</p>
-          </li>
-
-          <li>
-            <p><a href=
-            "javascript:void(window.open('http://config.privoxy.org/toggle?mini=y','ijbstatus','width=250,height=2,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
-            target="_top">Privoxy- View Status</a></p>
-          </li>
-
-          <li>
-            <p><a href=
-            "javascript:void(window.open('http://config.privoxy.org/show-url-info?url='+escape(location.href),'Why').focus());"
-            target="_top">Privoxy - Why?</a></p>
-          </li>
-        </ul>
-
-        <p>Credit: The site which gave us the general idea for these
-        bookmarklets is <a href="http://www.bookmarklets.com/" target=
-        "_top">www.bookmarklets.com</a>. They have more information about
-        bookmarklets.</p>
-      </div>
     </div>
 
     <div class="SECT2">
@@ -602,12 +539,11 @@
 
       <p>One quick test to see if <span class="APPLICATION">Privoxy</span> is
       causing a problem or not, is to disable it temporarily. This should be
-      the first troubleshooting step. See <a href=
-      "appendix.html#BOOKMARKLETS">the Bookmarklets</a> section on a quick
-      and easy way to do this (be sure to flush caches afterward!). Looking
-      at the logs is a good idea too. (Note that both the toggle feature and
-      logging are enabled via <tt class="FILENAME">config</tt> file settings,
-      and may need to be turned <span class="QUOTE">"on"</span>.)</p>
+      the first troubleshooting step (be sure to flush caches afterward!).
+      Looking at the logs is a good idea too. (Note that both the toggle
+      feature and logging are enabled via <tt class="FILENAME">config</tt>
+      file settings, and may need to be turned <span class=
+      "QUOTE">"on"</span>.)</p>
 
       <p>Another easy troubleshooting step to try is if you have done any
       customization of your installation, revert back to the installed
diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index 22454888..416a1197 100644
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -128,10 +128,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
diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index 15472717..ac299531 100644
--- a/doc/webserver/user-manual/filter-file.html
+++ b/doc/webserver/user-manual/filter-file.html
@@ -177,7 +177,7 @@ FILTER: foo Replace all "foo" with "bar"
     started.</p>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="AEN5287" id="AEN5287">9.1. Filter File
+      <h2 class="SECT2"><a name="AEN5285" id="AEN5285">9.1. Filter File
       Tutorial</a></h2>
 
       <p>Now, let's complete our <span class="QUOTE">"foo"</span> content
diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 6a0e65f9..6904c34a 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -348,10 +348,10 @@
 
         <dd>
           <dl>
-            <dt>8.1. <a href="actions-file.html#AEN2987">Finding the Right
+            <dt>8.1. <a href="actions-file.html#AEN2985">Finding the Right
             Mix</a></dt>
 
-            <dt>8.2. <a href="actions-file.html#AEN2994">How to Edit</a></dt>
+            <dt>8.2. <a href="actions-file.html#AEN2992">How to Edit</a></dt>
 
             <dt>8.3. <a href="actions-file.html#ACTIONS-APPLY">How Actions
             are Applied to Requests</a></dt>
@@ -364,7 +364,7 @@
                 <dt>8.4.1. <a href="actions-file.html#HOST-PATTERN">The Host
                 Pattern</a></dt>
 
-                <dt>8.4.2. <a href="actions-file.html#AEN3188">The Path
+                <dt>8.4.2. <a href="actions-file.html#AEN3186">The Path
                 Pattern</a></dt>
 
                 <dt>8.4.3. <a href="actions-file.html#TAG-PATTERN">The Tag
@@ -485,7 +485,7 @@
                 "actions-file.html#SET-IMAGE-BLOCKER">set-image-blocker</a></dt>
 
                 <dt>8.5.36. <a href=
-                "actions-file.html#AEN4920">Summary</a></dt>
+                "actions-file.html#AEN4918">Summary</a></dt>
               </dl>
             </dd>
 
@@ -497,13 +497,13 @@
             <dd>
               <dl>
                 <dt>8.7.1. <a href=
-                "actions-file.html#AEN4984">match-all.action</a></dt>
+                "actions-file.html#AEN4982">match-all.action</a></dt>
 
                 <dt>8.7.2. <a href=
-                "actions-file.html#AEN5006">default.action</a></dt>
+                "actions-file.html#AEN5004">default.action</a></dt>
 
                 <dt>8.7.3. <a href=
-                "actions-file.html#AEN5119">user.action</a></dt>
+                "actions-file.html#AEN5117">user.action</a></dt>
               </dl>
             </dd>
           </dl>
@@ -513,7 +513,7 @@
 
         <dd>
           <dl>
-            <dt>9.1. <a href="filter-file.html#AEN5287">Filter File
+            <dt>9.1. <a href="filter-file.html#AEN5285">Filter File
             Tutorial</a></dt>
 
             <dt>9.2. <a href="filter-file.html#PREDEFINED-FILTERS">The
@@ -584,16 +584,9 @@
             <dt>14.1. <a href="appendix.html#REGEX">Regular
             Expressions</a></dt>
 
-            <dt>14.2. <a href="appendix.html#AEN6038">Privoxy's Internal
+            <dt>14.2. <a href="appendix.html#AEN6036">Privoxy's Internal
             Pages</a></dt>
 
-            <dd>
-              <dl>
-                <dt>14.2.1. <a href=
-                "appendix.html#BOOKMARKLETS">Bookmarklets</a></dt>
-              </dl>
-            </dd>
-
             <dt>14.3. <a href="appendix.html#CHAIN">Chain of Events</a></dt>
 
             <dt>14.4. <a href="appendix.html#ACTIONSANAT">Troubleshooting:
-- 
2.50.1