X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fjournalctl.xml;h=1f464880e6a9f0bd47beb901e1fffa4d73aaf28a;hb=92daebc0d0268c35f416c1665e0da3d4be5dd69f;hp=8890c64a41fbbfae8c61ac84ef73248873243cbd;hpb=21ac6ff143cc8bebfbd1818af28e8c6f82cd5265;p=elogind.git

diff --git a/man/journalctl.xml b/man/journalctl.xml
index 8890c64a4..1f464880e 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -130,28 +130,6 @@
                 <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>
@@ -203,7 +181,7 @@
                                 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>
 
@@ -380,7 +358,7 @@
                                                         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>
@@ -521,16 +499,16 @@
                                 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
-                                (<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
-                                multiple times. </para></listitem>
+                                multiple times.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -562,7 +540,7 @@
                                 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),
@@ -866,6 +844,9 @@
                                 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>