changeset 87004:0877a1d16074

* 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{}.
author Michael Albinus <michael.albinus@gmx.de>
date Mon, 03 Dec 2007 06:48:12 +0000
parents c24d6306ce07
children ce6a9097341e
files doc/misc/ChangeLog doc/misc/Makefile.in doc/misc/dbus.texi
diffstat 3 files changed, 14 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/doc/misc/ChangeLog	Mon Dec 03 00:33:35 2007 +0000
+++ b/doc/misc/ChangeLog	Mon Dec 03 06:48:12 2007 +0000
@@ -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.
--- a/doc/misc/Makefile.in	Mon Dec 03 00:33:35 2007 +0000
+++ b/doc/misc/Makefile.in	Mon Dec 03 06:48:12 2007 +0000
@@ -44,6 +44,7 @@
 	$(infodir)/calc \
 	$(infodir)/ccmode \
 	$(infodir)/cl \
+	$(infodir)/dbus \
 	$(infodir)/dired-x \
 	$(infodir)/ebrowse \
 	$(infodir)/ediff \
@@ -79,16 +80,13 @@
 	$(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 @@
 	widget.dvi \
 	woman.dvi
 
-ifeq (@DBUS_INFO@, dbus)
-  DVI_TARGETS += dbus.dvi
-endif
-
 
 TEXI2DVI = texi2dvi
 
--- a/doc/misc/dbus.texi	Mon Dec 03 00:33:35 2007 +0000
+++ b/doc/misc/dbus.texi	Mon Dec 03 06:48:12 2007 +0000
@@ -157,8 +157,9 @@
 
 @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 @@
     (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\"