Adding upstream version 256.upstream/256

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

1 files changed, 29 insertions, 20 deletions

diff --git a/man/common-variables.xml b/man/common-variables.xml
index 1aa31e1..2d26bf7 100644
--- a/man/common-variables.xml
+++ b/man/common-variables.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+<!DOCTYPE refsect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 
@@ -11,13 +11,18 @@
       <term><varname>$SYSTEMD_LOG_LEVEL</varname></term>
 
       <listitem><para id='log-level-body'>The maximum log level of emitted messages (messages with a higher
-      log level, i.e. less important ones, will be suppressed). Either one of (in order of decreasing
-      importance) <constant>emerg</constant>, <constant>alert</constant>, <constant>crit</constant>,
-      <constant>err</constant>, <constant>warning</constant>, <constant>notice</constant>,
-      <constant>info</constant>, <constant>debug</constant>, or an integer in the range 0…7. See
+      log level, i.e. less important ones, will be suppressed). Takes a comma-separated list of values. A
+      value may be either one of (in order of decreasing importance) <constant>emerg</constant>,
+      <constant>alert</constant>, <constant>crit</constant>, <constant>err</constant>,
+      <constant>warning</constant>, <constant>notice</constant>, <constant>info</constant>,
+      <constant>debug</constant>, or an integer in the range 0…7. See
       <citerefentry project='man-pages'><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-      for more information.</para>
-      </listitem>
+      for more information. Each value may optionally be prefixed with one of <constant>console</constant>,
+      <constant>syslog</constant>, <constant>kmsg</constant> or <constant>journal</constant> followed by a
+      colon to set the maximum log level for that specific log target (e.g.
+      <constant>SYSTEMD_LOG_LEVEL=debug,console:info</constant> specifies to log at debug level except when
+      logging to the console which should be at info level). Note that the global maximum log level takes
+      priority over any per target maximum log levels.</para></listitem>
     </varlistentry>
 
     <varlistentry id='log-color'>
@@ -116,24 +121,28 @@
         <varlistentry>
           <term><option>K</option></term>
 
-          <para>This option instructs the pager to exit immediately when
-          <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> is pressed. To allow
-          <command>less</command> to handle <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo>
-          itself to switch back to the pager command prompt, unset this option.</para>
-
-          <para>If the value of <varname>$SYSTEMD_LESS</varname> does not include <literal>K</literal>,
-          and the pager that is invoked is <command>less</command>,
-          <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> will be ignored by the
-          executable, and needs to be handled by the pager.</para>
+          <listitem>
+            <para>This option instructs the pager to exit immediately when
+            <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> is pressed. To allow
+            <command>less</command> to handle <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo>
+            itself to switch back to the pager command prompt, unset this option.</para>
+
+            <para>If the value of <varname>$SYSTEMD_LESS</varname> does not include <literal>K</literal>,
+            and the pager that is invoked is <command>less</command>,
+            <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> will be ignored by the
+            executable, and needs to be handled by the pager.</para>
+          </listitem>
         </varlistentry>
 
         <varlistentry>
           <term><option>X</option></term>
 
-          <para>This option instructs the pager to not send termcap initialization and deinitialization
-          strings to the terminal. It is set by default to allow command output to remain visible in the
-          terminal even after the pager exits. Nevertheless, this prevents some pager functionality from
-          working, in particular paged output cannot be scrolled with the mouse.</para>
+          <listitem>
+            <para>This option instructs the pager to not send termcap initialization and deinitialization
+            strings to the terminal. It is set by default to allow command output to remain visible in the
+            terminal even after the pager exits. Nevertheless, this prevents some pager functionality from
+            working, in particular paged output cannot be scrolled with the mouse.</para>
+        </listitem>
         </varlistentry>
       </variablelist>