diff --git a/doc/cli-reference/generated/ch_cli_sahara_commands.xml b/doc/cli-reference/generated/ch_cli_sahara_commands.xml
index d7fb4b0965..7397300a07 100644
--- a/doc/cli-reference/generated/ch_cli_sahara_commands.xml
+++ b/doc/cli-reference/generated/ch_cli_sahara_commands.xml
@@ -15,7 +15,7 @@
         interface (CLI) for the Data processing API and its extensions.
 
        This chapter documents <command>sahara</command> version
-        <literal>0.7.3</literal>.
+        <literal>0.7.4</literal>.
     </para>
 
     <para>For help on a specific <command>sahara</command>
diff --git a/doc/cli-reference/generated/ch_cli_trove_commands.xml b/doc/cli-reference/generated/ch_cli_trove_commands.xml
index fe4ba66ae5..de3632fe70 100644
--- a/doc/cli-reference/generated/ch_cli_trove_commands.xml
+++ b/doc/cli-reference/generated/ch_cli_trove_commands.xml
@@ -15,7 +15,7 @@
         interface (CLI) for the Database API and its extensions.
 
        This chapter documents <command>trove</command> version
-        1.0.7.
+        <literal>1.0.7</literal>.
     </para>
 
     <para>For help on a specific <command>trove</command>
@@ -731,7 +731,7 @@
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_backup-copy">
-        <title>trove backup-copy command</title>
+        <title>trove backup-copy</title>
         <screen><computeroutput>usage: trove backup-copy &lt;name&gt; &lt;backup&gt;
                          [--region &lt;region&gt;] [--description &lt;description&gt;]</computeroutput></screen>
         <para>
@@ -776,7 +776,7 @@ Creates a backup from another backup.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_backup-create">
-        <title>trove backup-create command</title>
+        <title>trove backup-create</title>
         <screen><computeroutput>usage: trove backup-create &lt;instance&gt; &lt;name&gt;
                            [--description &lt;description&gt;] [--parent &lt;parent&gt;]</computeroutput></screen>
         <para>
@@ -822,7 +822,7 @@ Creates a backup of an instance.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_backup-delete">
-        <title>trove backup-delete command</title>
+        <title>trove backup-delete</title>
         <screen><computeroutput>usage: trove backup-delete &lt;backup&gt;</computeroutput></screen>
         <para>
 Deletes a backup.
@@ -839,7 +839,7 @@ Deletes a backup.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_backup-list">
-        <title>trove backup-list command</title>
+        <title>trove backup-list</title>
         <screen><computeroutput>usage: trove backup-list [--limit &lt;limit&gt;] [--datastore &lt;datastore&gt;]</computeroutput></screen>
         <para>
 Lists available backups.
@@ -864,7 +864,7 @@ Lists available backups.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_backup-list-instance">
-        <title>trove backup-list-instance command</title>
+        <title>trove backup-list-instance</title>
         <screen><computeroutput>usage: trove backup-list-instance [--limit &lt;limit&gt;] &lt;instance&gt;</computeroutput></screen>
         <para>
 Lists available backups for an instance.
@@ -892,7 +892,7 @@ Lists available backups for an instance.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_backup-show">
-        <title>trove backup-show command</title>
+        <title>trove backup-show</title>
         <screen><computeroutput>usage: trove backup-show &lt;backup&gt;</computeroutput></screen>
         <para>
 Shows details of a backup.
@@ -909,7 +909,7 @@ Shows details of a backup.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_cluster-create">
-        <title>trove cluster-create command</title>
+        <title>trove cluster-create</title>
         <screen><computeroutput>usage: trove cluster-create &lt;name&gt; &lt;datastore&gt; &lt;datastore_version&gt;
                             [--instance &lt;flavor_id=flavor_id,volume=volume&gt;]</computeroutput></screen>
         <para>
@@ -955,7 +955,7 @@ Creates a new cluster.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_cluster-delete">
-        <title>trove cluster-delete command</title>
+        <title>trove cluster-delete</title>
         <screen><computeroutput>usage: trove cluster-delete &lt;cluster&gt;</computeroutput></screen>
         <para>
 Deletes a cluster.
@@ -972,7 +972,7 @@ Deletes a cluster.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_cluster-instances">
-        <title>trove cluster-instances command</title>
+        <title>trove cluster-instances</title>
         <screen><computeroutput>usage: trove cluster-instances &lt;cluster&gt;</computeroutput></screen>
         <para>
 Lists all instances of a cluster.
@@ -989,7 +989,7 @@ Lists all instances of a cluster.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_cluster-list">
-        <title>trove cluster-list command</title>
+        <title>trove cluster-list</title>
         <screen><computeroutput>usage: trove cluster-list [--limit &lt;limit&gt;] [--marker &lt;ID&gt;]</computeroutput></screen>
         <para>
 Lists all the clusters.
@@ -1016,7 +1016,7 @@ Lists all the clusters.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_cluster-show">
-        <title>trove cluster-show command</title>
+        <title>trove cluster-show</title>
         <screen><computeroutput>usage: trove cluster-show &lt;cluster&gt;</computeroutput></screen>
         <para>
 Shows details of a cluster.
@@ -1033,7 +1033,7 @@ Shows details of a cluster.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_configuration-attach">
-        <title>trove configuration-attach command</title>
+        <title>trove configuration-attach</title>
         <screen><computeroutput>usage: trove configuration-attach &lt;instance&gt; &lt;configuration&gt;</computeroutput></screen>
         <para>
 Attaches a configuration group to an instance.
@@ -1058,7 +1058,7 @@ Attaches a configuration group to an instance.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_configuration-create">
-        <title>trove configuration-create command</title>
+        <title>trove configuration-create</title>
         <screen><computeroutput>usage: trove configuration-create &lt;name&gt; &lt;values&gt;
                                   [--datastore &lt;datastore&gt;]
                                   [--datastore_version &lt;datastore_version&gt;]
@@ -1116,7 +1116,7 @@ Creates a configuration group.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_configuration-default">
-        <title>trove configuration-default command</title>
+        <title>trove configuration-default</title>
         <screen><computeroutput>usage: trove configuration-default &lt;instance&gt;</computeroutput></screen>
         <para>
 Shows the default configuration of an instance.
@@ -1133,7 +1133,7 @@ Shows the default configuration of an instance.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_configuration-delete">
-        <title>trove configuration-delete command</title>
+        <title>trove configuration-delete</title>
         <screen><computeroutput>usage: trove configuration-delete &lt;configuration_group&gt;</computeroutput></screen>
         <para>
 Deletes a configuration group.
@@ -1150,7 +1150,7 @@ Deletes a configuration group.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_configuration-detach">
-        <title>trove configuration-detach command</title>
+        <title>trove configuration-detach</title>
         <screen><computeroutput>usage: trove configuration-detach &lt;instance&gt;</computeroutput></screen>
         <para>
 Detaches a configuration group from an instance.
@@ -1167,7 +1167,7 @@ Detaches a configuration group from an instance.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_configuration-instances">
-        <title>trove configuration-instances command</title>
+        <title>trove configuration-instances</title>
         <screen><computeroutput>usage: trove configuration-instances &lt;configuration_group&gt;</computeroutput></screen>
         <para>
 Lists all instances associated with a configuration group.
@@ -1184,14 +1184,14 @@ Lists all instances associated with a configuration group.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_configuration-list">
-        <title>trove configuration-list command</title>
+        <title>trove configuration-list</title>
         <screen><computeroutput>usage: trove configuration-list</computeroutput></screen>
         <para>
 Lists all configuration groups.
         </para>
     </section>
     <section xml:id="troveclient_subcommand_configuration-parameter-list">
-        <title>trove configuration-parameter-list command</title>
+        <title>trove configuration-parameter-list</title>
         <screen><computeroutput>usage: trove configuration-parameter-list &lt;datastore_version&gt;
                                           [--datastore &lt;datastore&gt;]</computeroutput></screen>
         <para>
@@ -1223,7 +1223,7 @@ Lists available parameters for a configuration group.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_configuration-parameter-show">
-        <title>trove configuration-parameter-show command</title>
+        <title>trove configuration-parameter-show</title>
         <screen><computeroutput>usage: trove configuration-parameter-show &lt;datastore_version&gt; &lt;parameter&gt;
                                           [--datastore &lt;datastore&gt;]</computeroutput></screen>
         <para>
@@ -1263,7 +1263,7 @@ Shows details of a configuration parameter.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_configuration-patch">
-        <title>trove configuration-patch command</title>
+        <title>trove configuration-patch</title>
         <screen><computeroutput>usage: trove configuration-patch &lt;configuration_group&gt; &lt;values&gt;</computeroutput></screen>
         <para>
 Patches a configuration group.
@@ -1288,7 +1288,7 @@ Patches a configuration group.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_configuration-show">
-        <title>trove configuration-show command</title>
+        <title>trove configuration-show</title>
         <screen><computeroutput>usage: trove configuration-show &lt;configuration_group&gt;</computeroutput></screen>
         <para>
 Shows details of a configuration group.
@@ -1305,7 +1305,7 @@ Shows details of a configuration group.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_configuration-update">
-        <title>trove configuration-update command</title>
+        <title>trove configuration-update</title>
         <screen><computeroutput>usage: trove configuration-update &lt;configuration_group&gt; &lt;values&gt;
                                   [--name &lt;name&gt;]
                                   [--description &lt;description&gt;]</computeroutput></screen>
@@ -1352,7 +1352,7 @@ Updates a configuration group.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_create">
-        <title>trove create command</title>
+        <title>trove create</title>
         <screen><computeroutput>usage: trove create &lt;name&gt; &lt;flavor_id&gt;
                     [--size &lt;size&gt;]
                     [--databases &lt;databases&gt; [&lt;databases&gt; ...]]
@@ -1480,7 +1480,7 @@ Creates a new instance.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_database-create">
-        <title>trove database-create command</title>
+        <title>trove database-create</title>
         <screen><computeroutput>usage: trove database-create &lt;instance&gt; &lt;name&gt;
                              [--character_set &lt;character_set&gt;]
                              [--collate &lt;collate&gt;]</computeroutput></screen>
@@ -1526,7 +1526,7 @@ Creates a database on an instance.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_database-delete">
-        <title>trove database-delete command</title>
+        <title>trove database-delete</title>
         <screen><computeroutput>usage: trove database-delete &lt;instance&gt; &lt;database&gt;</computeroutput></screen>
         <para>
 Deletes a database from an instance.
@@ -1551,7 +1551,7 @@ Deletes a database from an instance.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_database-list">
-        <title>trove database-list command</title>
+        <title>trove database-list</title>
         <screen><computeroutput>usage: trove database-list &lt;instance&gt;</computeroutput></screen>
         <para>
 Lists available databases on an instance.
@@ -1568,14 +1568,14 @@ Lists available databases on an instance.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_datastore-list">
-        <title>trove datastore-list command</title>
+        <title>trove datastore-list</title>
         <screen><computeroutput>usage: trove datastore-list</computeroutput></screen>
         <para>
 Lists available datastores.
         </para>
     </section>
     <section xml:id="troveclient_subcommand_datastore-show">
-        <title>trove datastore-show command</title>
+        <title>trove datastore-show</title>
         <screen><computeroutput>usage: trove datastore-show &lt;datastore&gt;</computeroutput></screen>
         <para>
 Shows details of a datastore.
@@ -1592,7 +1592,7 @@ Shows details of a datastore.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_datastore-version-list">
-        <title>trove datastore-version-list command</title>
+        <title>trove datastore-version-list</title>
         <screen><computeroutput>usage: trove datastore-version-list &lt;datastore&gt;</computeroutput></screen>
         <para>
 Lists available versions for a datastore.
@@ -1609,7 +1609,7 @@ Lists available versions for a datastore.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_datastore-version-show">
-        <title>trove datastore-version-show command</title>
+        <title>trove datastore-version-show</title>
         <screen><computeroutput>usage: trove datastore-version-show &lt;datastore_version&gt;
                                     [--datastore &lt;datastore&gt;]</computeroutput></screen>
         <para>
@@ -1639,7 +1639,7 @@ Shows details of a datastore version.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_delete">
-        <title>trove delete command</title>
+        <title>trove delete</title>
         <screen><computeroutput>usage: trove delete &lt;instance&gt;</computeroutput></screen>
         <para>
 Deletes an instance.
@@ -1656,7 +1656,7 @@ Deletes an instance.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_detach-replica">
-        <title>trove detach-replica command</title>
+        <title>trove detach-replica</title>
         <screen><computeroutput>usage: trove detach-replica &lt;instance&gt;</computeroutput></screen>
         <para>
 Detaches a replica instance from its replication source.
@@ -1673,14 +1673,14 @@ Detaches a replica instance from its replication source.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_flavor-list">
-        <title>trove flavor-list command</title>
+        <title>trove flavor-list</title>
         <screen><computeroutput>usage: trove flavor-list</computeroutput></screen>
         <para>
 Lists available flavors.
         </para>
     </section>
     <section xml:id="troveclient_subcommand_flavor-show">
-        <title>trove flavor-show command</title>
+        <title>trove flavor-show</title>
         <screen><computeroutput>usage: trove flavor-show &lt;flavor&gt;</computeroutput></screen>
         <para>
 Shows details of a flavor.
@@ -1697,14 +1697,14 @@ Shows details of a flavor.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_limit-list">
-        <title>trove limit-list command</title>
+        <title>trove limit-list</title>
         <screen><computeroutput>usage: trove limit-list</computeroutput></screen>
         <para>
 Lists the limits for a tenant.
         </para>
     </section>
     <section xml:id="troveclient_subcommand_list">
-        <title>trove list command</title>
+        <title>trove list</title>
         <screen><computeroutput>usage: trove list [--limit &lt;limit&gt;] [--marker &lt;ID&gt;] [--include-clustered]</computeroutput></screen>
         <para>
 Lists all the instances.
@@ -1740,7 +1740,7 @@ Lists all the instances.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_metadata-create">
-        <title>trove metadata-create command</title>
+        <title>trove metadata-create</title>
         <screen><computeroutput>usage: trove metadata-create &lt;instance_id&gt; &lt;key&gt; &lt;value&gt;</computeroutput></screen>
         <para>
 Creates metadata in the database for instance &lt;id&gt;.
@@ -1773,7 +1773,7 @@ Creates metadata in the database for instance &lt;id&gt;.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_metadata-delete">
-        <title>trove metadata-delete command</title>
+        <title>trove metadata-delete</title>
         <screen><computeroutput>usage: trove metadata-delete &lt;instance_id&gt; &lt;key&gt;</computeroutput></screen>
         <para>
 Deletes metadata for instance &lt;id&gt;.
@@ -1798,7 +1798,7 @@ Deletes metadata for instance &lt;id&gt;.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_metadata-edit">
-        <title>trove metadata-edit command</title>
+        <title>trove metadata-edit</title>
         <screen><computeroutput>usage: trove metadata-edit &lt;instance_id&gt; &lt;key&gt; &lt;value&gt;</computeroutput></screen>
         <para>
 Replaces metadata value with a new one, this is non-destructive.
@@ -1831,7 +1831,7 @@ Replaces metadata value with a new one, this is non-destructive.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_metadata-list">
-        <title>trove metadata-list command</title>
+        <title>trove metadata-list</title>
         <screen><computeroutput>usage: trove metadata-list &lt;instance_id&gt;</computeroutput></screen>
         <para>
 Shows all metadata for instance &lt;id&gt;.
@@ -1848,7 +1848,7 @@ Shows all metadata for instance &lt;id&gt;.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_metadata-show">
-        <title>trove metadata-show command</title>
+        <title>trove metadata-show</title>
         <screen><computeroutput>usage: trove metadata-show &lt;instance_id&gt; &lt;key&gt;</computeroutput></screen>
         <para>
 Shows metadata entry for key &lt;key&gt; and instance &lt;id&gt;.
@@ -1873,7 +1873,7 @@ Shows metadata entry for key &lt;key&gt; and instance &lt;id&gt;.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_metadata-update">
-        <title>trove metadata-update command</title>
+        <title>trove metadata-update</title>
         <screen><computeroutput>usage: trove metadata-update &lt;instance_id&gt; &lt;key&gt; &lt;newkey&gt; &lt;value&gt;</computeroutput></screen>
         <para>
 Updates metadata, this is destructive.
@@ -1914,7 +1914,7 @@ Updates metadata, this is destructive.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_resize-instance">
-        <title>trove resize-instance command</title>
+        <title>trove resize-instance</title>
         <screen><computeroutput>usage: trove resize-instance &lt;instance&gt; &lt;flavor_id&gt;</computeroutput></screen>
         <para>
 Resizes an instance with a new flavor.
@@ -1939,7 +1939,7 @@ Resizes an instance with a new flavor.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_resize-volume">
-        <title>trove resize-volume command</title>
+        <title>trove resize-volume</title>
         <screen><computeroutput>usage: trove resize-volume &lt;instance&gt; &lt;size&gt;</computeroutput></screen>
         <para>
 Resizes the volume size of an instance.
@@ -1964,7 +1964,7 @@ Resizes the volume size of an instance.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_restart">
-        <title>trove restart command</title>
+        <title>trove restart</title>
         <screen><computeroutput>usage: trove restart &lt;instance&gt;</computeroutput></screen>
         <para>
 Restarts an instance.
@@ -1981,7 +1981,7 @@ Restarts an instance.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_root-enable">
-        <title>trove root-enable command</title>
+        <title>trove root-enable</title>
         <screen><computeroutput>usage: trove root-enable &lt;instance&gt;</computeroutput></screen>
         <para>
 Enables root for an instance and resets if already exists.
@@ -1998,7 +1998,7 @@ Enables root for an instance and resets if already exists.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_root-show">
-        <title>trove root-show command</title>
+        <title>trove root-show</title>
         <screen><computeroutput>usage: trove root-show &lt;instance&gt;</computeroutput></screen>
         <para>
 Gets status if root was ever enabled for an instance.
@@ -2015,7 +2015,7 @@ Gets status if root was ever enabled for an instance.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_secgroup-add-rule">
-        <title>trove secgroup-add-rule command</title>
+        <title>trove secgroup-add-rule</title>
         <screen><computeroutput>usage: trove secgroup-add-rule &lt;security_group&gt; &lt;cidr&gt;</computeroutput></screen>
         <para>
 Creates a security group rule.
@@ -2040,7 +2040,7 @@ Creates a security group rule.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_secgroup-delete-rule">
-        <title>trove secgroup-delete-rule command</title>
+        <title>trove secgroup-delete-rule</title>
         <screen><computeroutput>usage: trove secgroup-delete-rule &lt;security_group_rule&gt;</computeroutput></screen>
         <para>
 Deletes a security group rule.
@@ -2057,14 +2057,14 @@ Deletes a security group rule.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_secgroup-list">
-        <title>trove secgroup-list command</title>
+        <title>trove secgroup-list</title>
         <screen><computeroutput>usage: trove secgroup-list</computeroutput></screen>
         <para>
 Lists all security groups.
         </para>
     </section>
     <section xml:id="troveclient_subcommand_secgroup-list-rules">
-        <title>trove secgroup-list-rules command</title>
+        <title>trove secgroup-list-rules</title>
         <screen><computeroutput>usage: trove secgroup-list-rules &lt;security_group&gt;</computeroutput></screen>
         <para>
 Lists all rules for a security group.
@@ -2081,7 +2081,7 @@ Lists all rules for a security group.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_secgroup-show">
-        <title>trove secgroup-show command</title>
+        <title>trove secgroup-show</title>
         <screen><computeroutput>usage: trove secgroup-show &lt;security_group&gt;</computeroutput></screen>
         <para>
 Shows details of a security group.
@@ -2098,7 +2098,7 @@ Shows details of a security group.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_show">
-        <title>trove show command</title>
+        <title>trove show</title>
         <screen><computeroutput>usage: trove show &lt;instance&gt;</computeroutput></screen>
         <para>
 Shows details of an instance.
@@ -2115,7 +2115,7 @@ Shows details of an instance.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_update">
-        <title>trove update command</title>
+        <title>trove update</title>
         <screen><computeroutput>usage: trove update &lt;instance&gt;
                     [--name &lt;name&gt;] [--configuration &lt;configuration&gt;]
                     [--detach-replica-source] [--remove_configuration]</computeroutput></screen>
@@ -2170,7 +2170,7 @@ Updates an instance: Edits name, configuration, or replica source.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_user-create">
-        <title>trove user-create command</title>
+        <title>trove user-create</title>
         <screen><computeroutput>usage: trove user-create &lt;instance&gt; &lt;name&gt; &lt;password&gt;
                          [--host &lt;host&gt;]
                          [--databases &lt;databases&gt; [&lt;databases&gt; ...]]</computeroutput></screen>
@@ -2224,7 +2224,7 @@ Creates a user on an instance.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_user-delete">
-        <title>trove user-delete command</title>
+        <title>trove user-delete</title>
         <screen><computeroutput>usage: trove user-delete [--host &lt;host&gt;] &lt;instance&gt; &lt;name&gt;</computeroutput></screen>
         <para>
 Deletes a user from an instance.
@@ -2260,7 +2260,7 @@ Deletes a user from an instance.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_user-grant-access">
-        <title>trove user-grant-access command</title>
+        <title>trove user-grant-access</title>
         <screen><computeroutput>usage: trove user-grant-access &lt;instance&gt; &lt;name&gt; &lt;databases&gt; [&lt;databases&gt; ...]
                                [--host &lt;host&gt;]</computeroutput></screen>
         <para>
@@ -2305,7 +2305,7 @@ Grants access to a database(s) for a user.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_user-list">
-        <title>trove user-list command</title>
+        <title>trove user-list</title>
         <screen><computeroutput>usage: trove user-list &lt;instance&gt;</computeroutput></screen>
         <para>
 Lists the users for an instance.
@@ -2322,7 +2322,7 @@ Lists the users for an instance.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_user-revoke-access">
-        <title>trove user-revoke-access command</title>
+        <title>trove user-revoke-access</title>
         <screen><computeroutput>usage: trove user-revoke-access [--host &lt;host&gt;] &lt;instance&gt; &lt;name&gt; &lt;database&gt;</computeroutput></screen>
         <para>
 Revokes access to a database for a user.
@@ -2366,7 +2366,7 @@ Revokes access to a database for a user.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_user-show">
-        <title>trove user-show command</title>
+        <title>trove user-show</title>
         <screen><computeroutput>usage: trove user-show [--host &lt;host&gt;] &lt;instance&gt; &lt;name&gt;</computeroutput></screen>
         <para>
 Shows details of a user of an instance.
@@ -2402,7 +2402,7 @@ Shows details of a user of an instance.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_user-show-access">
-        <title>trove user-show-access command</title>
+        <title>trove user-show-access</title>
         <screen><computeroutput>usage: trove user-show-access [--host &lt;host&gt;] &lt;instance&gt; &lt;name&gt;</computeroutput></screen>
         <para>
 Shows access details of a user of an instance.
@@ -2438,7 +2438,7 @@ Shows access details of a user of an instance.
  </variablelist>
     </section>
     <section xml:id="troveclient_subcommand_user-update-attributes">
-        <title>trove user-update-attributes command</title>
+        <title>trove user-update-attributes</title>
         <screen><computeroutput>usage: trove user-update-attributes &lt;instance&gt; &lt;name&gt;
                                     [--host &lt;host&gt;] [--new_name &lt;new_name&gt;]
                                     [--new_password &lt;new_password&gt;]