From a76c6bb15cb4ebbf472c1055f8f719af9a7ab3fa Mon Sep 17 00:00:00 2001
From: swilson-fly <123485058+swilson-fly@users.noreply.github.com>
Date: Tue, 22 Oct 2024 16:59:32 -0400
Subject: [PATCH] Revert "[flyctl-bot] Update docs from flyctl (#1850)"

This reverts commit 5e8aa535351100d4423eb8290e9abd5c8b87b2fb.
---
 flyctl/cmd/fly.md                             | 64 +++++++++++++++++++
 flyctl/cmd/{main_agent.md => fly_agent.md}    | 14 ++--
 .../{main_agent_ping.md => fly_agent_ping.md} |  4 +-
 ..._agent_restart.md => fly_agent_restart.md} |  4 +-
 .../{main_agent_run.md => fly_agent_run.md}   |  4 +-
 ...main_agent_start.md => fly_agent_start.md} |  4 +-
 .../{main_agent_stop.md => fly_agent_stop.md} |  4 +-
 flyctl/cmd/fly_apps.md                        | 35 ++++++++++
 ...main_apps_create.md => fly_apps_create.md} |  4 +-
 ...in_apps_destroy.md => fly_apps_destroy.md} |  4 +-
 ...main_apps_errors.md => fly_apps_errors.md} |  4 +-
 .../{main_apps_list.md => fly_apps_list.md}   |  4 +-
 .../{main_apps_move.md => fly_apps_move.md}   |  4 +-
 .../{main_apps_open.md => fly_apps_open.md}   |  4 +-
 ..._apps_releases.md => fly_apps_releases.md} |  4 +-
 ...in_apps_restart.md => fly_apps_restart.md} |  4 +-
 flyctl/cmd/{main_auth.md => fly_auth.md}      | 14 ++--
 ...main_auth_docker.md => fly_auth_docker.md} |  4 +-
 .../{main_auth_login.md => fly_auth_login.md} |  4 +-
 ...main_auth_logout.md => fly_auth_logout.md} |  4 +-
 ...main_auth_signup.md => fly_auth_signup.md} |  4 +-
 ...main_auth_whoami.md => fly_auth_whoami.md} |  4 +-
 flyctl/cmd/{main_certs.md => fly_certs.md}    | 14 ++--
 .../{main_certs_add.md => fly_certs_add.md}   |  4 +-
 ...main_certs_check.md => fly_certs_check.md} |  4 +-
 .../{main_certs_list.md => fly_certs_list.md} |  4 +-
 ...in_certs_remove.md => fly_certs_remove.md} |  4 +-
 .../{main_certs_show.md => fly_certs_show.md} |  4 +-
 flyctl/cmd/{main_checks.md => fly_checks.md}  |  6 +-
 ...main_checks_list.md => fly_checks_list.md} |  4 +-
 flyctl/cmd/fly_config.md                      | 31 +++++++++
 .../{main_config_env.md => fly_config_env.md} |  4 +-
 ...main_config_save.md => fly_config_save.md} |  4 +-
 ...main_config_show.md => fly_config_show.md} |  4 +-
 ...fig_validate.md => fly_config_validate.md} |  4 +-
 .../cmd/{main_console.md => fly_console.md}   |  4 +-
 flyctl/cmd/{main_consul.md => fly_consul.md}  |  8 +--
 ..._consul_attach.md => fly_consul_attach.md} |  4 +-
 ..._consul_detach.md => fly_consul_detach.md} |  4 +-
 .../{main_dashboard.md => fly_dashboard.md}   |  6 +-
 ...rd_metrics.md => fly_dashboard_metrics.md} |  4 +-
 flyctl/cmd/{main_deploy.md => fly_deploy.md}  |  4 +-
 flyctl/cmd/{main_dig.md => fly_dig.md}        |  4 +-
 flyctl/cmd/{main_docs.md => fly_docs.md}      |  4 +-
 flyctl/cmd/{main_doctor.md => fly_doctor.md}  |  6 +-
 ...main_doctor_diag.md => fly_doctor_diag.md} |  4 +-
 flyctl/cmd/fly_extensions.md                  | 37 +++++++++++
 flyctl/cmd/fly_extensions_arcjet.md           | 33 ++++++++++
 ...ate.md => fly_extensions_arcjet_create.md} |  4 +-
 ....md => fly_extensions_arcjet_dashboard.md} |  4 +-
 ...oy.md => fly_extensions_arcjet_destroy.md} |  4 +-
 ..._list.md => fly_extensions_arcjet_list.md} |  4 +-
 ...tus.md => fly_extensions_arcjet_status.md} |  4 +-
 flyctl/cmd/fly_extensions_enveloop.md         | 33 ++++++++++
 ...e.md => fly_extensions_enveloop_create.md} |  4 +-
 ...d => fly_extensions_enveloop_dashboard.md} |  4 +-
 ....md => fly_extensions_enveloop_destroy.md} |  4 +-
 ...ist.md => fly_extensions_enveloop_list.md} |  4 +-
 ...s.md => fly_extensions_enveloop_status.md} |  4 +-
 flyctl/cmd/fly_extensions_kafka.md            | 34 ++++++++++
 ...eate.md => fly_extensions_kafka_create.md} |  4 +-
 ...d.md => fly_extensions_kafka_dashboard.md} |  4 +-
 ...roy.md => fly_extensions_kafka_destroy.md} |  4 +-
 ...a_list.md => fly_extensions_kafka_list.md} |  4 +-
 ...atus.md => fly_extensions_kafka_status.md} |  4 +-
 ...date.md => fly_extensions_kafka_update.md} |  4 +-
 flyctl/cmd/fly_extensions_kubernetes.md       | 32 ++++++++++
 ...md => fly_extensions_kubernetes_create.md} |  4 +-
 ...d => fly_extensions_kubernetes_destroy.md} |  4 +-
 ...t.md => fly_extensions_kubernetes_list.md} |  4 +-
 ..._extensions_kubernetes_save-kubeconfig.md} |  4 +-
 flyctl/cmd/fly_extensions_mysql.md            | 33 ++++++++++
 ...eate.md => fly_extensions_mysql_create.md} |  4 +-
 ...roy.md => fly_extensions_mysql_destroy.md} |  4 +-
 ...l_list.md => fly_extensions_mysql_list.md} |  4 +-
 ...atus.md => fly_extensions_mysql_status.md} |  4 +-
 ...date.md => fly_extensions_mysql_update.md} |  4 +-
 flyctl/cmd/fly_extensions_sentry.md           | 30 +++++++++
 ...ate.md => fly_extensions_sentry_create.md} |  4 +-
 ....md => fly_extensions_sentry_dashboard.md} |  4 +-
 flyctl/cmd/fly_extensions_storage.md          | 34 ++++++++++
 ...te.md => fly_extensions_storage_create.md} |  4 +-
 ...md => fly_extensions_storage_dashboard.md} |  4 +-
 ...y.md => fly_extensions_storage_destroy.md} |  4 +-
 ...list.md => fly_extensions_storage_list.md} |  4 +-
 ...us.md => fly_extensions_storage_status.md} |  4 +-
 ...te.md => fly_extensions_storage_update.md} |  4 +-
 flyctl/cmd/fly_extensions_supabase.md         | 33 ++++++++++
 ...e.md => fly_extensions_supabase_create.md} |  4 +-
 ...d => fly_extensions_supabase_dashboard.md} |  4 +-
 ....md => fly_extensions_supabase_destroy.md} |  4 +-
 ...ist.md => fly_extensions_supabase_list.md} |  4 +-
 ...s.md => fly_extensions_supabase_status.md} |  4 +-
 flyctl/cmd/fly_extensions_vector.md           | 33 ++++++++++
 ...ate.md => fly_extensions_vector_create.md} |  4 +-
 ....md => fly_extensions_vector_dashboard.md} |  4 +-
 ...oy.md => fly_extensions_vector_destroy.md} |  4 +-
 ..._list.md => fly_extensions_vector_list.md} |  4 +-
 ...tus.md => fly_extensions_vector_status.md} |  4 +-
 flyctl/cmd/fly_extensions_wafris.md           | 31 +++++++++
 ...ate.md => fly_extensions_wafris_create.md} |  4 +-
 ....md => fly_extensions_wafris_dashboard.md} |  4 +-
 ...oy.md => fly_extensions_wafris_destroy.md} |  4 +-
 flyctl/cmd/{main_image.md => fly_image.md}    |  8 +--
 .../{main_image_show.md => fly_image_show.md} |  4 +-
 ...in_image_update.md => fly_image_update.md} |  4 +-
 .../{main_incidents.md => fly_incidents.md}   |  8 +--
 ...idents_hosts.md => fly_incidents_hosts.md} |  6 +-
 ...ts_list.md => fly_incidents_hosts_list.md} |  4 +-
 ...ncidents_list.md => fly_incidents_list.md} |  4 +-
 flyctl/cmd/fly_ips.md                         | 32 ++++++++++
 ..._allocate-v4.md => fly_ips_allocate-v4.md} |  4 +-
 ..._allocate-v6.md => fly_ips_allocate-v6.md} |  4 +-
 .../cmd/{main_ips_list.md => fly_ips_list.md} |  4 +-
 ...main_ips_private.md => fly_ips_private.md} |  4 +-
 ...main_ips_release.md => fly_ips_release.md} |  4 +-
 flyctl/cmd/{main_jobs.md => fly_jobs.md}      |  6 +-
 .../{main_jobs_open.md => fly_jobs_open.md}   |  4 +-
 flyctl/cmd/{main_launch.md => fly_launch.md}  |  4 +-
 flyctl/cmd/fly_litefs-cloud.md                | 33 ++++++++++
 flyctl/cmd/fly_litefs-cloud_clusters.md       | 31 +++++++++
 ...md => fly_litefs-cloud_clusters_create.md} |  4 +-
 ...d => fly_litefs-cloud_clusters_destroy.md} |  4 +-
 ...t.md => fly_litefs-cloud_clusters_list.md} |  4 +-
 ...d_export.md => fly_litefs-cloud_export.md} |  4 +-
 ...d_import.md => fly_litefs-cloud_import.md} |  4 +-
 ...regions.md => fly_litefs-cloud_regions.md} |  4 +-
 ...restore.md => fly_litefs-cloud_restore.md} |  4 +-
 ...d_status.md => fly_litefs-cloud_status.md} |  4 +-
 flyctl/cmd/{main_logs.md => fly_logs.md}      |  4 +-
 flyctl/cmd/fly_machine.md                     | 47 ++++++++++++++
 ..._api-proxy.md => fly_machine_api-proxy.md} |  4 +-
 ..._machine_clone.md => fly_machine_clone.md} |  4 +-
 ...achine_cordon.md => fly_machine_cordon.md} |  4 +-
 ...achine_create.md => fly_machine_create.md} |  4 +-
 ...hine_destroy.md => fly_machine_destroy.md} |  4 +-
 flyctl/cmd/fly_machine_egress-ip.md           | 30 +++++++++
 ...e.md => fly_machine_egress-ip_allocate.md} |  4 +-
 ..._list.md => fly_machine_egress-ip_list.md} |  4 +-
 ...se.md => fly_machine_egress-ip_release.md} |  4 +-
 ...in_machine_exec.md => fly_machine_exec.md} |  4 +-
 ...in_machine_kill.md => fly_machine_kill.md} |  4 +-
 ...achine_leases.md => fly_machine_leases.md} |  8 +--
 ...s_clear.md => fly_machine_leases_clear.md} |  4 +-
 ...ses_view.md => fly_machine_leases_view.md} |  4 +-
 ...in_machine_list.md => fly_machine_list.md} |  4 +-
 ...hine_restart.md => fly_machine_restart.md} |  4 +-
 ...main_machine_run.md => fly_machine_run.md} |  4 +-
 ..._machine_start.md => fly_machine_start.md} |  4 +-
 ...achine_status.md => fly_machine_status.md} |  4 +-
 ...in_machine_stop.md => fly_machine_stop.md} |  4 +-
 ...hine_suspend.md => fly_machine_suspend.md} |  4 +-
 ...ne_uncordon.md => fly_machine_uncordon.md} |  4 +-
 ...achine_update.md => fly_machine_update.md} |  4 +-
 flyctl/cmd/fly_mysql.md                       | 33 ++++++++++
 ...in_mysql_create.md => fly_mysql_create.md} |  4 +-
 ..._mysql_destroy.md => fly_mysql_destroy.md} |  4 +-
 .../{main_mysql_list.md => fly_mysql_list.md} |  4 +-
 ...in_mysql_status.md => fly_mysql_status.md} |  4 +-
 ...in_mysql_update.md => fly_mysql_update.md} |  4 +-
 flyctl/cmd/fly_orgs.md                        | 36 +++++++++++
 ...main_orgs_create.md => fly_orgs_create.md} |  4 +-
 ...main_orgs_delete.md => fly_orgs_delete.md} |  4 +-
 ...main_orgs_invite.md => fly_orgs_invite.md} |  4 +-
 .../{main_orgs_list.md => fly_orgs_list.md}   |  4 +-
 ...main_orgs_remove.md => fly_orgs_remove.md} |  4 +-
 .../{main_orgs_show.md => fly_orgs_show.md}   |  4 +-
 flyctl/cmd/{main_ping.md => fly_ping.md}      |  4 +-
 flyctl/cmd/fly_platform.md                    | 32 ++++++++++
 ...orm_regions.md => fly_platform_regions.md} |  4 +-
 ...tform_status.md => fly_platform_status.md} |  4 +-
 ...m_vm-sizes.md => fly_platform_vm-sizes.md} |  4 +-
 flyctl/cmd/fly_postgres.md                    | 42 ++++++++++++
 ...tgres_attach.md => fly_postgres_attach.md} |  4 +-
 flyctl/cmd/fly_postgres_backup.md             | 33 ++++++++++
 ...onfig.md => fly_postgres_backup_config.md} |  8 +--
 ....md => fly_postgres_backup_config_show.md} |  4 +-
 ...d => fly_postgres_backup_config_update.md} |  4 +-
 ...reate.md => fly_postgres_backup_create.md} |  4 +-
 ...nable.md => fly_postgres_backup_enable.md} |  4 +-
 ...up_list.md => fly_postgres_backup_list.md} |  4 +-
 ...tore.md => fly_postgres_backup_restore.md} |  4 +-
 ...tgres_config.md => fly_postgres_config.md} |  8 +--
 ...ig_show.md => fly_postgres_config_show.md} |  4 +-
 ...pdate.md => fly_postgres_config_update.md} |  4 +-
 ...res_connect.md => fly_postgres_connect.md} |  4 +-
 ...tgres_create.md => fly_postgres_create.md} |  4 +-
 ...main_postgres_db.md => fly_postgres_db.md} |  6 +-
 ...res_db_list.md => fly_postgres_db_list.md} |  4 +-
 ...tgres_detach.md => fly_postgres_detach.md} |  4 +-
 ...tgres_events.md => fly_postgres_events.md} |  6 +-
 ...ts_list.md => fly_postgres_events_list.md} |  4 +-
 ...s_failover.md => fly_postgres_failover.md} |  4 +-
 ...tgres_import.md => fly_postgres_import.md} |  4 +-
 ..._postgres_list.md => fly_postgres_list.md} |  4 +-
 ...w-certs.md => fly_postgres_renew-certs.md} |  4 +-
 ...res_restart.md => fly_postgres_restart.md} |  4 +-
 ...ostgres_users.md => fly_postgres_users.md} |  6 +-
 ...ers_list.md => fly_postgres_users_list.md} |  4 +-
 flyctl/cmd/{main_proxy.md => fly_proxy.md}    |  4 +-
 flyctl/cmd/fly_redis.md                       | 37 +++++++++++
 ..._redis_connect.md => fly_redis_connect.md} |  4 +-
 ...in_redis_create.md => fly_redis_create.md} |  4 +-
 ...is_dashboard.md => fly_redis_dashboard.md} |  4 +-
 ..._redis_destroy.md => fly_redis_destroy.md} |  4 +-
 .../{main_redis_list.md => fly_redis_list.md} |  4 +-
 ...main_redis_plans.md => fly_redis_plans.md} |  4 +-
 ...main_redis_proxy.md => fly_redis_proxy.md} |  4 +-
 ...main_redis_reset.md => fly_redis_reset.md} |  4 +-
 ...in_redis_status.md => fly_redis_status.md} |  4 +-
 ...in_redis_update.md => fly_redis_update.md} |  4 +-
 .../cmd/{main_releases.md => fly_releases.md} |  4 +-
 flyctl/cmd/fly_scale.md                       | 31 +++++++++
 ...main_scale_count.md => fly_scale_count.md} |  4 +-
 ...in_scale_memory.md => fly_scale_memory.md} |  4 +-
 .../{main_scale_show.md => fly_scale_show.md} |  4 +-
 .../cmd/{main_scale_vm.md => fly_scale_vm.md} |  4 +-
 flyctl/cmd/fly_secrets.md                     | 35 ++++++++++
 ...ecrets_deploy.md => fly_secrets_deploy.md} |  4 +-
 ...ecrets_import.md => fly_secrets_import.md} |  4 +-
 ...in_secrets_list.md => fly_secrets_list.md} |  4 +-
 ...main_secrets_set.md => fly_secrets_set.md} |  4 +-
 ..._secrets_unset.md => fly_secrets_unset.md} |  4 +-
 .../cmd/{main_services.md => fly_services.md} |  6 +-
 ..._services_list.md => fly_services_list.md} |  4 +-
 flyctl/cmd/fly_settings.md                    | 30 +++++++++
 ...analytics.md => fly_settings_analytics.md} |  8 +--
 ...e.md => fly_settings_analytics_disable.md} |  4 +-
 ...le.md => fly_settings_analytics_enable.md} |  4 +-
 ...toupdate.md => fly_settings_autoupdate.md} |  8 +--
 ....md => fly_settings_autoupdate_disable.md} |  4 +-
 ...e.md => fly_settings_autoupdate_enable.md} |  4 +-
 ...nthetics.md => fly_settings_synthetics.md} |  8 +--
 ....md => fly_settings_synthetics_disable.md} |  4 +-
 ...e.md => fly_settings_synthetics_enable.md} |  4 +-
 flyctl/cmd/fly_sftp.md                        | 30 +++++++++
 .../{main_sftp_find.md => fly_sftp_find.md}   |  4 +-
 .../cmd/{main_sftp_get.md => fly_sftp_get.md} |  4 +-
 .../{main_sftp_shell.md => fly_sftp_shell.md} |  4 +-
 flyctl/cmd/fly_ssh.md                         | 31 +++++++++
 ...main_ssh_console.md => fly_ssh_console.md} |  4 +-
 .../{main_ssh_issue.md => fly_ssh_issue.md}   |  4 +-
 .../cmd/{main_ssh_log.md => fly_ssh_log.md}   |  4 +-
 flyctl/cmd/fly_ssh_sftp.md                    | 30 +++++++++
 ..._ssh_sftp_find.md => fly_ssh_sftp_find.md} |  4 +-
 ...in_ssh_sftp_get.md => fly_ssh_sftp_get.md} |  4 +-
 ...sh_sftp_shell.md => fly_ssh_sftp_shell.md} |  4 +-
 flyctl/cmd/{main_status.md => fly_status.md}  |  4 +-
 flyctl/cmd/fly_storage.md                     | 34 ++++++++++
 ...torage_create.md => fly_storage_create.md} |  4 +-
 ..._dashboard.md => fly_storage_dashboard.md} |  4 +-
 ...rage_destroy.md => fly_storage_destroy.md} |  4 +-
 ...in_storage_list.md => fly_storage_list.md} |  4 +-
 ...torage_status.md => fly_storage_status.md} |  4 +-
 ...torage_update.md => fly_storage_update.md} |  4 +-
 .../{main_synthetics.md => fly_synthetics.md} |  6 +-
 ...etics_agent.md => fly_synthetics_agent.md} |  4 +-
 flyctl/cmd/fly_tokens.md                      | 33 ++++++++++
 .../{main_tokens_3p.md => fly_tokens_3p.md}   | 12 ++--
 ...arge.md => fly_tokens_3p_add-discharge.md} |  4 +-
 ..._tokens_3p_add.md => fly_tokens_3p_add.md} |  4 +-
 ...ischarge.md => fly_tokens_3p_discharge.md} |  4 +-
 ...s_3p_ticket.md => fly_tokens_3p_ticket.md} |  4 +-
 ...s_attenuate.md => fly_tokens_attenuate.md} |  4 +-
 flyctl/cmd/fly_tokens_create.md               | 33 ++++++++++
 ..._deploy.md => fly_tokens_create_deploy.md} |  4 +-
 ...d.md => fly_tokens_create_litefs-cloud.md} |  4 +-
 ...c.md => fly_tokens_create_machine-exec.md} |  4 +-
 ...create_org.md => fly_tokens_create_org.md} |  4 +-
 ...donly.md => fly_tokens_create_readonly.md} |  4 +-
 ...create_ssh.md => fly_tokens_create_ssh.md} |  4 +-
 ...in_tokens_debug.md => fly_tokens_debug.md} |  4 +-
 ...main_tokens_list.md => fly_tokens_list.md} |  4 +-
 ..._tokens_revoke.md => fly_tokens_revoke.md} |  4 +-
 .../cmd/{main_version.md => fly_version.md}   |  6 +-
 ...sion_upgrade.md => fly_version_upgrade.md} |  4 +-
 flyctl/cmd/fly_volumes.md                     | 35 ++++++++++
 ...olumes_create.md => fly_volumes_create.md} |  4 +-
 ...umes_destroy.md => fly_volumes_destroy.md} |  4 +-
 ...olumes_extend.md => fly_volumes_extend.md} |  4 +-
 ...in_volumes_fork.md => fly_volumes_fork.md} |  4 +-
 ...in_volumes_list.md => fly_volumes_list.md} |  4 +-
 ...in_volumes_show.md => fly_volumes_show.md} |  4 +-
 ..._snapshots.md => fly_volumes_snapshots.md} |  8 +--
 ...ate.md => fly_volumes_snapshots_create.md} |  4 +-
 ..._list.md => fly_volumes_snapshots_list.md} |  4 +-
 ...olumes_update.md => fly_volumes_update.md} |  4 +-
 flyctl/cmd/fly_wireguard.md                   | 33 ++++++++++
 ...uard_create.md => fly_wireguard_create.md} |  4 +-
 ...ireguard_list.md => fly_wireguard_list.md} |  4 +-
 ...uard_remove.md => fly_wireguard_remove.md} |  4 +-
 ...eguard_reset.md => fly_wireguard_reset.md} |  4 +-
 flyctl/cmd/fly_wireguard_token.md             | 32 ++++++++++
 ...reate.md => fly_wireguard_token_create.md} |  4 +-
 ...elete.md => fly_wireguard_token_delete.md} |  4 +-
 ...en_list.md => fly_wireguard_token_list.md} |  4 +-
 ..._start.md => fly_wireguard_token_start.md} |  4 +-
 ...pdate.md => fly_wireguard_token_update.md} |  4 +-
 ...sockets.md => fly_wireguard_websockets.md} |  4 +-
 flyctl/cmd/main.md                            | 64 -------------------
 flyctl/cmd/main_apps.md                       | 35 ----------
 flyctl/cmd/main_config.md                     | 31 ---------
 flyctl/cmd/main_extensions.md                 | 37 -----------
 flyctl/cmd/main_extensions_arcjet.md          | 33 ----------
 flyctl/cmd/main_extensions_enveloop.md        | 33 ----------
 flyctl/cmd/main_extensions_kafka.md           | 34 ----------
 flyctl/cmd/main_extensions_kubernetes.md      | 32 ----------
 flyctl/cmd/main_extensions_mysql.md           | 33 ----------
 flyctl/cmd/main_extensions_sentry.md          | 30 ---------
 flyctl/cmd/main_extensions_storage.md         | 34 ----------
 flyctl/cmd/main_extensions_supabase.md        | 33 ----------
 flyctl/cmd/main_extensions_vector.md          | 33 ----------
 flyctl/cmd/main_extensions_wafris.md          | 31 ---------
 flyctl/cmd/main_ips.md                        | 32 ----------
 flyctl/cmd/main_litefs-cloud.md               | 33 ----------
 flyctl/cmd/main_litefs-cloud_clusters.md      | 31 ---------
 flyctl/cmd/main_machine.md                    | 47 --------------
 flyctl/cmd/main_machine_egress-ip.md          | 30 ---------
 flyctl/cmd/main_mysql.md                      | 33 ----------
 flyctl/cmd/main_orgs.md                       | 36 -----------
 flyctl/cmd/main_platform.md                   | 32 ----------
 flyctl/cmd/main_postgres.md                   | 42 ------------
 flyctl/cmd/main_postgres_backup.md            | 33 ----------
 flyctl/cmd/main_redis.md                      | 37 -----------
 flyctl/cmd/main_scale.md                      | 31 ---------
 flyctl/cmd/main_secrets.md                    | 35 ----------
 flyctl/cmd/main_settings.md                   | 30 ---------
 flyctl/cmd/main_sftp.md                       | 30 ---------
 flyctl/cmd/main_ssh.md                        | 31 ---------
 flyctl/cmd/main_ssh_sftp.md                   | 30 ---------
 flyctl/cmd/main_storage.md                    | 34 ----------
 flyctl/cmd/main_tokens.md                     | 33 ----------
 flyctl/cmd/main_tokens_create.md              | 33 ----------
 flyctl/cmd/main_volumes.md                    | 35 ----------
 flyctl/cmd/main_wireguard.md                  | 33 ----------
 flyctl/cmd/main_wireguard_token.md            | 32 ----------
 336 files changed, 1840 insertions(+), 1840 deletions(-)
 create mode 100644 flyctl/cmd/fly.md
 rename flyctl/cmd/{main_agent.md => fly_agent.md} (55%)
 rename flyctl/cmd/{main_agent_ping.md => fly_agent_ping.md} (65%)
 rename flyctl/cmd/{main_agent_restart.md => fly_agent_restart.md} (63%)
 rename flyctl/cmd/{main_agent_run.md => fly_agent_run.md} (64%)
 rename flyctl/cmd/{main_agent_start.md => fly_agent_start.md} (63%)
 rename flyctl/cmd/{main_agent_stop.md => fly_agent_stop.md} (63%)
 create mode 100644 flyctl/cmd/fly_apps.md
 rename flyctl/cmd/{main_apps_create.md => fly_apps_create.md} (88%)
 rename flyctl/cmd/{main_apps_destroy.md => fly_apps_destroy.md} (79%)
 rename flyctl/cmd/{main_apps_errors.md => fly_apps_errors.md} (84%)
 rename flyctl/cmd/{main_apps_list.md => fly_apps_list.md} (89%)
 rename flyctl/cmd/{main_apps_move.md => fly_apps_move.md} (87%)
 rename flyctl/cmd/{main_apps_open.md => fly_apps_open.md} (85%)
 rename flyctl/cmd/{main_apps_releases.md => fly_apps_releases.md} (88%)
 rename flyctl/cmd/{main_apps_restart.md => fly_apps_restart.md} (84%)
 rename flyctl/cmd/{main_auth.md => fly_auth.md} (51%)
 rename flyctl/cmd/{main_auth_docker.md => fly_auth_docker.md} (82%)
 rename flyctl/cmd/{main_auth_login.md => fly_auth_login.md} (87%)
 rename flyctl/cmd/{main_auth_logout.md => fly_auth_logout.md} (81%)
 rename flyctl/cmd/{main_auth_signup.md => fly_auth_signup.md} (81%)
 rename flyctl/cmd/{main_auth_whoami.md => fly_auth_whoami.md} (79%)
 rename flyctl/cmd/{main_certs.md => fly_certs.md} (55%)
 rename flyctl/cmd/{main_certs_add.md => fly_certs_add.md} (83%)
 rename flyctl/cmd/{main_certs_check.md => fly_certs_check.md} (84%)
 rename flyctl/cmd/{main_certs_list.md => fly_certs_list.md} (84%)
 rename flyctl/cmd/{main_certs_remove.md => fly_certs_remove.md} (84%)
 rename flyctl/cmd/{main_certs_show.md => fly_certs_show.md} (84%)
 rename flyctl/cmd/{main_checks.md => fly_checks.md} (72%)
 rename flyctl/cmd/{main_checks_list.md => fly_checks_list.md} (84%)
 create mode 100644 flyctl/cmd/fly_config.md
 rename flyctl/cmd/{main_config_env.md => fly_config_env.md} (83%)
 rename flyctl/cmd/{main_config_save.md => fly_config_save.md} (87%)
 rename flyctl/cmd/{main_config_show.md => fly_config_show.md} (88%)
 rename flyctl/cmd/{main_config_validate.md => fly_config_validate.md} (82%)
 rename flyctl/cmd/{main_console.md => fly_console.md} (97%)
 rename flyctl/cmd/{main_consul.md => fly_consul.md} (56%)
 rename flyctl/cmd/{main_consul_attach.md => fly_consul_attach.md} (84%)
 rename flyctl/cmd/{main_consul_detach.md => fly_consul_detach.md} (84%)
 rename flyctl/cmd/{main_dashboard.md => fly_dashboard.md} (70%)
 rename flyctl/cmd/{main_dashboard_metrics.md => fly_dashboard_metrics.md} (77%)
 rename flyctl/cmd/{main_deploy.md => fly_deploy.md} (98%)
 rename flyctl/cmd/{main_dig.md => fly_dig.md} (91%)
 rename flyctl/cmd/{main_docs.md => fly_docs.md} (81%)
 rename flyctl/cmd/{main_doctor.md => fly_doctor.md} (75%)
 rename flyctl/cmd/{main_doctor_diag.md => fly_doctor_diag.md} (85%)
 create mode 100644 flyctl/cmd/fly_extensions.md
 create mode 100644 flyctl/cmd/fly_extensions_arcjet.md
 rename flyctl/cmd/{main_extensions_arcjet_create.md => fly_extensions_arcjet_create.md} (82%)
 rename flyctl/cmd/{main_extensions_arcjet_dashboard.md => fly_extensions_arcjet_dashboard.md} (77%)
 rename flyctl/cmd/{main_extensions_arcjet_destroy.md => fly_extensions_arcjet_destroy.md} (76%)
 rename flyctl/cmd/{main_extensions_arcjet_list.md => fly_extensions_arcjet_list.md} (75%)
 rename flyctl/cmd/{main_extensions_arcjet_status.md => fly_extensions_arcjet_status.md} (77%)
 create mode 100644 flyctl/cmd/fly_extensions_enveloop.md
 rename flyctl/cmd/{main_extensions_enveloop_create.md => fly_extensions_enveloop_create.md} (80%)
 rename flyctl/cmd/{main_extensions_enveloop_dashboard.md => fly_extensions_enveloop_dashboard.md} (77%)
 rename flyctl/cmd/{main_extensions_enveloop_destroy.md => fly_extensions_enveloop_destroy.md} (74%)
 rename flyctl/cmd/{main_extensions_enveloop_list.md => fly_extensions_enveloop_list.md} (72%)
 rename flyctl/cmd/{main_extensions_enveloop_status.md => fly_extensions_enveloop_status.md} (75%)
 create mode 100644 flyctl/cmd/fly_extensions_kafka.md
 rename flyctl/cmd/{main_extensions_kafka_create.md => fly_extensions_kafka_create.md} (81%)
 rename flyctl/cmd/{main_extensions_kafka_dashboard.md => fly_extensions_kafka_dashboard.md} (78%)
 rename flyctl/cmd/{main_extensions_kafka_destroy.md => fly_extensions_kafka_destroy.md} (75%)
 rename flyctl/cmd/{main_extensions_kafka_list.md => fly_extensions_kafka_list.md} (73%)
 rename flyctl/cmd/{main_extensions_kafka_status.md => fly_extensions_kafka_status.md} (75%)
 rename flyctl/cmd/{main_extensions_kafka_update.md => fly_extensions_kafka_update.md} (77%)
 create mode 100644 flyctl/cmd/fly_extensions_kubernetes.md
 rename flyctl/cmd/{main_extensions_kubernetes_create.md => fly_extensions_kubernetes_create.md} (78%)
 rename flyctl/cmd/{main_extensions_kubernetes_destroy.md => fly_extensions_kubernetes_destroy.md} (67%)
 rename flyctl/cmd/{main_extensions_kubernetes_list.md => fly_extensions_kubernetes_list.md} (65%)
 rename flyctl/cmd/{main_extensions_kubernetes_save-kubeconfig.md => fly_extensions_kubernetes_save-kubeconfig.md} (68%)
 create mode 100644 flyctl/cmd/fly_extensions_mysql.md
 rename flyctl/cmd/{main_extensions_mysql_create.md => fly_extensions_mysql_create.md} (86%)
 rename flyctl/cmd/{main_extensions_mysql_destroy.md => fly_extensions_mysql_destroy.md} (75%)
 rename flyctl/cmd/{main_extensions_mysql_list.md => fly_extensions_mysql_list.md} (73%)
 rename flyctl/cmd/{main_extensions_mysql_status.md => fly_extensions_mysql_status.md} (75%)
 rename flyctl/cmd/{main_extensions_mysql_update.md => fly_extensions_mysql_update.md} (81%)
 create mode 100644 flyctl/cmd/fly_extensions_sentry.md
 rename flyctl/cmd/{main_extensions_sentry_create.md => fly_extensions_sentry_create.md} (77%)
 rename flyctl/cmd/{main_extensions_sentry_dashboard.md => fly_extensions_sentry_dashboard.md} (76%)
 create mode 100644 flyctl/cmd/fly_extensions_storage.md
 rename flyctl/cmd/{main_extensions_storage_create.md => fly_extensions_storage_create.md} (87%)
 rename flyctl/cmd/{main_extensions_storage_dashboard.md => fly_extensions_storage_dashboard.md} (74%)
 rename flyctl/cmd/{main_extensions_storage_destroy.md => fly_extensions_storage_destroy.md} (72%)
 rename flyctl/cmd/{main_extensions_storage_list.md => fly_extensions_storage_list.md} (72%)
 rename flyctl/cmd/{main_extensions_storage_status.md => fly_extensions_storage_status.md} (74%)
 rename flyctl/cmd/{main_extensions_storage_update.md => fly_extensions_storage_update.md} (87%)
 create mode 100644 flyctl/cmd/fly_extensions_supabase.md
 rename flyctl/cmd/{main_extensions_supabase_create.md => fly_extensions_supabase_create.md} (80%)
 rename flyctl/cmd/{main_extensions_supabase_dashboard.md => fly_extensions_supabase_dashboard.md} (74%)
 rename flyctl/cmd/{main_extensions_supabase_destroy.md => fly_extensions_supabase_destroy.md} (73%)
 rename flyctl/cmd/{main_extensions_supabase_list.md => fly_extensions_supabase_list.md} (71%)
 rename flyctl/cmd/{main_extensions_supabase_status.md => fly_extensions_supabase_status.md} (74%)
 create mode 100644 flyctl/cmd/fly_extensions_vector.md
 rename flyctl/cmd/{main_extensions_vector_create.md => fly_extensions_vector_create.md} (81%)
 rename flyctl/cmd/{main_extensions_vector_dashboard.md => fly_extensions_vector_dashboard.md} (78%)
 rename flyctl/cmd/{main_extensions_vector_destroy.md => fly_extensions_vector_destroy.md} (75%)
 rename flyctl/cmd/{main_extensions_vector_list.md => fly_extensions_vector_list.md} (73%)
 rename flyctl/cmd/{main_extensions_vector_status.md => fly_extensions_vector_status.md} (75%)
 create mode 100644 flyctl/cmd/fly_extensions_wafris.md
 rename flyctl/cmd/{main_extensions_wafris_create.md => fly_extensions_wafris_create.md} (79%)
 rename flyctl/cmd/{main_extensions_wafris_dashboard.md => fly_extensions_wafris_dashboard.md} (73%)
 rename flyctl/cmd/{main_extensions_wafris_destroy.md => fly_extensions_wafris_destroy.md} (72%)
 rename flyctl/cmd/{main_image.md => fly_image.md} (54%)
 rename flyctl/cmd/{main_image_show.md => fly_image_show.md} (83%)
 rename flyctl/cmd/{main_image_update.md => fly_image_update.md} (89%)
 rename flyctl/cmd/{main_incidents.md => fly_incidents.md} (59%)
 rename flyctl/cmd/{main_incidents_hosts.md => fly_incidents_hosts.md} (62%)
 rename flyctl/cmd/{main_incidents_hosts_list.md => fly_incidents_hosts_list.md} (79%)
 rename flyctl/cmd/{main_incidents_list.md => fly_incidents_list.md} (85%)
 create mode 100644 flyctl/cmd/fly_ips.md
 rename flyctl/cmd/{main_ips_allocate-v4.md => fly_ips_allocate-v4.md} (86%)
 rename flyctl/cmd/{main_ips_allocate-v6.md => fly_ips_allocate-v6.md} (87%)
 rename flyctl/cmd/{main_ips_list.md => fly_ips_list.md} (83%)
 rename flyctl/cmd/{main_ips_private.md => fly_ips_private.md} (84%)
 rename flyctl/cmd/{main_ips_release.md => fly_ips_release.md} (79%)
 rename flyctl/cmd/{main_jobs.md => fly_jobs.md} (71%)
 rename flyctl/cmd/{main_jobs_open.md => fly_jobs_open.md} (78%)
 rename flyctl/cmd/{main_launch.md => fly_launch.md} (99%)
 create mode 100644 flyctl/cmd/fly_litefs-cloud.md
 create mode 100644 flyctl/cmd/fly_litefs-cloud_clusters.md
 rename flyctl/cmd/{main_litefs-cloud_clusters_create.md => fly_litefs-cloud_clusters_create.md} (75%)
 rename flyctl/cmd/{main_litefs-cloud_clusters_destroy.md => fly_litefs-cloud_clusters_destroy.md} (73%)
 rename flyctl/cmd/{main_litefs-cloud_clusters_list.md => fly_litefs-cloud_clusters_list.md} (78%)
 rename flyctl/cmd/{main_litefs-cloud_export.md => fly_litefs-cloud_export.md} (83%)
 rename flyctl/cmd/{main_litefs-cloud_import.md => fly_litefs-cloud_import.md} (82%)
 rename flyctl/cmd/{main_litefs-cloud_regions.md => fly_litefs-cloud_regions.md} (72%)
 rename flyctl/cmd/{main_litefs-cloud_restore.md => fly_litefs-cloud_restore.md} (82%)
 rename flyctl/cmd/{main_litefs-cloud_status.md => fly_litefs-cloud_status.md} (79%)
 rename flyctl/cmd/{main_logs.md => fly_logs.md} (91%)
 create mode 100644 flyctl/cmd/fly_machine.md
 rename flyctl/cmd/{main_machine_api-proxy.md => fly_machine_api-proxy.md} (82%)
 rename flyctl/cmd/{main_machine_clone.md => fly_machine_clone.md} (95%)
 rename flyctl/cmd/{main_machine_cordon.md => fly_machine_cordon.md} (79%)
 rename flyctl/cmd/{main_machine_create.md => fly_machine_create.md} (97%)
 rename flyctl/cmd/{main_machine_destroy.md => fly_machine_destroy.md} (86%)
 create mode 100644 flyctl/cmd/fly_machine_egress-ip.md
 rename flyctl/cmd/{main_machine_egress-ip_allocate.md => fly_machine_egress-ip_allocate.md} (75%)
 rename flyctl/cmd/{main_machine_egress-ip_list.md => fly_machine_egress-ip_list.md} (78%)
 rename flyctl/cmd/{main_machine_egress-ip_release.md => fly_machine_egress-ip_release.md} (74%)
 rename flyctl/cmd/{main_machine_exec.md => fly_machine_exec.md} (80%)
 rename flyctl/cmd/{main_machine_kill.md => fly_machine_kill.md} (80%)
 rename flyctl/cmd/{main_machine_leases.md => fly_machine_leases.md} (55%)
 rename flyctl/cmd/{main_machine_leases_clear.md => fly_machine_leases_clear.md} (75%)
 rename flyctl/cmd/{main_machine_leases_view.md => fly_machine_leases_view.md} (77%)
 rename flyctl/cmd/{main_machine_list.md => fly_machine_list.md} (83%)
 rename flyctl/cmd/{main_machine_restart.md => fly_machine_restart.md} (86%)
 rename flyctl/cmd/{main_machine_run.md => fly_machine_run.md} (97%)
 rename flyctl/cmd/{main_machine_start.md => fly_machine_start.md} (79%)
 rename flyctl/cmd/{main_machine_status.md => fly_machine_status.md} (82%)
 rename flyctl/cmd/{main_machine_stop.md => fly_machine_stop.md} (87%)
 rename flyctl/cmd/{main_machine_suspend.md => fly_machine_suspend.md} (83%)
 rename flyctl/cmd/{main_machine_uncordon.md => fly_machine_uncordon.md} (79%)
 rename flyctl/cmd/{main_machine_update.md => fly_machine_update.md} (97%)
 create mode 100644 flyctl/cmd/fly_mysql.md
 rename flyctl/cmd/{main_mysql_create.md => fly_mysql_create.md} (88%)
 rename flyctl/cmd/{main_mysql_destroy.md => fly_mysql_destroy.md} (79%)
 rename flyctl/cmd/{main_mysql_list.md => fly_mysql_list.md} (77%)
 rename flyctl/cmd/{main_mysql_status.md => fly_mysql_status.md} (79%)
 rename flyctl/cmd/{main_mysql_update.md => fly_mysql_update.md} (84%)
 create mode 100644 flyctl/cmd/fly_orgs.md
 rename flyctl/cmd/{main_orgs_create.md => fly_orgs_create.md} (77%)
 rename flyctl/cmd/{main_orgs_delete.md => fly_orgs_delete.md} (74%)
 rename flyctl/cmd/{main_orgs_invite.md => fly_orgs_invite.md} (77%)
 rename flyctl/cmd/{main_orgs_list.md => fly_orgs_list.md} (76%)
 rename flyctl/cmd/{main_orgs_remove.md => fly_orgs_remove.md} (76%)
 rename flyctl/cmd/{main_orgs_show.md => fly_orgs_show.md} (80%)
 rename flyctl/cmd/{main_ping.md => fly_ping.md} (92%)
 create mode 100644 flyctl/cmd/fly_platform.md
 rename flyctl/cmd/{main_platform_regions.md => fly_platform_regions.md} (77%)
 rename flyctl/cmd/{main_platform_status.md => fly_platform_status.md} (77%)
 rename flyctl/cmd/{main_platform_vm-sizes.md => fly_platform_vm-sizes.md} (78%)
 create mode 100644 flyctl/cmd/fly_postgres.md
 rename flyctl/cmd/{main_postgres_attach.md => fly_postgres_attach.md} (88%)
 create mode 100644 flyctl/cmd/fly_postgres_backup.md
 rename flyctl/cmd/{main_postgres_backup_config.md => fly_postgres_backup_config.md} (51%)
 rename flyctl/cmd/{main_postgres_backup_config_show.md => fly_postgres_backup_config_show.md} (73%)
 rename flyctl/cmd/{main_postgres_backup_config_update.md => fly_postgres_backup_config_update.md} (82%)
 rename flyctl/cmd/{main_postgres_backup_create.md => fly_postgres_backup_create.md} (82%)
 rename flyctl/cmd/{main_postgres_backup_enable.md => fly_postgres_backup_enable.md} (79%)
 rename flyctl/cmd/{main_postgres_backup_list.md => fly_postgres_backup_list.md} (77%)
 rename flyctl/cmd/{main_postgres_backup_restore.md => fly_postgres_backup_restore.md} (87%)
 rename flyctl/cmd/{main_postgres_config.md => fly_postgres_config.md} (54%)
 rename flyctl/cmd/{main_postgres_config_show.md => fly_postgres_config_show.md} (74%)
 rename flyctl/cmd/{main_postgres_config_update.md => fly_postgres_config_update.md} (93%)
 rename flyctl/cmd/{main_postgres_connect.md => fly_postgres_connect.md} (86%)
 rename flyctl/cmd/{main_postgres_create.md => fly_postgres_create.md} (94%)
 rename flyctl/cmd/{main_postgres_db.md => fly_postgres_db.md} (66%)
 rename flyctl/cmd/{main_postgres_db_list.md => fly_postgres_db_list.md} (77%)
 rename flyctl/cmd/{main_postgres_detach.md => fly_postgres_detach.md} (77%)
 rename flyctl/cmd/{main_postgres_events.md => fly_postgres_events.md} (62%)
 rename flyctl/cmd/{main_postgres_events_list.md => fly_postgres_events_list.md} (86%)
 rename flyctl/cmd/{main_postgres_failover.md => fly_postgres_failover.md} (87%)
 rename flyctl/cmd/{main_postgres_import.md => fly_postgres_import.md} (90%)
 rename flyctl/cmd/{main_postgres_list.md => fly_postgres_list.md} (75%)
 rename flyctl/cmd/{main_postgres_renew-certs.md => fly_postgres_renew-certs.md} (84%)
 rename flyctl/cmd/{main_postgres_restart.md => fly_postgres_restart.md} (86%)
 rename flyctl/cmd/{main_postgres_users.md => fly_postgres_users.md} (65%)
 rename flyctl/cmd/{main_postgres_users_list.md => fly_postgres_users_list.md} (76%)
 rename flyctl/cmd/{main_proxy.md => fly_proxy.md} (89%)
 create mode 100644 flyctl/cmd/fly_redis.md
 rename flyctl/cmd/{main_redis_connect.md => fly_redis_connect.md} (78%)
 rename flyctl/cmd/{main_redis_create.md => fly_redis_create.md} (87%)
 rename flyctl/cmd/{main_redis_dashboard.md => fly_redis_dashboard.md} (70%)
 rename flyctl/cmd/{main_redis_destroy.md => fly_redis_destroy.md} (72%)
 rename flyctl/cmd/{main_redis_list.md => fly_redis_list.md} (75%)
 rename flyctl/cmd/{main_redis_plans.md => fly_redis_plans.md} (70%)
 rename flyctl/cmd/{main_redis_proxy.md => fly_redis_proxy.md} (77%)
 rename flyctl/cmd/{main_redis_reset.md => fly_redis_reset.md} (70%)
 rename flyctl/cmd/{main_redis_status.md => fly_redis_status.md} (69%)
 rename flyctl/cmd/{main_redis_update.md => fly_redis_update.md} (81%)
 rename flyctl/cmd/{main_releases.md => fly_releases.md} (87%)
 create mode 100644 flyctl/cmd/fly_scale.md
 rename flyctl/cmd/{main_scale_count.md => fly_scale_count.md} (95%)
 rename flyctl/cmd/{main_scale_memory.md => fly_scale_memory.md} (83%)
 rename flyctl/cmd/{main_scale_show.md => fly_scale_show.md} (83%)
 rename flyctl/cmd/{main_scale_vm.md => fly_scale_vm.md} (89%)
 create mode 100644 flyctl/cmd/fly_secrets.md
 rename flyctl/cmd/{main_secrets_deploy.md => fly_secrets_deploy.md} (78%)
 rename flyctl/cmd/{main_secrets_import.md => fly_secrets_import.md} (82%)
 rename flyctl/cmd/{main_secrets_list.md => fly_secrets_list.md} (82%)
 rename flyctl/cmd/{main_secrets_set.md => fly_secrets_set.md} (78%)
 rename flyctl/cmd/{main_secrets_unset.md => fly_secrets_unset.md} (80%)
 rename flyctl/cmd/{main_services.md => fly_services.md} (69%)
 rename flyctl/cmd/{main_services_list.md => fly_services_list.md} (79%)
 create mode 100644 flyctl/cmd/fly_settings.md
 rename flyctl/cmd/{main_settings_analytics.md => fly_settings_analytics.md} (56%)
 rename flyctl/cmd/{main_settings_analytics_disable.md => fly_settings_analytics_disable.md} (65%)
 rename flyctl/cmd/{main_settings_analytics_enable.md => fly_settings_analytics_enable.md} (65%)
 rename flyctl/cmd/{main_settings_autoupdate.md => fly_settings_autoupdate.md} (53%)
 rename flyctl/cmd/{main_settings_autoupdate_disable.md => fly_settings_autoupdate_disable.md} (68%)
 rename flyctl/cmd/{main_settings_autoupdate_enable.md => fly_settings_autoupdate_enable.md} (68%)
 rename flyctl/cmd/{main_settings_synthetics.md => fly_settings_synthetics.md} (55%)
 rename flyctl/cmd/{main_settings_synthetics_disable.md => fly_settings_synthetics_disable.md} (66%)
 rename flyctl/cmd/{main_settings_synthetics_enable.md => fly_settings_synthetics_enable.md} (66%)
 create mode 100644 flyctl/cmd/fly_sftp.md
 rename flyctl/cmd/{main_sftp_find.md => fly_sftp_find.md} (91%)
 rename flyctl/cmd/{main_sftp_get.md => fly_sftp_get.md} (91%)
 rename flyctl/cmd/{main_sftp_shell.md => fly_sftp_shell.md} (92%)
 create mode 100644 flyctl/cmd/fly_ssh.md
 rename flyctl/cmd/{main_ssh_console.md => fly_ssh_console.md} (91%)
 rename flyctl/cmd/{main_ssh_issue.md => fly_ssh_issue.md} (87%)
 rename flyctl/cmd/{main_ssh_log.md => fly_ssh_log.md} (78%)
 create mode 100644 flyctl/cmd/fly_ssh_sftp.md
 rename flyctl/cmd/{main_ssh_sftp_find.md => fly_ssh_sftp_find.md} (91%)
 rename flyctl/cmd/{main_ssh_sftp_get.md => fly_ssh_sftp_get.md} (90%)
 rename flyctl/cmd/{main_ssh_sftp_shell.md => fly_ssh_sftp_shell.md} (91%)
 rename flyctl/cmd/{main_status.md => fly_status.md} (90%)
 create mode 100644 flyctl/cmd/fly_storage.md
 rename flyctl/cmd/{main_storage_create.md => fly_storage_create.md} (89%)
 rename flyctl/cmd/{main_storage_dashboard.md => fly_storage_dashboard.md} (78%)
 rename flyctl/cmd/{main_storage_destroy.md => fly_storage_destroy.md} (76%)
 rename flyctl/cmd/{main_storage_list.md => fly_storage_list.md} (76%)
 rename flyctl/cmd/{main_storage_status.md => fly_storage_status.md} (78%)
 rename flyctl/cmd/{main_storage_update.md => fly_storage_update.md} (89%)
 rename flyctl/cmd/{main_synthetics.md => fly_synthetics.md} (65%)
 rename flyctl/cmd/{main_synthetics_agent.md => fly_synthetics_agent.md} (75%)
 create mode 100644 flyctl/cmd/fly_tokens.md
 rename flyctl/cmd/{main_tokens_3p.md => fly_tokens_3p.md} (55%)
 rename flyctl/cmd/{main_tokens_3p_add-discharge.md => fly_tokens_3p_add-discharge.md} (78%)
 rename flyctl/cmd/{main_tokens_3p_add.md => fly_tokens_3p_add.md} (83%)
 rename flyctl/cmd/{main_tokens_3p_discharge.md => fly_tokens_3p_discharge.md} (83%)
 rename flyctl/cmd/{main_tokens_3p_ticket.md => fly_tokens_3p_ticket.md} (79%)
 rename flyctl/cmd/{main_tokens_attenuate.md => fly_tokens_attenuate.md} (86%)
 create mode 100644 flyctl/cmd/fly_tokens_create.md
 rename flyctl/cmd/{main_tokens_create_deploy.md => fly_tokens_create_deploy.md} (86%)
 rename flyctl/cmd/{main_tokens_create_litefs-cloud.md => fly_tokens_create_litefs-cloud.md} (83%)
 rename flyctl/cmd/{main_tokens_create_machine-exec.md => fly_tokens_create_machine-exec.md} (89%)
 rename flyctl/cmd/{main_tokens_create_org.md => fly_tokens_create_org.md} (85%)
 rename flyctl/cmd/{main_tokens_create_readonly.md => fly_tokens_create_readonly.md} (85%)
 rename flyctl/cmd/{main_tokens_create_ssh.md => fly_tokens_create_ssh.md} (86%)
 rename flyctl/cmd/{main_tokens_debug.md => fly_tokens_debug.md} (85%)
 rename flyctl/cmd/{main_tokens_list.md => fly_tokens_list.md} (83%)
 rename flyctl/cmd/{main_tokens_revoke.md => fly_tokens_revoke.md} (73%)
 rename flyctl/cmd/{main_version.md => fly_version.md} (68%)
 rename flyctl/cmd/{main_version_upgrade.md => fly_version_upgrade.md} (75%)
 create mode 100644 flyctl/cmd/fly_volumes.md
 rename flyctl/cmd/{main_volumes_create.md => fly_volumes_create.md} (94%)
 rename flyctl/cmd/{main_volumes_destroy.md => fly_volumes_destroy.md} (82%)
 rename flyctl/cmd/{main_volumes_extend.md => fly_volumes_extend.md} (87%)
 rename flyctl/cmd/{main_volumes_fork.md => fly_volumes_fork.md} (93%)
 rename flyctl/cmd/{main_volumes_list.md => fly_volumes_list.md} (85%)
 rename flyctl/cmd/{main_volumes_show.md => fly_volumes_show.md} (81%)
 rename flyctl/cmd/{main_volumes_snapshots.md => fly_volumes_snapshots.md} (63%)
 rename flyctl/cmd/{main_volumes_snapshots_create.md => fly_volumes_snapshots_create.md} (68%)
 rename flyctl/cmd/{main_volumes_snapshots_list.md => fly_volumes_snapshots_list.md} (71%)
 rename flyctl/cmd/{main_volumes_update.md => fly_volumes_update.md} (86%)
 create mode 100644 flyctl/cmd/fly_wireguard.md
 rename flyctl/cmd/{main_wireguard_create.md => fly_wireguard_create.md} (67%)
 rename flyctl/cmd/{main_wireguard_list.md => fly_wireguard_list.md} (71%)
 rename flyctl/cmd/{main_wireguard_remove.md => fly_wireguard_remove.md} (69%)
 rename flyctl/cmd/{main_wireguard_reset.md => fly_wireguard_reset.md} (70%)
 create mode 100644 flyctl/cmd/fly_wireguard_token.md
 rename flyctl/cmd/{main_wireguard_token_create.md => fly_wireguard_token_create.md} (64%)
 rename flyctl/cmd/{main_wireguard_token_delete.md => fly_wireguard_token_delete.md} (66%)
 rename flyctl/cmd/{main_wireguard_token_list.md => fly_wireguard_token_list.md} (66%)
 rename flyctl/cmd/{main_wireguard_token_start.md => fly_wireguard_token_start.md} (65%)
 rename flyctl/cmd/{main_wireguard_token_update.md => fly_wireguard_token_update.md} (67%)
 rename flyctl/cmd/{main_wireguard_websockets.md => fly_wireguard_websockets.md} (68%)
 delete mode 100644 flyctl/cmd/main.md
 delete mode 100644 flyctl/cmd/main_apps.md
 delete mode 100644 flyctl/cmd/main_config.md
 delete mode 100644 flyctl/cmd/main_extensions.md
 delete mode 100644 flyctl/cmd/main_extensions_arcjet.md
 delete mode 100644 flyctl/cmd/main_extensions_enveloop.md
 delete mode 100644 flyctl/cmd/main_extensions_kafka.md
 delete mode 100644 flyctl/cmd/main_extensions_kubernetes.md
 delete mode 100644 flyctl/cmd/main_extensions_mysql.md
 delete mode 100644 flyctl/cmd/main_extensions_sentry.md
 delete mode 100644 flyctl/cmd/main_extensions_storage.md
 delete mode 100644 flyctl/cmd/main_extensions_supabase.md
 delete mode 100644 flyctl/cmd/main_extensions_vector.md
 delete mode 100644 flyctl/cmd/main_extensions_wafris.md
 delete mode 100644 flyctl/cmd/main_ips.md
 delete mode 100644 flyctl/cmd/main_litefs-cloud.md
 delete mode 100644 flyctl/cmd/main_litefs-cloud_clusters.md
 delete mode 100644 flyctl/cmd/main_machine.md
 delete mode 100644 flyctl/cmd/main_machine_egress-ip.md
 delete mode 100644 flyctl/cmd/main_mysql.md
 delete mode 100644 flyctl/cmd/main_orgs.md
 delete mode 100644 flyctl/cmd/main_platform.md
 delete mode 100644 flyctl/cmd/main_postgres.md
 delete mode 100644 flyctl/cmd/main_postgres_backup.md
 delete mode 100644 flyctl/cmd/main_redis.md
 delete mode 100644 flyctl/cmd/main_scale.md
 delete mode 100644 flyctl/cmd/main_secrets.md
 delete mode 100644 flyctl/cmd/main_settings.md
 delete mode 100644 flyctl/cmd/main_sftp.md
 delete mode 100644 flyctl/cmd/main_ssh.md
 delete mode 100644 flyctl/cmd/main_ssh_sftp.md
 delete mode 100644 flyctl/cmd/main_storage.md
 delete mode 100644 flyctl/cmd/main_tokens.md
 delete mode 100644 flyctl/cmd/main_tokens_create.md
 delete mode 100644 flyctl/cmd/main_volumes.md
 delete mode 100644 flyctl/cmd/main_wireguard.md
 delete mode 100644 flyctl/cmd/main_wireguard_token.md

diff --git a/flyctl/cmd/fly.md b/flyctl/cmd/fly.md
new file mode 100644
index 0000000000..b17951501c
--- /dev/null
+++ b/flyctl/cmd/fly.md
@@ -0,0 +1,64 @@
+This is flyctl, the Fly.io command line interface.
+
+## Usage
+~~~
+fly [flags]
+~~~
+
+## Available Commands
+* [agent](/docs/flyctl/agent/)	 - Commands that manage the Fly agent, a background process that manages flyctl wireguard connections
+* [apps](/docs/flyctl/apps/)	 - Manage apps.
+* [auth](/docs/flyctl/auth/)	 - Manage authentication
+* [certs](/docs/flyctl/certs/)	 - Manage certificates
+* [checks](/docs/flyctl/checks/)	 - Manage health checks
+* [config](/docs/flyctl/config/)	 - Manage an app's configuration
+* [console](/docs/flyctl/console/)	 - Run a console in a new or existing machine
+* [consul](/docs/flyctl/consul/)	 - Enable and manage Consul clusters
+* [dashboard](/docs/flyctl/dashboard/)	 - Open web browser on Fly Web UI for this app
+* [deploy](/docs/flyctl/deploy/)	 - Deploy Fly applications
+* [dig](/docs/flyctl/dig/)	 - Make DNS requests against Fly.io's internal DNS server
+* [docs](/docs/flyctl/docs/)	 - View Fly documentation
+* [doctor](/docs/flyctl/doctor/)	 - The DOCTOR command allows you to debug your Fly environment
+* [extensions](/docs/flyctl/extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
+* [image](/docs/flyctl/image/)	 - Manage app image
+* [incidents](/docs/flyctl/incidents/)	 - Show incidents
+* [ips](/docs/flyctl/ips/)	 - Manage IP addresses for apps
+* [jobs](/docs/flyctl/jobs/)	 - Show jobs at Fly.io
+* [launch](/docs/flyctl/launch/)	 - Create and configure a new app from source code or a Docker image
+* [litefs-cloud](/docs/flyctl/litefs-cloud/)	 - LiteFS Cloud management commands
+* [logs](/docs/flyctl/logs/)	 - View app logs
+* [machine](/docs/flyctl/machine/)	 - Manage Fly Machines.
+* [mysql](/docs/flyctl/mysql/)	 - Provision and manage MySQL database clusters
+* [orgs](/docs/flyctl/orgs/)	 - Commands for managing Fly organizations
+* [ping](/docs/flyctl/ping/)	 - Test connectivity with ICMP ping messages
+* [platform](/docs/flyctl/platform/)	 - Fly platform information
+* [postgres](/docs/flyctl/postgres/)	 - Manage Postgres clusters.
+* [proxy](/docs/flyctl/proxy/)	 - Proxies connections to a Fly Machine.
+* [redis](/docs/flyctl/redis/)	 - Launch and manage Redis databases managed by Upstash.com
+* [releases](/docs/flyctl/releases/)	 - List app releases
+* [scale](/docs/flyctl/scale/)	 - Scale app resources
+* [secrets](/docs/flyctl/secrets/)	 - Manage application secrets with the set and unset commands.
+* [services](/docs/flyctl/services/)	 - Show the application's services
+* [settings](/docs/flyctl/settings/)	 - Manage flyctl settings
+* [sftp](/docs/flyctl/sftp/)	 - Get or put files from a remote VM.
+* [ssh](/docs/flyctl/ssh/)	 - Use SSH to log into or run commands on Machines
+* [status](/docs/flyctl/status/)	 - Show app status
+* [storage](/docs/flyctl/storage/)	 - Provision and manage Tigris object storage buckets
+* [synthetics](/docs/flyctl/synthetics/)	 - Synthetic monitoring
+* [tokens](/docs/flyctl/tokens/)	 - Manage Fly.io API tokens
+* [version](/docs/flyctl/version/)	 - Show version information for the flyctl command
+* [volumes](/docs/flyctl/volumes/)	 - Manage Fly Volumes.
+* [wireguard](/docs/flyctl/wireguard/)	 - Commands that manage WireGuard peer connections
+
+## Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+  -h, --help                  help for fly
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+
diff --git a/flyctl/cmd/main_agent.md b/flyctl/cmd/fly_agent.md
similarity index 55%
rename from flyctl/cmd/main_agent.md
rename to flyctl/cmd/fly_agent.md
index 4306297cb5..300971f9c7 100644
--- a/flyctl/cmd/main_agent.md
+++ b/flyctl/cmd/fly_agent.md
@@ -5,15 +5,15 @@ Generally, the agent starts and stops automatically. These commands are useful f
 
 ## Usage
 ~~~
-main agent [command] [flags]
+fly agent [command] [flags]
 ~~~
 
 ## Available Commands
-* [ping](/docs/flyctl/main-agent-ping/)	 - Ping the Fly agent
-* [restart](/docs/flyctl/main-agent-restart/)	 - Restart the Fly agent
-* [run](/docs/flyctl/main-agent-run/)	 - Run the Fly agent in the foreground
-* [start](/docs/flyctl/main-agent-start/)	 - Start the Fly agent
-* [stop](/docs/flyctl/main-agent-stop/)	 - Stop the Fly agent
+* [ping](/docs/flyctl/agent-ping/)	 - Ping the Fly agent
+* [restart](/docs/flyctl/agent-restart/)	 - Restart the Fly agent
+* [run](/docs/flyctl/agent-run/)	 - Run the Fly agent in the foreground
+* [start](/docs/flyctl/agent-start/)	 - Start the Fly agent
+* [stop](/docs/flyctl/agent-stop/)	 - Stop the Fly agent
 
 ## Options
 
@@ -31,5 +31,5 @@ main agent [command] [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/main_agent_ping.md b/flyctl/cmd/fly_agent_ping.md
similarity index 65%
rename from flyctl/cmd/main_agent_ping.md
rename to flyctl/cmd/fly_agent_ping.md
index c97f143db6..a3e37bfd8f 100644
--- a/flyctl/cmd/main_agent_ping.md
+++ b/flyctl/cmd/fly_agent_ping.md
@@ -3,7 +3,7 @@ Ping the Fly agent
 
 ## Usage
 ~~~
-main agent ping [flags]
+fly agent ping [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main agent ping [flags]
 
 ## See Also
 
-* [main agent](/docs/flyctl/main-agent/)	 - Commands that manage the Fly agent, a background process that manages flyctl wireguard connections
+* [fly agent](/docs/flyctl/agent/)	 - Commands that manage the Fly agent, a background process that manages flyctl wireguard connections
 
diff --git a/flyctl/cmd/main_agent_restart.md b/flyctl/cmd/fly_agent_restart.md
similarity index 63%
rename from flyctl/cmd/main_agent_restart.md
rename to flyctl/cmd/fly_agent_restart.md
index 10edc16e3c..e819d75039 100644
--- a/flyctl/cmd/main_agent_restart.md
+++ b/flyctl/cmd/fly_agent_restart.md
@@ -3,7 +3,7 @@ Restart the Fly agent
 
 ## Usage
 ~~~
-main agent restart [flags]
+fly agent restart [flags]
 ~~~
 
 ## Options
@@ -22,5 +22,5 @@ main agent restart [flags]
 
 ## See Also
 
-* [main agent](/docs/flyctl/main-agent/)	 - Commands that manage the Fly agent, a background process that manages flyctl wireguard connections
+* [fly agent](/docs/flyctl/agent/)	 - Commands that manage the Fly agent, a background process that manages flyctl wireguard connections
 
diff --git a/flyctl/cmd/main_agent_run.md b/flyctl/cmd/fly_agent_run.md
similarity index 64%
rename from flyctl/cmd/main_agent_run.md
rename to flyctl/cmd/fly_agent_run.md
index 8709237e78..dfdf2aac81 100644
--- a/flyctl/cmd/main_agent_run.md
+++ b/flyctl/cmd/fly_agent_run.md
@@ -3,7 +3,7 @@ Run the Fly agent in the foreground
 
 ## Usage
 ~~~
-main agent run [flags]
+fly agent run [flags]
 ~~~
 
 ## Options
@@ -22,5 +22,5 @@ main agent run [flags]
 
 ## See Also
 
-* [main agent](/docs/flyctl/main-agent/)	 - Commands that manage the Fly agent, a background process that manages flyctl wireguard connections
+* [fly agent](/docs/flyctl/agent/)	 - Commands that manage the Fly agent, a background process that manages flyctl wireguard connections
 
diff --git a/flyctl/cmd/main_agent_start.md b/flyctl/cmd/fly_agent_start.md
similarity index 63%
rename from flyctl/cmd/main_agent_start.md
rename to flyctl/cmd/fly_agent_start.md
index 3041d44f17..f63e221300 100644
--- a/flyctl/cmd/main_agent_start.md
+++ b/flyctl/cmd/fly_agent_start.md
@@ -3,7 +3,7 @@ Start the Fly agent
 
 ## Usage
 ~~~
-main agent start [flags]
+fly agent start [flags]
 ~~~
 
 ## Options
@@ -22,5 +22,5 @@ main agent start [flags]
 
 ## See Also
 
-* [main agent](/docs/flyctl/main-agent/)	 - Commands that manage the Fly agent, a background process that manages flyctl wireguard connections
+* [fly agent](/docs/flyctl/agent/)	 - Commands that manage the Fly agent, a background process that manages flyctl wireguard connections
 
diff --git a/flyctl/cmd/main_agent_stop.md b/flyctl/cmd/fly_agent_stop.md
similarity index 63%
rename from flyctl/cmd/main_agent_stop.md
rename to flyctl/cmd/fly_agent_stop.md
index a29cb3bd55..88c47e7aca 100644
--- a/flyctl/cmd/main_agent_stop.md
+++ b/flyctl/cmd/fly_agent_stop.md
@@ -3,7 +3,7 @@ Stop the Fly agent
 
 ## Usage
 ~~~
-main agent stop [flags]
+fly agent stop [flags]
 ~~~
 
 ## Options
@@ -22,5 +22,5 @@ main agent stop [flags]
 
 ## See Also
 
-* [main agent](/docs/flyctl/main-agent/)	 - Commands that manage the Fly agent, a background process that manages flyctl wireguard connections
+* [fly agent](/docs/flyctl/agent/)	 - Commands that manage the Fly agent, a background process that manages flyctl wireguard connections
 
diff --git a/flyctl/cmd/fly_apps.md b/flyctl/cmd/fly_apps.md
new file mode 100644
index 0000000000..518cd8a29d
--- /dev/null
+++ b/flyctl/cmd/fly_apps.md
@@ -0,0 +1,35 @@
+Manage your Fly applications.
+
+## Usage
+~~~
+fly apps [command] [flags]
+~~~
+
+## Available Commands
+* [create](/docs/flyctl/apps-create/)	 - Create a new application.
+* [destroy](/docs/flyctl/apps-destroy/)	 - Permanently destroy one or more apps.
+* [errors](/docs/flyctl/apps-errors/)	 - View application errors on Sentry.io
+* [list](/docs/flyctl/apps-list/)	 - List applications.
+* [move](/docs/flyctl/apps-move/)	 - Move an app to another organization.
+* [open](/docs/flyctl/apps-open/)	 - Open browser to current deployed application
+* [releases](/docs/flyctl/apps-releases/)	 - List app releases
+* [restart](/docs/flyctl/apps-restart/)	 - Restart an application.
+
+## Options
+
+~~~
+  -h, --help   help for apps
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/main_apps_create.md b/flyctl/cmd/fly_apps_create.md
similarity index 88%
rename from flyctl/cmd/main_apps_create.md
rename to flyctl/cmd/fly_apps_create.md
index 2dc73a6332..b0f7f240bc 100644
--- a/flyctl/cmd/main_apps_create.md
+++ b/flyctl/cmd/fly_apps_create.md
@@ -4,7 +4,7 @@ fetch one with 'fly config save -a <app_name>'.
 
 ## Usage
 ~~~
-main apps create <app name> [flags]
+fly apps create <app name> [flags]
 ~~~
 
 ## Options
@@ -28,5 +28,5 @@ main apps create <app name> [flags]
 
 ## See Also
 
-* [main apps](/docs/flyctl/main-apps/)	 - Manage apps.
+* [fly apps](/docs/flyctl/apps/)	 - Manage apps.
 
diff --git a/flyctl/cmd/main_apps_destroy.md b/flyctl/cmd/fly_apps_destroy.md
similarity index 79%
rename from flyctl/cmd/main_apps_destroy.md
rename to flyctl/cmd/fly_apps_destroy.md
index 0d61acd130..6862feba62 100644
--- a/flyctl/cmd/main_apps_destroy.md
+++ b/flyctl/cmd/fly_apps_destroy.md
@@ -2,7 +2,7 @@ Delete one or more applications from the Fly platform.
 
 ## Usage
 ~~~
-main apps destroy <app name(s)> [flags]
+fly apps destroy <app name(s)> [flags]
 ~~~
 
 ## Options
@@ -22,5 +22,5 @@ main apps destroy <app name(s)> [flags]
 
 ## See Also
 
-* [main apps](/docs/flyctl/main-apps/)	 - Manage apps.
+* [fly apps](/docs/flyctl/apps/)	 - Manage apps.
 
diff --git a/flyctl/cmd/main_apps_errors.md b/flyctl/cmd/fly_apps_errors.md
similarity index 84%
rename from flyctl/cmd/main_apps_errors.md
rename to flyctl/cmd/fly_apps_errors.md
index af4ef60d64..f6dc7a6fe7 100644
--- a/flyctl/cmd/main_apps_errors.md
+++ b/flyctl/cmd/fly_apps_errors.md
@@ -2,7 +2,7 @@ View application errors on Sentry.io
 
 ## Usage
 ~~~
-main apps errors [flags]
+fly apps errors [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main apps errors [flags]
 
 ## See Also
 
-* [main apps](/docs/flyctl/main-apps/)	 - Manage apps.
+* [fly apps](/docs/flyctl/apps/)	 - Manage apps.
 
diff --git a/flyctl/cmd/main_apps_list.md b/flyctl/cmd/fly_apps_list.md
similarity index 89%
rename from flyctl/cmd/main_apps_list.md
rename to flyctl/cmd/fly_apps_list.md
index acc38612e2..aa0ef81529 100644
--- a/flyctl/cmd/main_apps_list.md
+++ b/flyctl/cmd/fly_apps_list.md
@@ -6,7 +6,7 @@ the name, owner (org), status, and date/time of latest deploy for each app.
 
 ## Usage
 ~~~
-main apps list [flags]
+fly apps list [flags]
 ~~~
 
 ## Options
@@ -28,5 +28,5 @@ main apps list [flags]
 
 ## See Also
 
-* [main apps](/docs/flyctl/main-apps/)	 - Manage apps.
+* [fly apps](/docs/flyctl/apps/)	 - Manage apps.
 
diff --git a/flyctl/cmd/main_apps_move.md b/flyctl/cmd/fly_apps_move.md
similarity index 87%
rename from flyctl/cmd/main_apps_move.md
rename to flyctl/cmd/fly_apps_move.md
index fc297ba203..8bcc3e4243 100644
--- a/flyctl/cmd/main_apps_move.md
+++ b/flyctl/cmd/fly_apps_move.md
@@ -4,7 +4,7 @@ For details, see https://fly.io/docs/apps/move-app-org/.
 
 ## Usage
 ~~~
-main apps move <app name> [flags]
+fly apps move <app name> [flags]
 ~~~
 
 ## Options
@@ -26,5 +26,5 @@ main apps move <app name> [flags]
 
 ## See Also
 
-* [main apps](/docs/flyctl/main-apps/)	 - Manage apps.
+* [fly apps](/docs/flyctl/apps/)	 - Manage apps.
 
diff --git a/flyctl/cmd/main_apps_open.md b/flyctl/cmd/fly_apps_open.md
similarity index 85%
rename from flyctl/cmd/main_apps_open.md
rename to flyctl/cmd/fly_apps_open.md
index 858a3a1252..3f409c64dc 100644
--- a/flyctl/cmd/main_apps_open.md
+++ b/flyctl/cmd/fly_apps_open.md
@@ -4,7 +4,7 @@ to the root URL of the deployed application.
 
 ## Usage
 ~~~
-main apps open [RELATIVE_URI] [flags]
+fly apps open [RELATIVE_URI] [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main apps open [RELATIVE_URI] [flags]
 
 ## See Also
 
-* [main apps](/docs/flyctl/main-apps/)	 - Manage apps.
+* [fly apps](/docs/flyctl/apps/)	 - Manage apps.
 
diff --git a/flyctl/cmd/main_apps_releases.md b/flyctl/cmd/fly_apps_releases.md
similarity index 88%
rename from flyctl/cmd/main_apps_releases.md
rename to flyctl/cmd/fly_apps_releases.md
index ffe07882ac..795110f9ac 100644
--- a/flyctl/cmd/main_apps_releases.md
+++ b/flyctl/cmd/fly_apps_releases.md
@@ -4,7 +4,7 @@ including type, when, success/fail and which user triggered the release.
 
 ## Usage
 ~~~
-main apps releases [flags]
+fly apps releases [flags]
 ~~~
 
 ## Options
@@ -27,5 +27,5 @@ main apps releases [flags]
 
 ## See Also
 
-* [main apps](/docs/flyctl/main-apps/)	 - Manage apps.
+* [fly apps](/docs/flyctl/apps/)	 - Manage apps.
 
diff --git a/flyctl/cmd/main_apps_restart.md b/flyctl/cmd/fly_apps_restart.md
similarity index 84%
rename from flyctl/cmd/main_apps_restart.md
rename to flyctl/cmd/fly_apps_restart.md
index 7dd95d614d..cd3ab947c7 100644
--- a/flyctl/cmd/main_apps_restart.md
+++ b/flyctl/cmd/fly_apps_restart.md
@@ -2,7 +2,7 @@ Restart an application. Perform a rolling restart against all running Machines.
 
 ## Usage
 ~~~
-main apps restart <app name> [flags]
+fly apps restart <app name> [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main apps restart <app name> [flags]
 
 ## See Also
 
-* [main apps](/docs/flyctl/main-apps/)	 - Manage apps.
+* [fly apps](/docs/flyctl/apps/)	 - Manage apps.
 
diff --git a/flyctl/cmd/main_auth.md b/flyctl/cmd/fly_auth.md
similarity index 51%
rename from flyctl/cmd/main_auth.md
rename to flyctl/cmd/fly_auth.md
index 0641b45f4a..849d2643f9 100644
--- a/flyctl/cmd/main_auth.md
+++ b/flyctl/cmd/fly_auth.md
@@ -5,15 +5,15 @@ If you do have an account, begin with the AUTH LOGIN subcommand.
 
 ## Usage
 ~~~
-main auth [command] [flags]
+fly auth [command] [flags]
 ~~~
 
 ## Available Commands
-* [docker](/docs/flyctl/main-auth-docker/)	 - Authenticate docker
-* [login](/docs/flyctl/main-auth-login/)	 - Log in a user
-* [logout](/docs/flyctl/main-auth-logout/)	 - Logs out the currently logged in user
-* [signup](/docs/flyctl/main-auth-signup/)	 - Create a new fly account
-* [whoami](/docs/flyctl/main-auth-whoami/)	 - Displays the users email address/service identity currently
+* [docker](/docs/flyctl/auth-docker/)	 - Authenticate docker
+* [login](/docs/flyctl/auth-login/)	 - Log in a user
+* [logout](/docs/flyctl/auth-logout/)	 - Logs out the currently logged in user
+* [signup](/docs/flyctl/auth-signup/)	 - Create a new fly account
+* [whoami](/docs/flyctl/auth-whoami/)	 - Displays the users email address/service identity currently
 authenticated and in use.
 
 
@@ -33,5 +33,5 @@ authenticated and in use.
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/main_auth_docker.md b/flyctl/cmd/fly_auth_docker.md
similarity index 82%
rename from flyctl/cmd/main_auth_docker.md
rename to flyctl/cmd/fly_auth_docker.md
index 4aab24b944..4a132ee79f 100644
--- a/flyctl/cmd/main_auth_docker.md
+++ b/flyctl/cmd/fly_auth_docker.md
@@ -5,7 +5,7 @@ the docker cli.
 
 ## Usage
 ~~~
-main auth docker [flags]
+fly auth docker [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main auth docker [flags]
 
 ## See Also
 
-* [main auth](/docs/flyctl/main-auth/)	 - Manage authentication
+* [fly auth](/docs/flyctl/auth/)	 - Manage authentication
 
diff --git a/flyctl/cmd/main_auth_login.md b/flyctl/cmd/fly_auth_login.md
similarity index 87%
rename from flyctl/cmd/main_auth_login.md
rename to flyctl/cmd/fly_auth_login.md
index d5275a2162..3c4c19c281 100644
--- a/flyctl/cmd/main_auth_login.md
+++ b/flyctl/cmd/fly_auth_login.md
@@ -5,7 +5,7 @@ browser-based authentication.
 
 ## Usage
 ~~~
-main auth login [flags]
+fly auth login [flags]
 ~~~
 
 ## Options
@@ -28,5 +28,5 @@ main auth login [flags]
 
 ## See Also
 
-* [main auth](/docs/flyctl/main-auth/)	 - Manage authentication
+* [fly auth](/docs/flyctl/auth/)	 - Manage authentication
 
diff --git a/flyctl/cmd/main_auth_logout.md b/flyctl/cmd/fly_auth_logout.md
similarity index 81%
rename from flyctl/cmd/main_auth_logout.md
rename to flyctl/cmd/fly_auth_logout.md
index 4cf1c1c76b..d833ab9fae 100644
--- a/flyctl/cmd/main_auth_logout.md
+++ b/flyctl/cmd/fly_auth_logout.md
@@ -4,7 +4,7 @@ To continue interacting with Fly, the user will need to log in again.
 
 ## Usage
 ~~~
-main auth logout [flags]
+fly auth logout [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main auth logout [flags]
 
 ## See Also
 
-* [main auth](/docs/flyctl/main-auth/)	 - Manage authentication
+* [fly auth](/docs/flyctl/auth/)	 - Manage authentication
 
diff --git a/flyctl/cmd/main_auth_signup.md b/flyctl/cmd/fly_auth_signup.md
similarity index 81%
rename from flyctl/cmd/main_auth_signup.md
rename to flyctl/cmd/fly_auth_signup.md
index 4927450a87..d2a621718b 100644
--- a/flyctl/cmd/main_auth_signup.md
+++ b/flyctl/cmd/fly_auth_signup.md
@@ -4,7 +4,7 @@ and sends the user to a form to provide appropriate credentials.
 
 ## Usage
 ~~~
-main auth signup [flags]
+fly auth signup [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main auth signup [flags]
 
 ## See Also
 
-* [main auth](/docs/flyctl/main-auth/)	 - Manage authentication
+* [fly auth](/docs/flyctl/auth/)	 - Manage authentication
 
diff --git a/flyctl/cmd/main_auth_whoami.md b/flyctl/cmd/fly_auth_whoami.md
similarity index 79%
rename from flyctl/cmd/main_auth_whoami.md
rename to flyctl/cmd/fly_auth_whoami.md
index ad6f2e58bc..735be91346 100644
--- a/flyctl/cmd/main_auth_whoami.md
+++ b/flyctl/cmd/fly_auth_whoami.md
@@ -2,7 +2,7 @@ Show the currently authenticated user
 
 ## Usage
 ~~~
-main auth whoami [flags]
+fly auth whoami [flags]
 ~~~
 
 ## Options
@@ -22,5 +22,5 @@ main auth whoami [flags]
 
 ## See Also
 
-* [main auth](/docs/flyctl/main-auth/)	 - Manage authentication
+* [fly auth](/docs/flyctl/auth/)	 - Manage authentication
 
diff --git a/flyctl/cmd/main_certs.md b/flyctl/cmd/fly_certs.md
similarity index 55%
rename from flyctl/cmd/main_certs.md
rename to flyctl/cmd/fly_certs.md
index c18b834fdc..512b8ed8f4 100644
--- a/flyctl/cmd/main_certs.md
+++ b/flyctl/cmd/fly_certs.md
@@ -5,15 +5,15 @@ certificates issued for the hostname/domain by Let's Encrypt.
 
 ## Usage
 ~~~
-main certs [command] [flags]
+fly certs [command] [flags]
 ~~~
 
 ## Available Commands
-* [add](/docs/flyctl/main-certs-add/)	 - Add a certificate for an app.
-* [check](/docs/flyctl/main-certs-check/)	 - Checks DNS configuration
-* [list](/docs/flyctl/main-certs-list/)	 - List certificates for an app.
-* [remove](/docs/flyctl/main-certs-remove/)	 - Removes a certificate from an app
-* [show](/docs/flyctl/main-certs-show/)	 - Shows certificate information
+* [add](/docs/flyctl/certs-add/)	 - Add a certificate for an app.
+* [check](/docs/flyctl/certs-check/)	 - Checks DNS configuration
+* [list](/docs/flyctl/certs-list/)	 - List certificates for an app.
+* [remove](/docs/flyctl/certs-remove/)	 - Removes a certificate from an app
+* [show](/docs/flyctl/certs-show/)	 - Shows certificate information
 
 ## Options
 
@@ -31,5 +31,5 @@ main certs [command] [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/main_certs_add.md b/flyctl/cmd/fly_certs_add.md
similarity index 83%
rename from flyctl/cmd/main_certs_add.md
rename to flyctl/cmd/fly_certs_add.md
index ba793e6854..a442a3b630 100644
--- a/flyctl/cmd/main_certs_add.md
+++ b/flyctl/cmd/fly_certs_add.md
@@ -3,7 +3,7 @@ as a parameter for the certificate.
 
 ## Usage
 ~~~
-main certs add <hostname> [flags]
+fly certs add <hostname> [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main certs add <hostname> [flags]
 
 ## See Also
 
-* [main certs](/docs/flyctl/main-certs/)	 - Manage certificates
+* [fly certs](/docs/flyctl/certs/)	 - Manage certificates
 
diff --git a/flyctl/cmd/main_certs_check.md b/flyctl/cmd/fly_certs_check.md
similarity index 84%
rename from flyctl/cmd/main_certs_check.md
rename to flyctl/cmd/fly_certs_check.md
index d44bb66eae..c11ccce499 100644
--- a/flyctl/cmd/main_certs_check.md
+++ b/flyctl/cmd/fly_certs_check.md
@@ -3,7 +3,7 @@ Displays results in the same format as the SHOW command.
 
 ## Usage
 ~~~
-main certs check <hostname> [flags]
+fly certs check <hostname> [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main certs check <hostname> [flags]
 
 ## See Also
 
-* [main certs](/docs/flyctl/main-certs/)	 - Manage certificates
+* [fly certs](/docs/flyctl/certs/)	 - Manage certificates
 
diff --git a/flyctl/cmd/main_certs_list.md b/flyctl/cmd/fly_certs_list.md
similarity index 84%
rename from flyctl/cmd/main_certs_list.md
rename to flyctl/cmd/fly_certs_list.md
index 89317dc036..6b06346213 100644
--- a/flyctl/cmd/main_certs_list.md
+++ b/flyctl/cmd/fly_certs_list.md
@@ -2,7 +2,7 @@ List the certificates associated with a deployed application.
 
 ## Usage
 ~~~
-main certs list [flags]
+fly certs list [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main certs list [flags]
 
 ## See Also
 
-* [main certs](/docs/flyctl/main-certs/)	 - Manage certificates
+* [fly certs](/docs/flyctl/certs/)	 - Manage certificates
 
diff --git a/flyctl/cmd/main_certs_remove.md b/flyctl/cmd/fly_certs_remove.md
similarity index 84%
rename from flyctl/cmd/main_certs_remove.md
rename to flyctl/cmd/fly_certs_remove.md
index 438ca4d7ac..cfaf5dc747 100644
--- a/flyctl/cmd/main_certs_remove.md
+++ b/flyctl/cmd/fly_certs_remove.md
@@ -3,7 +3,7 @@ as a parameter to locate the certificate.
 
 ## Usage
 ~~~
-main certs remove <hostname> [flags]
+fly certs remove <hostname> [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main certs remove <hostname> [flags]
 
 ## See Also
 
-* [main certs](/docs/flyctl/main-certs/)	 - Manage certificates
+* [fly certs](/docs/flyctl/certs/)	 - Manage certificates
 
diff --git a/flyctl/cmd/main_certs_show.md b/flyctl/cmd/fly_certs_show.md
similarity index 84%
rename from flyctl/cmd/main_certs_show.md
rename to flyctl/cmd/fly_certs_show.md
index 40d802c260..cc44167d91 100644
--- a/flyctl/cmd/main_certs_show.md
+++ b/flyctl/cmd/fly_certs_show.md
@@ -3,7 +3,7 @@ Takes hostname as a parameter to locate the certificate.
 
 ## Usage
 ~~~
-main certs show <hostname> [flags]
+fly certs show <hostname> [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main certs show <hostname> [flags]
 
 ## See Also
 
-* [main certs](/docs/flyctl/main-certs/)	 - Manage certificates
+* [fly certs](/docs/flyctl/certs/)	 - Manage certificates
 
diff --git a/flyctl/cmd/main_checks.md b/flyctl/cmd/fly_checks.md
similarity index 72%
rename from flyctl/cmd/main_checks.md
rename to flyctl/cmd/fly_checks.md
index 320f180892..8678b7fa93 100644
--- a/flyctl/cmd/main_checks.md
+++ b/flyctl/cmd/fly_checks.md
@@ -2,11 +2,11 @@ Manage health checks
 
 ## Usage
 ~~~
-main checks [command] [flags]
+fly checks [command] [flags]
 ~~~
 
 ## Available Commands
-* [list](/docs/flyctl/main-checks-list/)	 - List health checks
+* [list](/docs/flyctl/checks-list/)	 - List health checks
 
 ## Options
 
@@ -26,5 +26,5 @@ main checks [command] [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/main_checks_list.md b/flyctl/cmd/fly_checks_list.md
similarity index 84%
rename from flyctl/cmd/main_checks_list.md
rename to flyctl/cmd/fly_checks_list.md
index 5acd1a9956..03de119f94 100644
--- a/flyctl/cmd/main_checks_list.md
+++ b/flyctl/cmd/fly_checks_list.md
@@ -2,7 +2,7 @@ List health checks
 
 ## Usage
 ~~~
-main checks list [flags]
+fly checks list [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main checks list [flags]
 
 ## See Also
 
-* [main checks](/docs/flyctl/main-checks/)	 - Manage health checks
+* [fly checks](/docs/flyctl/checks/)	 - Manage health checks
 
diff --git a/flyctl/cmd/fly_config.md b/flyctl/cmd/fly_config.md
new file mode 100644
index 0000000000..eaa092335f
--- /dev/null
+++ b/flyctl/cmd/fly_config.md
@@ -0,0 +1,31 @@
+The CONFIG commands allow you to work with an application's configuration.
+
+## Usage
+~~~
+fly config [command] [flags]
+~~~
+
+## Available Commands
+* [env](/docs/flyctl/config-env/)	 - Display an app's runtime environment variables
+* [save](/docs/flyctl/config-save/)	 - Save an app's config file
+* [show](/docs/flyctl/config-show/)	 - Show an app's configuration
+* [validate](/docs/flyctl/config-validate/)	 - Validate an app's config file
+
+## Options
+
+~~~
+  -h, --help   help for config
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/main_config_env.md b/flyctl/cmd/fly_config_env.md
similarity index 83%
rename from flyctl/cmd/main_config_env.md
rename to flyctl/cmd/fly_config_env.md
index 856a6f0c49..8e3433ea19 100644
--- a/flyctl/cmd/main_config_env.md
+++ b/flyctl/cmd/fly_config_env.md
@@ -3,7 +3,7 @@ secrets and another for config file defined environment variables.
 
 ## Usage
 ~~~
-main config env [flags]
+fly config env [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main config env [flags]
 
 ## See Also
 
-* [main config](/docs/flyctl/main-config/)	 - Manage an app's configuration
+* [fly config](/docs/flyctl/config/)	 - Manage an app's configuration
 
diff --git a/flyctl/cmd/main_config_save.md b/flyctl/cmd/fly_config_save.md
similarity index 87%
rename from flyctl/cmd/main_config_save.md
rename to flyctl/cmd/fly_config_save.md
index e34fff55c2..e6f8715ab2 100644
--- a/flyctl/cmd/main_config_save.md
+++ b/flyctl/cmd/fly_config_save.md
@@ -3,7 +3,7 @@ retrieved from the Fly service and saved in TOML format.
 
 ## Usage
 ~~~
-main config save [flags]
+fly config save [flags]
 ~~~
 
 ## Options
@@ -27,5 +27,5 @@ main config save [flags]
 
 ## See Also
 
-* [main config](/docs/flyctl/main-config/)	 - Manage an app's configuration
+* [fly config](/docs/flyctl/config/)	 - Manage an app's configuration
 
diff --git a/flyctl/cmd/main_config_show.md b/flyctl/cmd/fly_config_show.md
similarity index 88%
rename from flyctl/cmd/main_config_show.md
rename to flyctl/cmd/fly_config_show.md
index 948cbd4e2b..1200a0ed8b 100644
--- a/flyctl/cmd/main_config_show.md
+++ b/flyctl/cmd/fly_config_show.md
@@ -3,7 +3,7 @@ in JSON format. The configuration data is retrieved from the Fly service.
 
 ## Usage
 ~~~
-main config show [flags]
+fly config show [flags]
 ~~~
 
 ## Options
@@ -27,5 +27,5 @@ main config show [flags]
 
 ## See Also
 
-* [main config](/docs/flyctl/main-config/)	 - Manage an app's configuration
+* [fly config](/docs/flyctl/config/)	 - Manage an app's configuration
 
diff --git a/flyctl/cmd/main_config_validate.md b/flyctl/cmd/fly_config_validate.md
similarity index 82%
rename from flyctl/cmd/main_config_validate.md
rename to flyctl/cmd/fly_config_validate.md
index cbd4c60f8d..bb4b8e4d80 100644
--- a/flyctl/cmd/main_config_validate.md
+++ b/flyctl/cmd/fly_config_validate.md
@@ -3,7 +3,7 @@ ensure it is correct and meaningful to the platform.
 
 ## Usage
 ~~~
-main config validate [flags]
+fly config validate [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main config validate [flags]
 
 ## See Also
 
-* [main config](/docs/flyctl/main-config/)	 - Manage an app's configuration
+* [fly config](/docs/flyctl/config/)	 - Manage an app's configuration
 
diff --git a/flyctl/cmd/main_console.md b/flyctl/cmd/fly_console.md
similarity index 97%
rename from flyctl/cmd/main_console.md
rename to flyctl/cmd/fly_console.md
index 03666dbf39..55d936aa35 100644
--- a/flyctl/cmd/main_console.md
+++ b/flyctl/cmd/fly_console.md
@@ -5,7 +5,7 @@ image. An existing machine can be used instead with --machine.
 
 ## Usage
 ~~~
-main console [flags]
+fly console [flags]
 ~~~
 
 ## Options
@@ -50,5 +50,5 @@ main console [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/main_consul.md b/flyctl/cmd/fly_consul.md
similarity index 56%
rename from flyctl/cmd/main_consul.md
rename to flyctl/cmd/fly_consul.md
index 75904ee48d..f01fc437d5 100644
--- a/flyctl/cmd/main_consul.md
+++ b/flyctl/cmd/fly_consul.md
@@ -2,12 +2,12 @@ Enable and manage Consul clusters
 
 ## Usage
 ~~~
-main consul [command] [flags]
+fly consul [command] [flags]
 ~~~
 
 ## Available Commands
-* [attach](/docs/flyctl/main-consul-attach/)	 - Attach Consul cluster to an app
-* [detach](/docs/flyctl/main-consul-detach/)	 - Detach Consul cluster from an app
+* [attach](/docs/flyctl/consul-attach/)	 - Attach Consul cluster to an app
+* [detach](/docs/flyctl/consul-detach/)	 - Detach Consul cluster from an app
 
 ## Options
 
@@ -25,5 +25,5 @@ main consul [command] [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/main_consul_attach.md b/flyctl/cmd/fly_consul_attach.md
similarity index 84%
rename from flyctl/cmd/main_consul_attach.md
rename to flyctl/cmd/fly_consul_attach.md
index 99598f1f88..1cb1301a7e 100644
--- a/flyctl/cmd/main_consul_attach.md
+++ b/flyctl/cmd/fly_consul_attach.md
@@ -2,7 +2,7 @@ Attach Consul cluster to an app, and setting the FLY_CONSUL_URL secret
 
 ## Usage
 ~~~
-main consul attach [flags]
+fly consul attach [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main consul attach [flags]
 
 ## See Also
 
-* [main consul](/docs/flyctl/main-consul/)	 - Enable and manage Consul clusters
+* [fly consul](/docs/flyctl/consul/)	 - Enable and manage Consul clusters
 
diff --git a/flyctl/cmd/main_consul_detach.md b/flyctl/cmd/fly_consul_detach.md
similarity index 84%
rename from flyctl/cmd/main_consul_detach.md
rename to flyctl/cmd/fly_consul_detach.md
index 3832d19169..3b9c7be1ba 100644
--- a/flyctl/cmd/main_consul_detach.md
+++ b/flyctl/cmd/fly_consul_detach.md
@@ -2,7 +2,7 @@ Detach Consul cluster from an app, and unsetting the FLY_CONSUL_URL secret
 
 ## Usage
 ~~~
-main consul detach [flags]
+fly consul detach [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main consul detach [flags]
 
 ## See Also
 
-* [main consul](/docs/flyctl/main-consul/)	 - Enable and manage Consul clusters
+* [fly consul](/docs/flyctl/consul/)	 - Enable and manage Consul clusters
 
diff --git a/flyctl/cmd/main_dashboard.md b/flyctl/cmd/fly_dashboard.md
similarity index 70%
rename from flyctl/cmd/main_dashboard.md
rename to flyctl/cmd/fly_dashboard.md
index b6631ec659..a1a8fb905a 100644
--- a/flyctl/cmd/main_dashboard.md
+++ b/flyctl/cmd/fly_dashboard.md
@@ -2,11 +2,11 @@ Open web browser on Fly Web UI for this application
 
 ## Usage
 ~~~
-main dashboard [flags]
+fly dashboard [flags]
 ~~~
 
 ## Available Commands
-* [metrics](/docs/flyctl/main-dashboard-metrics/)	 - Open web browser on Fly Web UI for this app's metrics
+* [metrics](/docs/flyctl/dashboard-metrics/)	 - Open web browser on Fly Web UI for this app's metrics
 
 ## Options
 
@@ -26,5 +26,5 @@ main dashboard [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/main_dashboard_metrics.md b/flyctl/cmd/fly_dashboard_metrics.md
similarity index 77%
rename from flyctl/cmd/main_dashboard_metrics.md
rename to flyctl/cmd/fly_dashboard_metrics.md
index c945e25afb..aeb1457c8f 100644
--- a/flyctl/cmd/main_dashboard_metrics.md
+++ b/flyctl/cmd/fly_dashboard_metrics.md
@@ -2,7 +2,7 @@ Open web browser on Fly Web UI for this application's metrics
 
 ## Usage
 ~~~
-main dashboard metrics [flags]
+fly dashboard metrics [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main dashboard metrics [flags]
 
 ## See Also
 
-* [main dashboard](/docs/flyctl/main-dashboard/)	 - Open web browser on Fly Web UI for this app
+* [fly dashboard](/docs/flyctl/dashboard/)	 - Open web browser on Fly Web UI for this app
 
diff --git a/flyctl/cmd/main_deploy.md b/flyctl/cmd/fly_deploy.md
similarity index 98%
rename from flyctl/cmd/main_deploy.md
rename to flyctl/cmd/fly_deploy.md
index 80a5966bdf..ef910447e4 100644
--- a/flyctl/cmd/main_deploy.md
+++ b/flyctl/cmd/fly_deploy.md
@@ -5,7 +5,7 @@ Deploy Fly applications from source or an image using a local or remote builder.
 
 ## Usage
 ~~~
-main deploy [WORKING_DIRECTORY] [flags]
+fly deploy [WORKING_DIRECTORY] [flags]
 ~~~
 
 ## Options
@@ -94,5 +94,5 @@ main deploy [WORKING_DIRECTORY] [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/main_dig.md b/flyctl/cmd/fly_dig.md
similarity index 91%
rename from flyctl/cmd/main_dig.md
rename to flyctl/cmd/fly_dig.md
index 9fd2afcc11..2f1d3ee2dd 100644
--- a/flyctl/cmd/main_dig.md
+++ b/flyctl/cmd/fly_dig.md
@@ -9,7 +9,7 @@ attached to the current app (you can pass an app in with -a <appname>).
 
 ## Usage
 ~~~
-main dig [type] <name> [flags]
+fly dig [type] <name> [flags]
 ~~~
 
 ## Options
@@ -32,5 +32,5 @@ main dig [type] <name> [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/main_docs.md b/flyctl/cmd/fly_docs.md
similarity index 81%
rename from flyctl/cmd/main_docs.md
rename to flyctl/cmd/fly_docs.md
index a9c645c495..5e73341c85 100644
--- a/flyctl/cmd/main_docs.md
+++ b/flyctl/cmd/fly_docs.md
@@ -4,7 +4,7 @@ browser to view the content.
 
 ## Usage
 ~~~
-main docs [flags]
+fly docs [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main docs [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/main_doctor.md b/flyctl/cmd/fly_doctor.md
similarity index 75%
rename from flyctl/cmd/main_doctor.md
rename to flyctl/cmd/fly_doctor.md
index 54be32abbc..bdf8f6f28f 100644
--- a/flyctl/cmd/main_doctor.md
+++ b/flyctl/cmd/fly_doctor.md
@@ -3,11 +3,11 @@ The DOCTOR command allows you to debug your Fly environment
 
 ## Usage
 ~~~
-main doctor [flags]
+fly doctor [flags]
 ~~~
 
 ## Available Commands
-* [diag](/docs/flyctl/main-doctor-diag/)	 - Send diagnostic information about your applications back to Fly.io.
+* [diag](/docs/flyctl/doctor-diag/)	 - Send diagnostic information about your applications back to Fly.io.
 
 ## Options
 
@@ -29,5 +29,5 @@ main doctor [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/main_doctor_diag.md b/flyctl/cmd/fly_doctor_diag.md
similarity index 85%
rename from flyctl/cmd/main_doctor_diag.md
rename to flyctl/cmd/fly_doctor_diag.md
index 902a3ba6cd..eed9a9f02e 100644
--- a/flyctl/cmd/main_doctor_diag.md
+++ b/flyctl/cmd/fly_doctor_diag.md
@@ -8,7 +8,7 @@ you might have associated with this application.
 
 ## Usage
 ~~~
-main doctor diag [flags]
+fly doctor diag [flags]
 ~~~
 
 ## Options
@@ -30,5 +30,5 @@ main doctor diag [flags]
 
 ## See Also
 
-* [main doctor](/docs/flyctl/main-doctor/)	 - The DOCTOR command allows you to debug your Fly environment
+* [fly doctor](/docs/flyctl/doctor/)	 - The DOCTOR command allows you to debug your Fly environment
 
diff --git a/flyctl/cmd/fly_extensions.md b/flyctl/cmd/fly_extensions.md
new file mode 100644
index 0000000000..61671f5849
--- /dev/null
+++ b/flyctl/cmd/fly_extensions.md
@@ -0,0 +1,37 @@
+Extensions are additional functionality that can be added to your Fly apps
+
+## Usage
+~~~
+fly extensions [command] [flags]
+~~~
+
+## Available Commands
+* [arcjet](/docs/flyctl/extensions-arcjet/)	 - Provision and manage Arcjet
+* [enveloop](/docs/flyctl/extensions-enveloop/)	 - Provision and manage Enveloop projects
+* [kafka](/docs/flyctl/extensions-kafka/)	 - Provision and manage Upstash Kafka clusters
+* [kubernetes](/docs/flyctl/extensions-kubernetes/)	 - Provision and manage Kubernetes clusters
+* [mysql](/docs/flyctl/extensions-mysql/)	 - Provision and manage MySQL database clusters
+* [sentry](/docs/flyctl/extensions-sentry/)	 - Setup a Sentry project for this app
+* [storage](/docs/flyctl/extensions-storage/)	 - Provision and manage Tigris object storage buckets
+* [supabase](/docs/flyctl/extensions-supabase/)	 - Provision and manage Supabase Postgres databases
+* [vector](/docs/flyctl/extensions-vector/)	 - Provision and manage Upstash Vector index
+* [wafris](/docs/flyctl/extensions-wafris/)	 - Provision and manage Wafris WAFs (Web Application Firewalls)
+
+## Options
+
+~~~
+  -h, --help   help for extensions
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/fly_extensions_arcjet.md b/flyctl/cmd/fly_extensions_arcjet.md
new file mode 100644
index 0000000000..92aa38071e
--- /dev/null
+++ b/flyctl/cmd/fly_extensions_arcjet.md
@@ -0,0 +1,33 @@
+Provision and manage Arcjet
+
+
+## Usage
+~~~
+fly extensions arcjet [command] [flags]
+~~~
+
+## Available Commands
+* [create](/docs/flyctl/extensions-arcjet-create/)	 - Create an Arcjet site
+* [dashboard](/docs/flyctl/extensions-arcjet-dashboard/)	 - Visit the Arcjet dashboard
+* [destroy](/docs/flyctl/extensions-arcjet-destroy/)	 - Permanently destroy an Arcjet site
+* [list](/docs/flyctl/extensions-arcjet-list/)	 - List your Arcjet sites
+* [status](/docs/flyctl/extensions-arcjet-status/)	 - Show details about an Arcjet site setup
+
+## Options
+
+~~~
+  -h, --help   help for arcjet
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly extensions](/docs/flyctl/extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
+
diff --git a/flyctl/cmd/main_extensions_arcjet_create.md b/flyctl/cmd/fly_extensions_arcjet_create.md
similarity index 82%
rename from flyctl/cmd/main_extensions_arcjet_create.md
rename to flyctl/cmd/fly_extensions_arcjet_create.md
index b4dbb48bc9..e9a1bfaf77 100644
--- a/flyctl/cmd/main_extensions_arcjet_create.md
+++ b/flyctl/cmd/fly_extensions_arcjet_create.md
@@ -3,7 +3,7 @@ Create an Arcjet site
 
 ## Usage
 ~~~
-main extensions arcjet create [flags]
+fly extensions arcjet create [flags]
 ~~~
 
 ## Options
@@ -28,5 +28,5 @@ main extensions arcjet create [flags]
 
 ## See Also
 
-* [main extensions arcjet](/docs/flyctl/main-extensions-arcjet/)	 - Provision and manage Arcjet
+* [fly extensions arcjet](/docs/flyctl/extensions-arcjet/)	 - Provision and manage Arcjet
 
diff --git a/flyctl/cmd/main_extensions_arcjet_dashboard.md b/flyctl/cmd/fly_extensions_arcjet_dashboard.md
similarity index 77%
rename from flyctl/cmd/main_extensions_arcjet_dashboard.md
rename to flyctl/cmd/fly_extensions_arcjet_dashboard.md
index 50d6d919c8..2c229d7565 100644
--- a/flyctl/cmd/main_extensions_arcjet_dashboard.md
+++ b/flyctl/cmd/fly_extensions_arcjet_dashboard.md
@@ -2,7 +2,7 @@ Visit the Arcjet dashboard
 
 ## Usage
 ~~~
-main extensions arcjet dashboard [site_name] [flags]
+fly extensions arcjet dashboard [site_name] [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main extensions arcjet dashboard [site_name] [flags]
 
 ## See Also
 
-* [main extensions arcjet](/docs/flyctl/main-extensions-arcjet/)	 - Provision and manage Arcjet
+* [fly extensions arcjet](/docs/flyctl/extensions-arcjet/)	 - Provision and manage Arcjet
 
diff --git a/flyctl/cmd/main_extensions_arcjet_destroy.md b/flyctl/cmd/fly_extensions_arcjet_destroy.md
similarity index 76%
rename from flyctl/cmd/main_extensions_arcjet_destroy.md
rename to flyctl/cmd/fly_extensions_arcjet_destroy.md
index aa423731a2..51aed26d75 100644
--- a/flyctl/cmd/main_extensions_arcjet_destroy.md
+++ b/flyctl/cmd/fly_extensions_arcjet_destroy.md
@@ -2,7 +2,7 @@ Permanently destroy an Arcjet site
 
 ## Usage
 ~~~
-main extensions arcjet destroy [name] [flags]
+fly extensions arcjet destroy [name] [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main extensions arcjet destroy [name] [flags]
 
 ## See Also
 
-* [main extensions arcjet](/docs/flyctl/main-extensions-arcjet/)	 - Provision and manage Arcjet
+* [fly extensions arcjet](/docs/flyctl/extensions-arcjet/)	 - Provision and manage Arcjet
 
diff --git a/flyctl/cmd/main_extensions_arcjet_list.md b/flyctl/cmd/fly_extensions_arcjet_list.md
similarity index 75%
rename from flyctl/cmd/main_extensions_arcjet_list.md
rename to flyctl/cmd/fly_extensions_arcjet_list.md
index 69011dd28e..8dc2040c79 100644
--- a/flyctl/cmd/main_extensions_arcjet_list.md
+++ b/flyctl/cmd/fly_extensions_arcjet_list.md
@@ -2,7 +2,7 @@ List your Arcjet sites
 
 ## Usage
 ~~~
-main extensions arcjet list [flags]
+fly extensions arcjet list [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main extensions arcjet list [flags]
 
 ## See Also
 
-* [main extensions arcjet](/docs/flyctl/main-extensions-arcjet/)	 - Provision and manage Arcjet
+* [fly extensions arcjet](/docs/flyctl/extensions-arcjet/)	 - Provision and manage Arcjet
 
diff --git a/flyctl/cmd/main_extensions_arcjet_status.md b/flyctl/cmd/fly_extensions_arcjet_status.md
similarity index 77%
rename from flyctl/cmd/main_extensions_arcjet_status.md
rename to flyctl/cmd/fly_extensions_arcjet_status.md
index 8ebea3e4a5..56b2637c19 100644
--- a/flyctl/cmd/main_extensions_arcjet_status.md
+++ b/flyctl/cmd/fly_extensions_arcjet_status.md
@@ -3,7 +3,7 @@ Show details about an Arcjet site setup
 
 ## Usage
 ~~~
-main extensions arcjet status [name] [flags]
+fly extensions arcjet status [name] [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main extensions arcjet status [name] [flags]
 
 ## See Also
 
-* [main extensions arcjet](/docs/flyctl/main-extensions-arcjet/)	 - Provision and manage Arcjet
+* [fly extensions arcjet](/docs/flyctl/extensions-arcjet/)	 - Provision and manage Arcjet
 
diff --git a/flyctl/cmd/fly_extensions_enveloop.md b/flyctl/cmd/fly_extensions_enveloop.md
new file mode 100644
index 0000000000..9a93b7d049
--- /dev/null
+++ b/flyctl/cmd/fly_extensions_enveloop.md
@@ -0,0 +1,33 @@
+Provision and manage Enveloop projects
+
+
+## Usage
+~~~
+fly extensions enveloop [command] [flags]
+~~~
+
+## Available Commands
+* [create](/docs/flyctl/extensions-enveloop-create/)	 - Provision an Enveloop project
+* [dashboard](/docs/flyctl/extensions-enveloop-dashboard/)	 - Open the Enveloop dashboard via your web browser
+* [destroy](/docs/flyctl/extensions-enveloop-destroy/)	 - Permanently destroy an Enveloop project
+* [list](/docs/flyctl/extensions-enveloop-list/)	 - List your Enveloop projects
+* [status](/docs/flyctl/extensions-enveloop-status/)	 - Show details about an Enveloop project
+
+## Options
+
+~~~
+  -h, --help   help for enveloop
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly extensions](/docs/flyctl/extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
+
diff --git a/flyctl/cmd/main_extensions_enveloop_create.md b/flyctl/cmd/fly_extensions_enveloop_create.md
similarity index 80%
rename from flyctl/cmd/main_extensions_enveloop_create.md
rename to flyctl/cmd/fly_extensions_enveloop_create.md
index 42e8701931..711294e797 100644
--- a/flyctl/cmd/main_extensions_enveloop_create.md
+++ b/flyctl/cmd/fly_extensions_enveloop_create.md
@@ -3,7 +3,7 @@ Provision an Enveloop project
 
 ## Usage
 ~~~
-main extensions enveloop create [flags]
+fly extensions enveloop create [flags]
 ~~~
 
 ## Options
@@ -28,5 +28,5 @@ main extensions enveloop create [flags]
 
 ## See Also
 
-* [main extensions enveloop](/docs/flyctl/main-extensions-enveloop/)	 - Provision and manage Enveloop projects
+* [fly extensions enveloop](/docs/flyctl/extensions-enveloop/)	 - Provision and manage Enveloop projects
 
diff --git a/flyctl/cmd/main_extensions_enveloop_dashboard.md b/flyctl/cmd/fly_extensions_enveloop_dashboard.md
similarity index 77%
rename from flyctl/cmd/main_extensions_enveloop_dashboard.md
rename to flyctl/cmd/fly_extensions_enveloop_dashboard.md
index 9e65df3538..7b395a2762 100644
--- a/flyctl/cmd/main_extensions_enveloop_dashboard.md
+++ b/flyctl/cmd/fly_extensions_enveloop_dashboard.md
@@ -2,7 +2,7 @@ Open the Enveloop dashboard via your web browser
 
 ## Usage
 ~~~
-main extensions enveloop dashboard [flags]
+fly extensions enveloop dashboard [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main extensions enveloop dashboard [flags]
 
 ## See Also
 
-* [main extensions enveloop](/docs/flyctl/main-extensions-enveloop/)	 - Provision and manage Enveloop projects
+* [fly extensions enveloop](/docs/flyctl/extensions-enveloop/)	 - Provision and manage Enveloop projects
 
diff --git a/flyctl/cmd/main_extensions_enveloop_destroy.md b/flyctl/cmd/fly_extensions_enveloop_destroy.md
similarity index 74%
rename from flyctl/cmd/main_extensions_enveloop_destroy.md
rename to flyctl/cmd/fly_extensions_enveloop_destroy.md
index 9869cf2562..20e9839da8 100644
--- a/flyctl/cmd/main_extensions_enveloop_destroy.md
+++ b/flyctl/cmd/fly_extensions_enveloop_destroy.md
@@ -2,7 +2,7 @@ Permanently destroy an Enveloop project
 
 ## Usage
 ~~~
-main extensions enveloop destroy [name] [flags]
+fly extensions enveloop destroy [name] [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main extensions enveloop destroy [name] [flags]
 
 ## See Also
 
-* [main extensions enveloop](/docs/flyctl/main-extensions-enveloop/)	 - Provision and manage Enveloop projects
+* [fly extensions enveloop](/docs/flyctl/extensions-enveloop/)	 - Provision and manage Enveloop projects
 
diff --git a/flyctl/cmd/main_extensions_enveloop_list.md b/flyctl/cmd/fly_extensions_enveloop_list.md
similarity index 72%
rename from flyctl/cmd/main_extensions_enveloop_list.md
rename to flyctl/cmd/fly_extensions_enveloop_list.md
index 390580fe1f..01774f15ba 100644
--- a/flyctl/cmd/main_extensions_enveloop_list.md
+++ b/flyctl/cmd/fly_extensions_enveloop_list.md
@@ -2,7 +2,7 @@ List your Enveloop projects
 
 ## Usage
 ~~~
-main extensions enveloop list [flags]
+fly extensions enveloop list [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main extensions enveloop list [flags]
 
 ## See Also
 
-* [main extensions enveloop](/docs/flyctl/main-extensions-enveloop/)	 - Provision and manage Enveloop projects
+* [fly extensions enveloop](/docs/flyctl/extensions-enveloop/)	 - Provision and manage Enveloop projects
 
diff --git a/flyctl/cmd/main_extensions_enveloop_status.md b/flyctl/cmd/fly_extensions_enveloop_status.md
similarity index 75%
rename from flyctl/cmd/main_extensions_enveloop_status.md
rename to flyctl/cmd/fly_extensions_enveloop_status.md
index 6d7569d6a6..87e05929ce 100644
--- a/flyctl/cmd/main_extensions_enveloop_status.md
+++ b/flyctl/cmd/fly_extensions_enveloop_status.md
@@ -3,7 +3,7 @@ Show details about an Enveloop project
 
 ## Usage
 ~~~
-main extensions enveloop status [name] [flags]
+fly extensions enveloop status [name] [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main extensions enveloop status [name] [flags]
 
 ## See Also
 
-* [main extensions enveloop](/docs/flyctl/main-extensions-enveloop/)	 - Provision and manage Enveloop projects
+* [fly extensions enveloop](/docs/flyctl/extensions-enveloop/)	 - Provision and manage Enveloop projects
 
diff --git a/flyctl/cmd/fly_extensions_kafka.md b/flyctl/cmd/fly_extensions_kafka.md
new file mode 100644
index 0000000000..6ab1467a8e
--- /dev/null
+++ b/flyctl/cmd/fly_extensions_kafka.md
@@ -0,0 +1,34 @@
+Provision and manage Upstash Kafka clusters
+
+
+## Usage
+~~~
+fly extensions kafka [command] [flags]
+~~~
+
+## Available Commands
+* [create](/docs/flyctl/extensions-kafka-create/)	 - Provision a Upstash Kafka cluster
+* [dashboard](/docs/flyctl/extensions-kafka-dashboard/)	 - Visit the Upstash Kafka dashboard on the Upstash web console
+* [destroy](/docs/flyctl/extensions-kafka-destroy/)	 - Permanently destroy an Upstash Kafka cluster
+* [list](/docs/flyctl/extensions-kafka-list/)	 - List your Upstash Kafka clusters
+* [status](/docs/flyctl/extensions-kafka-status/)	 - Show details about an Upstash Kafka cluster
+* [update](/docs/flyctl/extensions-kafka-update/)	 - Update an existing Upstash Kafka cluster
+
+## Options
+
+~~~
+  -h, --help   help for kafka
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly extensions](/docs/flyctl/extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
+
diff --git a/flyctl/cmd/main_extensions_kafka_create.md b/flyctl/cmd/fly_extensions_kafka_create.md
similarity index 81%
rename from flyctl/cmd/main_extensions_kafka_create.md
rename to flyctl/cmd/fly_extensions_kafka_create.md
index ee05c0ac41..5aca47f347 100644
--- a/flyctl/cmd/main_extensions_kafka_create.md
+++ b/flyctl/cmd/fly_extensions_kafka_create.md
@@ -3,7 +3,7 @@ Provision a Upstash Kafka cluster
 
 ## Usage
 ~~~
-main extensions kafka create [flags]
+fly extensions kafka create [flags]
 ~~~
 
 ## Options
@@ -28,5 +28,5 @@ main extensions kafka create [flags]
 
 ## See Also
 
-* [main extensions kafka](/docs/flyctl/main-extensions-kafka/)	 - Provision and manage Upstash Kafka clusters
+* [fly extensions kafka](/docs/flyctl/extensions-kafka/)	 - Provision and manage Upstash Kafka clusters
 
diff --git a/flyctl/cmd/main_extensions_kafka_dashboard.md b/flyctl/cmd/fly_extensions_kafka_dashboard.md
similarity index 78%
rename from flyctl/cmd/main_extensions_kafka_dashboard.md
rename to flyctl/cmd/fly_extensions_kafka_dashboard.md
index 2a10181ce3..e8c5c57719 100644
--- a/flyctl/cmd/main_extensions_kafka_dashboard.md
+++ b/flyctl/cmd/fly_extensions_kafka_dashboard.md
@@ -2,7 +2,7 @@ Visit the Upstash Kafka dashboard on the Upstash web console
 
 ## Usage
 ~~~
-main extensions kafka dashboard [flags]
+fly extensions kafka dashboard [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main extensions kafka dashboard [flags]
 
 ## See Also
 
-* [main extensions kafka](/docs/flyctl/main-extensions-kafka/)	 - Provision and manage Upstash Kafka clusters
+* [fly extensions kafka](/docs/flyctl/extensions-kafka/)	 - Provision and manage Upstash Kafka clusters
 
diff --git a/flyctl/cmd/main_extensions_kafka_destroy.md b/flyctl/cmd/fly_extensions_kafka_destroy.md
similarity index 75%
rename from flyctl/cmd/main_extensions_kafka_destroy.md
rename to flyctl/cmd/fly_extensions_kafka_destroy.md
index 7be8524209..09f2a007f3 100644
--- a/flyctl/cmd/main_extensions_kafka_destroy.md
+++ b/flyctl/cmd/fly_extensions_kafka_destroy.md
@@ -2,7 +2,7 @@ Permanently destroy an Upstash Kafka cluster
 
 ## Usage
 ~~~
-main extensions kafka destroy [name] [flags]
+fly extensions kafka destroy [name] [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main extensions kafka destroy [name] [flags]
 
 ## See Also
 
-* [main extensions kafka](/docs/flyctl/main-extensions-kafka/)	 - Provision and manage Upstash Kafka clusters
+* [fly extensions kafka](/docs/flyctl/extensions-kafka/)	 - Provision and manage Upstash Kafka clusters
 
diff --git a/flyctl/cmd/main_extensions_kafka_list.md b/flyctl/cmd/fly_extensions_kafka_list.md
similarity index 73%
rename from flyctl/cmd/main_extensions_kafka_list.md
rename to flyctl/cmd/fly_extensions_kafka_list.md
index d067a2d90f..244f7f5822 100644
--- a/flyctl/cmd/main_extensions_kafka_list.md
+++ b/flyctl/cmd/fly_extensions_kafka_list.md
@@ -2,7 +2,7 @@ List your Upstash Kafka clusters
 
 ## Usage
 ~~~
-main extensions kafka list [flags]
+fly extensions kafka list [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main extensions kafka list [flags]
 
 ## See Also
 
-* [main extensions kafka](/docs/flyctl/main-extensions-kafka/)	 - Provision and manage Upstash Kafka clusters
+* [fly extensions kafka](/docs/flyctl/extensions-kafka/)	 - Provision and manage Upstash Kafka clusters
 
diff --git a/flyctl/cmd/main_extensions_kafka_status.md b/flyctl/cmd/fly_extensions_kafka_status.md
similarity index 75%
rename from flyctl/cmd/main_extensions_kafka_status.md
rename to flyctl/cmd/fly_extensions_kafka_status.md
index 76c465432e..df5f9dd979 100644
--- a/flyctl/cmd/main_extensions_kafka_status.md
+++ b/flyctl/cmd/fly_extensions_kafka_status.md
@@ -3,7 +3,7 @@ Show details about an Upstash Kafka cluster
 
 ## Usage
 ~~~
-main extensions kafka status [name] [flags]
+fly extensions kafka status [name] [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main extensions kafka status [name] [flags]
 
 ## See Also
 
-* [main extensions kafka](/docs/flyctl/main-extensions-kafka/)	 - Provision and manage Upstash Kafka clusters
+* [fly extensions kafka](/docs/flyctl/extensions-kafka/)	 - Provision and manage Upstash Kafka clusters
 
diff --git a/flyctl/cmd/main_extensions_kafka_update.md b/flyctl/cmd/fly_extensions_kafka_update.md
similarity index 77%
rename from flyctl/cmd/main_extensions_kafka_update.md
rename to flyctl/cmd/fly_extensions_kafka_update.md
index 897cbda5aa..b5ec9c3c2e 100644
--- a/flyctl/cmd/main_extensions_kafka_update.md
+++ b/flyctl/cmd/fly_extensions_kafka_update.md
@@ -3,7 +3,7 @@ Update an existing Upstash Kafka cluster
 
 ## Usage
 ~~~
-main extensions kafka update <name> [flags]
+fly extensions kafka update <name> [flags]
 ~~~
 
 ## Options
@@ -26,5 +26,5 @@ main extensions kafka update <name> [flags]
 
 ## See Also
 
-* [main extensions kafka](/docs/flyctl/main-extensions-kafka/)	 - Provision and manage Upstash Kafka clusters
+* [fly extensions kafka](/docs/flyctl/extensions-kafka/)	 - Provision and manage Upstash Kafka clusters
 
diff --git a/flyctl/cmd/fly_extensions_kubernetes.md b/flyctl/cmd/fly_extensions_kubernetes.md
new file mode 100644
index 0000000000..8261da469b
--- /dev/null
+++ b/flyctl/cmd/fly_extensions_kubernetes.md
@@ -0,0 +1,32 @@
+Provision and manage Kubernetes clusters
+
+
+## Usage
+~~~
+fly extensions kubernetes [command] [flags]
+~~~
+
+## Available Commands
+* [create](/docs/flyctl/extensions-kubernetes-create/)	 - Provision a Kubernetes cluster for an organization
+* [destroy](/docs/flyctl/extensions-kubernetes-destroy/)	 - Permanently destroy a Kubernetes cluster
+* [list](/docs/flyctl/extensions-kubernetes-list/)	 - List your Kubernetes clusters
+* [save-kubeconfig](/docs/flyctl/extensions-kubernetes-save-kubeconfig/)	 - Save the kubeconfig file of your cluster
+
+## Options
+
+~~~
+  -h, --help   help for kubernetes
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly extensions](/docs/flyctl/extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
+
diff --git a/flyctl/cmd/main_extensions_kubernetes_create.md b/flyctl/cmd/fly_extensions_kubernetes_create.md
similarity index 78%
rename from flyctl/cmd/main_extensions_kubernetes_create.md
rename to flyctl/cmd/fly_extensions_kubernetes_create.md
index ca9ef183eb..825d7685da 100644
--- a/flyctl/cmd/main_extensions_kubernetes_create.md
+++ b/flyctl/cmd/fly_extensions_kubernetes_create.md
@@ -3,7 +3,7 @@ Provision a Kubernetes cluster for an organization
 
 ## Usage
 ~~~
-main extensions kubernetes create [flags]
+fly extensions kubernetes create [flags]
 ~~~
 
 ## Options
@@ -26,5 +26,5 @@ main extensions kubernetes create [flags]
 
 ## See Also
 
-* [main extensions kubernetes](/docs/flyctl/main-extensions-kubernetes/)	 - Provision and manage Kubernetes clusters
+* [fly extensions kubernetes](/docs/flyctl/extensions-kubernetes/)	 - Provision and manage Kubernetes clusters
 
diff --git a/flyctl/cmd/main_extensions_kubernetes_destroy.md b/flyctl/cmd/fly_extensions_kubernetes_destroy.md
similarity index 67%
rename from flyctl/cmd/main_extensions_kubernetes_destroy.md
rename to flyctl/cmd/fly_extensions_kubernetes_destroy.md
index ac89d8632d..b250813612 100644
--- a/flyctl/cmd/main_extensions_kubernetes_destroy.md
+++ b/flyctl/cmd/fly_extensions_kubernetes_destroy.md
@@ -2,7 +2,7 @@ Permanently destroy a Kubernetes cluster
 
 ## Usage
 ~~~
-main extensions kubernetes destroy [name] [flags]
+fly extensions kubernetes destroy [name] [flags]
 ~~~
 
 ## Options
@@ -22,5 +22,5 @@ main extensions kubernetes destroy [name] [flags]
 
 ## See Also
 
-* [main extensions kubernetes](/docs/flyctl/main-extensions-kubernetes/)	 - Provision and manage Kubernetes clusters
+* [fly extensions kubernetes](/docs/flyctl/extensions-kubernetes/)	 - Provision and manage Kubernetes clusters
 
diff --git a/flyctl/cmd/main_extensions_kubernetes_list.md b/flyctl/cmd/fly_extensions_kubernetes_list.md
similarity index 65%
rename from flyctl/cmd/main_extensions_kubernetes_list.md
rename to flyctl/cmd/fly_extensions_kubernetes_list.md
index afbef414d4..bbdf02c50c 100644
--- a/flyctl/cmd/main_extensions_kubernetes_list.md
+++ b/flyctl/cmd/fly_extensions_kubernetes_list.md
@@ -2,7 +2,7 @@ List your Kubernetes clusters
 
 ## Usage
 ~~~
-main extensions kubernetes list [flags]
+fly extensions kubernetes list [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main extensions kubernetes list [flags]
 
 ## See Also
 
-* [main extensions kubernetes](/docs/flyctl/main-extensions-kubernetes/)	 - Provision and manage Kubernetes clusters
+* [fly extensions kubernetes](/docs/flyctl/extensions-kubernetes/)	 - Provision and manage Kubernetes clusters
 
diff --git a/flyctl/cmd/main_extensions_kubernetes_save-kubeconfig.md b/flyctl/cmd/fly_extensions_kubernetes_save-kubeconfig.md
similarity index 68%
rename from flyctl/cmd/main_extensions_kubernetes_save-kubeconfig.md
rename to flyctl/cmd/fly_extensions_kubernetes_save-kubeconfig.md
index dc8225d975..09dd11820d 100644
--- a/flyctl/cmd/main_extensions_kubernetes_save-kubeconfig.md
+++ b/flyctl/cmd/fly_extensions_kubernetes_save-kubeconfig.md
@@ -2,7 +2,7 @@ Save the kubeconfig file of your cluster
 
 ## Usage
 ~~~
-main extensions kubernetes save-kubeconfig [cluster name] [flags]
+fly extensions kubernetes save-kubeconfig [cluster name] [flags]
 ~~~
 
 ## Options
@@ -22,5 +22,5 @@ main extensions kubernetes save-kubeconfig [cluster name] [flags]
 
 ## See Also
 
-* [main extensions kubernetes](/docs/flyctl/main-extensions-kubernetes/)	 - Provision and manage Kubernetes clusters
+* [fly extensions kubernetes](/docs/flyctl/extensions-kubernetes/)	 - Provision and manage Kubernetes clusters
 
diff --git a/flyctl/cmd/fly_extensions_mysql.md b/flyctl/cmd/fly_extensions_mysql.md
new file mode 100644
index 0000000000..daa2885059
--- /dev/null
+++ b/flyctl/cmd/fly_extensions_mysql.md
@@ -0,0 +1,33 @@
+Provision and manage MySQL database clusters
+
+
+## Usage
+~~~
+fly extensions mysql [command] [flags]
+~~~
+
+## Available Commands
+* [create](/docs/flyctl/extensions-mysql-create/)	 - Provision a MySQL database
+* [destroy](/docs/flyctl/extensions-mysql-destroy/)	 - Permanently destroy a MySQL database
+* [list](/docs/flyctl/extensions-mysql-list/)	 - List your MySQL databases
+* [status](/docs/flyctl/extensions-mysql-status/)	 - Show details about a MySQL database
+* [update](/docs/flyctl/extensions-mysql-update/)	 - Update an existing MySQL database
+
+## Options
+
+~~~
+  -h, --help   help for mysql
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly extensions](/docs/flyctl/extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
+
diff --git a/flyctl/cmd/main_extensions_mysql_create.md b/flyctl/cmd/fly_extensions_mysql_create.md
similarity index 86%
rename from flyctl/cmd/main_extensions_mysql_create.md
rename to flyctl/cmd/fly_extensions_mysql_create.md
index a71b3cd316..881843ac54 100644
--- a/flyctl/cmd/main_extensions_mysql_create.md
+++ b/flyctl/cmd/fly_extensions_mysql_create.md
@@ -3,7 +3,7 @@ Provision a MySQL database
 
 ## Usage
 ~~~
-main extensions mysql create [flags]
+fly extensions mysql create [flags]
 ~~~
 
 ## Options
@@ -32,5 +32,5 @@ main extensions mysql create [flags]
 
 ## See Also
 
-* [main extensions mysql](/docs/flyctl/main-extensions-mysql/)	 - Provision and manage MySQL database clusters
+* [fly extensions mysql](/docs/flyctl/extensions-mysql/)	 - Provision and manage MySQL database clusters
 
diff --git a/flyctl/cmd/main_extensions_mysql_destroy.md b/flyctl/cmd/fly_extensions_mysql_destroy.md
similarity index 75%
rename from flyctl/cmd/main_extensions_mysql_destroy.md
rename to flyctl/cmd/fly_extensions_mysql_destroy.md
index e1863f33c0..235cefb1aa 100644
--- a/flyctl/cmd/main_extensions_mysql_destroy.md
+++ b/flyctl/cmd/fly_extensions_mysql_destroy.md
@@ -2,7 +2,7 @@ Permanently destroy a MySQL database
 
 ## Usage
 ~~~
-main extensions mysql destroy [name] [flags]
+fly extensions mysql destroy [name] [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main extensions mysql destroy [name] [flags]
 
 ## See Also
 
-* [main extensions mysql](/docs/flyctl/main-extensions-mysql/)	 - Provision and manage MySQL database clusters
+* [fly extensions mysql](/docs/flyctl/extensions-mysql/)	 - Provision and manage MySQL database clusters
 
diff --git a/flyctl/cmd/main_extensions_mysql_list.md b/flyctl/cmd/fly_extensions_mysql_list.md
similarity index 73%
rename from flyctl/cmd/main_extensions_mysql_list.md
rename to flyctl/cmd/fly_extensions_mysql_list.md
index fe21c5da87..68f85b17f4 100644
--- a/flyctl/cmd/main_extensions_mysql_list.md
+++ b/flyctl/cmd/fly_extensions_mysql_list.md
@@ -2,7 +2,7 @@ List your MySQL databases
 
 ## Usage
 ~~~
-main extensions mysql list [flags]
+fly extensions mysql list [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main extensions mysql list [flags]
 
 ## See Also
 
-* [main extensions mysql](/docs/flyctl/main-extensions-mysql/)	 - Provision and manage MySQL database clusters
+* [fly extensions mysql](/docs/flyctl/extensions-mysql/)	 - Provision and manage MySQL database clusters
 
diff --git a/flyctl/cmd/main_extensions_mysql_status.md b/flyctl/cmd/fly_extensions_mysql_status.md
similarity index 75%
rename from flyctl/cmd/main_extensions_mysql_status.md
rename to flyctl/cmd/fly_extensions_mysql_status.md
index 90a24186dc..55dace95ad 100644
--- a/flyctl/cmd/main_extensions_mysql_status.md
+++ b/flyctl/cmd/fly_extensions_mysql_status.md
@@ -3,7 +3,7 @@ Show details about a MySQL database
 
 ## Usage
 ~~~
-main extensions mysql status [name] [flags]
+fly extensions mysql status [name] [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main extensions mysql status [name] [flags]
 
 ## See Also
 
-* [main extensions mysql](/docs/flyctl/main-extensions-mysql/)	 - Provision and manage MySQL database clusters
+* [fly extensions mysql](/docs/flyctl/extensions-mysql/)	 - Provision and manage MySQL database clusters
 
diff --git a/flyctl/cmd/main_extensions_mysql_update.md b/flyctl/cmd/fly_extensions_mysql_update.md
similarity index 81%
rename from flyctl/cmd/main_extensions_mysql_update.md
rename to flyctl/cmd/fly_extensions_mysql_update.md
index 85f384d3fc..775c2e07f3 100644
--- a/flyctl/cmd/main_extensions_mysql_update.md
+++ b/flyctl/cmd/fly_extensions_mysql_update.md
@@ -3,7 +3,7 @@ Update an existing MySQL database
 
 ## Usage
 ~~~
-main extensions mysql update <database_name> [flags]
+fly extensions mysql update <database_name> [flags]
 ~~~
 
 ## Options
@@ -29,5 +29,5 @@ main extensions mysql update <database_name> [flags]
 
 ## See Also
 
-* [main extensions mysql](/docs/flyctl/main-extensions-mysql/)	 - Provision and manage MySQL database clusters
+* [fly extensions mysql](/docs/flyctl/extensions-mysql/)	 - Provision and manage MySQL database clusters
 
diff --git a/flyctl/cmd/fly_extensions_sentry.md b/flyctl/cmd/fly_extensions_sentry.md
new file mode 100644
index 0000000000..4ee7a4c5b9
--- /dev/null
+++ b/flyctl/cmd/fly_extensions_sentry.md
@@ -0,0 +1,30 @@
+Setup a Sentry project for this app
+
+
+## Usage
+~~~
+fly extensions sentry [command] [flags]
+~~~
+
+## Available Commands
+* [create](/docs/flyctl/extensions-sentry-create/)	 - Provision a Sentry project for a Fly.io app
+* [dashboard](/docs/flyctl/extensions-sentry-dashboard/)	 - View application errors in the Sentry dashboard
+
+## Options
+
+~~~
+  -h, --help   help for sentry
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly extensions](/docs/flyctl/extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
+
diff --git a/flyctl/cmd/main_extensions_sentry_create.md b/flyctl/cmd/fly_extensions_sentry_create.md
similarity index 77%
rename from flyctl/cmd/main_extensions_sentry_create.md
rename to flyctl/cmd/fly_extensions_sentry_create.md
index 578e8db285..ec37008f27 100644
--- a/flyctl/cmd/main_extensions_sentry_create.md
+++ b/flyctl/cmd/fly_extensions_sentry_create.md
@@ -3,7 +3,7 @@ Provision a Sentry project for a Fly.io app
 
 ## Usage
 ~~~
-main extensions sentry create [flags]
+fly extensions sentry create [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main extensions sentry create [flags]
 
 ## See Also
 
-* [main extensions sentry](/docs/flyctl/main-extensions-sentry/)	 - Setup a Sentry project for this app
+* [fly extensions sentry](/docs/flyctl/extensions-sentry/)	 - Setup a Sentry project for this app
 
diff --git a/flyctl/cmd/main_extensions_sentry_dashboard.md b/flyctl/cmd/fly_extensions_sentry_dashboard.md
similarity index 76%
rename from flyctl/cmd/main_extensions_sentry_dashboard.md
rename to flyctl/cmd/fly_extensions_sentry_dashboard.md
index e69bb58ddb..120e548a36 100644
--- a/flyctl/cmd/main_extensions_sentry_dashboard.md
+++ b/flyctl/cmd/fly_extensions_sentry_dashboard.md
@@ -2,7 +2,7 @@ View application errors in the Sentry dashboard
 
 ## Usage
 ~~~
-main extensions sentry dashboard [flags]
+fly extensions sentry dashboard [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main extensions sentry dashboard [flags]
 
 ## See Also
 
-* [main extensions sentry](/docs/flyctl/main-extensions-sentry/)	 - Setup a Sentry project for this app
+* [fly extensions sentry](/docs/flyctl/extensions-sentry/)	 - Setup a Sentry project for this app
 
diff --git a/flyctl/cmd/fly_extensions_storage.md b/flyctl/cmd/fly_extensions_storage.md
new file mode 100644
index 0000000000..ac0cf117fe
--- /dev/null
+++ b/flyctl/cmd/fly_extensions_storage.md
@@ -0,0 +1,34 @@
+Provision and manage Tigris object storage buckets
+
+
+## Usage
+~~~
+fly extensions storage [command] [flags]
+~~~
+
+## Available Commands
+* [create](/docs/flyctl/extensions-storage-create/)	 - Provision a Tigris object storage bucket
+* [dashboard](/docs/flyctl/extensions-storage-dashboard/)	 - Visit the Tigris dashboard
+* [destroy](/docs/flyctl/extensions-storage-destroy/)	 - Permanently destroy a Tigris object storage bucket
+* [list](/docs/flyctl/extensions-storage-list/)	 - List your Tigris object storage buckets
+* [status](/docs/flyctl/extensions-storage-status/)	 - Show details about a Tigris storage bucket
+* [update](/docs/flyctl/extensions-storage-update/)	 - Update an existing Tigris object storage bucket
+
+## Options
+
+~~~
+  -h, --help   help for storage
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly extensions](/docs/flyctl/extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
+
diff --git a/flyctl/cmd/main_extensions_storage_create.md b/flyctl/cmd/fly_extensions_storage_create.md
similarity index 87%
rename from flyctl/cmd/main_extensions_storage_create.md
rename to flyctl/cmd/fly_extensions_storage_create.md
index b756f71d31..09e0f26fd9 100644
--- a/flyctl/cmd/main_extensions_storage_create.md
+++ b/flyctl/cmd/fly_extensions_storage_create.md
@@ -3,7 +3,7 @@ Provision a Tigris object storage bucket
 
 ## Usage
 ~~~
-main extensions storage create [flags]
+fly extensions storage create [flags]
 ~~~
 
 ## Options
@@ -34,5 +34,5 @@ main extensions storage create [flags]
 
 ## See Also
 
-* [main extensions storage](/docs/flyctl/main-extensions-storage/)	 - Provision and manage Tigris object storage buckets
+* [fly extensions storage](/docs/flyctl/extensions-storage/)	 - Provision and manage Tigris object storage buckets
 
diff --git a/flyctl/cmd/main_extensions_storage_dashboard.md b/flyctl/cmd/fly_extensions_storage_dashboard.md
similarity index 74%
rename from flyctl/cmd/main_extensions_storage_dashboard.md
rename to flyctl/cmd/fly_extensions_storage_dashboard.md
index 057412b30b..6563c8b063 100644
--- a/flyctl/cmd/main_extensions_storage_dashboard.md
+++ b/flyctl/cmd/fly_extensions_storage_dashboard.md
@@ -2,7 +2,7 @@ Visit the Tigris dashboard
 
 ## Usage
 ~~~
-main extensions storage dashboard [bucket_name] [flags]
+fly extensions storage dashboard [bucket_name] [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main extensions storage dashboard [bucket_name] [flags]
 
 ## See Also
 
-* [main extensions storage](/docs/flyctl/main-extensions-storage/)	 - Provision and manage Tigris object storage buckets
+* [fly extensions storage](/docs/flyctl/extensions-storage/)	 - Provision and manage Tigris object storage buckets
 
diff --git a/flyctl/cmd/main_extensions_storage_destroy.md b/flyctl/cmd/fly_extensions_storage_destroy.md
similarity index 72%
rename from flyctl/cmd/main_extensions_storage_destroy.md
rename to flyctl/cmd/fly_extensions_storage_destroy.md
index 956f2958fe..862efaac49 100644
--- a/flyctl/cmd/main_extensions_storage_destroy.md
+++ b/flyctl/cmd/fly_extensions_storage_destroy.md
@@ -2,7 +2,7 @@ Permanently destroy a Tigris object storage bucket
 
 ## Usage
 ~~~
-main extensions storage destroy [storage-bucket-name] [flags]
+fly extensions storage destroy [storage-bucket-name] [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main extensions storage destroy [storage-bucket-name] [flags]
 
 ## See Also
 
-* [main extensions storage](/docs/flyctl/main-extensions-storage/)	 - Provision and manage Tigris object storage buckets
+* [fly extensions storage](/docs/flyctl/extensions-storage/)	 - Provision and manage Tigris object storage buckets
 
diff --git a/flyctl/cmd/main_extensions_storage_list.md b/flyctl/cmd/fly_extensions_storage_list.md
similarity index 72%
rename from flyctl/cmd/main_extensions_storage_list.md
rename to flyctl/cmd/fly_extensions_storage_list.md
index f85b9eaf38..1f422cee13 100644
--- a/flyctl/cmd/main_extensions_storage_list.md
+++ b/flyctl/cmd/fly_extensions_storage_list.md
@@ -2,7 +2,7 @@ List your Tigris object storage buckets
 
 ## Usage
 ~~~
-main extensions storage list [flags]
+fly extensions storage list [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main extensions storage list [flags]
 
 ## See Also
 
-* [main extensions storage](/docs/flyctl/main-extensions-storage/)	 - Provision and manage Tigris object storage buckets
+* [fly extensions storage](/docs/flyctl/extensions-storage/)	 - Provision and manage Tigris object storage buckets
 
diff --git a/flyctl/cmd/main_extensions_storage_status.md b/flyctl/cmd/fly_extensions_storage_status.md
similarity index 74%
rename from flyctl/cmd/main_extensions_storage_status.md
rename to flyctl/cmd/fly_extensions_storage_status.md
index 4e3a00c3fd..148e4672ab 100644
--- a/flyctl/cmd/main_extensions_storage_status.md
+++ b/flyctl/cmd/fly_extensions_storage_status.md
@@ -3,7 +3,7 @@ Show details about a Tigris storage bucket
 
 ## Usage
 ~~~
-main extensions storage status [name] [flags]
+fly extensions storage status [name] [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main extensions storage status [name] [flags]
 
 ## See Also
 
-* [main extensions storage](/docs/flyctl/main-extensions-storage/)	 - Provision and manage Tigris object storage buckets
+* [fly extensions storage](/docs/flyctl/extensions-storage/)	 - Provision and manage Tigris object storage buckets
 
diff --git a/flyctl/cmd/main_extensions_storage_update.md b/flyctl/cmd/fly_extensions_storage_update.md
similarity index 87%
rename from flyctl/cmd/main_extensions_storage_update.md
rename to flyctl/cmd/fly_extensions_storage_update.md
index 65f8a2218f..47c9890060 100644
--- a/flyctl/cmd/main_extensions_storage_update.md
+++ b/flyctl/cmd/fly_extensions_storage_update.md
@@ -3,7 +3,7 @@ Update an existing Tigris object storage bucket
 
 ## Usage
 ~~~
-main extensions storage update <bucket_name> [flags]
+fly extensions storage update <bucket_name> [flags]
 ~~~
 
 ## Options
@@ -35,5 +35,5 @@ main extensions storage update <bucket_name> [flags]
 
 ## See Also
 
-* [main extensions storage](/docs/flyctl/main-extensions-storage/)	 - Provision and manage Tigris object storage buckets
+* [fly extensions storage](/docs/flyctl/extensions-storage/)	 - Provision and manage Tigris object storage buckets
 
diff --git a/flyctl/cmd/fly_extensions_supabase.md b/flyctl/cmd/fly_extensions_supabase.md
new file mode 100644
index 0000000000..a61ce23a80
--- /dev/null
+++ b/flyctl/cmd/fly_extensions_supabase.md
@@ -0,0 +1,33 @@
+Provision and manage Supabase Postgres databases
+
+
+## Usage
+~~~
+fly extensions supabase [command] [flags]
+~~~
+
+## Available Commands
+* [create](/docs/flyctl/extensions-supabase-create/)	 - Provision a Supabase Postgres database
+* [dashboard](/docs/flyctl/extensions-supabase-dashboard/)	 - Visit the Supabase database dashboard
+* [destroy](/docs/flyctl/extensions-supabase-destroy/)	 - Permanently destroy a Supabase database
+* [list](/docs/flyctl/extensions-supabase-list/)	 - List your Supabase databases
+* [status](/docs/flyctl/extensions-supabase-status/)	 - Show details about a Supabase Postgres database
+
+## Options
+
+~~~
+  -h, --help   help for supabase
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly extensions](/docs/flyctl/extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
+
diff --git a/flyctl/cmd/main_extensions_supabase_create.md b/flyctl/cmd/fly_extensions_supabase_create.md
similarity index 80%
rename from flyctl/cmd/main_extensions_supabase_create.md
rename to flyctl/cmd/fly_extensions_supabase_create.md
index fae13948cc..099f2e8a25 100644
--- a/flyctl/cmd/main_extensions_supabase_create.md
+++ b/flyctl/cmd/fly_extensions_supabase_create.md
@@ -3,7 +3,7 @@ Provision a Supabase Postgres database
 
 ## Usage
 ~~~
-main extensions supabase create [flags]
+fly extensions supabase create [flags]
 ~~~
 
 ## Options
@@ -28,5 +28,5 @@ main extensions supabase create [flags]
 
 ## See Also
 
-* [main extensions supabase](/docs/flyctl/main-extensions-supabase/)	 - Provision and manage Supabase Postgres databases
+* [fly extensions supabase](/docs/flyctl/extensions-supabase/)	 - Provision and manage Supabase Postgres databases
 
diff --git a/flyctl/cmd/main_extensions_supabase_dashboard.md b/flyctl/cmd/fly_extensions_supabase_dashboard.md
similarity index 74%
rename from flyctl/cmd/main_extensions_supabase_dashboard.md
rename to flyctl/cmd/fly_extensions_supabase_dashboard.md
index 13b03782b0..961cfb52b7 100644
--- a/flyctl/cmd/main_extensions_supabase_dashboard.md
+++ b/flyctl/cmd/fly_extensions_supabase_dashboard.md
@@ -2,7 +2,7 @@ Visit the Supabase database dashboard
 
 ## Usage
 ~~~
-main extensions supabase dashboard [database_name] [flags]
+fly extensions supabase dashboard [database_name] [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main extensions supabase dashboard [database_name] [flags]
 
 ## See Also
 
-* [main extensions supabase](/docs/flyctl/main-extensions-supabase/)	 - Provision and manage Supabase Postgres databases
+* [fly extensions supabase](/docs/flyctl/extensions-supabase/)	 - Provision and manage Supabase Postgres databases
 
diff --git a/flyctl/cmd/main_extensions_supabase_destroy.md b/flyctl/cmd/fly_extensions_supabase_destroy.md
similarity index 73%
rename from flyctl/cmd/main_extensions_supabase_destroy.md
rename to flyctl/cmd/fly_extensions_supabase_destroy.md
index 9641407800..9f4a2bacd6 100644
--- a/flyctl/cmd/main_extensions_supabase_destroy.md
+++ b/flyctl/cmd/fly_extensions_supabase_destroy.md
@@ -2,7 +2,7 @@ Permanently destroy a Supabase database
 
 ## Usage
 ~~~
-main extensions supabase destroy [name] [flags]
+fly extensions supabase destroy [name] [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main extensions supabase destroy [name] [flags]
 
 ## See Also
 
-* [main extensions supabase](/docs/flyctl/main-extensions-supabase/)	 - Provision and manage Supabase Postgres databases
+* [fly extensions supabase](/docs/flyctl/extensions-supabase/)	 - Provision and manage Supabase Postgres databases
 
diff --git a/flyctl/cmd/main_extensions_supabase_list.md b/flyctl/cmd/fly_extensions_supabase_list.md
similarity index 71%
rename from flyctl/cmd/main_extensions_supabase_list.md
rename to flyctl/cmd/fly_extensions_supabase_list.md
index 367326e30c..9fcf475bb1 100644
--- a/flyctl/cmd/main_extensions_supabase_list.md
+++ b/flyctl/cmd/fly_extensions_supabase_list.md
@@ -2,7 +2,7 @@ List your Supabase databases
 
 ## Usage
 ~~~
-main extensions supabase list [flags]
+fly extensions supabase list [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main extensions supabase list [flags]
 
 ## See Also
 
-* [main extensions supabase](/docs/flyctl/main-extensions-supabase/)	 - Provision and manage Supabase Postgres databases
+* [fly extensions supabase](/docs/flyctl/extensions-supabase/)	 - Provision and manage Supabase Postgres databases
 
diff --git a/flyctl/cmd/main_extensions_supabase_status.md b/flyctl/cmd/fly_extensions_supabase_status.md
similarity index 74%
rename from flyctl/cmd/main_extensions_supabase_status.md
rename to flyctl/cmd/fly_extensions_supabase_status.md
index ff526a0f4c..99352ffdc3 100644
--- a/flyctl/cmd/main_extensions_supabase_status.md
+++ b/flyctl/cmd/fly_extensions_supabase_status.md
@@ -3,7 +3,7 @@ Show details about a Supabase Postgres database
 
 ## Usage
 ~~~
-main extensions supabase status [name] [flags]
+fly extensions supabase status [name] [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main extensions supabase status [name] [flags]
 
 ## See Also
 
-* [main extensions supabase](/docs/flyctl/main-extensions-supabase/)	 - Provision and manage Supabase Postgres databases
+* [fly extensions supabase](/docs/flyctl/extensions-supabase/)	 - Provision and manage Supabase Postgres databases
 
diff --git a/flyctl/cmd/fly_extensions_vector.md b/flyctl/cmd/fly_extensions_vector.md
new file mode 100644
index 0000000000..f908cbcc40
--- /dev/null
+++ b/flyctl/cmd/fly_extensions_vector.md
@@ -0,0 +1,33 @@
+Provision and manage Upstash Vector index
+
+
+## Usage
+~~~
+fly extensions vector [command] [flags]
+~~~
+
+## Available Commands
+* [create](/docs/flyctl/extensions-vector-create/)	 - Provision a Upstash Vector index
+* [dashboard](/docs/flyctl/extensions-vector-dashboard/)	 - Visit the Upstash Vector dashboard on the Upstash web console
+* [destroy](/docs/flyctl/extensions-vector-destroy/)	 - Permanently destroy an Upstash Vector index
+* [list](/docs/flyctl/extensions-vector-list/)	 - List your Upstash Vector index
+* [status](/docs/flyctl/extensions-vector-status/)	 - Show details about an Upstash Vector index
+
+## Options
+
+~~~
+  -h, --help   help for vector
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly extensions](/docs/flyctl/extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
+
diff --git a/flyctl/cmd/main_extensions_vector_create.md b/flyctl/cmd/fly_extensions_vector_create.md
similarity index 81%
rename from flyctl/cmd/main_extensions_vector_create.md
rename to flyctl/cmd/fly_extensions_vector_create.md
index 1003102c20..38649b13fd 100644
--- a/flyctl/cmd/main_extensions_vector_create.md
+++ b/flyctl/cmd/fly_extensions_vector_create.md
@@ -3,7 +3,7 @@ Provision a Upstash Vector index
 
 ## Usage
 ~~~
-main extensions vector create [flags]
+fly extensions vector create [flags]
 ~~~
 
 ## Options
@@ -28,5 +28,5 @@ main extensions vector create [flags]
 
 ## See Also
 
-* [main extensions vector](/docs/flyctl/main-extensions-vector/)	 - Provision and manage Upstash Vector index
+* [fly extensions vector](/docs/flyctl/extensions-vector/)	 - Provision and manage Upstash Vector index
 
diff --git a/flyctl/cmd/main_extensions_vector_dashboard.md b/flyctl/cmd/fly_extensions_vector_dashboard.md
similarity index 78%
rename from flyctl/cmd/main_extensions_vector_dashboard.md
rename to flyctl/cmd/fly_extensions_vector_dashboard.md
index cc78850869..5381d4e31f 100644
--- a/flyctl/cmd/main_extensions_vector_dashboard.md
+++ b/flyctl/cmd/fly_extensions_vector_dashboard.md
@@ -2,7 +2,7 @@ Visit the Upstash Vector dashboard on the Upstash web console
 
 ## Usage
 ~~~
-main extensions vector dashboard [flags]
+fly extensions vector dashboard [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main extensions vector dashboard [flags]
 
 ## See Also
 
-* [main extensions vector](/docs/flyctl/main-extensions-vector/)	 - Provision and manage Upstash Vector index
+* [fly extensions vector](/docs/flyctl/extensions-vector/)	 - Provision and manage Upstash Vector index
 
diff --git a/flyctl/cmd/main_extensions_vector_destroy.md b/flyctl/cmd/fly_extensions_vector_destroy.md
similarity index 75%
rename from flyctl/cmd/main_extensions_vector_destroy.md
rename to flyctl/cmd/fly_extensions_vector_destroy.md
index 869761a0d3..7aa867cad3 100644
--- a/flyctl/cmd/main_extensions_vector_destroy.md
+++ b/flyctl/cmd/fly_extensions_vector_destroy.md
@@ -2,7 +2,7 @@ Permanently destroy an Upstash Vector index
 
 ## Usage
 ~~~
-main extensions vector destroy [name] [flags]
+fly extensions vector destroy [name] [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main extensions vector destroy [name] [flags]
 
 ## See Also
 
-* [main extensions vector](/docs/flyctl/main-extensions-vector/)	 - Provision and manage Upstash Vector index
+* [fly extensions vector](/docs/flyctl/extensions-vector/)	 - Provision and manage Upstash Vector index
 
diff --git a/flyctl/cmd/main_extensions_vector_list.md b/flyctl/cmd/fly_extensions_vector_list.md
similarity index 73%
rename from flyctl/cmd/main_extensions_vector_list.md
rename to flyctl/cmd/fly_extensions_vector_list.md
index 2f490be240..57a186ce56 100644
--- a/flyctl/cmd/main_extensions_vector_list.md
+++ b/flyctl/cmd/fly_extensions_vector_list.md
@@ -2,7 +2,7 @@ List your Upstash Vector index
 
 ## Usage
 ~~~
-main extensions vector list [flags]
+fly extensions vector list [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main extensions vector list [flags]
 
 ## See Also
 
-* [main extensions vector](/docs/flyctl/main-extensions-vector/)	 - Provision and manage Upstash Vector index
+* [fly extensions vector](/docs/flyctl/extensions-vector/)	 - Provision and manage Upstash Vector index
 
diff --git a/flyctl/cmd/main_extensions_vector_status.md b/flyctl/cmd/fly_extensions_vector_status.md
similarity index 75%
rename from flyctl/cmd/main_extensions_vector_status.md
rename to flyctl/cmd/fly_extensions_vector_status.md
index f033562ca4..35c693bb6e 100644
--- a/flyctl/cmd/main_extensions_vector_status.md
+++ b/flyctl/cmd/fly_extensions_vector_status.md
@@ -3,7 +3,7 @@ Show details about an Upstash Vector index
 
 ## Usage
 ~~~
-main extensions vector status [name] [flags]
+fly extensions vector status [name] [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main extensions vector status [name] [flags]
 
 ## See Also
 
-* [main extensions vector](/docs/flyctl/main-extensions-vector/)	 - Provision and manage Upstash Vector index
+* [fly extensions vector](/docs/flyctl/extensions-vector/)	 - Provision and manage Upstash Vector index
 
diff --git a/flyctl/cmd/fly_extensions_wafris.md b/flyctl/cmd/fly_extensions_wafris.md
new file mode 100644
index 0000000000..37d13aa72f
--- /dev/null
+++ b/flyctl/cmd/fly_extensions_wafris.md
@@ -0,0 +1,31 @@
+Provision and manage Wafris WAFs (Web Application Firewalls)
+
+
+## Usage
+~~~
+fly extensions wafris [command] [flags]
+~~~
+
+## Available Commands
+* [create](/docs/flyctl/extensions-wafris-create/)	 - Provision a Wafris WAF
+* [dashboard](/docs/flyctl/extensions-wafris-dashboard/)	 - Visit the Wafris dashboard
+* [destroy](/docs/flyctl/extensions-wafris-destroy/)	 - Permanently destroy a Wafris WAF
+
+## Options
+
+~~~
+  -h, --help   help for wafris
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly extensions](/docs/flyctl/extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
+
diff --git a/flyctl/cmd/main_extensions_wafris_create.md b/flyctl/cmd/fly_extensions_wafris_create.md
similarity index 79%
rename from flyctl/cmd/main_extensions_wafris_create.md
rename to flyctl/cmd/fly_extensions_wafris_create.md
index fae8e9051e..e4dc0664c7 100644
--- a/flyctl/cmd/main_extensions_wafris_create.md
+++ b/flyctl/cmd/fly_extensions_wafris_create.md
@@ -3,7 +3,7 @@ Provision a Wafris WAF
 
 ## Usage
 ~~~
-main extensions wafris create [flags]
+fly extensions wafris create [flags]
 ~~~
 
 ## Options
@@ -28,5 +28,5 @@ main extensions wafris create [flags]
 
 ## See Also
 
-* [main extensions wafris](/docs/flyctl/main-extensions-wafris/)	 - Provision and manage Wafris WAFs (Web Application Firewalls)
+* [fly extensions wafris](/docs/flyctl/extensions-wafris/)	 - Provision and manage Wafris WAFs (Web Application Firewalls)
 
diff --git a/flyctl/cmd/main_extensions_wafris_dashboard.md b/flyctl/cmd/fly_extensions_wafris_dashboard.md
similarity index 73%
rename from flyctl/cmd/main_extensions_wafris_dashboard.md
rename to flyctl/cmd/fly_extensions_wafris_dashboard.md
index 5c9c73fbab..528c7a447d 100644
--- a/flyctl/cmd/main_extensions_wafris_dashboard.md
+++ b/flyctl/cmd/fly_extensions_wafris_dashboard.md
@@ -2,7 +2,7 @@ Visit the Wafris dashboard
 
 ## Usage
 ~~~
-main extensions wafris dashboard [firewall_name] [flags]
+fly extensions wafris dashboard [firewall_name] [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main extensions wafris dashboard [firewall_name] [flags]
 
 ## See Also
 
-* [main extensions wafris](/docs/flyctl/main-extensions-wafris/)	 - Provision and manage Wafris WAFs (Web Application Firewalls)
+* [fly extensions wafris](/docs/flyctl/extensions-wafris/)	 - Provision and manage Wafris WAFs (Web Application Firewalls)
 
diff --git a/flyctl/cmd/main_extensions_wafris_destroy.md b/flyctl/cmd/fly_extensions_wafris_destroy.md
similarity index 72%
rename from flyctl/cmd/main_extensions_wafris_destroy.md
rename to flyctl/cmd/fly_extensions_wafris_destroy.md
index d23041ec4e..76950e3384 100644
--- a/flyctl/cmd/main_extensions_wafris_destroy.md
+++ b/flyctl/cmd/fly_extensions_wafris_destroy.md
@@ -2,7 +2,7 @@ Permanently destroy a Wafris WAF
 
 ## Usage
 ~~~
-main extensions wafris destroy [name] [flags]
+fly extensions wafris destroy [name] [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main extensions wafris destroy [name] [flags]
 
 ## See Also
 
-* [main extensions wafris](/docs/flyctl/main-extensions-wafris/)	 - Provision and manage Wafris WAFs (Web Application Firewalls)
+* [fly extensions wafris](/docs/flyctl/extensions-wafris/)	 - Provision and manage Wafris WAFs (Web Application Firewalls)
 
diff --git a/flyctl/cmd/main_image.md b/flyctl/cmd/fly_image.md
similarity index 54%
rename from flyctl/cmd/main_image.md
rename to flyctl/cmd/fly_image.md
index 70aa974c4a..9731838a5d 100644
--- a/flyctl/cmd/main_image.md
+++ b/flyctl/cmd/fly_image.md
@@ -3,12 +3,12 @@ Manage app image
 
 ## Usage
 ~~~
-main image [command] [flags]
+fly image [command] [flags]
 ~~~
 
 ## Available Commands
-* [show](/docs/flyctl/main-image-show/)	 - Show image details.
-* [update](/docs/flyctl/main-image-update/)	 - Updates the app's image to the latest available version.
+* [show](/docs/flyctl/image-show/)	 - Show image details.
+* [update](/docs/flyctl/image-update/)	 - Updates the app's image to the latest available version.
 
 ## Options
 
@@ -26,5 +26,5 @@ main image [command] [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/main_image_show.md b/flyctl/cmd/fly_image_show.md
similarity index 83%
rename from flyctl/cmd/main_image_show.md
rename to flyctl/cmd/fly_image_show.md
index b6a8153b4b..5011a6b377 100644
--- a/flyctl/cmd/main_image_show.md
+++ b/flyctl/cmd/fly_image_show.md
@@ -3,7 +3,7 @@ Show image details.
 
 ## Usage
 ~~~
-main image show [flags]
+fly image show [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main image show [flags]
 
 ## See Also
 
-* [main image](/docs/flyctl/main-image/)	 - Manage app image
+* [fly image](/docs/flyctl/image/)	 - Manage app image
 
diff --git a/flyctl/cmd/main_image_update.md b/flyctl/cmd/fly_image_update.md
similarity index 89%
rename from flyctl/cmd/main_image_update.md
rename to flyctl/cmd/fly_image_update.md
index 398eb47410..c6df54c5ec 100644
--- a/flyctl/cmd/main_image_update.md
+++ b/flyctl/cmd/fly_image_update.md
@@ -3,7 +3,7 @@ The update will perform a rolling restart against each Machine, which may result
 
 ## Usage
 ~~~
-main image update [flags]
+fly image update [flags]
 ~~~
 
 ## Options
@@ -27,5 +27,5 @@ main image update [flags]
 
 ## See Also
 
-* [main image](/docs/flyctl/main-image/)	 - Manage app image
+* [fly image](/docs/flyctl/image/)	 - Manage app image
 
diff --git a/flyctl/cmd/main_incidents.md b/flyctl/cmd/fly_incidents.md
similarity index 59%
rename from flyctl/cmd/main_incidents.md
rename to flyctl/cmd/fly_incidents.md
index db70936dee..463c10cd1f 100644
--- a/flyctl/cmd/main_incidents.md
+++ b/flyctl/cmd/fly_incidents.md
@@ -2,12 +2,12 @@ Show incidents that may be affecting your organization.
 
 ## Usage
 ~~~
-main incidents [command] [flags]
+fly incidents [command] [flags]
 ~~~
 
 ## Available Commands
-* [hosts](/docs/flyctl/main-incidents-hosts/)	 - Show hosts' incidents
-* [list](/docs/flyctl/main-incidents-list/)	 - List active incidents.
+* [hosts](/docs/flyctl/incidents-hosts/)	 - Show hosts' incidents
+* [list](/docs/flyctl/incidents-list/)	 - List active incidents.
 
 ## Options
 
@@ -25,5 +25,5 @@ main incidents [command] [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/main_incidents_hosts.md b/flyctl/cmd/fly_incidents_hosts.md
similarity index 62%
rename from flyctl/cmd/main_incidents_hosts.md
rename to flyctl/cmd/fly_incidents_hosts.md
index d5abe30dab..280775fc55 100644
--- a/flyctl/cmd/main_incidents_hosts.md
+++ b/flyctl/cmd/fly_incidents_hosts.md
@@ -2,11 +2,11 @@ Show hosts' incidents affecting applications
 
 ## Usage
 ~~~
-main incidents hosts [command] [flags]
+fly incidents hosts [command] [flags]
 ~~~
 
 ## Available Commands
-* [list](/docs/flyctl/main-incidents-hosts-list/)	 - List hosts' issues affecting the application
+* [list](/docs/flyctl/incidents-hosts-list/)	 - List hosts' issues affecting the application
 
 ## Options
 
@@ -24,5 +24,5 @@ main incidents hosts [command] [flags]
 
 ## See Also
 
-* [main incidents](/docs/flyctl/main-incidents/)	 - Show incidents
+* [fly incidents](/docs/flyctl/incidents/)	 - Show incidents
 
diff --git a/flyctl/cmd/main_incidents_hosts_list.md b/flyctl/cmd/fly_incidents_hosts_list.md
similarity index 79%
rename from flyctl/cmd/main_incidents_hosts_list.md
rename to flyctl/cmd/fly_incidents_hosts_list.md
index 12f738fc99..9ab41efe6b 100644
--- a/flyctl/cmd/main_incidents_hosts_list.md
+++ b/flyctl/cmd/fly_incidents_hosts_list.md
@@ -2,7 +2,7 @@ List hosts' issues affecting the application
 
 ## Usage
 ~~~
-main incidents hosts list [flags]
+fly incidents hosts list [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main incidents hosts list [flags]
 
 ## See Also
 
-* [main incidents hosts](/docs/flyctl/main-incidents-hosts/)	 - Show hosts' incidents
+* [fly incidents hosts](/docs/flyctl/incidents-hosts/)	 - Show hosts' incidents
 
diff --git a/flyctl/cmd/main_incidents_list.md b/flyctl/cmd/fly_incidents_list.md
similarity index 85%
rename from flyctl/cmd/main_incidents_list.md
rename to flyctl/cmd/fly_incidents_list.md
index 337b2a25fe..5747a0b639 100644
--- a/flyctl/cmd/main_incidents_list.md
+++ b/flyctl/cmd/fly_incidents_list.md
@@ -2,7 +2,7 @@ List the active incidents that may be affecting your apps or deployments.
 
 ## Usage
 ~~~
-main incidents list [flags]
+fly incidents list [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main incidents list [flags]
 
 ## See Also
 
-* [main incidents](/docs/flyctl/main-incidents/)	 - Show incidents
+* [fly incidents](/docs/flyctl/incidents/)	 - Show incidents
 
diff --git a/flyctl/cmd/fly_ips.md b/flyctl/cmd/fly_ips.md
new file mode 100644
index 0000000000..372d148688
--- /dev/null
+++ b/flyctl/cmd/fly_ips.md
@@ -0,0 +1,32 @@
+Commands for managing IP addresses associated with an application
+
+## Usage
+~~~
+fly ips [command] [flags]
+~~~
+
+## Available Commands
+* [allocate-v4](/docs/flyctl/ips-allocate-v4/)	 - Allocate an IPv4 address
+* [allocate-v6](/docs/flyctl/ips-allocate-v6/)	 - Allocate an IPv6 address
+* [list](/docs/flyctl/ips-list/)	 - List allocated IP addresses
+* [private](/docs/flyctl/ips-private/)	 - List instances private IP addresses
+* [release](/docs/flyctl/ips-release/)	 - Release IP addresses
+
+## Options
+
+~~~
+  -h, --help   help for ips
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/main_ips_allocate-v4.md b/flyctl/cmd/fly_ips_allocate-v4.md
similarity index 86%
rename from flyctl/cmd/main_ips_allocate-v4.md
rename to flyctl/cmd/fly_ips_allocate-v4.md
index a998e7ae1c..0c39402cb4 100644
--- a/flyctl/cmd/main_ips_allocate-v4.md
+++ b/flyctl/cmd/fly_ips_allocate-v4.md
@@ -2,7 +2,7 @@ Allocates an IPv4 address to the application
 
 ## Usage
 ~~~
-main ips allocate-v4 [flags]
+fly ips allocate-v4 [flags]
 ~~~
 
 ## Options
@@ -26,5 +26,5 @@ main ips allocate-v4 [flags]
 
 ## See Also
 
-* [main ips](/docs/flyctl/main-ips/)	 - Manage IP addresses for apps
+* [fly ips](/docs/flyctl/ips/)	 - Manage IP addresses for apps
 
diff --git a/flyctl/cmd/main_ips_allocate-v6.md b/flyctl/cmd/fly_ips_allocate-v6.md
similarity index 87%
rename from flyctl/cmd/main_ips_allocate-v6.md
rename to flyctl/cmd/fly_ips_allocate-v6.md
index 435951f323..a73f966250 100644
--- a/flyctl/cmd/main_ips_allocate-v6.md
+++ b/flyctl/cmd/fly_ips_allocate-v6.md
@@ -2,7 +2,7 @@ Allocates an IPv6 address to the application
 
 ## Usage
 ~~~
-main ips allocate-v6 [flags]
+fly ips allocate-v6 [flags]
 ~~~
 
 ## Options
@@ -27,5 +27,5 @@ main ips allocate-v6 [flags]
 
 ## See Also
 
-* [main ips](/docs/flyctl/main-ips/)	 - Manage IP addresses for apps
+* [fly ips](/docs/flyctl/ips/)	 - Manage IP addresses for apps
 
diff --git a/flyctl/cmd/main_ips_list.md b/flyctl/cmd/fly_ips_list.md
similarity index 83%
rename from flyctl/cmd/main_ips_list.md
rename to flyctl/cmd/fly_ips_list.md
index ceea6648aa..64d6e9119c 100644
--- a/flyctl/cmd/main_ips_list.md
+++ b/flyctl/cmd/fly_ips_list.md
@@ -2,7 +2,7 @@ Lists the IP addresses allocated to the application
 
 ## Usage
 ~~~
-main ips list [flags]
+fly ips list [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main ips list [flags]
 
 ## See Also
 
-* [main ips](/docs/flyctl/main-ips/)	 - Manage IP addresses for apps
+* [fly ips](/docs/flyctl/ips/)	 - Manage IP addresses for apps
 
diff --git a/flyctl/cmd/main_ips_private.md b/flyctl/cmd/fly_ips_private.md
similarity index 84%
rename from flyctl/cmd/main_ips_private.md
rename to flyctl/cmd/fly_ips_private.md
index c815d4c1d3..0144001d71 100644
--- a/flyctl/cmd/main_ips_private.md
+++ b/flyctl/cmd/fly_ips_private.md
@@ -2,7 +2,7 @@ List instances private IP addresses, accessible from within the Fly network
 
 ## Usage
 ~~~
-main ips private [flags]
+fly ips private [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main ips private [flags]
 
 ## See Also
 
-* [main ips](/docs/flyctl/main-ips/)	 - Manage IP addresses for apps
+* [fly ips](/docs/flyctl/ips/)	 - Manage IP addresses for apps
 
diff --git a/flyctl/cmd/main_ips_release.md b/flyctl/cmd/fly_ips_release.md
similarity index 79%
rename from flyctl/cmd/main_ips_release.md
rename to flyctl/cmd/fly_ips_release.md
index 97549ca8c6..3c5a19ba41 100644
--- a/flyctl/cmd/main_ips_release.md
+++ b/flyctl/cmd/fly_ips_release.md
@@ -2,7 +2,7 @@ Releases one or more IP addresses from the application
 
 ## Usage
 ~~~
-main ips release [flags] ADDRESS ADDRESS ...
+fly ips release [flags] ADDRESS ADDRESS ...
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main ips release [flags] ADDRESS ADDRESS ...
 
 ## See Also
 
-* [main ips](/docs/flyctl/main-ips/)	 - Manage IP addresses for apps
+* [fly ips](/docs/flyctl/ips/)	 - Manage IP addresses for apps
 
diff --git a/flyctl/cmd/main_jobs.md b/flyctl/cmd/fly_jobs.md
similarity index 71%
rename from flyctl/cmd/main_jobs.md
rename to flyctl/cmd/fly_jobs.md
index 8306a5413c..e672df0a14 100644
--- a/flyctl/cmd/main_jobs.md
+++ b/flyctl/cmd/fly_jobs.md
@@ -2,11 +2,11 @@ Show jobs at Fly.io, including maybe ones you should apply to
 
 ## Usage
 ~~~
-main jobs [flags]
+fly jobs [flags]
 ~~~
 
 ## Available Commands
-* [open](/docs/flyctl/main-jobs-open/)	 - Open fly.io/jobs
+* [open](/docs/flyctl/jobs-open/)	 - Open fly.io/jobs
 
 ## Options
 
@@ -24,5 +24,5 @@ main jobs [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/main_jobs_open.md b/flyctl/cmd/fly_jobs_open.md
similarity index 78%
rename from flyctl/cmd/main_jobs_open.md
rename to flyctl/cmd/fly_jobs_open.md
index 7d5f08bf6b..8459b1d256 100644
--- a/flyctl/cmd/main_jobs_open.md
+++ b/flyctl/cmd/fly_jobs_open.md
@@ -2,7 +2,7 @@ Open browser to https://fly.io/jobs/
 
 ## Usage
 ~~~
-main jobs open [flags]
+fly jobs open [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main jobs open [flags]
 
 ## See Also
 
-* [main jobs](/docs/flyctl/main-jobs/)	 - Show jobs at Fly.io
+* [fly jobs](/docs/flyctl/jobs/)	 - Show jobs at Fly.io
 
diff --git a/flyctl/cmd/main_launch.md b/flyctl/cmd/fly_launch.md
similarity index 99%
rename from flyctl/cmd/main_launch.md
rename to flyctl/cmd/fly_launch.md
index 538b9d54b3..5ba3eb9eac 100644
--- a/flyctl/cmd/main_launch.md
+++ b/flyctl/cmd/fly_launch.md
@@ -2,7 +2,7 @@ Create and configure a new app from source code or a Docker image.  Options pass
 
 ## Usage
 ~~~
-main launch [flags]
+fly launch [flags]
 ~~~
 
 ## Options
@@ -106,5 +106,5 @@ main launch [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/fly_litefs-cloud.md b/flyctl/cmd/fly_litefs-cloud.md
new file mode 100644
index 0000000000..a39858a7d5
--- /dev/null
+++ b/flyctl/cmd/fly_litefs-cloud.md
@@ -0,0 +1,33 @@
+Commands for managing LiteFS Cloud databases
+
+## Usage
+~~~
+fly litefs-cloud [command] [flags]
+~~~
+
+## Available Commands
+* [clusters](/docs/flyctl/litefs-cloud-clusters/)	 - Manage LiteFS Cloud clusters
+* [export](/docs/flyctl/litefs-cloud-export/)	 - Export LiteFS Cloud database
+* [import](/docs/flyctl/litefs-cloud-import/)	 - Import SQLite database into LiteFS Cloud
+* [regions](/docs/flyctl/litefs-cloud-regions/)	 - List LiteFS Cloud regions
+* [restore](/docs/flyctl/litefs-cloud-restore/)	 - Restore LiteFS Cloud database
+* [status](/docs/flyctl/litefs-cloud-status/)	 - Show LiteFS Cloud cluster status
+
+## Options
+
+~~~
+  -h, --help   help for litefs-cloud
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/fly_litefs-cloud_clusters.md b/flyctl/cmd/fly_litefs-cloud_clusters.md
new file mode 100644
index 0000000000..78f33dcfc3
--- /dev/null
+++ b/flyctl/cmd/fly_litefs-cloud_clusters.md
@@ -0,0 +1,31 @@
+"Commands for managing LiteFS Cloud clusters"
+
+
+## Usage
+~~~
+fly litefs-cloud clusters [command] [flags]
+~~~
+
+## Available Commands
+* [create](/docs/flyctl/litefs-cloud-clusters-create/)	 - Creates a LiteFS Cloud cluster
+* [destroy](/docs/flyctl/litefs-cloud-clusters-destroy/)	 - Delete a LiteFS Cloud cluster
+* [list](/docs/flyctl/litefs-cloud-clusters-list/)	 - Show LiteFS Cloud clusters
+
+## Options
+
+~~~
+  -h, --help   help for clusters
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly litefs-cloud](/docs/flyctl/litefs-cloud/)	 - LiteFS Cloud management commands
+
diff --git a/flyctl/cmd/main_litefs-cloud_clusters_create.md b/flyctl/cmd/fly_litefs-cloud_clusters_create.md
similarity index 75%
rename from flyctl/cmd/main_litefs-cloud_clusters_create.md
rename to flyctl/cmd/fly_litefs-cloud_clusters_create.md
index 7e0c86aeca..9d5ffd9f9b 100644
--- a/flyctl/cmd/main_litefs-cloud_clusters_create.md
+++ b/flyctl/cmd/fly_litefs-cloud_clusters_create.md
@@ -2,7 +2,7 @@ Creates a new LiteFS Cloud cluster.
 
 ## Usage
 ~~~
-main litefs-cloud clusters create CLUSTERNAME [flags]
+fly litefs-cloud clusters create CLUSTERNAME [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main litefs-cloud clusters create CLUSTERNAME [flags]
 
 ## See Also
 
-* [main litefs-cloud clusters](/docs/flyctl/main-litefs-cloud-clusters/)	 - Manage LiteFS Cloud clusters
+* [fly litefs-cloud clusters](/docs/flyctl/litefs-cloud-clusters/)	 - Manage LiteFS Cloud clusters
 
diff --git a/flyctl/cmd/main_litefs-cloud_clusters_destroy.md b/flyctl/cmd/fly_litefs-cloud_clusters_destroy.md
similarity index 73%
rename from flyctl/cmd/main_litefs-cloud_clusters_destroy.md
rename to flyctl/cmd/fly_litefs-cloud_clusters_destroy.md
index c2e3c6f2db..1eda076771 100644
--- a/flyctl/cmd/main_litefs-cloud_clusters_destroy.md
+++ b/flyctl/cmd/fly_litefs-cloud_clusters_destroy.md
@@ -2,7 +2,7 @@ Permanently deletes a LiteFS Cloud cluster.
 
 ## Usage
 ~~~
-main litefs-cloud clusters destroy [flags]
+fly litefs-cloud clusters destroy [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main litefs-cloud clusters destroy [flags]
 
 ## See Also
 
-* [main litefs-cloud clusters](/docs/flyctl/main-litefs-cloud-clusters/)	 - Manage LiteFS Cloud clusters
+* [fly litefs-cloud clusters](/docs/flyctl/litefs-cloud-clusters/)	 - Manage LiteFS Cloud clusters
 
diff --git a/flyctl/cmd/main_litefs-cloud_clusters_list.md b/flyctl/cmd/fly_litefs-cloud_clusters_list.md
similarity index 78%
rename from flyctl/cmd/main_litefs-cloud_clusters_list.md
rename to flyctl/cmd/fly_litefs-cloud_clusters_list.md
index f7b212ae45..349a9c973c 100644
--- a/flyctl/cmd/main_litefs-cloud_clusters_list.md
+++ b/flyctl/cmd/fly_litefs-cloud_clusters_list.md
@@ -2,7 +2,7 @@ Lists the LiteFS Cloud clusters in the organization.
 
 ## Usage
 ~~~
-main litefs-cloud clusters list [flags]
+fly litefs-cloud clusters list [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main litefs-cloud clusters list [flags]
 
 ## See Also
 
-* [main litefs-cloud clusters](/docs/flyctl/main-litefs-cloud-clusters/)	 - Manage LiteFS Cloud clusters
+* [fly litefs-cloud clusters](/docs/flyctl/litefs-cloud-clusters/)	 - Manage LiteFS Cloud clusters
 
diff --git a/flyctl/cmd/main_litefs-cloud_export.md b/flyctl/cmd/fly_litefs-cloud_export.md
similarity index 83%
rename from flyctl/cmd/main_litefs-cloud_export.md
rename to flyctl/cmd/fly_litefs-cloud_export.md
index 0e36ab3da4..16c18c214a 100644
--- a/flyctl/cmd/main_litefs-cloud_export.md
+++ b/flyctl/cmd/fly_litefs-cloud_export.md
@@ -2,7 +2,7 @@ Exports the current state of the database to a file.
 
 ## Usage
 ~~~
-main litefs-cloud export [flags]
+fly litefs-cloud export [flags]
 ~~~
 
 ## Options
@@ -27,5 +27,5 @@ main litefs-cloud export [flags]
 
 ## See Also
 
-* [main litefs-cloud](/docs/flyctl/main-litefs-cloud/)	 - LiteFS Cloud management commands
+* [fly litefs-cloud](/docs/flyctl/litefs-cloud/)	 - LiteFS Cloud management commands
 
diff --git a/flyctl/cmd/main_litefs-cloud_import.md b/flyctl/cmd/fly_litefs-cloud_import.md
similarity index 82%
rename from flyctl/cmd/main_litefs-cloud_import.md
rename to flyctl/cmd/fly_litefs-cloud_import.md
index 756270c7d7..02c2d8ab66 100644
--- a/flyctl/cmd/main_litefs-cloud_import.md
+++ b/flyctl/cmd/fly_litefs-cloud_import.md
@@ -2,7 +2,7 @@ Imports a local SQLite database into a LiteFS Cloud cluster.
 
 ## Usage
 ~~~
-main litefs-cloud import [flags]
+fly litefs-cloud import [flags]
 ~~~
 
 ## Options
@@ -26,5 +26,5 @@ main litefs-cloud import [flags]
 
 ## See Also
 
-* [main litefs-cloud](/docs/flyctl/main-litefs-cloud/)	 - LiteFS Cloud management commands
+* [fly litefs-cloud](/docs/flyctl/litefs-cloud/)	 - LiteFS Cloud management commands
 
diff --git a/flyctl/cmd/main_litefs-cloud_regions.md b/flyctl/cmd/fly_litefs-cloud_regions.md
similarity index 72%
rename from flyctl/cmd/main_litefs-cloud_regions.md
rename to flyctl/cmd/fly_litefs-cloud_regions.md
index 3c8cb4c56c..8537451acc 100644
--- a/flyctl/cmd/main_litefs-cloud_regions.md
+++ b/flyctl/cmd/fly_litefs-cloud_regions.md
@@ -2,7 +2,7 @@ View a list of LiteFS Cloud regions
 
 ## Usage
 ~~~
-main litefs-cloud regions [flags]
+fly litefs-cloud regions [flags]
 ~~~
 
 ## Options
@@ -22,5 +22,5 @@ main litefs-cloud regions [flags]
 
 ## See Also
 
-* [main litefs-cloud](/docs/flyctl/main-litefs-cloud/)	 - LiteFS Cloud management commands
+* [fly litefs-cloud](/docs/flyctl/litefs-cloud/)	 - LiteFS Cloud management commands
 
diff --git a/flyctl/cmd/main_litefs-cloud_restore.md b/flyctl/cmd/fly_litefs-cloud_restore.md
similarity index 82%
rename from flyctl/cmd/main_litefs-cloud_restore.md
rename to flyctl/cmd/fly_litefs-cloud_restore.md
index 4d818ac9dd..614e75e958 100644
--- a/flyctl/cmd/main_litefs-cloud_restore.md
+++ b/flyctl/cmd/fly_litefs-cloud_restore.md
@@ -2,7 +2,7 @@ Restores a LiteFS Cloud database to a previous state.
 
 ## Usage
 ~~~
-main litefs-cloud restore [flags]
+fly litefs-cloud restore [flags]
 ~~~
 
 ## Options
@@ -26,5 +26,5 @@ main litefs-cloud restore [flags]
 
 ## See Also
 
-* [main litefs-cloud](/docs/flyctl/main-litefs-cloud/)	 - LiteFS Cloud management commands
+* [fly litefs-cloud](/docs/flyctl/litefs-cloud/)	 - LiteFS Cloud management commands
 
diff --git a/flyctl/cmd/main_litefs-cloud_status.md b/flyctl/cmd/fly_litefs-cloud_status.md
similarity index 79%
rename from flyctl/cmd/main_litefs-cloud_status.md
rename to flyctl/cmd/fly_litefs-cloud_status.md
index fae3dec6cb..85f2918861 100644
--- a/flyctl/cmd/main_litefs-cloud_status.md
+++ b/flyctl/cmd/fly_litefs-cloud_status.md
@@ -2,7 +2,7 @@ Lists the databases in the cluster with their replication position.
 
 ## Usage
 ~~~
-main litefs-cloud status [flags]
+fly litefs-cloud status [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main litefs-cloud status [flags]
 
 ## See Also
 
-* [main litefs-cloud](/docs/flyctl/main-litefs-cloud/)	 - LiteFS Cloud management commands
+* [fly litefs-cloud](/docs/flyctl/litefs-cloud/)	 - LiteFS Cloud management commands
 
diff --git a/flyctl/cmd/main_logs.md b/flyctl/cmd/fly_logs.md
similarity index 91%
rename from flyctl/cmd/main_logs.md
rename to flyctl/cmd/fly_logs.md
index abd548444b..0b02575200 100644
--- a/flyctl/cmd/main_logs.md
+++ b/flyctl/cmd/fly_logs.md
@@ -10,7 +10,7 @@ Use --no-tail to only fetch the logs in the buffer.
 
 ## Usage
 ~~~
-main logs [flags]
+fly logs [flags]
 ~~~
 
 ## Options
@@ -35,5 +35,5 @@ main logs [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/fly_machine.md b/flyctl/cmd/fly_machine.md
new file mode 100644
index 0000000000..b777be2948
--- /dev/null
+++ b/flyctl/cmd/fly_machine.md
@@ -0,0 +1,47 @@
+Manage Fly Machines. Fly Machines are super-fast, lightweight VMs that can be created,
+and then quickly started and stopped as needed with flyctl commands or with the
+Machines REST fly.
+
+## Usage
+~~~
+fly machine [command] [flags]
+~~~
+
+## Available Commands
+* [api-proxy](/docs/flyctl/machine-api-proxy/)	 - Establish a proxy to the Machine API through a Wireguard tunnel for local connections
+* [clone](/docs/flyctl/machine-clone/)	 - Clone a Fly Machine
+* [cordon](/docs/flyctl/machine-cordon/)	 - Deactivate all services on a machine
+* [create](/docs/flyctl/machine-create/)	 - Create, but don't start, a machine
+* [destroy](/docs/flyctl/machine-destroy/)	 - Destroy Fly machines
+* [egress-ip](/docs/flyctl/machine-egress-ip/)	 - Manage static egress IPs
+* [exec](/docs/flyctl/machine-exec/)	 - Execute a command on a machine
+* [kill](/docs/flyctl/machine-kill/)	 - Kill (SIGKILL) a Fly machine
+* [leases](/docs/flyctl/machine-leases/)	 - Manage machine leases
+* [list](/docs/flyctl/machine-list/)	 - List Fly machines
+* [restart](/docs/flyctl/machine-restart/)	 - Restart one or more Fly machines
+* [run](/docs/flyctl/machine-run/)	 - Run a machine
+* [start](/docs/flyctl/machine-start/)	 - Start one or more Fly machines
+* [status](/docs/flyctl/machine-status/)	 - Show current status of a running machine
+* [stop](/docs/flyctl/machine-stop/)	 - Stop one or more Fly machines
+* [suspend](/docs/flyctl/machine-suspend/)	 - Suspend one or more Fly machines
+* [uncordon](/docs/flyctl/machine-uncordon/)	 - Reactivate all services on a machine
+* [update](/docs/flyctl/machine-update/)	 - Update a machine
+
+## Options
+
+~~~
+  -h, --help   help for machine
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/main_machine_api-proxy.md b/flyctl/cmd/fly_machine_api-proxy.md
similarity index 82%
rename from flyctl/cmd/main_machine_api-proxy.md
rename to flyctl/cmd/fly_machine_api-proxy.md
index 95e539a1be..5395bc0ad1 100644
--- a/flyctl/cmd/main_machine_api-proxy.md
+++ b/flyctl/cmd/fly_machine_api-proxy.md
@@ -3,7 +3,7 @@ Establish a proxy to the Machine API through a Wireguard tunnel for local connec
 
 ## Usage
 ~~~
-main machine api-proxy [flags]
+fly machine api-proxy [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main machine api-proxy [flags]
 
 ## See Also
 
-* [main machine](/docs/flyctl/main-machine/)	 - Manage Fly Machines.
+* [fly machine](/docs/flyctl/machine/)	 - Manage Fly Machines.
 
diff --git a/flyctl/cmd/main_machine_clone.md b/flyctl/cmd/fly_machine_clone.md
similarity index 95%
rename from flyctl/cmd/main_machine_clone.md
rename to flyctl/cmd/fly_machine_clone.md
index 23a093b853..825b963996 100644
--- a/flyctl/cmd/main_machine_clone.md
+++ b/flyctl/cmd/fly_machine_clone.md
@@ -2,7 +2,7 @@ Clone a Fly Machine. The new Machine will be a copy of the specified Machine. If
 
 ## Usage
 ~~~
-main machine clone [machine_id] [flags]
+fly machine clone [machine_id] [flags]
 ~~~
 
 ## Options
@@ -40,5 +40,5 @@ main machine clone [machine_id] [flags]
 
 ## See Also
 
-* [main machine](/docs/flyctl/main-machine/)	 - Manage Fly Machines.
+* [fly machine](/docs/flyctl/machine/)	 - Manage Fly Machines.
 
diff --git a/flyctl/cmd/main_machine_cordon.md b/flyctl/cmd/fly_machine_cordon.md
similarity index 79%
rename from flyctl/cmd/main_machine_cordon.md
rename to flyctl/cmd/fly_machine_cordon.md
index 64c72fba94..3f5480cc47 100644
--- a/flyctl/cmd/main_machine_cordon.md
+++ b/flyctl/cmd/fly_machine_cordon.md
@@ -3,7 +3,7 @@ Deactivate all services on a machine
 
 ## Usage
 ~~~
-main machine cordon [<id>...] [flags]
+fly machine cordon [<id>...] [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main machine cordon [<id>...] [flags]
 
 ## See Also
 
-* [main machine](/docs/flyctl/main-machine/)	 - Manage Fly Machines.
+* [fly machine](/docs/flyctl/machine/)	 - Manage Fly Machines.
 
diff --git a/flyctl/cmd/main_machine_create.md b/flyctl/cmd/fly_machine_create.md
similarity index 97%
rename from flyctl/cmd/main_machine_create.md
rename to flyctl/cmd/fly_machine_create.md
index 72a4ee84d8..18f3a9b768 100644
--- a/flyctl/cmd/main_machine_create.md
+++ b/flyctl/cmd/fly_machine_create.md
@@ -3,7 +3,7 @@ Create, but don't start, a machine
 
 ## Usage
 ~~~
-main machine create <image> [command] [flags]
+fly machine create <image> [command] [flags]
 ~~~
 
 ## Options
@@ -58,5 +58,5 @@ main machine create <image> [command] [flags]
 
 ## See Also
 
-* [main machine](/docs/flyctl/main-machine/)	 - Manage Fly Machines.
+* [fly machine](/docs/flyctl/machine/)	 - Manage Fly Machines.
 
diff --git a/flyctl/cmd/main_machine_destroy.md b/flyctl/cmd/fly_machine_destroy.md
similarity index 86%
rename from flyctl/cmd/main_machine_destroy.md
rename to flyctl/cmd/fly_machine_destroy.md
index bec23c2601..42ad813646 100644
--- a/flyctl/cmd/main_machine_destroy.md
+++ b/flyctl/cmd/fly_machine_destroy.md
@@ -4,7 +4,7 @@ This command requires a machine to be in a stopped or suspended state unless the
 
 ## Usage
 ~~~
-main machine destroy [flags] ID ID ...
+fly machine destroy [flags] ID ID ...
 ~~~
 
 ## Options
@@ -27,5 +27,5 @@ main machine destroy [flags] ID ID ...
 
 ## See Also
 
-* [main machine](/docs/flyctl/main-machine/)	 - Manage Fly Machines.
+* [fly machine](/docs/flyctl/machine/)	 - Manage Fly Machines.
 
diff --git a/flyctl/cmd/fly_machine_egress-ip.md b/flyctl/cmd/fly_machine_egress-ip.md
new file mode 100644
index 0000000000..ff2fafcd6c
--- /dev/null
+++ b/flyctl/cmd/fly_machine_egress-ip.md
@@ -0,0 +1,30 @@
+Manage static egress (outgoing) IP addresses for machines
+
+## Usage
+~~~
+fly machine egress-ip [command] [flags]
+~~~
+
+## Available Commands
+* [allocate](/docs/flyctl/machine-egress-ip-allocate/)	 - Allocate static egress IPs
+* [list](/docs/flyctl/machine-egress-ip-list/)	 - List all allocated static egress IPs
+* [release](/docs/flyctl/machine-egress-ip-release/)	 - Release an egress IP address
+
+## Options
+
+~~~
+  -h, --help   help for egress-ip
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly machine](/docs/flyctl/machine/)	 - Manage Fly Machines.
+
diff --git a/flyctl/cmd/main_machine_egress-ip_allocate.md b/flyctl/cmd/fly_machine_egress-ip_allocate.md
similarity index 75%
rename from flyctl/cmd/main_machine_egress-ip_allocate.md
rename to flyctl/cmd/fly_machine_egress-ip_allocate.md
index 937ce420ed..f21510b691 100644
--- a/flyctl/cmd/main_machine_egress-ip_allocate.md
+++ b/flyctl/cmd/fly_machine_egress-ip_allocate.md
@@ -2,7 +2,7 @@ Allocate a pair of static egress IPv4 and IPv6 for a machine
 
 ## Usage
 ~~~
-main machine egress-ip allocate <machine-id> [flags]
+fly machine egress-ip allocate <machine-id> [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main machine egress-ip allocate <machine-id> [flags]
 
 ## See Also
 
-* [main machine egress-ip](/docs/flyctl/main-machine-egress-ip/)	 - Manage static egress IPs
+* [fly machine egress-ip](/docs/flyctl/machine-egress-ip/)	 - Manage static egress IPs
 
diff --git a/flyctl/cmd/main_machine_egress-ip_list.md b/flyctl/cmd/fly_machine_egress-ip_list.md
similarity index 78%
rename from flyctl/cmd/main_machine_egress-ip_list.md
rename to flyctl/cmd/fly_machine_egress-ip_list.md
index a6ffc9805f..fb8928dd67 100644
--- a/flyctl/cmd/main_machine_egress-ip_list.md
+++ b/flyctl/cmd/fly_machine_egress-ip_list.md
@@ -2,7 +2,7 @@ List all allocated static egress IP addresses with their corresponding machine
 
 ## Usage
 ~~~
-main machine egress-ip list [flags]
+fly machine egress-ip list [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main machine egress-ip list [flags]
 
 ## See Also
 
-* [main machine egress-ip](/docs/flyctl/main-machine-egress-ip/)	 - Manage static egress IPs
+* [fly machine egress-ip](/docs/flyctl/machine-egress-ip/)	 - Manage static egress IPs
 
diff --git a/flyctl/cmd/main_machine_egress-ip_release.md b/flyctl/cmd/fly_machine_egress-ip_release.md
similarity index 74%
rename from flyctl/cmd/main_machine_egress-ip_release.md
rename to flyctl/cmd/fly_machine_egress-ip_release.md
index 3163c602d2..209c2ea197 100644
--- a/flyctl/cmd/main_machine_egress-ip_release.md
+++ b/flyctl/cmd/fly_machine_egress-ip_release.md
@@ -2,7 +2,7 @@ Release an egress IP address for a machine
 
 ## Usage
 ~~~
-main machine egress-ip release <machine-id> [flags]
+fly machine egress-ip release <machine-id> [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main machine egress-ip release <machine-id> [flags]
 
 ## See Also
 
-* [main machine egress-ip](/docs/flyctl/main-machine-egress-ip/)	 - Manage static egress IPs
+* [fly machine egress-ip](/docs/flyctl/machine-egress-ip/)	 - Manage static egress IPs
 
diff --git a/flyctl/cmd/main_machine_exec.md b/flyctl/cmd/fly_machine_exec.md
similarity index 80%
rename from flyctl/cmd/main_machine_exec.md
rename to flyctl/cmd/fly_machine_exec.md
index 84823cbe57..fe9199c7ed 100644
--- a/flyctl/cmd/main_machine_exec.md
+++ b/flyctl/cmd/fly_machine_exec.md
@@ -3,7 +3,7 @@ Execute a command on a machine
 
 ## Usage
 ~~~
-main machine exec [machine-id] <command> [flags]
+fly machine exec [machine-id] <command> [flags]
 ~~~
 
 ## Options
@@ -26,5 +26,5 @@ main machine exec [machine-id] <command> [flags]
 
 ## See Also
 
-* [main machine](/docs/flyctl/main-machine/)	 - Manage Fly Machines.
+* [fly machine](/docs/flyctl/machine/)	 - Manage Fly Machines.
 
diff --git a/flyctl/cmd/main_machine_kill.md b/flyctl/cmd/fly_machine_kill.md
similarity index 80%
rename from flyctl/cmd/main_machine_kill.md
rename to flyctl/cmd/fly_machine_kill.md
index 67a157046e..e2690fb12f 100644
--- a/flyctl/cmd/main_machine_kill.md
+++ b/flyctl/cmd/fly_machine_kill.md
@@ -3,7 +3,7 @@ Kill (SIGKILL) a Fly machine
 
 ## Usage
 ~~~
-main machine kill [id] [flags]
+fly machine kill [id] [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main machine kill [id] [flags]
 
 ## See Also
 
-* [main machine](/docs/flyctl/main-machine/)	 - Manage Fly Machines.
+* [fly machine](/docs/flyctl/machine/)	 - Manage Fly Machines.
 
diff --git a/flyctl/cmd/main_machine_leases.md b/flyctl/cmd/fly_machine_leases.md
similarity index 55%
rename from flyctl/cmd/main_machine_leases.md
rename to flyctl/cmd/fly_machine_leases.md
index 318bef4af0..19b7844a3d 100644
--- a/flyctl/cmd/main_machine_leases.md
+++ b/flyctl/cmd/fly_machine_leases.md
@@ -3,12 +3,12 @@ Manage machine leases
 
 ## Usage
 ~~~
-main machine leases [command] [flags]
+fly machine leases [command] [flags]
 ~~~
 
 ## Available Commands
-* [clear](/docs/flyctl/main-machine-leases-clear/)	 - Clear machine leases
-* [view](/docs/flyctl/main-machine-leases-view/)	 - View machine leases
+* [clear](/docs/flyctl/machine-leases-clear/)	 - Clear machine leases
+* [view](/docs/flyctl/machine-leases-view/)	 - View machine leases
 
 ## Options
 
@@ -26,5 +26,5 @@ main machine leases [command] [flags]
 
 ## See Also
 
-* [main machine](/docs/flyctl/main-machine/)	 - Manage Fly Machines.
+* [fly machine](/docs/flyctl/machine/)	 - Manage Fly Machines.
 
diff --git a/flyctl/cmd/main_machine_leases_clear.md b/flyctl/cmd/fly_machine_leases_clear.md
similarity index 75%
rename from flyctl/cmd/main_machine_leases_clear.md
rename to flyctl/cmd/fly_machine_leases_clear.md
index 9b265a8ebb..b7feb123dc 100644
--- a/flyctl/cmd/main_machine_leases_clear.md
+++ b/flyctl/cmd/fly_machine_leases_clear.md
@@ -3,7 +3,7 @@ Clear machine leases
 
 ## Usage
 ~~~
-main machine leases clear [machine-id] [flags]
+fly machine leases clear [machine-id] [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main machine leases clear [machine-id] [flags]
 
 ## See Also
 
-* [main machine leases](/docs/flyctl/main-machine-leases/)	 - Manage machine leases
+* [fly machine leases](/docs/flyctl/machine-leases/)	 - Manage machine leases
 
diff --git a/flyctl/cmd/main_machine_leases_view.md b/flyctl/cmd/fly_machine_leases_view.md
similarity index 77%
rename from flyctl/cmd/main_machine_leases_view.md
rename to flyctl/cmd/fly_machine_leases_view.md
index 0f20dfba24..bfe6d77ac7 100644
--- a/flyctl/cmd/main_machine_leases_view.md
+++ b/flyctl/cmd/fly_machine_leases_view.md
@@ -3,7 +3,7 @@ View machine leases
 
 ## Usage
 ~~~
-main machine leases view [machine-id] [flags]
+fly machine leases view [machine-id] [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main machine leases view [machine-id] [flags]
 
 ## See Also
 
-* [main machine leases](/docs/flyctl/main-machine-leases/)	 - Manage machine leases
+* [fly machine leases](/docs/flyctl/machine-leases/)	 - Manage machine leases
 
diff --git a/flyctl/cmd/main_machine_list.md b/flyctl/cmd/fly_machine_list.md
similarity index 83%
rename from flyctl/cmd/main_machine_list.md
rename to flyctl/cmd/fly_machine_list.md
index e32b5108c5..6c5942dc82 100644
--- a/flyctl/cmd/main_machine_list.md
+++ b/flyctl/cmd/fly_machine_list.md
@@ -3,7 +3,7 @@ List Fly machines
 
 ## Usage
 ~~~
-main machine list [flags]
+fly machine list [flags]
 ~~~
 
 ## Options
@@ -26,5 +26,5 @@ main machine list [flags]
 
 ## See Also
 
-* [main machine](/docs/flyctl/main-machine/)	 - Manage Fly Machines.
+* [fly machine](/docs/flyctl/machine/)	 - Manage Fly Machines.
 
diff --git a/flyctl/cmd/main_machine_restart.md b/flyctl/cmd/fly_machine_restart.md
similarity index 86%
rename from flyctl/cmd/main_machine_restart.md
rename to flyctl/cmd/fly_machine_restart.md
index dd06fc50b1..3be4e0b4e8 100644
--- a/flyctl/cmd/main_machine_restart.md
+++ b/flyctl/cmd/fly_machine_restart.md
@@ -3,7 +3,7 @@ Restart one or more Fly machines
 
 ## Usage
 ~~~
-main machine restart [<id>...] [flags]
+fly machine restart [<id>...] [flags]
 ~~~
 
 ## Options
@@ -28,5 +28,5 @@ main machine restart [<id>...] [flags]
 
 ## See Also
 
-* [main machine](/docs/flyctl/main-machine/)	 - Manage Fly Machines.
+* [fly machine](/docs/flyctl/machine/)	 - Manage Fly Machines.
 
diff --git a/flyctl/cmd/main_machine_run.md b/flyctl/cmd/fly_machine_run.md
similarity index 97%
rename from flyctl/cmd/main_machine_run.md
rename to flyctl/cmd/fly_machine_run.md
index 3cf3c3cd45..bb76c07b12 100644
--- a/flyctl/cmd/main_machine_run.md
+++ b/flyctl/cmd/fly_machine_run.md
@@ -3,7 +3,7 @@ Run a machine
 
 ## Usage
 ~~~
-main machine run <image> [command] [flags]
+fly machine run <image> [command] [flags]
 ~~~
 
 ## Options
@@ -62,5 +62,5 @@ main machine run <image> [command] [flags]
 
 ## See Also
 
-* [main machine](/docs/flyctl/main-machine/)	 - Manage Fly Machines.
+* [fly machine](/docs/flyctl/machine/)	 - Manage Fly Machines.
 
diff --git a/flyctl/cmd/main_machine_start.md b/flyctl/cmd/fly_machine_start.md
similarity index 79%
rename from flyctl/cmd/main_machine_start.md
rename to flyctl/cmd/fly_machine_start.md
index 3fb0b7f400..5c3f53236a 100644
--- a/flyctl/cmd/main_machine_start.md
+++ b/flyctl/cmd/fly_machine_start.md
@@ -3,7 +3,7 @@ Start one or more Fly machines
 
 ## Usage
 ~~~
-main machine start [<id>...] [flags]
+fly machine start [<id>...] [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main machine start [<id>...] [flags]
 
 ## See Also
 
-* [main machine](/docs/flyctl/main-machine/)	 - Manage Fly Machines.
+* [fly machine](/docs/flyctl/machine/)	 - Manage Fly Machines.
 
diff --git a/flyctl/cmd/main_machine_status.md b/flyctl/cmd/fly_machine_status.md
similarity index 82%
rename from flyctl/cmd/main_machine_status.md
rename to flyctl/cmd/fly_machine_status.md
index 9e7c0eb47c..a82a5c8e79 100644
--- a/flyctl/cmd/main_machine_status.md
+++ b/flyctl/cmd/fly_machine_status.md
@@ -3,7 +3,7 @@ Show current status of a running machine
 
 ## Usage
 ~~~
-main machine status [id] [flags]
+fly machine status [id] [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main machine status [id] [flags]
 
 ## See Also
 
-* [main machine](/docs/flyctl/main-machine/)	 - Manage Fly Machines.
+* [fly machine](/docs/flyctl/machine/)	 - Manage Fly Machines.
 
diff --git a/flyctl/cmd/main_machine_stop.md b/flyctl/cmd/fly_machine_stop.md
similarity index 87%
rename from flyctl/cmd/main_machine_stop.md
rename to flyctl/cmd/fly_machine_stop.md
index bca8a07814..656d96a835 100644
--- a/flyctl/cmd/main_machine_stop.md
+++ b/flyctl/cmd/fly_machine_stop.md
@@ -3,7 +3,7 @@ Stop one or more Fly machines
 
 ## Usage
 ~~~
-main machine stop [<id>...] [flags]
+fly machine stop [<id>...] [flags]
 ~~~
 
 ## Options
@@ -27,5 +27,5 @@ main machine stop [<id>...] [flags]
 
 ## See Also
 
-* [main machine](/docs/flyctl/main-machine/)	 - Manage Fly Machines.
+* [fly machine](/docs/flyctl/machine/)	 - Manage Fly Machines.
 
diff --git a/flyctl/cmd/main_machine_suspend.md b/flyctl/cmd/fly_machine_suspend.md
similarity index 83%
rename from flyctl/cmd/main_machine_suspend.md
rename to flyctl/cmd/fly_machine_suspend.md
index 59b42297e4..5a20e1746e 100644
--- a/flyctl/cmd/main_machine_suspend.md
+++ b/flyctl/cmd/fly_machine_suspend.md
@@ -3,7 +3,7 @@ Suspend one or more Fly machines
 
 ## Usage
 ~~~
-main machine suspend [<id>...] [flags]
+fly machine suspend [<id>...] [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main machine suspend [<id>...] [flags]
 
 ## See Also
 
-* [main machine](/docs/flyctl/main-machine/)	 - Manage Fly Machines.
+* [fly machine](/docs/flyctl/machine/)	 - Manage Fly Machines.
 
diff --git a/flyctl/cmd/main_machine_uncordon.md b/flyctl/cmd/fly_machine_uncordon.md
similarity index 79%
rename from flyctl/cmd/main_machine_uncordon.md
rename to flyctl/cmd/fly_machine_uncordon.md
index bd566ffa82..2a1521295a 100644
--- a/flyctl/cmd/main_machine_uncordon.md
+++ b/flyctl/cmd/fly_machine_uncordon.md
@@ -3,7 +3,7 @@ Reactivate all services on a machine
 
 ## Usage
 ~~~
-main machine uncordon [<id>...] [flags]
+fly machine uncordon [<id>...] [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main machine uncordon [<id>...] [flags]
 
 ## See Also
 
-* [main machine](/docs/flyctl/main-machine/)	 - Manage Fly Machines.
+* [fly machine](/docs/flyctl/machine/)	 - Manage Fly Machines.
 
diff --git a/flyctl/cmd/main_machine_update.md b/flyctl/cmd/fly_machine_update.md
similarity index 97%
rename from flyctl/cmd/main_machine_update.md
rename to flyctl/cmd/fly_machine_update.md
index 4a7868cd90..b03285d563 100644
--- a/flyctl/cmd/main_machine_update.md
+++ b/flyctl/cmd/fly_machine_update.md
@@ -3,7 +3,7 @@ Update a machine
 
 ## Usage
 ~~~
-main machine update [machine_id] [flags]
+fly machine update [machine_id] [flags]
 ~~~
 
 ## Options
@@ -59,5 +59,5 @@ main machine update [machine_id] [flags]
 
 ## See Also
 
-* [main machine](/docs/flyctl/main-machine/)	 - Manage Fly Machines.
+* [fly machine](/docs/flyctl/machine/)	 - Manage Fly Machines.
 
diff --git a/flyctl/cmd/fly_mysql.md b/flyctl/cmd/fly_mysql.md
new file mode 100644
index 0000000000..3949f4199a
--- /dev/null
+++ b/flyctl/cmd/fly_mysql.md
@@ -0,0 +1,33 @@
+Provision and manage MySQL database clusters
+
+
+## Usage
+~~~
+fly mysql [command] [flags]
+~~~
+
+## Available Commands
+* [create](/docs/flyctl/mysql-create/)	 - Provision a MySQL database
+* [destroy](/docs/flyctl/mysql-destroy/)	 - Permanently destroy a MySQL database
+* [list](/docs/flyctl/mysql-list/)	 - List your MySQL databases
+* [status](/docs/flyctl/mysql-status/)	 - Show details about a MySQL database
+* [update](/docs/flyctl/mysql-update/)	 - Update an existing MySQL database
+
+## Options
+
+~~~
+  -h, --help   help for mysql
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/main_mysql_create.md b/flyctl/cmd/fly_mysql_create.md
similarity index 88%
rename from flyctl/cmd/main_mysql_create.md
rename to flyctl/cmd/fly_mysql_create.md
index 2826af79ac..04f78ea055 100644
--- a/flyctl/cmd/main_mysql_create.md
+++ b/flyctl/cmd/fly_mysql_create.md
@@ -3,7 +3,7 @@ Provision a MySQL database
 
 ## Usage
 ~~~
-main mysql create [flags]
+fly mysql create [flags]
 ~~~
 
 ## Options
@@ -32,5 +32,5 @@ main mysql create [flags]
 
 ## See Also
 
-* [main mysql](/docs/flyctl/main-mysql/)	 - Provision and manage MySQL database clusters
+* [fly mysql](/docs/flyctl/mysql/)	 - Provision and manage MySQL database clusters
 
diff --git a/flyctl/cmd/main_mysql_destroy.md b/flyctl/cmd/fly_mysql_destroy.md
similarity index 79%
rename from flyctl/cmd/main_mysql_destroy.md
rename to flyctl/cmd/fly_mysql_destroy.md
index 00657789f7..ea8f3d5aff 100644
--- a/flyctl/cmd/main_mysql_destroy.md
+++ b/flyctl/cmd/fly_mysql_destroy.md
@@ -2,7 +2,7 @@ Permanently destroy a MySQL database
 
 ## Usage
 ~~~
-main mysql destroy [name] [flags]
+fly mysql destroy [name] [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main mysql destroy [name] [flags]
 
 ## See Also
 
-* [main mysql](/docs/flyctl/main-mysql/)	 - Provision and manage MySQL database clusters
+* [fly mysql](/docs/flyctl/mysql/)	 - Provision and manage MySQL database clusters
 
diff --git a/flyctl/cmd/main_mysql_list.md b/flyctl/cmd/fly_mysql_list.md
similarity index 77%
rename from flyctl/cmd/main_mysql_list.md
rename to flyctl/cmd/fly_mysql_list.md
index f0cb781f4d..6f961706a9 100644
--- a/flyctl/cmd/main_mysql_list.md
+++ b/flyctl/cmd/fly_mysql_list.md
@@ -2,7 +2,7 @@ List your MySQL databases
 
 ## Usage
 ~~~
-main mysql list [flags]
+fly mysql list [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main mysql list [flags]
 
 ## See Also
 
-* [main mysql](/docs/flyctl/main-mysql/)	 - Provision and manage MySQL database clusters
+* [fly mysql](/docs/flyctl/mysql/)	 - Provision and manage MySQL database clusters
 
diff --git a/flyctl/cmd/main_mysql_status.md b/flyctl/cmd/fly_mysql_status.md
similarity index 79%
rename from flyctl/cmd/main_mysql_status.md
rename to flyctl/cmd/fly_mysql_status.md
index 974c1f44a0..2d33493b5b 100644
--- a/flyctl/cmd/main_mysql_status.md
+++ b/flyctl/cmd/fly_mysql_status.md
@@ -3,7 +3,7 @@ Show details about a MySQL database
 
 ## Usage
 ~~~
-main mysql status [name] [flags]
+fly mysql status [name] [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main mysql status [name] [flags]
 
 ## See Also
 
-* [main mysql](/docs/flyctl/main-mysql/)	 - Provision and manage MySQL database clusters
+* [fly mysql](/docs/flyctl/mysql/)	 - Provision and manage MySQL database clusters
 
diff --git a/flyctl/cmd/main_mysql_update.md b/flyctl/cmd/fly_mysql_update.md
similarity index 84%
rename from flyctl/cmd/main_mysql_update.md
rename to flyctl/cmd/fly_mysql_update.md
index 1950d4d213..ed5f4bf126 100644
--- a/flyctl/cmd/main_mysql_update.md
+++ b/flyctl/cmd/fly_mysql_update.md
@@ -3,7 +3,7 @@ Update an existing MySQL database
 
 ## Usage
 ~~~
-main mysql update <database_name> [flags]
+fly mysql update <database_name> [flags]
 ~~~
 
 ## Options
@@ -29,5 +29,5 @@ main mysql update <database_name> [flags]
 
 ## See Also
 
-* [main mysql](/docs/flyctl/main-mysql/)	 - Provision and manage MySQL database clusters
+* [fly mysql](/docs/flyctl/mysql/)	 - Provision and manage MySQL database clusters
 
diff --git a/flyctl/cmd/fly_orgs.md b/flyctl/cmd/fly_orgs.md
new file mode 100644
index 0000000000..2435b073a0
--- /dev/null
+++ b/flyctl/cmd/fly_orgs.md
@@ -0,0 +1,36 @@
+Commands for managing Fly organizations. list, create, show and
+destroy organizations.
+Organization admins can also invite or remove users from Organizations.
+
+
+## Usage
+~~~
+fly orgs [command] [flags]
+~~~
+
+## Available Commands
+* [create](/docs/flyctl/orgs-create/)	 - Create an organization
+* [delete](/docs/flyctl/orgs-delete/)	 - Delete an organization
+* [invite](/docs/flyctl/orgs-invite/)	 - Invite user (by email) to organization
+* [list](/docs/flyctl/orgs-list/)	 - Lists organizations for current user
+* [remove](/docs/flyctl/orgs-remove/)	 - Remove a user from an organization
+* [show](/docs/flyctl/orgs-show/)	 - Show information about an organization
+
+## Options
+
+~~~
+  -h, --help   help for orgs
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/main_orgs_create.md b/flyctl/cmd/fly_orgs_create.md
similarity index 77%
rename from flyctl/cmd/main_orgs_create.md
rename to flyctl/cmd/fly_orgs_create.md
index 74c649c2e2..0d6ee6580e 100644
--- a/flyctl/cmd/main_orgs_create.md
+++ b/flyctl/cmd/fly_orgs_create.md
@@ -4,7 +4,7 @@ organization later.
 
 ## Usage
 ~~~
-main orgs create [name] [flags]
+fly orgs create [name] [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main orgs create [name] [flags]
 
 ## See Also
 
-* [main orgs](/docs/flyctl/main-orgs/)	 - Commands for managing Fly organizations
+* [fly orgs](/docs/flyctl/orgs/)	 - Commands for managing Fly organizations
 
diff --git a/flyctl/cmd/main_orgs_delete.md b/flyctl/cmd/fly_orgs_delete.md
similarity index 74%
rename from flyctl/cmd/main_orgs_delete.md
rename to flyctl/cmd/fly_orgs_delete.md
index 98b8498cc5..8c892d5029 100644
--- a/flyctl/cmd/main_orgs_delete.md
+++ b/flyctl/cmd/fly_orgs_delete.md
@@ -3,7 +3,7 @@ Delete an existing organization.
 
 ## Usage
 ~~~
-main orgs delete [-yes] [slug] [flags]
+fly orgs delete [-yes] [slug] [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main orgs delete [-yes] [slug] [flags]
 
 ## See Also
 
-* [main orgs](/docs/flyctl/main-orgs/)	 - Commands for managing Fly organizations
+* [fly orgs](/docs/flyctl/orgs/)	 - Commands for managing Fly organizations
 
diff --git a/flyctl/cmd/main_orgs_invite.md b/flyctl/cmd/fly_orgs_invite.md
similarity index 77%
rename from flyctl/cmd/main_orgs_invite.md
rename to flyctl/cmd/fly_orgs_invite.md
index 3cfffbe7e1..7e293211bb 100644
--- a/flyctl/cmd/main_orgs_invite.md
+++ b/flyctl/cmd/fly_orgs_invite.md
@@ -4,7 +4,7 @@ sent, and the user will be pending until they respond.
 
 ## Usage
 ~~~
-main orgs invite [slug] [email] [flags]
+fly orgs invite [slug] [email] [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main orgs invite [slug] [email] [flags]
 
 ## See Also
 
-* [main orgs](/docs/flyctl/main-orgs/)	 - Commands for managing Fly organizations
+* [fly orgs](/docs/flyctl/orgs/)	 - Commands for managing Fly organizations
 
diff --git a/flyctl/cmd/main_orgs_list.md b/flyctl/cmd/fly_orgs_list.md
similarity index 76%
rename from flyctl/cmd/main_orgs_list.md
rename to flyctl/cmd/fly_orgs_list.md
index 85c8dcc9b7..2974645272 100644
--- a/flyctl/cmd/main_orgs_list.md
+++ b/flyctl/cmd/fly_orgs_list.md
@@ -3,7 +3,7 @@ Lists organizations available to current user.
 
 ## Usage
 ~~~
-main orgs list [flags]
+fly orgs list [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main orgs list [flags]
 
 ## See Also
 
-* [main orgs](/docs/flyctl/main-orgs/)	 - Commands for managing Fly organizations
+* [fly orgs](/docs/flyctl/orgs/)	 - Commands for managing Fly organizations
 
diff --git a/flyctl/cmd/main_orgs_remove.md b/flyctl/cmd/fly_orgs_remove.md
similarity index 76%
rename from flyctl/cmd/main_orgs_remove.md
rename to flyctl/cmd/fly_orgs_remove.md
index f86db9abe4..502aeed882 100644
--- a/flyctl/cmd/main_orgs_remove.md
+++ b/flyctl/cmd/fly_orgs_remove.md
@@ -4,7 +4,7 @@ invitation to join (if not, see orgs revoke).
 
 ## Usage
 ~~~
-main orgs remove [slug] [email] [flags]
+fly orgs remove [slug] [email] [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main orgs remove [slug] [email] [flags]
 
 ## See Also
 
-* [main orgs](/docs/flyctl/main-orgs/)	 - Commands for managing Fly organizations
+* [fly orgs](/docs/flyctl/orgs/)	 - Commands for managing Fly organizations
 
diff --git a/flyctl/cmd/main_orgs_show.md b/flyctl/cmd/fly_orgs_show.md
similarity index 80%
rename from flyctl/cmd/main_orgs_show.md
rename to flyctl/cmd/fly_orgs_show.md
index 9371dcbc3f..858e058222 100644
--- a/flyctl/cmd/main_orgs_show.md
+++ b/flyctl/cmd/fly_orgs_show.md
@@ -5,7 +5,7 @@ associated member. Details full list of members and roles.
 
 ## Usage
 ~~~
-main orgs show [slug] [flags]
+fly orgs show [slug] [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main orgs show [slug] [flags]
 
 ## See Also
 
-* [main orgs](/docs/flyctl/main-orgs/)	 - Commands for managing Fly organizations
+* [fly orgs](/docs/flyctl/orgs/)	 - Commands for managing Fly organizations
 
diff --git a/flyctl/cmd/main_ping.md b/flyctl/cmd/fly_ping.md
similarity index 92%
rename from flyctl/cmd/main_ping.md
rename to flyctl/cmd/fly_ping.md
index 8c70b158b2..254aea94b3 100644
--- a/flyctl/cmd/main_ping.md
+++ b/flyctl/cmd/fly_ping.md
@@ -12,7 +12,7 @@ The target argument can be either a ".internal" DNS name in our network
 
 ## Usage
 ~~~
-main ping [hostname] [flags]
+fly ping [hostname] [flags]
 ~~~
 
 ## Options
@@ -37,5 +37,5 @@ main ping [hostname] [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/fly_platform.md b/flyctl/cmd/fly_platform.md
new file mode 100644
index 0000000000..76e734231d
--- /dev/null
+++ b/flyctl/cmd/fly_platform.md
@@ -0,0 +1,32 @@
+The PLATFORM commands are for users looking for information
+about the Fly platform.
+
+
+## Usage
+~~~
+fly platform [command] [flags]
+~~~
+
+## Available Commands
+* [regions](/docs/flyctl/platform-regions/)	 - List regions
+* [status](/docs/flyctl/platform-status/)	 - Show current platform status with an optional filter for maintenance or incidents in json mode (eg. incidents, maintenance)
+* [vm-sizes](/docs/flyctl/platform-vm-sizes/)	 - List VM Sizes
+
+## Options
+
+~~~
+  -h, --help   help for platform
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/main_platform_regions.md b/flyctl/cmd/fly_platform_regions.md
similarity index 77%
rename from flyctl/cmd/main_platform_regions.md
rename to flyctl/cmd/fly_platform_regions.md
index a8c34a2bd6..b6e98a3797 100644
--- a/flyctl/cmd/main_platform_regions.md
+++ b/flyctl/cmd/fly_platform_regions.md
@@ -3,7 +3,7 @@ View a list of regions where Fly has edges and/or datacenters
 
 ## Usage
 ~~~
-main platform regions [flags]
+fly platform regions [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main platform regions [flags]
 
 ## See Also
 
-* [main platform](/docs/flyctl/main-platform/)	 - Fly platform information
+* [fly platform](/docs/flyctl/platform/)	 - Fly platform information
 
diff --git a/flyctl/cmd/main_platform_status.md b/flyctl/cmd/fly_platform_status.md
similarity index 77%
rename from flyctl/cmd/main_platform_status.md
rename to flyctl/cmd/fly_platform_status.md
index be3bad31f2..d796008c38 100644
--- a/flyctl/cmd/main_platform_status.md
+++ b/flyctl/cmd/fly_platform_status.md
@@ -3,7 +3,7 @@ Show current Fly platform status in a browser or via json with the json flag
 
 ## Usage
 ~~~
-main platform status [kind] [flags]
+fly platform status [kind] [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main platform status [kind] [flags]
 
 ## See Also
 
-* [main platform](/docs/flyctl/main-platform/)	 - Fly platform information
+* [fly platform](/docs/flyctl/platform/)	 - Fly platform information
 
diff --git a/flyctl/cmd/main_platform_vm-sizes.md b/flyctl/cmd/fly_platform_vm-sizes.md
similarity index 78%
rename from flyctl/cmd/main_platform_vm-sizes.md
rename to flyctl/cmd/fly_platform_vm-sizes.md
index a8352cb9d0..878815ffa7 100644
--- a/flyctl/cmd/main_platform_vm-sizes.md
+++ b/flyctl/cmd/fly_platform_vm-sizes.md
@@ -3,7 +3,7 @@ View a list of VM sizes which can be used with the FLYCTL SCALE VM command
 
 ## Usage
 ~~~
-main platform vm-sizes [flags]
+fly platform vm-sizes [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main platform vm-sizes [flags]
 
 ## See Also
 
-* [main platform](/docs/flyctl/main-platform/)	 - Fly platform information
+* [fly platform](/docs/flyctl/platform/)	 - Fly platform information
 
diff --git a/flyctl/cmd/fly_postgres.md b/flyctl/cmd/fly_postgres.md
new file mode 100644
index 0000000000..79d3c237c8
--- /dev/null
+++ b/flyctl/cmd/fly_postgres.md
@@ -0,0 +1,42 @@
+Manage Postgres clusters.
+
+
+## Usage
+~~~
+fly postgres [command] [flags]
+~~~
+
+## Available Commands
+* [attach](/docs/flyctl/postgres-attach/)	 - Attach a postgres cluster to an app
+* [backup](/docs/flyctl/postgres-backup/)	 - Backup commands
+* [config](/docs/flyctl/postgres-config/)	 - Show and manage Postgres configuration.
+* [connect](/docs/flyctl/postgres-connect/)	 - Connect to the Postgres console
+* [create](/docs/flyctl/postgres-create/)	 - Create a new Postgres cluster
+* [db](/docs/flyctl/postgres-db/)	 - Manage databases in a cluster
+* [detach](/docs/flyctl/postgres-detach/)	 - Detach a postgres cluster from an app
+* [events](/docs/flyctl/postgres-events/)	 - Track major cluster events
+* [failover](/docs/flyctl/postgres-failover/)	 - Failover to a new primary
+* [import](/docs/flyctl/postgres-import/)	 - Imports database from a specified Postgres URI
+* [list](/docs/flyctl/postgres-list/)	 - List postgres clusters
+* [renew-certs](/docs/flyctl/postgres-renew-certs/)	 - Renews the SSH certificates for the Postgres cluster.
+* [restart](/docs/flyctl/postgres-restart/)	 - Restarts each member of the Postgres cluster one by one.
+* [users](/docs/flyctl/postgres-users/)	 - Manage users in a postgres cluster
+
+## Options
+
+~~~
+  -h, --help   help for postgres
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/main_postgres_attach.md b/flyctl/cmd/fly_postgres_attach.md
similarity index 88%
rename from flyctl/cmd/main_postgres_attach.md
rename to flyctl/cmd/fly_postgres_attach.md
index 11a47ca0e1..c27e834d57 100644
--- a/flyctl/cmd/main_postgres_attach.md
+++ b/flyctl/cmd/fly_postgres_attach.md
@@ -3,7 +3,7 @@ Attach a postgres cluster to an app
 
 ## Usage
 ~~~
-main postgres attach <POSTGRES APP> [flags]
+fly postgres attach <POSTGRES APP> [flags]
 ~~~
 
 ## Options
@@ -29,5 +29,5 @@ main postgres attach <POSTGRES APP> [flags]
 
 ## See Also
 
-* [main postgres](/docs/flyctl/main-postgres/)	 - Manage Postgres clusters.
+* [fly postgres](/docs/flyctl/postgres/)	 - Manage Postgres clusters.
 
diff --git a/flyctl/cmd/fly_postgres_backup.md b/flyctl/cmd/fly_postgres_backup.md
new file mode 100644
index 0000000000..ebfec301ff
--- /dev/null
+++ b/flyctl/cmd/fly_postgres_backup.md
@@ -0,0 +1,33 @@
+Backup commands
+
+
+## Usage
+~~~
+fly postgres backup [command] [flags]
+~~~
+
+## Available Commands
+* [config](/docs/flyctl/postgres-backup-config/)	 - Manage backup configuration
+* [create](/docs/flyctl/postgres-backup-create/)	 - Create a backup
+* [enable](/docs/flyctl/postgres-backup-enable/)	 - Enable backups on a Postgres cluster, creating a Tigris bucket for storage
+* [list](/docs/flyctl/postgres-backup-list/)	 - List backups
+* [restore](/docs/flyctl/postgres-backup-restore/)	 - Performs a WAL-based restore into a new Postgres cluster.
+
+## Options
+
+~~~
+  -h, --help   help for backup
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly postgres](/docs/flyctl/postgres/)	 - Manage Postgres clusters.
+
diff --git a/flyctl/cmd/main_postgres_backup_config.md b/flyctl/cmd/fly_postgres_backup_config.md
similarity index 51%
rename from flyctl/cmd/main_postgres_backup_config.md
rename to flyctl/cmd/fly_postgres_backup_config.md
index af0a4708cd..be8b33c4c0 100644
--- a/flyctl/cmd/main_postgres_backup_config.md
+++ b/flyctl/cmd/fly_postgres_backup_config.md
@@ -3,12 +3,12 @@ Manage backup configuration
 
 ## Usage
 ~~~
-main postgres backup config [command] [flags]
+fly postgres backup config [command] [flags]
 ~~~
 
 ## Available Commands
-* [show](/docs/flyctl/main-postgres-backup-config-show/)	 - Show backup configuration
-* [update](/docs/flyctl/main-postgres-backup-config-update/)	 - Update backup configuration
+* [show](/docs/flyctl/postgres-backup-config-show/)	 - Show backup configuration
+* [update](/docs/flyctl/postgres-backup-config-update/)	 - Update backup configuration
 
 ## Options
 
@@ -26,5 +26,5 @@ main postgres backup config [command] [flags]
 
 ## See Also
 
-* [main postgres backup](/docs/flyctl/main-postgres-backup/)	 - Backup commands
+* [fly postgres backup](/docs/flyctl/postgres-backup/)	 - Backup commands
 
diff --git a/flyctl/cmd/main_postgres_backup_config_show.md b/flyctl/cmd/fly_postgres_backup_config_show.md
similarity index 73%
rename from flyctl/cmd/main_postgres_backup_config_show.md
rename to flyctl/cmd/fly_postgres_backup_config_show.md
index 111ac73b27..d8c485f9fc 100644
--- a/flyctl/cmd/main_postgres_backup_config_show.md
+++ b/flyctl/cmd/fly_postgres_backup_config_show.md
@@ -3,7 +3,7 @@ Show backup configuration
 
 ## Usage
 ~~~
-main postgres backup config show [flags]
+fly postgres backup config show [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main postgres backup config show [flags]
 
 ## See Also
 
-* [main postgres backup config](/docs/flyctl/main-postgres-backup-config/)	 - Manage backup configuration
+* [fly postgres backup config](/docs/flyctl/postgres-backup-config/)	 - Manage backup configuration
 
diff --git a/flyctl/cmd/main_postgres_backup_config_update.md b/flyctl/cmd/fly_postgres_backup_config_update.md
similarity index 82%
rename from flyctl/cmd/main_postgres_backup_config_update.md
rename to flyctl/cmd/fly_postgres_backup_config_update.md
index e3d7be25a8..9b91ab6954 100644
--- a/flyctl/cmd/main_postgres_backup_config_update.md
+++ b/flyctl/cmd/fly_postgres_backup_config_update.md
@@ -3,7 +3,7 @@ Update backup configuration
 
 ## Usage
 ~~~
-main postgres backup config update [flags]
+fly postgres backup config update [flags]
 ~~~
 
 ## Options
@@ -28,5 +28,5 @@ main postgres backup config update [flags]
 
 ## See Also
 
-* [main postgres backup config](/docs/flyctl/main-postgres-backup-config/)	 - Manage backup configuration
+* [fly postgres backup config](/docs/flyctl/postgres-backup-config/)	 - Manage backup configuration
 
diff --git a/flyctl/cmd/main_postgres_backup_create.md b/flyctl/cmd/fly_postgres_backup_create.md
similarity index 82%
rename from flyctl/cmd/main_postgres_backup_create.md
rename to flyctl/cmd/fly_postgres_backup_create.md
index 4a4cb12260..624e57d3ef 100644
--- a/flyctl/cmd/main_postgres_backup_create.md
+++ b/flyctl/cmd/fly_postgres_backup_create.md
@@ -3,7 +3,7 @@ Create a backup
 
 ## Usage
 ~~~
-main postgres backup create [flags]
+fly postgres backup create [flags]
 ~~~
 
 ## Options
@@ -26,5 +26,5 @@ main postgres backup create [flags]
 
 ## See Also
 
-* [main postgres backup](/docs/flyctl/main-postgres-backup/)	 - Backup commands
+* [fly postgres backup](/docs/flyctl/postgres-backup/)	 - Backup commands
 
diff --git a/flyctl/cmd/main_postgres_backup_enable.md b/flyctl/cmd/fly_postgres_backup_enable.md
similarity index 79%
rename from flyctl/cmd/main_postgres_backup_enable.md
rename to flyctl/cmd/fly_postgres_backup_enable.md
index cac461adf0..ad53dab4b7 100644
--- a/flyctl/cmd/main_postgres_backup_enable.md
+++ b/flyctl/cmd/fly_postgres_backup_enable.md
@@ -3,7 +3,7 @@ Enable backups on a Postgres cluster, creating a Tigris bucket for storage
 
 ## Usage
 ~~~
-main postgres backup enable [flags]
+fly postgres backup enable [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main postgres backup enable [flags]
 
 ## See Also
 
-* [main postgres backup](/docs/flyctl/main-postgres-backup/)	 - Backup commands
+* [fly postgres backup](/docs/flyctl/postgres-backup/)	 - Backup commands
 
diff --git a/flyctl/cmd/main_postgres_backup_list.md b/flyctl/cmd/fly_postgres_backup_list.md
similarity index 77%
rename from flyctl/cmd/main_postgres_backup_list.md
rename to flyctl/cmd/fly_postgres_backup_list.md
index 3684133c20..9ce6d69aea 100644
--- a/flyctl/cmd/main_postgres_backup_list.md
+++ b/flyctl/cmd/fly_postgres_backup_list.md
@@ -3,7 +3,7 @@ List backups
 
 ## Usage
 ~~~
-main postgres backup list [flags]
+fly postgres backup list [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main postgres backup list [flags]
 
 ## See Also
 
-* [main postgres backup](/docs/flyctl/main-postgres-backup/)	 - Backup commands
+* [fly postgres backup](/docs/flyctl/postgres-backup/)	 - Backup commands
 
diff --git a/flyctl/cmd/main_postgres_backup_restore.md b/flyctl/cmd/fly_postgres_backup_restore.md
similarity index 87%
rename from flyctl/cmd/main_postgres_backup_restore.md
rename to flyctl/cmd/fly_postgres_backup_restore.md
index 47ce53be07..2b4b26c310 100644
--- a/flyctl/cmd/main_postgres_backup_restore.md
+++ b/flyctl/cmd/fly_postgres_backup_restore.md
@@ -3,7 +3,7 @@ Performs a WAL-based restore into a new Postgres cluster.
 
 ## Usage
 ~~~
-main postgres backup restore <destination-app-name> [flags]
+fly postgres backup restore <destination-app-name> [flags]
 ~~~
 
 ## Options
@@ -29,5 +29,5 @@ main postgres backup restore <destination-app-name> [flags]
 
 ## See Also
 
-* [main postgres backup](/docs/flyctl/main-postgres-backup/)	 - Backup commands
+* [fly postgres backup](/docs/flyctl/postgres-backup/)	 - Backup commands
 
diff --git a/flyctl/cmd/main_postgres_config.md b/flyctl/cmd/fly_postgres_config.md
similarity index 54%
rename from flyctl/cmd/main_postgres_config.md
rename to flyctl/cmd/fly_postgres_config.md
index 2baae8bfa2..1aabc983a2 100644
--- a/flyctl/cmd/main_postgres_config.md
+++ b/flyctl/cmd/fly_postgres_config.md
@@ -3,12 +3,12 @@ Show and manage Postgres configuration.
 
 ## Usage
 ~~~
-main postgres config [command] [flags]
+fly postgres config [command] [flags]
 ~~~
 
 ## Available Commands
-* [show](/docs/flyctl/main-postgres-config-show/)	 - Show Postgres configuration
-* [update](/docs/flyctl/main-postgres-config-update/)	 - Update Postgres configuration.
+* [show](/docs/flyctl/postgres-config-show/)	 - Show Postgres configuration
+* [update](/docs/flyctl/postgres-config-update/)	 - Update Postgres configuration.
 
 ## Options
 
@@ -26,5 +26,5 @@ main postgres config [command] [flags]
 
 ## See Also
 
-* [main postgres](/docs/flyctl/main-postgres/)	 - Manage Postgres clusters.
+* [fly postgres](/docs/flyctl/postgres/)	 - Manage Postgres clusters.
 
diff --git a/flyctl/cmd/main_postgres_config_show.md b/flyctl/cmd/fly_postgres_config_show.md
similarity index 74%
rename from flyctl/cmd/main_postgres_config_show.md
rename to flyctl/cmd/fly_postgres_config_show.md
index a8880f933f..aa381b5f4d 100644
--- a/flyctl/cmd/main_postgres_config_show.md
+++ b/flyctl/cmd/fly_postgres_config_show.md
@@ -2,7 +2,7 @@ Show Postgres configuration
 
 ## Usage
 ~~~
-main postgres config show [flags]
+fly postgres config show [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main postgres config show [flags]
 
 ## See Also
 
-* [main postgres config](/docs/flyctl/main-postgres-config/)	 - Show and manage Postgres configuration.
+* [fly postgres config](/docs/flyctl/postgres-config/)	 - Show and manage Postgres configuration.
 
diff --git a/flyctl/cmd/main_postgres_config_update.md b/flyctl/cmd/fly_postgres_config_update.md
similarity index 93%
rename from flyctl/cmd/main_postgres_config_update.md
rename to flyctl/cmd/fly_postgres_config_update.md
index 5529dae502..ef7df91461 100644
--- a/flyctl/cmd/main_postgres_config_update.md
+++ b/flyctl/cmd/fly_postgres_config_update.md
@@ -2,7 +2,7 @@ Update Postgres configuration.
 
 ## Usage
 ~~~
-main postgres config update [flags]
+fly postgres config update [flags]
 ~~~
 
 ## Options
@@ -36,5 +36,5 @@ main postgres config update [flags]
 
 ## See Also
 
-* [main postgres config](/docs/flyctl/main-postgres-config/)	 - Show and manage Postgres configuration.
+* [fly postgres config](/docs/flyctl/postgres-config/)	 - Show and manage Postgres configuration.
 
diff --git a/flyctl/cmd/main_postgres_connect.md b/flyctl/cmd/fly_postgres_connect.md
similarity index 86%
rename from flyctl/cmd/main_postgres_connect.md
rename to flyctl/cmd/fly_postgres_connect.md
index b84efd27be..888af33f24 100644
--- a/flyctl/cmd/main_postgres_connect.md
+++ b/flyctl/cmd/fly_postgres_connect.md
@@ -3,7 +3,7 @@ Connect to the Postgres console
 
 ## Usage
 ~~~
-main postgres connect [flags]
+fly postgres connect [flags]
 ~~~
 
 ## Options
@@ -27,5 +27,5 @@ main postgres connect [flags]
 
 ## See Also
 
-* [main postgres](/docs/flyctl/main-postgres/)	 - Manage Postgres clusters.
+* [fly postgres](/docs/flyctl/postgres/)	 - Manage Postgres clusters.
 
diff --git a/flyctl/cmd/main_postgres_create.md b/flyctl/cmd/fly_postgres_create.md
similarity index 94%
rename from flyctl/cmd/main_postgres_create.md
rename to flyctl/cmd/fly_postgres_create.md
index 0e41dd1242..62828ce410 100644
--- a/flyctl/cmd/main_postgres_create.md
+++ b/flyctl/cmd/fly_postgres_create.md
@@ -3,7 +3,7 @@ Create a new Postgres cluster
 
 ## Usage
 ~~~
-main postgres create [flags]
+fly postgres create [flags]
 ~~~
 
 ## Options
@@ -38,5 +38,5 @@ main postgres create [flags]
 
 ## See Also
 
-* [main postgres](/docs/flyctl/main-postgres/)	 - Manage Postgres clusters.
+* [fly postgres](/docs/flyctl/postgres/)	 - Manage Postgres clusters.
 
diff --git a/flyctl/cmd/main_postgres_db.md b/flyctl/cmd/fly_postgres_db.md
similarity index 66%
rename from flyctl/cmd/main_postgres_db.md
rename to flyctl/cmd/fly_postgres_db.md
index edb054362f..aa88be6151 100644
--- a/flyctl/cmd/main_postgres_db.md
+++ b/flyctl/cmd/fly_postgres_db.md
@@ -3,11 +3,11 @@ Manage databases in a cluster
 
 ## Usage
 ~~~
-main postgres db [command] [flags]
+fly postgres db [command] [flags]
 ~~~
 
 ## Available Commands
-* [list](/docs/flyctl/main-postgres-db-list/)	 - list databases
+* [list](/docs/flyctl/postgres-db-list/)	 - list databases
 
 ## Options
 
@@ -26,5 +26,5 @@ main postgres db [command] [flags]
 
 ## See Also
 
-* [main postgres](/docs/flyctl/main-postgres/)	 - Manage Postgres clusters.
+* [fly postgres](/docs/flyctl/postgres/)	 - Manage Postgres clusters.
 
diff --git a/flyctl/cmd/main_postgres_db_list.md b/flyctl/cmd/fly_postgres_db_list.md
similarity index 77%
rename from flyctl/cmd/main_postgres_db_list.md
rename to flyctl/cmd/fly_postgres_db_list.md
index 7175d2073d..880af67e32 100644
--- a/flyctl/cmd/main_postgres_db_list.md
+++ b/flyctl/cmd/fly_postgres_db_list.md
@@ -3,7 +3,7 @@ list databases
 
 ## Usage
 ~~~
-main postgres db list [flags]
+fly postgres db list [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main postgres db list [flags]
 
 ## See Also
 
-* [main postgres db](/docs/flyctl/main-postgres-db/)	 - Manage databases in a cluster
+* [fly postgres db](/docs/flyctl/postgres-db/)	 - Manage databases in a cluster
 
diff --git a/flyctl/cmd/main_postgres_detach.md b/flyctl/cmd/fly_postgres_detach.md
similarity index 77%
rename from flyctl/cmd/main_postgres_detach.md
rename to flyctl/cmd/fly_postgres_detach.md
index 183c180454..962f4f5566 100644
--- a/flyctl/cmd/main_postgres_detach.md
+++ b/flyctl/cmd/fly_postgres_detach.md
@@ -3,7 +3,7 @@ Detach a postgres cluster from an app
 
 ## Usage
 ~~~
-main postgres detach <POSTGRES APP> [flags]
+fly postgres detach <POSTGRES APP> [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main postgres detach <POSTGRES APP> [flags]
 
 ## See Also
 
-* [main postgres](/docs/flyctl/main-postgres/)	 - Manage Postgres clusters.
+* [fly postgres](/docs/flyctl/postgres/)	 - Manage Postgres clusters.
 
diff --git a/flyctl/cmd/main_postgres_events.md b/flyctl/cmd/fly_postgres_events.md
similarity index 62%
rename from flyctl/cmd/main_postgres_events.md
rename to flyctl/cmd/fly_postgres_events.md
index f368facd04..f5e20ee539 100644
--- a/flyctl/cmd/main_postgres_events.md
+++ b/flyctl/cmd/fly_postgres_events.md
@@ -3,11 +3,11 @@ Track major cluster events
 
 ## Usage
 ~~~
-main postgres events [command] [flags]
+fly postgres events [command] [flags]
 ~~~
 
 ## Available Commands
-* [list](/docs/flyctl/main-postgres-events-list/)	 - Outputs a formatted list of cluster events
+* [list](/docs/flyctl/postgres-events-list/)	 - Outputs a formatted list of cluster events
 
 ## Options
 
@@ -26,5 +26,5 @@ main postgres events [command] [flags]
 
 ## See Also
 
-* [main postgres](/docs/flyctl/main-postgres/)	 - Manage Postgres clusters.
+* [fly postgres](/docs/flyctl/postgres/)	 - Manage Postgres clusters.
 
diff --git a/flyctl/cmd/main_postgres_events_list.md b/flyctl/cmd/fly_postgres_events_list.md
similarity index 86%
rename from flyctl/cmd/main_postgres_events_list.md
rename to flyctl/cmd/fly_postgres_events_list.md
index 97439672ee..eece9f054f 100644
--- a/flyctl/cmd/main_postgres_events_list.md
+++ b/flyctl/cmd/fly_postgres_events_list.md
@@ -3,7 +3,7 @@ Outputs a formatted list of cluster events
 
 ## Usage
 ~~~
-main postgres events list [flags]
+fly postgres events list [flags]
 ~~~
 
 ## Options
@@ -30,5 +30,5 @@ main postgres events list [flags]
 
 ## See Also
 
-* [main postgres events](/docs/flyctl/main-postgres-events/)	 - Track major cluster events
+* [fly postgres events](/docs/flyctl/postgres-events/)	 - Track major cluster events
 
diff --git a/flyctl/cmd/main_postgres_failover.md b/flyctl/cmd/fly_postgres_failover.md
similarity index 87%
rename from flyctl/cmd/main_postgres_failover.md
rename to flyctl/cmd/fly_postgres_failover.md
index 4a09a7fbb6..70e6a7e704 100644
--- a/flyctl/cmd/main_postgres_failover.md
+++ b/flyctl/cmd/fly_postgres_failover.md
@@ -3,7 +3,7 @@ Failover to a new primary
 
 ## Usage
 ~~~
-main postgres failover [flags]
+fly postgres failover [flags]
 ~~~
 
 ## Options
@@ -26,5 +26,5 @@ main postgres failover [flags]
 
 ## See Also
 
-* [main postgres](/docs/flyctl/main-postgres/)	 - Manage Postgres clusters.
+* [fly postgres](/docs/flyctl/postgres/)	 - Manage Postgres clusters.
 
diff --git a/flyctl/cmd/main_postgres_import.md b/flyctl/cmd/fly_postgres_import.md
similarity index 90%
rename from flyctl/cmd/main_postgres_import.md
rename to flyctl/cmd/fly_postgres_import.md
index e193ab526a..f72f55bf90 100644
--- a/flyctl/cmd/main_postgres_import.md
+++ b/flyctl/cmd/fly_postgres_import.md
@@ -3,7 +3,7 @@ Imports database from a specified Postgres URI
 
 ## Usage
 ~~~
-main postgres import <source-uri> [flags]
+fly postgres import <source-uri> [flags]
 ~~~
 
 ## Options
@@ -31,5 +31,5 @@ main postgres import <source-uri> [flags]
 
 ## See Also
 
-* [main postgres](/docs/flyctl/main-postgres/)	 - Manage Postgres clusters.
+* [fly postgres](/docs/flyctl/postgres/)	 - Manage Postgres clusters.
 
diff --git a/flyctl/cmd/main_postgres_list.md b/flyctl/cmd/fly_postgres_list.md
similarity index 75%
rename from flyctl/cmd/main_postgres_list.md
rename to flyctl/cmd/fly_postgres_list.md
index ae06809900..51daa23f44 100644
--- a/flyctl/cmd/main_postgres_list.md
+++ b/flyctl/cmd/fly_postgres_list.md
@@ -3,7 +3,7 @@ List postgres clusters
 
 ## Usage
 ~~~
-main postgres list [flags]
+fly postgres list [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main postgres list [flags]
 
 ## See Also
 
-* [main postgres](/docs/flyctl/main-postgres/)	 - Manage Postgres clusters.
+* [fly postgres](/docs/flyctl/postgres/)	 - Manage Postgres clusters.
 
diff --git a/flyctl/cmd/main_postgres_renew-certs.md b/flyctl/cmd/fly_postgres_renew-certs.md
similarity index 84%
rename from flyctl/cmd/main_postgres_renew-certs.md
rename to flyctl/cmd/fly_postgres_renew-certs.md
index 825ffad3d0..163aad851f 100644
--- a/flyctl/cmd/main_postgres_renew-certs.md
+++ b/flyctl/cmd/fly_postgres_renew-certs.md
@@ -2,7 +2,7 @@ Renews the SSH certificates for the Postgres cluster. This is useful when the ce
 
 ## Usage
 ~~~
-main postgres renew-certs [flags]
+fly postgres renew-certs [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main postgres renew-certs [flags]
 
 ## See Also
 
-* [main postgres](/docs/flyctl/main-postgres/)	 - Manage Postgres clusters.
+* [fly postgres](/docs/flyctl/postgres/)	 - Manage Postgres clusters.
 
diff --git a/flyctl/cmd/main_postgres_restart.md b/flyctl/cmd/fly_postgres_restart.md
similarity index 86%
rename from flyctl/cmd/main_postgres_restart.md
rename to flyctl/cmd/fly_postgres_restart.md
index 4a700f8f12..002cd29388 100644
--- a/flyctl/cmd/main_postgres_restart.md
+++ b/flyctl/cmd/fly_postgres_restart.md
@@ -3,7 +3,7 @@ Restarts each member of the Postgres cluster one by one. Downtime should be mini
 
 ## Usage
 ~~~
-main postgres restart [flags]
+fly postgres restart [flags]
 ~~~
 
 ## Options
@@ -26,5 +26,5 @@ main postgres restart [flags]
 
 ## See Also
 
-* [main postgres](/docs/flyctl/main-postgres/)	 - Manage Postgres clusters.
+* [fly postgres](/docs/flyctl/postgres/)	 - Manage Postgres clusters.
 
diff --git a/flyctl/cmd/main_postgres_users.md b/flyctl/cmd/fly_postgres_users.md
similarity index 65%
rename from flyctl/cmd/main_postgres_users.md
rename to flyctl/cmd/fly_postgres_users.md
index 0b4ac29815..c6d9c91dce 100644
--- a/flyctl/cmd/main_postgres_users.md
+++ b/flyctl/cmd/fly_postgres_users.md
@@ -3,11 +3,11 @@ Manage users in a postgres cluster
 
 ## Usage
 ~~~
-main postgres users [command] [flags]
+fly postgres users [command] [flags]
 ~~~
 
 ## Available Commands
-* [list](/docs/flyctl/main-postgres-users-list/)	 - List users
+* [list](/docs/flyctl/postgres-users-list/)	 - List users
 
 ## Options
 
@@ -25,5 +25,5 @@ main postgres users [command] [flags]
 
 ## See Also
 
-* [main postgres](/docs/flyctl/main-postgres/)	 - Manage Postgres clusters.
+* [fly postgres](/docs/flyctl/postgres/)	 - Manage Postgres clusters.
 
diff --git a/flyctl/cmd/main_postgres_users_list.md b/flyctl/cmd/fly_postgres_users_list.md
similarity index 76%
rename from flyctl/cmd/main_postgres_users_list.md
rename to flyctl/cmd/fly_postgres_users_list.md
index c6be8ef2ae..a724fa7258 100644
--- a/flyctl/cmd/main_postgres_users_list.md
+++ b/flyctl/cmd/fly_postgres_users_list.md
@@ -3,7 +3,7 @@ List users
 
 ## Usage
 ~~~
-main postgres users list [flags]
+fly postgres users list [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main postgres users list [flags]
 
 ## See Also
 
-* [main postgres users](/docs/flyctl/main-postgres-users/)	 - Manage users in a postgres cluster
+* [fly postgres users](/docs/flyctl/postgres-users/)	 - Manage users in a postgres cluster
 
diff --git a/flyctl/cmd/main_proxy.md b/flyctl/cmd/fly_proxy.md
similarity index 89%
rename from flyctl/cmd/main_proxy.md
rename to flyctl/cmd/fly_proxy.md
index 6d8f884599..c0823963db 100644
--- a/flyctl/cmd/main_proxy.md
+++ b/flyctl/cmd/fly_proxy.md
@@ -3,7 +3,7 @@ connects to the first Machine address returned by an internal DNS query on the a
 
 ## Usage
 ~~~
-main proxy <local:remote> [remote_host] [flags]
+fly proxy <local:remote> [remote_host] [flags]
 ~~~
 
 ## Options
@@ -29,5 +29,5 @@ main proxy <local:remote> [remote_host] [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/fly_redis.md b/flyctl/cmd/fly_redis.md
new file mode 100644
index 0000000000..feb92bb8a9
--- /dev/null
+++ b/flyctl/cmd/fly_redis.md
@@ -0,0 +1,37 @@
+Launch and manage Redis databases managed by Upstash.com
+
+## Usage
+~~~
+fly redis [command] [flags]
+~~~
+
+## Available Commands
+* [connect](/docs/flyctl/redis-connect/)	 - Connect to a Redis database using redis-cli
+* [create](/docs/flyctl/redis-create/)	 - Create an Upstash Redis database
+* [dashboard](/docs/flyctl/redis-dashboard/)	 - View your Upstash Redis databases on the Upstash web console
+* [destroy](/docs/flyctl/redis-destroy/)	 - Permanently destroy an Upstash Redis database
+* [list](/docs/flyctl/redis-list/)	 - List Upstash Redis databases for an organization
+* [plans](/docs/flyctl/redis-plans/)	 - List available Redis plans
+* [proxy](/docs/flyctl/redis-proxy/)	 - Proxy to a Redis database
+* [reset](/docs/flyctl/redis-reset/)	 - Reset the password for an Upstash Redis database
+* [status](/docs/flyctl/redis-status/)	 - Show status of a Redis database
+* [update](/docs/flyctl/redis-update/)	 - Update an Upstash Redis database
+
+## Options
+
+~~~
+  -h, --help   help for redis
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/main_redis_connect.md b/flyctl/cmd/fly_redis_connect.md
similarity index 78%
rename from flyctl/cmd/main_redis_connect.md
rename to flyctl/cmd/fly_redis_connect.md
index 7e8e39c622..1fa522057d 100644
--- a/flyctl/cmd/main_redis_connect.md
+++ b/flyctl/cmd/fly_redis_connect.md
@@ -2,7 +2,7 @@ Connect to a Redis database using redis-cli
 
 ## Usage
 ~~~
-main redis connect [flags]
+fly redis connect [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main redis connect [flags]
 
 ## See Also
 
-* [main redis](/docs/flyctl/main-redis/)	 - Launch and manage Redis databases managed by Upstash.com
+* [fly redis](/docs/flyctl/redis/)	 - Launch and manage Redis databases managed by Upstash.com
 
diff --git a/flyctl/cmd/main_redis_create.md b/flyctl/cmd/fly_redis_create.md
similarity index 87%
rename from flyctl/cmd/main_redis_create.md
rename to flyctl/cmd/fly_redis_create.md
index 451cead92f..bf1f69098c 100644
--- a/flyctl/cmd/main_redis_create.md
+++ b/flyctl/cmd/fly_redis_create.md
@@ -2,7 +2,7 @@ Create an Upstash Redis database
 
 ## Usage
 ~~~
-main redis create [flags]
+fly redis create [flags]
 ~~~
 
 ## Options
@@ -28,5 +28,5 @@ main redis create [flags]
 
 ## See Also
 
-* [main redis](/docs/flyctl/main-redis/)	 - Launch and manage Redis databases managed by Upstash.com
+* [fly redis](/docs/flyctl/redis/)	 - Launch and manage Redis databases managed by Upstash.com
 
diff --git a/flyctl/cmd/main_redis_dashboard.md b/flyctl/cmd/fly_redis_dashboard.md
similarity index 70%
rename from flyctl/cmd/main_redis_dashboard.md
rename to flyctl/cmd/fly_redis_dashboard.md
index ab20ee3bb8..b6461a7a09 100644
--- a/flyctl/cmd/main_redis_dashboard.md
+++ b/flyctl/cmd/fly_redis_dashboard.md
@@ -2,7 +2,7 @@ View your Upstash Redis databases on the Upstash web console
 
 ## Usage
 ~~~
-main redis dashboard <org_slug> [flags]
+fly redis dashboard <org_slug> [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main redis dashboard <org_slug> [flags]
 
 ## See Also
 
-* [main redis](/docs/flyctl/main-redis/)	 - Launch and manage Redis databases managed by Upstash.com
+* [fly redis](/docs/flyctl/redis/)	 - Launch and manage Redis databases managed by Upstash.com
 
diff --git a/flyctl/cmd/main_redis_destroy.md b/flyctl/cmd/fly_redis_destroy.md
similarity index 72%
rename from flyctl/cmd/main_redis_destroy.md
rename to flyctl/cmd/fly_redis_destroy.md
index 32483eb2df..ad1d3768ab 100644
--- a/flyctl/cmd/main_redis_destroy.md
+++ b/flyctl/cmd/fly_redis_destroy.md
@@ -2,7 +2,7 @@ Permanently destroy an Upstash Redis database
 
 ## Usage
 ~~~
-main redis destroy <name> [flags]
+fly redis destroy <name> [flags]
 ~~~
 
 ## Options
@@ -22,5 +22,5 @@ main redis destroy <name> [flags]
 
 ## See Also
 
-* [main redis](/docs/flyctl/main-redis/)	 - Launch and manage Redis databases managed by Upstash.com
+* [fly redis](/docs/flyctl/redis/)	 - Launch and manage Redis databases managed by Upstash.com
 
diff --git a/flyctl/cmd/main_redis_list.md b/flyctl/cmd/fly_redis_list.md
similarity index 75%
rename from flyctl/cmd/main_redis_list.md
rename to flyctl/cmd/fly_redis_list.md
index e88afda872..3bb0dd9e1a 100644
--- a/flyctl/cmd/main_redis_list.md
+++ b/flyctl/cmd/fly_redis_list.md
@@ -2,7 +2,7 @@ List Upstash Redis databases for an organization
 
 ## Usage
 ~~~
-main redis list [flags]
+fly redis list [flags]
 ~~~
 
 ## Options
@@ -22,5 +22,5 @@ main redis list [flags]
 
 ## See Also
 
-* [main redis](/docs/flyctl/main-redis/)	 - Launch and manage Redis databases managed by Upstash.com
+* [fly redis](/docs/flyctl/redis/)	 - Launch and manage Redis databases managed by Upstash.com
 
diff --git a/flyctl/cmd/main_redis_plans.md b/flyctl/cmd/fly_redis_plans.md
similarity index 70%
rename from flyctl/cmd/main_redis_plans.md
rename to flyctl/cmd/fly_redis_plans.md
index 73f171629b..075c25acc7 100644
--- a/flyctl/cmd/main_redis_plans.md
+++ b/flyctl/cmd/fly_redis_plans.md
@@ -2,7 +2,7 @@ List available Redis plans
 
 ## Usage
 ~~~
-main redis plans [flags]
+fly redis plans [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main redis plans [flags]
 
 ## See Also
 
-* [main redis](/docs/flyctl/main-redis/)	 - Launch and manage Redis databases managed by Upstash.com
+* [fly redis](/docs/flyctl/redis/)	 - Launch and manage Redis databases managed by Upstash.com
 
diff --git a/flyctl/cmd/main_redis_proxy.md b/flyctl/cmd/fly_redis_proxy.md
similarity index 77%
rename from flyctl/cmd/main_redis_proxy.md
rename to flyctl/cmd/fly_redis_proxy.md
index d4c7e837a4..c5244fc99e 100644
--- a/flyctl/cmd/main_redis_proxy.md
+++ b/flyctl/cmd/fly_redis_proxy.md
@@ -2,7 +2,7 @@ Proxy to a Redis database
 
 ## Usage
 ~~~
-main redis proxy [flags]
+fly redis proxy [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main redis proxy [flags]
 
 ## See Also
 
-* [main redis](/docs/flyctl/main-redis/)	 - Launch and manage Redis databases managed by Upstash.com
+* [fly redis](/docs/flyctl/redis/)	 - Launch and manage Redis databases managed by Upstash.com
 
diff --git a/flyctl/cmd/main_redis_reset.md b/flyctl/cmd/fly_redis_reset.md
similarity index 70%
rename from flyctl/cmd/main_redis_reset.md
rename to flyctl/cmd/fly_redis_reset.md
index 986fce1250..d8a863d5dd 100644
--- a/flyctl/cmd/main_redis_reset.md
+++ b/flyctl/cmd/fly_redis_reset.md
@@ -2,7 +2,7 @@ Reset the password for an Upstash Redis database
 
 ## Usage
 ~~~
-main redis reset <name> [flags]
+fly redis reset <name> [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main redis reset <name> [flags]
 
 ## See Also
 
-* [main redis](/docs/flyctl/main-redis/)	 - Launch and manage Redis databases managed by Upstash.com
+* [fly redis](/docs/flyctl/redis/)	 - Launch and manage Redis databases managed by Upstash.com
 
diff --git a/flyctl/cmd/main_redis_status.md b/flyctl/cmd/fly_redis_status.md
similarity index 69%
rename from flyctl/cmd/main_redis_status.md
rename to flyctl/cmd/fly_redis_status.md
index 6f0c3ba57e..732f4e0a8f 100644
--- a/flyctl/cmd/main_redis_status.md
+++ b/flyctl/cmd/fly_redis_status.md
@@ -3,7 +3,7 @@ Show status of a Redis database
 
 ## Usage
 ~~~
-main redis status <name> [flags]
+fly redis status <name> [flags]
 ~~~
 
 ## Options
@@ -22,5 +22,5 @@ main redis status <name> [flags]
 
 ## See Also
 
-* [main redis](/docs/flyctl/main-redis/)	 - Launch and manage Redis databases managed by Upstash.com
+* [fly redis](/docs/flyctl/redis/)	 - Launch and manage Redis databases managed by Upstash.com
 
diff --git a/flyctl/cmd/main_redis_update.md b/flyctl/cmd/fly_redis_update.md
similarity index 81%
rename from flyctl/cmd/main_redis_update.md
rename to flyctl/cmd/fly_redis_update.md
index 916dd558cc..a45ff2a8f7 100644
--- a/flyctl/cmd/main_redis_update.md
+++ b/flyctl/cmd/fly_redis_update.md
@@ -2,7 +2,7 @@ Update an Upstash Redis database
 
 ## Usage
 ~~~
-main redis update <name> [flags]
+fly redis update <name> [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main redis update <name> [flags]
 
 ## See Also
 
-* [main redis](/docs/flyctl/main-redis/)	 - Launch and manage Redis databases managed by Upstash.com
+* [fly redis](/docs/flyctl/redis/)	 - Launch and manage Redis databases managed by Upstash.com
 
diff --git a/flyctl/cmd/main_releases.md b/flyctl/cmd/fly_releases.md
similarity index 87%
rename from flyctl/cmd/main_releases.md
rename to flyctl/cmd/fly_releases.md
index 9513f529cc..02f7238e91 100644
--- a/flyctl/cmd/main_releases.md
+++ b/flyctl/cmd/fly_releases.md
@@ -4,7 +4,7 @@ including type, when, success/fail and which user triggered the release.
 
 ## Usage
 ~~~
-main releases [flags]
+fly releases [flags]
 ~~~
 
 ## Options
@@ -27,5 +27,5 @@ main releases [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/fly_scale.md b/flyctl/cmd/fly_scale.md
new file mode 100644
index 0000000000..916ce66d3d
--- /dev/null
+++ b/flyctl/cmd/fly_scale.md
@@ -0,0 +1,31 @@
+Scale application resources
+
+## Usage
+~~~
+fly scale [command] [flags]
+~~~
+
+## Available Commands
+* [count](/docs/flyctl/scale-count/)	 - Change an app's VM count to the given value
+* [memory](/docs/flyctl/scale-memory/)	 - Set VM memory
+* [show](/docs/flyctl/scale-show/)	 - Show current resources
+* [vm](/docs/flyctl/scale-vm/)	 - Change an app's VM to a named size (eg. shared-cpu-1x, performance-1x, performance-2x...)
+
+## Options
+
+~~~
+  -h, --help   help for scale
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/main_scale_count.md b/flyctl/cmd/fly_scale_count.md
similarity index 95%
rename from flyctl/cmd/main_scale_count.md
rename to flyctl/cmd/fly_scale_count.md
index f92b6c853d..e4459ad4f4 100644
--- a/flyctl/cmd/main_scale_count.md
+++ b/flyctl/cmd/fly_scale_count.md
@@ -4,7 +4,7 @@ For pricing, see https://fly.io/docs/about/pricing/
 
 ## Usage
 ~~~
-main scale count [count] [flags]
+fly scale count [count] [flags]
 ~~~
 
 ## Options
@@ -39,5 +39,5 @@ main scale count [count] [flags]
 
 ## See Also
 
-* [main scale](/docs/flyctl/main-scale/)	 - Scale app resources
+* [fly scale](/docs/flyctl/scale/)	 - Scale app resources
 
diff --git a/flyctl/cmd/main_scale_memory.md b/flyctl/cmd/fly_scale_memory.md
similarity index 83%
rename from flyctl/cmd/main_scale_memory.md
rename to flyctl/cmd/fly_scale_memory.md
index b14a21295f..9e82120469 100644
--- a/flyctl/cmd/main_scale_memory.md
+++ b/flyctl/cmd/fly_scale_memory.md
@@ -2,7 +2,7 @@ Set VM memory to a number of megabytes
 
 ## Usage
 ~~~
-main scale memory [memoryMB] [flags]
+fly scale memory [memoryMB] [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main scale memory [memoryMB] [flags]
 
 ## See Also
 
-* [main scale](/docs/flyctl/main-scale/)	 - Scale app resources
+* [fly scale](/docs/flyctl/scale/)	 - Scale app resources
 
diff --git a/flyctl/cmd/main_scale_show.md b/flyctl/cmd/fly_scale_show.md
similarity index 83%
rename from flyctl/cmd/main_scale_show.md
rename to flyctl/cmd/fly_scale_show.md
index 65325bf31d..392cab41ef 100644
--- a/flyctl/cmd/main_scale_show.md
+++ b/flyctl/cmd/fly_scale_show.md
@@ -2,7 +2,7 @@ Show current VM size and counts
 
 ## Usage
 ~~~
-main scale show [flags]
+fly scale show [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main scale show [flags]
 
 ## See Also
 
-* [main scale](/docs/flyctl/main-scale/)	 - Scale app resources
+* [fly scale](/docs/flyctl/scale/)	 - Scale app resources
 
diff --git a/flyctl/cmd/main_scale_vm.md b/flyctl/cmd/fly_scale_vm.md
similarity index 89%
rename from flyctl/cmd/main_scale_vm.md
rename to flyctl/cmd/fly_scale_vm.md
index af37fd6e32..ee343d1200 100644
--- a/flyctl/cmd/main_scale_vm.md
+++ b/flyctl/cmd/fly_scale_vm.md
@@ -9,7 +9,7 @@ For pricing, see https://fly.io/docs/about/pricing/
 
 ## Usage
 ~~~
-main scale vm [size] [flags]
+fly scale vm [size] [flags]
 ~~~
 
 ## Options
@@ -32,5 +32,5 @@ main scale vm [size] [flags]
 
 ## See Also
 
-* [main scale](/docs/flyctl/main-scale/)	 - Scale app resources
+* [fly scale](/docs/flyctl/scale/)	 - Scale app resources
 
diff --git a/flyctl/cmd/fly_secrets.md b/flyctl/cmd/fly_secrets.md
new file mode 100644
index 0000000000..63a08de02c
--- /dev/null
+++ b/flyctl/cmd/fly_secrets.md
@@ -0,0 +1,35 @@
+Secrets are provided to applications at runtime as ENV variables. Names are
+		case sensitive and stored as-is, so ensure names are appropriate for
+		the application and vm environment.
+		
+
+## Usage
+~~~
+fly secrets [command] [flags]
+~~~
+
+## Available Commands
+* [deploy](/docs/flyctl/secrets-deploy/)	 - Deploy staged secrets for an application
+* [import](/docs/flyctl/secrets-import/)	 - Set secrets as NAME=VALUE pairs from stdin
+* [list](/docs/flyctl/secrets-list/)	 - List application secret names, digests and creation times
+* [set](/docs/flyctl/secrets-set/)	 - Set one or more encrypted secrets for an application
+* [unset](/docs/flyctl/secrets-unset/)	 - Unset one or more encrypted secrets for an application
+
+## Options
+
+~~~
+  -h, --help   help for secrets
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/main_secrets_deploy.md b/flyctl/cmd/fly_secrets_deploy.md
similarity index 78%
rename from flyctl/cmd/main_secrets_deploy.md
rename to flyctl/cmd/fly_secrets_deploy.md
index 503253700a..cc8f758581 100644
--- a/flyctl/cmd/main_secrets_deploy.md
+++ b/flyctl/cmd/fly_secrets_deploy.md
@@ -2,7 +2,7 @@ Deploy staged secrets for an application
 
 ## Usage
 ~~~
-main secrets deploy [flags]
+fly secrets deploy [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main secrets deploy [flags]
 
 ## See Also
 
-* [main secrets](/docs/flyctl/main-secrets/)	 - Manage application secrets with the set and unset commands.
+* [fly secrets](/docs/flyctl/secrets/)	 - Manage application secrets with the set and unset commands.
 
diff --git a/flyctl/cmd/main_secrets_import.md b/flyctl/cmd/fly_secrets_import.md
similarity index 82%
rename from flyctl/cmd/main_secrets_import.md
rename to flyctl/cmd/fly_secrets_import.md
index 66514ce5cc..446a540e7e 100644
--- a/flyctl/cmd/main_secrets_import.md
+++ b/flyctl/cmd/fly_secrets_import.md
@@ -2,7 +2,7 @@ Set one or more encrypted secrets for an application. Values are read from stdin
 
 ## Usage
 ~~~
-main secrets import [flags]
+fly secrets import [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main secrets import [flags]
 
 ## See Also
 
-* [main secrets](/docs/flyctl/main-secrets/)	 - Manage application secrets with the set and unset commands.
+* [fly secrets](/docs/flyctl/secrets/)	 - Manage application secrets with the set and unset commands.
 
diff --git a/flyctl/cmd/main_secrets_list.md b/flyctl/cmd/fly_secrets_list.md
similarity index 82%
rename from flyctl/cmd/main_secrets_list.md
rename to flyctl/cmd/fly_secrets_list.md
index d88b512542..02b91d9c8d 100644
--- a/flyctl/cmd/main_secrets_list.md
+++ b/flyctl/cmd/fly_secrets_list.md
@@ -4,7 +4,7 @@ actual value of the secret is only available to the application.
 
 ## Usage
 ~~~
-main secrets list [flags]
+fly secrets list [flags]
 ~~~
 
 ## Options
@@ -26,5 +26,5 @@ main secrets list [flags]
 
 ## See Also
 
-* [main secrets](/docs/flyctl/main-secrets/)	 - Manage application secrets with the set and unset commands.
+* [fly secrets](/docs/flyctl/secrets/)	 - Manage application secrets with the set and unset commands.
 
diff --git a/flyctl/cmd/main_secrets_set.md b/flyctl/cmd/fly_secrets_set.md
similarity index 78%
rename from flyctl/cmd/main_secrets_set.md
rename to flyctl/cmd/fly_secrets_set.md
index 0e59cffe6c..3d6ec9667c 100644
--- a/flyctl/cmd/main_secrets_set.md
+++ b/flyctl/cmd/fly_secrets_set.md
@@ -2,7 +2,7 @@ Set one or more encrypted secrets for an application
 
 ## Usage
 ~~~
-main secrets set [flags] NAME=VALUE NAME=VALUE ...
+fly secrets set [flags] NAME=VALUE NAME=VALUE ...
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main secrets set [flags] NAME=VALUE NAME=VALUE ...
 
 ## See Also
 
-* [main secrets](/docs/flyctl/main-secrets/)	 - Manage application secrets with the set and unset commands.
+* [fly secrets](/docs/flyctl/secrets/)	 - Manage application secrets with the set and unset commands.
 
diff --git a/flyctl/cmd/main_secrets_unset.md b/flyctl/cmd/fly_secrets_unset.md
similarity index 80%
rename from flyctl/cmd/main_secrets_unset.md
rename to flyctl/cmd/fly_secrets_unset.md
index 6eaa67cfc6..b3649028fa 100644
--- a/flyctl/cmd/main_secrets_unset.md
+++ b/flyctl/cmd/fly_secrets_unset.md
@@ -2,7 +2,7 @@ Unset one or more encrypted secrets for an application
 
 ## Usage
 ~~~
-main secrets unset [flags] NAME NAME ...
+fly secrets unset [flags] NAME NAME ...
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main secrets unset [flags] NAME NAME ...
 
 ## See Also
 
-* [main secrets](/docs/flyctl/main-secrets/)	 - Manage application secrets with the set and unset commands.
+* [fly secrets](/docs/flyctl/secrets/)	 - Manage application secrets with the set and unset commands.
 
diff --git a/flyctl/cmd/main_services.md b/flyctl/cmd/fly_services.md
similarity index 69%
rename from flyctl/cmd/main_services.md
rename to flyctl/cmd/fly_services.md
index 8b4723e969..9369058200 100644
--- a/flyctl/cmd/main_services.md
+++ b/flyctl/cmd/fly_services.md
@@ -2,11 +2,11 @@ Shows information about the services of the application.
 
 ## Usage
 ~~~
-main services [command] [flags]
+fly services [command] [flags]
 ~~~
 
 ## Available Commands
-* [list](/docs/flyctl/main-services-list/)	 - List services
+* [list](/docs/flyctl/services-list/)	 - List services
 
 ## Options
 
@@ -24,5 +24,5 @@ main services [command] [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/main_services_list.md b/flyctl/cmd/fly_services_list.md
similarity index 79%
rename from flyctl/cmd/main_services_list.md
rename to flyctl/cmd/fly_services_list.md
index ba22252171..73d4507c21 100644
--- a/flyctl/cmd/main_services_list.md
+++ b/flyctl/cmd/fly_services_list.md
@@ -2,7 +2,7 @@ List the services that are associated with an app
 
 ## Usage
 ~~~
-main services list [flags]
+fly services list [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main services list [flags]
 
 ## See Also
 
-* [main services](/docs/flyctl/main-services/)	 - Show the application's services
+* [fly services](/docs/flyctl/services/)	 - Show the application's services
 
diff --git a/flyctl/cmd/fly_settings.md b/flyctl/cmd/fly_settings.md
new file mode 100644
index 0000000000..fada20a524
--- /dev/null
+++ b/flyctl/cmd/fly_settings.md
@@ -0,0 +1,30 @@
+Manage flyctl settings
+
+## Usage
+~~~
+fly settings [command] [flags]
+~~~
+
+## Available Commands
+* [analytics](/docs/flyctl/settings-analytics/)	 - Control anonymized analytics collection
+* [autoupdate](/docs/flyctl/settings-autoupdate/)	 - Control automatic updates
+* [synthetics](/docs/flyctl/settings-synthetics/)	 - Control synthetics agent execution
+
+## Options
+
+~~~
+  -h, --help   help for settings
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/main_settings_analytics.md b/flyctl/cmd/fly_settings_analytics.md
similarity index 56%
rename from flyctl/cmd/main_settings_analytics.md
rename to flyctl/cmd/fly_settings_analytics.md
index bd5c1bb7c7..bb8dbff285 100644
--- a/flyctl/cmd/main_settings_analytics.md
+++ b/flyctl/cmd/fly_settings_analytics.md
@@ -2,12 +2,12 @@ Control anonymized analytics collection
 
 ## Usage
 ~~~
-main settings analytics [flags]
+fly settings analytics [flags]
 ~~~
 
 ## Available Commands
-* [disable](/docs/flyctl/main-settings-analytics-disable/)	 - Disable analytics
-* [enable](/docs/flyctl/main-settings-analytics-enable/)	 - Enable analytics
+* [disable](/docs/flyctl/settings-analytics-disable/)	 - Disable analytics
+* [enable](/docs/flyctl/settings-analytics-enable/)	 - Enable analytics
 
 ## Options
 
@@ -25,5 +25,5 @@ main settings analytics [flags]
 
 ## See Also
 
-* [main settings](/docs/flyctl/main-settings/)	 - Manage flyctl settings
+* [fly settings](/docs/flyctl/settings/)	 - Manage flyctl settings
 
diff --git a/flyctl/cmd/main_settings_analytics_disable.md b/flyctl/cmd/fly_settings_analytics_disable.md
similarity index 65%
rename from flyctl/cmd/main_settings_analytics_disable.md
rename to flyctl/cmd/fly_settings_analytics_disable.md
index 1ccba065a2..db952b4755 100644
--- a/flyctl/cmd/main_settings_analytics_disable.md
+++ b/flyctl/cmd/fly_settings_analytics_disable.md
@@ -2,7 +2,7 @@ Disable analytics
 
 ## Usage
 ~~~
-main settings analytics disable [flags]
+fly settings analytics disable [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main settings analytics disable [flags]
 
 ## See Also
 
-* [main settings analytics](/docs/flyctl/main-settings-analytics/)	 - Control anonymized analytics collection
+* [fly settings analytics](/docs/flyctl/settings-analytics/)	 - Control anonymized analytics collection
 
diff --git a/flyctl/cmd/main_settings_analytics_enable.md b/flyctl/cmd/fly_settings_analytics_enable.md
similarity index 65%
rename from flyctl/cmd/main_settings_analytics_enable.md
rename to flyctl/cmd/fly_settings_analytics_enable.md
index dac85d5409..98b146df9b 100644
--- a/flyctl/cmd/main_settings_analytics_enable.md
+++ b/flyctl/cmd/fly_settings_analytics_enable.md
@@ -2,7 +2,7 @@ Enable analytics
 
 ## Usage
 ~~~
-main settings analytics enable [flags]
+fly settings analytics enable [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main settings analytics enable [flags]
 
 ## See Also
 
-* [main settings analytics](/docs/flyctl/main-settings-analytics/)	 - Control anonymized analytics collection
+* [fly settings analytics](/docs/flyctl/settings-analytics/)	 - Control anonymized analytics collection
 
diff --git a/flyctl/cmd/main_settings_autoupdate.md b/flyctl/cmd/fly_settings_autoupdate.md
similarity index 53%
rename from flyctl/cmd/main_settings_autoupdate.md
rename to flyctl/cmd/fly_settings_autoupdate.md
index 925d1d27d2..e98adeaf45 100644
--- a/flyctl/cmd/main_settings_autoupdate.md
+++ b/flyctl/cmd/fly_settings_autoupdate.md
@@ -2,12 +2,12 @@ Control automatic updates
 
 ## Usage
 ~~~
-main settings autoupdate [flags]
+fly settings autoupdate [flags]
 ~~~
 
 ## Available Commands
-* [disable](/docs/flyctl/main-settings-autoupdate-disable/)	 - Disable automatic updates
-* [enable](/docs/flyctl/main-settings-autoupdate-enable/)	 - Enable automatic updates
+* [disable](/docs/flyctl/settings-autoupdate-disable/)	 - Disable automatic updates
+* [enable](/docs/flyctl/settings-autoupdate-enable/)	 - Enable automatic updates
 
 ## Options
 
@@ -25,5 +25,5 @@ main settings autoupdate [flags]
 
 ## See Also
 
-* [main settings](/docs/flyctl/main-settings/)	 - Manage flyctl settings
+* [fly settings](/docs/flyctl/settings/)	 - Manage flyctl settings
 
diff --git a/flyctl/cmd/main_settings_autoupdate_disable.md b/flyctl/cmd/fly_settings_autoupdate_disable.md
similarity index 68%
rename from flyctl/cmd/main_settings_autoupdate_disable.md
rename to flyctl/cmd/fly_settings_autoupdate_disable.md
index 02a24ec8b9..2b796c45b2 100644
--- a/flyctl/cmd/main_settings_autoupdate_disable.md
+++ b/flyctl/cmd/fly_settings_autoupdate_disable.md
@@ -2,7 +2,7 @@ Disable automatic updates
 
 ## Usage
 ~~~
-main settings autoupdate disable [flags]
+fly settings autoupdate disable [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main settings autoupdate disable [flags]
 
 ## See Also
 
-* [main settings autoupdate](/docs/flyctl/main-settings-autoupdate/)	 - Control automatic updates
+* [fly settings autoupdate](/docs/flyctl/settings-autoupdate/)	 - Control automatic updates
 
diff --git a/flyctl/cmd/main_settings_autoupdate_enable.md b/flyctl/cmd/fly_settings_autoupdate_enable.md
similarity index 68%
rename from flyctl/cmd/main_settings_autoupdate_enable.md
rename to flyctl/cmd/fly_settings_autoupdate_enable.md
index 79aade53b2..dce7f17c74 100644
--- a/flyctl/cmd/main_settings_autoupdate_enable.md
+++ b/flyctl/cmd/fly_settings_autoupdate_enable.md
@@ -2,7 +2,7 @@ Enable automatic updates
 
 ## Usage
 ~~~
-main settings autoupdate enable [flags]
+fly settings autoupdate enable [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main settings autoupdate enable [flags]
 
 ## See Also
 
-* [main settings autoupdate](/docs/flyctl/main-settings-autoupdate/)	 - Control automatic updates
+* [fly settings autoupdate](/docs/flyctl/settings-autoupdate/)	 - Control automatic updates
 
diff --git a/flyctl/cmd/main_settings_synthetics.md b/flyctl/cmd/fly_settings_synthetics.md
similarity index 55%
rename from flyctl/cmd/main_settings_synthetics.md
rename to flyctl/cmd/fly_settings_synthetics.md
index 454bfac86a..72be448fd3 100644
--- a/flyctl/cmd/main_settings_synthetics.md
+++ b/flyctl/cmd/fly_settings_synthetics.md
@@ -2,12 +2,12 @@ Control synthetics agent execution
 
 ## Usage
 ~~~
-main settings synthetics [flags]
+fly settings synthetics [flags]
 ~~~
 
 ## Available Commands
-* [disable](/docs/flyctl/main-settings-synthetics-disable/)	 - Disable synthetics
-* [enable](/docs/flyctl/main-settings-synthetics-enable/)	 - Enable synthetics
+* [disable](/docs/flyctl/settings-synthetics-disable/)	 - Disable synthetics
+* [enable](/docs/flyctl/settings-synthetics-enable/)	 - Enable synthetics
 
 ## Options
 
@@ -25,5 +25,5 @@ main settings synthetics [flags]
 
 ## See Also
 
-* [main settings](/docs/flyctl/main-settings/)	 - Manage flyctl settings
+* [fly settings](/docs/flyctl/settings/)	 - Manage flyctl settings
 
diff --git a/flyctl/cmd/main_settings_synthetics_disable.md b/flyctl/cmd/fly_settings_synthetics_disable.md
similarity index 66%
rename from flyctl/cmd/main_settings_synthetics_disable.md
rename to flyctl/cmd/fly_settings_synthetics_disable.md
index feae59e1d8..0b57ea2743 100644
--- a/flyctl/cmd/main_settings_synthetics_disable.md
+++ b/flyctl/cmd/fly_settings_synthetics_disable.md
@@ -2,7 +2,7 @@ Disable synthetics
 
 ## Usage
 ~~~
-main settings synthetics disable [flags]
+fly settings synthetics disable [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main settings synthetics disable [flags]
 
 ## See Also
 
-* [main settings synthetics](/docs/flyctl/main-settings-synthetics/)	 - Control synthetics agent execution
+* [fly settings synthetics](/docs/flyctl/settings-synthetics/)	 - Control synthetics agent execution
 
diff --git a/flyctl/cmd/main_settings_synthetics_enable.md b/flyctl/cmd/fly_settings_synthetics_enable.md
similarity index 66%
rename from flyctl/cmd/main_settings_synthetics_enable.md
rename to flyctl/cmd/fly_settings_synthetics_enable.md
index 1539766d7b..ba6e45904e 100644
--- a/flyctl/cmd/main_settings_synthetics_enable.md
+++ b/flyctl/cmd/fly_settings_synthetics_enable.md
@@ -2,7 +2,7 @@ Enable synthetics
 
 ## Usage
 ~~~
-main settings synthetics enable [flags]
+fly settings synthetics enable [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main settings synthetics enable [flags]
 
 ## See Also
 
-* [main settings synthetics](/docs/flyctl/main-settings-synthetics/)	 - Control synthetics agent execution
+* [fly settings synthetics](/docs/flyctl/settings-synthetics/)	 - Control synthetics agent execution
 
diff --git a/flyctl/cmd/fly_sftp.md b/flyctl/cmd/fly_sftp.md
new file mode 100644
index 0000000000..612b9f2cc8
--- /dev/null
+++ b/flyctl/cmd/fly_sftp.md
@@ -0,0 +1,30 @@
+Get or put files from a remote VM.
+
+## Usage
+~~~
+fly sftp [command] [flags]
+~~~
+
+## Available Commands
+* [find](/docs/flyctl/sftp-find/)	 - The SFTP FIND command lists files (from an optional root directory) on a remote VM.
+* [get](/docs/flyctl/sftp-get/)	 - The SFTP GET retrieves a file from a remote VM.
+* [shell](/docs/flyctl/sftp-shell/)	 - The SFTP SHELL command brings up an interactive SFTP session to fetch and push files from/to a VM.
+
+## Options
+
+~~~
+  -h, --help   help for sftp
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/main_sftp_find.md b/flyctl/cmd/fly_sftp_find.md
similarity index 91%
rename from flyctl/cmd/main_sftp_find.md
rename to flyctl/cmd/fly_sftp_find.md
index 433e8aa754..e8e6b3f0d8 100644
--- a/flyctl/cmd/main_sftp_find.md
+++ b/flyctl/cmd/fly_sftp_find.md
@@ -2,7 +2,7 @@ The SFTP FIND command lists files (from an optional root directory) on a remote
 
 ## Usage
 ~~~
-main sftp find [path] [flags]
+fly sftp find [path] [flags]
 ~~~
 
 ## Options
@@ -33,5 +33,5 @@ main sftp find [path] [flags]
 
 ## See Also
 
-* [main sftp](/docs/flyctl/main-sftp/)	 - Get or put files from a remote VM.
+* [fly sftp](/docs/flyctl/sftp/)	 - Get or put files from a remote VM.
 
diff --git a/flyctl/cmd/main_sftp_get.md b/flyctl/cmd/fly_sftp_get.md
similarity index 91%
rename from flyctl/cmd/main_sftp_get.md
rename to flyctl/cmd/fly_sftp_get.md
index d4d1db7d1c..ecd24bdbab 100644
--- a/flyctl/cmd/main_sftp_get.md
+++ b/flyctl/cmd/fly_sftp_get.md
@@ -2,7 +2,7 @@ The SFTP GET retrieves a file from a remote VM.
 
 ## Usage
 ~~~
-main sftp get <path> [flags]
+fly sftp get <path> [flags]
 ~~~
 
 ## Options
@@ -33,5 +33,5 @@ main sftp get <path> [flags]
 
 ## See Also
 
-* [main sftp](/docs/flyctl/main-sftp/)	 - Get or put files from a remote VM.
+* [fly sftp](/docs/flyctl/sftp/)	 - Get or put files from a remote VM.
 
diff --git a/flyctl/cmd/main_sftp_shell.md b/flyctl/cmd/fly_sftp_shell.md
similarity index 92%
rename from flyctl/cmd/main_sftp_shell.md
rename to flyctl/cmd/fly_sftp_shell.md
index 77654e5122..a7a8611740 100644
--- a/flyctl/cmd/main_sftp_shell.md
+++ b/flyctl/cmd/fly_sftp_shell.md
@@ -2,7 +2,7 @@ The SFTP SHELL command brings up an interactive SFTP session to fetch and push f
 
 ## Usage
 ~~~
-main sftp shell [flags]
+fly sftp shell [flags]
 ~~~
 
 ## Options
@@ -33,5 +33,5 @@ main sftp shell [flags]
 
 ## See Also
 
-* [main sftp](/docs/flyctl/main-sftp/)	 - Get or put files from a remote VM.
+* [fly sftp](/docs/flyctl/sftp/)	 - Get or put files from a remote VM.
 
diff --git a/flyctl/cmd/fly_ssh.md b/flyctl/cmd/fly_ssh.md
new file mode 100644
index 0000000000..862ca06e15
--- /dev/null
+++ b/flyctl/cmd/fly_ssh.md
@@ -0,0 +1,31 @@
+Use SSH to log into or run commands on Machines
+
+## Usage
+~~~
+fly ssh [command] [flags]
+~~~
+
+## Available Commands
+* [console](/docs/flyctl/ssh-console/)	 - Connect to a running instance of the current app.
+* [issue](/docs/flyctl/ssh-issue/)	 - Issue a new SSH credential
+* [log](/docs/flyctl/ssh-log/)	 - Log of all issued SSH certs
+* [sftp](/docs/flyctl/ssh-sftp/)	 - Get or put files from a remote VM.
+
+## Options
+
+~~~
+  -h, --help   help for ssh
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/main_ssh_console.md b/flyctl/cmd/fly_ssh_console.md
similarity index 91%
rename from flyctl/cmd/main_ssh_console.md
rename to flyctl/cmd/fly_ssh_console.md
index d82a3aa59e..87aff14e9d 100644
--- a/flyctl/cmd/main_ssh_console.md
+++ b/flyctl/cmd/fly_ssh_console.md
@@ -2,7 +2,7 @@ Connect to a running instance of the current app.
 
 ## Usage
 ~~~
-main ssh console [flags]
+fly ssh console [flags]
 ~~~
 
 ## Options
@@ -33,5 +33,5 @@ main ssh console [flags]
 
 ## See Also
 
-* [main ssh](/docs/flyctl/main-ssh/)	 - Use SSH to log into or run commands on Machines
+* [fly ssh](/docs/flyctl/ssh/)	 - Use SSH to log into or run commands on Machines
 
diff --git a/flyctl/cmd/main_ssh_issue.md b/flyctl/cmd/fly_ssh_issue.md
similarity index 87%
rename from flyctl/cmd/main_ssh_issue.md
rename to flyctl/cmd/fly_ssh_issue.md
index 89527709bb..ce4152ba51 100644
--- a/flyctl/cmd/main_ssh_issue.md
+++ b/flyctl/cmd/fly_ssh_issue.md
@@ -4,7 +4,7 @@ validity.
 
 ## Usage
 ~~~
-main ssh issue [org] [path] [flags]
+fly ssh issue [org] [path] [flags]
 ~~~
 
 ## Options
@@ -29,5 +29,5 @@ main ssh issue [org] [path] [flags]
 
 ## See Also
 
-* [main ssh](/docs/flyctl/main-ssh/)	 - Use SSH to log into or run commands on Machines
+* [fly ssh](/docs/flyctl/ssh/)	 - Use SSH to log into or run commands on Machines
 
diff --git a/flyctl/cmd/main_ssh_log.md b/flyctl/cmd/fly_ssh_log.md
similarity index 78%
rename from flyctl/cmd/main_ssh_log.md
rename to flyctl/cmd/fly_ssh_log.md
index 171e1aa0e5..354123fd9f 100644
--- a/flyctl/cmd/main_ssh_log.md
+++ b/flyctl/cmd/fly_ssh_log.md
@@ -2,7 +2,7 @@ Log of all issued SSH certs
 
 ## Usage
 ~~~
-main ssh log [flags]
+fly ssh log [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main ssh log [flags]
 
 ## See Also
 
-* [main ssh](/docs/flyctl/main-ssh/)	 - Use SSH to log into or run commands on Machines
+* [fly ssh](/docs/flyctl/ssh/)	 - Use SSH to log into or run commands on Machines
 
diff --git a/flyctl/cmd/fly_ssh_sftp.md b/flyctl/cmd/fly_ssh_sftp.md
new file mode 100644
index 0000000000..e2918ad823
--- /dev/null
+++ b/flyctl/cmd/fly_ssh_sftp.md
@@ -0,0 +1,30 @@
+Get or put files from a remote VM.
+
+## Usage
+~~~
+fly ssh sftp [command] [flags]
+~~~
+
+## Available Commands
+* [find](/docs/flyctl/ssh-sftp-find/)	 - The SFTP FIND command lists files (from an optional root directory) on a remote VM.
+* [get](/docs/flyctl/ssh-sftp-get/)	 - The SFTP GET retrieves a file from a remote VM.
+* [shell](/docs/flyctl/ssh-sftp-shell/)	 - The SFTP SHELL command brings up an interactive SFTP session to fetch and push files from/to a VM.
+
+## Options
+
+~~~
+  -h, --help   help for sftp
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly ssh](/docs/flyctl/ssh/)	 - Use SSH to log into or run commands on Machines
+
diff --git a/flyctl/cmd/main_ssh_sftp_find.md b/flyctl/cmd/fly_ssh_sftp_find.md
similarity index 91%
rename from flyctl/cmd/main_ssh_sftp_find.md
rename to flyctl/cmd/fly_ssh_sftp_find.md
index 4c195e6702..77ce1f8915 100644
--- a/flyctl/cmd/main_ssh_sftp_find.md
+++ b/flyctl/cmd/fly_ssh_sftp_find.md
@@ -2,7 +2,7 @@ The SFTP FIND command lists files (from an optional root directory) on a remote
 
 ## Usage
 ~~~
-main ssh sftp find [path] [flags]
+fly ssh sftp find [path] [flags]
 ~~~
 
 ## Options
@@ -33,5 +33,5 @@ main ssh sftp find [path] [flags]
 
 ## See Also
 
-* [main ssh sftp](/docs/flyctl/main-ssh-sftp/)	 - Get or put files from a remote VM.
+* [fly ssh sftp](/docs/flyctl/ssh-sftp/)	 - Get or put files from a remote VM.
 
diff --git a/flyctl/cmd/main_ssh_sftp_get.md b/flyctl/cmd/fly_ssh_sftp_get.md
similarity index 90%
rename from flyctl/cmd/main_ssh_sftp_get.md
rename to flyctl/cmd/fly_ssh_sftp_get.md
index e15271134d..43066800ee 100644
--- a/flyctl/cmd/main_ssh_sftp_get.md
+++ b/flyctl/cmd/fly_ssh_sftp_get.md
@@ -2,7 +2,7 @@ The SFTP GET retrieves a file from a remote VM.
 
 ## Usage
 ~~~
-main ssh sftp get <path> [flags]
+fly ssh sftp get <path> [flags]
 ~~~
 
 ## Options
@@ -33,5 +33,5 @@ main ssh sftp get <path> [flags]
 
 ## See Also
 
-* [main ssh sftp](/docs/flyctl/main-ssh-sftp/)	 - Get or put files from a remote VM.
+* [fly ssh sftp](/docs/flyctl/ssh-sftp/)	 - Get or put files from a remote VM.
 
diff --git a/flyctl/cmd/main_ssh_sftp_shell.md b/flyctl/cmd/fly_ssh_sftp_shell.md
similarity index 91%
rename from flyctl/cmd/main_ssh_sftp_shell.md
rename to flyctl/cmd/fly_ssh_sftp_shell.md
index 85fb449b62..4db26d9025 100644
--- a/flyctl/cmd/main_ssh_sftp_shell.md
+++ b/flyctl/cmd/fly_ssh_sftp_shell.md
@@ -2,7 +2,7 @@ The SFTP SHELL command brings up an interactive SFTP session to fetch and push f
 
 ## Usage
 ~~~
-main ssh sftp shell [flags]
+fly ssh sftp shell [flags]
 ~~~
 
 ## Options
@@ -33,5 +33,5 @@ main ssh sftp shell [flags]
 
 ## See Also
 
-* [main ssh sftp](/docs/flyctl/main-ssh-sftp/)	 - Get or put files from a remote VM.
+* [fly ssh sftp](/docs/flyctl/ssh-sftp/)	 - Get or put files from a remote VM.
 
diff --git a/flyctl/cmd/main_status.md b/flyctl/cmd/fly_status.md
similarity index 90%
rename from flyctl/cmd/main_status.md
rename to flyctl/cmd/fly_status.md
index 3ac3b22e89..90e4645e44 100644
--- a/flyctl/cmd/main_status.md
+++ b/flyctl/cmd/fly_status.md
@@ -5,7 +5,7 @@ currently allocated.
 
 ## Usage
 ~~~
-main status [flags]
+fly status [flags]
 ~~~
 
 ## Options
@@ -31,5 +31,5 @@ main status [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/fly_storage.md b/flyctl/cmd/fly_storage.md
new file mode 100644
index 0000000000..8c3c3a5188
--- /dev/null
+++ b/flyctl/cmd/fly_storage.md
@@ -0,0 +1,34 @@
+Provision and manage Tigris object storage buckets
+
+
+## Usage
+~~~
+fly storage [command] [flags]
+~~~
+
+## Available Commands
+* [create](/docs/flyctl/storage-create/)	 - Provision a Tigris object storage bucket
+* [dashboard](/docs/flyctl/storage-dashboard/)	 - Visit the Tigris dashboard
+* [destroy](/docs/flyctl/storage-destroy/)	 - Permanently destroy a Tigris object storage bucket
+* [list](/docs/flyctl/storage-list/)	 - List your Tigris object storage buckets
+* [status](/docs/flyctl/storage-status/)	 - Show details about a Tigris storage bucket
+* [update](/docs/flyctl/storage-update/)	 - Update an existing Tigris object storage bucket
+
+## Options
+
+~~~
+  -h, --help   help for storage
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/main_storage_create.md b/flyctl/cmd/fly_storage_create.md
similarity index 89%
rename from flyctl/cmd/main_storage_create.md
rename to flyctl/cmd/fly_storage_create.md
index c9d8a025a0..3a9c3a2a54 100644
--- a/flyctl/cmd/main_storage_create.md
+++ b/flyctl/cmd/fly_storage_create.md
@@ -3,7 +3,7 @@ Provision a Tigris object storage bucket
 
 ## Usage
 ~~~
-main storage create [flags]
+fly storage create [flags]
 ~~~
 
 ## Options
@@ -34,5 +34,5 @@ main storage create [flags]
 
 ## See Also
 
-* [main storage](/docs/flyctl/main-storage/)	 - Provision and manage Tigris object storage buckets
+* [fly storage](/docs/flyctl/storage/)	 - Provision and manage Tigris object storage buckets
 
diff --git a/flyctl/cmd/main_storage_dashboard.md b/flyctl/cmd/fly_storage_dashboard.md
similarity index 78%
rename from flyctl/cmd/main_storage_dashboard.md
rename to flyctl/cmd/fly_storage_dashboard.md
index 3e149554e2..4795b66d4a 100644
--- a/flyctl/cmd/main_storage_dashboard.md
+++ b/flyctl/cmd/fly_storage_dashboard.md
@@ -2,7 +2,7 @@ Visit the Tigris dashboard
 
 ## Usage
 ~~~
-main storage dashboard [bucket_name] [flags]
+fly storage dashboard [bucket_name] [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main storage dashboard [bucket_name] [flags]
 
 ## See Also
 
-* [main storage](/docs/flyctl/main-storage/)	 - Provision and manage Tigris object storage buckets
+* [fly storage](/docs/flyctl/storage/)	 - Provision and manage Tigris object storage buckets
 
diff --git a/flyctl/cmd/main_storage_destroy.md b/flyctl/cmd/fly_storage_destroy.md
similarity index 76%
rename from flyctl/cmd/main_storage_destroy.md
rename to flyctl/cmd/fly_storage_destroy.md
index ed0d6f9a6c..4e8f20d934 100644
--- a/flyctl/cmd/main_storage_destroy.md
+++ b/flyctl/cmd/fly_storage_destroy.md
@@ -2,7 +2,7 @@ Permanently destroy a Tigris object storage bucket
 
 ## Usage
 ~~~
-main storage destroy [storage-bucket-name] [flags]
+fly storage destroy [storage-bucket-name] [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main storage destroy [storage-bucket-name] [flags]
 
 ## See Also
 
-* [main storage](/docs/flyctl/main-storage/)	 - Provision and manage Tigris object storage buckets
+* [fly storage](/docs/flyctl/storage/)	 - Provision and manage Tigris object storage buckets
 
diff --git a/flyctl/cmd/main_storage_list.md b/flyctl/cmd/fly_storage_list.md
similarity index 76%
rename from flyctl/cmd/main_storage_list.md
rename to flyctl/cmd/fly_storage_list.md
index 1cdd515ebf..12f82000b8 100644
--- a/flyctl/cmd/main_storage_list.md
+++ b/flyctl/cmd/fly_storage_list.md
@@ -2,7 +2,7 @@ List your Tigris object storage buckets
 
 ## Usage
 ~~~
-main storage list [flags]
+fly storage list [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main storage list [flags]
 
 ## See Also
 
-* [main storage](/docs/flyctl/main-storage/)	 - Provision and manage Tigris object storage buckets
+* [fly storage](/docs/flyctl/storage/)	 - Provision and manage Tigris object storage buckets
 
diff --git a/flyctl/cmd/main_storage_status.md b/flyctl/cmd/fly_storage_status.md
similarity index 78%
rename from flyctl/cmd/main_storage_status.md
rename to flyctl/cmd/fly_storage_status.md
index c0f706267f..4e65bb0a71 100644
--- a/flyctl/cmd/main_storage_status.md
+++ b/flyctl/cmd/fly_storage_status.md
@@ -3,7 +3,7 @@ Show details about a Tigris storage bucket
 
 ## Usage
 ~~~
-main storage status [name] [flags]
+fly storage status [name] [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main storage status [name] [flags]
 
 ## See Also
 
-* [main storage](/docs/flyctl/main-storage/)	 - Provision and manage Tigris object storage buckets
+* [fly storage](/docs/flyctl/storage/)	 - Provision and manage Tigris object storage buckets
 
diff --git a/flyctl/cmd/main_storage_update.md b/flyctl/cmd/fly_storage_update.md
similarity index 89%
rename from flyctl/cmd/main_storage_update.md
rename to flyctl/cmd/fly_storage_update.md
index 6ffe51547a..1fd7ae52ff 100644
--- a/flyctl/cmd/main_storage_update.md
+++ b/flyctl/cmd/fly_storage_update.md
@@ -3,7 +3,7 @@ Update an existing Tigris object storage bucket
 
 ## Usage
 ~~~
-main storage update <bucket_name> [flags]
+fly storage update <bucket_name> [flags]
 ~~~
 
 ## Options
@@ -35,5 +35,5 @@ main storage update <bucket_name> [flags]
 
 ## See Also
 
-* [main storage](/docs/flyctl/main-storage/)	 - Provision and manage Tigris object storage buckets
+* [fly storage](/docs/flyctl/storage/)	 - Provision and manage Tigris object storage buckets
 
diff --git a/flyctl/cmd/main_synthetics.md b/flyctl/cmd/fly_synthetics.md
similarity index 65%
rename from flyctl/cmd/main_synthetics.md
rename to flyctl/cmd/fly_synthetics.md
index 6fd5ea6c40..ec599ccbdd 100644
--- a/flyctl/cmd/main_synthetics.md
+++ b/flyctl/cmd/fly_synthetics.md
@@ -2,11 +2,11 @@ Synthetic monitoring management.
 
 ## Usage
 ~~~
-main synthetics [command] [flags]
+fly synthetics [command] [flags]
 ~~~
 
 ## Available Commands
-* [agent](/docs/flyctl/main-synthetics-agent/)	 - Runs the Synthetics agent
+* [agent](/docs/flyctl/synthetics-agent/)	 - Runs the Synthetics agent
 
 ## Options
 
@@ -24,5 +24,5 @@ main synthetics [command] [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/main_synthetics_agent.md b/flyctl/cmd/fly_synthetics_agent.md
similarity index 75%
rename from flyctl/cmd/main_synthetics_agent.md
rename to flyctl/cmd/fly_synthetics_agent.md
index 1e565fefa1..30595c859e 100644
--- a/flyctl/cmd/main_synthetics_agent.md
+++ b/flyctl/cmd/fly_synthetics_agent.md
@@ -2,7 +2,7 @@ Runs the Synthetics agent in the foreground.
 
 ## Usage
 ~~~
-main synthetics agent [flags]
+fly synthetics agent [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main synthetics agent [flags]
 
 ## See Also
 
-* [main synthetics](/docs/flyctl/main-synthetics/)	 - Synthetic monitoring
+* [fly synthetics](/docs/flyctl/synthetics/)	 - Synthetic monitoring
 
diff --git a/flyctl/cmd/fly_tokens.md b/flyctl/cmd/fly_tokens.md
new file mode 100644
index 0000000000..c83cb6ce58
--- /dev/null
+++ b/flyctl/cmd/fly_tokens.md
@@ -0,0 +1,33 @@
+Manage Fly.io API tokens
+
+## Usage
+~~~
+fly tokens [command] [flags]
+~~~
+
+## Available Commands
+* [3p](/docs/flyctl/tokens-3p/)	 - Manage third-party (3P) caveats for Fly.io API tokens
+* [attenuate](/docs/flyctl/tokens-attenuate/)	 - Attenuate Fly.io API tokens
+* [create](/docs/flyctl/tokens-create/)	 - Create Fly.io API tokens
+* [debug](/docs/flyctl/tokens-debug/)	 - Debug Fly.io API tokens
+* [list](/docs/flyctl/tokens-list/)	 - List tokens
+* [revoke](/docs/flyctl/tokens-revoke/)	 - Revoke tokens
+
+## Options
+
+~~~
+  -h, --help   help for tokens
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/main_tokens_3p.md b/flyctl/cmd/fly_tokens_3p.md
similarity index 55%
rename from flyctl/cmd/main_tokens_3p.md
rename to flyctl/cmd/fly_tokens_3p.md
index 2397b5cdc2..702c42e68f 100644
--- a/flyctl/cmd/main_tokens_3p.md
+++ b/flyctl/cmd/fly_tokens_3p.md
@@ -7,14 +7,14 @@ TOKEN_3P_SHARED_SECRET variable.
 
 ## Usage
 ~~~
-main tokens 3p [command] [flags]
+fly tokens 3p [command] [flags]
 ~~~
 
 ## Available Commands
-* [add](/docs/flyctl/main-tokens-3p-add/)	 - Add a third-party caveat
-* [add-discharge](/docs/flyctl/main-tokens-3p-add-discharge/)	 - Tack a discharge token onto a Fly.io API token
-* [discharge](/docs/flyctl/main-tokens-3p-discharge/)	 - Exchange a ticket for the token that discharges a third-party caveat
-* [ticket](/docs/flyctl/main-tokens-3p-ticket/)	 - Retrieve the ticket from an existing third-party caveat
+* [add](/docs/flyctl/tokens-3p-add/)	 - Add a third-party caveat
+* [add-discharge](/docs/flyctl/tokens-3p-add-discharge/)	 - Tack a discharge token onto a Fly.io API token
+* [discharge](/docs/flyctl/tokens-3p-discharge/)	 - Exchange a ticket for the token that discharges a third-party caveat
+* [ticket](/docs/flyctl/tokens-3p-ticket/)	 - Retrieve the ticket from an existing third-party caveat
 
 ## Options
 
@@ -32,5 +32,5 @@ main tokens 3p [command] [flags]
 
 ## See Also
 
-* [main tokens](/docs/flyctl/main-tokens/)	 - Manage Fly.io API tokens
+* [fly tokens](/docs/flyctl/tokens/)	 - Manage Fly.io API tokens
 
diff --git a/flyctl/cmd/main_tokens_3p_add-discharge.md b/flyctl/cmd/fly_tokens_3p_add-discharge.md
similarity index 78%
rename from flyctl/cmd/main_tokens_3p_add-discharge.md
rename to flyctl/cmd/fly_tokens_3p_add-discharge.md
index af01e8d950..6ae91f2dc4 100644
--- a/flyctl/cmd/main_tokens_3p_add-discharge.md
+++ b/flyctl/cmd/fly_tokens_3p_add-discharge.md
@@ -4,7 +4,7 @@ authentication attempts.
 
 ## Usage
 ~~~
-main tokens 3p add-discharge [flags]
+fly tokens 3p add-discharge [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main tokens 3p add-discharge [flags]
 
 ## See Also
 
-* [main tokens 3p](/docs/flyctl/main-tokens-3p/)	 - Manage third-party (3P) caveats for Fly.io API tokens
+* [fly tokens 3p](/docs/flyctl/tokens-3p/)	 - Manage third-party (3P) caveats for Fly.io API tokens
 
diff --git a/flyctl/cmd/main_tokens_3p_add.md b/flyctl/cmd/fly_tokens_3p_add.md
similarity index 83%
rename from flyctl/cmd/main_tokens_3p_add.md
rename to flyctl/cmd/fly_tokens_3p_add.md
index c2c64c4784..b7bf1c478d 100644
--- a/flyctl/cmd/main_tokens_3p_add.md
+++ b/flyctl/cmd/fly_tokens_3p_add.md
@@ -4,7 +4,7 @@ identified by --location (a URL), to supply a discharge token in order to clear.
 
 ## Usage
 ~~~
-main tokens 3p add [flags]
+fly tokens 3p add [flags]
 ~~~
 
 ## Options
@@ -26,5 +26,5 @@ main tokens 3p add [flags]
 
 ## See Also
 
-* [main tokens 3p](/docs/flyctl/main-tokens-3p/)	 - Manage third-party (3P) caveats for Fly.io API tokens
+* [fly tokens 3p](/docs/flyctl/tokens-3p/)	 - Manage third-party (3P) caveats for Fly.io API tokens
 
diff --git a/flyctl/cmd/main_tokens_3p_discharge.md b/flyctl/cmd/fly_tokens_3p_discharge.md
similarity index 83%
rename from flyctl/cmd/main_tokens_3p_discharge.md
rename to flyctl/cmd/fly_tokens_3p_discharge.md
index c4ecee2276..e8d8dd1854 100644
--- a/flyctl/cmd/main_tokens_3p_discharge.md
+++ b/flyctl/cmd/fly_tokens_3p_discharge.md
@@ -3,7 +3,7 @@ that satisfies the caveat.
 
 ## Usage
 ~~~
-main tokens 3p discharge [flags]
+fly tokens 3p discharge [flags]
 ~~~
 
 ## Options
@@ -26,5 +26,5 @@ main tokens 3p discharge [flags]
 
 ## See Also
 
-* [main tokens 3p](/docs/flyctl/main-tokens-3p/)	 - Manage third-party (3P) caveats for Fly.io API tokens
+* [fly tokens 3p](/docs/flyctl/tokens-3p/)	 - Manage third-party (3P) caveats for Fly.io API tokens
 
diff --git a/flyctl/cmd/main_tokens_3p_ticket.md b/flyctl/cmd/fly_tokens_3p_ticket.md
similarity index 79%
rename from flyctl/cmd/main_tokens_3p_ticket.md
rename to flyctl/cmd/fly_tokens_3p_ticket.md
index 68c248642c..0340bca565 100644
--- a/flyctl/cmd/main_tokens_3p_ticket.md
+++ b/flyctl/cmd/fly_tokens_3p_ticket.md
@@ -4,7 +4,7 @@ to retrieve a discharge token.
 
 ## Usage
 ~~~
-main tokens 3p ticket [flags]
+fly tokens 3p ticket [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main tokens 3p ticket [flags]
 
 ## See Also
 
-* [main tokens 3p](/docs/flyctl/main-tokens-3p/)	 - Manage third-party (3P) caveats for Fly.io API tokens
+* [fly tokens 3p](/docs/flyctl/tokens-3p/)	 - Manage third-party (3P) caveats for Fly.io API tokens
 
diff --git a/flyctl/cmd/main_tokens_attenuate.md b/flyctl/cmd/fly_tokens_attenuate.md
similarity index 86%
rename from flyctl/cmd/main_tokens_attenuate.md
rename to flyctl/cmd/fly_tokens_attenuate.md
index 80756db3e3..559eabfd19 100644
--- a/flyctl/cmd/main_tokens_attenuate.md
+++ b/flyctl/cmd/fly_tokens_attenuate.md
@@ -6,7 +6,7 @@ Attenuate a Fly.io API token by appending caveats to it. The
 
 ## Usage
 ~~~
-main tokens attenuate [flags]
+fly tokens attenuate [flags]
 ~~~
 
 ## Options
@@ -26,5 +26,5 @@ main tokens attenuate [flags]
 
 ## See Also
 
-* [main tokens](/docs/flyctl/main-tokens/)	 - Manage Fly.io API tokens
+* [fly tokens](/docs/flyctl/tokens/)	 - Manage Fly.io API tokens
 
diff --git a/flyctl/cmd/fly_tokens_create.md b/flyctl/cmd/fly_tokens_create.md
new file mode 100644
index 0000000000..2ff1504cfd
--- /dev/null
+++ b/flyctl/cmd/fly_tokens_create.md
@@ -0,0 +1,33 @@
+Create Fly.io API tokens
+
+## Usage
+~~~
+fly tokens create [command] [flags]
+~~~
+
+## Available Commands
+* [deploy](/docs/flyctl/tokens-create-deploy/)	 - Create deploy tokens
+* [litefs-cloud](/docs/flyctl/tokens-create-litefs-cloud/)	 - Create LiteFS Cloud tokens
+* [machine-exec](/docs/flyctl/tokens-create-machine-exec/)	 - Create a machine exec token
+* [org](/docs/flyctl/tokens-create-org/)	 - Create org deploy tokens
+* [readonly](/docs/flyctl/tokens-create-readonly/)	 - Create read-only org tokens
+* [ssh](/docs/flyctl/tokens-create-ssh/)	 - Create token for SSH'ing to a single app
+
+## Options
+
+~~~
+  -h, --help   help for create
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly tokens](/docs/flyctl/tokens/)	 - Manage Fly.io API tokens
+
diff --git a/flyctl/cmd/main_tokens_create_deploy.md b/flyctl/cmd/fly_tokens_create_deploy.md
similarity index 86%
rename from flyctl/cmd/main_tokens_create_deploy.md
rename to flyctl/cmd/fly_tokens_create_deploy.md
index 82e7d7cd2c..030900a5d9 100644
--- a/flyctl/cmd/main_tokens_create_deploy.md
+++ b/flyctl/cmd/fly_tokens_create_deploy.md
@@ -2,7 +2,7 @@ Create an API token limited to managing a single app and its resources. Also ava
 
 ## Usage
 ~~~
-main tokens create deploy [flags]
+fly tokens create deploy [flags]
 ~~~
 
 ## Options
@@ -26,5 +26,5 @@ main tokens create deploy [flags]
 
 ## See Also
 
-* [main tokens create](/docs/flyctl/main-tokens-create/)	 - Create Fly.io API tokens
+* [fly tokens create](/docs/flyctl/tokens-create/)	 - Create Fly.io API tokens
 
diff --git a/flyctl/cmd/main_tokens_create_litefs-cloud.md b/flyctl/cmd/fly_tokens_create_litefs-cloud.md
similarity index 83%
rename from flyctl/cmd/main_tokens_create_litefs-cloud.md
rename to flyctl/cmd/fly_tokens_create_litefs-cloud.md
index 103ed11e37..2bfdef6d53 100644
--- a/flyctl/cmd/main_tokens_create_litefs-cloud.md
+++ b/flyctl/cmd/fly_tokens_create_litefs-cloud.md
@@ -2,7 +2,7 @@ Create an API token limited to a single LiteFS Cloud cluster.
 
 ## Usage
 ~~~
-main tokens create litefs-cloud [flags]
+fly tokens create litefs-cloud [flags]
 ~~~
 
 ## Options
@@ -26,5 +26,5 @@ main tokens create litefs-cloud [flags]
 
 ## See Also
 
-* [main tokens create](/docs/flyctl/main-tokens-create/)	 - Create Fly.io API tokens
+* [fly tokens create](/docs/flyctl/tokens-create/)	 - Create Fly.io API tokens
 
diff --git a/flyctl/cmd/main_tokens_create_machine-exec.md b/flyctl/cmd/fly_tokens_create_machine-exec.md
similarity index 89%
rename from flyctl/cmd/main_tokens_create_machine-exec.md
rename to flyctl/cmd/fly_tokens_create_machine-exec.md
index e4f0f8b5e8..8d5dee48d0 100644
--- a/flyctl/cmd/main_tokens_create_machine-exec.md
+++ b/flyctl/cmd/fly_tokens_create_machine-exec.md
@@ -2,7 +2,7 @@ Create an API token that can execute a restricted set of commands on a machine.
 
 ## Usage
 ~~~
-main tokens create machine-exec [command...] [flags]
+fly tokens create machine-exec [command...] [flags]
 ~~~
 
 ## Options
@@ -28,5 +28,5 @@ main tokens create machine-exec [command...] [flags]
 
 ## See Also
 
-* [main tokens create](/docs/flyctl/main-tokens-create/)	 - Create Fly.io API tokens
+* [fly tokens create](/docs/flyctl/tokens-create/)	 - Create Fly.io API tokens
 
diff --git a/flyctl/cmd/main_tokens_create_org.md b/flyctl/cmd/fly_tokens_create_org.md
similarity index 85%
rename from flyctl/cmd/main_tokens_create_org.md
rename to flyctl/cmd/fly_tokens_create_org.md
index 76136e07a8..61a508a8ce 100644
--- a/flyctl/cmd/main_tokens_create_org.md
+++ b/flyctl/cmd/fly_tokens_create_org.md
@@ -2,7 +2,7 @@ Create an API token limited to managing a single org and its resources. Tokens a
 
 ## Usage
 ~~~
-main tokens create org [flags]
+fly tokens create org [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main tokens create org [flags]
 
 ## See Also
 
-* [main tokens create](/docs/flyctl/main-tokens-create/)	 - Create Fly.io API tokens
+* [fly tokens create](/docs/flyctl/tokens-create/)	 - Create Fly.io API tokens
 
diff --git a/flyctl/cmd/main_tokens_create_readonly.md b/flyctl/cmd/fly_tokens_create_readonly.md
similarity index 85%
rename from flyctl/cmd/main_tokens_create_readonly.md
rename to flyctl/cmd/fly_tokens_create_readonly.md
index 694277ef4c..3d442020f2 100644
--- a/flyctl/cmd/main_tokens_create_readonly.md
+++ b/flyctl/cmd/fly_tokens_create_readonly.md
@@ -2,7 +2,7 @@ Create an API token limited to reading a single org and its resources. Tokens ar
 
 ## Usage
 ~~~
-main tokens create readonly [flags]
+fly tokens create readonly [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main tokens create readonly [flags]
 
 ## See Also
 
-* [main tokens create](/docs/flyctl/main-tokens-create/)	 - Create Fly.io API tokens
+* [fly tokens create](/docs/flyctl/tokens-create/)	 - Create Fly.io API tokens
 
diff --git a/flyctl/cmd/main_tokens_create_ssh.md b/flyctl/cmd/fly_tokens_create_ssh.md
similarity index 86%
rename from flyctl/cmd/main_tokens_create_ssh.md
rename to flyctl/cmd/fly_tokens_create_ssh.md
index ff286ba9f8..c123d787b4 100644
--- a/flyctl/cmd/main_tokens_create_ssh.md
+++ b/flyctl/cmd/fly_tokens_create_ssh.md
@@ -2,7 +2,7 @@ Create token for SSH'ing to a single app. To be able to SSH to an app, this toke
 
 ## Usage
 ~~~
-main tokens create ssh [flags]
+fly tokens create ssh [flags]
 ~~~
 
 ## Options
@@ -26,5 +26,5 @@ main tokens create ssh [flags]
 
 ## See Also
 
-* [main tokens create](/docs/flyctl/main-tokens-create/)	 - Create Fly.io API tokens
+* [fly tokens create](/docs/flyctl/tokens-create/)	 - Create Fly.io API tokens
 
diff --git a/flyctl/cmd/main_tokens_debug.md b/flyctl/cmd/fly_tokens_debug.md
similarity index 85%
rename from flyctl/cmd/main_tokens_debug.md
rename to flyctl/cmd/fly_tokens_debug.md
index 7600da8e1b..c027623652 100644
--- a/flyctl/cmd/main_tokens_debug.md
+++ b/flyctl/cmd/fly_tokens_debug.md
@@ -5,7 +5,7 @@ Decode and print a Fly.io API token. The token to be
 
 ## Usage
 ~~~
-main tokens debug [flags]
+fly tokens debug [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main tokens debug [flags]
 
 ## See Also
 
-* [main tokens](/docs/flyctl/main-tokens/)	 - Manage Fly.io API tokens
+* [fly tokens](/docs/flyctl/tokens/)	 - Manage Fly.io API tokens
 
diff --git a/flyctl/cmd/main_tokens_list.md b/flyctl/cmd/fly_tokens_list.md
similarity index 83%
rename from flyctl/cmd/main_tokens_list.md
rename to flyctl/cmd/fly_tokens_list.md
index 4341463ae7..fab020864f 100644
--- a/flyctl/cmd/main_tokens_list.md
+++ b/flyctl/cmd/fly_tokens_list.md
@@ -2,7 +2,7 @@ List tokens
 
 ## Usage
 ~~~
-main tokens list [flags]
+fly tokens list [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main tokens list [flags]
 
 ## See Also
 
-* [main tokens](/docs/flyctl/main-tokens/)	 - Manage Fly.io API tokens
+* [fly tokens](/docs/flyctl/tokens/)	 - Manage Fly.io API tokens
 
diff --git a/flyctl/cmd/main_tokens_revoke.md b/flyctl/cmd/fly_tokens_revoke.md
similarity index 73%
rename from flyctl/cmd/main_tokens_revoke.md
rename to flyctl/cmd/fly_tokens_revoke.md
index 992263027b..e2886931ef 100644
--- a/flyctl/cmd/main_tokens_revoke.md
+++ b/flyctl/cmd/fly_tokens_revoke.md
@@ -2,7 +2,7 @@ Revoke one or more tokens.
 
 ## Usage
 ~~~
-main tokens revoke [flags] ID ID ...
+fly tokens revoke [flags] ID ID ...
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main tokens revoke [flags] ID ID ...
 
 ## See Also
 
-* [main tokens](/docs/flyctl/main-tokens/)	 - Manage Fly.io API tokens
+* [fly tokens](/docs/flyctl/tokens/)	 - Manage Fly.io API tokens
 
diff --git a/flyctl/cmd/main_version.md b/flyctl/cmd/fly_version.md
similarity index 68%
rename from flyctl/cmd/main_version.md
rename to flyctl/cmd/fly_version.md
index f763b36d76..e519791198 100644
--- a/flyctl/cmd/main_version.md
+++ b/flyctl/cmd/fly_version.md
@@ -3,11 +3,11 @@ number and build date.
 
 ## Usage
 ~~~
-main version [flags]
+fly version [flags]
 ~~~
 
 ## Available Commands
-* [upgrade](/docs/flyctl/main-version-upgrade/)	 - Checks for available updates and automatically upgrades
+* [upgrade](/docs/flyctl/version-upgrade/)	 - Checks for available updates and automatically upgrades
 
 ## Options
 
@@ -26,5 +26,5 @@ main version [flags]
 
 ## See Also
 
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
 
diff --git a/flyctl/cmd/main_version_upgrade.md b/flyctl/cmd/fly_version_upgrade.md
similarity index 75%
rename from flyctl/cmd/main_version_upgrade.md
rename to flyctl/cmd/fly_version_upgrade.md
index 31eec2add1..841e88f9c7 100644
--- a/flyctl/cmd/main_version_upgrade.md
+++ b/flyctl/cmd/fly_version_upgrade.md
@@ -3,7 +3,7 @@ command to upgrade the application.
 
 ## Usage
 ~~~
-main version upgrade [flags]
+fly version upgrade [flags]
 ~~~
 
 ## Options
@@ -22,5 +22,5 @@ main version upgrade [flags]
 
 ## See Also
 
-* [main version](/docs/flyctl/main-version/)	 - Show version information for the flyctl command
+* [fly version](/docs/flyctl/version/)	 - Show version information for the flyctl command
 
diff --git a/flyctl/cmd/fly_volumes.md b/flyctl/cmd/fly_volumes.md
new file mode 100644
index 0000000000..c384d2edeb
--- /dev/null
+++ b/flyctl/cmd/fly_volumes.md
@@ -0,0 +1,35 @@
+Manage Fly Volumes. Volumes are persistent storage for Fly Machines. Learn how how volumes work: https://fly.io/docs/volumes/overview/.
+
+## Usage
+~~~
+fly volumes [command] [flags]
+~~~
+
+## Available Commands
+* [create](/docs/flyctl/volumes-create/)	 - Create a new volume for an app.
+* [destroy](/docs/flyctl/volumes-destroy/)	 - Destroy one or more volumes.
+* [extend](/docs/flyctl/volumes-extend/)	 - Extend a volume to the specified size.
+* [fork](/docs/flyctl/volumes-fork/)	 - Fork the specified volume.
+* [list](/docs/flyctl/volumes-list/)	 - List the volumes associated with an app.
+* [show](/docs/flyctl/volumes-show/)	 - Show the details of the specified volume.
+* [snapshots](/docs/flyctl/volumes-snapshots/)	 - Manage volume snapshots.
+* [update](/docs/flyctl/volumes-update/)	 - Update a volume for an app.
+
+## Options
+
+~~~
+  -h, --help   help for volumes
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/main_volumes_create.md b/flyctl/cmd/fly_volumes_create.md
similarity index 94%
rename from flyctl/cmd/main_volumes_create.md
rename to flyctl/cmd/fly_volumes_create.md
index 67e6cb530b..8bebda8691 100644
--- a/flyctl/cmd/main_volumes_create.md
+++ b/flyctl/cmd/fly_volumes_create.md
@@ -2,7 +2,7 @@ Create a new volume for an app. Volumes are persistent storage for Fly Machines.
 
 ## Usage
 ~~~
-main volumes create <volume name> [flags]
+fly volumes create <volume name> [flags]
 ~~~
 
 ## Options
@@ -39,5 +39,5 @@ main volumes create <volume name> [flags]
 
 ## See Also
 
-* [main volumes](/docs/flyctl/main-volumes/)	 - Manage Fly Volumes.
+* [fly volumes](/docs/flyctl/volumes/)	 - Manage Fly Volumes.
 
diff --git a/flyctl/cmd/main_volumes_destroy.md b/flyctl/cmd/fly_volumes_destroy.md
similarity index 82%
rename from flyctl/cmd/main_volumes_destroy.md
rename to flyctl/cmd/fly_volumes_destroy.md
index d981440ddf..8926b15ce4 100644
--- a/flyctl/cmd/main_volumes_destroy.md
+++ b/flyctl/cmd/fly_volumes_destroy.md
@@ -2,7 +2,7 @@ Destroy one or more volumes. When you destroy a volume, you permanently delete a
 
 ## Usage
 ~~~
-main volumes destroy <volume id> ... [flags]
+fly volumes destroy <volume id> ... [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main volumes destroy <volume id> ... [flags]
 
 ## See Also
 
-* [main volumes](/docs/flyctl/main-volumes/)	 - Manage Fly Volumes.
+* [fly volumes](/docs/flyctl/volumes/)	 - Manage Fly Volumes.
 
diff --git a/flyctl/cmd/main_volumes_extend.md b/flyctl/cmd/fly_volumes_extend.md
similarity index 87%
rename from flyctl/cmd/main_volumes_extend.md
rename to flyctl/cmd/fly_volumes_extend.md
index 484f6414a2..6e14230d1f 100644
--- a/flyctl/cmd/main_volumes_extend.md
+++ b/flyctl/cmd/fly_volumes_extend.md
@@ -2,7 +2,7 @@ Extend a volume to the specified size. Most Machines don't require a restart aft
 
 ## Usage
 ~~~
-main volumes extend <volume id> [flags]
+fly volumes extend <volume id> [flags]
 ~~~
 
 ## Options
@@ -26,5 +26,5 @@ main volumes extend <volume id> [flags]
 
 ## See Also
 
-* [main volumes](/docs/flyctl/main-volumes/)	 - Manage Fly Volumes.
+* [fly volumes](/docs/flyctl/volumes/)	 - Manage Fly Volumes.
 
diff --git a/flyctl/cmd/main_volumes_fork.md b/flyctl/cmd/fly_volumes_fork.md
similarity index 93%
rename from flyctl/cmd/main_volumes_fork.md
rename to flyctl/cmd/fly_volumes_fork.md
index 073b01b82f..c9b6d8c7f6 100644
--- a/flyctl/cmd/main_volumes_fork.md
+++ b/flyctl/cmd/fly_volumes_fork.md
@@ -2,7 +2,7 @@ Fork the specified volume. Volume forking creates an independent copy of a stora
 
 ## Usage
 ~~~
-main volumes fork <volume id> [flags]
+fly volumes fork <volume id> [flags]
 ~~~
 
 ## Options
@@ -34,5 +34,5 @@ main volumes fork <volume id> [flags]
 
 ## See Also
 
-* [main volumes](/docs/flyctl/main-volumes/)	 - Manage Fly Volumes.
+* [fly volumes](/docs/flyctl/volumes/)	 - Manage Fly Volumes.
 
diff --git a/flyctl/cmd/main_volumes_list.md b/flyctl/cmd/fly_volumes_list.md
similarity index 85%
rename from flyctl/cmd/main_volumes_list.md
rename to flyctl/cmd/fly_volumes_list.md
index 4a2ba7cca3..3dc1d3d04a 100644
--- a/flyctl/cmd/main_volumes_list.md
+++ b/flyctl/cmd/fly_volumes_list.md
@@ -2,7 +2,7 @@ List the volumes associated with an app.
 
 ## Usage
 ~~~
-main volumes list [flags]
+fly volumes list [flags]
 ~~~
 
 ## Options
@@ -25,5 +25,5 @@ main volumes list [flags]
 
 ## See Also
 
-* [main volumes](/docs/flyctl/main-volumes/)	 - Manage Fly Volumes.
+* [fly volumes](/docs/flyctl/volumes/)	 - Manage Fly Volumes.
 
diff --git a/flyctl/cmd/main_volumes_show.md b/flyctl/cmd/fly_volumes_show.md
similarity index 81%
rename from flyctl/cmd/main_volumes_show.md
rename to flyctl/cmd/fly_volumes_show.md
index f7908fdcd3..6663b1d84a 100644
--- a/flyctl/cmd/main_volumes_show.md
+++ b/flyctl/cmd/fly_volumes_show.md
@@ -2,7 +2,7 @@ Show the details of the specified volume.
 
 ## Usage
 ~~~
-main volumes show <volume id> [flags]
+fly volumes show <volume id> [flags]
 ~~~
 
 ## Options
@@ -24,5 +24,5 @@ main volumes show <volume id> [flags]
 
 ## See Also
 
-* [main volumes](/docs/flyctl/main-volumes/)	 - Manage Fly Volumes.
+* [fly volumes](/docs/flyctl/volumes/)	 - Manage Fly Volumes.
 
diff --git a/flyctl/cmd/main_volumes_snapshots.md b/flyctl/cmd/fly_volumes_snapshots.md
similarity index 63%
rename from flyctl/cmd/main_volumes_snapshots.md
rename to flyctl/cmd/fly_volumes_snapshots.md
index a39b2ce789..e0b2223103 100644
--- a/flyctl/cmd/main_volumes_snapshots.md
+++ b/flyctl/cmd/fly_volumes_snapshots.md
@@ -2,12 +2,12 @@ Manage volume snapshots. A snapshot is a point-in-time copy of a volume. Snapsho
 
 ## Usage
 ~~~
-main volumes snapshots [command] [flags]
+fly volumes snapshots [command] [flags]
 ~~~
 
 ## Available Commands
-* [create](/docs/flyctl/main-volumes-snapshots-create/)	 - Create a volume snapshot.
-* [list](/docs/flyctl/main-volumes-snapshots-list/)	 - List snapshots.
+* [create](/docs/flyctl/volumes-snapshots-create/)	 - Create a volume snapshot.
+* [list](/docs/flyctl/volumes-snapshots-list/)	 - List snapshots.
 
 ## Options
 
@@ -25,5 +25,5 @@ main volumes snapshots [command] [flags]
 
 ## See Also
 
-* [main volumes](/docs/flyctl/main-volumes/)	 - Manage Fly Volumes.
+* [fly volumes](/docs/flyctl/volumes/)	 - Manage Fly Volumes.
 
diff --git a/flyctl/cmd/main_volumes_snapshots_create.md b/flyctl/cmd/fly_volumes_snapshots_create.md
similarity index 68%
rename from flyctl/cmd/main_volumes_snapshots_create.md
rename to flyctl/cmd/fly_volumes_snapshots_create.md
index 7e7e02cb55..a85f79154a 100644
--- a/flyctl/cmd/main_volumes_snapshots_create.md
+++ b/flyctl/cmd/fly_volumes_snapshots_create.md
@@ -3,7 +3,7 @@ Snapshot a volume
 
 ## Usage
 ~~~
-main volumes snapshots create <volume id> [flags]
+fly volumes snapshots create <volume id> [flags]
 ~~~
 
 ## Options
@@ -23,5 +23,5 @@ main volumes snapshots create <volume id> [flags]
 
 ## See Also
 
-* [main volumes snapshots](/docs/flyctl/main-volumes-snapshots/)	 - Manage volume snapshots.
+* [fly volumes snapshots](/docs/flyctl/volumes-snapshots/)	 - Manage volume snapshots.
 
diff --git a/flyctl/cmd/main_volumes_snapshots_list.md b/flyctl/cmd/fly_volumes_snapshots_list.md
similarity index 71%
rename from flyctl/cmd/main_volumes_snapshots_list.md
rename to flyctl/cmd/fly_volumes_snapshots_list.md
index 207b047094..d8a208438a 100644
--- a/flyctl/cmd/main_volumes_snapshots_list.md
+++ b/flyctl/cmd/fly_volumes_snapshots_list.md
@@ -2,7 +2,7 @@ List snapshots associated with the specified volume.
 
 ## Usage
 ~~~
-main volumes snapshots list <volume id> [flags]
+fly volumes snapshots list <volume id> [flags]
 ~~~
 
 ## Options
@@ -22,5 +22,5 @@ main volumes snapshots list <volume id> [flags]
 
 ## See Also
 
-* [main volumes snapshots](/docs/flyctl/main-volumes-snapshots/)	 - Manage volume snapshots.
+* [fly volumes snapshots](/docs/flyctl/volumes-snapshots/)	 - Manage volume snapshots.
 
diff --git a/flyctl/cmd/main_volumes_update.md b/flyctl/cmd/fly_volumes_update.md
similarity index 86%
rename from flyctl/cmd/main_volumes_update.md
rename to flyctl/cmd/fly_volumes_update.md
index 4fe840491b..b51ae14022 100644
--- a/flyctl/cmd/main_volumes_update.md
+++ b/flyctl/cmd/fly_volumes_update.md
@@ -3,7 +3,7 @@ Update a volume for an app. Volumes are persistent storage for
 
 ## Usage
 ~~~
-main volumes update <volume id> [flags]
+fly volumes update <volume id> [flags]
 ~~~
 
 ## Options
@@ -27,5 +27,5 @@ main volumes update <volume id> [flags]
 
 ## See Also
 
-* [main volumes](/docs/flyctl/main-volumes/)	 - Manage Fly Volumes.
+* [fly volumes](/docs/flyctl/volumes/)	 - Manage Fly Volumes.
 
diff --git a/flyctl/cmd/fly_wireguard.md b/flyctl/cmd/fly_wireguard.md
new file mode 100644
index 0000000000..0f7eedab87
--- /dev/null
+++ b/flyctl/cmd/fly_wireguard.md
@@ -0,0 +1,33 @@
+Commands that manage WireGuard peer connections
+
+## Usage
+~~~
+fly wireguard [command] [flags]
+~~~
+
+## Available Commands
+* [create](/docs/flyctl/wireguard-create/)	 - Add a WireGuard peer connection
+* [list](/docs/flyctl/wireguard-list/)	 - List all WireGuard peer connections
+* [remove](/docs/flyctl/wireguard-remove/)	 - Remove a WireGuard peer connection
+* [reset](/docs/flyctl/wireguard-reset/)	 - Reset WireGuard peer connection for an organization
+* [token](/docs/flyctl/wireguard-token/)	 - Commands that managed WireGuard delegated access tokens
+* [websockets](/docs/flyctl/wireguard-websockets/)	 - Enable or disable WireGuard tunneling over WebSockets
+
+## Options
+
+~~~
+  -h, --help   help for wireguard
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly](/docs/flyctl/help/)	 - The Fly.io command line interface
+
diff --git a/flyctl/cmd/main_wireguard_create.md b/flyctl/cmd/fly_wireguard_create.md
similarity index 67%
rename from flyctl/cmd/main_wireguard_create.md
rename to flyctl/cmd/fly_wireguard_create.md
index d31d5f33b3..28e2019853 100644
--- a/flyctl/cmd/main_wireguard_create.md
+++ b/flyctl/cmd/fly_wireguard_create.md
@@ -2,7 +2,7 @@ Add a WireGuard peer connection to an organization
 
 ## Usage
 ~~~
-main wireguard create [org] [region] [name] [file] [flags]
+fly wireguard create [org] [region] [name] [file] [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main wireguard create [org] [region] [name] [file] [flags]
 
 ## See Also
 
-* [main wireguard](/docs/flyctl/main-wireguard/)	 - Commands that manage WireGuard peer connections
+* [fly wireguard](/docs/flyctl/wireguard/)	 - Commands that manage WireGuard peer connections
 
diff --git a/flyctl/cmd/main_wireguard_list.md b/flyctl/cmd/fly_wireguard_list.md
similarity index 71%
rename from flyctl/cmd/main_wireguard_list.md
rename to flyctl/cmd/fly_wireguard_list.md
index 50c707f8ef..8271ac42d6 100644
--- a/flyctl/cmd/main_wireguard_list.md
+++ b/flyctl/cmd/fly_wireguard_list.md
@@ -2,7 +2,7 @@ List all WireGuard peer connections
 
 ## Usage
 ~~~
-main wireguard list [org] [flags]
+fly wireguard list [org] [flags]
 ~~~
 
 ## Options
@@ -22,5 +22,5 @@ main wireguard list [org] [flags]
 
 ## See Also
 
-* [main wireguard](/docs/flyctl/main-wireguard/)	 - Commands that manage WireGuard peer connections
+* [fly wireguard](/docs/flyctl/wireguard/)	 - Commands that manage WireGuard peer connections
 
diff --git a/flyctl/cmd/main_wireguard_remove.md b/flyctl/cmd/fly_wireguard_remove.md
similarity index 69%
rename from flyctl/cmd/main_wireguard_remove.md
rename to flyctl/cmd/fly_wireguard_remove.md
index f65c344c8b..6377441555 100644
--- a/flyctl/cmd/main_wireguard_remove.md
+++ b/flyctl/cmd/fly_wireguard_remove.md
@@ -2,7 +2,7 @@ Remove a WireGuard peer connection from an organization
 
 ## Usage
 ~~~
-main wireguard remove [org] [name] [flags]
+fly wireguard remove [org] [name] [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main wireguard remove [org] [name] [flags]
 
 ## See Also
 
-* [main wireguard](/docs/flyctl/main-wireguard/)	 - Commands that manage WireGuard peer connections
+* [fly wireguard](/docs/flyctl/wireguard/)	 - Commands that manage WireGuard peer connections
 
diff --git a/flyctl/cmd/main_wireguard_reset.md b/flyctl/cmd/fly_wireguard_reset.md
similarity index 70%
rename from flyctl/cmd/main_wireguard_reset.md
rename to flyctl/cmd/fly_wireguard_reset.md
index 2c561b8fc0..baa3d1b06e 100644
--- a/flyctl/cmd/main_wireguard_reset.md
+++ b/flyctl/cmd/fly_wireguard_reset.md
@@ -2,7 +2,7 @@ Reset WireGuard peer connection for an organization
 
 ## Usage
 ~~~
-main wireguard reset [org] [flags]
+fly wireguard reset [org] [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main wireguard reset [org] [flags]
 
 ## See Also
 
-* [main wireguard](/docs/flyctl/main-wireguard/)	 - Commands that manage WireGuard peer connections
+* [fly wireguard](/docs/flyctl/wireguard/)	 - Commands that manage WireGuard peer connections
 
diff --git a/flyctl/cmd/fly_wireguard_token.md b/flyctl/cmd/fly_wireguard_token.md
new file mode 100644
index 0000000000..197d7589fb
--- /dev/null
+++ b/flyctl/cmd/fly_wireguard_token.md
@@ -0,0 +1,32 @@
+Commands that managed WireGuard delegated access tokens
+
+## Usage
+~~~
+fly wireguard token [command] [flags]
+~~~
+
+## Available Commands
+* [create](/docs/flyctl/wireguard-token-create/)	 - Create a new WireGuard token
+* [delete](/docs/flyctl/wireguard-token-delete/)	 - Delete a WireGuard token; token is name:<name> or token:<token>
+* [list](/docs/flyctl/wireguard-token-list/)	 - List all WireGuard tokens
+* [start](/docs/flyctl/wireguard-token-start/)	 - Start a new WireGuard peer connection associated with a token (set FLY_WIREGUARD_TOKEN)
+* [update](/docs/flyctl/wireguard-token-update/)	 - Rekey a WireGuard peer connection associated with a token (set FLY_WIREGUARD_TOKEN)
+
+## Options
+
+~~~
+  -h, --help   help for token
+~~~
+
+## Global Options
+
+~~~
+  -t, --access-token string   Fly API Access Token
+      --debug                 Print additional logs and traces
+      --verbose               Verbose output
+~~~
+
+## See Also
+
+* [fly wireguard](/docs/flyctl/wireguard/)	 - Commands that manage WireGuard peer connections
+
diff --git a/flyctl/cmd/main_wireguard_token_create.md b/flyctl/cmd/fly_wireguard_token_create.md
similarity index 64%
rename from flyctl/cmd/main_wireguard_token_create.md
rename to flyctl/cmd/fly_wireguard_token_create.md
index c95c8a1feb..dce2739d1f 100644
--- a/flyctl/cmd/main_wireguard_token_create.md
+++ b/flyctl/cmd/fly_wireguard_token_create.md
@@ -2,7 +2,7 @@ Create a new WireGuard token
 
 ## Usage
 ~~~
-main wireguard token create [org] [name] [flags]
+fly wireguard token create [org] [name] [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main wireguard token create [org] [name] [flags]
 
 ## See Also
 
-* [main wireguard token](/docs/flyctl/main-wireguard-token/)	 - Commands that managed WireGuard delegated access tokens
+* [fly wireguard token](/docs/flyctl/wireguard-token/)	 - Commands that managed WireGuard delegated access tokens
 
diff --git a/flyctl/cmd/main_wireguard_token_delete.md b/flyctl/cmd/fly_wireguard_token_delete.md
similarity index 66%
rename from flyctl/cmd/main_wireguard_token_delete.md
rename to flyctl/cmd/fly_wireguard_token_delete.md
index 8b90b4287e..efe2dad03e 100644
--- a/flyctl/cmd/main_wireguard_token_delete.md
+++ b/flyctl/cmd/fly_wireguard_token_delete.md
@@ -2,7 +2,7 @@ Delete a WireGuard token; token is name:<name> or token:<token>
 
 ## Usage
 ~~~
-main wireguard token delete [org] [token] [flags]
+fly wireguard token delete [org] [token] [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main wireguard token delete [org] [token] [flags]
 
 ## See Also
 
-* [main wireguard token](/docs/flyctl/main-wireguard-token/)	 - Commands that managed WireGuard delegated access tokens
+* [fly wireguard token](/docs/flyctl/wireguard-token/)	 - Commands that managed WireGuard delegated access tokens
 
diff --git a/flyctl/cmd/main_wireguard_token_list.md b/flyctl/cmd/fly_wireguard_token_list.md
similarity index 66%
rename from flyctl/cmd/main_wireguard_token_list.md
rename to flyctl/cmd/fly_wireguard_token_list.md
index 25141baf82..9a89218192 100644
--- a/flyctl/cmd/main_wireguard_token_list.md
+++ b/flyctl/cmd/fly_wireguard_token_list.md
@@ -2,7 +2,7 @@ List all WireGuard tokens
 
 ## Usage
 ~~~
-main wireguard token list [org] [flags]
+fly wireguard token list [org] [flags]
 ~~~
 
 ## Options
@@ -22,5 +22,5 @@ main wireguard token list [org] [flags]
 
 ## See Also
 
-* [main wireguard token](/docs/flyctl/main-wireguard-token/)	 - Commands that managed WireGuard delegated access tokens
+* [fly wireguard token](/docs/flyctl/wireguard-token/)	 - Commands that managed WireGuard delegated access tokens
 
diff --git a/flyctl/cmd/main_wireguard_token_start.md b/flyctl/cmd/fly_wireguard_token_start.md
similarity index 65%
rename from flyctl/cmd/main_wireguard_token_start.md
rename to flyctl/cmd/fly_wireguard_token_start.md
index 839d08e499..de82cbd941 100644
--- a/flyctl/cmd/main_wireguard_token_start.md
+++ b/flyctl/cmd/fly_wireguard_token_start.md
@@ -2,7 +2,7 @@ Start a new WireGuard peer connection associated with a token (set FLY_WIREGUARD
 
 ## Usage
 ~~~
-main wireguard token start [name] [group] [region] [file] [flags]
+fly wireguard token start [name] [group] [region] [file] [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main wireguard token start [name] [group] [region] [file] [flags]
 
 ## See Also
 
-* [main wireguard token](/docs/flyctl/main-wireguard-token/)	 - Commands that managed WireGuard delegated access tokens
+* [fly wireguard token](/docs/flyctl/wireguard-token/)	 - Commands that managed WireGuard delegated access tokens
 
diff --git a/flyctl/cmd/main_wireguard_token_update.md b/flyctl/cmd/fly_wireguard_token_update.md
similarity index 67%
rename from flyctl/cmd/main_wireguard_token_update.md
rename to flyctl/cmd/fly_wireguard_token_update.md
index 3ac1ecdaf9..61d9d9dcc3 100644
--- a/flyctl/cmd/main_wireguard_token_update.md
+++ b/flyctl/cmd/fly_wireguard_token_update.md
@@ -2,7 +2,7 @@ Rekey a WireGuard peer connection associated with a token (set FLY_WIREGUARD_TOK
 
 ## Usage
 ~~~
-main wireguard token update [name] [file] [flags]
+fly wireguard token update [name] [file] [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main wireguard token update [name] [file] [flags]
 
 ## See Also
 
-* [main wireguard token](/docs/flyctl/main-wireguard-token/)	 - Commands that managed WireGuard delegated access tokens
+* [fly wireguard token](/docs/flyctl/wireguard-token/)	 - Commands that managed WireGuard delegated access tokens
 
diff --git a/flyctl/cmd/main_wireguard_websockets.md b/flyctl/cmd/fly_wireguard_websockets.md
similarity index 68%
rename from flyctl/cmd/main_wireguard_websockets.md
rename to flyctl/cmd/fly_wireguard_websockets.md
index d504c39e82..031419c914 100644
--- a/flyctl/cmd/main_wireguard_websockets.md
+++ b/flyctl/cmd/fly_wireguard_websockets.md
@@ -2,7 +2,7 @@ Enable or disable WireGuard tunneling over WebSockets
 
 ## Usage
 ~~~
-main wireguard websockets [enable|disable] [flags]
+fly wireguard websockets [enable|disable] [flags]
 ~~~
 
 ## Options
@@ -21,5 +21,5 @@ main wireguard websockets [enable|disable] [flags]
 
 ## See Also
 
-* [main wireguard](/docs/flyctl/main-wireguard/)	 - Commands that manage WireGuard peer connections
+* [fly wireguard](/docs/flyctl/wireguard/)	 - Commands that manage WireGuard peer connections
 
diff --git a/flyctl/cmd/main.md b/flyctl/cmd/main.md
deleted file mode 100644
index fcadaa6520..0000000000
--- a/flyctl/cmd/main.md
+++ /dev/null
@@ -1,64 +0,0 @@
-This is flyctl, the Fly.io command line interface.
-
-## Usage
-~~~
-main [flags]
-~~~
-
-## Available Commands
-* [agent](/docs/flyctl/main-agent/)	 - Commands that manage the Fly agent, a background process that manages flyctl wireguard connections
-* [apps](/docs/flyctl/main-apps/)	 - Manage apps.
-* [auth](/docs/flyctl/main-auth/)	 - Manage authentication
-* [certs](/docs/flyctl/main-certs/)	 - Manage certificates
-* [checks](/docs/flyctl/main-checks/)	 - Manage health checks
-* [config](/docs/flyctl/main-config/)	 - Manage an app's configuration
-* [console](/docs/flyctl/main-console/)	 - Run a console in a new or existing machine
-* [consul](/docs/flyctl/main-consul/)	 - Enable and manage Consul clusters
-* [dashboard](/docs/flyctl/main-dashboard/)	 - Open web browser on Fly Web UI for this app
-* [deploy](/docs/flyctl/main-deploy/)	 - Deploy Fly applications
-* [dig](/docs/flyctl/main-dig/)	 - Make DNS requests against Fly.io's internal DNS server
-* [docs](/docs/flyctl/main-docs/)	 - View Fly documentation
-* [doctor](/docs/flyctl/main-doctor/)	 - The DOCTOR command allows you to debug your Fly environment
-* [extensions](/docs/flyctl/main-extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
-* [image](/docs/flyctl/main-image/)	 - Manage app image
-* [incidents](/docs/flyctl/main-incidents/)	 - Show incidents
-* [ips](/docs/flyctl/main-ips/)	 - Manage IP addresses for apps
-* [jobs](/docs/flyctl/main-jobs/)	 - Show jobs at Fly.io
-* [launch](/docs/flyctl/main-launch/)	 - Create and configure a new app from source code or a Docker image
-* [litefs-cloud](/docs/flyctl/main-litefs-cloud/)	 - LiteFS Cloud management commands
-* [logs](/docs/flyctl/main-logs/)	 - View app logs
-* [machine](/docs/flyctl/main-machine/)	 - Manage Fly Machines.
-* [mysql](/docs/flyctl/main-mysql/)	 - Provision and manage MySQL database clusters
-* [orgs](/docs/flyctl/main-orgs/)	 - Commands for managing Fly organizations
-* [ping](/docs/flyctl/main-ping/)	 - Test connectivity with ICMP ping messages
-* [platform](/docs/flyctl/main-platform/)	 - Fly platform information
-* [postgres](/docs/flyctl/main-postgres/)	 - Manage Postgres clusters.
-* [proxy](/docs/flyctl/main-proxy/)	 - Proxies connections to a Fly Machine.
-* [redis](/docs/flyctl/main-redis/)	 - Launch and manage Redis databases managed by Upstash.com
-* [releases](/docs/flyctl/main-releases/)	 - List app releases
-* [scale](/docs/flyctl/main-scale/)	 - Scale app resources
-* [secrets](/docs/flyctl/main-secrets/)	 - Manage application secrets with the set and unset commands.
-* [services](/docs/flyctl/main-services/)	 - Show the application's services
-* [settings](/docs/flyctl/main-settings/)	 - Manage flyctl settings
-* [sftp](/docs/flyctl/main-sftp/)	 - Get or put files from a remote VM.
-* [ssh](/docs/flyctl/main-ssh/)	 - Use SSH to log into or run commands on Machines
-* [status](/docs/flyctl/main-status/)	 - Show app status
-* [storage](/docs/flyctl/main-storage/)	 - Provision and manage Tigris object storage buckets
-* [synthetics](/docs/flyctl/main-synthetics/)	 - Synthetic monitoring
-* [tokens](/docs/flyctl/main-tokens/)	 - Manage Fly.io API tokens
-* [version](/docs/flyctl/main-version/)	 - Show version information for the flyctl command
-* [volumes](/docs/flyctl/main-volumes/)	 - Manage Fly Volumes.
-* [wireguard](/docs/flyctl/main-wireguard/)	 - Commands that manage WireGuard peer connections
-
-## Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-  -h, --help                  help for main
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-
diff --git a/flyctl/cmd/main_apps.md b/flyctl/cmd/main_apps.md
deleted file mode 100644
index a86c387375..0000000000
--- a/flyctl/cmd/main_apps.md
+++ /dev/null
@@ -1,35 +0,0 @@
-Manage your Fly applications.
-
-## Usage
-~~~
-main apps [command] [flags]
-~~~
-
-## Available Commands
-* [create](/docs/flyctl/main-apps-create/)	 - Create a new application.
-* [destroy](/docs/flyctl/main-apps-destroy/)	 - Permanently destroy one or more apps.
-* [errors](/docs/flyctl/main-apps-errors/)	 - View application errors on Sentry.io
-* [list](/docs/flyctl/main-apps-list/)	 - List applications.
-* [move](/docs/flyctl/main-apps-move/)	 - Move an app to another organization.
-* [open](/docs/flyctl/main-apps-open/)	 - Open browser to current deployed application
-* [releases](/docs/flyctl/main-apps-releases/)	 - List app releases
-* [restart](/docs/flyctl/main-apps-restart/)	 - Restart an application.
-
-## Options
-
-~~~
-  -h, --help   help for apps
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_config.md b/flyctl/cmd/main_config.md
deleted file mode 100644
index 369263ad5e..0000000000
--- a/flyctl/cmd/main_config.md
+++ /dev/null
@@ -1,31 +0,0 @@
-The CONFIG commands allow you to work with an application's configuration.
-
-## Usage
-~~~
-main config [command] [flags]
-~~~
-
-## Available Commands
-* [env](/docs/flyctl/main-config-env/)	 - Display an app's runtime environment variables
-* [save](/docs/flyctl/main-config-save/)	 - Save an app's config file
-* [show](/docs/flyctl/main-config-show/)	 - Show an app's configuration
-* [validate](/docs/flyctl/main-config-validate/)	 - Validate an app's config file
-
-## Options
-
-~~~
-  -h, --help   help for config
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_extensions.md b/flyctl/cmd/main_extensions.md
deleted file mode 100644
index 27b203934b..0000000000
--- a/flyctl/cmd/main_extensions.md
+++ /dev/null
@@ -1,37 +0,0 @@
-Extensions are additional functionality that can be added to your Fly apps
-
-## Usage
-~~~
-main extensions [command] [flags]
-~~~
-
-## Available Commands
-* [arcjet](/docs/flyctl/main-extensions-arcjet/)	 - Provision and manage Arcjet
-* [enveloop](/docs/flyctl/main-extensions-enveloop/)	 - Provision and manage Enveloop projects
-* [kafka](/docs/flyctl/main-extensions-kafka/)	 - Provision and manage Upstash Kafka clusters
-* [kubernetes](/docs/flyctl/main-extensions-kubernetes/)	 - Provision and manage Kubernetes clusters
-* [mysql](/docs/flyctl/main-extensions-mysql/)	 - Provision and manage MySQL database clusters
-* [sentry](/docs/flyctl/main-extensions-sentry/)	 - Setup a Sentry project for this app
-* [storage](/docs/flyctl/main-extensions-storage/)	 - Provision and manage Tigris object storage buckets
-* [supabase](/docs/flyctl/main-extensions-supabase/)	 - Provision and manage Supabase Postgres databases
-* [vector](/docs/flyctl/main-extensions-vector/)	 - Provision and manage Upstash Vector index
-* [wafris](/docs/flyctl/main-extensions-wafris/)	 - Provision and manage Wafris WAFs (Web Application Firewalls)
-
-## Options
-
-~~~
-  -h, --help   help for extensions
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_extensions_arcjet.md b/flyctl/cmd/main_extensions_arcjet.md
deleted file mode 100644
index 02bd5b3fdc..0000000000
--- a/flyctl/cmd/main_extensions_arcjet.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Provision and manage Arcjet
-
-
-## Usage
-~~~
-main extensions arcjet [command] [flags]
-~~~
-
-## Available Commands
-* [create](/docs/flyctl/main-extensions-arcjet-create/)	 - Create an Arcjet site
-* [dashboard](/docs/flyctl/main-extensions-arcjet-dashboard/)	 - Visit the Arcjet dashboard
-* [destroy](/docs/flyctl/main-extensions-arcjet-destroy/)	 - Permanently destroy an Arcjet site
-* [list](/docs/flyctl/main-extensions-arcjet-list/)	 - List your Arcjet sites
-* [status](/docs/flyctl/main-extensions-arcjet-status/)	 - Show details about an Arcjet site setup
-
-## Options
-
-~~~
-  -h, --help   help for arcjet
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main extensions](/docs/flyctl/main-extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
-
diff --git a/flyctl/cmd/main_extensions_enveloop.md b/flyctl/cmd/main_extensions_enveloop.md
deleted file mode 100644
index ee36434b11..0000000000
--- a/flyctl/cmd/main_extensions_enveloop.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Provision and manage Enveloop projects
-
-
-## Usage
-~~~
-main extensions enveloop [command] [flags]
-~~~
-
-## Available Commands
-* [create](/docs/flyctl/main-extensions-enveloop-create/)	 - Provision an Enveloop project
-* [dashboard](/docs/flyctl/main-extensions-enveloop-dashboard/)	 - Open the Enveloop dashboard via your web browser
-* [destroy](/docs/flyctl/main-extensions-enveloop-destroy/)	 - Permanently destroy an Enveloop project
-* [list](/docs/flyctl/main-extensions-enveloop-list/)	 - List your Enveloop projects
-* [status](/docs/flyctl/main-extensions-enveloop-status/)	 - Show details about an Enveloop project
-
-## Options
-
-~~~
-  -h, --help   help for enveloop
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main extensions](/docs/flyctl/main-extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
-
diff --git a/flyctl/cmd/main_extensions_kafka.md b/flyctl/cmd/main_extensions_kafka.md
deleted file mode 100644
index 3ec96e94f3..0000000000
--- a/flyctl/cmd/main_extensions_kafka.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Provision and manage Upstash Kafka clusters
-
-
-## Usage
-~~~
-main extensions kafka [command] [flags]
-~~~
-
-## Available Commands
-* [create](/docs/flyctl/main-extensions-kafka-create/)	 - Provision a Upstash Kafka cluster
-* [dashboard](/docs/flyctl/main-extensions-kafka-dashboard/)	 - Visit the Upstash Kafka dashboard on the Upstash web console
-* [destroy](/docs/flyctl/main-extensions-kafka-destroy/)	 - Permanently destroy an Upstash Kafka cluster
-* [list](/docs/flyctl/main-extensions-kafka-list/)	 - List your Upstash Kafka clusters
-* [status](/docs/flyctl/main-extensions-kafka-status/)	 - Show details about an Upstash Kafka cluster
-* [update](/docs/flyctl/main-extensions-kafka-update/)	 - Update an existing Upstash Kafka cluster
-
-## Options
-
-~~~
-  -h, --help   help for kafka
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main extensions](/docs/flyctl/main-extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
-
diff --git a/flyctl/cmd/main_extensions_kubernetes.md b/flyctl/cmd/main_extensions_kubernetes.md
deleted file mode 100644
index d4c20d2b06..0000000000
--- a/flyctl/cmd/main_extensions_kubernetes.md
+++ /dev/null
@@ -1,32 +0,0 @@
-Provision and manage Kubernetes clusters
-
-
-## Usage
-~~~
-main extensions kubernetes [command] [flags]
-~~~
-
-## Available Commands
-* [create](/docs/flyctl/main-extensions-kubernetes-create/)	 - Provision a Kubernetes cluster for an organization
-* [destroy](/docs/flyctl/main-extensions-kubernetes-destroy/)	 - Permanently destroy a Kubernetes cluster
-* [list](/docs/flyctl/main-extensions-kubernetes-list/)	 - List your Kubernetes clusters
-* [save-kubeconfig](/docs/flyctl/main-extensions-kubernetes-save-kubeconfig/)	 - Save the kubeconfig file of your cluster
-
-## Options
-
-~~~
-  -h, --help   help for kubernetes
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main extensions](/docs/flyctl/main-extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
-
diff --git a/flyctl/cmd/main_extensions_mysql.md b/flyctl/cmd/main_extensions_mysql.md
deleted file mode 100644
index 5087972e9c..0000000000
--- a/flyctl/cmd/main_extensions_mysql.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Provision and manage MySQL database clusters
-
-
-## Usage
-~~~
-main extensions mysql [command] [flags]
-~~~
-
-## Available Commands
-* [create](/docs/flyctl/main-extensions-mysql-create/)	 - Provision a MySQL database
-* [destroy](/docs/flyctl/main-extensions-mysql-destroy/)	 - Permanently destroy a MySQL database
-* [list](/docs/flyctl/main-extensions-mysql-list/)	 - List your MySQL databases
-* [status](/docs/flyctl/main-extensions-mysql-status/)	 - Show details about a MySQL database
-* [update](/docs/flyctl/main-extensions-mysql-update/)	 - Update an existing MySQL database
-
-## Options
-
-~~~
-  -h, --help   help for mysql
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main extensions](/docs/flyctl/main-extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
-
diff --git a/flyctl/cmd/main_extensions_sentry.md b/flyctl/cmd/main_extensions_sentry.md
deleted file mode 100644
index 027331dab5..0000000000
--- a/flyctl/cmd/main_extensions_sentry.md
+++ /dev/null
@@ -1,30 +0,0 @@
-Setup a Sentry project for this app
-
-
-## Usage
-~~~
-main extensions sentry [command] [flags]
-~~~
-
-## Available Commands
-* [create](/docs/flyctl/main-extensions-sentry-create/)	 - Provision a Sentry project for a Fly.io app
-* [dashboard](/docs/flyctl/main-extensions-sentry-dashboard/)	 - View application errors in the Sentry dashboard
-
-## Options
-
-~~~
-  -h, --help   help for sentry
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main extensions](/docs/flyctl/main-extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
-
diff --git a/flyctl/cmd/main_extensions_storage.md b/flyctl/cmd/main_extensions_storage.md
deleted file mode 100644
index 862a7c193c..0000000000
--- a/flyctl/cmd/main_extensions_storage.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Provision and manage Tigris object storage buckets
-
-
-## Usage
-~~~
-main extensions storage [command] [flags]
-~~~
-
-## Available Commands
-* [create](/docs/flyctl/main-extensions-storage-create/)	 - Provision a Tigris object storage bucket
-* [dashboard](/docs/flyctl/main-extensions-storage-dashboard/)	 - Visit the Tigris dashboard
-* [destroy](/docs/flyctl/main-extensions-storage-destroy/)	 - Permanently destroy a Tigris object storage bucket
-* [list](/docs/flyctl/main-extensions-storage-list/)	 - List your Tigris object storage buckets
-* [status](/docs/flyctl/main-extensions-storage-status/)	 - Show details about a Tigris storage bucket
-* [update](/docs/flyctl/main-extensions-storage-update/)	 - Update an existing Tigris object storage bucket
-
-## Options
-
-~~~
-  -h, --help   help for storage
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main extensions](/docs/flyctl/main-extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
-
diff --git a/flyctl/cmd/main_extensions_supabase.md b/flyctl/cmd/main_extensions_supabase.md
deleted file mode 100644
index 898a05d909..0000000000
--- a/flyctl/cmd/main_extensions_supabase.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Provision and manage Supabase Postgres databases
-
-
-## Usage
-~~~
-main extensions supabase [command] [flags]
-~~~
-
-## Available Commands
-* [create](/docs/flyctl/main-extensions-supabase-create/)	 - Provision a Supabase Postgres database
-* [dashboard](/docs/flyctl/main-extensions-supabase-dashboard/)	 - Visit the Supabase database dashboard
-* [destroy](/docs/flyctl/main-extensions-supabase-destroy/)	 - Permanently destroy a Supabase database
-* [list](/docs/flyctl/main-extensions-supabase-list/)	 - List your Supabase databases
-* [status](/docs/flyctl/main-extensions-supabase-status/)	 - Show details about a Supabase Postgres database
-
-## Options
-
-~~~
-  -h, --help   help for supabase
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main extensions](/docs/flyctl/main-extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
-
diff --git a/flyctl/cmd/main_extensions_vector.md b/flyctl/cmd/main_extensions_vector.md
deleted file mode 100644
index 4c9719d39c..0000000000
--- a/flyctl/cmd/main_extensions_vector.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Provision and manage Upstash Vector index
-
-
-## Usage
-~~~
-main extensions vector [command] [flags]
-~~~
-
-## Available Commands
-* [create](/docs/flyctl/main-extensions-vector-create/)	 - Provision a Upstash Vector index
-* [dashboard](/docs/flyctl/main-extensions-vector-dashboard/)	 - Visit the Upstash Vector dashboard on the Upstash web console
-* [destroy](/docs/flyctl/main-extensions-vector-destroy/)	 - Permanently destroy an Upstash Vector index
-* [list](/docs/flyctl/main-extensions-vector-list/)	 - List your Upstash Vector index
-* [status](/docs/flyctl/main-extensions-vector-status/)	 - Show details about an Upstash Vector index
-
-## Options
-
-~~~
-  -h, --help   help for vector
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main extensions](/docs/flyctl/main-extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
-
diff --git a/flyctl/cmd/main_extensions_wafris.md b/flyctl/cmd/main_extensions_wafris.md
deleted file mode 100644
index 0662e70a1e..0000000000
--- a/flyctl/cmd/main_extensions_wafris.md
+++ /dev/null
@@ -1,31 +0,0 @@
-Provision and manage Wafris WAFs (Web Application Firewalls)
-
-
-## Usage
-~~~
-main extensions wafris [command] [flags]
-~~~
-
-## Available Commands
-* [create](/docs/flyctl/main-extensions-wafris-create/)	 - Provision a Wafris WAF
-* [dashboard](/docs/flyctl/main-extensions-wafris-dashboard/)	 - Visit the Wafris dashboard
-* [destroy](/docs/flyctl/main-extensions-wafris-destroy/)	 - Permanently destroy a Wafris WAF
-
-## Options
-
-~~~
-  -h, --help   help for wafris
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main extensions](/docs/flyctl/main-extensions/)	 - Extensions are additional functionality that can be added to your Fly apps
-
diff --git a/flyctl/cmd/main_ips.md b/flyctl/cmd/main_ips.md
deleted file mode 100644
index 560caaae01..0000000000
--- a/flyctl/cmd/main_ips.md
+++ /dev/null
@@ -1,32 +0,0 @@
-Commands for managing IP addresses associated with an application
-
-## Usage
-~~~
-main ips [command] [flags]
-~~~
-
-## Available Commands
-* [allocate-v4](/docs/flyctl/main-ips-allocate-v4/)	 - Allocate an IPv4 address
-* [allocate-v6](/docs/flyctl/main-ips-allocate-v6/)	 - Allocate an IPv6 address
-* [list](/docs/flyctl/main-ips-list/)	 - List allocated IP addresses
-* [private](/docs/flyctl/main-ips-private/)	 - List instances private IP addresses
-* [release](/docs/flyctl/main-ips-release/)	 - Release IP addresses
-
-## Options
-
-~~~
-  -h, --help   help for ips
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_litefs-cloud.md b/flyctl/cmd/main_litefs-cloud.md
deleted file mode 100644
index 848eef128a..0000000000
--- a/flyctl/cmd/main_litefs-cloud.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Commands for managing LiteFS Cloud databases
-
-## Usage
-~~~
-main litefs-cloud [command] [flags]
-~~~
-
-## Available Commands
-* [clusters](/docs/flyctl/main-litefs-cloud-clusters/)	 - Manage LiteFS Cloud clusters
-* [export](/docs/flyctl/main-litefs-cloud-export/)	 - Export LiteFS Cloud database
-* [import](/docs/flyctl/main-litefs-cloud-import/)	 - Import SQLite database into LiteFS Cloud
-* [regions](/docs/flyctl/main-litefs-cloud-regions/)	 - List LiteFS Cloud regions
-* [restore](/docs/flyctl/main-litefs-cloud-restore/)	 - Restore LiteFS Cloud database
-* [status](/docs/flyctl/main-litefs-cloud-status/)	 - Show LiteFS Cloud cluster status
-
-## Options
-
-~~~
-  -h, --help   help for litefs-cloud
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_litefs-cloud_clusters.md b/flyctl/cmd/main_litefs-cloud_clusters.md
deleted file mode 100644
index ed29af2b86..0000000000
--- a/flyctl/cmd/main_litefs-cloud_clusters.md
+++ /dev/null
@@ -1,31 +0,0 @@
-"Commands for managing LiteFS Cloud clusters"
-
-
-## Usage
-~~~
-main litefs-cloud clusters [command] [flags]
-~~~
-
-## Available Commands
-* [create](/docs/flyctl/main-litefs-cloud-clusters-create/)	 - Creates a LiteFS Cloud cluster
-* [destroy](/docs/flyctl/main-litefs-cloud-clusters-destroy/)	 - Delete a LiteFS Cloud cluster
-* [list](/docs/flyctl/main-litefs-cloud-clusters-list/)	 - Show LiteFS Cloud clusters
-
-## Options
-
-~~~
-  -h, --help   help for clusters
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main litefs-cloud](/docs/flyctl/main-litefs-cloud/)	 - LiteFS Cloud management commands
-
diff --git a/flyctl/cmd/main_machine.md b/flyctl/cmd/main_machine.md
deleted file mode 100644
index a354b4d07d..0000000000
--- a/flyctl/cmd/main_machine.md
+++ /dev/null
@@ -1,47 +0,0 @@
-Manage Fly Machines. Fly Machines are super-fast, lightweight VMs that can be created,
-and then quickly started and stopped as needed with flyctl commands or with the
-Machines REST fly.
-
-## Usage
-~~~
-main machine [command] [flags]
-~~~
-
-## Available Commands
-* [api-proxy](/docs/flyctl/main-machine-api-proxy/)	 - Establish a proxy to the Machine API through a Wireguard tunnel for local connections
-* [clone](/docs/flyctl/main-machine-clone/)	 - Clone a Fly Machine
-* [cordon](/docs/flyctl/main-machine-cordon/)	 - Deactivate all services on a machine
-* [create](/docs/flyctl/main-machine-create/)	 - Create, but don't start, a machine
-* [destroy](/docs/flyctl/main-machine-destroy/)	 - Destroy Fly machines
-* [egress-ip](/docs/flyctl/main-machine-egress-ip/)	 - Manage static egress IPs
-* [exec](/docs/flyctl/main-machine-exec/)	 - Execute a command on a machine
-* [kill](/docs/flyctl/main-machine-kill/)	 - Kill (SIGKILL) a Fly machine
-* [leases](/docs/flyctl/main-machine-leases/)	 - Manage machine leases
-* [list](/docs/flyctl/main-machine-list/)	 - List Fly machines
-* [restart](/docs/flyctl/main-machine-restart/)	 - Restart one or more Fly machines
-* [run](/docs/flyctl/main-machine-run/)	 - Run a machine
-* [start](/docs/flyctl/main-machine-start/)	 - Start one or more Fly machines
-* [status](/docs/flyctl/main-machine-status/)	 - Show current status of a running machine
-* [stop](/docs/flyctl/main-machine-stop/)	 - Stop one or more Fly machines
-* [suspend](/docs/flyctl/main-machine-suspend/)	 - Suspend one or more Fly machines
-* [uncordon](/docs/flyctl/main-machine-uncordon/)	 - Reactivate all services on a machine
-* [update](/docs/flyctl/main-machine-update/)	 - Update a machine
-
-## Options
-
-~~~
-  -h, --help   help for machine
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_machine_egress-ip.md b/flyctl/cmd/main_machine_egress-ip.md
deleted file mode 100644
index 92784160ae..0000000000
--- a/flyctl/cmd/main_machine_egress-ip.md
+++ /dev/null
@@ -1,30 +0,0 @@
-Manage static egress (outgoing) IP addresses for machines
-
-## Usage
-~~~
-main machine egress-ip [command] [flags]
-~~~
-
-## Available Commands
-* [allocate](/docs/flyctl/main-machine-egress-ip-allocate/)	 - Allocate static egress IPs
-* [list](/docs/flyctl/main-machine-egress-ip-list/)	 - List all allocated static egress IPs
-* [release](/docs/flyctl/main-machine-egress-ip-release/)	 - Release an egress IP address
-
-## Options
-
-~~~
-  -h, --help   help for egress-ip
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main machine](/docs/flyctl/main-machine/)	 - Manage Fly Machines.
-
diff --git a/flyctl/cmd/main_mysql.md b/flyctl/cmd/main_mysql.md
deleted file mode 100644
index 6aeb0f3be2..0000000000
--- a/flyctl/cmd/main_mysql.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Provision and manage MySQL database clusters
-
-
-## Usage
-~~~
-main mysql [command] [flags]
-~~~
-
-## Available Commands
-* [create](/docs/flyctl/main-mysql-create/)	 - Provision a MySQL database
-* [destroy](/docs/flyctl/main-mysql-destroy/)	 - Permanently destroy a MySQL database
-* [list](/docs/flyctl/main-mysql-list/)	 - List your MySQL databases
-* [status](/docs/flyctl/main-mysql-status/)	 - Show details about a MySQL database
-* [update](/docs/flyctl/main-mysql-update/)	 - Update an existing MySQL database
-
-## Options
-
-~~~
-  -h, --help   help for mysql
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_orgs.md b/flyctl/cmd/main_orgs.md
deleted file mode 100644
index 05456e2943..0000000000
--- a/flyctl/cmd/main_orgs.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Commands for managing Fly organizations. list, create, show and
-destroy organizations.
-Organization admins can also invite or remove users from Organizations.
-
-
-## Usage
-~~~
-main orgs [command] [flags]
-~~~
-
-## Available Commands
-* [create](/docs/flyctl/main-orgs-create/)	 - Create an organization
-* [delete](/docs/flyctl/main-orgs-delete/)	 - Delete an organization
-* [invite](/docs/flyctl/main-orgs-invite/)	 - Invite user (by email) to organization
-* [list](/docs/flyctl/main-orgs-list/)	 - Lists organizations for current user
-* [remove](/docs/flyctl/main-orgs-remove/)	 - Remove a user from an organization
-* [show](/docs/flyctl/main-orgs-show/)	 - Show information about an organization
-
-## Options
-
-~~~
-  -h, --help   help for orgs
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_platform.md b/flyctl/cmd/main_platform.md
deleted file mode 100644
index b2bbb3931d..0000000000
--- a/flyctl/cmd/main_platform.md
+++ /dev/null
@@ -1,32 +0,0 @@
-The PLATFORM commands are for users looking for information
-about the Fly platform.
-
-
-## Usage
-~~~
-main platform [command] [flags]
-~~~
-
-## Available Commands
-* [regions](/docs/flyctl/main-platform-regions/)	 - List regions
-* [status](/docs/flyctl/main-platform-status/)	 - Show current platform status with an optional filter for maintenance or incidents in json mode (eg. incidents, maintenance)
-* [vm-sizes](/docs/flyctl/main-platform-vm-sizes/)	 - List VM Sizes
-
-## Options
-
-~~~
-  -h, --help   help for platform
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_postgres.md b/flyctl/cmd/main_postgres.md
deleted file mode 100644
index dbf97b3aab..0000000000
--- a/flyctl/cmd/main_postgres.md
+++ /dev/null
@@ -1,42 +0,0 @@
-Manage Postgres clusters.
-
-
-## Usage
-~~~
-main postgres [command] [flags]
-~~~
-
-## Available Commands
-* [attach](/docs/flyctl/main-postgres-attach/)	 - Attach a postgres cluster to an app
-* [backup](/docs/flyctl/main-postgres-backup/)	 - Backup commands
-* [config](/docs/flyctl/main-postgres-config/)	 - Show and manage Postgres configuration.
-* [connect](/docs/flyctl/main-postgres-connect/)	 - Connect to the Postgres console
-* [create](/docs/flyctl/main-postgres-create/)	 - Create a new Postgres cluster
-* [db](/docs/flyctl/main-postgres-db/)	 - Manage databases in a cluster
-* [detach](/docs/flyctl/main-postgres-detach/)	 - Detach a postgres cluster from an app
-* [events](/docs/flyctl/main-postgres-events/)	 - Track major cluster events
-* [failover](/docs/flyctl/main-postgres-failover/)	 - Failover to a new primary
-* [import](/docs/flyctl/main-postgres-import/)	 - Imports database from a specified Postgres URI
-* [list](/docs/flyctl/main-postgres-list/)	 - List postgres clusters
-* [renew-certs](/docs/flyctl/main-postgres-renew-certs/)	 - Renews the SSH certificates for the Postgres cluster.
-* [restart](/docs/flyctl/main-postgres-restart/)	 - Restarts each member of the Postgres cluster one by one.
-* [users](/docs/flyctl/main-postgres-users/)	 - Manage users in a postgres cluster
-
-## Options
-
-~~~
-  -h, --help   help for postgres
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_postgres_backup.md b/flyctl/cmd/main_postgres_backup.md
deleted file mode 100644
index 1e750e19dc..0000000000
--- a/flyctl/cmd/main_postgres_backup.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Backup commands
-
-
-## Usage
-~~~
-main postgres backup [command] [flags]
-~~~
-
-## Available Commands
-* [config](/docs/flyctl/main-postgres-backup-config/)	 - Manage backup configuration
-* [create](/docs/flyctl/main-postgres-backup-create/)	 - Create a backup
-* [enable](/docs/flyctl/main-postgres-backup-enable/)	 - Enable backups on a Postgres cluster, creating a Tigris bucket for storage
-* [list](/docs/flyctl/main-postgres-backup-list/)	 - List backups
-* [restore](/docs/flyctl/main-postgres-backup-restore/)	 - Performs a WAL-based restore into a new Postgres cluster.
-
-## Options
-
-~~~
-  -h, --help   help for backup
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main postgres](/docs/flyctl/main-postgres/)	 - Manage Postgres clusters.
-
diff --git a/flyctl/cmd/main_redis.md b/flyctl/cmd/main_redis.md
deleted file mode 100644
index 97ad14a950..0000000000
--- a/flyctl/cmd/main_redis.md
+++ /dev/null
@@ -1,37 +0,0 @@
-Launch and manage Redis databases managed by Upstash.com
-
-## Usage
-~~~
-main redis [command] [flags]
-~~~
-
-## Available Commands
-* [connect](/docs/flyctl/main-redis-connect/)	 - Connect to a Redis database using redis-cli
-* [create](/docs/flyctl/main-redis-create/)	 - Create an Upstash Redis database
-* [dashboard](/docs/flyctl/main-redis-dashboard/)	 - View your Upstash Redis databases on the Upstash web console
-* [destroy](/docs/flyctl/main-redis-destroy/)	 - Permanently destroy an Upstash Redis database
-* [list](/docs/flyctl/main-redis-list/)	 - List Upstash Redis databases for an organization
-* [plans](/docs/flyctl/main-redis-plans/)	 - List available Redis plans
-* [proxy](/docs/flyctl/main-redis-proxy/)	 - Proxy to a Redis database
-* [reset](/docs/flyctl/main-redis-reset/)	 - Reset the password for an Upstash Redis database
-* [status](/docs/flyctl/main-redis-status/)	 - Show status of a Redis database
-* [update](/docs/flyctl/main-redis-update/)	 - Update an Upstash Redis database
-
-## Options
-
-~~~
-  -h, --help   help for redis
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_scale.md b/flyctl/cmd/main_scale.md
deleted file mode 100644
index 002f1ddbd7..0000000000
--- a/flyctl/cmd/main_scale.md
+++ /dev/null
@@ -1,31 +0,0 @@
-Scale application resources
-
-## Usage
-~~~
-main scale [command] [flags]
-~~~
-
-## Available Commands
-* [count](/docs/flyctl/main-scale-count/)	 - Change an app's VM count to the given value
-* [memory](/docs/flyctl/main-scale-memory/)	 - Set VM memory
-* [show](/docs/flyctl/main-scale-show/)	 - Show current resources
-* [vm](/docs/flyctl/main-scale-vm/)	 - Change an app's VM to a named size (eg. shared-cpu-1x, performance-1x, performance-2x...)
-
-## Options
-
-~~~
-  -h, --help   help for scale
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_secrets.md b/flyctl/cmd/main_secrets.md
deleted file mode 100644
index 01dd79ab23..0000000000
--- a/flyctl/cmd/main_secrets.md
+++ /dev/null
@@ -1,35 +0,0 @@
-Secrets are provided to applications at runtime as ENV variables. Names are
-		case sensitive and stored as-is, so ensure names are appropriate for
-		the application and vm environment.
-		
-
-## Usage
-~~~
-main secrets [command] [flags]
-~~~
-
-## Available Commands
-* [deploy](/docs/flyctl/main-secrets-deploy/)	 - Deploy staged secrets for an application
-* [import](/docs/flyctl/main-secrets-import/)	 - Set secrets as NAME=VALUE pairs from stdin
-* [list](/docs/flyctl/main-secrets-list/)	 - List application secret names, digests and creation times
-* [set](/docs/flyctl/main-secrets-set/)	 - Set one or more encrypted secrets for an application
-* [unset](/docs/flyctl/main-secrets-unset/)	 - Unset one or more encrypted secrets for an application
-
-## Options
-
-~~~
-  -h, --help   help for secrets
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_settings.md b/flyctl/cmd/main_settings.md
deleted file mode 100644
index 759a236101..0000000000
--- a/flyctl/cmd/main_settings.md
+++ /dev/null
@@ -1,30 +0,0 @@
-Manage flyctl settings
-
-## Usage
-~~~
-main settings [command] [flags]
-~~~
-
-## Available Commands
-* [analytics](/docs/flyctl/main-settings-analytics/)	 - Control anonymized analytics collection
-* [autoupdate](/docs/flyctl/main-settings-autoupdate/)	 - Control automatic updates
-* [synthetics](/docs/flyctl/main-settings-synthetics/)	 - Control synthetics agent execution
-
-## Options
-
-~~~
-  -h, --help   help for settings
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_sftp.md b/flyctl/cmd/main_sftp.md
deleted file mode 100644
index 60263b2159..0000000000
--- a/flyctl/cmd/main_sftp.md
+++ /dev/null
@@ -1,30 +0,0 @@
-Get or put files from a remote VM.
-
-## Usage
-~~~
-main sftp [command] [flags]
-~~~
-
-## Available Commands
-* [find](/docs/flyctl/main-sftp-find/)	 - The SFTP FIND command lists files (from an optional root directory) on a remote VM.
-* [get](/docs/flyctl/main-sftp-get/)	 - The SFTP GET retrieves a file from a remote VM.
-* [shell](/docs/flyctl/main-sftp-shell/)	 - The SFTP SHELL command brings up an interactive SFTP session to fetch and push files from/to a VM.
-
-## Options
-
-~~~
-  -h, --help   help for sftp
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_ssh.md b/flyctl/cmd/main_ssh.md
deleted file mode 100644
index 2b15715f00..0000000000
--- a/flyctl/cmd/main_ssh.md
+++ /dev/null
@@ -1,31 +0,0 @@
-Use SSH to log into or run commands on Machines
-
-## Usage
-~~~
-main ssh [command] [flags]
-~~~
-
-## Available Commands
-* [console](/docs/flyctl/main-ssh-console/)	 - Connect to a running instance of the current app.
-* [issue](/docs/flyctl/main-ssh-issue/)	 - Issue a new SSH credential
-* [log](/docs/flyctl/main-ssh-log/)	 - Log of all issued SSH certs
-* [sftp](/docs/flyctl/main-ssh-sftp/)	 - Get or put files from a remote VM.
-
-## Options
-
-~~~
-  -h, --help   help for ssh
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_ssh_sftp.md b/flyctl/cmd/main_ssh_sftp.md
deleted file mode 100644
index 12f974848b..0000000000
--- a/flyctl/cmd/main_ssh_sftp.md
+++ /dev/null
@@ -1,30 +0,0 @@
-Get or put files from a remote VM.
-
-## Usage
-~~~
-main ssh sftp [command] [flags]
-~~~
-
-## Available Commands
-* [find](/docs/flyctl/main-ssh-sftp-find/)	 - The SFTP FIND command lists files (from an optional root directory) on a remote VM.
-* [get](/docs/flyctl/main-ssh-sftp-get/)	 - The SFTP GET retrieves a file from a remote VM.
-* [shell](/docs/flyctl/main-ssh-sftp-shell/)	 - The SFTP SHELL command brings up an interactive SFTP session to fetch and push files from/to a VM.
-
-## Options
-
-~~~
-  -h, --help   help for sftp
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main ssh](/docs/flyctl/main-ssh/)	 - Use SSH to log into or run commands on Machines
-
diff --git a/flyctl/cmd/main_storage.md b/flyctl/cmd/main_storage.md
deleted file mode 100644
index dbe49fa9e0..0000000000
--- a/flyctl/cmd/main_storage.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Provision and manage Tigris object storage buckets
-
-
-## Usage
-~~~
-main storage [command] [flags]
-~~~
-
-## Available Commands
-* [create](/docs/flyctl/main-storage-create/)	 - Provision a Tigris object storage bucket
-* [dashboard](/docs/flyctl/main-storage-dashboard/)	 - Visit the Tigris dashboard
-* [destroy](/docs/flyctl/main-storage-destroy/)	 - Permanently destroy a Tigris object storage bucket
-* [list](/docs/flyctl/main-storage-list/)	 - List your Tigris object storage buckets
-* [status](/docs/flyctl/main-storage-status/)	 - Show details about a Tigris storage bucket
-* [update](/docs/flyctl/main-storage-update/)	 - Update an existing Tigris object storage bucket
-
-## Options
-
-~~~
-  -h, --help   help for storage
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_tokens.md b/flyctl/cmd/main_tokens.md
deleted file mode 100644
index ef0a9cfdce..0000000000
--- a/flyctl/cmd/main_tokens.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Manage Fly.io API tokens
-
-## Usage
-~~~
-main tokens [command] [flags]
-~~~
-
-## Available Commands
-* [3p](/docs/flyctl/main-tokens-3p/)	 - Manage third-party (3P) caveats for Fly.io API tokens
-* [attenuate](/docs/flyctl/main-tokens-attenuate/)	 - Attenuate Fly.io API tokens
-* [create](/docs/flyctl/main-tokens-create/)	 - Create Fly.io API tokens
-* [debug](/docs/flyctl/main-tokens-debug/)	 - Debug Fly.io API tokens
-* [list](/docs/flyctl/main-tokens-list/)	 - List tokens
-* [revoke](/docs/flyctl/main-tokens-revoke/)	 - Revoke tokens
-
-## Options
-
-~~~
-  -h, --help   help for tokens
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_tokens_create.md b/flyctl/cmd/main_tokens_create.md
deleted file mode 100644
index be6dc6d977..0000000000
--- a/flyctl/cmd/main_tokens_create.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Create Fly.io API tokens
-
-## Usage
-~~~
-main tokens create [command] [flags]
-~~~
-
-## Available Commands
-* [deploy](/docs/flyctl/main-tokens-create-deploy/)	 - Create deploy tokens
-* [litefs-cloud](/docs/flyctl/main-tokens-create-litefs-cloud/)	 - Create LiteFS Cloud tokens
-* [machine-exec](/docs/flyctl/main-tokens-create-machine-exec/)	 - Create a machine exec token
-* [org](/docs/flyctl/main-tokens-create-org/)	 - Create org deploy tokens
-* [readonly](/docs/flyctl/main-tokens-create-readonly/)	 - Create read-only org tokens
-* [ssh](/docs/flyctl/main-tokens-create-ssh/)	 - Create token for SSH'ing to a single app
-
-## Options
-
-~~~
-  -h, --help   help for create
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main tokens](/docs/flyctl/main-tokens/)	 - Manage Fly.io API tokens
-
diff --git a/flyctl/cmd/main_volumes.md b/flyctl/cmd/main_volumes.md
deleted file mode 100644
index 97fce5fa92..0000000000
--- a/flyctl/cmd/main_volumes.md
+++ /dev/null
@@ -1,35 +0,0 @@
-Manage Fly Volumes. Volumes are persistent storage for Fly Machines. Learn how how volumes work: https://fly.io/docs/volumes/overview/.
-
-## Usage
-~~~
-main volumes [command] [flags]
-~~~
-
-## Available Commands
-* [create](/docs/flyctl/main-volumes-create/)	 - Create a new volume for an app.
-* [destroy](/docs/flyctl/main-volumes-destroy/)	 - Destroy one or more volumes.
-* [extend](/docs/flyctl/main-volumes-extend/)	 - Extend a volume to the specified size.
-* [fork](/docs/flyctl/main-volumes-fork/)	 - Fork the specified volume.
-* [list](/docs/flyctl/main-volumes-list/)	 - List the volumes associated with an app.
-* [show](/docs/flyctl/main-volumes-show/)	 - Show the details of the specified volume.
-* [snapshots](/docs/flyctl/main-volumes-snapshots/)	 - Manage volume snapshots.
-* [update](/docs/flyctl/main-volumes-update/)	 - Update a volume for an app.
-
-## Options
-
-~~~
-  -h, --help   help for volumes
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_wireguard.md b/flyctl/cmd/main_wireguard.md
deleted file mode 100644
index 7624507373..0000000000
--- a/flyctl/cmd/main_wireguard.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Commands that manage WireGuard peer connections
-
-## Usage
-~~~
-main wireguard [command] [flags]
-~~~
-
-## Available Commands
-* [create](/docs/flyctl/main-wireguard-create/)	 - Add a WireGuard peer connection
-* [list](/docs/flyctl/main-wireguard-list/)	 - List all WireGuard peer connections
-* [remove](/docs/flyctl/main-wireguard-remove/)	 - Remove a WireGuard peer connection
-* [reset](/docs/flyctl/main-wireguard-reset/)	 - Reset WireGuard peer connection for an organization
-* [token](/docs/flyctl/main-wireguard-token/)	 - Commands that managed WireGuard delegated access tokens
-* [websockets](/docs/flyctl/main-wireguard-websockets/)	 - Enable or disable WireGuard tunneling over WebSockets
-
-## Options
-
-~~~
-  -h, --help   help for wireguard
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main](/docs/flyctl/main/)	 - The Fly.io command line interface
-
diff --git a/flyctl/cmd/main_wireguard_token.md b/flyctl/cmd/main_wireguard_token.md
deleted file mode 100644
index f2ff2a9bc3..0000000000
--- a/flyctl/cmd/main_wireguard_token.md
+++ /dev/null
@@ -1,32 +0,0 @@
-Commands that managed WireGuard delegated access tokens
-
-## Usage
-~~~
-main wireguard token [command] [flags]
-~~~
-
-## Available Commands
-* [create](/docs/flyctl/main-wireguard-token-create/)	 - Create a new WireGuard token
-* [delete](/docs/flyctl/main-wireguard-token-delete/)	 - Delete a WireGuard token; token is name:<name> or token:<token>
-* [list](/docs/flyctl/main-wireguard-token-list/)	 - List all WireGuard tokens
-* [start](/docs/flyctl/main-wireguard-token-start/)	 - Start a new WireGuard peer connection associated with a token (set FLY_WIREGUARD_TOKEN)
-* [update](/docs/flyctl/main-wireguard-token-update/)	 - Rekey a WireGuard peer connection associated with a token (set FLY_WIREGUARD_TOKEN)
-
-## Options
-
-~~~
-  -h, --help   help for token
-~~~
-
-## Global Options
-
-~~~
-  -t, --access-token string   Fly API Access Token
-      --debug                 Print additional logs and traces
-      --verbose               Verbose output
-~~~
-
-## See Also
-
-* [main wireguard](/docs/flyctl/main-wireguard/)	 - Commands that manage WireGuard peer connections
-