man: update with latest args

4 files changed, 22 insertions, 8 deletions

diff --git a/man/cconf.8 b/man/cconf.8
index 32bb7ff01c0..a6c7b027ca0 100644
--- a/man/cconf.8
+++ b/man/cconf.8
@@ -3,23 +3,36 @@
 cconf \- ceph conf file tool
 .SH SYNOPSIS
 .B cconf
-\fB\-c \fIconffile\fR
-( \fB\-l \fIprefix\fR | \fIkey\fR [ \fIdefault\fR ] \fB\-s \fIsection\fR [ \fB\-s \fIsection2\fI ... ] )
+\fB\-c \fIconffile\fR \fB\-l \fIprefix\fR
+.br
+.B cconf
+\fIkey\fR [ \fIdefault\fR ] \fB\-s \fIsection1\fR ...
+.br
+.B cconf
+\fIkey\fR [ \fIdefault\fR ] \fB\-i \fIid\fR \fB\-t \fItype\fR
 .SH DESCRIPTION
 .B cconf
 is a utility for extracting values from a "INI" style configuration files.  It has
-two basic modes of operation.
+three basic modes of operation.
 .PP
 The first mode simply prints all section names that begin with \fIprefix\fP.
 .PP
 The second mode extracts an option value by searching through one or more \fIsection\fPs,
 in the order specified on the command line.  If the option does not exist in
+.PP
+The third mode will look in the standard section names for the given daemon \fIid\fR
+of type \fItype\fR.
 \fIconffile\fP, an optional \fIdefault\fP value may be output instead.
+.PP
 .SH EXAMPLES
-To extract the value of the "osd data" option from section \fI[osd0]\fP,
+To extract the value of the "osd data" option for the \fIosd0\fP daemon,
+.IP
+cconf -c foo.conf "osd data" -i 0 -t osd
+.PP
+This is equivalent to doing specifying sections \fI[osd0]\fP, \fI[osd.0]\fP,
 \fI[osd]\fP, or \fI[global]\fP, in that order of preference:
 .IP
-cconf -c foo.conf "osd data" -s osd0 -s osd -s global
+cconf -c foo.conf "osd data" -s osd0 -s osd.0 -s osd -s global
 .PP
 To list all sections that begin with \fIosd\fP:
 .IP
diff --git a/man/cmds.8 b/man/cmds.8
index 9b6b86aabc1..e4ec2e87247 100644
--- a/man/cmds.8
+++ b/man/cmds.8
@@ -3,7 +3,7 @@
 cmds \- ceph metadata server daemon
 .SH SYNOPSIS
 .B cmds
-\fB\- \fIname\fR
+\fB\-i \fIname\fR
 [ \fB\-\-rank\fI rank\fR ]
 [ \fB\-\-shadow\fI rank\fR ]
 .SH DESCRIPTION
diff --git a/man/cmon.8 b/man/cmon.8
index 176704f1631..6903f2cb4d7 100644
--- a/man/cmon.8
+++ b/man/cmon.8
@@ -14,7 +14,8 @@ extremely reliable and durable storage of cluster membership, configuration,
 and state.
 .PP
 The \fImondatapath\fP refers to a directory on a local file system
-storing monitor data.  
+storing monitor data.  It is normally specified via the "mon data" option
+in the configuration file.
 .SH OPTIONS
 .TP
 \fB\-D\fP
diff --git a/man/mkmonfs.8 b/man/mkmonfs.8
index 13ed07f10c0..4efc1f6db2f 100644
--- a/man/mkmonfs.8
+++ b/man/mkmonfs.8
@@ -3,8 +3,8 @@
 mkmonfs \- create a ceph monitor data store
 .SH SYNOPSIS
 .B mkmonfs
-\fIdatadir\fR
 \fB\-i \fImonid\fR
+\fB\-\-mon\-data \fIdatadir\fR
 \fB\-\-monmap \fImonmapfile\fR
 \fB\-\-osdmap \fIosdmapfile\fR
 [ \fB\-\-clobber\fR ]