X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemctl.xml;h=22d3f6ee5e5befb12860f465e1945749677d876d;hp=e3a07d5d033f744f782cf17b1b1b47a4a60428a4;hb=a974d58e83e409a92ca916bb9bbce0e457ea896f;hpb=225fdfd3dda82220537ae699895fffe99ce4ba34
diff --git a/man/systemctl.xml b/man/systemctl.xml
index e3a07d5d0..22d3f6ee5 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -90,26 +90,41 @@
similar.
+
+
+
+
+ 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
+ MainPID.
+
+
When listing units,
show all units, regardless of their
- state, including inactive
- units.
+ state, including inactive units. When
+ showing unit/job/manager information,
+ show all properties regardless whether
+ they are set or not.
-
+ 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.
+ unfinished operation, fail the
+ command. If this is not specified the
+ requested operation will replace the
+ pending job if
+ necessary.
@@ -164,53 +179,6 @@
List known units.
-
- list-jobs
-
- List jobs that are in progress.
-
-
- clear-jobs
-
- Cancel all jobs that are in progress.
-
-
- load [NAME...]
-
- 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
- start 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
- daemon-reload
- command for that. All in all, this
- command is of little use except for
- debugging.
- This command should not be
- confused with the
- daemon-reload or
- reload
- commands.
-
-
-
- cancel [JOB...]
-
- Cancel one or more
- jobs specified on the command line by
- their numeric job
- IDs.
- start [NAME...]
@@ -278,6 +246,74 @@
this will also print the current unit
state to STDOUT.
+
+ status [NAME...]
+
+ Show short status
+ information about one or more
+ units. This shows terse runtime
+ information about
+ units.
+
+
+ show [NAME...|JOB...]
+
+ 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.
+
+
+ load [NAME...]
+
+ 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
+ start 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
+ daemon-reload
+ command for that. All in all, this
+ command is of little use except for
+ debugging.
+ This command should not be
+ confused with the
+ daemon-reload or
+ reload
+ commands.
+
+
+ list-jobs
+
+ List jobs that are in progress.
+
+
+ cancel [JOB...]
+
+ Cancel one or more
+ jobs specified on the command line by
+ their numeric job
+ IDs.
+
+
+ clear-jobs
+
+ Cancel all jobs that are in progress.
+ monitor
@@ -345,7 +381,7 @@
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. This
command should not be confused with
the load or
@@ -465,7 +501,7 @@
Enter emergency
mode. This is mostly equivalent to
isolate
- emergency.service but also
+ emergency.target but also
prints a wall message to all
users.