From c81f172eb07d11314dae8921bb7481c01e4972c7 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 12 Feb 2015 13:00:06 +0000
Subject: [PATCH 2/3] man page fixes, to be squashed

---
 doc/dbus-test-tool.1.xml.in | 48 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/doc/dbus-test-tool.1.xml.in b/doc/dbus-test-tool.1.xml.in
index bbe21e9..091dee1 100644
--- a/doc/dbus-test-tool.1.xml.in
+++ b/doc/dbus-test-tool.1.xml.in
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 <refentry id="dbus-test-tool.1">
+  <refentryinfo>
+    <copyright>
+      <year>2015</year>
+      <holder>Collabora Ltd.</holder>
+    </copyright>
+    <legalnotice>
+      <para>This man page is distributed under the same terms as
+        dbus-test-tool (GPL-2+). There is NO WARRANTY, to the extent
+        permitted by law.</para>
+    </legalnotice>
+  </refentryinfo>
+
   <refmeta>
     <refentrytitle>dbus-test-tool</refentrytitle>
     <manvolnum>1</manvolnum>
@@ -49,6 +61,7 @@
       <arg choice="opt">--ignore-errors</arg>
       <arg choice="opt">--messages-per-conn=<replaceable>N</replaceable></arg>
       <arg choice="opt">--no-reply</arg>
+      <arg choice="opt">--queue=<replaceable>N</replaceable></arg>
       <arg choice="opt">--seed=<replaceable>SEED</replaceable></arg>
       <group choice="opt">
         <arg choice="plain">--string</arg>
@@ -114,8 +127,11 @@
         <varlistentry>
           <term><option>--name=</option><replaceable>NAME</replaceable></term>
           <listitem>
-            <para>Request ownership of <replaceable>NAME</replaceable>
-              on the bus before proceeding.</para>
+            <para>Before proceeding, request ownership of the well-known
+              bus name <replaceable>NAME</replaceable>, for example
+              <literal>com.example.NoReply</literal>. By default,
+              no name is requested, and the tool can only be addressed by
+              a unique bus name such as <literal>:1.23</literal>.</para>
           </listitem>
         </varlistentry>
 
@@ -136,8 +152,11 @@
         <varlistentry>
           <term><option>--name=</option><replaceable>NAME</replaceable></term>
           <listitem>
-            <para>Request ownership of <replaceable>NAME</replaceable>
-              on the bus before proceeding.</para>
+            <para>Before proceeding, request ownership of the well-known
+              bus name <replaceable>NAME</replaceable>, for example
+              <literal>com.example.Echo</literal>. By default,
+              no name is requested, and the tool can only be addressed by
+              a unique bus name such as <literal>:1.23</literal>.</para>
           </listitem>
         </varlistentry>
 
@@ -159,7 +178,8 @@
         <varlistentry>
           <term><option>--dest=</option><replaceable>NAME</replaceable></term>
           <listitem>
-            <para>Send method calls to <replaceable>NAME</replaceable>.
+            <para>Send method calls to the well-known or unique
+              bus name <replaceable>NAME</replaceable>.
               The default is the dbus-daemon,
               <literal>org.freedesktop.DBus</literal>.</para>
           </listitem>
@@ -179,8 +199,10 @@
             <para>Send <replaceable>N</replaceable> method calls before
               waiting for any replies, then send one new call per reply
               received, keeping <replaceable>N</replaceable> method calls
-              "in flight" at all times until the <option>--count</option>
-              is reached. The default is 1.</para>
+              "in flight" at all times until the number of messages specified
+              with the <option>--count</option> option have been sent.
+              The default is 1, unless <option>--flood</option>
+              is used.</para>
           </listitem>
         </varlistentry>
 
@@ -217,14 +239,20 @@
           <term><option>--string</option></term>
           <listitem>
             <para>The payload of each message is a UTF-8 string. This is the
-              default.</para>
+              default. The actual string used is given by the
+              <option>--payload</option> or <option>--stdin</option>
+              option, defaulting to "hello, world!".</para>
           </listitem>
         </varlistentry>
 
         <varlistentry>
           <term><option>--bytes</option></term>
           <listitem>
-            <para>The payload of each message is a byte-array.</para>
+            <para>The payload of each message is a byte-array.
+              The actual bytes used are given by the
+              <option>--payload</option> or <option>--stdin</option>
+              option, defaulting to the ASCII encoding of
+              "hello, world!".</para>
           </listitem>
         </varlistentry>
 
@@ -257,7 +285,7 @@
           <term><option>--message-stdin</option></term>
           <listitem>
             <para>Read a complete binary D-Bus method call message from
-              standard input, and use that.</para>
+              standard input, and use that for each method call.</para>
           </listitem>
         </varlistentry>
 
-- 
2.1.4