From 0844088fb586c3bfd41b37d5f49b9b42b78c1332 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 21 Nov 2016 20:12:17 +0000
Subject: [PATCH 1/4] Spec: be clearer about what activation means

The spec previously mentioned that CORBA calls this activation, but
did not explicitly say that D-Bus has copied this jargon term.
It's 2016, and developers are probably more likely to be familiar
with D-Bus than with CORBA at this point: explicitly say that *our*
jargon term for this action is activation.

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---
 doc/dbus-specification.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml
index 64f561b..6199396 100644
--- a/doc/dbus-specification.xml
+++ b/doc/dbus-specification.xml
@@ -4970,12 +4970,14 @@
       </sect3>
     </sect2>
     <sect2 id="message-bus-starting-services">
-      <title>Message Bus Starting Services</title>
+      <title>Message Bus Starting Services (Activation)</title>
       <para>
         The message bus can start applications on behalf of other applications.
-        In CORBA terms, this would be called <firstterm>activation</firstterm>.
+        This is referred to as <firstterm>service activation</firstterm> or
+        <firstterm>activation</firstterm>.
         An application that can be started in this way is called a
-        <firstterm>service</firstterm>.
+        <firstterm>service</firstterm> or an
+        <firstterm>activatable service</firstterm>.
       </para>
       <para>
         With D-Bus, starting a service is normally done by name. That is,
-- 
2.10.2