From 393a2f9be167f4147e117fd2fc912292899b6b33 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 4 Jul 2010 20:46:12 +0200 Subject: man: update systemctl man page --- man/systemctl.xml | 125 +++++++++++++++++++++++++++++++++--------------------- src/systemctl.c | 4 +- 2 files changed, 78 insertions(+), 51 deletions(-) diff --git a/man/systemctl.xml b/man/systemctl.xml index e3a07d5d03..1bd08da96b 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -90,14 +90,29 @@ 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. @@ -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,65 @@ this will also print the current unit state to STDOUT. + + show [NAME...|JOB...] + + Show information about + one or more units, jobs or the manager + itself. If no argument is specified + information about the manager will be + shown. If a unit name is specified + information about the unit is shown, + and if a job id is specified + information about 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 diff --git a/src/systemctl.c b/src/systemctl.c index 12ddae859e..72bb7d8044 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -2106,7 +2106,7 @@ static int systemctl_help(void) { "Send control commands to the systemd manager.\n\n" " -h --help Show this help\n" " -t --type=TYPE List only units of a particular type\n" - " -p --property=NAME Show only property by this name\n" + " -p --property=NAME Show only properties by this name\n" " -a --all Show all units/properties, including dead/empty ones\n" " --replace When installing a new job, replace existing conflicting ones\n" " --system Connect to system bus\n" @@ -2122,7 +2122,7 @@ static int systemctl_help(void) { " reload [NAME...] Reload one or more units\n" " isolate [NAME] Start one unit and stop all others\n" " check [NAME...] Check whether any of the passed units are active\n" - " show [NAME...|JOB...] Show information about one or more units\n" + " show [NAME...|JOB...] Show information about one or more units/jobs/manager\n" " load [NAME...] Load one or more units\n" " list-jobs List jobs\n" " cancel [JOB...] Cancel one or more jobs\n" -- cgit v1.2.3-54-g00ecf