From 7b13a0f20c0a3b4084d25d1dd6175159405c3218 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 3 Dec 2007 06:48:12 +0000
Subject: [PATCH] * Makefile.in (INFO_TARGETS, DVI_TARGETS): Apply dbus and
 dbus.dvi unconditionally.

* dbus.texi (Synchronous Methods): Show the result of the "lshal"
emulation with @print{}.
---
 doc/misc/ChangeLog   |  8 ++++++++
 doc/misc/Makefile.in | 10 ++--------
 doc/misc/dbus.texi   |  7 ++++---
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 79abaab3994..724cf73d4a6 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-03  Michael Albinus  <michael.albinus@gmx.de>
+
+	* Makefile.in (INFO_TARGETS, DVI_TARGETS): Apply dbus and dbus.dvi
+	unconditionally.
+
+	* dbus.texi (Synchronous Methods): Show the result of the "lshal"
+	emulation with @print{}.
+
 2007-12-02  Richard Stallman  <rms@gnu.org>
 
 	* dbus.texi (Overview): Minor cleanup.
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 9ab382386c8..e8ab579c079 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -44,6 +44,7 @@ INFO_TARGETS = \
 	$(infodir)/calc \
 	$(infodir)/ccmode \
 	$(infodir)/cl \
+	$(infodir)/dbus \
 	$(infodir)/dired-x \
 	$(infodir)/ebrowse \
 	$(infodir)/ediff \
@@ -79,16 +80,13 @@ INFO_TARGETS = \
 	$(infodir)/widget \
 	$(infodir)/woman
 
-ifeq (@DBUS_INFO@, dbus)
-  INFO_TARGETS += $(infodir)/dbus
-endif
-
 DVI_TARGETS = \
 	ada-mode.dvi \
 	autotype.dvi \
 	calc.dvi \
 	cc-mode.dvi \
 	cl.dvi \
+	dbus.dvi \
 	dired-x.dvi \
 	ebrowse.dvi \
 	ediff.dvi \
@@ -124,10 +122,6 @@ DVI_TARGETS = \
 	widget.dvi \
 	woman.dvi
 
-ifeq (@DBUS_INFO@, dbus)
-  DVI_TARGETS += dbus.dvi
-endif
-
 
 TEXI2DVI = texi2dvi
 
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index b81e81c6e51..9f7514ad10e 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -157,8 +157,9 @@ string.
 
 @defun dbus-get-name-owner bus service
 For a given service, registered at D-Bus @var{bus} under the name
-@var{service}, the unique name of the name owner is returned.  The result is a
-string, or @code{nil} when there exist no name owner of @var{service}.
+@var{service}, the unique name of the name owner is returned.  The
+result is a string, or @code{nil} when there exist no name owner of
+@var{service}.
 
 @var{bus} must be either the symbol @code{:system} or the symbol
 @code{:session}.  @var{service} must be a known service name as
@@ -379,7 +380,7 @@ emulate the @code{lshal} command on GNU/Linux systems:
     (message "  %s = %S"
              (car properties) (or (caar (cdr properties)) ""))))
 
-@result{} "udi = /org/freedesktop/Hal/devices/computer
+@print{} "udi = /org/freedesktop/Hal/devices/computer
       info.addons = (\"hald-addon-acpi\")
       info.bus = \"unknown\"
       info.product = \"Computer\"
-- 
2.39.2