From abd789ae2b66c396bf6899a82268c6849ab5ed22 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Fri, 9 Nov 2012 10:50:30 +0000
Subject: [PATCH] Rebuild after documenting --config-test

---
 doc/webserver/user-manual/actions-file.html  | 20 +++++++-------
 doc/webserver/user-manual/appendix.html      | 28 ++++++++++----------
 doc/webserver/user-manual/configuration.html |  6 ++---
 doc/webserver/user-manual/copyright.html     |  2 +-
 doc/webserver/user-manual/filter-file.html   |  2 +-
 doc/webserver/user-manual/index.html         | 26 +++++++++---------
 doc/webserver/user-manual/startup.html       | 18 +++++++++++++
 7 files changed, 60 insertions(+), 42 deletions(-)

diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index 3c39d976..ce06322d 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="AEN2855" id="AEN2855"></a>
+          <a name="AEN2862" id="AEN2862"></a>
 
           <p><b>Table 1. Default Configurations</b></p>
 
@@ -314,7 +314,7 @@
     actions</a>.</p>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="AEN2954" id="AEN2954">8.1. Finding the Right
+      <h2 class="SECT2"><a name="AEN2961" id="AEN2961">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="AEN2961" id="AEN2961">8.2. How to
+      <h2 class="SECT2"><a name="AEN2968" id="AEN2968">8.2. How to
       Edit</a></h2>
 
       <p>The easiest way to edit the actions files is with a browser by using
@@ -529,7 +529,7 @@
       </div>
 
       <div class="SECT3">
-        <h3 class="SECT3"><a name="AEN3073" id="AEN3073">8.4.1. The Domain
+        <h3 class="SECT3"><a name="AEN3080" id="AEN3080">8.4.1. The Domain
         Pattern</a></h3>
 
         <p>The matching of the domain part offers some flexible options: if
@@ -634,7 +634,7 @@
       </div>
 
       <div class="SECT3">
-        <h3 class="SECT3"><a name="AEN3149" id="AEN3149">8.4.2. The Path
+        <h3 class="SECT3"><a name="AEN3156" id="AEN3156">8.4.2. The Path
         Pattern</a></h3>
 
         <p><span class="APPLICATION">Privoxy</span> uses <span class=
@@ -1195,7 +1195,7 @@
               <p>Client-header filters are executed after the other header
               actions have finished and use their output as input.</p>
 
-              <p>If the request URL gets changed, <span class=
+              <p>If the request URI gets changed, <span class=
               "APPLICATION">Privoxy</span> will detect that and use the new
               one. This can be used to rewrite the request destination behind
               the client's back, for example to specify a Tor exit relay for
@@ -4242,7 +4242,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
       </div>
 
       <div class="SECT3">
-        <h3 class="SECT3"><a name="AEN4785" id="AEN4785">8.5.34.
+        <h3 class="SECT3"><a name="AEN4792" id="AEN4792">8.5.34.
         Summary</a></h3>
 
         <p>Note that many of these actions have the potential to cause a page
@@ -4401,7 +4401,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
       together:</p>
 
       <div class="SECT3">
-        <h3 class="SECT3"><a name="AEN4849" id="AEN4849">8.7.1.
+        <h3 class="SECT3"><a name="AEN4856" id="AEN4856">8.7.1.
         match-all.action</a></h3>
 
         <p>Remember <span class="emphasis"><i class="EMPHASIS">all actions
@@ -4450,7 +4450,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
       </div>
 
       <div class="SECT3">
-        <h3 class="SECT3"><a name="AEN4871" id="AEN4871">8.7.2.
+        <h3 class="SECT3"><a name="AEN4878" id="AEN4878">8.7.2.
         default.action</a></h3>
 
         <p>If you aren't a developer, there's no need for you to edit the
@@ -4793,7 +4793,7 @@ wiki.
       </div>
 
       <div class="SECT3">
-        <h3 class="SECT3"><a name="AEN4984" id="AEN4984">8.7.3.
+        <h3 class="SECT3"><a name="AEN4991" id="AEN4991">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 6872b219..49e26d21 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="AEN5865" id="AEN5865">14.2. Privoxy's
+      <h2 class="SECT2"><a name="AEN5872" id="AEN5872">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="AEN5879" id="AEN5879"></a>
+          <p>Privoxy main page:</p><a name="AEN5886" id="AEN5886"></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="AEN5887" id=
-          "AEN5887"></a>
+          viewing and editing of actions files:</p><a name="AEN5894" id=
+          "AEN5894"></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="AEN5892" id=
-          "AEN5892"></a>
+          <p>Show the source code version numbers:</p><a name="AEN5899" id=
+          "AEN5899"></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="AEN5897" id=
-          "AEN5897"></a>
+          <p>Show the browser's request headers:</p><a name="AEN5904" id=
+          "AEN5904"></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="AEN5902"
-          id="AEN5902"></a>
+          <p>Show which actions apply to a URL and why:</p><a name="AEN5909"
+          id="AEN5909"></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=
-          "AEN5910" id="AEN5910"></a>
+          "AEN5917" id="AEN5917"></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="AEN5914" id=
-          "AEN5914"></a>
+          <p>Short cuts. Turn off, then on:</p><a name="AEN5921" id=
+          "AEN5921"></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="AEN5917" id="AEN5917"></a>
+          </blockquote><a name="AEN5924" id="AEN5924"></a>
 
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle?set=enable" target=
diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index 1a68756c..01501538 100644
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -46,7 +46,7 @@
     controlled easily with a web browser.</p>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="AEN1107" id="AEN1107">6.1. Controlling
+      <h2 class="SECT2"><a name="AEN1114" id="AEN1114">6.1. Controlling
       Privoxy with Your Web Browser</a></h2>
 
       <p><span class="APPLICATION">Privoxy</span>'s user interface can be
@@ -63,8 +63,8 @@
 
 </pre>
 
-            <h2 class="BRIDGEHEAD"><a name="AEN1115" id=
-            "AEN1115"></a>&nbsp;&nbsp;&nbsp;&nbsp;Privoxy Menu</h2>
+            <h2 class="BRIDGEHEAD"><a name="AEN1122" id=
+            "AEN1122"></a>&nbsp;&nbsp;&nbsp;&nbsp;Privoxy Menu</h2>
             <pre>
 </pre>
 
diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index 017c14cb..18e058ed 100644
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -51,7 +51,7 @@
     "CITETITLE">GNU General Public License</i>.</p>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="AEN5621" id="AEN5621">12.1. License</a></h2>
+      <h2 class="SECT2"><a name="AEN5628" id="AEN5628">12.1. License</a></h2>
 
       <p><span class="APPLICATION">Privoxy</span> is free software; you can
       redistribute it and/or modify it under the terms of the <i class=
diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index 7da48b66..3a69b31f 100644
--- a/doc/webserver/user-manual/filter-file.html
+++ b/doc/webserver/user-manual/filter-file.html
@@ -151,7 +151,7 @@ FILTER: foo Replace all "foo" with "bar"
     started.</p>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="AEN5139" id="AEN5139">9.1. Filter File
+      <h2 class="SECT2"><a name="AEN5146" id="AEN5146">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 c249bffd..f98ed65c 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -23,7 +23,7 @@
       2001-2011 by <a href="http://www.privoxy.org/" target="_top">Privoxy
       Developers</a></sub><br></p>
 
-      <p class="PUBDATE">$Id: user-manual.sgml,v 2.150 2012/09/26 15:20:54
+      <p class="PUBDATE">$Id: user-manual.sgml,v 2.152 2012/10/29 12:02:55
       fabiankeil Exp $<br></p>
 
       <div>
@@ -193,7 +193,7 @@
 
         <dd>
           <dl>
-            <dt>6.1. <a href="configuration.html#AEN1107">Controlling Privoxy
+            <dt>6.1. <a href="configuration.html#AEN1114">Controlling Privoxy
             with Your Web Browser</a></dt>
 
             <dt>6.2. <a href="configuration.html#CONFOVERVIEW">Configuration
@@ -362,10 +362,10 @@
 
         <dd>
           <dl>
-            <dt>8.1. <a href="actions-file.html#AEN2954">Finding the Right
+            <dt>8.1. <a href="actions-file.html#AEN2961">Finding the Right
             Mix</a></dt>
 
-            <dt>8.2. <a href="actions-file.html#AEN2961">How to Edit</a></dt>
+            <dt>8.2. <a href="actions-file.html#AEN2968">How to Edit</a></dt>
 
             <dt>8.3. <a href="actions-file.html#ACTIONS-APPLY">How Actions
             are Applied to Requests</a></dt>
@@ -375,10 +375,10 @@
 
             <dd>
               <dl>
-                <dt>8.4.1. <a href="actions-file.html#AEN3073">The Domain
+                <dt>8.4.1. <a href="actions-file.html#AEN3080">The Domain
                 Pattern</a></dt>
 
-                <dt>8.4.2. <a href="actions-file.html#AEN3149">The Path
+                <dt>8.4.2. <a href="actions-file.html#AEN3156">The Path
                 Pattern</a></dt>
 
                 <dt>8.4.3. <a href="actions-file.html#TAG-PATTERN">The Tag
@@ -489,7 +489,7 @@
                 "actions-file.html#SET-IMAGE-BLOCKER">set-image-blocker</a></dt>
 
                 <dt>8.5.34. <a href=
-                "actions-file.html#AEN4785">Summary</a></dt>
+                "actions-file.html#AEN4792">Summary</a></dt>
               </dl>
             </dd>
 
@@ -501,13 +501,13 @@
             <dd>
               <dl>
                 <dt>8.7.1. <a href=
-                "actions-file.html#AEN4849">match-all.action</a></dt>
+                "actions-file.html#AEN4856">match-all.action</a></dt>
 
                 <dt>8.7.2. <a href=
-                "actions-file.html#AEN4871">default.action</a></dt>
+                "actions-file.html#AEN4878">default.action</a></dt>
 
                 <dt>8.7.3. <a href=
-                "actions-file.html#AEN4984">user.action</a></dt>
+                "actions-file.html#AEN4991">user.action</a></dt>
               </dl>
             </dd>
           </dl>
@@ -517,7 +517,7 @@
 
         <dd>
           <dl>
-            <dt>9.1. <a href="filter-file.html#AEN5139">Filter File
+            <dt>9.1. <a href="filter-file.html#AEN5146">Filter File
             Tutorial</a></dt>
 
             <dt>9.2. <a href="filter-file.html#PREDEFINED-FILTERS">The
@@ -561,7 +561,7 @@
 
         <dd>
           <dl>
-            <dt>12.1. <a href="copyright.html#AEN5621">License</a></dt>
+            <dt>12.1. <a href="copyright.html#AEN5628">License</a></dt>
 
             <dt>12.2. <a href="copyright.html#HISTORY">History</a></dt>
 
@@ -578,7 +578,7 @@
             <dt>14.1. <a href="appendix.html#REGEX">Regular
             Expressions</a></dt>
 
-            <dt>14.2. <a href="appendix.html#AEN5865">Privoxy's Internal
+            <dt>14.2. <a href="appendix.html#AEN5872">Privoxy's Internal
             Pages</a></dt>
 
             <dd>
diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index e935cbd0..da3c27c9 100644
--- a/doc/webserver/user-manual/startup.html
+++ b/doc/webserver/user-manual/startup.html
@@ -319,6 +319,24 @@
       following command-line options:</p>
 
       <ul>
+        <li>
+          <p><span class="emphasis"><i class=
+          "EMPHASIS">--config-test</i></span></p>
+
+          <p>Exit after loading the configuration files before binding to the
+          listen address. The exit code signals whether or not the
+          configuration files have been successfully loaded.</p>
+
+          <p>If the exit code is 1, at least one of the configuration files
+          is invalid, if it is 0, all the configuration files have been
+          successfully loaded (but may still contain errors that can
+          currently only be detected at run time).</p>
+
+          <p>This option doesn't affect the log setting, combination with
+          <span class="emphasis"><i class="EMPHASIS">--no-daemon</i></span>
+          is recommended if a configured log file shouldn't be used.</p>
+        </li>
+
         <li>
           <p><span class="emphasis"><i class=
           "EMPHASIS">--version</i></span></p>
-- 
2.49.0