X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-analyze.xml;h=c7a25985ca9a116299626f112bb57e36383895f8;hb=9ea28c55a2488e6cd4a44ac5786f12b71ad5bc9f;hp=60377093d0f84cf9dd3852fd24824fdc5363278b;hpb=d83c224da0aedcec9a432fe51fa27a3fed7be4b3;p=elogind.git

diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
index 60377093d..c7a25985c 100644
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -21,7 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="systemd-analyze">
+<refentry id="systemd-analyze"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
 
         <refentryinfo>
                 <title>systemd-analyze</title>
@@ -182,19 +183,19 @@
 
                 <variablelist>
                         <varlistentry>
-                                <term><option>-h</option></term>
-                                <term><option>--help</option></term>
+                                <term><option>--user</option></term>
 
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
+                                <listitem><para>Shows performance data
+                                of user sessions instead of the system
+                                manager.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--user</option></term>
+                                <term><option>--system</option></term>
 
                                 <listitem><para>Shows performance data
-                                of user sessions instead of the system
-                                manager.</para></listitem>
+                                of the system manager. This is the
+                                implied default.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -206,12 +207,12 @@
                                 <command>dot</command> command (see
                                 above), selects which dependencies are
                                 shown in the dependency graph. If
-                                <option>--order</option> is passed
+                                <option>--order</option> is passed,
                                 only dependencies of type
                                 <varname>After=</varname> or
                                 <varname>Before=</varname> are
                                 shown. If <option>--require</option>
-                                is passed only dependencies of type
+                                is passed, only dependencies of type
                                 <varname>Requires=</varname>,
                                 <varname>RequiresOverridable=</varname>,
                                 <varname>Requisite=</varname>,
@@ -256,13 +257,12 @@
                                 e.g. "50ms".</para></listitem>
                         </varlistentry>
 
-                        <varlistentry>
-                                <term><option>--no-pager</option></term>
+                        <xi:include href="user-system-options.xml" xpointer="host" />
+                        <xi:include href="user-system-options.xml" xpointer="machine" />
 
-                                <listitem>
-                                        <para>Do not pipe output into a pager.</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>
@@ -270,7 +270,7 @@
         <refsect1>
                 <title>Exit status</title>
 
-                <para>On success 0 is returned, a non-zero failure
+                <para>On success, 0 is returned, a non-zero failure
                 code otherwise.</para>
         </refsect1>
 
@@ -291,23 +291,7 @@ $ eog targets.svg</programlisting>
 
         </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>See Also</title>