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 80f355491fa8aa9cd4ca591ce163f3766677c868..42682b7874e8bed07e0450aa101a1540852464c1 100644 (file)
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -90,26 +90,67 @@
                                 similar.</para></listitem>
                         </varlistentry>
 
                                 similar.</para></listitem>
                         </varlistentry>
 

+                        <varlistentry>
+                                <term><option>--property=</option></term>
+                                <term><option>-p</option></term>
+
+                                <listitem><para>When showing
+                                unit/job/manager information, limit
+                                display to certain property names. If
+                                not specified all set properties are
+                                shown. The argument should be a
+                                property name, such as
+                                <literal>MainPID</literal>.</para></listitem>
+                        </varlistentry>
+

                         <varlistentry>
                                 <term><option>--all</option></term>
                                 <term><option>-a</option></term>
 
                                 <listitem><para>When listing units,
                                 show all units, regardless of their
                         <varlistentry>
                                 <term><option>--all</option></term>
                                 <term><option>-a</option></term>
 
                                 <listitem><para>When listing units,
                                 show all units, regardless of their

-                                state, including inactive
-                                units.</para></listitem>
+                                state, including inactive units. When
+                                showing unit/job/manager information,
+                                show all properties regardless whether
+                                they are set or not.</para></listitem>

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


@@ -129,14 +170,13 @@
                         <varlistentry>
                                 <term><option>--no-block</option></term>
 
                         <varlistentry>
                                 <term><option>--no-block</option></term>
 

-                                <listitem><para>Do no synchronously
-                                wait for the requested operation to
-                                finish. If this is not specified the
-                                job will be verified, enqueued and
-                                wait until it is complete. By passing
-                                this argument it is only verified and
-                                enqueued.</para></listitem>
-                        </varlistentry>
+                               <listitem><para>Do not synchronously wait for
+                               the requested operation to finish. If this is
+                               not specified the job will be verified,
+                               enqueued and <command>systemctl</command> will
+                               wait until it is completed. By passing this
+                               argument it is only verified and
+                               enqueued.</para></listitem> </varlistentry>

 
                         <varlistentry>
                                 <term><option>--quiet</option></term>
 
                         <varlistentry>
                                 <term><option>--quiet</option></term>


@@ -165,53 +205,6 @@
 
                                 <listitem><para>List known units.</para></listitem>
                         </varlistentry>
 
                                 <listitem><para>List known units.</para></listitem>
                         </varlistentry>

-                        <varlistentry>
-                                <term><command>list-jobs</command></term>
-
-                                <listitem><para>List jobs that are in progress.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>clear-jobs</command></term>
-
-                                <listitem><para>Cancel all jobs that are in progress.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>load [NAME...]</command></term>
-
-                                <listitem><para>Load one or more units
-                                specified on the command line. This
-                                will simply load their configuration
-                                from disk, but not start them. To
-                                start them you need to use the
-                                <command>start</command> command which
-                                will implicitly load a unit that has
-                                not been loaded yet. Note that systemd
-                                garbage collects loaded units that are
-                                not active or referenced by an active
-                                unit. This means that units loaded
-                                this way will usually not stay loaded
-                                for long. Also note that this command
-                                cannot be used to reload unit
-                                configuration. Use the
-                                <command>daemon-reload</command>
-                                command for that. All in all, this
-                                command is of little use except for
-                                debugging.</para>
-                                <para>This command should not be
-                                confused with the
-                                <command>daemon-reload</command> or
-                                <command>reload</command>
-                                commands.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><command>cancel [JOB...]</command></term>
-
-                                <listitem><para>Cancel one or more
-                                jobs specified on the command line by
-                                their numeric job
-                                IDs.</para></listitem>
-                        </varlistentry>

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


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


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


@@ -279,6 +292,74 @@
                                 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>
+
+                                <listitem><para>Show properties of
+                                one or more units, jobs or the manager
+                                itself. If no argument is specified
+                                properties of the manager will be
+                                shown. If a unit name is specified
+                                properties of the unit is shown,
+                                and if a job id is specified
+                                properties of the job is
+                                shown.</para></listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><command>load [NAME...]</command></term>
+
+                                <listitem><para>Load one or more units
+                                specified on the command line. This
+                                will simply load their configuration
+                                from disk, but not start them. To
+                                start them you need to use the
+                                <command>start</command> command which
+                                will implicitly load a unit that has
+                                not been loaded yet. Note that systemd
+                                garbage collects loaded units that are
+                                not active or referenced by an active
+                                unit. This means that units loaded
+                                this way will usually not stay loaded
+                                for long. Also note that this command
+                                cannot be used to reload unit
+                                configuration. Use the
+                                <command>daemon-reload</command>
+                                command for that. All in all, this
+                                command is of little use except for
+                                debugging.</para>
+                                <para>This command should not be
+                                confused with the
+                                <command>daemon-reload</command> or
+                                <command>reload</command>
+                                commands.</para></listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><command>list-jobs</command></term>
+
+                                <listitem><para>List jobs that are in progress.</para></listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><command>cancel [JOB...]</command></term>
+
+                                <listitem><para>Cancel one or more
+                                jobs specified on the command line by
+                                their numeric job
+                                IDs.</para></listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><command>clear-jobs</command></term>
+
+                                <listitem><para>Cancel all jobs that are in progress.</para></listitem>
+                        </varlistentry>

                         <varlistentry>
                                 <term><command>monitor</command></term>
 
                         <varlistentry>
                                 <term><command>monitor</command></term>
 


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


@@ -331,6 +430,13 @@
                                 state. Snapshots are dynamic and lost
                                 on reboot.</para>
                         </varlistentry>
                                 state. Snapshots are dynamic and lost
                                 on reboot.</para>
                         </varlistentry>

+                        <varlistentry>
+                                <term><command>delete [NAME...]</command></term>
+
+                                <listitem><para>Remove a snapshot
+                                previously created with
+                                <command>snapshot</command>.</para></listitem>
+                        </varlistentry>

                         <varlistentry>
                                 <term><command>daemon-reload</command></term>
 
                         <varlistentry>
                                 <term><command>daemon-reload</command></term>
 


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


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