socket: don't allow mixing of accepting and non-accepting sockets in the same unit

[elogind.git] / man / systemctl.xml

diff --git a/man/systemctl.xml b/man/systemctl.xml
index 1bd08da96bbf1793ab54b502c8043c7371893f05..42682b7874e8bed07e0450aa101a1540852464c1 100644 (file)
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -116,15 +116,41 @@
                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>

-                                <term><option>--replace</option></term>
+                                <term><option>--fail</option></term>

 
                                 <listitem><para>If the requested
                                 operation conflicts with an existing
 
                                 <listitem><para>If the requested
                                 operation conflicts with an existing

-                                unfinished operation, replace the
-                                existing operation by the requested
-                                operation. If this is not specified
-                                the requested operation will
-                                fail.</para></listitem>
+                                unfinished operation, fail the
+                                command. If this is not specified the
+                                requested operation will replace the
+                                pending job if
+                                necessary.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--order</option></term>
+                                <term><option>--require</option></term>
+
+                                <listitem><para>When used in
+                                conjunction with the
+                                <command>dot</command> command (see
+                                below), selects which dependencies are
+                                shown in the dependency graph. If
+                                <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
+                                <varname>Requires=</varname>,
+                                <varname>RequiresOverridable=</varname>,
+                                <varname>Requisite=</varname>,
+                                <varname>RequisiteOverridable=</varname>,
+                                <varname>Wants=</varname> and
+                                <varname>Conflicts=</varname> are
+                                shown. If neither is passed, shows
+                                dependencies of all these
+                                types.</para></listitem>

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


@@ -193,13 +219,6 @@
                                 specified on the command
                                 line.</para></listitem>
                         </varlistentry>
                                 specified on the command
                                 line.</para></listitem>
                         </varlistentry>

-                        <varlistentry>
-                                <term><command>restart [NAME...]</command></term>
-
-                                <listitem><para>Restart one or more
-                                units specified on the command
-                                line.</para></listitem>
-                        </varlistentry>

                         <varlistentry>
                                 <term><command>reload [NAME...]</command></term>
 
                         <varlistentry>
                                 <term><command>reload [NAME...]</command></term>
 


@@ -226,6 +245,33 @@
                                 commands.</para></listitem>
 
                         </varlistentry>
                                 commands.</para></listitem>
 
                         </varlistentry>

+                        <varlistentry>
+                                <term><command>restart [NAME...]</command></term>
+
+                                <listitem><para>Restart one or more
+                                units specified on the command
+                                line. If the units are not running yet
+                                they will be
+                                started.</para></listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><command>try-restart [NAME...]</command></term>
+
+                                <listitem><para>Restart one or more
+                                units specified on the command
+                                line. If the units are not running yet
+                                the operation will
+                                fail.</para></listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><command>reload-or-restart [NAME...]</command></term>
+                                <term><command>reload-or-try-restart [NAME...]</command></term>
+
+                                <listitem><para>Reload one or more
+                                units if they support it. If not
+                                restart them
+                                instead.</para></listitem>
+                        </varlistentry>

                         <varlistentry>
                                 <term><command>isolate [NAME]</command></term>
 
                         <varlistentry>
                                 <term><command>isolate [NAME]</command></term>
 


@@ -246,17 +292,26 @@
                                 this will also print the current unit
                                 state to STDOUT.</para></listitem>
                         </varlistentry>
                                 this will also print the current unit
                                 state to STDOUT.</para></listitem>
                         </varlistentry>

+                        <varlistentry>
+                                <term><command>status [NAME...]</command></term>
+
+                                <listitem><para>Show short status
+                                information about one or more
+                                units. This shows terse runtime
+                                information about
+                                units.</para></listitem>
+                        </varlistentry>

                         <varlistentry>
                                 <term><command>show [NAME...|JOB...]</command></term>
 
                         <varlistentry>
                                 <term><command>show [NAME...|JOB...]</command></term>
 

-                                <listitem><para>Show information about
+                                <listitem><para>Show properties of

                                 one or more units, jobs or the manager
                                 itself. If no argument is specified
                                 one or more units, jobs or the manager
                                 itself. If no argument is specified

-                                information about the manager will be
+                                properties of the manager will be

                                 shown. If a unit name is specified
                                 shown. If a unit name is specified

-                                information about the unit is shown,
+                                properties of the unit is shown,

                                 and if a job id is specified
                                 and if a job id is specified

-                                information about the job is
+                                properties of the job is

                                 shown.</para></listitem>
                         </varlistentry>
                         <varlistentry>
                                 shown.</para></listitem>
                         </varlistentry>
                         <varlistentry>


@@ -326,6 +381,24 @@
                                 be parsed by
                                 applications.</para></listitem>
                         </varlistentry>
                                 be parsed by
                                 applications.</para></listitem>
                         </varlistentry>

+                        <varlistentry>
+                                <term><command>dot</command></term>
+
+                                <listitem><para>Generate textual
+                                dependency graph description in dot
+                                format for further processing with the
+                                GraphViz
+                                <citerefentry><refentrytitle>dot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                                tool. Use a command line like
+                                <command>systemctl dot | dot -Tsvg >
+                                systemd.svg</command> to generate a
+                                graphical dependency tree. Unless
+                                <option>--order</option> or
+                                <option>--require</option> is passed
+                                the generated graph will show both
+                                ordering and requirement
+                                dependencies.</para></listitem>
+                        </varlistentry>

                         <varlistentry>
                                 <term><command>snapshot [NAME]</command></term>
 
                         <varlistentry>
                                 <term><command>snapshot [NAME]</command></term>
 


@@ -372,7 +445,7 @@
                                 unit files and recreate the entire
                                 dependency tree. While the daemon is
                                 reloaded, all sockets systemd listens
                                 unit files and recreate the entire
                                 dependency tree. While the daemon is
                                 reloaded, all sockets systemd listens

-                                on on behalf of user configuration, will
+                                on on behalf of user configuration will

                                 stay accessible.</para> <para>This
                                 command should not be confused with
                                 the <command>load</command> or
                                 stay accessible.</para> <para>This
                                 command should not be confused with
                                 the <command>load</command> or


@@ -492,7 +565,7 @@
                                 <listitem><para>Enter emergency
                                 mode. This is mostly equivalent to
                                 <command>isolate
                                 <listitem><para>Enter emergency
                                 mode. This is mostly equivalent to
                                 <command>isolate

-                                emergency.service</command> but also
+                                emergency.target</command> but also

                                 prints a wall message to all
                                 users.</para></listitem>
                         </varlistentry>
                                 prints a wall message to all
                                 users.</para></listitem>
                         </varlistentry>