(Receiving Method Calls): Clean up previous change.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 55d36c54100f9ab004574656e8241e5bec93643e..e694f33efb9283dc68595c4a8fe0dd9870a2174b 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-28  Richard M Stallman  <rms@gnu.org>
+
+       * dbus.texi (Receiving Method Calls): Clean up previous change.
+
 2008-11-26  Michael Albinus  <michael.albinus@gmx.de>
 
        * dbus.texi (Type Conversion): New defuns `dbus-string-to-byte-array',

diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index b93f29a3a65ed858248eb7bf5f0799f27a53c056..9bb444e5f703d58ceb5ad642d5ae557e7b9c09da 100644 (file)
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -1254,14 +1254,16 @@ registered.
 @var{interface} is the interface offered by @var{service}.  It must
 provide @var{method}.
 
-@var{handler} is a Lisp function to be called when when a @var{method}
-call is is received.  It must accept as arguments the input arguments
-of @var{method}.  @var{handler} must return a list, which elements are
-used as arguments for the reply message of @var{method}.  This list
-can be composed like the input parameters in @ref{Type Conversion}.
-If only one Lisp object is returned, and this object is not a consp,
-then @var{handler} can return this object directly, instead of of list
-of this object.
+@var{handler} is a Lisp function to be called when a @var{method} call
+is received.  It must accept as arguments the input arguments of
+@var{method}.  @var{handler} should return a list, whose elements are
+to be used as arguments for the reply message of @var{method}.  This
+list can be composed like the input parameters in @ref{Type
+Conversion}.
+
+If @var{handler} wants to return just one Lisp object and it is not a
+cons cell, @var{handler} can return this object directly, instead of
+returning a list containing the object.
 
 The default D-Bus timeout when waiting for a message reply is 25
 seconds.  This value could be even smaller, depending on the calling