Merge branch 'neo' into master

* neo:
  DOC-10603 Remove command name from sub-categories

Change-Id: I4ed6b015d42826dee6fa83e8428c00ab2135857b

Author: jamesl33

docs/generate.py

@@ -182,11 +182,11 @@ def __generate_nav(self, command: ADoc, subcommands: List[ADoc], subsubcommands:
                 continue
 
             nav += (f" ** xref:{self.module}:{'cbcli/' if command.meta.command == 'couchbase-cli' else ''}"
-                    f"{subcommand.path.name}[{subcommand.meta.command} {subcommand.meta.subcommand}]\n")
+                    f"{subcommand.path.name}[{subcommand.meta.subcommand}]\n")
 
             for subsubcommand in sorted(subsubcommands[subcommand.meta.subcommand]):
                 nav += (f" ** xref:{self.module}:{'cbcli/' if command.meta.command == 'couchbase-cli' else ''}"
-                        f"{subsubcommand.path.name}[{subcommand.meta.command} {subcommand.meta.subcommand} "
+                        f"{subsubcommand.path.name}[{subcommand.meta.subcommand} "
                         f"{subsubcommand.meta.subsubcommand}]\n")
 
         return nav

docs/modules/cli/pages/_partials/cbcli/nav.adoc

@@ -1,60 +1,60 @@
 * xref:cli:cbcli/couchbase-cli.adoc[couchbase-cli]
- ** xref:cli:cbcli/couchbase-cli-analytics-link-setup.adoc[couchbase-cli analytics-link-setup]
- ** xref:cli:cbcli/couchbase-cli-backup-service.adoc[couchbase-cli backup-service]
- ** xref:cli:cbcli/couchbase-cli-backup-service-plan.adoc[couchbase-cli backup-service plan]
- ** xref:cli:cbcli/couchbase-cli-backup-service-repository.adoc[couchbase-cli backup-service repository]
- ** xref:cli:cbcli/couchbase-cli-backup-service-settings.adoc[couchbase-cli backup-service settings]
- ** xref:cli:cbcli/couchbase-cli-bucket-compact.adoc[couchbase-cli bucket-compact]
- ** xref:cli:cbcli/couchbase-cli-bucket-create.adoc[couchbase-cli bucket-create]
- ** xref:cli:cbcli/couchbase-cli-bucket-delete.adoc[couchbase-cli bucket-delete]
- ** xref:cli:cbcli/couchbase-cli-bucket-edit.adoc[couchbase-cli bucket-edit]
- ** xref:cli:cbcli/couchbase-cli-bucket-flush.adoc[couchbase-cli bucket-flush]
- ** xref:cli:cbcli/couchbase-cli-bucket-list.adoc[couchbase-cli bucket-list]
- ** xref:cli:cbcli/couchbase-cli-cluster-edit.adoc[couchbase-cli cluster-edit]
- ** xref:cli:cbcli/couchbase-cli-cluster-init.adoc[couchbase-cli cluster-init]
- ** xref:cli:cbcli/couchbase-cli-collect-logs-start.adoc[couchbase-cli collect-logs-start]
- ** xref:cli:cbcli/couchbase-cli-collect-logs-status.adoc[couchbase-cli collect-logs-status]
- ** xref:cli:cbcli/couchbase-cli-collect-logs-stop.adoc[couchbase-cli collect-logs-stop]
- ** xref:cli:cbcli/couchbase-cli-collection-manage.adoc[couchbase-cli collection-manage]
- ** xref:cli:cbcli/couchbase-cli-enable-developer-preview.adoc[couchbase-cli enable-developer-preview]
- ** xref:cli:cbcli/couchbase-cli-eventing-function-setup.adoc[couchbase-cli eventing-function-setup]
- ** xref:cli:cbcli/couchbase-cli-failover.adoc[couchbase-cli failover]
- ** xref:cli:cbcli/couchbase-cli-group-manage.adoc[couchbase-cli group-manage]
- ** xref:cli:cbcli/couchbase-cli-host-list.adoc[couchbase-cli host-list]
- ** xref:cli:cbcli/couchbase-cli-ip-family.adoc[couchbase-cli ip-family]
- ** xref:cli:cbcli/couchbase-cli-master-password.adoc[couchbase-cli master-password]
- ** xref:cli:cbcli/couchbase-cli-node-init.adoc[couchbase-cli node-init]
- ** xref:cli:cbcli/couchbase-cli-node-to-node-encryption.adoc[couchbase-cli node-to-node-encryption]
- ** xref:cli:cbcli/couchbase-cli-rebalance-status.adoc[couchbase-cli rebalance-status]
- ** xref:cli:cbcli/couchbase-cli-rebalance-stop.adoc[couchbase-cli rebalance-stop]
- ** xref:cli:cbcli/couchbase-cli-rebalance.adoc[couchbase-cli rebalance]
- ** xref:cli:cbcli/couchbase-cli-recovery.adoc[couchbase-cli recovery]
- ** xref:cli:cbcli/couchbase-cli-reset-admin-password.adoc[couchbase-cli reset-admin-password]
- ** xref:cli:cbcli/couchbase-cli-reset-cipher-suites.adoc[couchbase-cli reset-cipher-suites]
- ** xref:cli:cbcli/couchbase-cli-server-add.adoc[couchbase-cli server-add]
- ** xref:cli:cbcli/couchbase-cli-server-info.adoc[couchbase-cli server-info]
- ** xref:cli:cbcli/couchbase-cli-server-list.adoc[couchbase-cli server-list]
- ** xref:cli:cbcli/couchbase-cli-server-readd.adoc[couchbase-cli server-readd]
- ** xref:cli:cbcli/couchbase-cli-setting-alert.adoc[couchbase-cli setting-alert]
- ** xref:cli:cbcli/couchbase-cli-setting-alternate-address.adoc[couchbase-cli setting-alternate-address]
- ** xref:cli:cbcli/couchbase-cli-setting-analytics.adoc[couchbase-cli setting-analytics]
- ** xref:cli:cbcli/couchbase-cli-setting-audit.adoc[couchbase-cli setting-audit]
- ** xref:cli:cbcli/couchbase-cli-setting-autofailover.adoc[couchbase-cli setting-autofailover]
- ** xref:cli:cbcli/couchbase-cli-setting-autoreprovision.adoc[couchbase-cli setting-autoreprovision]
- ** xref:cli:cbcli/couchbase-cli-setting-cluster.adoc[couchbase-cli setting-cluster]
- ** xref:cli:cbcli/couchbase-cli-setting-compaction.adoc[couchbase-cli setting-compaction]
- ** xref:cli:cbcli/couchbase-cli-setting-index.adoc[couchbase-cli setting-index]
- ** xref:cli:cbcli/couchbase-cli-setting-ldap.adoc[couchbase-cli setting-ldap]
- ** xref:cli:cbcli/couchbase-cli-setting-master-password.adoc[couchbase-cli setting-master-password]
- ** xref:cli:cbcli/couchbase-cli-setting-notification.adoc[couchbase-cli setting-notification]
- ** xref:cli:cbcli/couchbase-cli-setting-password-policy.adoc[couchbase-cli setting-password-policy]
- ** xref:cli:cbcli/couchbase-cli-setting-query.adoc[couchbase-cli setting-query]
- ** xref:cli:cbcli/couchbase-cli-setting-rebalance.adoc[couchbase-cli setting-rebalance]
- ** xref:cli:cbcli/couchbase-cli-setting-saslauthd.adoc[couchbase-cli setting-saslauthd]
- ** xref:cli:cbcli/couchbase-cli-setting-security.adoc[couchbase-cli setting-security]
- ** xref:cli:cbcli/couchbase-cli-setting-xdcr.adoc[couchbase-cli setting-xdcr]
- ** xref:cli:cbcli/couchbase-cli-ssl-manage.adoc[couchbase-cli ssl-manage]
- ** xref:cli:cbcli/couchbase-cli-user-change-password.adoc[couchbase-cli user-change-password]
- ** xref:cli:cbcli/couchbase-cli-user-manage.adoc[couchbase-cli user-manage]
- ** xref:cli:cbcli/couchbase-cli-xdcr-replicate.adoc[couchbase-cli xdcr-replicate]
- ** xref:cli:cbcli/couchbase-cli-xdcr-setup.adoc[couchbase-cli xdcr-setup]
+ ** xref:cli:cbcli/couchbase-cli-analytics-link-setup.adoc[analytics-link-setup]
+ ** xref:cli:cbcli/couchbase-cli-backup-service.adoc[backup-service]
+ ** xref:cli:cbcli/couchbase-cli-backup-service-plan.adoc[backup-service plan]
+ ** xref:cli:cbcli/couchbase-cli-backup-service-repository.adoc[backup-service repository]
+ ** xref:cli:cbcli/couchbase-cli-backup-service-settings.adoc[backup-service settings]
+ ** xref:cli:cbcli/couchbase-cli-bucket-compact.adoc[bucket-compact]
+ ** xref:cli:cbcli/couchbase-cli-bucket-create.adoc[bucket-create]
+ ** xref:cli:cbcli/couchbase-cli-bucket-delete.adoc[bucket-delete]
+ ** xref:cli:cbcli/couchbase-cli-bucket-edit.adoc[bucket-edit]
+ ** xref:cli:cbcli/couchbase-cli-bucket-flush.adoc[bucket-flush]
+ ** xref:cli:cbcli/couchbase-cli-bucket-list.adoc[bucket-list]
+ ** xref:cli:cbcli/couchbase-cli-cluster-edit.adoc[cluster-edit]
+ ** xref:cli:cbcli/couchbase-cli-cluster-init.adoc[cluster-init]
+ ** xref:cli:cbcli/couchbase-cli-collect-logs-start.adoc[collect-logs-start]
+ ** xref:cli:cbcli/couchbase-cli-collect-logs-status.adoc[collect-logs-status]
+ ** xref:cli:cbcli/couchbase-cli-collect-logs-stop.adoc[collect-logs-stop]
+ ** xref:cli:cbcli/couchbase-cli-collection-manage.adoc[collection-manage]
+ ** xref:cli:cbcli/couchbase-cli-enable-developer-preview.adoc[enable-developer-preview]
+ ** xref:cli:cbcli/couchbase-cli-eventing-function-setup.adoc[eventing-function-setup]
+ ** xref:cli:cbcli/couchbase-cli-failover.adoc[failover]
+ ** xref:cli:cbcli/couchbase-cli-group-manage.adoc[group-manage]
+ ** xref:cli:cbcli/couchbase-cli-host-list.adoc[host-list]
+ ** xref:cli:cbcli/couchbase-cli-ip-family.adoc[ip-family]
+ ** xref:cli:cbcli/couchbase-cli-master-password.adoc[master-password]
+ ** xref:cli:cbcli/couchbase-cli-node-init.adoc[node-init]
+ ** xref:cli:cbcli/couchbase-cli-node-to-node-encryption.adoc[node-to-node-encryption]
+ ** xref:cli:cbcli/couchbase-cli-rebalance-status.adoc[rebalance-status]
+ ** xref:cli:cbcli/couchbase-cli-rebalance-stop.adoc[rebalance-stop]
+ ** xref:cli:cbcli/couchbase-cli-rebalance.adoc[rebalance]
+ ** xref:cli:cbcli/couchbase-cli-recovery.adoc[recovery]
+ ** xref:cli:cbcli/couchbase-cli-reset-admin-password.adoc[reset-admin-password]
+ ** xref:cli:cbcli/couchbase-cli-reset-cipher-suites.adoc[reset-cipher-suites]
+ ** xref:cli:cbcli/couchbase-cli-server-add.adoc[server-add]
+ ** xref:cli:cbcli/couchbase-cli-server-info.adoc[server-info]
+ ** xref:cli:cbcli/couchbase-cli-server-list.adoc[server-list]
+ ** xref:cli:cbcli/couchbase-cli-server-readd.adoc[server-readd]
+ ** xref:cli:cbcli/couchbase-cli-setting-alert.adoc[setting-alert]
+ ** xref:cli:cbcli/couchbase-cli-setting-alternate-address.adoc[setting-alternate-address]
+ ** xref:cli:cbcli/couchbase-cli-setting-analytics.adoc[setting-analytics]
+ ** xref:cli:cbcli/couchbase-cli-setting-audit.adoc[setting-audit]
+ ** xref:cli:cbcli/couchbase-cli-setting-autofailover.adoc[setting-autofailover]
+ ** xref:cli:cbcli/couchbase-cli-setting-autoreprovision.adoc[setting-autoreprovision]
+ ** xref:cli:cbcli/couchbase-cli-setting-cluster.adoc[setting-cluster]
+ ** xref:cli:cbcli/couchbase-cli-setting-compaction.adoc[setting-compaction]
+ ** xref:cli:cbcli/couchbase-cli-setting-index.adoc[setting-index]
+ ** xref:cli:cbcli/couchbase-cli-setting-ldap.adoc[setting-ldap]
+ ** xref:cli:cbcli/couchbase-cli-setting-master-password.adoc[setting-master-password]
+ ** xref:cli:cbcli/couchbase-cli-setting-notification.adoc[setting-notification]
+ ** xref:cli:cbcli/couchbase-cli-setting-password-policy.adoc[setting-password-policy]
+ ** xref:cli:cbcli/couchbase-cli-setting-query.adoc[setting-query]
+ ** xref:cli:cbcli/couchbase-cli-setting-rebalance.adoc[setting-rebalance]
+ ** xref:cli:cbcli/couchbase-cli-setting-saslauthd.adoc[setting-saslauthd]
+ ** xref:cli:cbcli/couchbase-cli-setting-security.adoc[setting-security]
+ ** xref:cli:cbcli/couchbase-cli-setting-xdcr.adoc[setting-xdcr]
+ ** xref:cli:cbcli/couchbase-cli-ssl-manage.adoc[ssl-manage]
+ ** xref:cli:cbcli/couchbase-cli-user-change-password.adoc[user-change-password]
+ ** xref:cli:cbcli/couchbase-cli-user-manage.adoc[user-manage]
+ ** xref:cli:cbcli/couchbase-cli-xdcr-replicate.adoc[xdcr-replicate]
+ ** xref:cli:cbcli/couchbase-cli-xdcr-setup.adoc[xdcr-setup]