doc: Fix ceph command manpage to match ceph -h (firefly)

Improve synopsis section
Fixes: #10676
Signed-off-by: David Zafman <dzafman@redhat.com>

diff --git a/doc/man/8/ceph.rst b/doc/man/8/ceph.rst
index 73cb10f5aa86931d6e55d4f47db061323812b4cc..ed7de1897933347920d0afe26a36a69bb3a5bee2 100644 (file)
--- a/doc/man/8/ceph.rst
+++ b/doc/man/8/ceph.rst
@@ -7,31 +7,54 @@
 Synopsis
 ========
 
-| **ceph** **auth** *add* *<entity>* {*<caps>* [*<caps>*...]}
+| **ceph** **auth** [ *add* \| *caps* \| *del* \| *export* \| *get* \| *get-key* \| *get-or-create* \| *get-or-create-key* \| *import* \| *list* \| *print-key* \| *print_key* ] ...
 
-| **ceph** **auth** *export* *<entity>*
+| **ceph** **compact**
 
-| **ceph** **config-key** *get* *<key>*
+| **ceph** **config-key** [ *del* | *exists* | *get* | *list* | *put* ] ...
 
-| **ceph** **mds** *add_data_pool* *<pool>*
+| **ceph** **df** *{detail}*
 
-| **ceph** **mds** *getmap* {*<int[0-]>*}
+| **ceph** **fsid**
 
-| **ceph** **mon** *add* *<name>* <*IPaddr[:port]*>
+| **ceph** **health** *{detail}*
+
+| **ceph** **heap** [ *dump* \| *start_profiler* \| *stop_profiler* \| *release* \| *stats* ] ...
+
+| **ceph** **injectargs** *<injectedargs>* [ *<injectedargs>*... ]
+
+| **ceph** **log** *<logtext>* [ *<logtext>*... ]
+
+| **ceph** **mds** [ *add_data_pool* \| *cluster_down* \| *cluster_up* \| *compat* \| *deactivate* \| *dump* \| *fail* \| *getmap* \| *newfs* \| *remove_data_pool* \| *rm* \| *rmfailed* \| *set* \| *set_max_mds* \| *set_state* \| *setmap* \| *stat* \| *stop* \| *tell* ] ...
+
+| **ceph** **mon** [ *add* \| *dump* \| *getmap* \| *remove* \| *stat* ] ...
 
 | **ceph** **mon_status**
 
-| **ceph** **osd** *create* {*<uuid>*}
+| **ceph** **osd** [ *blacklist* \| *create* \| *deep-scrub* \| *down* \| *dump* \| *erasure-code-profile* \| *find* \| *getcrushmap* \| *getmap* \| *getmaxosd* \| *in* \| *lost* \| *ls* \| *lspools* \| *map* \| *metadata* \| *out* \| *pause* \| *perf* \| *primary-affinity* \| *primary-temp* \| *repair* \| *reweight* \| *reweight-by-utilization* \| *rm* \| *scrub* \| *set* \| *setcrushmap* \| *setmaxosd*  \| *stat* \| *thrash* \| *tree* \| *unpause* \| *unset* ] ...
+
+| **ceph** **osd** **crush** [ *add* \| *add-bucket* \| *create-or-move* \| *dump* \| *get-tunable* \| *link* \| *move* \| *remove* \| *reweight* \| *reweight-all* \| *rm* \| *rule* \| *set* \| *set-tunable* \| *show-tunables* \| *tunables* \| *unlink* ] ...
 
-| **ceph** **osd** **crush** *add* *<osdname (id|osd.id)>*
-*<float[0.0-]>* *<args>* [*<args>*...]
+| **ceph** **osd** **pool** [ *create* \| *delete* \| *get* \| *get-quota* \| *mksnap* \| *rename* \| *rmsnap* \| *set* \| *set-quota* \| *stats* ] ...
 
-| **ceph** **pg** *force_create_pg* *<pgid>*
+| **ceph** **osd** **tier** [ *add* \| *add-cache* \| *cache-mode* \| *remove* \| *remove-overlay* \| *set-overlay* ] ...
 
-| **ceph** **pg** *stat*
+| **ceph** **pg** [ *debug* \| *deep-scrub* \| *dump* \| *dump_json* \| *dump_pools_json* \| *dump_stuck* \| *force_create_pg* \| *getmap* \| *map* \| *repair* \| *scrub* \| *send_pg_creates* \| *set_full_ratio* \| *set_nearfull_ratio* \| *stat* ] ...
+
+| **ceph** **quorum** [ *enter* \| *exit* ]
 
 | **ceph** **quorum_status**
 
+| **ceph** **report** { *<tags>* [ *<tags>...* ] }
+
+| **ceph** **scrub**
+
+| **ceph** **status**
+
+| **ceph** **sync** **force** {--yes-i-really-mean-it} {--i-know-what-i-am-doing}
+
+| **ceph** **tell** *<name (type.id)> <args> [<args>...]*
+
 Description
 ===========
 
@@ -144,23 +167,23 @@ config-key
 
 Manage configuration key. It uses some additional subcommands.
 
-Subcommand ``get`` gets the configuration key.
+Subcommand ``del`` deletes configuration key.
 
 Usage::
 
-       ceph config-key get <key>
+       ceph config-key del <key>
 
-Subcommand ``put`` puts configuration key and values.
+Subcommand ``exists`` checks for configuration keys existence.
 
 Usage::
 
-       ceph config-key put <key> {<val>}
+       ceph config-key exists <key>
 
-Subcommand ``exists`` checks for configuration keys existence.
+Subcommand ``get`` gets the configuration key.
 
 Usage::
 
-       ceph config-key exists <key>
+       ceph config-key get <key>
 
 Subcommand ``list`` lists configuration keys.
 
@@ -168,11 +191,11 @@ Usage::
 
        ceph config-key list
 
-Subcommand ``del`` deletes configuration key.
+Subcommand ``put`` puts configuration key and values.
 
 Usage::
 
-       ceph config-key del <key>
+       ceph config-key put <key> {<val>}
 
 
 df
@@ -182,7 +205,7 @@ Show cluster's free space status.
 
 Usage::
 
-       ceph df
+       ceph df {detail}
 
 
 fsid
@@ -202,7 +225,7 @@ Show cluster's health.
 
 Usage::
 
-       ceph health
+       ceph health {detail}
 
 
 heap
@@ -328,6 +351,12 @@ Usage::
 
        ceph mds rmfailed <int[0-]>
 
+Subcommand ``set`` set mds parameter <var> to <val>
+
+Usage::
+
+       ceph mds set max_mds|max_file_size|allow_new_snaps|inline_data <va> {<confirm>}
+
 Subcommand ``set_max_mds`` sets max MDS index.
 
 Usage::
@@ -400,7 +429,10 @@ Usage::
 
        ceph mon stat
 
-Subcommand ``mon_status`` reports status of monitors.
+mon_status
+----------
+
+Reports status of monitors.
 
 Usage::
 
@@ -412,6 +444,28 @@ osd
 Manage OSD configuration and administration. It uses some additional
 subcommands.
 
+Subcommand ``blacklist`` manage blacklisted clients. It uses some additional
+subcommands.
+
+Subcommand ``add`` add <addr> to blacklist (optionally until <expire> seconds
+from now)
+
+Usage::
+
+       ceph osd blacklist add <EntityAddr> {<float[0.0-]>}
+
+Subcommand ``ls`` show blacklisted clients
+
+Usage::
+
+       ceph osd blacklist ls
+
+Subcommand ``rm`` remove <addr> from blacklist
+
+Usage::
+
+       ceph osd blacklist rm <EntityAddr>
+
 Subcommand ``create`` creates new osd (with optional UUID).
 
 Usage::
@@ -449,6 +503,12 @@ Usage::
 
        ceph osd crush dump
 
+Subcommand ``get-tunable`` get crush tunable straw_calc_version
+
+Usage::
+
+       ceph osd crush get-tunable straw_calc_version
+
 Subcommand ``link`` links existing entry for <name> under location <args>.
 
 Usage::
@@ -474,6 +534,13 @@ Usage::
 
        ceph osd crush reweight <name> <float[0.0-]>
 
+Subcommand ``reweight-all`` recalculate the weights for the tree to
+ensure they sum correctly
+
+Usage::
+
+       ceph osd crush reweight-all
+
 Subcommand ``rm`` removes <name> from crush map (everywhere, or just at
 <ancestor>).
 
@@ -523,7 +590,7 @@ Usage::
 
        ceph osd crush rule rm <name>
 
-Subcommand ``set`` sets crush map from input file.
+Subcommand ``set`` used alone, sets crush map from input file.
 
 Usage::
 
@@ -536,6 +603,13 @@ Usage::
 
        ceph osd crush set <osdname (id|osd.id)> <float[0.0-]> <args> [<args>...]
 
+Subcommand ``set-tunable`` set crush tunable <tunable> to <value>.  The only
+tunable that can be set is straw_calc_version.
+
+Usage::
+
+       ceph osd crush set-tunable straw_calc_version <value>
+
 Subcommand ``show-tunables`` shows current crush tunables.
 
 Usage::
@@ -708,7 +782,7 @@ Subcommand ``get`` gets pool parameter <var>.
 Usage::
 
        ceph osd pool get <poolname> size|min_size|crash_replay_interval|pg_num|
-       pgp_num|crush_ruleset|hit_set_type|hit_set_period|hit_set_count|hit_set_fpp|
+       pgp_num|crush_ruleset|hit_set_type|hit_set_period|hit_set_count|hit_set_fpp
 
        ceph osd pool get <poolname> auid|target_max_objects|target_max_bytes
 
@@ -746,7 +820,7 @@ Subcommand ``set`` sets pool parameter <var> to <val>.
 Usage::
 
        ceph osd pool set <poolname> size|min_size|crash_replay_interval|pg_num|
-       pgp_num|crush_ruleset|hashpspool|hit_set_type|hit_set_period|
+       pgp_num|crush_ruleset|hashpspool|hit_set_type|hit_set_period
 
        ceph osd pool set <poolname> hit_set_count|hit_set_fpp|debug_fake_ec_pool
 
@@ -754,10 +828,9 @@ Usage::
 
        ceph osd pool set <poolname> cache_target_dirty_ratio|cache_target_full_ratio
 
-       ceph osd pool set <poolname> cache_min_flush_age
+       ceph osd pool set <poolname> cache_min_flush_age|cache_min_evict_age
 
-       ceph osd pool set <poolname> cache_min_evict_age|auid <val>
-       {--yes-i-really-mean-it}
+       ceph osd pool set <poolname> auid <val> {--yes-i-really-mean-it}
 
 Subcommand ``set-quota`` sets object or byte limit on pool.
 
@@ -933,16 +1006,13 @@ with plain).
 
 Usage::
 
-       ceph pg dump {all|summary|sum|delta|pools|osds|pgs|pgs_brief}
-
-       ceph pg dump {all|summary|sum|delta|pools|osds|pgs|pgs_brief...}
+       ceph pg dump {all|summary|sum|delta|pools|osds|pgs|pgs_brief} [{all|summary|sum|delta|pools|osds|pgs|pgs_brief...]}
 
 Subcommand ``dump_json`` shows human-readable version of pg map in json only.
 
 Usage::
 
-       ceph pg dump_json {all|summary|sum|pools|osds|pgs[all|summary|sum|pools|
-       osds|pgs...]}
+       ceph pg dump_json {all|summary|sum|delta|pools|osds|pgs|pgs_brief} [{all|summary|sum|delta|pools|osds|pgs|pgs_brief...]}
 
 Subcommand ``dump_pools_json`` shows pg pools info in json only.
 
@@ -954,8 +1024,7 @@ Subcommand ``dump_stuck`` shows information about stuck pgs.
 
 Usage::
 
-       ceph pg dump_stuck {inactive|unclean|stale[inactive|unclean|stale...]}
-       {<int>}
+       ceph pg dump_stuck {inactive|unclean|stale [inactive|unclean|stale...]} {<int>}
 
 Subcommand ``force_create_pg`` forces creation of pg <pgid>.
 

diff --git a/man/ceph.8 b/man/ceph.8
index 5f7b8dc701e588ce708a82a7467bd9f2fc01fc0c..27396d35648c347fb22960d34f8762f7432f7755 100644 (file)
--- a/man/ceph.8
+++ b/man/ceph.8
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "CEPH" "8" "December 18, 2014" "dev" "Ceph"
+.TH "CEPH" "8" "March 12, 2015" "dev" "Ceph"
 .SH NAME
 ceph \- ceph administration tool
 .
@@ -59,27 +59,47 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 ..
 .SH SYNOPSIS
 .nf
-\fBceph\fP \fBauth\fP \fIadd\fP \fI<entity>\fP {\fI<caps>\fP [\fI<caps>\fP\&...]}
+\fBceph\fP \fBauth\fP [ \fIadd\fP | \fIcaps\fP | \fIdel\fP | \fIexport\fP | \fIget\fP | \fIget\-key\fP | \fIget\-or\-create\fP | \fIget\-or\-create\-key\fP | \fIimport\fP | \fIlist\fP | \fIprint\-key\fP | \fIprint_key\fP ] ...
 .fi
 .sp
 .nf
-\fBceph\fP \fBauth\fP \fIexport\fP \fI<entity>\fP
+\fBceph\fP \fBcompact\fP
 .fi
 .sp
 .nf
-\fBceph\fP \fBconfig\-key\fP \fIget\fP \fI<key>\fP
+\fBceph\fP \fBconfig\-key\fP [ \fIdel\fP | \fIexists\fP | \fIget\fP | \fIlist\fP | \fIput\fP ] ...
 .fi
 .sp
 .nf
-\fBceph\fP \fBmds\fP \fIadd_data_pool\fP \fI<pool>\fP
+\fBceph\fP \fBdf\fP \fI{detail}\fP
 .fi
 .sp
 .nf
-\fBceph\fP \fBmds\fP \fIgetmap\fP {\fI<int[0\-]>\fP}
+\fBceph\fP \fBfsid\fP
 .fi
 .sp
 .nf
-\fBceph\fP \fBmon\fP \fIadd\fP \fI<name>\fP <\fIIPaddr[:port]\fP>
+\fBceph\fP \fBhealth\fP \fI{detail}\fP
+.fi
+.sp
+.nf
+\fBceph\fP \fBheap\fP [ \fIdump\fP | \fIstart_profiler\fP | \fIstop_profiler\fP | \fIrelease\fP | \fIstats\fP ] ...
+.fi
+.sp
+.nf
+\fBceph\fP \fBinjectargs\fP \fI<injectedargs>\fP [ \fI<injectedargs>\fP\&... ]
+.fi
+.sp
+.nf
+\fBceph\fP \fBlog\fP \fI<logtext>\fP [ \fI<logtext>\fP\&... ]
+.fi
+.sp
+.nf
+\fBceph\fP \fBmds\fP [ \fIadd_data_pool\fP | \fIcluster_down\fP | \fIcluster_up\fP | \fIcompat\fP | \fIdeactivate\fP | \fIdump\fP | \fIfail\fP | \fIgetmap\fP | \fInewfs\fP | \fIremove_data_pool\fP | \fIrm\fP | \fIrmfailed\fP | \fIset\fP | \fIset_max_mds\fP | \fIset_state\fP | \fIsetmap\fP | \fIstat\fP | \fIstop\fP | \fItell\fP ] ...
+.fi
+.sp
+.nf
+\fBceph\fP \fBmon\fP [ \fIadd\fP | \fIdump\fP | \fIgetmap\fP | \fIremove\fP | \fIstat\fP ] ...
 .fi
 .sp
 .nf
@@ -87,27 +107,53 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .fi
 .sp
 .nf
-\fBceph\fP \fBosd\fP \fIcreate\fP {\fI<uuid>\fP}
+\fBceph\fP \fBosd\fP [ \fIblacklist\fP | \fIcreate\fP | \fIdeep\-scrub\fP | \fIdown\fP | \fIdump\fP | \fIerasure\-code\-profile\fP | \fIfind\fP | \fIgetcrushmap\fP | \fIgetmap\fP | \fIgetmaxosd\fP | \fIin\fP | \fIlost\fP | \fIls\fP | \fIlspools\fP | \fImap\fP | \fImetadata\fP | \fIout\fP | \fIpause\fP | \fIperf\fP | \fIprimary\-affinity\fP | \fIprimary\-temp\fP | \fIrepair\fP | \fIreweight\fP | \fIreweight\-by\-utilization\fP | \fIrm\fP | \fIscrub\fP | \fIset\fP | \fIsetcrushmap\fP | \fIsetmaxosd\fP  | \fIstat\fP | \fIthrash\fP | \fItree\fP | \fIunpause\fP | \fIunset\fP ] ...
 .fi
 .sp
 .nf
-\fBceph\fP \fBosd\fP \fBcrush\fP \fIadd\fP \fI<osdname (id|osd.id)>\fP
+\fBceph\fP \fBosd\fP \fBcrush\fP [ \fIadd\fP | \fIadd\-bucket\fP | \fIcreate\-or\-move\fP | \fIdump\fP | \fIget\-tunable\fP | \fIlink\fP | \fImove\fP | \fIremove\fP | \fIreweight\fP | \fIreweight\-all\fP | \fIrm\fP | \fIrule\fP | \fIset\fP | \fIset\-tunable\fP | \fIshow\-tunables\fP | \fItunables\fP | \fIunlink\fP ] ...
 .fi
 .sp
+.nf
+\fBceph\fP \fBosd\fP \fBpool\fP [ \fIcreate\fP | \fIdelete\fP | \fIget\fP | \fIget\-quota\fP | \fImksnap\fP | \fIrename\fP | \fIrmsnap\fP | \fIset\fP | \fIset\-quota\fP | \fIstats\fP ] ...
+.fi
 .sp
-\fI<float[0.0\-]>\fP \fI<args>\fP [\fI<args>\fP\&...]
 .nf
-\fBceph\fP \fBpg\fP \fIforce_create_pg\fP \fI<pgid>\fP
+\fBceph\fP \fBosd\fP \fBtier\fP [ \fIadd\fP | \fIadd\-cache\fP | \fIcache\-mode\fP | \fIremove\fP | \fIremove\-overlay\fP | \fIset\-overlay\fP ] ...
 .fi
 .sp
 .nf
-\fBceph\fP \fBpg\fP \fIstat\fP
+\fBceph\fP \fBpg\fP [ \fIdebug\fP | \fIdeep\-scrub\fP | \fIdump\fP | \fIdump_json\fP | \fIdump_pools_json\fP | \fIdump_stuck\fP | \fIforce_create_pg\fP | \fIgetmap\fP | \fImap\fP | \fIrepair\fP | \fIscrub\fP | \fIsend_pg_creates\fP | \fIset_full_ratio\fP | \fIset_nearfull_ratio\fP | \fIstat\fP ] ...
+.fi
+.sp
+.nf
+\fBceph\fP \fBquorum\fP [ \fIenter\fP | \fIexit\fP ]
 .fi
 .sp
 .nf
 \fBceph\fP \fBquorum_status\fP
 .fi
 .sp
+.nf
+\fBceph\fP \fBreport\fP { \fI<tags>\fP [ \fI<tags>...\fP ] }
+.fi
+.sp
+.nf
+\fBceph\fP \fBscrub\fP
+.fi
+.sp
+.nf
+\fBceph\fP \fBstatus\fP
+.fi
+.sp
+.nf
+\fBceph\fP \fBsync\fP \fBforce\fP {\-\-yes\-i\-really\-mean\-it} {\-\-i\-know\-what\-i\-am\-doing}
+.fi
+.sp
+.nf
+\fBceph\fP \fBtell\fP \fI<name (type.id)> <args> [<args>...]\fP
+.fi
+.sp
 .SH DESCRIPTION
 .sp
 \fBceph\fP is a control utility which is used for manual deployment and maintenance
@@ -313,7 +359,7 @@ ceph compact
 .sp
 Manage configuration key. It uses some additional subcommands.
 .sp
-Subcommand \fBget\fP gets the configuration key.
+Subcommand \fBdel\fP deletes configuration key.
 .sp
 Usage:
 .INDENT 0.0
@@ -321,13 +367,13 @@ Usage:
 .sp
 .nf
 .ft C
-ceph config\-key get <key>
+ceph config\-key del <key>
 .ft P
 .fi
 .UNINDENT
 .UNINDENT
 .sp
-Subcommand \fBput\fP puts configuration key and values.
+Subcommand \fBexists\fP checks for configuration keys existence.
 .sp
 Usage:
 .INDENT 0.0
@@ -335,13 +381,13 @@ Usage:
 .sp
 .nf
 .ft C
-ceph config\-key put <key> {<val>}
+ceph config\-key exists <key>
 .ft P
 .fi
 .UNINDENT
 .UNINDENT
 .sp
-Subcommand \fBexists\fP checks for configuration keys existence.
+Subcommand \fBget\fP gets the configuration key.
 .sp
 Usage:
 .INDENT 0.0
@@ -349,7 +395,7 @@ Usage:
 .sp
 .nf
 .ft C
-ceph config\-key exists <key>
+ceph config\-key get <key>
 .ft P
 .fi
 .UNINDENT
@@ -369,7 +415,7 @@ ceph config\-key list
 .UNINDENT
 .UNINDENT
 .sp
-Subcommand \fBdel\fP deletes configuration key.
+Subcommand \fBput\fP puts configuration key and values.
 .sp
 Usage:
 .INDENT 0.0
@@ -377,7 +423,7 @@ Usage:
 .sp
 .nf
 .ft C
-ceph config\-key del <key>
+ceph config\-key put <key> {<val>}
 .ft P
 .fi
 .UNINDENT
@@ -392,7 +438,7 @@ Usage:
 .sp
 .nf
 .ft C
-ceph df
+ceph df {detail}
 .ft P
 .fi
 .UNINDENT
@@ -422,7 +468,7 @@ Usage:
 .sp
 .nf
 .ft C
-ceph health
+ceph health {detail}
 .ft P
 .fi
 .UNINDENT
@@ -676,6 +722,20 @@ ceph mds rmfailed <int[0\-]>
 .UNINDENT
 .UNINDENT
 .sp
+Subcommand \fBset\fP set mds parameter <var> to <val>
+.sp
+Usage:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+ceph mds set max_mds|max_file_size|allow_new_snaps|inline_data <va> {<confirm>}
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
 Subcommand \fBset_max_mds\fP sets max MDS index.
 .sp
 Usage:
@@ -833,8 +893,9 @@ ceph mon stat
 .fi
 .UNINDENT
 .UNINDENT
+.SS mon_status
 .sp
-Subcommand \fBmon_status\fP reports status of monitors.
+Reports status of monitors.
 .sp
 Usage:
 .INDENT 0.0
@@ -852,6 +913,52 @@ ceph mon_status
 Manage OSD configuration and administration. It uses some additional
 subcommands.
 .sp
+Subcommand \fBblacklist\fP manage blacklisted clients. It uses some additional
+subcommands.
+.sp
+Subcommand \fBadd\fP add <addr> to blacklist (optionally until <expire> seconds
+from now)
+.sp
+Usage:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+ceph osd blacklist add <EntityAddr> {<float[0.0\-]>}
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+Subcommand \fBls\fP show blacklisted clients
+.sp
+Usage:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+ceph osd blacklist ls
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+Subcommand \fBrm\fP remove <addr> from blacklist
+.sp
+Usage:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+ceph osd blacklist rm <EntityAddr>
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
 Subcommand \fBcreate\fP creates new osd (with optional UUID).
 .sp
 Usage:
@@ -930,6 +1037,20 @@ ceph osd crush dump
 .UNINDENT
 .UNINDENT
 .sp
+Subcommand \fBget\-tunable\fP get crush tunable straw_calc_version
+.sp
+Usage:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+ceph osd crush get\-tunable straw_calc_version
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
 Subcommand \fBlink\fP links existing entry for <name> under location <args>.
 .sp
 Usage:
@@ -987,6 +1108,21 @@ ceph osd crush reweight <name> <float[0.0\-]>
 .UNINDENT
 .UNINDENT
 .sp
+Subcommand \fBreweight\-all\fP recalculate the weights for the tree to
+ensure they sum correctly
+.sp
+Usage:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+ceph osd crush reweight\-all
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
 Subcommand \fBrm\fP removes <name> from crush map (everywhere, or just at
 <ancestor>).
 .sp
@@ -1092,7 +1228,7 @@ ceph osd crush rule rm <name>
 .UNINDENT
 .UNINDENT
 .sp
-Subcommand \fBset\fP sets crush map from input file.
+Subcommand \fBset\fP used alone, sets crush map from input file.
 .sp
 Usage:
 .INDENT 0.0
@@ -1121,6 +1257,21 @@ ceph osd crush set <osdname (id|osd.id)> <float[0.0\-]> <args> [<args>...]
 .UNINDENT
 .UNINDENT
 .sp
+Subcommand \fBset\-tunable\fP set crush tunable <tunable> to <value>.  The only
+tunable that can be set is straw_calc_version.
+.sp
+Usage:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+ceph osd crush set\-tunable straw_calc_version <value>
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
 Subcommand \fBshow\-tunables\fP shows current crush tunables.
 .sp
 Usage:
@@ -1505,7 +1656,7 @@ Usage:
 .nf
 .ft C
 ceph osd pool get <poolname> size|min_size|crash_replay_interval|pg_num|
-pgp_num|crush_ruleset|hit_set_type|hit_set_period|hit_set_count|hit_set_fpp|
+pgp_num|crush_ruleset|hit_set_type|hit_set_period|hit_set_count|hit_set_fpp
 
 ceph osd pool get <poolname> auid|target_max_objects|target_max_bytes
 
@@ -1583,7 +1734,7 @@ Usage:
 .nf
 .ft C
 ceph osd pool set <poolname> size|min_size|crash_replay_interval|pg_num|
-pgp_num|crush_ruleset|hashpspool|hit_set_type|hit_set_period|
+pgp_num|crush_ruleset|hashpspool|hit_set_type|hit_set_period
 
 ceph osd pool set <poolname> hit_set_count|hit_set_fpp|debug_fake_ec_pool
 
@@ -1591,10 +1742,9 @@ ceph osd pool set <poolname> target_max_bytes|target_max_objects
 
 ceph osd pool set <poolname> cache_target_dirty_ratio|cache_target_full_ratio
 
-ceph osd pool set <poolname> cache_min_flush_age
+ceph osd pool set <poolname> cache_min_flush_age|cache_min_evict_age
 
-ceph osd pool set <poolname> cache_min_evict_age|auid <val>
-{\-\-yes\-i\-really\-mean\-it}
+ceph osd pool set <poolname> auid <val> {\-\-yes\-i\-really\-mean\-it}
 .ft P
 .fi
 .UNINDENT
@@ -1975,9 +2125,7 @@ Usage:
 .sp
 .nf
 .ft C
-ceph pg dump {all|summary|sum|delta|pools|osds|pgs|pgs_brief}
-
-ceph pg dump {all|summary|sum|delta|pools|osds|pgs|pgs_brief...}
+ceph pg dump {all|summary|sum|delta|pools|osds|pgs|pgs_brief} [{all|summary|sum|delta|pools|osds|pgs|pgs_brief...]}
 .ft P
 .fi
 .UNINDENT
@@ -1991,8 +2139,7 @@ Usage:
 .sp
 .nf
 .ft C
-ceph pg dump_json {all|summary|sum|pools|osds|pgs[all|summary|sum|pools|
-osds|pgs...]}
+ceph pg dump_json {all|summary|sum|delta|pools|osds|pgs|pgs_brief} [{all|summary|sum|delta|pools|osds|pgs|pgs_brief...]}
 .ft P
 .fi
 .UNINDENT
@@ -2020,8 +2167,7 @@ Usage:
 .sp
 .nf
 .ft C
-ceph pg dump_stuck {inactive|unclean|stale[inactive|unclean|stale...]}
-{<int>}
+ceph pg dump_stuck {inactive|unclean|stale [inactive|unclean|stale...]} {<int>}
 .ft P
 .fi
 .UNINDENT