The following commit has been merged in the master branch:
commit de995070a648eadd33dc6321a94c19c596149bd6
Author: Guillem Jover <[EMAIL PROTECTED]>
Date:   Tue Apr 8 06:31:52 2008 +0300

    doc: Fix wrong dpkg trigger related option names

diff --git a/ChangeLog b/ChangeLog
index ade8a05..5971afc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-04-08  Guillem Jover  <[EMAIL PROTECTED]>
 
+       * doc/triggers.txt: Fix wrong dpkg trigger related option names.
+
+2008-04-08  Guillem Jover  <[EMAIL PROTECTED]>
+
        * doc/triggers.txt: Move parts of the document into proper man pages.
        Add references to those.
 
diff --git a/doc/triggers.txt b/doc/triggers.txt
index f71c038..915e8e7 100644
--- a/doc/triggers.txt
+++ b/doc/triggers.txt
@@ -364,14 +364,13 @@ package in `config-failed' or `installed'.
 Note that automatic package management tools which call dpkg (like apt
 and aptitude) should not attempt to configure individual packages in
 state `triggers-pending' (or indeed `triggers-awaited') with dpkg
---triggers <package>... or dpkg --suppress-triggers --configure
-<package>..., or similar approaches.  This might defeat dpkg's trigger
-cycle detection.
+--triggers-only <package>... or dpkg --no-triggers --configure <package>...,
+or similar approaches. This might defeat dpkg's trigger cycle detection.
 
 A package management tool which will run dpkg --configure --pending at
-the end may use --suppress-triggers on its other dpkg runs.  This
-would be more efficient as it allows more aggressive deferral (and
-hence more unification) of trigger processing.
+the end may use --no-triggers on its other dpkg runs.  This would be
+more efficient as it allows more aggressive deferral (and hence more
+unification) of trigger processing.
 
 
 Error handling

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to