sysusers: add new line type "m" to add users as members to groups

[elogind.git] / man / journalctl.xml

diff --git a/man/journalctl.xml b/man/journalctl.xml
index 23bb96051dc98bd852a85d24a79ef80f8f22de99..78fc6f616066be8aaf4e35a70c776e3f842314cf 100644 (file)
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -21,7 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 

-<refentry id="journalctl">
+<refentry id="journalctl"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>journalctl</title>
 
         <refentryinfo>
                 <title>journalctl</title>


@@ -119,7 +120,7 @@
                 <para>When outputing to a tty, lines are colored
                 according to priority: lines of level ERROR and higher
                 are colored red; lines of level NOTICE and higher are
                 <para>When outputing to a tty, lines are colored
                 according to priority: lines of level ERROR and higher
                 are colored red; lines of level NOTICE and higher are

-                highlighted; and other lines are displayed normally.
+                highlighted; other lines are displayed normally.

                 </para>
         </refsect1>
 
                 </para>
         </refsect1>
 


@@ -129,28 +130,6 @@
                 <para>The following options are understood:</para>
 
                 <variablelist>
                 <para>The following options are understood:</para>
 
                 <variablelist>

-                        <varlistentry>
-                                <term><option>-h</option></term>
-                                <term><option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Prints a short version
-                                string and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--no-pager</option></term>
-
-                                <listitem><para>Do not pipe output into a
-                                pager.</para></listitem>
-                        </varlistentry>
-

                         <varlistentry>
                                 <term><option>--no-full</option></term>
                                 <term><option>--full</option></term>
                         <varlistentry>
                                 <term><option>--no-full</option></term>
                                 <term><option>--full</option></term>


@@ -232,7 +211,7 @@
                                 <term><option>-r</option></term>
                                 <term><option>--reverse</option></term>
 
                                 <term><option>-r</option></term>
                                 <term><option>--reverse</option></term>
 

-                                <listitem><para>Reverse output so the newest
+                                <listitem><para>Reverse output so that the newest

                                 entries are displayed first.</para></listitem>
                         </varlistentry>
 
                                 entries are displayed first.</para></listitem>
                         </varlistentry>
 


@@ -379,7 +358,7 @@
                                                         terse output, only
                                                         showing the actual
                                                         message of each journal
                                                         terse output, only
                                                         showing the actual
                                                         message of each journal

-                                                        entry with no meta data,
+                                                        entry with no metadata,

                                                         not even a timestamp.
                                                         </para>
                                                 </listitem>
                                                         not even a timestamp.
                                                         </para>
                                                 </listitem>


@@ -509,17 +488,27 @@
 
                         <varlistentry>
                                 <term><option>-u</option></term>
 
                         <varlistentry>
                                 <term><option>-u</option></term>

-                                <term><option>--unit=</option></term>
+                                <term><option>--unit=<replaceable>UNIT</replaceable>|<replaceable>PATTERN</replaceable></option></term>

 
                                 <listitem><para>Show messages for the
 
                                 <listitem><para>Show messages for the

-                                specified systemd unit. This will add
-                                a match for messages from the unit
-                                (<literal>_SYSTEMD_UNIT=</literal>)
-                                and additional matches for messages
-                                from systemd and messages about
-                                coredumps for the specified unit.</para>
-                                <para>This parameter can be specified multiple times.
-                                </para></listitem>
+                                specified systemd unit
+                                <replaceable>UNIT</replaceable>, or
+                                for any of the units matched by
+                                <replaceable>PATTERN</replaceable>.
+                                If a pattern is specified, a list of
+                                unit names found in the journal is
+                                compared with the specified pattern
+                                and all that match are used. For each
+                                unit name, a match is added for
+                                messages from the unit
+                                (<literal>_SYSTEMD_UNIT=<replaceable>UNIT</replaceable></literal>),
+                                along with additional matches for
+                                messages from systemd and messages
+                                about coredumps for the specified
+                                unit.</para>
+
+                                <para>This parameter can be specified
+                                multiple times.</para></listitem>

                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>


@@ -691,7 +680,7 @@
                                 matching <replaceable>GLOB</replaceable>
                                 instead of the default runtime and
                                 system journal paths. May be specified
                                 matching <replaceable>GLOB</replaceable>
                                 instead of the default runtime and
                                 system journal paths. May be specified

-                                multiple times, in which case, files will
+                                multiple times, in which case files will

                                 be suitably interleaved.</para></listitem>
                         </varlistentry>
 
                                 be suitably interleaved.</para></listitem>
                         </varlistentry>
 


@@ -800,10 +789,14 @@
                                 sealing key is stored in the journal
                                 data directory and shall remain on the
                                 host. The verification key should be
                                 sealing key is stored in the journal
                                 data directory and shall remain on the
                                 host. The verification key should be

-                                stored externally. Also see the
+                                stored externally. Refer to the

                                 <option>Seal=</option> option in
                                 <citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                                 <option>Seal=</option> option in
                                 <citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>

-                                for details.</para></listitem>
+                                for information on Forward Secure
+                                Sealing and for a link to a refereed
+                                scholarly paper detailing the
+                                cryptographic theory it is based on.
+                                </para></listitem>

                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>


@@ -851,6 +844,9 @@
                                 operation.</para></listitem>
                         </varlistentry>
 
                                 operation.</para></listitem>
                         </varlistentry>
 

+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />
+                        <xi:include href="standard-options.xml" xpointer="no-pager" />

                 </variablelist>
         </refsect1>
 
                 </variablelist>
         </refsect1>
 


@@ -861,21 +857,7 @@
                 failure code is returned.</para>
         </refsect1>
 
                 failure code is returned.</para>
         </refsect1>
 

-        <refsect1>
-                <title>Environment</title>
-
-                <variablelist class='environment-variables'>
-                        <varlistentry>
-                                <term><varname>$SYSTEMD_PAGER</varname></term>
-                                <listitem><para>Pager to use when
-                                <option>--no-pager</option> is not given;
-                                overrides <varname>$PAGER</varname>.  Setting
-                                this to an empty string or the value
-                                <literal>cat</literal> is equivalent to passing
-                                <option>--no-pager</option>.</para></listitem>
-                        </varlistentry>
-                </variablelist>
-        </refsect1>
+        <xi:include href="less-variables.xml" />

 
         <refsect1>
                 <title>Examples</title>
 
         <refsect1>
                 <title>Examples</title>