sd-dhcp-client: make request broadcasts opt-in

[elogind.git] / man / journalctl.xml

diff --git a/man/journalctl.xml b/man/journalctl.xml
index 3b05e80fc118d3d8dff1d721dab64035109f62a9..47b5a0593b795bfabd95d1e6682fccdf899ab114 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>


@@ -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>


@@ -202,7 +181,7 @@
                                 with some other numeric value on the
                                 command line. Note that this option is
                                 only supported for the
                                 with some other numeric value on the
                                 command line. Note that this option is
                                 only supported for the

-                                <citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                                <citerefentry project='man-pages'><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry>

                                 pager.</para></listitem>
                         </varlistentry>
 
                                 pager.</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>


@@ -520,16 +499,16 @@
                                 unit names found in the journal is
                                 compared with the specified pattern
                                 and all that match are used. For each
                                 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
+                                unit name, a match is added for

                                 messages from the unit
                                 messages from the unit

-                                (<literal>_SYSTEMD_UNIT=<replaceable>UNIT</replaceable></literal>)
+                                (<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
                                 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>
+                                multiple times.</para></listitem>

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


@@ -561,7 +540,7 @@
                                 the form FROM..TO. The log levels are
                                 the usual syslog log levels as
                                 documented in
                                 the form FROM..TO. The log levels are
                                 the usual syslog log levels as
                                 documented in

-                                <citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+                                <citerefentry project='man-pages'><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>,

                                 i.e. <literal>emerg</literal> (0),
                                 <literal>alert</literal> (1),
                                 <literal>crit</literal> (2),
                                 i.e. <literal>emerg</literal> (0),
                                 <literal>alert</literal> (1),
                                 <literal>crit</literal> (2),


@@ -865,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>
 


@@ -875,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>


@@ -940,6 +908,7 @@
                         <citerefentry><refentrytitle>systemd</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>systemd</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>
                 </para>
                         <citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                 </para>