X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fbusctl.xml;h=afc33c7c6b5d1ea73178a783a8975174b3e4f5ca;hp=872f3f496b31396889c0ea0f5de3fe6887e6bfb6;hb=53d6837510478e1275b294654663635466cbafc7;hpb=43dbecd5a31f6b247b261a5a281afecafdf1c841

diff --git a/man/busctl.xml b/man/busctl.xml
index 872f3f496..afc33c7c6 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -123,16 +123,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
           <!-- TODO: link to sd_bus_add_match when it is written? -->
       </varlistentry>
 
-      <varlistentry>
-        <term><option>--no-legend</option></term>
-
-        <listitem>
-          <para>Do not print the legend,
-          i.e. the column headers and the
-          footer.</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><option>--size=</option></term>
 
@@ -232,14 +222,29 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><option>--augment-creds=</option><replaceable>BOOL</replaceable></term>
+
+        <listitem>
+          <para>Controls whether credential data reported by
+          <command>list</command> or <command>status</command> shall
+          be augmented with data from
+          <filename>/proc</filename>. When this is turned on the data
+          shown is possibly inconsistent, as the data read from
+          <filename>/proc</filename> might be more recent than rest of
+          the credential information. Defaults to <literal>yes</literal>.</para>
+        </listitem>
+      </varlistentry>
+
       <xi:include href="user-system-options.xml" xpointer="user" />
       <xi:include href="user-system-options.xml" xpointer="system" />
       <xi:include href="user-system-options.xml" xpointer="host" />
       <xi:include href="user-system-options.xml" xpointer="machine" />
 
+      <xi:include href="standard-options.xml" xpointer="no-pager" />
+      <xi:include href="standard-options.xml" xpointer="no-legend" />
       <xi:include href="standard-options.xml" xpointer="help" />
       <xi:include href="standard-options.xml" xpointer="version" />
-      <xi:include href="standard-options.xml" xpointer="no-pager" />
     </variablelist>
   </refsect1>
 
@@ -257,10 +262,13 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
       </varlistentry>
 
       <varlistentry>
-        <term><command>status</command> <arg choice="plain"><replaceable>SERVICE</replaceable></arg></term>
+        <term><command>status</command> <arg choice="opt"><replaceable>SERVICE</replaceable></arg></term>
 
         <listitem><para>Show process information and credentials of a
-        bus service.</para></listitem>
+        bus service (if one is specified by its unique or well-known
+        name), a process (if one is specified by its numeric PID), or
+        the owner of the bus (if no parameter is
+        specified).</para></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -296,11 +304,13 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
       </varlistentry>
 
       <varlistentry>
-        <term><command>introspect</command> <arg choice="plain"><replaceable>SERVICE</replaceable></arg> <arg choice="plain"><replaceable>OBJECT</replaceable></arg></term>
+        <term><command>introspect</command> <arg choice="plain"><replaceable>SERVICE</replaceable></arg> <arg choice="plain"><replaceable>OBJECT</replaceable></arg> <arg choice="opt"><replaceable>INTERFACE</replaceable></arg></term>
 
         <listitem><para>Show interfaces, methods, properties and
         signals of the specified object (identified by its path) on
-        the specified service.</para></listitem>
+        the specified service. If the interface argument is passed the
+        output is limited to members of the specified
+        interface.</para></listitem>
       </varlistentry>
 
       <varlistentry>