man: clarify systemctl --property= documentation a bit

diff --git a/.gitignore b/.gitignore
index 9afbb10668b33a7f2b115a3f82dfce4342c98aa3..7385107894d07d6798b269af9701b72336173940 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@
 /systemadm
 /systemctl
 /systemd
+/systemd-activate
 /systemd-ac-power
 /systemd-analyze
 /systemd-ask-password

diff --git a/TODO b/TODO
index 6f4a30c5ac6cfde04c916f0565b36ab3ae6fa59e..2366470ae5fd85fb764c00470d4051c6caafe756 100644 (file)
--- a/TODO
+++ b/TODO
@@ -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 87d783e45d0b11e641298d7bd8248f657c3ea516..5656564f54bf6837bb9f37123efcae460369db27 100644 (file)
--- 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