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

[elogind.git] / man / journalctl.xml

diff --git a/man/journalctl.xml b/man/journalctl.xml
index 626d820151275fe5f027ce48042e56dda6054e91..47b5a0593b795bfabd95d1e6682fccdf899ab114 100644 (file)
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -130,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>


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


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


@@ -562,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),


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


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