X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Fprivoxy-man-page.sgml;h=cd4f78147d36262ea53847c583b04d0d7ba63ea3;hp=0d24c78aa02986bb1c02577f7d85bdb6ffc9ea84;hb=9e8218ff00c020b0d3216744fb3f26242326ada5;hpb=0428133610c525457cb16f7ac6a54203a2743d6c

diff --git a/doc/source/privoxy-man-page.sgml b/doc/source/privoxy-man-page.sgml
index 0d24c78a..cd4f7814 100644
--- a/doc/source/privoxy-man-page.sgml
+++ b/doc/source/privoxy-man-page.sgml
@@ -5,9 +5,9 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: privoxy-man-page.sgml,v 2.37 2011/08/17 10:40:07 fabiankeil Exp $
+ $Id: privoxy-man-page.sgml,v 2.48 2013/03/01 17:44:24 fabiankeil Exp $
 
- Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
+ Copyright (C) 2001-2012 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
 
  ========================================================================
@@ -42,7 +42,7 @@
 <!entity copyright SYSTEM "copyright.sgml">
 <!entity license SYSTEM "license.sgml">
 <!entity authors SYSTEM "p-authors.sgml">
-<!entity p-version "3.0.18">
+<!entity p-version "3.0.22">
 <!entity p-status "UNRELEASED">
 <!entity % p-not-stable "INCLUDE">
 <!entity % p-stable "IGNORE">
@@ -54,7 +54,7 @@
 
 <refentry id="privoxy">
 <refentryinfo>
- <date>2009-02-15</date>
+ <date>2012-11-08</date>
 </refentryinfo>
 <refmeta>
  <refentrytitle>privoxy</refentrytitle>
@@ -72,13 +72,14 @@
 <refsynopsisdiv>
  <cmdsynopsis>
   <command>privoxy</command>
+  <arg><option>--chroot</option></arg>
+  <arg><option>--config-test</option></arg>
   <arg><option>--help</option></arg>
-  <arg><option>--version</option></arg>
   <arg><option>--no-daemon</option></arg>
   <arg><option>--pidfile </option><replaceable class="parameter">pidfile</replaceable></arg>
-  <arg><option>--user </option><replaceable class="parameter">user[.group]</replaceable></arg>
-  <arg><option>--chroot</option></arg>
   <arg><option>--pre-chroot-nslookup </option><replaceable class="parameter">hostname</replaceable></arg>
+  <arg><option>--user </option><replaceable class="parameter">user[.group]</replaceable></arg>
+  <arg><option>--version</option></arg>
   <arg><replaceable class="parameter">configfile</replaceable></arg>
  </cmdsynopsis>
 
@@ -93,20 +94,48 @@
  </para>
 
  <variablelist>
+
   <varlistentry>
-    <term>--help</term>
+    <term>--chroot</term>
+     <listitem>
+      <para>
+       Before changing to the user ID given in the --user option, chroot to
+       that user's home directory, i.e. make the kernel pretend to the
+       <command>Privoxy</command> process that the directory tree starts
+       there. If set up carefully, this can limit the impact of possible
+       vulnerabilities in <command>Privoxy</command> to the files contained in
+       that hierarchy.
+      </para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term>--config-test</term>
       <listitem>
        <para>
-         Print brief usage info and exit.
+         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.
+       </para>
+       <para>
+         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).
         </para>
+       <para>
+         This option doesn't affect the log setting, combination with
+         "--no-daemon" is recommended if a configured log file shouldn't
+         be used.
+       </para>
       </listitem>
   </varlistentry>
 
   <varlistentry>
-    <term>--version</term>
+    <term>--help</term>
       <listitem>
        <para>
-         Print version info and exit.
+         Print brief usage info and exit.
         </para>
       </listitem>
   </varlistentry>
@@ -133,6 +162,17 @@
     </listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term>--pre-chroot-nslookup <replaceable class="parameter">hostname</replaceable></term>
+     <listitem>
+      <para>
+        Initialize the resolver library using <replaceable class="parameter">hostname</replaceable>
+        before chroot'ing. On some systems this reduces the number of files
+        that must be copied into the chroot tree.
+     </para>
+    </listitem>
+  </varlistentry>
+
   <varlistentry>
     <term>--user <replaceable class="parameter">user[.group]</replaceable></term>
      <listitem>
@@ -148,29 +188,16 @@
      </para>
     </listitem>
   </varlistentry>
+
   <varlistentry>
-    <term>--chroot</term>
-     <listitem>
-      <para>
-       Before changing to the user ID given in the --user option, chroot to
-       that user's home directory, i.e. make the kernel pretend to the
-       <command>Privoxy</command> process that the directory tree starts
-       there. If set up carefully, this can limit the impact of possible
-       vulnerabilities in <command>Privoxy</command> to the files contained in
-       that hierarchy.
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>--pre-chroot-nslookup <replaceable class="parameter">hostname</replaceable></term>
-     <listitem>
-      <para>
-        Initialize the resolver library using <replaceable class="parameter">hostname</replaceable>
-        before chroot'ing. On some systems this reduces the number of files
-        that must be copied into the chroot tree.
-     </para>
-    </listitem>
+    <term>--version</term>
+      <listitem>
+       <para>
+         Print version info and exit.
+        </para>
+      </listitem>
   </varlistentry>
+
  </variablelist>
 
  <para>
@@ -294,13 +321,14 @@
 <refsect1><title>Signals</title>
 <para>
  <!-- command tag is used here to get proper looking format  -->
- <command>Privoxy</command> terminates on the <command>SIGINT</command>,
- <command>SIGTERM</command> and <command>SIGABRT</command> signals. Log
+ <command>Privoxy</command> terminates on the <command>SIGINT</command>
+ and <command>SIGTERM</command> signals. Log
  rotation scripts may cause a re-opening of the logfile by sending a
  <command>SIGHUP</command> to <command>Privoxy</command>. Note that unlike
  other daemons,  <command>Privoxy</command> does not need to be made aware of
  config file changes by <command>SIGHUP</command> -- it will detect them
- automatically.
+ automatically. Signals other than the ones listed above aren't explicitly
+ handled and result in the default action defined by the operating system.
 </para>
 
 </refsect1>