From 8cb719417627c70b6c08bc2216069fa849cf0c98 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 22 Nov 2016 11:46:17 +0000
Subject: [PATCH] Spec: be clearer about "starting" and "activation" being
 synonyms

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=98671
---
 doc/dbus-specification.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml
index 9f1527b..4e8c074 100644
--- a/doc/dbus-specification.xml
+++ b/doc/dbus-specification.xml
@@ -1930,7 +1930,7 @@
         <para>
           Unless a message has the flag <literal>NO_AUTO_START</literal>, if the
           destination name does not exist then a program to own the destination
-          name will be started before the message is delivered. See
+          name will be started (activated) before the message is delivered. See
           <xref linkend="message-bus-starting-services"/>.
           The message
           will be held until the new program is successfully started or has
@@ -4994,8 +4994,13 @@
       </para>
 
       <para>
-        In D-Bus, starting a service is normally done by
-        <firstterm>auto-starting</firstterm>, which is one form of activation.
+        <firstterm>Starting a service</firstterm> should be read as synonymous
+        with service activation.
+      </para>
+
+      <para>
+        In D-Bus, service activation is normally done by
+        <firstterm>auto-starting</firstterm>.
         In auto-starting, applications send a
         message to a particular well-known name, such as
         <literal>com.example.TextEditor1</literal>, without specifying the
-- 
2.7.4