Просмотр исходного кода

doc: Fix wrong dpkg trigger related option names

Guillem Jover лет назад: 18
Родитель
Сommit
de995070a6
2 измененных файлов с 9 добавлено и 6 удалено
  1. 4 0
      ChangeLog
  2. 5 6
      doc/triggers.txt

+ 4 - 0
ChangeLog

@@ -1,3 +1,7 @@
+2008-04-08  Guillem Jover  <guillem@debian.org>
+
+	* doc/triggers.txt: Fix wrong dpkg trigger related option names.
+
 2008-04-08  Guillem Jover  <guillem@debian.org>
 2008-04-08  Guillem Jover  <guillem@debian.org>
 
 
 	* doc/triggers.txt: Move parts of the document into proper man pages.
 	* doc/triggers.txt: Move parts of the document into proper man pages.

+ 5 - 6
doc/triggers.txt

@@ -364,14 +364,13 @@ package in `config-failed' or `installed'.
 Note that automatic package management tools which call dpkg (like apt
 Note that automatic package management tools which call dpkg (like apt
 and aptitude) should not attempt to configure individual packages in
 and aptitude) should not attempt to configure individual packages in
 state `triggers-pending' (or indeed `triggers-awaited') with dpkg
 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
 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
 Error handling