Merging upstream version 256.

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

1 files changed, 38 insertions, 20 deletions

diff --git a/man/journalctl.xml b/man/journalctl.xml
index d1066b8..5fd9263 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 
 <refentry id="journalctl"
@@ -77,7 +77,7 @@
     <emphasis>are</emphasis> being shown.</para>
 
     <para>The set of journal files which will be used can be modified using the <option>--user</option>,
-    <option>--system</option>, <option>--directory</option>, and <option>--file</option> options, see
+    <option>--system</option>, <option>--directory=</option>, and <option>--file=</option> options, see
     below.</para>
 
     <para>All users are granted access to their private per-user journals. However, by default, only root and
@@ -160,6 +160,7 @@
       </varlistentry>
 
       <varlistentry>
+        <term><option>-i <replaceable>GLOB</replaceable></option></term>
         <term><option>--file=<replaceable>GLOB</replaceable></option></term>
 
         <listitem><para>Takes a file glob as an argument. If specified, journalctl will operate on the
@@ -295,7 +296,7 @@
         <constant>2</constant> the second and so on; while <constant>-0</constant> is the last boot,
         <constant>-1</constant> the boot before last, and so on. An empty <replaceable>offset</replaceable>
         is equivalent to specifying <constant>-0</constant>, except when the current boot is not the last
-        boot (e.g. because <option>--directory</option> was specified to look at logs from a different
+        boot (e.g. because <option>--directory=</option> was specified to look at logs from a different
         machine).</para>
 
         <para>If the 32-character <replaceable>ID</replaceable> is specified, it may optionally be followed
@@ -362,6 +363,18 @@
       </varlistentry>
 
       <varlistentry>
+        <term><option>-T</option></term>
+        <term><option>--exclude-identifier=<replaceable>SYSLOG_IDENTIFIER</replaceable></option></term>
+
+        <listitem><para>Exclude messages for the specified syslog identifier
+        <replaceable>SYSLOG_IDENTIFIER</replaceable>.</para>
+
+        <para>This parameter can be specified multiple times.</para>
+
+        <xi:include href="version-info.xml" xpointer="v256"/></listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><option>-p</option></term>
         <term><option>--priority=</option></term>
 
@@ -677,8 +690,7 @@
         will explain the context of an error or log event, possible solutions, as well as pointers to support
         forums, developer documentation, and any other relevant manuals. Note that help texts are not
         available for all messages, but only for selected ones. For more information on the message catalog,
-        please refer to the <ulink url="https://www.freedesktop.org/wiki/Software/systemd/catalog">Message
-        Catalog Developer Documentation</ulink>.</para>
+        see <ulink url="https://systemd.io/CATALOG">Journal Message Catalogs</ulink>.</para>
 
         <para>Note: when attaching <command>journalctl</command> output to bug reports, please do
         <emphasis>not</emphasis> use <option>-x</option>.</para>
@@ -838,10 +850,16 @@
       <varlistentry>
         <term><option>--list-boots</option></term>
 
-        <listitem><para>Show a tabular list of boot numbers (relative to the current boot), their IDs, and
-        the timestamps of the first and last message pertaining to the boot.</para>
+        <listitem>
+          <para>Show a tabular list of boot numbers (relative to the current boot), their IDs, and the
+          timestamps of the first and last message pertaining to the boot. When specified with
+          <option>-n/--lines=<optional>+</optional><replaceable>N</replaceable></option> option, only the
+          first (when the number prefixed with <literal>+</literal>) or the last (without prefix)
+          <replaceable>N</replaceable> entries will be shown. When specified with
+          <option>-r/--reverse</option>, the list will be shown in the reverse order.</para>
 
-        <xi:include href="version-info.xml" xpointer="v209"/></listitem>
+          <xi:include href="version-info.xml" xpointer="v209"/>
+        </listitem>
       </varlistentry>
 
       <varlistentry>
@@ -1096,17 +1114,17 @@ journalctl _SYSTEMD_CGROUP=/user.slice/user-42.slice/session-c1.scope</programli
 
   <refsect1>
     <title>See Also</title>
-    <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-cat</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>coredumpctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-journal-remote.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-journal-upload.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-    </para>
+    <para><simplelist type="inline">
+      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-cat</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>coredumpctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-journal-remote.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-journal-upload.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+    </simplelist></para>
   </refsect1>
 </refentry>