dbus/doc dbus-faq.xml,1.2,1.3 dbus-tutorial.xml,1.9,1.10

[Havoc Pennington]

Update of /cvs/dbus/dbus/doc
In directory gabe:/tmp/cvs-serv23345/doc

Modified Files:
	dbus-faq.xml dbus-tutorial.xml 
Log Message:
couple of minor tweaks


Index: dbus-faq.xml
===================================================================
RCS file: /cvs/dbus/dbus/doc/dbus-faq.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dbus-faq.xml	23 Jan 2005 03:43:38 -0000	1.2
+++ dbus-faq.xml	23 Jan 2005 03:53:34 -0000	1.3
@@ -97,11 +97,10 @@
       </question>
       <answer>
         <para>
-          If you imagine a C++ program that implements a network 
-          service, then the bus name is the domain name 
-          of the computer running this C++ program, the object path 
-          is a C++ object instance pointer, and an interface is a C++ 
-          class (a pure virtual or abstract class, to be exact). 
+          If you imagine a C++ program that implements a network service, then
+          the bus name is the hostname of the computer running this C++ program,
+          the object path is a C++ object instance pointer, and an interface is
+          a C++ class (a pure virtual or abstract class, to be exact).
         </para>
         <para>
           In Java terms, the object path is an object reference, 
@@ -120,11 +119,12 @@
         </para>
         <para>
           However, a text editor application could as easily own multiple bus
-          names (for example, <literal>org.kde.KWrite</literal>), have multiple
-          objects (maybe <literal>/org/kde/documents/4352</literal>),
-          and each object could implement multiple interfaces, 
-          such as <literal>org.freedesktop.Introspectable</literal>, 
-          <literal>org.freedesktop.BasicTextField</literal>, 
+          names (for example, <literal>org.kde.KWrite</literal> in addition to
+          generic <literal>TextEditor</literal>), have multiple objects (maybe
+          <literal>/org/kde/documents/4352</literal> where the number changes
+          according to the document), and each object could implement multiple
+          interfaces, such as <literal>org.freedesktop.Introspectable</literal>,
+          <literal>org.freedesktop.BasicTextField</literal>,
           <literal>org.kde.RichTextDocument</literal>.
         </para>
       </answer>

Index: dbus-tutorial.xml
===================================================================
RCS file: /cvs/dbus/dbus/doc/dbus-tutorial.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dbus-tutorial.xml	23 Jan 2005 00:28:41 -0000	1.9
+++ dbus-tutorial.xml	23 Jan 2005 03:53:34 -0000	1.10
@@ -107,7 +107,7 @@
         communication" or "networking" in their stated purpose: <ulink
         url="http://www.omg.org">CORBA</ulink>, <ulink
         url="http://www.opengroup.org/dce/">DCE</ulink>, <ulink
-        url="http://www.microsoft.com/com/">COM/DCOM</ulink>, <ulink
+        url="http://www.microsoft.com/com/">DCOM</ulink>, <ulink
         url="http://developer.kde.org/documentation/library/kdeqt/dcop.html">DCOP</ulink>, <ulink
         url="http://www.xmlrpc.com">XML-RPC</ulink>, <ulink
         url="http://www.w3.org/TR/SOAP/">SOAP</ulink>, <ulink
@@ -222,6 +222,12 @@
       using to write a D-BUS application. The exact code you write will be
       different for GLib vs. Qt vs. Python applications, however.
     </para>
+    
+    <para>
+      Here is a diagram (<ulink url="diagram.png">png</ulink> <ulink
+      url="diagram.svg">svg</ulink>) that may help you visualize the concepts
+      that follow.
+    </para>
 
     <sect2 id="objects">
       <title>Objects and Object Paths</title>