man: mkcephfs: small fixes

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/man/mkcephfs.8 b/man/mkcephfs.8
index 1a7d101ad241f95e214dc9413117a0e5749b1d46..f066d7894621fcc9bc08801fdf656ecaeeab67e7 100644 (file)
--- a/man/mkcephfs.8
+++ b/man/mkcephfs.8
@@ -4,9 +4,8 @@ mkcephfs \- create a ceph file system
 .SH SYNOPSIS
 .B mkcephfs
 [ \fB\-c\fP\fI ceph.conf\fP ]
-[ \fB\-k\fI /path/to/admin.keyring\fP ]
 [ \fB\-\-mkbtrfs\fP ]
-[ \fB\-a\fR, \fB\-\-all-hosts\fP ]
+[ \fB\-a\fR, \fB\-\-all-hosts\fP [ \fB\-k\fI /path/to/admin.keyring\fP ] ]
 .SH DESCRIPTION
 .B mkcephfs
 is used to create an empty Ceph file system, possibly spanning
@@ -62,7 +61,10 @@ executing commands via SSH.
 Use the given conf file instead of the default \fI/etc/ceph/ceph.conf\fP.
 .TP
 \fB\-k\fI /path/to/keyring\fR
-Location to write the client.admin keyring, which is used to administer the cluster.  The default is \fI/etc/ceph/keyring\fP.
+When \fB\-a\fR is used, we can special a location to copy the
+client.admin keyring, which is used to administer the cluster.  The
+default is \fI/etc/ceph/keyring\fP (or whatever is specified in the
+config file).
 .TP
 \fB\-\-mkbtrfs\fR
 Create and mount the any btrfs file systems specified in the
@@ -73,13 +75,13 @@ Create and mount the any btrfs file systems specified in the
 .SH SUBCOMMANDS
 The sub-commands performed during cluster setup can be run individually with
 .TP
- \fB\-\-prepare\-monmap\fR \fB\-d \fIdir\fB
-Create an initial monmap with a random fsid/uuid and store it in
-\fIdir\fR.
+ \fB\-\-prepare\-monmap\fR \fB\-d \fIdir\fB \fB\-c \fIceph.conf\fR
+Create an initial monmap with a random fsid/uuid and store it and
+the \fIceph.conf\fR in \fIdir\fR.
 .TP
- \fB\-\-init\-local\-daemons\fR \fItype\fR \fB\-d \fIdir\fB Initialize
-any daemons of type \fItype\fR on the local host using the monmap in
-\fIdir\fR.  For types \fIosd\fR and \fImds\fR, the resulting
+ \fB\-\-init\-local\-daemons\fR \fItype\fR \fB\-d \fIdir\fB
+Initialize any daemons of type \fItype\fR on the local host using the
+monmap in \fIdir\fR.  For types \fIosd\fR and \fImds\fR, the resulting
 authentication keys will be placed in \fIdir\fR.  For type \fImon\fR,
 the initial data files generated by \fB\-\-prepare\-mon\fR (below) are
 expected in \fIdir\fR.