hal: Branch 'master'

David Zeuthen david at kemper.freedesktop.org
Sun Apr 1 14:32:54 PDT 2007


 configure.in                          |    2 +-
 doc/man/Makefile.am                   |    6 +++---
 doc/man/hal-disable-polling.1.in      |    2 +-
 doc/man/hal-find-by-capability.1.in   |    2 +-
 doc/man/hal-find-by-property.1.in     |    2 +-
 doc/man/hal-get-property.1.in         |    2 +-
 doc/man/hal-is-caller-locked-out.1.in |    2 +-
 doc/man/hal-lock.1.in                 |    2 +-
 doc/man/hal-set-property.1.in         |    2 +-
 doc/man/hald.8.in                     |    2 +-
 doc/man/lshal.1.in                    |    2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

New commits:
diff-tree 51ee8eb98ac8de413d2a5b2df8d78d663f2e01c6 (from d3aaf33d66443c0f18743a78511caf16df36cb69)
Author: Michael Biebl <mbiebl at gmail.com>
Date:   Sun Apr 1 17:32:43 2007 -0400

    fix section for hald man page
    
    2007/4/1, David Zeuthen <david at fubar.dk>:
    > On Sun, 2007-04-01 at 22:11 +0200, Michael Biebl wrote:
    > > hald is a system daemon (installed in /usr/sbin). The correct section
    > > for the man page is 8 in that case (current one is 1)
    > > The attached patch fixes that.
    >
    > OK, I'm fine with this, but
    >
    >  - need to patch configure.in
    >  - need to change all the references from hald(1) to hald(8)
    >    in the other man pages
    >
    > Is it possible you can attach a new patch that does this? Thanks.
    
    Sure, updated patch attached.

diff --git a/configure.in b/configure.in
index d3dd295..daa7126 100644
--- a/configure.in
+++ b/configure.in
@@ -885,7 +885,7 @@ doc/api/libhal-storage/version.xml
 doc/spec/Makefile
 doc/spec/hal-spec.xml.in
 doc/man/Makefile
-doc/man/hald.1
+doc/man/hald.8
 doc/man/lshal.1
 doc/man/hal-get-property.1
 doc/man/hal-set-property.1
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 5f5416d..8be2784 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,13 +1,13 @@
 
 if MAN_PAGES_ENABLED
 
-MAN_IN_FILES = hald.1.in lshal.1.in hal-get-property.1.in hal-set-property.1.in hal-find-by-property.1.in hal-find-by-capability.1.in hal-is-caller-locked-out.1.in hal-lock.1.in hal-disable-polling.1.in
+MAN_IN_FILES = hald.8.in lshal.1.in hal-get-property.1.in hal-set-property.1.in hal-find-by-property.1.in hal-find-by-capability.1.in hal-is-caller-locked-out.1.in hal-lock.1.in hal-disable-polling.1.in
 
-man_MANS = hald.1 lshal.1 hal-get-property.1 hal-set-property.1 hal-find-by-property.1 hal-find-by-capability.1 hal-is-caller-locked-out.1 hal-lock.1 hal-disable-polling.1
+man_MANS = hald.8 lshal.1 hal-get-property.1 hal-set-property.1 hal-find-by-property.1 hal-find-by-capability.1 hal-is-caller-locked-out.1 hal-lock.1 hal-disable-polling.1
 
 endif # MAN_PAGES_ENABLED
 
 EXTRA_DIST=$(man_MANS) $(MAN_IN_FILES)
 
 clean-local:
-	rm -f *~ *.1
+	rm -f *~ *.1 *.8
diff --git a/doc/man/hal-disable-polling.1.in b/doc/man/hal-disable-polling.1.in
index 26f2769..343d3bc 100644
--- a/doc/man/hal-disable-polling.1.in
+++ b/doc/man/hal-disable-polling.1.in
@@ -124,7 +124,7 @@ on how to subscribe.
 
 .SH SEE ALSO
 .PP
-\&\fIhald\fR\|(1),
+\&\fIhald\fR\|(8),
 \&\fIlshal\fR\|(1),
 \&\fIhal-lock\fR\|(1),
 \&\fIopen\fR\|(2),
diff --git a/doc/man/hal-find-by-capability.1.in b/doc/man/hal-find-by-capability.1.in
index 5c593ca..2417e45 100644
--- a/doc/man/hal-find-by-capability.1.in
+++ b/doc/man/hal-find-by-capability.1.in
@@ -53,7 +53,7 @@ on how to subscribe.
 
 .SH SEE ALSO
 .PP
-\&\fIhald\fR\|(1), 
+\&\fIhald\fR\|(8), 
 \&\fIlshal\fR\|(1), 
 \&\fIhal-set-property\fR\|(1),
 \&\fIhal-get-property\fR\|(1),
diff --git a/doc/man/hal-find-by-property.1.in b/doc/man/hal-find-by-property.1.in
index 73bc99b..ce76388 100644
--- a/doc/man/hal-find-by-property.1.in
+++ b/doc/man/hal-find-by-property.1.in
@@ -56,7 +56,7 @@ on how to subscribe.
 
 .SH SEE ALSO
 .PP
-\&\fIhald\fR\|(1), 
+\&\fIhald\fR\|(8), 
 \&\fIlshal\fR\|(1), 
 \&\fIhal-set-property\fR\|(1),
 \&\fIhal-get-property\fR\|(1),
diff --git a/doc/man/hal-get-property.1.in b/doc/man/hal-get-property.1.in
index 87ab9d9..ecb15f6 100644
--- a/doc/man/hal-get-property.1.in
+++ b/doc/man/hal-get-property.1.in
@@ -60,7 +60,7 @@ on how to subscribe.
 
 .SH SEE ALSO
 .PP
-\&\fIhald\fR\|(1), 
+\&\fIhald\fR\|(8), 
 \&\fIlshal\fR\|(1), 
 \&\fIhal-set-property\fR\|(1),
 \&\fIhal-find-by-property\fR\|(1),
diff --git a/doc/man/hal-is-caller-locked-out.1.in b/doc/man/hal-is-caller-locked-out.1.in
index d5de39a..3c73f17 100644
--- a/doc/man/hal-is-caller-locked-out.1.in
+++ b/doc/man/hal-is-caller-locked-out.1.in
@@ -54,7 +54,7 @@ on how to subscribe.
 
 .SH SEE ALSO
 .PP
-\&\fIhald\fR\|(1), 
+\&\fIhald\fR\|(8), 
 \&\fIlshal\fR\|(1), 
 \&\fIhal-get-property\fR\|(1),
 \&\fIhal-set-property\fR\|(1),
diff --git a/doc/man/hal-lock.1.in b/doc/man/hal-lock.1.in
index bbff769..6cb11a6 100644
--- a/doc/man/hal-lock.1.in
+++ b/doc/man/hal-lock.1.in
@@ -85,7 +85,7 @@ on how to subscribe.
 
 .SH SEE ALSO
 .PP
-\&\fIhald\fR\|(1), 
+\&\fIhald\fR\|(8), 
 \&\fIlshal\fR\|(1), 
 \&\fIhal-get-property\fR\|(1),
 \&\fIhal-set-property\fR\|(1),
diff --git a/doc/man/hal-set-property.1.in b/doc/man/hal-set-property.1.in
index d62bfcd..b9b2d33 100644
--- a/doc/man/hal-set-property.1.in
+++ b/doc/man/hal-set-property.1.in
@@ -94,7 +94,7 @@ on how to subscribe.
 
 .SH SEE ALSO
 .PP
-\&\fIhald\fR\|(1), 
+\&\fIhald\fR\|(8), 
 \&\fIlshal\fR\|(1), 
 \&\fIhal-get-property\fR\|(1),
 \&\fIhal-find-by-property\fR\|(1),
diff --git a/doc/man/hald.1.in b/doc/man/hald.1.in
deleted file mode 100644
index b72c6a4..0000000
--- a/doc/man/hald.1.in
+++ /dev/null
@@ -1,105 +0,0 @@
-.\" 
-.\" hald manual page.
-.\" Copyright (C) 2007 David Zeuthen <david at fubar.dk>
-.\"
-.TH HALD 1
-.SH NAME
-hald \- HAL daemon
-.SH SYNOPSIS
-.PP
-.B hald
-[options]
-
-.SH DESCRIPTION
-
-\fIhald\fP is a daemon that maintains a database of the devices
-connected to the system system in real-time. The daemon connects to
-the \fID-Bus\fP system message bus to provide an API that applications
-can use to discover, monitor and invoke operations on devices. For
-more information about both the big picture and specific API details,
-refer to the \fIHAL spec\fP which can be found in
-.I "/usr/share/doc/hal- at VERSION@/spec/hal-spec.html"
-depending on the distribution.
-
-.SH OPTIONS
-The following options are supported:
-.TP
-.I "--daemon=yes|no"
-Specify whether to run in the foreground or the background.
-.TP
-.I "--verbose=yes|no"
-Enable verbose debug output.
-.TP
-.I "--help"
-Print out usage.
-.TP
-.I "--version"
-Print the version of the daemon and exit.
-
-.SH BUGS AND DEBUGGING
-.PP
-Please send bug reports to either the distribution or the HAL
-mailing list, see 
-.I "http://lists.freedesktop.org/mailman/listinfo/hal"
-on how to subscribe.
-
-First, to obtain useful debug traces you will need to have
-.B debuginfo
-packages installed. On a Fedora system this is in the 
-.B hal-debuginfo 
-package and can be installed via the
-.I yum
-update program. 
-
-Second, shut down the existing 
-.B hald
-daemon instance; on a Fedora system this is achieved by
-
-.I "/etc/init.d/haldaemon stop"
-
-After having shut down the daemon, you might want to run
-
-.I "pkill hald"
-
-to ensure that all the helper processe of
-.B hald
-are killed too. To start the HAL daemon, use
-
-.I "/usr/sbin/hald --daemon=no --verbose=yes"
-
-If the daemon crashes, you can start it under a debugger via
-
-.I "gdb /usr/sbin/hald"
-
-and then typing
-
-.I "run --daemon=no --verbose=yes"
-
-at the 
-.B "(gdb)"
-prompt. To capture a back trace, use the
-.B "bt"
-command and attach this to the bug report.
-
-Please also attach the output of \&\fIlshal\fR\|(1) in the bug report
-if possible (it's not possible if the
-.B "hald"
-daemon crashed). If the nature of the bug has to do with hotplugging,
-attach two outputs of \&\fIlshal\fR\|(1) - one before the device
-hotplug event and one after.
-
-.SH SEE ALSO
-.PP
-\&\fIudev\fR\|(7), 
-\&\fIdbus-daemon\fR\|(1), 
-\&\fIlshal\fR\|(1), 
-\&\fIhal-set-property\fR\|(1),
-\&\fIhal-get-property\fR\|(1),
-\&\fIhal-find-by-property\fR\|(1),
-\&\fIhal-find-by-capability\fR\|(1),
-\&\fIhal-is-caller-locked-out\fR\|(1)
-
-.SH AUTHOR
-Written by David Zeuthen <david at fubar.dk> with a lot of help from many
-others.
-
diff --git a/doc/man/hald.8.in b/doc/man/hald.8.in
new file mode 100644
index 0000000..0c1a0b7
--- /dev/null
+++ b/doc/man/hald.8.in
@@ -0,0 +1,105 @@
+.\" 
+.\" hald manual page.
+.\" Copyright (C) 2007 David Zeuthen <david at fubar.dk>
+.\"
+.TH HALD 8
+.SH NAME
+hald \- HAL daemon
+.SH SYNOPSIS
+.PP
+.B hald
+[options]
+
+.SH DESCRIPTION
+
+\fIhald\fP is a daemon that maintains a database of the devices
+connected to the system system in real-time. The daemon connects to
+the \fID-Bus\fP system message bus to provide an API that applications
+can use to discover, monitor and invoke operations on devices. For
+more information about both the big picture and specific API details,
+refer to the \fIHAL spec\fP which can be found in
+.I "/usr/share/doc/hal- at VERSION@/spec/hal-spec.html"
+depending on the distribution.
+
+.SH OPTIONS
+The following options are supported:
+.TP
+.I "--daemon=yes|no"
+Specify whether to run in the foreground or the background.
+.TP
+.I "--verbose=yes|no"
+Enable verbose debug output.
+.TP
+.I "--help"
+Print out usage.
+.TP
+.I "--version"
+Print the version of the daemon and exit.
+
+.SH BUGS AND DEBUGGING
+.PP
+Please send bug reports to either the distribution or the HAL
+mailing list, see 
+.I "http://lists.freedesktop.org/mailman/listinfo/hal"
+on how to subscribe.
+
+First, to obtain useful debug traces you will need to have
+.B debuginfo
+packages installed. On a Fedora system this is in the 
+.B hal-debuginfo 
+package and can be installed via the
+.I yum
+update program. 
+
+Second, shut down the existing 
+.B hald
+daemon instance; on a Fedora system this is achieved by
+
+.I "/etc/init.d/haldaemon stop"
+
+After having shut down the daemon, you might want to run
+
+.I "pkill hald"
+
+to ensure that all the helper processe of
+.B hald
+are killed too. To start the HAL daemon, use
+
+.I "/usr/sbin/hald --daemon=no --verbose=yes"
+
+If the daemon crashes, you can start it under a debugger via
+
+.I "gdb /usr/sbin/hald"
+
+and then typing
+
+.I "run --daemon=no --verbose=yes"
+
+at the 
+.B "(gdb)"
+prompt. To capture a back trace, use the
+.B "bt"
+command and attach this to the bug report.
+
+Please also attach the output of \&\fIlshal\fR\|(1) in the bug report
+if possible (it's not possible if the
+.B "hald"
+daemon crashed). If the nature of the bug has to do with hotplugging,
+attach two outputs of \&\fIlshal\fR\|(1) - one before the device
+hotplug event and one after.
+
+.SH SEE ALSO
+.PP
+\&\fIudev\fR\|(7), 
+\&\fIdbus-daemon\fR\|(1), 
+\&\fIlshal\fR\|(1), 
+\&\fIhal-set-property\fR\|(1),
+\&\fIhal-get-property\fR\|(1),
+\&\fIhal-find-by-property\fR\|(1),
+\&\fIhal-find-by-capability\fR\|(1),
+\&\fIhal-is-caller-locked-out\fR\|(1)
+
+.SH AUTHOR
+Written by David Zeuthen <david at fubar.dk> with a lot of help from many
+others.
+
diff --git a/doc/man/lshal.1.in b/doc/man/lshal.1.in
index 0aaaad6..02f4fd3 100644
--- a/doc/man/lshal.1.in
+++ b/doc/man/lshal.1.in
@@ -53,7 +53,7 @@ on how to subscribe.
 
 .SH SEE ALSO
 .PP
-\&\fIhald\fR\|(1), 
+\&\fIhald\fR\|(8), 
 \&\fIhal-get-property\fR\|(1),
 \&\fIhal-set-property\fR\|(1),
 \&\fIhal-find-by-property\fR\|(1),


More information about the hal-commit mailing list