persistent_callback: print "no error message given" instead of "(null)"

[sahlberg/ctdb.git] / doc / onnode.1

diff --git a/doc/onnode.1 b/doc/onnode.1
index baf3e62bed4c1299d6af4d062c69f8677820c714..055a82e089ce73f45cb3d95ba3e6d6d3bad7d519 100644 (file)
--- a/doc/onnode.1
+++ b/doc/onnode.1
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: onnode
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/>
-.\"      Date: 12/08/2009
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 02/05/2010
 .\"    Manual:  
 .\"    Source:  
 .\"  Language: English
 .\"
-.TH "ONNODE" "1" "12/08/2009" "" ""
+.TH "ONNODE" "1" "02/05/2010" "" ""
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -98,8 +98,9 @@ Allow nodes to be specified by name rather than node numbers\&. These nodes don\
 .PP
 \-f <file>
 .RS 4
-Specify an alternative nodes file to use instead of
-/etc/ctdb/nodes\&. This overrides the CTDB_NODES_FILE environment variable\&.
+Specify an alternative nodes file to use instead of the default\&. This option overrides the CTDB_NODES_FILE environment variable\&. See the discussion of
+/etc/ctdb/nodes
+in the FILES section for more details\&.
 .RE
 .PP
 \-v
@@ -168,14 +169,24 @@ The following command would run \&./foo in the current working directory, in par
 .PP
 \fBCTDB_NODES_FILE\fR
 .RS 4
-Name of alternative nodes file to use instead of
-/etc/ctdb/nodes\&.
+Name of alternative nodes file to use instead of the default\&. See the discussion of
+/etc/ctdb/nodes
+in the FILES section for more details\&.
 .RE
 .SH "FILES"
 .PP
 /etc/ctdb/nodes
 .RS 4
 Default file containing a list of each node\'s IP address or hostname\&.
+.sp
+Actually, the default is
+$\fBCTDB_BASE\fR/nodes, where
+\fB$CTDB_BASE\fR
+defaults to
+/etc/ctdb\&. If a relative path is given (via the \-f option or
+\fB$CTDB_BASE\fR) and no corresponding file exists relative to the current directory then the file is also searched for in the
+$\fBCTDB_BASE\fR
+directory\&.
 .RE
 .PP
 /etc/ctdb/onnode\&.conf