Merging upstream version 1.22.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 13 insertions, 1 deletions

diff --git a/man/dpkg.pod b/man/dpkg.pod
index 75493cd..a9795a4 100644
--- a/man/dpkg.pod
+++ b/man/dpkg.pod
@@ -1042,6 +1042,9 @@ is preserved, with the ones from the configuration files taking precedence.
 The environment variable B<DPKG_HOOK_ACTION> is set for the hooks to the
 current B<dpkg> action.
 
+The invoke hooks are not executed when B<--no-act> is specified,
+or when running as non-root without B<--force-not-root>.
+
 B<Note>: Front-ends might call B<dpkg> several
 times per invocation, which might run the hooks more times than expected.
 
@@ -1108,7 +1111,7 @@ These lines have the following format:
 
 Z<>
  B<missing  > [B<c>] I<pathname> [B<(>I<error-message>B<)>]
- B<??5??????> [B<c>] I<pathname>
+ B<?M5??????> [B<c>] I<pathname>
 
 The first 9 characters are used to report the checks result,
 either a literal B<missing> when the file is not present or its metadata
@@ -1220,6 +1223,9 @@ shell I<command>'s standard input, to be run via “%DPKG_DEFAULT_SHELL% -c”
 This option can be specified multiple times.
 The output format used is the same as in B<--status-fd>.
 
+The status loggers are not executed when B<--no-act> is specified,
+or when running as non-root without B<--force-not-root>.
+
 =item B<--log=>I<filename>
 
 Log status change updates and actions to I<filename>, instead of
@@ -1356,6 +1362,12 @@ Sets the color mode (since dpkg 1.18.5).
 The currently accepted values are: B<auto> (default), B<always> and
 B<never>.
 
+=item B<DPKG_NLS>
+
+If set, it will be used to decide whether to activate Native Language Support,
+also known as internationalization (or i18n) support (since dpkg 1.22.7).
+The accepted values are: B<0> and B<1> (default).
+
 =item B<DPKG_DEBUG>
 
 Sets the debug mask (since dpkg 1.21.10) from an octal value.