From 1995fb8bb4aee2ee9becc549eff4571da4a08be7 Mon Sep 17 00:00:00 2001
From: Chris Morin <cmtm@google.com>
Date: Thu, 13 Jun 2019 20:42:37 -0700
Subject: [PATCH 1/3] doc: replace dbus-send's --address with --peer and --bus

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48816
---
 doc/dbus-send.1.xml.in | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/dbus-send.1.xml.in b/doc/dbus-send.1.xml.in
index 271435ca..55aa1374 100644
--- a/doc/dbus-send.1.xml.in
+++ b/doc/dbus-send.1.xml.in
@@ -21,7 +21,7 @@
 <refsynopsisdiv id='synopsis'>
 <cmdsynopsis>
   <command>dbus-send</command>
-    <group choice='opt'><arg choice='plain'>--system </arg><arg choice='plain'>--session </arg><arg choice='plain'>--address=<replaceable>ADDRESS</replaceable></arg></group>
+  <group choice='opt'><arg choice='plain'>--system </arg><arg choice='plain'>--session </arg><arg choice='plain'>--bus=<replaceable>ADDRESS</replaceable></arg><arg choice='plain'>--peer=<replaceable>ADDRESS</replaceable></arg></group>
     <arg choice='opt'>--dest=<replaceable>NAME</replaceable></arg>
     <arg choice='opt'><arg choice='plain'>--print-reply </arg><arg choice='opt'><replaceable>=literal</replaceable></arg></arg>
     <arg choice='opt'>--reply-timeout=<replaceable>MSEC</replaceable></arg>
@@ -137,7 +137,13 @@ The default is implementation&hyphen;defined, typically 25 seconds.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><option>--address=</option><replaceable>ADDRESS</replaceable></term>
+  <term><option>--bus=</option><replaceable>ADDRESS</replaceable></term>
+  <listitem>
+<para>Register on bus <replaceable>ADDRESS</replaceable>.</para>
+  </listitem>
+  </varlistentry>
+  <varlistentry>
+  <term><option>--peer=</option><replaceable>ADDRESS</replaceable></term>
   <listitem>
 <para>Send to <replaceable>ADDRESS</replaceable>.</para>
   </listitem>

From 738d5af0dfa344828d046187267e3e9585221e12 Mon Sep 17 00:00:00 2001
From: Christopher Morin <chris.morin2@gmail.com>
Date: Tue, 2 Jul 2019 22:53:36 +0000
Subject: [PATCH 2/3] Apply suggestion to doc/dbus-send.1.xml.in

---
 doc/dbus-send.1.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/dbus-send.1.xml.in b/doc/dbus-send.1.xml.in
index 55aa1374..6a43dec4 100644
--- a/doc/dbus-send.1.xml.in
+++ b/doc/dbus-send.1.xml.in
@@ -145,7 +145,7 @@ The default is implementation&hyphen;defined, typically 25 seconds.</para>
   <varlistentry>
   <term><option>--peer=</option><replaceable>ADDRESS</replaceable></term>
   <listitem>
-<para>Send to <replaceable>ADDRESS</replaceable>.</para>
+<para>Send to a non-message-bus D-Bus server at <replaceable>ADDRESS</replaceable>. In this case <command>dbus-send</command> will not call the <literal>Hello</literal> method.</para>
   </listitem>
   </varlistentry>
   <varlistentry>

From 75bf56e16d8ce45d704c1cda22411d2af7ac3cb3 Mon Sep 17 00:00:00 2001
From: Christopher Morin <chris.morin2@gmail.com>
Date: Wed, 3 Jul 2019 00:20:12 +0000
Subject: [PATCH 3/3] Apply suggestion to doc/dbus-send.1.xml.in

---
 doc/dbus-send.1.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/dbus-send.1.xml.in b/doc/dbus-send.1.xml.in
index 6a43dec4..34c4b99e 100644
--- a/doc/dbus-send.1.xml.in
+++ b/doc/dbus-send.1.xml.in
@@ -139,7 +139,7 @@ The default is implementation&hyphen;defined, typically 25 seconds.</para>
   <varlistentry>
   <term><option>--bus=</option><replaceable>ADDRESS</replaceable></term>
   <listitem>
-<para>Register on bus <replaceable>ADDRESS</replaceable>.</para>
+<para>Register on a message bus at <replaceable>ADDRESS</replaceable>, typically a <command>dbus-daemon</command>.</para>
   </listitem>
   </varlistentry>
   <varlistentry>