cleanup commit for trigger processing:

- remove the DPkg::NoConfTriggers - absolutely useless as we need
  TriggersPending already so we can use --no-triggers.
- remove the Immediate-option from the example, it doesn't help much.
- UnpackCritical uses DepUnPackPre with a D (on simple letter...)
- the "smart" optimisation to skip A was not so smart - revert.

1 files changed, 2 insertions, 10 deletions

diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 808c852a5..67aa933cc 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -21,7 +21,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>10 December 2008</date>
+   <date>18 September 2009</date>
  </refentryinfo>
  
  <refmeta>
@@ -484,8 +484,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
 <literallayout>DPkg::NoTriggers "true";
 PackageManager::Configure "smart";
 DPkg::ConfigurePending "true";
-DPkg::TriggersPending "true";
-OrderList::Score::Immediate 100;</literallayout></para>
+DPkg::TriggersPending "true";</literallayout></para>
 
      <variablelist>
        <varlistentry><term>DPkg::NoTriggers</term>
@@ -520,13 +519,6 @@ OrderList::Score::Immediate 100;</literallayout></para>
        currently which is a dealbreaker for Pre-Dependencies (see debbugs #526774). Note that this will
        process all triggers, not only the triggers needed to configure this package.</para></listitem>
        </varlistentry>
-       <varlistentry><term>Dpkg::NoConfTriggers</term>
-       <listitem><para>DPkg currently will ignore the --triggers or --no-triggers flag if the trigger
-       is already pending. This option therefore has no real effect as long as dpkg doesn't change
-       his behavior. The option is automatical activated if <literal>DPkg::NoTriggers</literal> is
-       activated. You should use <literal>DPkg::TriggersPending</literal> to take care of these pending
-       triggers.</para></listitem>
-       </varlistentry>
        <varlistentry><term>PackageManager::UnpackAll</term>
        <listitem><para>As the configuration can be deferred to be done at the end by dpkg it can be
        tried to order the unpack series only by critical needs, e.g. by Pre-Depends. Default is true