diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | TODO | 6 | ||||
| -rw-r--r-- | man/systemctl.xml | 11 |
3 files changed, 10 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index 9afbb10668..7385107894 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ /systemadm /systemctl /systemd +/systemd-activate /systemd-ac-power /systemd-analyze /systemd-ask-password @@ -49,9 +49,11 @@ Fedora 19: Features: +* systemd-inhibit: refuse taking delay locks + * journal-or-kmsg is currently broken? See reverted commit 4a01181e460686d8b4a543b1dfa7f77c9e3c5ab8. -* remove any syslog support from log.c +* remove any syslog support from log.c -- we probably can't do this before split-off udev is gone for good * convert /etc/bash_completion.d/ to /usr/share/bash-completion/ (systemd (and everything else) should install zero static data in /etc) @@ -80,8 +82,6 @@ Features: * man: maybe sort directives in man pages, and take sections from --help and apply them to man too -* man: systemctl: clarify that -p applies to "systemctl show" only - * add "# export SYSTEMD_PAGER=" to bash login * /usr/bin/service should actually show the new command line diff --git a/man/systemctl.xml b/man/systemctl.xml index 87d783e45d..5656564f54 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -117,10 +117,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. <term><option>--property=</option></term> <listitem> - <para>When showing unit/job/manager properties, limit - display to certain properties as specified as argument. If - not specified all set properties are shown. The argument - should be a comma-seperated list of property names, such as + <para>When showing unit/job/manager properties with the + <command>show</command> command, limit display to certain + properties as specified as argument. If not specified all + set properties are shown. The argument should be a + comma-seperated list of property names, such as <literal>MainPID</literal>. If specified more than once all properties with the specified names are shown.</para> </listitem> @@ -206,7 +207,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. sleep state. Any user may take these locks and privileged users may override these locks. If any locks are taken, shutdown and sleep state requests will normally fail - (regardless if privileged or not) and list of active locks + (regardless if privileged or not) and a list of active locks is printed. However if <option>--ignore-inhibitors</option> is specified the locks are ignored and not printed, and the operation attempted anyway, possibly requiring additional |