From e66897239f8bb00742a6df290f05b08c8fe1ec67 Mon Sep 17 00:00:00 2001
From: William Laugesen <will.laugesen@octopus.com>
Date: Mon, 31 Aug 2026 18:01:18 +1200
Subject: [PATCH 1/7] Move the CLI reference to its own top level section

The Octopus CLI now sits at /docs/cli with a nav of its own: the overview and
the deprecated Octo CLI above a rule, the 185 generated command pages below it.
Redirect stubs are left at every old url, and the underscore stubs that were
already there now point straight at the new destination rather than chaining.

Adding the area generalised what the API reference already had. apiNavigation.ts
is now areaMenu.ts and builds either tree, and generatedApiPaths.ts is now
generatedPaths.ts and covers both _generated folders.

Cli.astro is the reference's own layout, laid out as a docs page. It leaves out
Edit on GitHub for the reason Api.astro gives: gen-docs writes these pages and
the next sync overwrites the file the button opens.

The overview page is written here now rather than generated whole by the CLI
repo, and imports the one part that has to be generated - the row per command -
as a shared-content include.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 frontmatter.json                              |   3 +-
 src/components/ApiNavigation.astro            |  10 +-
 src/components/AreaNavigation.astro           |   3 +
 ...ionItem.astro => AreaNavigationItem.astro} |  20 +-
 src/components/CliNavigation.astro            |  67 ++++
 src/components/TopNav.astro                   |   2 +-
 src/layouts/Cli.astro                         | 138 ++++++++
 src/lib/accelerator.ts                        |  22 +-
 src/lib/{apiNavigation.ts => areaMenu.ts}     | 113 ++++---
 src/lib/areas.ts                              |  12 +-
 src/lib/generatedApiPaths.ts                  |  14 -
 src/lib/generatedPaths.ts                     |  25 ++
 src/lib/navigationTree.ts                     |   2 +-
 src/pages/components.mdx                      |   2 +-
 .../clean-environment.md                      |   2 +-
 .../octo.exe-command-line/clean-workerpool.md |   2 +-
 .../cleaning-environments.md                  |   2 +-
 .../create-autodeployoverride.md              |   2 +-
 .../octo.exe-command-line/create-channel.md   |   2 +-
 .../create-environment.md                     |   2 +-
 .../octo.exe-command-line/create-project.md   |   2 +-
 .../octo.exe-command-line/create-release.md   |   2 +-
 .../create-workerpool.md                      |   2 +-
 .../deleting-auto-deploy-overrides.md         |   2 +-
 .../creating-auto-deploy-overrides/index.md   |   2 +-
 .../creating-channels.md                      |   2 +-
 .../creating-environments.md                  |   2 +-
 .../creating-projects.md                      |   2 +-
 .../creating-releases.md                      |   2 +-
 .../delete-autodeployoverride.md              |   2 +-
 .../octo.exe-command-line/delete-release.md   |   2 +-
 .../octo.exe-command-line/delete-releases.md  |   2 +-
 .../deleting-releases.md                      |   2 +-
 .../octo.exe-command-line/deploy-release.md   |   2 +-
 .../deploying-releases.md                     |   2 +-
 .../octo.exe-command-line/dump-deployments.md |   2 +-
 .../octo.exe-command-line/export.md           |   2 +-
 .../octo.exe-command-line/formatted-output.md |   2 +-
 .../octo.exe-command-line/import.md           |   2 +-
 .../octo.exe-command-line/index.md            |   2 +-
 .../install-global-tool.md                    |   2 +-
 .../octo.exe-command-line/list-deployments.md |   2 +-
 .../list-environments.md                      |   2 +-
 .../list-latestdeployments.md                 |   2 +-
 .../octo.exe-command-line/list-machines.md    |   2 +-
 .../octo.exe-command-line/list-projects.md    |   2 +-
 .../octo.exe-command-line/list-releases.md    |   2 +-
 .../octo.exe-command-line/list-tenants.md     |   2 +-
 .../octo.exe-command-line/list-workerpools.md |   2 +-
 .../octo.exe-command-line/list-workers.md     |   2 +-
 .../octo.exe-command-line/pack.md             |   2 +-
 .../octo.exe-command-line/promote-release.md  |   2 +-
 .../promoting-releases.md                     |   2 +-
 .../octo.exe-command-line/push-metadata.md    |   2 +-
 .../octo.exe-command-line/push-package.md     |   2 +-
 .../octo.exe-command-line/push.md             |   2 +-
 .../octo.exe-command-line/pushing-packages.md |   2 +-
 .../octo.exe-command-line/version.md          |   2 +-
 .../docs/cli/[...generatedFileName].astro     |  35 +++
 .../_generated/octopus-account-aws-create.mdx |  50 +++
 .../_generated/octopus-account-aws-list.mdx   |  40 +++
 .../cli/_generated/octopus-account-aws.mdx    |  44 +++
 .../octopus-account-azure-create.mdx          |  54 ++++
 .../_generated/octopus-account-azure-list.mdx |  40 +++
 .../octopus-account-azure-oidc-create.mdx     |  57 ++++
 .../octopus-account-azure-oidc-list.mdx       |  40 +++
 .../_generated/octopus-account-azure-oidc.mdx |  44 +++
 .../cli/_generated/octopus-account-azure.mdx  |  44 +++
 .../cli/_generated/octopus-account-create.mdx |  40 +++
 .../cli/_generated/octopus-account-delete.mdx |  46 +++
 .../_generated/octopus-account-gcp-create.mdx |  48 +++
 .../_generated/octopus-account-gcp-list.mdx   |  40 +++
 .../cli/_generated/octopus-account-gcp.mdx    |  44 +++
 .../octopus-account-generic-oidc-create.mdx   |  49 +++
 .../octopus-account-generic-oidc-list.mdx     |  40 +++
 .../octopus-account-generic-oidc.mdx          |  44 +++
 .../cli/_generated/octopus-account-list.mdx   |  40 +++
 .../_generated/octopus-account-ssh-create.mdx |  50 +++
 .../_generated/octopus-account-ssh-list.mdx   |  40 +++
 .../cli/_generated/octopus-account-ssh.mdx    |  44 +++
 .../octopus-account-token-create.mdx          |  48 +++
 .../_generated/octopus-account-token-list.mdx |  40 +++
 .../cli/_generated/octopus-account-token.mdx  |  44 +++
 .../octopus-account-username-create.mdx       |  47 +++
 .../octopus-account-username-list.mdx         |  41 +++
 .../_generated/octopus-account-username.mdx   |  44 +++
 .../docs/cli/_generated/octopus-account.mdx   |  53 ++++
 src/pages/docs/cli/_generated/octopus-api.mdx |  40 +++
 .../octopus-build-information-bulk-delete.mdx |  46 +++
 .../octopus-build-information-delete.mdx      |  49 +++
 .../octopus-build-information-list.mdx        |  51 +++
 .../octopus-build-information-upload.mdx      |  51 +++
 .../octopus-build-information-view.mdx        |  43 +++
 .../_generated/octopus-build-information.mdx  |  50 +++
 .../cli/_generated/octopus-channel-create.mdx |  47 +++
 .../cli/_generated/octopus-channel-delete.mdx |  47 +++
 .../cli/_generated/octopus-channel-list.mdx   |  50 +++
 .../cli/_generated/octopus-channel-view.mdx   |  44 +++
 .../docs/cli/_generated/octopus-channel.mdx   |  50 +++
 .../cli/_generated/octopus-config-get.mdx     |  28 ++
 .../cli/_generated/octopus-config-list.mdx    |  41 +++
 .../cli/_generated/octopus-config-set.mdx     |  28 ++
 .../docs/cli/_generated/octopus-config.mdx    |  36 +++
 ...deployment-target-azure-web-app-create.mdx |  57 ++++
 ...s-deployment-target-azure-web-app-list.mdx |  42 +++
 ...s-deployment-target-azure-web-app-view.mdx |  43 +++
 ...ctopus-deployment-target-azure-web-app.mdx |  45 +++
 ...-deployment-target-cloud-region-create.mdx |  53 ++++
 ...us-deployment-target-cloud-region-list.mdx |  42 +++
 ...us-deployment-target-cloud-region-view.mdx |  43 +++
 ...octopus-deployment-target-cloud-region.mdx |  45 +++
 .../octopus-deployment-target-delete.mdx      |  46 +++
 ...us-deployment-target-kubernetes-create.mdx |  81 +++++
 ...opus-deployment-target-kubernetes-list.mdx |  42 +++
 ...opus-deployment-target-kubernetes-view.mdx |  42 +++
 .../octopus-deployment-target-kubernetes.mdx  |  48 +++
 .../octopus-deployment-target-list.mdx        |  42 +++
 ...yment-target-listening-tentacle-create.mdx |  56 ++++
 ...loyment-target-listening-tentacle-list.mdx |  42 +++
 ...loyment-target-listening-tentacle-view.mdx |  43 +++
 ...s-deployment-target-listening-tentacle.mdx |  45 +++
 ...eployment-target-polling-tentacle-list.mdx |  42 +++
 ...eployment-target-polling-tentacle-view.mdx |  43 +++
 ...pus-deployment-target-polling-tentacle.mdx |  44 +++
 .../octopus-deployment-target-ssh-create.mdx  |  60 ++++
 .../octopus-deployment-target-ssh-list.mdx    |  42 +++
 .../octopus-deployment-target-ssh-view.mdx    |  43 +++
 .../octopus-deployment-target-ssh.mdx         |  45 +++
 .../octopus-deployment-target-view.mdx        |  43 +++
 .../_generated/octopus-deployment-target.mdx  |  51 +++
 .../_generated/octopus-environment-create.mdx |  48 +++
 .../_generated/octopus-environment-delete.mdx |  46 +++
 .../_generated/octopus-environment-list.mdx   |  42 +++
 .../_generated/octopus-environment-tag.mdx    |  42 +++
 .../cli/_generated/octopus-environment.mdx    |  48 +++
 .../octopus-ephemeral-environment-create.mdx  |  45 +++
 ...al-environment-deprovision-environment.mdx |  41 +++
 ...emeral-environment-deprovision-project.mdx |  42 +++
 .../octopus-ephemeral-environment.mdx         |  46 +++
 .../docs/cli/_generated/octopus-login.mdx     |  48 +++
 .../docs/cli/_generated/octopus-logout.mdx    |  28 ++
 .../cli/_generated/octopus-package-delete.mdx |  49 +++
 .../cli/_generated/octopus-package-list.mdx   |  48 +++
 .../octopus-package-nuget-create.mdx          |  54 ++++
 .../cli/_generated/octopus-package-nuget.mdx  |  43 +++
 .../cli/_generated/octopus-package-upload.mdx |  54 ++++
 .../_generated/octopus-package-versions.mdx   |  49 +++
 .../_generated/octopus-package-zip-create.mdx |  49 +++
 .../cli/_generated/octopus-package-zip.mdx    |  43 +++
 .../docs/cli/_generated/octopus-package.mdx   |  48 +++
 .../octopus-project-branch-create.mdx         |  48 +++
 .../octopus-project-branch-list.mdx           |  47 +++
 .../cli/_generated/octopus-project-branch.mdx |  46 +++
 .../cli/_generated/octopus-project-clone.mdx  |  48 +++
 .../_generated/octopus-project-connect.mdx    |  47 +++
 .../_generated/octopus-project-convert.mdx    |  53 ++++
 .../cli/_generated/octopus-project-create.mdx |  59 ++++
 .../cli/_generated/octopus-project-delete.mdx |  46 +++
 .../_generated/octopus-project-disable.mdx    |  37 +++
 .../_generated/octopus-project-disconnect.mdx |  45 +++
 .../cli/_generated/octopus-project-enable.mdx |  37 +++
 .../octopus-project-group-create.mdx          |  45 +++
 .../octopus-project-group-delete.mdx          |  46 +++
 .../_generated/octopus-project-group-list.mdx |  42 +++
 .../_generated/octopus-project-group-view.mdx |  43 +++
 .../cli/_generated/octopus-project-group.mdx  |  48 +++
 .../cli/_generated/octopus-project-list.mdx   |  42 +++
 .../cli/_generated/octopus-project-tag.mdx    |  42 +++
 .../octopus-project-variables-create.mdx      |  66 ++++
 .../octopus-project-variables-delete.mdx      |  51 +++
 .../octopus-project-variables-exclude.mdx     |  44 +++
 .../octopus-project-variables-include.mdx     |  44 +++
 .../octopus-project-variables-list.mdx        |  48 +++
 .../octopus-project-variables-update.mdx      |  59 ++++
 .../octopus-project-variables-view.mdx        |  48 +++
 .../_generated/octopus-project-variables.mdx  |  55 ++++
 .../cli/_generated/octopus-project-view.mdx   |  44 +++
 .../docs/cli/_generated/octopus-project.mdx   |  60 ++++
 .../cli/_generated/octopus-release-create.mdx |  65 ++++
 .../cli/_generated/octopus-release-delete.mdx |  48 +++
 .../cli/_generated/octopus-release-deploy.mdx |  62 ++++
 .../cli/_generated/octopus-release-list.mdx   |  47 +++
 .../octopus-release-progression-allow.mdx     |  48 +++
 .../octopus-release-progression-prevent.mdx   |  49 +++
 .../octopus-release-progression.mdx           |  46 +++
 .../docs/cli/_generated/octopus-release.mdx   |  47 +++
 .../cli/_generated/octopus-runbook-delete.mdx |  49 +++
 .../cli/_generated/octopus-runbook-list.mdx   |  50 +++
 .../cli/_generated/octopus-runbook-run.mdx    |  68 ++++
 .../octopus-runbook-snapshot-create.mdx       |  61 ++++
 .../octopus-runbook-snapshot-list.mdx         |  48 +++
 .../octopus-runbook-snapshot-publish.mdx      |  44 +++
 .../_generated/octopus-runbook-snapshot.mdx   |  47 +++
 .../docs/cli/_generated/octopus-runbook.mdx   |  48 +++
 .../cli/_generated/octopus-space-create.mdx   |  47 +++
 .../cli/_generated/octopus-space-delete.mdx   |  46 +++
 .../cli/_generated/octopus-space-list.mdx     |  40 +++
 .../cli/_generated/octopus-space-view.mdx     |  39 +++
 .../docs/cli/_generated/octopus-space.mdx     |  48 +++
 .../docs/cli/_generated/octopus-task-wait.mdx |  44 +++
 .../docs/cli/_generated/octopus-task.mdx      |  34 ++
 .../cli/_generated/octopus-tenant-clone.mdx   |  45 +++
 .../cli/_generated/octopus-tenant-connect.mdx |  47 +++
 .../cli/_generated/octopus-tenant-create.mdx  |  46 +++
 .../cli/_generated/octopus-tenant-delete.mdx  |  46 +++
 .../cli/_generated/octopus-tenant-disable.mdx |  39 +++
 .../_generated/octopus-tenant-disconnect.mdx  |  45 +++
 .../cli/_generated/octopus-tenant-enable.mdx  |  39 +++
 .../cli/_generated/octopus-tenant-list.mdx    |  42 +++
 .../cli/_generated/octopus-tenant-tag.mdx     |  42 +++
 .../octopus-tenant-variables-list.mdx         |  47 +++
 .../octopus-tenant-variables-update.mdx       |  49 +++
 .../_generated/octopus-tenant-variables.mdx   |  49 +++
 .../cli/_generated/octopus-tenant-view.mdx    |  45 +++
 .../docs/cli/_generated/octopus-tenant.mdx    |  55 ++++
 .../cli/_generated/octopus-user-delete.mdx    |  46 +++
 .../docs/cli/_generated/octopus-user-list.mdx |  42 +++
 .../docs/cli/_generated/octopus-user.mdx      |  46 +++
 .../cli/_generated/octopus-worker-delete.mdx  |  46 +++
 .../cli/_generated/octopus-worker-list.mdx    |  40 +++
 ...topus-worker-listening-tentacle-create.mdx |  48 +++
 ...octopus-worker-listening-tentacle-list.mdx |  41 +++
 ...octopus-worker-listening-tentacle-view.mdx |  43 +++
 .../octopus-worker-listening-tentacle.mdx     |  45 +++
 .../octopus-worker-polling-tentacle-list.mdx  |  40 +++
 .../octopus-worker-polling-tentacle-view.mdx  |  43 +++
 .../octopus-worker-polling-tentacle.mdx       |  44 +++
 .../_generated/octopus-worker-pool-delete.mdx |  46 +++
 .../octopus-worker-pool-dynamic-create.mdx    |  45 +++
 .../octopus-worker-pool-dynamic-view.mdx      |  43 +++
 .../octopus-worker-pool-dynamic.mdx           |  44 +++
 .../_generated/octopus-worker-pool-list.mdx   |  40 +++
 .../octopus-worker-pool-static-create.mdx     |  44 +++
 .../octopus-worker-pool-static-view.mdx       |  43 +++
 .../_generated/octopus-worker-pool-static.mdx |  44 +++
 .../_generated/octopus-worker-pool-view.mdx   |  43 +++
 .../cli/_generated/octopus-worker-pool.mdx    |  49 +++
 .../_generated/octopus-worker-ssh-create.mdx  |  51 +++
 .../_generated/octopus-worker-ssh-list.mdx    |  40 +++
 .../_generated/octopus-worker-ssh-view.mdx    |  43 +++
 .../cli/_generated/octopus-worker-ssh.mdx     |  45 +++
 .../cli/_generated/octopus-worker-view.mdx    |  43 +++
 .../docs/cli/_generated/octopus-worker.mdx    |  50 +++
 src/pages/docs/cli/_generated/octopus.mdx     |  56 ++++
 src/pages/docs/cli/index.mdx                  |  26 ++
 .../octopus-cli/allow-releaseprogression.mdx  |  93 ++++++
 .../cli/octopus-cli/build-information.mdx     | 120 +++++++
 .../docs/cli/octopus-cli/clean-environment.md | 107 +++++++
 .../docs/cli/octopus-cli/clean-workerpool.mdx | 115 +++++++
 src/pages/docs/cli/octopus-cli/complete.md    |  51 +++
 .../octopus-cli/create-autodeployoverride.md  | 119 +++++++
 .../docs/cli/octopus-cli/create-channel.md    | 103 ++++++
 .../cli/octopus-cli/create-environment.md     |  91 ++++++
 .../docs/cli/octopus-cli/create-project.md    |  96 ++++++
 .../docs/cli/octopus-cli/create-release.md    | 289 +++++++++++++++++
 .../cli/octopus-cli/create-workerpool.mdx     | 100 ++++++
 .../octopus-cli/delete-autodeployoverride.md  | 116 +++++++
 .../docs/cli/octopus-cli/delete-package.md    |  78 +++++
 .../docs/cli/octopus-cli/delete-project.md    |  77 +++++
 .../docs/cli/octopus-cli/delete-releases.mdx  | 117 +++++++
 .../docs/cli/octopus-cli/deploy-release.md    | 178 +++++++++++
 .../docs/cli/octopus-cli/disable-project.md   |  77 +++++
 .../docs/cli/octopus-cli/dump-deployments.mdx |  97 ++++++
 src/pages/docs/cli/octopus-cli/export.md      |  21 ++
 .../docs/cli/octopus-cli/formatted-output.md  |  62 ++++
 src/pages/docs/cli/octopus-cli/import.md      |  21 ++
 src/pages/docs/cli/octopus-cli/index.mdx      | 113 +++++++
 .../cli/octopus-cli/install-autocomplete.mdx  |  39 +++
 .../cli/octopus-cli/install-global-tool.md    |  79 +++++
 .../docs/cli/octopus-cli/list-deployments.mdx | 116 +++++++
 .../cli/octopus-cli/list-environments.mdx     |  88 ++++++
 .../octopus-cli/list-latestdeployments.mdx    | 106 +++++++
 .../docs/cli/octopus-cli/list-machines.mdx    | 125 ++++++++
 .../docs/cli/octopus-cli/list-projects.md     |  85 +++++
 .../docs/cli/octopus-cli/list-releases.mdx    | 100 ++++++
 .../docs/cli/octopus-cli/list-tenants.mdx     |  93 ++++++
 .../docs/cli/octopus-cli/list-workerpools.mdx |  94 ++++++
 .../docs/cli/octopus-cli/list-workers.mdx     | 120 +++++++
 src/pages/docs/cli/octopus-cli/pack.md        |  95 ++++++
 .../octopus-cli/prevent-releaseprogression.md |  92 ++++++
 .../docs/cli/octopus-cli/promote-release.md   | 162 ++++++++++
 .../docs/cli/octopus-cli/push-metadata.md     |  96 ++++++
 src/pages/docs/cli/octopus-cli/push.md        | 117 +++++++
 src/pages/docs/cli/octopus-cli/run-runbook.md | 186 +++++++++++
 src/pages/docs/cli/octopus-cli/version.md     |  38 +++
 .../databases/mysql-flyway/index.md           |   2 +-
 .../keeping-deployment-targets-up-to-date.md  |   2 +-
 .../deployments/patterns/rollbacks/index.md   |   2 +-
 .../octopus-concepts/octopus-cli.md           |   2 +-
 .../octopus-concepts/octopus-cli.md           |   2 +-
 src/pages/docs/llms-full.txt.ts               |   4 +-
 src/pages/docs/llms.txt.ts                    |   4 +-
 src/pages/docs/octopus-concepts/octo.exe.md   |   2 +-
 .../docs/octopus-concepts/octopus-cli.md      |   2 +-
 src/pages/docs/octopus-rest-api/cli/index.md  | 214 +------------
 .../cli/octopus-account-aws-create.mdx        |  57 +---
 .../cli/octopus-account-aws-list.mdx          |  47 +--
 .../cli/octopus-account-aws.mdx               |  51 +--
 .../cli/octopus-account-azure-create.mdx      |  61 +---
 .../cli/octopus-account-azure-list.mdx        |  47 +--
 .../cli/octopus-account-azure-oidc-create.mdx |  64 +---
 .../cli/octopus-account-azure-oidc-list.mdx   |  47 +--
 .../cli/octopus-account-azure-oidc.mdx        |  51 +--
 .../cli/octopus-account-azure.mdx             |  51 +--
 .../cli/octopus-account-create.mdx            |  47 +--
 .../cli/octopus-account-delete.mdx            |  53 +---
 .../cli/octopus-account-gcp-create.mdx        |  55 +---
 .../cli/octopus-account-gcp-list.mdx          |  47 +--
 .../cli/octopus-account-gcp.mdx               |  51 +--
 .../octopus-account-generic-oidc-create.mdx   |  56 +---
 .../cli/octopus-account-generic-oidc-list.mdx |  47 +--
 .../cli/octopus-account-generic-oidc.mdx      |  51 +--
 .../cli/octopus-account-list.mdx              |  47 +--
 .../cli/octopus-account-ssh-create.mdx        |  57 +---
 .../cli/octopus-account-ssh-list.mdx          |  47 +--
 .../cli/octopus-account-ssh.mdx               |  51 +--
 .../cli/octopus-account-token-create.mdx      |  55 +---
 .../cli/octopus-account-token-list.mdx        |  47 +--
 .../cli/octopus-account-token.mdx             |  51 +--
 .../cli/octopus-account-username-create.mdx   |  54 +---
 .../cli/octopus-account-username-list.mdx     |  48 +--
 .../cli/octopus-account-username.mdx          |  51 +--
 .../octopus-rest-api/cli/octopus-account.mdx  |  60 +---
 .../docs/octopus-rest-api/cli/octopus-api.mdx |  47 +--
 .../octopus-build-information-bulk-delete.mdx |  53 +---
 .../cli/octopus-build-information-delete.mdx  |  56 +---
 .../cli/octopus-build-information-list.mdx    |  58 +---
 .../cli/octopus-build-information-upload.mdx  |  58 +---
 .../cli/octopus-build-information-view.mdx    |  50 +--
 .../cli/octopus-build-information.mdx         |  57 +---
 .../cli/octopus-channel-create.mdx            |  54 +---
 .../cli/octopus-channel-delete.mdx            |  54 +---
 .../cli/octopus-channel-list.mdx              |  57 +---
 .../cli/octopus-channel-view.mdx              |  51 +--
 .../octopus-rest-api/cli/octopus-channel.mdx  |  57 +---
 .../cli/octopus-config-get.mdx                |  35 +--
 .../cli/octopus-config-list.mdx               |  48 +--
 .../cli/octopus-config-set.mdx                |  35 +--
 .../octopus-rest-api/cli/octopus-config.mdx   |  43 +--
 ...deployment-target-azure-web-app-create.mdx |  64 +---
 ...s-deployment-target-azure-web-app-list.mdx |  49 +--
 ...s-deployment-target-azure-web-app-view.mdx |  50 +--
 ...ctopus-deployment-target-azure-web-app.mdx |  52 +--
 ...-deployment-target-cloud-region-create.mdx |  60 +---
 ...us-deployment-target-cloud-region-list.mdx |  49 +--
 ...us-deployment-target-cloud-region-view.mdx |  50 +--
 ...octopus-deployment-target-cloud-region.mdx |  52 +--
 .../cli/octopus-deployment-target-delete.mdx  |  53 +---
 ...us-deployment-target-kubernetes-create.mdx |  88 +-----
 ...opus-deployment-target-kubernetes-list.mdx |  49 +--
 ...opus-deployment-target-kubernetes-view.mdx |  49 +--
 .../octopus-deployment-target-kubernetes.mdx  |  55 +---
 .../cli/octopus-deployment-target-list.mdx    |  49 +--
 ...yment-target-listening-tentacle-create.mdx |  63 +---
 ...loyment-target-listening-tentacle-list.mdx |  49 +--
 ...loyment-target-listening-tentacle-view.mdx |  50 +--
 ...s-deployment-target-listening-tentacle.mdx |  52 +--
 ...eployment-target-polling-tentacle-list.mdx |  49 +--
 ...eployment-target-polling-tentacle-view.mdx |  50 +--
 ...pus-deployment-target-polling-tentacle.mdx |  51 +--
 .../octopus-deployment-target-ssh-create.mdx  |  67 +---
 .../octopus-deployment-target-ssh-list.mdx    |  49 +--
 .../octopus-deployment-target-ssh-view.mdx    |  50 +--
 .../cli/octopus-deployment-target-ssh.mdx     |  52 +--
 .../cli/octopus-deployment-target-view.mdx    |  50 +--
 .../cli/octopus-deployment-target.mdx         |  58 +---
 .../cli/octopus-environment-create.mdx        |  55 +---
 .../cli/octopus-environment-delete.mdx        |  53 +---
 .../cli/octopus-environment-list.mdx          |  49 +--
 .../cli/octopus-environment-tag.mdx           |  49 +--
 .../cli/octopus-environment.mdx               |  55 +---
 .../octopus-ephemeral-environment-create.mdx  |  52 +--
 ...al-environment-deprovision-environment.mdx |  48 +--
 ...emeral-environment-deprovision-project.mdx |  49 +--
 .../cli/octopus-ephemeral-environment.mdx     |  53 +---
 .../octopus-rest-api/cli/octopus-login.mdx    |  55 +---
 .../octopus-rest-api/cli/octopus-logout.mdx   |  35 +--
 .../cli/octopus-package-delete.mdx            |  56 +---
 .../cli/octopus-package-list.mdx              |  55 +---
 .../cli/octopus-package-nuget-create.mdx      |  61 +---
 .../cli/octopus-package-nuget.mdx             |  50 +--
 .../cli/octopus-package-upload.mdx            |  61 +---
 .../cli/octopus-package-versions.mdx          |  56 +---
 .../cli/octopus-package-zip-create.mdx        |  56 +---
 .../cli/octopus-package-zip.mdx               |  50 +--
 .../octopus-rest-api/cli/octopus-package.mdx  |  55 +---
 .../cli/octopus-project-branch-create.mdx     |  55 +---
 .../cli/octopus-project-branch-list.mdx       |  54 +---
 .../cli/octopus-project-branch.mdx            |  53 +---
 .../cli/octopus-project-clone.mdx             |  55 +---
 .../cli/octopus-project-connect.mdx           |  54 +---
 .../cli/octopus-project-convert.mdx           |  60 +---
 .../cli/octopus-project-create.mdx            |  66 +---
 .../cli/octopus-project-delete.mdx            |  53 +---
 .../cli/octopus-project-disable.mdx           |  44 +--
 .../cli/octopus-project-disconnect.mdx        |  52 +--
 .../cli/octopus-project-enable.mdx            |  44 +--
 .../cli/octopus-project-group-create.mdx      |  52 +--
 .../cli/octopus-project-group-delete.mdx      |  53 +---
 .../cli/octopus-project-group-list.mdx        |  49 +--
 .../cli/octopus-project-group-view.mdx        |  50 +--
 .../cli/octopus-project-group.mdx             |  55 +---
 .../cli/octopus-project-list.mdx              |  49 +--
 .../cli/octopus-project-tag.mdx               |  49 +--
 .../cli/octopus-project-variables-create.mdx  |  73 +----
 .../cli/octopus-project-variables-delete.mdx  |  58 +---
 .../cli/octopus-project-variables-exclude.mdx |  51 +--
 .../cli/octopus-project-variables-include.mdx |  51 +--
 .../cli/octopus-project-variables-list.mdx    |  55 +---
 .../cli/octopus-project-variables-update.mdx  |  66 +---
 .../cli/octopus-project-variables-view.mdx    |  55 +---
 .../cli/octopus-project-variables.mdx         |  62 +---
 .../cli/octopus-project-view.mdx              |  51 +--
 .../octopus-rest-api/cli/octopus-project.mdx  |  67 +---
 .../cli/octopus-release-create.mdx            |  72 +----
 .../cli/octopus-release-delete.mdx            |  55 +---
 .../cli/octopus-release-deploy.mdx            |  69 +---
 .../cli/octopus-release-list.mdx              |  54 +---
 .../cli/octopus-release-progression-allow.mdx |  55 +---
 .../octopus-release-progression-prevent.mdx   |  56 +---
 .../cli/octopus-release-progression.mdx       |  53 +---
 .../octopus-rest-api/cli/octopus-release.mdx  |  54 +---
 .../cli/octopus-runbook-delete.mdx            |  56 +---
 .../cli/octopus-runbook-list.mdx              |  57 +---
 .../cli/octopus-runbook-run.mdx               |  75 +----
 .../cli/octopus-runbook-snapshot-create.mdx   |  68 +---
 .../cli/octopus-runbook-snapshot-list.mdx     |  55 +---
 .../cli/octopus-runbook-snapshot-publish.mdx  |  51 +--
 .../cli/octopus-runbook-snapshot.mdx          |  54 +---
 .../octopus-rest-api/cli/octopus-runbook.mdx  |  55 +---
 .../cli/octopus-space-create.mdx              |  54 +---
 .../cli/octopus-space-delete.mdx              |  53 +---
 .../cli/octopus-space-list.mdx                |  47 +--
 .../cli/octopus-space-view.mdx                |  46 +--
 .../octopus-rest-api/cli/octopus-space.mdx    |  55 +---
 .../cli/octopus-task-wait.mdx                 |  51 +--
 .../octopus-rest-api/cli/octopus-task.mdx     |  41 +--
 .../cli/octopus-tenant-clone.mdx              |  52 +--
 .../cli/octopus-tenant-connect.mdx            |  54 +---
 .../cli/octopus-tenant-create.mdx             |  53 +---
 .../cli/octopus-tenant-delete.mdx             |  53 +---
 .../cli/octopus-tenant-disable.mdx            |  46 +--
 .../cli/octopus-tenant-disconnect.mdx         |  52 +--
 .../cli/octopus-tenant-enable.mdx             |  46 +--
 .../cli/octopus-tenant-list.mdx               |  49 +--
 .../cli/octopus-tenant-tag.mdx                |  49 +--
 .../cli/octopus-tenant-variables-list.mdx     |  54 +---
 .../cli/octopus-tenant-variables-update.mdx   |  56 +---
 .../cli/octopus-tenant-variables.mdx          |  56 +---
 .../cli/octopus-tenant-view.mdx               |  52 +--
 .../octopus-rest-api/cli/octopus-tenant.mdx   |  62 +---
 .../cli/octopus-user-delete.mdx               |  53 +---
 .../cli/octopus-user-list.mdx                 |  49 +--
 .../octopus-rest-api/cli/octopus-user.mdx     |  53 +---
 .../cli/octopus-worker-delete.mdx             |  53 +---
 .../cli/octopus-worker-list.mdx               |  47 +--
 ...topus-worker-listening-tentacle-create.mdx |  55 +---
 ...octopus-worker-listening-tentacle-list.mdx |  48 +--
 ...octopus-worker-listening-tentacle-view.mdx |  50 +--
 .../cli/octopus-worker-listening-tentacle.mdx |  52 +--
 .../octopus-worker-polling-tentacle-list.mdx  |  47 +--
 .../octopus-worker-polling-tentacle-view.mdx  |  50 +--
 .../cli/octopus-worker-polling-tentacle.mdx   |  51 +--
 .../cli/octopus-worker-pool-delete.mdx        |  53 +---
 .../octopus-worker-pool-dynamic-create.mdx    |  52 +--
 .../cli/octopus-worker-pool-dynamic-view.mdx  |  50 +--
 .../cli/octopus-worker-pool-dynamic.mdx       |  51 +--
 .../cli/octopus-worker-pool-list.mdx          |  47 +--
 .../cli/octopus-worker-pool-static-create.mdx |  51 +--
 .../cli/octopus-worker-pool-static-view.mdx   |  50 +--
 .../cli/octopus-worker-pool-static.mdx        |  51 +--
 .../cli/octopus-worker-pool-view.mdx          |  50 +--
 .../cli/octopus-worker-pool.mdx               |  56 +---
 .../cli/octopus-worker-ssh-create.mdx         |  58 +---
 .../cli/octopus-worker-ssh-list.mdx           |  47 +--
 .../cli/octopus-worker-ssh-view.mdx           |  50 +--
 .../cli/octopus-worker-ssh.mdx                |  52 +--
 .../cli/octopus-worker-view.mdx               |  50 +--
 .../octopus-rest-api/cli/octopus-worker.mdx   |  57 +---
 .../docs/octopus-rest-api/cli/octopus.mdx     |  63 +---
 .../octopus-rest-api/cli/octopus_account.md   |   2 +-
 .../cli/octopus_account_aws.md                |   2 +-
 .../cli/octopus_account_aws_create.md         |   2 +-
 .../cli/octopus_account_aws_list.md           |   2 +-
 .../cli/octopus_account_azure.md              |   2 +-
 .../cli/octopus_account_azure_create.md       |   2 +-
 .../cli/octopus_account_azure_list.md         |   2 +-
 .../cli/octopus_account_create.md             |   2 +-
 .../cli/octopus_account_delete.md             |   2 +-
 .../cli/octopus_account_gcp.md                |   2 +-
 .../cli/octopus_account_gcp_create.md         |   2 +-
 .../cli/octopus_account_gcp_list.md           |   2 +-
 .../cli/octopus_account_list.md               |   2 +-
 .../cli/octopus_account_ssh.md                |   2 +-
 .../cli/octopus_account_ssh_create.md         |   2 +-
 .../cli/octopus_account_ssh_list.md           |   2 +-
 .../cli/octopus_account_token.md              |   2 +-
 .../cli/octopus_account_token_create.md       |   2 +-
 .../cli/octopus_account_token_list.md         |   2 +-
 .../cli/octopus_account_username.md           |   2 +-
 .../cli/octopus_account_username_create.md    |   2 +-
 .../cli/octopus_account_username_list.md      |   2 +-
 .../octopus-rest-api/cli/octopus_config.md    |   2 +-
 .../cli/octopus_config_get.md                 |   2 +-
 .../cli/octopus_config_list.md                |   2 +-
 .../cli/octopus_config_set.md                 |   2 +-
 .../cli/octopus_deployment-target.md          |   2 +-
 ...octopus_deployment-target_azure-web-app.md |   2 +-
 ..._deployment-target_azure-web-app_create.md |   2 +-
 ...us_deployment-target_azure-web-app_list.md |   2 +-
 ...us_deployment-target_azure-web-app_view.md |   2 +-
 .../octopus_deployment-target_cloud-region.md |   2 +-
 ...s_deployment-target_cloud-region_create.md |   2 +-
 ...pus_deployment-target_cloud-region_list.md |   2 +-
 ...pus_deployment-target_cloud-region_view.md |   2 +-
 .../cli/octopus_deployment-target_delete.md   |   2 +-
 .../octopus_deployment-target_kubernetes.md   |   2 +-
 ...pus_deployment-target_kubernetes_create.md |   2 +-
 ...topus_deployment-target_kubernetes_list.md |   2 +-
 ...topus_deployment-target_kubernetes_view.md |   2 +-
 .../cli/octopus_deployment-target_list.md     |   2 +-
 ...us_deployment-target_listening-tentacle.md |   2 +-
 ...oyment-target_listening-tentacle_create.md |   2 +-
 ...ployment-target_listening-tentacle_list.md |   2 +-
 ...ployment-target_listening-tentacle_view.md |   2 +-
 ...opus_deployment-target_polling-tentacle.md |   2 +-
 ...deployment-target_polling-tentacle_list.md |   2 +-
 ...deployment-target_polling-tentacle_view.md |   2 +-
 .../cli/octopus_deployment-target_ssh.md      |   2 +-
 .../octopus_deployment-target_ssh_create.md   |   2 +-
 .../cli/octopus_deployment-target_ssh_list.md |   2 +-
 .../cli/octopus_deployment-target_ssh_view.md |   2 +-
 .../cli/octopus_deployment-target_view.md     |   2 +-
 .../cli/octopus_environment.md                |   2 +-
 .../cli/octopus_environment_delete.md         |   2 +-
 .../cli/octopus_environment_list.md           |   2 +-
 .../octopus-rest-api/cli/octopus_package.md   |   2 +-
 .../cli/octopus_package_list.md               |   2 +-
 .../cli/octopus_package_upload.md             |   2 +-
 .../cli/octopus_package_versions.md           |   2 +-
 .../cli/octopus_project-group.md              |   2 +-
 .../cli/octopus_project-group_create.md       |   2 +-
 .../cli/octopus_project-group_delete.md       |   2 +-
 .../cli/octopus_project-group_list.md         |   2 +-
 .../cli/octopus_project-group_view.md         |   2 +-
 .../octopus-rest-api/cli/octopus_project.md   |   2 +-
 .../cli/octopus_project_connect.md            |   2 +-
 .../cli/octopus_project_convert.md            |   2 +-
 .../cli/octopus_project_create.md             |   2 +-
 .../cli/octopus_project_delete.md             |   2 +-
 .../cli/octopus_project_disconnect.md         |   2 +-
 .../cli/octopus_project_list.md               |   2 +-
 .../cli/octopus_project_view.md               |   2 +-
 .../octopus-rest-api/cli/octopus_release.md   |   2 +-
 .../cli/octopus_release_create.md             |   2 +-
 .../cli/octopus_release_delete.md             |   2 +-
 .../cli/octopus_release_deploy.md             |   2 +-
 .../cli/octopus_release_list.md               |   2 +-
 .../octopus-rest-api/cli/octopus_runbook.md   |   2 +-
 .../cli/octopus_runbook_list.md               |   2 +-
 .../cli/octopus_runbook_run.md                |   2 +-
 .../octopus-rest-api/cli/octopus_space.md     |   2 +-
 .../cli/octopus_space_create.md               |   2 +-
 .../cli/octopus_space_delete.md               |   2 +-
 .../cli/octopus_space_list.md                 |   2 +-
 .../cli/octopus_space_view.md                 |   2 +-
 .../docs/octopus-rest-api/cli/octopus_task.md |   2 +-
 .../octopus-rest-api/cli/octopus_task_wait.md |   2 +-
 .../octopus-rest-api/cli/octopus_tenant.md    |   2 +-
 .../cli/octopus_tenant_clone.md               |   2 +-
 .../cli/octopus_tenant_connect.md             |   2 +-
 .../cli/octopus_tenant_create.md              |   2 +-
 .../cli/octopus_tenant_delete.md              |   2 +-
 .../cli/octopus_tenant_disconnect.md          |   2 +-
 .../cli/octopus_tenant_list.md                |   2 +-
 .../cli/octopus_tenant_tag.md                 |   2 +-
 .../cli/octopus_tenant_view.md                |   2 +-
 .../docs/octopus-rest-api/cli/octopus_user.md |   2 +-
 .../cli/octopus_user_delete.md                |   2 +-
 .../octopus-rest-api/cli/octopus_user_list.md |   2 +-
 .../cli/octopus_worker-pool.md                |   2 +-
 .../cli/octopus_worker-pool_delete.md         |   2 +-
 .../cli/octopus_worker-pool_dynamic.md        |   2 +-
 .../cli/octopus_worker-pool_dynamic_create.md |   2 +-
 .../cli/octopus_worker-pool_dynamic_view.md   |   2 +-
 .../cli/octopus_worker-pool_list.md           |   2 +-
 .../cli/octopus_worker-pool_static.md         |   2 +-
 .../cli/octopus_worker-pool_static_create.md  |   2 +-
 .../cli/octopus_worker-pool_static_view.md    |   2 +-
 .../cli/octopus_worker-pool_view.md           |   2 +-
 .../octopus-rest-api/cli/octopus_worker.md    |   2 +-
 .../cli/octopus_worker_delete.md              |   2 +-
 .../cli/octopus_worker_list.md                |   2 +-
 .../cli/octopus_worker_listening-tentacle.md  |   2 +-
 ...ctopus_worker_listening-tentacle_create.md |   2 +-
 .../octopus_worker_listening-tentacle_list.md |   2 +-
 .../octopus_worker_listening-tentacle_view.md |   2 +-
 .../cli/octopus_worker_polling-tentacle.md    |   2 +-
 .../octopus_worker_polling-tentacle_list.md   |   2 +-
 .../octopus_worker_polling-tentacle_view.md   |   2 +-
 .../cli/octopus_worker_ssh.md                 |   2 +-
 .../cli/octopus_worker_ssh_create.md          |   2 +-
 .../cli/octopus_worker_ssh_list.md            |   2 +-
 .../cli/octopus_worker_ssh_view.md            |   2 +-
 .../cli/octopus_worker_view.md                |   2 +-
 src/pages/docs/octopus-rest-api/index.mdx     |   2 +-
 .../build-information.md                      |   2 +-
 .../clean-environment.md                      |   2 +-
 .../octo.exe-command-line/clean-workerpool.md |   2 +-
 .../create-autodeployoverride.md              |   2 +-
 .../octo.exe-command-line/create-channel.md   |   2 +-
 .../create-environment.md                     |   2 +-
 .../octo.exe-command-line/create-project.md   |   2 +-
 .../octo.exe-command-line/create-release.md   |   2 +-
 .../create-workerpool.md                      |   2 +-
 .../delete-autodeployoverride.md              |   2 +-
 .../octo.exe-command-line/delete-releases.md  |   2 +-
 .../octo.exe-command-line/deploy-release.md   |   2 +-
 .../octo.exe-command-line/dump-deployments.md |   2 +-
 .../octo.exe-command-line/export.md           |   2 +-
 .../octo.exe-command-line/formatted-output.md |   2 +-
 .../octo.exe-command-line/import.md           |   2 +-
 .../octo.exe-command-line/index.md            |   2 +-
 .../install-global-tool.md                    |   2 +-
 .../octo.exe-command-line/list-deployments.md |   2 +-
 .../list-environments.md                      |   2 +-
 .../list-latestdeployments.md                 |   2 +-
 .../octo.exe-command-line/list-machines.md    |   2 +-
 .../octo.exe-command-line/list-projects.md    |   2 +-
 .../octo.exe-command-line/list-releases.md    |   2 +-
 .../octo.exe-command-line/list-tenants.md     |   2 +-
 .../octo.exe-command-line/list-workerpools.md |   2 +-
 .../octo.exe-command-line/list-workers.md     |   2 +-
 .../octo.exe-command-line/pack.md             |   2 +-
 .../octo.exe-command-line/promote-release.md  |   2 +-
 .../octo.exe-command-line/push-metadata.md    |   2 +-
 .../octo.exe-command-line/push.md             |   2 +-
 .../octo.exe-command-line/version.md          |   2 +-
 .../octopus-cli/allow-releaseprogression.mdx  | 100 +-----
 .../octopus-cli/build-information.mdx         | 127 +-------
 .../octopus-cli/clean-environment.md          | 114 +------
 .../octopus-cli/clean-workerpool.mdx          | 122 +-------
 .../octopus-rest-api/octopus-cli/complete.md  |  58 +---
 .../octopus-cli/create-autodeployoverride.md  | 126 +-------
 .../octopus-cli/create-channel.md             | 110 +------
 .../octopus-cli/create-environment.md         |  98 +-----
 .../octopus-cli/create-project.md             | 103 +-----
 .../octopus-cli/create-release.md             | 296 +-----------------
 .../octopus-cli/create-workerpool.mdx         | 107 +------
 .../octopus-cli/delete-autodeployoverride.md  | 123 +-------
 .../octopus-cli/delete-package.md             |  85 +----
 .../octopus-cli/delete-project.md             |  84 +----
 .../octopus-cli/delete-releases.mdx           | 124 +-------
 .../octopus-cli/deploy-release.md             | 185 +----------
 .../octopus-cli/disable-project.md            |  84 +----
 .../octopus-cli/dump-deployments.mdx          | 104 +-----
 .../octopus-rest-api/octopus-cli/export.md    |  28 +-
 .../octopus-cli/formatted-output.md           |  69 +---
 .../octopus-rest-api/octopus-cli/import.md    |  28 +-
 .../octopus-rest-api/octopus-cli/index.mdx    | 120 +------
 .../octopus-cli/install-autocomplete.mdx      |  46 +--
 .../octopus-cli/install-global-tool.md        |  86 +----
 .../octopus-cli/list-deployments.mdx          | 123 +-------
 .../octopus-cli/list-environments.mdx         |  95 +-----
 .../octopus-cli/list-latestdeployments.mdx    | 113 +------
 .../octopus-cli/list-machines.mdx             | 132 +-------
 .../octopus-cli/list-projects.md              |  92 +-----
 .../octopus-cli/list-releases.mdx             | 107 +------
 .../octopus-cli/list-tenants.mdx              | 100 +-----
 .../octopus-cli/list-workerpools.mdx          | 101 +-----
 .../octopus-cli/list-workers.mdx              | 127 +-------
 .../docs/octopus-rest-api/octopus-cli/pack.md | 102 +-----
 .../octopus-cli/prevent-releaseprogression.md |  99 +-----
 .../octopus-cli/promote-release.md            | 169 +---------
 .../octopus-cli/push-metadata.md              | 103 +-----
 .../docs/octopus-rest-api/octopus-cli/push.md | 124 +-------
 .../octopus-cli/run-runbook.md                | 193 +-----------
 .../octopus-rest-api/octopus-cli/version.md   |  45 +--
 .../build-servers/bamboo.md                   |  14 +-
 .../bitbucket-pipelines/index.mdx             |   2 +-
 .../build-servers/codefresh-pipelines.md      |   2 +-
 .../build-servers/github-actions.mdx          |   2 +-
 .../build-servers/jenkins/index.mdx           |  12 +-
 .../build-servers/jenkins/pipeline.md         |  10 +-
 .../build-servers/teamcity.mdx                |   2 +-
 .../using-octopus-extension/index.mdx         |  10 +-
 .../install-octopus-cli-capability.md         |   2 +-
 ...hooting-integrations-with-build-servers.md |   6 +-
 .../create-packages/octopus-cli.md            |   4 +-
 .../projects/ephemeral-environments/index.md  |   6 +-
 .../built-in-package-repository-triggers.md   |   2 +-
 .../deployment-target-triggers.md             |   8 +-
 .../projects/variables/prompted-variables.md  |   2 +-
 ...ng-release-from-a-build-server-plug-in.mdx |   2 +-
 src/pages/docs/releases/channels/index.md     |   2 +-
 src/pages/docs/releases/creating-a-release.md |   2 +-
 src/pages/docs/releases/deleting-releases.md  |   2 +-
 src/pages/docs/sitemap.xml.ts                 |   4 +-
 src/pages/docs/tenants/index.md               |   2 +-
 src/pages/docs/tenants/tag-sets.md            |   2 +-
 .../docs/tenants/tenant-deployment-faq.md     |   2 +-
 src/pages/docs/tenants/tenant-tags.md         |   2 +-
 src/pages/docs/tenants/tenant-variables.mdx   |   2 +-
 src/shared-content/cli/commands.include.md    | 185 +++++++++++
 .../octopus-project-variables-include.mdx     |   2 +-
 .../octopus/utilities/mdxContentCore.ts       |   4 +-
 tests/docs-search.spec.ts                     |   2 +-
 707 files changed, 15264 insertions(+), 12954 deletions(-)
 rename src/components/{ApiNavigationItem.astro => AreaNavigationItem.astro} (85%)
 create mode 100644 src/components/CliNavigation.astro
 create mode 100644 src/layouts/Cli.astro
 rename src/lib/{apiNavigation.ts => areaMenu.ts} (61%)
 delete mode 100644 src/lib/generatedApiPaths.ts
 create mode 100644 src/lib/generatedPaths.ts
 create mode 100644 src/pages/docs/cli/[...generatedFileName].astro
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-aws-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-aws-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-aws.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-azure-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-azure-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-azure-oidc-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-azure-oidc-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-azure-oidc.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-azure.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-delete.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-gcp-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-gcp-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-gcp.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-generic-oidc-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-generic-oidc-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-generic-oidc.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-ssh-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-ssh-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-ssh.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-token-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-token-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-token.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-username-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-username-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account-username.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-account.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-api.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-build-information-bulk-delete.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-build-information-delete.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-build-information-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-build-information-upload.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-build-information-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-build-information.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-channel-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-channel-delete.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-channel-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-channel-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-channel.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-config-get.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-config-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-config-set.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-config.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-azure-web-app-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-azure-web-app-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-azure-web-app-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-azure-web-app.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-cloud-region-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-cloud-region-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-cloud-region-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-cloud-region.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-delete.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-kubernetes-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-kubernetes-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-kubernetes-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-kubernetes.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-listening-tentacle-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-listening-tentacle-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-listening-tentacle-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-listening-tentacle.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-polling-tentacle-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-polling-tentacle-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-polling-tentacle.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-ssh-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-ssh-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-ssh-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-ssh.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-deployment-target.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-environment-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-environment-delete.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-environment-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-environment-tag.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-environment.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-ephemeral-environment-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-ephemeral-environment-deprovision-environment.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-ephemeral-environment-deprovision-project.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-ephemeral-environment.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-login.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-logout.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-package-delete.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-package-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-package-nuget-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-package-nuget.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-package-upload.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-package-versions.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-package-zip-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-package-zip.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-package.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-branch-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-branch-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-branch.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-clone.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-connect.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-convert.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-delete.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-disable.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-disconnect.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-enable.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-group-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-group-delete.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-group-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-group-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-group.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-tag.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-variables-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-variables-delete.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-variables-exclude.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-variables-include.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-variables-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-variables-update.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-variables-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-variables.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-project.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-release-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-release-delete.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-release-deploy.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-release-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-release-progression-allow.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-release-progression-prevent.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-release-progression.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-release.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-runbook-delete.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-runbook-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-runbook-run.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-runbook-snapshot-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-runbook-snapshot-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-runbook-snapshot-publish.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-runbook-snapshot.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-runbook.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-space-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-space-delete.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-space-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-space-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-space.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-task-wait.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-task.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-tenant-clone.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-tenant-connect.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-tenant-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-tenant-delete.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-tenant-disable.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-tenant-disconnect.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-tenant-enable.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-tenant-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-tenant-tag.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-tenant-variables-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-tenant-variables-update.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-tenant-variables.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-tenant-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-tenant.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-user-delete.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-user-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-user.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-delete.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-listening-tentacle-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-listening-tentacle-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-listening-tentacle-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-listening-tentacle.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-polling-tentacle-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-polling-tentacle-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-polling-tentacle.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-pool-delete.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-pool-dynamic-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-pool-dynamic-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-pool-dynamic.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-pool-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-pool-static-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-pool-static-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-pool-static.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-pool-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-pool.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-ssh-create.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-ssh-list.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-ssh-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-ssh.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker-view.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus-worker.mdx
 create mode 100644 src/pages/docs/cli/_generated/octopus.mdx
 create mode 100644 src/pages/docs/cli/index.mdx
 create mode 100644 src/pages/docs/cli/octopus-cli/allow-releaseprogression.mdx
 create mode 100644 src/pages/docs/cli/octopus-cli/build-information.mdx
 create mode 100644 src/pages/docs/cli/octopus-cli/clean-environment.md
 create mode 100644 src/pages/docs/cli/octopus-cli/clean-workerpool.mdx
 create mode 100644 src/pages/docs/cli/octopus-cli/complete.md
 create mode 100644 src/pages/docs/cli/octopus-cli/create-autodeployoverride.md
 create mode 100644 src/pages/docs/cli/octopus-cli/create-channel.md
 create mode 100644 src/pages/docs/cli/octopus-cli/create-environment.md
 create mode 100644 src/pages/docs/cli/octopus-cli/create-project.md
 create mode 100644 src/pages/docs/cli/octopus-cli/create-release.md
 create mode 100644 src/pages/docs/cli/octopus-cli/create-workerpool.mdx
 create mode 100644 src/pages/docs/cli/octopus-cli/delete-autodeployoverride.md
 create mode 100644 src/pages/docs/cli/octopus-cli/delete-package.md
 create mode 100644 src/pages/docs/cli/octopus-cli/delete-project.md
 create mode 100644 src/pages/docs/cli/octopus-cli/delete-releases.mdx
 create mode 100644 src/pages/docs/cli/octopus-cli/deploy-release.md
 create mode 100644 src/pages/docs/cli/octopus-cli/disable-project.md
 create mode 100644 src/pages/docs/cli/octopus-cli/dump-deployments.mdx
 create mode 100644 src/pages/docs/cli/octopus-cli/export.md
 create mode 100644 src/pages/docs/cli/octopus-cli/formatted-output.md
 create mode 100644 src/pages/docs/cli/octopus-cli/import.md
 create mode 100644 src/pages/docs/cli/octopus-cli/index.mdx
 create mode 100644 src/pages/docs/cli/octopus-cli/install-autocomplete.mdx
 create mode 100644 src/pages/docs/cli/octopus-cli/install-global-tool.md
 create mode 100644 src/pages/docs/cli/octopus-cli/list-deployments.mdx
 create mode 100644 src/pages/docs/cli/octopus-cli/list-environments.mdx
 create mode 100644 src/pages/docs/cli/octopus-cli/list-latestdeployments.mdx
 create mode 100644 src/pages/docs/cli/octopus-cli/list-machines.mdx
 create mode 100644 src/pages/docs/cli/octopus-cli/list-projects.md
 create mode 100644 src/pages/docs/cli/octopus-cli/list-releases.mdx
 create mode 100644 src/pages/docs/cli/octopus-cli/list-tenants.mdx
 create mode 100644 src/pages/docs/cli/octopus-cli/list-workerpools.mdx
 create mode 100644 src/pages/docs/cli/octopus-cli/list-workers.mdx
 create mode 100644 src/pages/docs/cli/octopus-cli/pack.md
 create mode 100644 src/pages/docs/cli/octopus-cli/prevent-releaseprogression.md
 create mode 100644 src/pages/docs/cli/octopus-cli/promote-release.md
 create mode 100644 src/pages/docs/cli/octopus-cli/push-metadata.md
 create mode 100644 src/pages/docs/cli/octopus-cli/push.md
 create mode 100644 src/pages/docs/cli/octopus-cli/run-runbook.md
 create mode 100644 src/pages/docs/cli/octopus-cli/version.md
 create mode 100644 src/shared-content/cli/commands.include.md

diff --git a/frontmatter.json b/frontmatter.json
index d3fc9e759d..51c459785c 100644
--- a/frontmatter.json
+++ b/frontmatter.json
@@ -78,7 +78,8 @@
           "type": "choice",
           "choices": [
             "docs",
-            "api"
+            "api",
+            "cli"
           ],
           "required": false
         }
diff --git a/src/components/ApiNavigation.astro b/src/components/ApiNavigation.astro
index b36bd5719e..31d50bbcc1 100644
--- a/src/components/ApiNavigation.astro
+++ b/src/components/ApiNavigation.astro
@@ -1,8 +1,8 @@
 ---
 import { accelerator } from '@lib/accelerator';
 import { Translations, Lang } from '@util/Languages';
-import { apiMenu } from '@lib/apiNavigation';
-import ApiNavigationItem from './ApiNavigationItem.astro';
+import { areaMenu } from '@lib/areaMenu';
+import AreaNavigationItem from './AreaNavigationItem.astro';
 
 const stats = new accelerator.statistics('components/ApiNavigation.astro');
 stats.start();
@@ -70,7 +70,7 @@ const endpoints = (headings ?? [])
 
 // The hand-written pages first, then the generated reference, with a rule
 // between them.
-const { authored, generated } = apiMenu();
+const { authored, generated } = areaMenu('api');
 
 stats.stop();
 ---
@@ -84,7 +84,7 @@ stats.stop();
   <ul class="site-nav__list">
     {
       authored.map((page) => (
-        <ApiNavigationItem
+        <AreaNavigationItem
           page={page}
           currentPath={currentPath}
           endpoints={endpoints}
@@ -103,7 +103,7 @@ stats.stop();
     }
     {
       generated.map((page) => (
-        <ApiNavigationItem
+        <AreaNavigationItem
           page={page}
           currentPath={currentPath}
           endpoints={endpoints}
diff --git a/src/components/AreaNavigation.astro b/src/components/AreaNavigation.astro
index bb5c45e394..54a7bf566f 100644
--- a/src/components/AreaNavigation.astro
+++ b/src/components/AreaNavigation.astro
@@ -5,6 +5,8 @@ import type { Area } from '@lib/areas';
 import Navigation from '@components/Navigation.astro';
 // The nav for the API reference
 import ApiNavigation from './ApiNavigation.astro';
+// The nav for the CLI reference
+import CliNavigation from './CliNavigation.astro';
 
 // The area's nav, picked by area rather than by layout, so a page can be laid
 // out one way and navigated another. Every layout renders this and none of them
@@ -36,3 +38,4 @@ const { area, lang, headings, apiMethods } = Astro.props satisfies Props;
     <ApiNavigation lang={lang} headings={headings} apiMethods={apiMethods} />
   )
 }
+{area === 'cli' && <CliNavigation lang={lang} />}
diff --git a/src/components/ApiNavigationItem.astro b/src/components/AreaNavigationItem.astro
similarity index 85%
rename from src/components/ApiNavigationItem.astro
rename to src/components/AreaNavigationItem.astro
index 4007e242d9..5411929ada 100644
--- a/src/components/ApiNavigationItem.astro
+++ b/src/components/AreaNavigationItem.astro
@@ -1,12 +1,16 @@
 ---
 import { accelerator } from '@lib/accelerator';
-import type { ApiNavPage } from '@lib/apiNavigation';
+import type { AreaNavPage } from '@lib/areaMenu';
 
-// One row of the API left nav, and the branch under it. Split out of
-// ApiNavigation.astro because the tree is now nested and a row has to be able
-// to render itself.
+// One row of an area's left nav, and the branch under it. Split out of
+// ApiNavigation.astro because the tree is nested and a row has to be able to
+// render itself.
+//
+// The endpoint list under the current row belongs to the API reference. A nav
+// with nothing of the sort — the CLI's — passes an empty list and every row
+// falls through to the plain link at the bottom of this file.
 
-export type ApiNavEndpoint = {
+export type AreaNavEndpoint = {
   slug: string;
   text: string;
   method: string | null;
@@ -14,13 +18,13 @@ export type ApiNavEndpoint = {
 };
 
 type Props = {
-  page: ApiNavPage;
+  page: AreaNavPage;
   // The reader's path, without its trailing slash. Decides which branch is
   // open and which row is current.
   currentPath: string;
   // The current page's endpoints, listed under whichever row turns out to be
   // that page. Empty for a layout that lists them somewhere else.
-  endpoints: ApiNavEndpoint[];
+  endpoints: AreaNavEndpoint[];
   // The badge labels, by method. Passed down so the two components cannot
   // disagree about which methods have a badge.
   methodLabels: Record<string, string>;
@@ -107,4 +111,4 @@ const showEndpoints = isCurrent && endpoints.length > 0;
       </a>
     </li>
   )
-}
\ No newline at end of file
+}
diff --git a/src/components/CliNavigation.astro b/src/components/CliNavigation.astro
new file mode 100644
index 0000000000..6766fa8f8c
--- /dev/null
+++ b/src/components/CliNavigation.astro
@@ -0,0 +1,67 @@
+---
+import { accelerator } from '@lib/accelerator';
+import { Translations, Lang } from '@util/Languages';
+import { areaMenu } from '@lib/areaMenu';
+import AreaNavigationItem from './AreaNavigationItem.astro';
+
+const stats = new accelerator.statistics('components/CliNavigation.astro');
+stats.start();
+
+type Props = {
+  lang: string;
+};
+const { lang } = Astro.props satisfies Props;
+
+const _ = Lang(lang);
+
+const currentPath = Astro.url.pathname.replace(/\/$/, '');
+
+// The hand-written pages first — the overview and the deprecated Octo CLI —
+// then the generated command reference, with a rule between them.
+//
+// Unlike the API nav there is no third level: a command page has no endpoints
+// under it, so the rows are handed an empty list and each one renders as a
+// plain link.
+const { authored, generated } = areaMenu('cli');
+
+stats.stop();
+---
+
+<nav
+  class="site-nav"
+  id="site-nav"
+  aria-label={_(Translations.aria.site_navigation)}
+>
+  <h2 class="site-nav-title">{_(Translations.navigation.title)}</h2>
+  <ul class="site-nav__list">
+    {
+      authored.map((page) => (
+        <AreaNavigationItem
+          page={page}
+          currentPath={currentPath}
+          endpoints={[]}
+          methodLabels={{}}
+        />
+      ))
+    }
+    {
+      authored.length > 0 && generated.length > 0 && (
+        <li class="site-nav__list-item">
+          {/* The two halves of the nav are written by different hands, and the
+              rule is where one set of pages stops and the other starts. */}
+          <hr class="site-nav__separator" />
+        </li>
+      )
+    }
+    {
+      generated.map((page) => (
+        <AreaNavigationItem
+          page={page}
+          currentPath={currentPath}
+          endpoints={[]}
+          methodLabels={{}}
+        />
+      ))
+    }
+  </ul>
+</nav>
diff --git a/src/components/TopNav.astro b/src/components/TopNav.astro
index 0da4a473f3..cba455ca14 100644
--- a/src/components/TopNav.astro
+++ b/src/components/TopNav.astro
@@ -19,7 +19,7 @@ const {
     { label: 'Docs', href: '/docs' },
     // TODO: { label: 'Learn', href: '/docs/?' },
     { label: 'API', href: '/docs/octopus-rest-api' },
-    { label: 'CLI', href: '/docs/octopus-rest-api/cli' },
+    { label: 'CLI', href: '/docs/cli' },
   ],
 } = Astro.props satisfies Props;
 
diff --git a/src/layouts/Cli.astro b/src/layouts/Cli.astro
new file mode 100644
index 0000000000..fb59c44258
--- /dev/null
+++ b/src/layouts/Cli.astro
@@ -0,0 +1,138 @@
+---
+import { accelerator } from '@lib/accelerator';
+import { PostFiltering } from 'astro-accelerator-utils';
+import type { Frontmatter as OriginalFrontmatter } from 'astro-accelerator-utils/types/Frontmatter';
+import { SITE } from '@config';
+import type { Crumb } from '@util/breadcrumbs';
+import { buildAreaCrumbs, resolveArea, type Area } from '@lib/areas';
+import { searchIndexAttributes } from '@lib/searchIndexing';
+
+// Theme components
+import Head from '@components/HtmlHead.astro';
+import SkipLinks from '@components/SkipLinks.astro';
+import Breadcrumbs from '@components/Breadcrumbs.astro';
+import Authors from '@components/Authors.astro';
+import Taxonomy from '@components/Taxonomy.astro';
+
+// Custom components
+import AreaNavigation from '../components/AreaNavigation.astro';
+import ArticleHeader from '../components/ArticleHeader.astro';
+import ArticleNav from '../components/ArticleNav.astro';
+import Feedback from '../components/Feedback.astro';
+import TopNav from '../components/TopNav.astro';
+import CopyAsMarkdown from '../components/CopyAsMarkdown.astro';
+import OpenInLlm from '../components/OpenInLlm.astro';
+import Plausible from 'src/components/Plausible.astro';
+import Footer from 'src/components/Footer.astro';
+import DocsSearch from '../components/DocsSearch.astro';
+
+// The layout for the generated CLI reference, the counterpart to Api.astro.
+// Every page under /docs/cli/_generated names it, so the reference can be
+// restyled without touching the hand-written pages beside it.
+//
+// It is laid out as a docs page: the middle column, the area nav and the table
+// of contents beside it. A shape of its own goes here, and the ~185 pages take
+// it without a sweep of their frontmatter.
+//
+// There is no "Edit on GitHub". These pages are written by gen-docs in
+// OctopusDeploy/cli and land in _generated, so the file the button would open is
+// overwritten by the next sync; correcting one of them means changing the
+// template in that repo. Api.astro leaves it out for the same reason.
+//
+// Copy as markdown stays: these pages have a .md of their own to hand over.
+
+type Props = {
+  // The nav this page appears in. Optional, and normally left alone: these
+  // pages live under /docs/cli, which is the CLI area already.
+  frontmatter: OriginalFrontmatter & { area?: Area };
+  headings: { depth: number; slug: string; text: string }[];
+  breadcrumbs?: Crumb[] | null;
+};
+const { frontmatter, headings, breadcrumbs } = Astro.props satisfies Props;
+
+const area = resolveArea(frontmatter.area, Astro.url.pathname);
+const crumbs = buildAreaCrumbs(Astro.url, area, breadcrumbs);
+
+const lang = frontmatter.lang ?? SITE.default.lang;
+const textDirection = frontmatter.dir ?? SITE.default.dir;
+
+const title = await accelerator.markdown.getInlineHtmlFrom(
+  frontmatter.title ?? SITE.title
+);
+
+const subtitle = frontmatter.subtitle
+  ? await accelerator.markdown.getInlineHtmlFrom(frontmatter.subtitle)
+  : null;
+
+const site_url = SITE.url;
+const site_features = SITE.featureFlags;
+const search =
+  accelerator.posts.all().filter(PostFiltering.isSearch).shift() ?? null;
+const searchUrl = search && accelerator.urlFormatter.formatAddress(search.url);
+const isSearchPage =
+  accelerator.urlFormatter.formatAddress(Astro.url.pathname) === searchUrl;
+
+// Gates the header's search field only. The overlay below is always rendered:
+// /docs/search has its own field and opens that same overlay.
+const showSearch = !isSearchPage;
+
+// The footer prints this; JSON-LD carries it as dateModified.
+const lastUpdated = frontmatter.modDate ?? frontmatter.pubDate ?? null;
+
+const searchIndex = searchIndexAttributes(Astro.url.pathname, frontmatter);
+---
+
+<html
+  dir={textDirection}
+  lang={lang}
+  class="initial"
+  data-theme="light"
+  data-signed-in="false"
+>
+  <Head
+    frontmatter={frontmatter}
+    headings={headings}
+    lang={lang}
+    crumbs={crumbs}
+  />
+  <body>
+    <SkipLinks frontmatter={frontmatter} headings={headings} lang={lang} />
+    <TopNav lang={lang} showSearch={showSearch} />
+    <div class="content-group">
+      <main id="site-main">
+        <Breadcrumbs lang={lang} crumbs={crumbs} />
+        <article {...searchIndex.article}>
+          <ArticleHeader lang={lang} subtitle={subtitle} title={title} />
+          <div class="page-actions">
+            <CopyAsMarkdown lang={lang} />
+            <OpenInLlm lang={lang} />
+          </div>
+          <div class="page-content anim-show-parent" {...searchIndex.content}>
+            <slot />
+            <Authors frontmatter={frontmatter} lang={lang} />
+            <Taxonomy frontmatter={frontmatter} lang={lang} />
+          </div>
+        </article>
+      </main>
+      {
+        /* The nav belongs to the area, not to this layout. The page's own
+          headings are not passed: the side column below lists them. */
+      }
+      <AreaNavigation area={area} lang={lang} />
+      <div class="side-nav">
+        <ArticleNav headings={headings} lang={lang} />
+        <Feedback frontmatter={frontmatter} lang={lang} />
+      </div>
+      <Footer lang={lang} lastUpdated={lastUpdated} />
+    </div>
+    <DocsSearch />
+    <script define:vars={{ site_url, site_features }}>
+      window.site_url = site_url;
+      window.site_features = site_features;
+    </script>
+    <script>
+      import '../scripts/main.js';
+    </script>
+    <Plausible />
+  </body>
+</html>
diff --git a/src/lib/accelerator.ts b/src/lib/accelerator.ts
index 2a936f006c..fce977e3c0 100644
--- a/src/lib/accelerator.ts
+++ b/src/lib/accelerator.ts
@@ -1,9 +1,6 @@
 import { Accelerator } from 'astro-accelerator-utils';
 import { SITE } from '@config';
-import {
-  flattenGeneratedApiPath,
-  isGeneratedApiPath,
-} from '@lib/generatedApiPaths';
+import { flattenGeneratedPath, isGeneratedPath } from '@lib/generatedPaths';
 
 // Shared, memoized Accelerator for the whole build process.
 //
@@ -41,8 +38,9 @@ const readAll = posts.all.bind(posts);
 // Astro does not route: anything with an underscore-prefixed path segment. Those
 // are not pages, so they have no business in the nav, the breadcrumb trail, the
 // taxonomy, or the /report pages - each of which would link to a URL that 404s.
-// Astro's own routing rule is the filter, with one exception: /docs/api/_generated
-// contains generated API docs which is published from /docs/api/ by [...generatedFileName].astro.
+// Astro's own routing rule is the filter, with one exception: the _generated
+// folders under /docs/api and /docs/cli hold the generated API and CLI docs, each
+// published from the folder above it by [...generatedFileName].astro.
 const PAGES_ROOT = '/src/pages/';
 
 // `file` is an absolute path. We only care about the part below `src/pages`.
@@ -59,22 +57,24 @@ const isRouted = (post: { file?: string }) =>
     .split('/')
     .some((part) => part.startsWith('_'));
 
-const withGeneratedApiUrl = <T extends { file?: string; url?: string }>(
+// The API reference is .md and the CLI reference is .mdx, so both extensions
+// come off: a url ending in .mdx would 404 against the route serving the page.
+const withGeneratedUrl = <T extends { file?: string; url?: string }>(
   post: T
 ): T => {
   const routePath = routePathOf(post);
-  if (!isGeneratedApiPath(routePath)) return post;
+  if (!isGeneratedPath(routePath)) return post;
 
   return {
     ...post,
-    url: '/' + flattenGeneratedApiPath(routePath).replace(/\.md$/, ''),
+    url: '/' + flattenGeneratedPath(routePath).replace(/\.mdx?$/, ''),
   };
 };
 
 const readRouted = () =>
   readAll()
-    .map(withGeneratedApiUrl)
-    .filter((post) => isRouted(post) || isGeneratedApiPath(routePathOf(post)));
+    .map(withGeneratedUrl)
+    .filter((post) => isRouted(post) || isGeneratedPath(routePathOf(post)));
 
 let allPosts: ReturnType<typeof readAll> | null = null;
 
diff --git a/src/lib/apiNavigation.ts b/src/lib/areaMenu.ts
similarity index 61%
rename from src/lib/apiNavigation.ts
rename to src/lib/areaMenu.ts
index bcef6fe49d..892799b2de 100644
--- a/src/lib/apiNavigation.ts
+++ b/src/lib/areaMenu.ts
@@ -2,27 +2,28 @@ import type { MarkdownInstance } from 'astro-accelerator-utils/types/Astro';
 import { PostFiltering } from 'astro-accelerator-utils';
 import { SITE } from '@config';
 import { accelerator } from './accelerator';
-import { AREAS, pageArea } from './areas';
-import { isGeneratedApiPath } from './generatedApiPaths';
+import { AREAS, pageArea, type Area } from './areas';
+import { isGeneratedPath } from './generatedPaths';
 
-// The API reference carries its own left nav, built here from the pages in the
-// API area (see lib/areas.ts — the section they live in, not the layout they
-// render with). Those same pages are pruned out of the main site nav in
-// navigationTree.ts, so the two trees never overlap.
+// An area with a nav of its own — the API reference, the CLI reference — builds
+// it here from the pages in that area (see lib/areas.ts — the section they live
+// in, not the layout they render with). Those same pages are pruned out of the
+// main site nav in navigationTree.ts, so the two trees never overlap.
 //
 // The tree follows the folders the pages live in, the same way the docs nav
 // does: /docs/api/octopus.client/using-resources sits under Octopus.Client
-// rather than beside it. Under the page the reader is on there is one more
-// level the docs nav has no equivalent of — an entry per endpoint. Those come
-// from the layout's own headings rather than from here: Posts.all() reads the
-// page set back from a JSON cache, which leaves the frontmatter intact but
+// rather than beside it. Under the page the reader is on the API nav shows one
+// more level the docs nav has no equivalent of — an entry per endpoint. Those
+// come from the layout's own headings rather than from here: Posts.all() reads
+// the page set back from a JSON cache, which leaves the frontmatter intact but
 // drops getHeadings().
 //
-// The menu comes back in two halves. The hand-written pages are one, the ~100
-// generated ones under _generated are the other, and ApiNavigation.astro draws
-// a rule between them.
+// The menu comes back in two halves. The hand-written pages are one, the
+// generated ones under _generated are the other, and the area's nav component
+// draws a rule between them. For the CLI that reads as the overview and the
+// deprecated Octo CLI above the rule, and the ~185 `octopus` commands below it.
 
-export type ApiNavPage = {
+export type AreaNavPage = {
   /** The row's label. */
   title: string;
   /** null for a folder that has no page of its own, so the row is not a link. */
@@ -31,31 +32,27 @@ export type ApiNavPage = {
       page still has: it is what decides whether the branch is open. */
   path: string;
   order: number;
-  children: ApiNavPage[];
+  children: AreaNavPage[];
 };
 
-export type ApiMenu = {
-  /** The pages under /docs/api that somebody wrote. */
-  authored: ApiNavPage[];
-  /** The pages generated into /docs/api/_generated. */
-  generated: ApiNavPage[];
+export type AreaMenu = {
+  /** The pages in the area that somebody wrote. */
+  authored: AreaNavPage[];
+  /** The pages generated into the area's _generated folder. */
+  generated: AreaNavPage[];
 };
 
-export function isApiPage(post: MarkdownInstance): boolean {
-  return pageArea(post) === 'api';
-}
+const trimSlash = (path: string) => path.replace(/\/$/, '');
 
-// Where the area's tree is rooted. The pages hang off this, and the segments
+// Where an area's tree is rooted. The pages hang off this, and the segments
 // below it are the folders the tree is built out of.
-const API_ROOT = SITE.subfolder + (AREAS.api.path ?? '');
-
-const trimSlash = (path: string) => path.replace(/\/$/, '');
+const areaRoot = (area: Area) => SITE.subfolder + (AREAS[area].path ?? '');
 
 // A generated page is one whose source file sits under _generated. The url does
-// not say so — [...generatedFileName].astro serves them from /docs/api as if
-// the folder were not there — so the file is what has to be asked.
+// not say so — [...generatedFileName].astro serves them from the folder above
+// as if it were not there — so the file is what has to be asked.
 function isGenerated(post: MarkdownInstance): boolean {
-  return isGeneratedApiPath(post.file ?? '');
+  return isGeneratedPath(post.file ?? '');
 }
 
 // A folder with no index page of its own still needs a label. "openid-connect"
@@ -82,13 +79,17 @@ function newNode(segment: string, path: string): TreeNode {
   return { segment, path, post: null, children: new Map() };
 }
 
-function insert(root: TreeNode, post: MarkdownInstance): void {
+function insert(
+  root: TreeNode,
+  post: MarkdownInstance,
+  rootPath: string
+): void {
   const path = trimSlash(post.url ?? '');
-  const rest = path.slice(API_ROOT.length).replace(/^\//, '');
+  const rest = path.slice(rootPath.length).replace(/^\//, '');
   const segments = rest === '' ? [] : rest.split('/');
 
   let node = root;
-  let walked = API_ROOT;
+  let walked = rootPath;
   for (const segment of segments) {
     walked += '/' + segment;
     let child = node.children.get(segment);
@@ -111,10 +112,10 @@ const branchTitle = (post: MarkdownInstance) =>
 const navOrder = (post: MarkdownInstance) =>
   post.frontmatter.navOrder ?? Number.MAX_SAFE_INTEGER;
 
-const byOrderThenTitle = (a: ApiNavPage, b: ApiNavPage) =>
+const byOrderThenTitle = (a: AreaNavPage, b: AreaNavPage) =>
   a.order - b.order || a.title.localeCompare(b.title);
 
-function toNavPage(node: TreeNode): ApiNavPage {
+function toNavPage(node: TreeNode): AreaNavPage {
   const url = node.post
     ? accelerator.urlFormatter.addSlashToAddress(node.post.url ?? '/')
     : null;
@@ -155,19 +156,19 @@ function toNavPage(node: TreeNode): ApiNavPage {
   };
 }
 
-function buildTree(posts: MarkdownInstance[]): ApiNavPage[] {
-  const root = newNode('', API_ROOT);
-  for (const post of posts) insert(root, post);
+function buildTree(posts: MarkdownInstance[], rootPath: string): AreaNavPage[] {
+  const root = newNode('', rootPath);
+  for (const post of posts) insert(root, post, rootPath);
 
   const pages = [...root.children.values()].map(toNavPage);
 
-  // /docs/api itself is a page, and a sibling of the sections rather than a
+  // The area's own landing page is a sibling of the sections rather than a
   // branch over them: the tree is already rooted there.
   if (root.post) {
     pages.push({
       title: rowTitle(root.post),
       url: accelerator.urlFormatter.addSlashToAddress(root.post.url ?? '/'),
-      path: API_ROOT,
+      path: rootPath,
       order: navOrder(root.post),
       children: [],
     });
@@ -176,30 +177,38 @@ function buildTree(posts: MarkdownInstance[]): ApiNavPage[] {
   return pages.sort(byOrderThenTitle);
 }
 
-// Same deal as menuTemplate(): the menu is identical for every page in the
-// section, so it is built once and read by all of them.
-let menu: ApiMenu | null = null;
+// Same deal as menuTemplate(): an area's menu is identical for every page in
+// it, so it is built once and read by all of them.
+const menus = new Map<Area, AreaMenu>();
 
-export function apiMenu(): ApiMenu {
+export function areaMenu(area: Area): AreaMenu {
   // Builds only. In dev, rebuild every time so a new or edited page shows up
   // in the nav without restarting the server.
-  if (menu !== null && import.meta.env.PROD) return menu;
+  const cached = menus.get(area);
+  if (cached !== undefined && import.meta.env.PROD) return cached;
 
   // navMenu: false keeps a page out of the nav, and the redirect stubs left
   // behind by moved pages all carry it. Without this they arrive as rows
   // titled "Redirect", each one a section of its own.
   const pages = accelerator.posts
     .all()
-    .filter(isApiPage)
+    .filter((post) => pageArea(post) === area)
     .filter(PostFiltering.showInMenu);
 
-  const built: ApiMenu = {
-    authored: buildTree(pages.filter((post) => !isGenerated(post))),
-    // The generated pages carry no navOrder — there is nobody to write one —
-    // so they fall back to the alphabetical order the index page lists them in.
-    generated: buildTree(pages.filter(isGenerated)),
+  const rootPath = areaRoot(area);
+  const built: AreaMenu = {
+    authored: buildTree(
+      pages.filter((post) => !isGenerated(post)),
+      rootPath
+    ),
+    // What orders this half is up to whatever generated it. The API pages carry
+    // no navOrder at all and fall back to sorting by title; the CLI pages each
+    // carry their position in the command tree, written by gen-docs as it walks
+    // it, so they sort in that order. The two agree today — cobra hands out its
+    // commands alphabetically — and byOrderThenTitle covers either.
+    generated: buildTree(pages.filter(isGenerated), rootPath),
   };
 
-  if (import.meta.env.PROD) menu = built;
+  if (import.meta.env.PROD) menus.set(area, built);
   return built;
 }
diff --git a/src/lib/areas.ts b/src/lib/areas.ts
index 3f9769e8a2..8fcabe38f1 100644
--- a/src/lib/areas.ts
+++ b/src/lib/areas.ts
@@ -4,15 +4,16 @@ import { buildCrumbs, type Crumb } from '@util/breadcrumbs';
 import { accelerator } from './accelerator';
 
 // An "area" is a slice of the site with its own navigation tree: the docs, the
-// API reference, and — as they arrive — Learn and the CLI reference. It is
+// API reference, the CLI reference, and — as it arrives — Learn. It is
 // deliberately not the layout. The layout decides what the middle column looks
 // like; the area decides which nav sits beside it and how the breadcrumbs read,
 // so a page can be in the API area and still be laid out like a docs page.
 //
 // A page's area comes from where it lives, which is what the section already
 // encodes: every page under /docs/api is in the API area without being told so,
-// including the ~100 generated ones. A page that needs to say otherwise puts
-// `area:` in its frontmatter and that wins.
+// including the ~100 generated ones, and the same goes for /docs/cli and its
+// ~185. A page that needs to say otherwise puts `area:` in its frontmatter and
+// that wins.
 //
 // Adding an area takes four things, and this list is the only copy of it:
 //   1. an entry in AREAS below, and the area's name in the Area union
@@ -22,7 +23,7 @@ import { accelerator } from './accelerator';
 //      one and the build still passes while authors cannot pick the area in
 //      Front Matter CMS, with nothing on screen to say why
 
-export type Area = 'docs' | 'api';
+export type Area = 'docs' | 'api' | 'cli';
 
 type AreaDefinition = {
   // The path the area occupies, under SITE.subfolder. The docs area is
@@ -39,6 +40,9 @@ export const AREAS = {
   // the section without help. It reads as "API" rather than as that page's
   // title because index.md carries a `crumbTitle`.
   api: { path: '/api', sectionCrumb: null },
+  // Same deal: /docs/cli is the reference's overview page, and its `crumbTitle`
+  // keeps the crumb reading as "CLI" rather than "Octopus CLI".
+  cli: { path: '/cli', sectionCrumb: null },
 } as const satisfies Record<Area, AreaDefinition>;
 
 const DEFAULT_AREA: Area = 'docs';
diff --git a/src/lib/generatedApiPaths.ts b/src/lib/generatedApiPaths.ts
deleted file mode 100644
index 2f352929d0..0000000000
--- a/src/lib/generatedApiPaths.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-const GENERATED_API_DIR = /(^|\/)api\/_generated\//;
-
-/** Generated API docs live in a _generated subfolder, this checks if a given path is to a generated file */
-export function isGeneratedApiPath(path: string): boolean {
-  return GENERATED_API_DIR.test(path);
-}
-
-/**
- * Removes _generated from a path to a generated API doc file, as _generated is part of the path on
- * disk but not where it's actually served from, which strips the _generated part
- */
-export function flattenGeneratedApiPath(path: string): string {
-  return path.replace(GENERATED_API_DIR, '$1api/');
-}
diff --git a/src/lib/generatedPaths.ts b/src/lib/generatedPaths.ts
new file mode 100644
index 0000000000..52cdc69867
--- /dev/null
+++ b/src/lib/generatedPaths.ts
@@ -0,0 +1,25 @@
+// Two references are generated rather than written: the API reference under
+// /docs/api and the CLI reference under /docs/cli. Both keep their generated
+// pages in a _generated folder so they sit apart from the hand-written pages on
+// disk, and both are served from the folder above it by a
+// [...generatedFileName].astro route. An area added to the list here is one
+// whose _generated folder is understood everywhere a url is derived from a file
+// path: the nav, the sitemap, the llms.txt endpoints and the markdown copies.
+const GENERATED_AREAS = ['api', 'cli'];
+
+const GENERATED_DIR = new RegExp(
+  `(^|/)(${GENERATED_AREAS.join('|')})/_generated/`
+);
+
+/** Generated docs live in a _generated subfolder, this checks if a given path is to a generated file */
+export function isGeneratedPath(path: string): boolean {
+  return GENERATED_DIR.test(path);
+}
+
+/**
+ * Removes _generated from a path to a generated doc file, as _generated is part of the path on
+ * disk but not where it's actually served from, which strips the _generated part
+ */
+export function flattenGeneratedPath(path: string): string {
+  return path.replace(GENERATED_DIR, '$1$2/');
+}
diff --git a/src/lib/navigationTree.ts b/src/lib/navigationTree.ts
index f79165aa26..a50aeb0ca6 100644
--- a/src/lib/navigationTree.ts
+++ b/src/lib/navigationTree.ts
@@ -20,7 +20,7 @@ const TEMPLATE_URL = new URL('https://octopus.com/__nav-template__');
 let template: NavPage[] | null = null;
 
 // This is the docs area's tree. Every other area is navigated by its own — the
-// API reference by lib/apiNavigation.ts — so their pages are dropped here
+// API and CLI references by lib/areaMenu.ts — so their pages are dropped here
 // rather than listed in both. Dropping a node drops its children with it, which
 // is what takes a whole section out in one go.
 function withoutOtherAreas(pages: NavPage[]): NavPage[] {
diff --git a/src/pages/components.mdx b/src/pages/components.mdx
index 2e5384e82b..3abc05b5f7 100644
--- a/src/pages/components.mdx
+++ b/src/pages/components.mdx
@@ -50,7 +50,7 @@ export const searchDemoResults = [
     facet: 'api',
   },
   {
-    url: '/docs/octopus-rest-api/cli/feed-list',
+    url: '/docs/cli/feed-list',
     title: 'octopus feed list',
     excerpt: 'Lists the <mark>feeds</mark> configured on the Octopus instance.',
     breadcrumb: ['CLI'],
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/clean-environment.md b/src/pages/docs/api-and-integration/octo.exe-command-line/clean-environment.md
index f040038a3f..90acacef11 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/clean-environment.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/clean-environment.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/clean-environment
+redirect: https://octopus.com/docs/cli/octopus-cli/clean-environment
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/clean-workerpool.md b/src/pages/docs/api-and-integration/octo.exe-command-line/clean-workerpool.md
index 27d8f3527c..b7a2aa2d92 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/clean-workerpool.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/clean-workerpool.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/clean-workerpool
+redirect: https://octopus.com/docs/cli/octopus-cli/clean-workerpool
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/cleaning-environments.md b/src/pages/docs/api-and-integration/octo.exe-command-line/cleaning-environments.md
index f040038a3f..90acacef11 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/cleaning-environments.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/cleaning-environments.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/clean-environment
+redirect: https://octopus.com/docs/cli/octopus-cli/clean-environment
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/create-autodeployoverride.md b/src/pages/docs/api-and-integration/octo.exe-command-line/create-autodeployoverride.md
index ad5bd1d8d7..a726fe83a2 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/create-autodeployoverride.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/create-autodeployoverride.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/create-autodeployoverride
+redirect: https://octopus.com/docs/cli/octopus-cli/create-autodeployoverride
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/create-channel.md b/src/pages/docs/api-and-integration/octo.exe-command-line/create-channel.md
index b5a89ba83d..a5dc611608 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/create-channel.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/create-channel.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/create-channel
+redirect: https://octopus.com/docs/cli/octopus-cli/create-channel
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/create-environment.md b/src/pages/docs/api-and-integration/octo.exe-command-line/create-environment.md
index 8514a6172b..20b25bf5a2 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/create-environment.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/create-environment.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/create-environment
+redirect: https://octopus.com/docs/cli/octopus-cli/create-environment
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/create-project.md b/src/pages/docs/api-and-integration/octo.exe-command-line/create-project.md
index 01863222d4..29f58bba1b 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/create-project.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/create-project.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/create-project
+redirect: https://octopus.com/docs/cli/octopus-cli/create-project
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/create-release.md b/src/pages/docs/api-and-integration/octo.exe-command-line/create-release.md
index 9d394e6299..0e37e5424a 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/create-release.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/create-release.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/create-release
+redirect: https://octopus.com/docs/cli/octopus-cli/create-release
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/create-workerpool.md b/src/pages/docs/api-and-integration/octo.exe-command-line/create-workerpool.md
index 7b7fbc6e5e..64719c6641 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/create-workerpool.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/create-workerpool.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/create-workerpool
+redirect: https://octopus.com/docs/cli/octopus-cli/create-workerpool
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-auto-deploy-overrides/deleting-auto-deploy-overrides.md b/src/pages/docs/api-and-integration/octo.exe-command-line/creating-auto-deploy-overrides/deleting-auto-deploy-overrides.md
index b20c094575..0daa571716 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-auto-deploy-overrides/deleting-auto-deploy-overrides.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/creating-auto-deploy-overrides/deleting-auto-deploy-overrides.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/delete-autodeployoverride
+redirect: https://octopus.com/docs/cli/octopus-cli/delete-autodeployoverride
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-auto-deploy-overrides/index.md b/src/pages/docs/api-and-integration/octo.exe-command-line/creating-auto-deploy-overrides/index.md
index ad5bd1d8d7..a726fe83a2 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-auto-deploy-overrides/index.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/creating-auto-deploy-overrides/index.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/create-autodeployoverride
+redirect: https://octopus.com/docs/cli/octopus-cli/create-autodeployoverride
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-channels.md b/src/pages/docs/api-and-integration/octo.exe-command-line/creating-channels.md
index b5a89ba83d..a5dc611608 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-channels.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/creating-channels.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/create-channel
+redirect: https://octopus.com/docs/cli/octopus-cli/create-channel
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-environments.md b/src/pages/docs/api-and-integration/octo.exe-command-line/creating-environments.md
index 8514a6172b..20b25bf5a2 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-environments.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/creating-environments.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/create-environment
+redirect: https://octopus.com/docs/cli/octopus-cli/create-environment
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-projects.md b/src/pages/docs/api-and-integration/octo.exe-command-line/creating-projects.md
index 01863222d4..29f58bba1b 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-projects.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/creating-projects.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/create-project
+redirect: https://octopus.com/docs/cli/octopus-cli/create-project
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-releases.md b/src/pages/docs/api-and-integration/octo.exe-command-line/creating-releases.md
index 9d394e6299..0e37e5424a 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-releases.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/creating-releases.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/create-release
+redirect: https://octopus.com/docs/cli/octopus-cli/create-release
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/delete-autodeployoverride.md b/src/pages/docs/api-and-integration/octo.exe-command-line/delete-autodeployoverride.md
index b20c094575..0daa571716 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/delete-autodeployoverride.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/delete-autodeployoverride.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/delete-autodeployoverride
+redirect: https://octopus.com/docs/cli/octopus-cli/delete-autodeployoverride
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/delete-release.md b/src/pages/docs/api-and-integration/octo.exe-command-line/delete-release.md
index f9c4f3b693..934448f2f0 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/delete-release.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/delete-release.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/delete-releases
+redirect: https://octopus.com/docs/cli/octopus-cli/delete-releases
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/delete-releases.md b/src/pages/docs/api-and-integration/octo.exe-command-line/delete-releases.md
index f9c4f3b693..934448f2f0 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/delete-releases.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/delete-releases.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/delete-releases
+redirect: https://octopus.com/docs/cli/octopus-cli/delete-releases
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/deleting-releases.md b/src/pages/docs/api-and-integration/octo.exe-command-line/deleting-releases.md
index f9c4f3b693..934448f2f0 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/deleting-releases.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/deleting-releases.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/delete-releases
+redirect: https://octopus.com/docs/cli/octopus-cli/delete-releases
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/deploy-release.md b/src/pages/docs/api-and-integration/octo.exe-command-line/deploy-release.md
index 50f730afd4..abdf7b7e5d 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/deploy-release.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/deploy-release.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/deploy-release
+redirect: https://octopus.com/docs/cli/octopus-cli/deploy-release
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/deploying-releases.md b/src/pages/docs/api-and-integration/octo.exe-command-line/deploying-releases.md
index 50f730afd4..abdf7b7e5d 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/deploying-releases.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/deploying-releases.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/deploy-release
+redirect: https://octopus.com/docs/cli/octopus-cli/deploy-release
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/dump-deployments.md b/src/pages/docs/api-and-integration/octo.exe-command-line/dump-deployments.md
index ce8240c6f1..3ed38b1b9f 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/dump-deployments.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/dump-deployments.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/dump-deployments
+redirect: https://octopus.com/docs/cli/octopus-cli/dump-deployments
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/export.md b/src/pages/docs/api-and-integration/octo.exe-command-line/export.md
index 5f3e01ad66..81cf85b330 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/export.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/export.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/export
+redirect: https://octopus.com/docs/cli/octopus-cli/export
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/formatted-output.md b/src/pages/docs/api-and-integration/octo.exe-command-line/formatted-output.md
index 6bfc78bf08..b82253da68 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/formatted-output.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/formatted-output.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/formatted-output
+redirect: https://octopus.com/docs/cli/octopus-cli/formatted-output
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/import.md b/src/pages/docs/api-and-integration/octo.exe-command-line/import.md
index 66a011bee9..837353206c 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/import.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/import.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/import
+redirect: https://octopus.com/docs/cli/octopus-cli/import
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/index.md b/src/pages/docs/api-and-integration/octo.exe-command-line/index.md
index 179d7af5b1..248236f205 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/index.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/index.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli
+redirect: https://octopus.com/docs/cli/octopus-cli
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/install-global-tool.md b/src/pages/docs/api-and-integration/octo.exe-command-line/install-global-tool.md
index 69ebdd2b57..ba2b23769e 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/install-global-tool.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/install-global-tool.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/install-global-tool
+redirect: https://octopus.com/docs/cli/octopus-cli/install-global-tool
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/list-deployments.md b/src/pages/docs/api-and-integration/octo.exe-command-line/list-deployments.md
index 17e8e230c9..123370ef8e 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/list-deployments.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/list-deployments.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/list-deployments
+redirect: https://octopus.com/docs/cli/octopus-cli/list-deployments
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/list-environments.md b/src/pages/docs/api-and-integration/octo.exe-command-line/list-environments.md
index 260f0234c9..a499e2c41d 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/list-environments.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/list-environments.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/list-environments
+redirect: https://octopus.com/docs/cli/octopus-cli/list-environments
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/list-latestdeployments.md b/src/pages/docs/api-and-integration/octo.exe-command-line/list-latestdeployments.md
index 6c618a0cac..3129c1cf1b 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/list-latestdeployments.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/list-latestdeployments.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/list-latestdeployments
+redirect: https://octopus.com/docs/cli/octopus-cli/list-latestdeployments
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/list-machines.md b/src/pages/docs/api-and-integration/octo.exe-command-line/list-machines.md
index 1d0eb7958b..4c5cb3a1f7 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/list-machines.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/list-machines.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/list-machines
+redirect: https://octopus.com/docs/cli/octopus-cli/list-machines
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/list-projects.md b/src/pages/docs/api-and-integration/octo.exe-command-line/list-projects.md
index b9f656d9b0..06ca504bc5 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/list-projects.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/list-projects.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/list-projects
+redirect: https://octopus.com/docs/cli/octopus-cli/list-projects
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/list-releases.md b/src/pages/docs/api-and-integration/octo.exe-command-line/list-releases.md
index 648e2ab5e4..6e6fbde7b0 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/list-releases.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/list-releases.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/list-releases
+redirect: https://octopus.com/docs/cli/octopus-cli/list-releases
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/list-tenants.md b/src/pages/docs/api-and-integration/octo.exe-command-line/list-tenants.md
index 610b26b961..a660388425 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/list-tenants.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/list-tenants.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/list-tenants
+redirect: https://octopus.com/docs/cli/octopus-cli/list-tenants
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/list-workerpools.md b/src/pages/docs/api-and-integration/octo.exe-command-line/list-workerpools.md
index 0a8d0d45c1..4261e02409 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/list-workerpools.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/list-workerpools.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/list-workerpools
+redirect: https://octopus.com/docs/cli/octopus-cli/list-workerpools
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/list-workers.md b/src/pages/docs/api-and-integration/octo.exe-command-line/list-workers.md
index 76f23d7ad5..ebc1989a9c 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/list-workers.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/list-workers.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/list-workers
+redirect: https://octopus.com/docs/cli/octopus-cli/list-workers
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/pack.md b/src/pages/docs/api-and-integration/octo.exe-command-line/pack.md
index c08d12e172..c6e9f04366 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/pack.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/pack.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/pack
+redirect: https://octopus.com/docs/cli/octopus-cli/pack
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/promote-release.md b/src/pages/docs/api-and-integration/octo.exe-command-line/promote-release.md
index 506be5dfc2..aec1efcf36 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/promote-release.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/promote-release.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/promote-release
+redirect: https://octopus.com/docs/cli/octopus-cli/promote-release
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/promoting-releases.md b/src/pages/docs/api-and-integration/octo.exe-command-line/promoting-releases.md
index 506be5dfc2..aec1efcf36 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/promoting-releases.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/promoting-releases.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/promote-release
+redirect: https://octopus.com/docs/cli/octopus-cli/promote-release
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/push-metadata.md b/src/pages/docs/api-and-integration/octo.exe-command-line/push-metadata.md
index 3b8e31d596..2fd6a8f9d2 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/push-metadata.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/push-metadata.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/push-metadata
+redirect: https://octopus.com/docs/cli/octopus-cli/push-metadata
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/push-package.md b/src/pages/docs/api-and-integration/octo.exe-command-line/push-package.md
index b74c3d113a..cc158e6143 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/push-package.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/push-package.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/push
+redirect: https://octopus.com/docs/cli/octopus-cli/push
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/push.md b/src/pages/docs/api-and-integration/octo.exe-command-line/push.md
index b74c3d113a..cc158e6143 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/push.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/push.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/push
+redirect: https://octopus.com/docs/cli/octopus-cli/push
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/pushing-packages.md b/src/pages/docs/api-and-integration/octo.exe-command-line/pushing-packages.md
index b74c3d113a..cc158e6143 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/pushing-packages.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/pushing-packages.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/push
+redirect: https://octopus.com/docs/cli/octopus-cli/push
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/version.md b/src/pages/docs/api-and-integration/octo.exe-command-line/version.md
index 66a0ce586f..3ae3637afb 100644
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/version.md
+++ b/src/pages/docs/api-and-integration/octo.exe-command-line/version.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/version
+redirect: https://octopus.com/docs/cli/octopus-cli/version
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/cli/[...generatedFileName].astro b/src/pages/docs/cli/[...generatedFileName].astro
new file mode 100644
index 0000000000..62f4c5e3b6
--- /dev/null
+++ b/src/pages/docs/cli/[...generatedFileName].astro
@@ -0,0 +1,35 @@
+---
+// [...name].astro allows an astro file to sub in for any subpath of this folder. We use this to
+// route /docs/cli/something.mdx to /docs/cli/_generated/something.mdx so we can keep generated CLI
+// docs separate from handwritten ones on disk, but have them side-by-side in the built website.
+//
+// Note: handwritten paths win over generated ones. If this becomes a problem in practice we could
+// check for this scenario in getStaticPaths and throw.
+//
+// The CLI reference is .mdx where the API reference is .md — the command pages import a shared
+// samples include — so both extensions are globbed here.
+
+import type { MarkdownInstance } from 'astro';
+
+export function getStaticPaths() {
+  const root = '/src/pages/docs/cli/_generated/';
+  const pages = import.meta.glob<MarkdownInstance<Record<string, any>>>(
+    '/src/pages/docs/cli/_generated/**/*.{md,mdx}',
+    { eager: true }
+  );
+
+  return Object.entries(pages).map(([path, page]) => ({
+    params: {
+      generatedFileName: path.slice(root.length).replace(/\.mdx?$/, ''),
+    },
+    props: { page },
+  }));
+}
+
+type Props = { page: MarkdownInstance<Record<string, any>> };
+
+const { page } = Astro.props satisfies Props;
+const { Content } = page;
+---
+
+<Content />
diff --git a/src/pages/docs/cli/_generated/octopus-account-aws-create.mdx b/src/pages/docs/cli/_generated/octopus-account-aws-create.mdx
new file mode 100644
index 0000000000..23fc18676d
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-aws-create.mdx
@@ -0,0 +1,50 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account aws create
+description: Create an AWS account
+navOrder: 3
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create an AWS account in Octopus Deploy
+
+```text
+Usage:
+  octopus account aws create [flags]
+
+Aliases:
+  create, new
+
+Flags:
+      --access-key string         The AWS access key to use when authenticating against Amazon Web Services.
+  -d, --description string        A summary explaining the use of the account to other users.
+  -D, --description-file file     Read the description from file
+  -e, --environment stringArray   The environments that are allowed to use this account
+  -n, --name string               A short, memorable, unique name for this account.
+      --region string             The AWS region to use for this account.
+      --secret-key string         The AWS secret key to use when authenticating against Amazon Web Services.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account aws create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-aws-list.mdx b/src/pages/docs/cli/_generated/octopus-account-aws-list.mdx
new file mode 100644
index 0000000000..c32ba44c36
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-aws-list.mdx
@@ -0,0 +1,40 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account aws list
+description: List AWS accounts
+navOrder: 4
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List AWS accounts in Octopus Deploy
+
+```text
+Usage:
+  octopus account aws list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account aws list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-aws.mdx b/src/pages/docs/cli/_generated/octopus-account-aws.mdx
new file mode 100644
index 0000000000..c7e111fbc7
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-aws.mdx
@@ -0,0 +1,44 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account aws
+description: Manage AWS accounts
+navOrder: 2
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage AWS accounts in Octopus Deploy
+
+```text
+Usage:
+  octopus account aws [command]
+
+Available Commands:
+  create Create an AWS account
+  help Help about any command
+  list List AWS accounts
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus account aws [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account aws list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-azure-create.mdx b/src/pages/docs/cli/_generated/octopus-account-azure-create.mdx
new file mode 100644
index 0000000000..d773c18a9a
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-azure-create.mdx
@@ -0,0 +1,54 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account azure create
+description: Create an Azure subscription account
+navOrder: 6
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create an Azure subscription account in Octopus Deploy
+
+```text
+Usage:
+  octopus account azure create [flags]
+
+Aliases:
+  create, new
+
+Flags:
+  -d, -- string                               A summary explaining the use of the account to other users.
+      --ad-endpoint-base-uri string           Set this only if you need to override the default Active Directory Endpoint.
+      --application-id string                 Your Azure Active Directory Application ID.
+      --application-key string                The password for the Azure Active Directory application.
+      --azure-environment string              Set only if you are using an isolated Azure Environment. Configure isolated Azure Environment. Valid option are AzureChinaCloud, AzureChinaCloud, AzureGermanCloud or AzureUSGovernment
+  -D, --description-file file                 Read the description from file
+  -e, --environment stringArray               The environments that are allowed to use this account
+  -n, --name string                           A short, memorable, unique name for this account.
+      --resource-management-base-uri string   Set this only if you need to override the default Resource Management Endpoint.
+      --subscription-id string                Your Azure subscription ID.
+      --tenant-id string                      Your Azure Active Directory Tenant ID.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account azure create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-azure-list.mdx b/src/pages/docs/cli/_generated/octopus-account-azure-list.mdx
new file mode 100644
index 0000000000..186cbd7837
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-azure-list.mdx
@@ -0,0 +1,40 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account azure list
+description: List Azure subscription accounts
+navOrder: 7
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List Azure subscription accounts in Octopus Deploy
+
+```text
+Usage:
+  octopus account azure list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account azure list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-azure-oidc-create.mdx b/src/pages/docs/cli/_generated/octopus-account-azure-oidc-create.mdx
new file mode 100644
index 0000000000..dd46e27b18
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-azure-oidc-create.mdx
@@ -0,0 +1,57 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account azure-oidc create
+description: Create an Azure OpenID Connect account
+navOrder: 9
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create an Azure OpenID Connect account in Octopus Deploy
+
+```text
+Usage:
+  octopus account azure-oidc create [flags]
+
+Aliases:
+  create, new
+
+Flags:
+  -d, -- string                                A summary explaining the use of the account to other users.
+  -T, --accounttest-subject-keys stringArray   The subject keys used for an account test
+      --ad-endpoint-base-uri string            Set this only if you need to override the default Active Directory Endpoint.
+      --application-id string                  Your Azure Active Directory Application ID.
+      --audience string                        The audience claim for the federated credentials. Defaults to api://AzureADTokenExchange
+      --azure-environment string               Set only if you are using an isolated Azure Environment. Configure isolated Azure Environment. Valid option are AzureChinaCloud, AzureChinaCloud, AzureGermanCloud or AzureUSGovernment
+  -D, --description-file file                  Read the description from file
+  -e, --environment stringArray                The environments that are allowed to use this account
+  -E, --execution-subject-keys stringArray     The subject keys used for a deployment or runbook
+  -H, --health-subject-keys stringArray        The subject keys used for a health check
+  -n, --name string                            A short, memorable, unique name for this account.
+      --resource-management-base-uri string    Set this only if you need to override the default Resource Management Endpoint.
+      --subscription-id string                 Your Azure subscription ID.
+      --tenant-id string                       Your Azure Active Directory Tenant ID.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account azure-oidc create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-azure-oidc-list.mdx b/src/pages/docs/cli/_generated/octopus-account-azure-oidc-list.mdx
new file mode 100644
index 0000000000..efcedc6c6c
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-azure-oidc-list.mdx
@@ -0,0 +1,40 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account azure-oidc list
+description: List Azure OpenID Connect accounts
+navOrder: 10
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List Azure OpenID Connect accounts in Octopus Deploy
+
+```text
+Usage:
+  octopus account azure-oidc list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account azure-oidc list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-azure-oidc.mdx b/src/pages/docs/cli/_generated/octopus-account-azure-oidc.mdx
new file mode 100644
index 0000000000..7286b39b3c
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-azure-oidc.mdx
@@ -0,0 +1,44 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account azure-oidc
+description: Manage Azure OpenID Connect accounts
+navOrder: 8
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage Azure OpenID Connect accounts in Octopus Deploy
+
+```text
+Usage:
+  octopus account azure-oidc [command]
+
+Available Commands:
+  create Create an Azure OpenID Connect account
+  help Help about any command
+  list List Azure OpenID Connect accounts
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus account azure-oidc [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account azure-oidc list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-azure.mdx b/src/pages/docs/cli/_generated/octopus-account-azure.mdx
new file mode 100644
index 0000000000..f9b74d22b1
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-azure.mdx
@@ -0,0 +1,44 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account azure
+description: Manage Azure subscription accounts
+navOrder: 5
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage Azure subscription accounts in Octopus Deploy
+
+```text
+Usage:
+  octopus account azure [command]
+
+Available Commands:
+  create Create an Azure subscription account
+  help Help about any command
+  list List Azure subscription accounts
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus account azure [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account azure list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-create.mdx b/src/pages/docs/cli/_generated/octopus-account-create.mdx
new file mode 100644
index 0000000000..88705b7bbb
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-create.mdx
@@ -0,0 +1,40 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account create
+description: Create an account
+navOrder: 11
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create an account in Octopus Deploy
+
+```text
+Usage:
+  octopus account create [flags]
+
+Aliases:
+  create, new
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-delete.mdx b/src/pages/docs/cli/_generated/octopus-account-delete.mdx
new file mode 100644
index 0000000000..15e194f020
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-delete.mdx
@@ -0,0 +1,46 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account delete
+description: Delete an account
+navOrder: 12
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Delete an account in Octopus Deploy
+
+```text
+Usage:
+  octopus account delete {<name> | <id>} [flags]
+
+Aliases:
+  delete, del, rm, remove
+
+Flags:
+  -y, --confirm   Don't ask for confirmation before deleting the account.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account delete
+octopus account rm
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-gcp-create.mdx b/src/pages/docs/cli/_generated/octopus-account-gcp-create.mdx
new file mode 100644
index 0000000000..e85ef3f6be
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-gcp-create.mdx
@@ -0,0 +1,48 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account gcp create
+description: Create a Google Cloud account
+navOrder: 14
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a Google Cloud account in Octopus Deploy
+
+```text
+Usage:
+  octopus account gcp create [flags]
+
+Aliases:
+  create, new
+
+Flags:
+  -d, --description string        A summary explaining the use of the account to other users.
+  -D, --description-file file     Read the description from file
+  -e, --environment stringArray   The environments that are allowed to use this account
+  -K, --key-file string           The json key file to use when authenticating against Google Cloud.
+  -n, --name string               A short, memorable, unique name for this account.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account gcp create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-gcp-list.mdx b/src/pages/docs/cli/_generated/octopus-account-gcp-list.mdx
new file mode 100644
index 0000000000..53a3aea39e
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-gcp-list.mdx
@@ -0,0 +1,40 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account gcp list
+description: List Google Cloud accounts
+navOrder: 15
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List Google Cloud accounts in Octopus Deploy
+
+```text
+Usage:
+  octopus account gcp list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account gcp list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-gcp.mdx b/src/pages/docs/cli/_generated/octopus-account-gcp.mdx
new file mode 100644
index 0000000000..293e2ade6d
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-gcp.mdx
@@ -0,0 +1,44 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account gcp
+description: Manage Google Cloud accounts
+navOrder: 13
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage Google Cloud accounts in Octopus Deploy
+
+```text
+Usage:
+  octopus account gcp [command]
+
+Available Commands:
+  create Create a Google Cloud account
+  help Help about any command
+  list List Google Cloud accounts
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus account gcp [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account gcp list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-generic-oidc-create.mdx b/src/pages/docs/cli/_generated/octopus-account-generic-oidc-create.mdx
new file mode 100644
index 0000000000..d0950467d5
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-generic-oidc-create.mdx
@@ -0,0 +1,49 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account generic-oidc create
+description: Create an Generic OpenID Connect account
+navOrder: 17
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create an Generic OpenID Connect account in Octopus Deploy
+
+```text
+Usage:
+  octopus account generic-oidc create [flags]
+
+Aliases:
+  create, new
+
+Flags:
+  -d, -- string                              A summary explaining the use of the account to other users.
+      --audience string                      The audience claim for the federated credentials. Defaults to api://default
+  -D, --description-file file                Read the description from file
+  -e, --environment stringArray              The environments that are allowed to use this account
+  -E, --execution-subject-keys stringArray   The subject keys used for a deployment or runbook
+  -n, --name string                          A short, memorable, unique name for this account.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account generic-oidc create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-generic-oidc-list.mdx b/src/pages/docs/cli/_generated/octopus-account-generic-oidc-list.mdx
new file mode 100644
index 0000000000..148b631d27
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-generic-oidc-list.mdx
@@ -0,0 +1,40 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account generic-oidc list
+description: List Generic OpenID Connect accounts
+navOrder: 18
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List Generic OpenID Connect accounts in Octopus Deploy
+
+```text
+Usage:
+  octopus account generic-oidc list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account generic-oidc list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-generic-oidc.mdx b/src/pages/docs/cli/_generated/octopus-account-generic-oidc.mdx
new file mode 100644
index 0000000000..0cabd8496b
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-generic-oidc.mdx
@@ -0,0 +1,44 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account generic-oidc
+description: Manage Generic OpenID Connect accounts
+navOrder: 16
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage Generic OpenID Connect accounts in Octopus Deploy
+
+```text
+Usage:
+  octopus account generic-oidc [command]
+
+Available Commands:
+  create Create an Generic OpenID Connect account
+  help Help about any command
+  list List Generic OpenID Connect accounts
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus account generic-oidc [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account generic-oidc list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-list.mdx b/src/pages/docs/cli/_generated/octopus-account-list.mdx
new file mode 100644
index 0000000000..80747bb509
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-list.mdx
@@ -0,0 +1,40 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account list
+description: List accounts
+navOrder: 19
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List accounts in Octopus Deploy
+
+```text
+Usage:
+  octopus account list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-ssh-create.mdx b/src/pages/docs/cli/_generated/octopus-account-ssh-create.mdx
new file mode 100644
index 0000000000..0f2b725b1f
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-ssh-create.mdx
@@ -0,0 +1,50 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account ssh create
+description: Create a SSH Key Pair account
+navOrder: 21
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a SSH Key Pair account in Octopus Deploy
+
+```text
+Usage:
+  octopus account ssh create [flags]
+
+Aliases:
+  create, new
+
+Flags:
+  -d, --description string        A summary explaining the use of the account to other users.
+  -D, --description-file file     Read the description from file.
+  -e, --environment stringArray   The environments that are allowed to use this account.
+  -n, --name string               A short, memorable, unique name for this account.
+  -p, --passphrase string         The passphrase for the private key, if required.
+  -K, --private-key string        Path to the private key file portion of the key pair.
+  -u, --username string           The username to use when authenticating against the remote host.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account ssh create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-ssh-list.mdx b/src/pages/docs/cli/_generated/octopus-account-ssh-list.mdx
new file mode 100644
index 0000000000..82f419fb84
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-ssh-list.mdx
@@ -0,0 +1,40 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account ssh list
+description: List SSH Key Pair accounts
+navOrder: 22
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List SSH Key Pair accounts in Octopus Deploy
+
+```text
+Usage:
+  octopus account ssh list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account ssh list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-ssh.mdx b/src/pages/docs/cli/_generated/octopus-account-ssh.mdx
new file mode 100644
index 0000000000..fb540f3941
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-ssh.mdx
@@ -0,0 +1,44 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account ssh
+description: Manage SSH Key Pair accounts
+navOrder: 20
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage SSH Key Pair accounts in Octopus Deploy
+
+```text
+Usage:
+  octopus account ssh [command]
+
+Available Commands:
+  create Create a SSH Key Pair account
+  help Help about any command
+  list List SSH Key Pair accounts
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus account ssh [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account ssh list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-token-create.mdx b/src/pages/docs/cli/_generated/octopus-account-token-create.mdx
new file mode 100644
index 0000000000..6402cd94b6
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-token-create.mdx
@@ -0,0 +1,48 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account token create
+description: Create a Token account
+navOrder: 24
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a Token account in Octopus Deploy
+
+```text
+Usage:
+  octopus account token create [flags]
+
+Aliases:
+  create, new
+
+Flags:
+  -d, -- string                   A summary explaining the use of the account to other users.
+  -D, --description-file file     Read the description from file.
+  -e, --environment stringArray   The environments that are allowed to use this account.
+  -n, --name string               A short, memorable, unique name for this account.
+  -t, --token string              The password to use to when authenticating against the remote host.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account token create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-token-list.mdx b/src/pages/docs/cli/_generated/octopus-account-token-list.mdx
new file mode 100644
index 0000000000..19aadec588
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-token-list.mdx
@@ -0,0 +1,40 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account token list
+description: List Token accounts
+navOrder: 25
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List Token accounts in Octopus Deploy
+
+```text
+Usage:
+  octopus account token list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account token list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-token.mdx b/src/pages/docs/cli/_generated/octopus-account-token.mdx
new file mode 100644
index 0000000000..887dbde19a
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-token.mdx
@@ -0,0 +1,44 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account token
+description: Manage Token accounts
+navOrder: 23
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage Token accounts in Octopus Deploy
+
+```text
+Usage:
+  octopus account token [command]
+
+Available Commands:
+  create Create a Token account
+  help Help about any command
+  list List Token accounts
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus account token [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account token list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-username-create.mdx b/src/pages/docs/cli/_generated/octopus-account-username-create.mdx
new file mode 100644
index 0000000000..9cb0a50dcc
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-username-create.mdx
@@ -0,0 +1,47 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account username create
+description: Create a Username/Password account
+navOrder: 27
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a Username/Password account in Octopus Deploy
+
+```text
+Usage:
+  octopus account username create [flags]
+
+Flags:
+  -d, --description string        A summary explaining the use of the account to other users.
+  -D, --description-file file     Read the description from file.
+  -e, --environment stringArray   The environments that are allowed to use this account.
+  -n, --name string               A short, memorable, unique name for this account.
+  -p, --password string           The password to use to when authenticating against the remote host.
+  -u, --username string           The username to use when authenticating against the remote host.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account username create"
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-username-list.mdx b/src/pages/docs/cli/_generated/octopus-account-username-list.mdx
new file mode 100644
index 0000000000..25d6882f47
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-username-list.mdx
@@ -0,0 +1,41 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account username list
+description: List Username/Password accounts
+navOrder: 28
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List Username/Password accounts in Octopus Deploy
+
+```text
+Usage:
+  octopus account username list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account username list"
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account-username.mdx b/src/pages/docs/cli/_generated/octopus-account-username.mdx
new file mode 100644
index 0000000000..832ae75507
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account-username.mdx
@@ -0,0 +1,44 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account username
+description: Manage Username/Password accounts
+navOrder: 26
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage Username/Password accounts in Octopus Deploy
+
+```text
+Usage:
+  octopus account username [command]
+
+Available Commands:
+  create Create a Username/Password account
+  help Help about any command
+  list List Username/Password accounts
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus account username [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account username list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-account.mdx b/src/pages/docs/cli/_generated/octopus-account.mdx
new file mode 100644
index 0000000000..1ae47df888
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-account.mdx
@@ -0,0 +1,53 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus account
+description: Manage accounts
+navOrder: 1
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage accounts in Octopus Deploy
+
+```text
+Usage:
+  octopus account [command]
+
+Available Commands:
+  aws Manage AWS accounts
+  azure Manage Azure subscription accounts
+  azure-oidc Manage Azure OpenID Connect accounts
+  create Create an account
+  delete Delete an account
+  gcp Manage Google Cloud accounts
+  generic-oidc Manage Generic OpenID Connect accounts
+  help Help about any command
+  list List accounts
+  ssh Manage SSH Key Pair accounts
+  token Manage Token accounts
+  username Manage Username/Password accounts
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus account [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus account list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-api.mdx b/src/pages/docs/cli/_generated/octopus-api.mdx
new file mode 100644
index 0000000000..71cee522c6
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-api.mdx
@@ -0,0 +1,40 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus api
+description: Execute a raw API GET request
+navOrder: 29
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Execute an authenticated GET request against the Octopus Server API and print the JSON response.
+
+```text
+Usage:
+  octopus api <url> [flags]
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus api /api
+octopus api /api/spaces
+octopus api /api/Spaces-1/projects
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-build-information-bulk-delete.mdx b/src/pages/docs/cli/_generated/octopus-build-information-bulk-delete.mdx
new file mode 100644
index 0000000000..e5e20aa4ce
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-build-information-bulk-delete.mdx
@@ -0,0 +1,46 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus build-information bulk-delete
+description: Bulk delete build information
+navOrder: 31
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Bulk delete build information in Octopus Deploy
+
+```text
+Usage:
+  octopus build-information bulk-delete [flags]
+
+Flags:
+  -y, --confirm               Don't ask for confirmation before deleting the build information.
+      --package-id string     the package id of the build information.
+      --version stringArray   the version of the build information, may be specified multiple times.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus build-information bulk-delete
+octopus build-info --package-id ThePackage
+octopus build-info --package-id ThePackage --version 1.0.0 --version 1.0.1
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-build-information-delete.mdx b/src/pages/docs/cli/_generated/octopus-build-information-delete.mdx
new file mode 100644
index 0000000000..2396aec480
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-build-information-delete.mdx
@@ -0,0 +1,49 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus build-information delete
+description: Delete a build information
+navOrder: 32
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Delete a build information in Octopus Deploy
+
+```text
+Usage:
+  octopus build-information delete <id> [flags]
+
+Aliases:
+  delete, del, rm, remove
+
+Flags:
+  -y, --confirm             Don't ask for confirmation before deleting the build information.
+  -p, --package-id string   The Package ID of the build information to delete
+  -v, --version string      The version of the build information to delete
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus build-information delete BuildInformation-1
+octopus build-info rm BuildInformation-1
+octopus build-info del --package-id ThePackage --version 1.2.3
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-build-information-list.mdx b/src/pages/docs/cli/_generated/octopus-build-information-list.mdx
new file mode 100644
index 0000000000..66065d6432
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-build-information-list.mdx
@@ -0,0 +1,51 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus build-information list
+description: List build information
+navOrder: 33
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List build information in Octopus Deploy
+
+```text
+Usage:
+  octopus build-information list [flags]
+
+Aliases:
+  list, ls
+
+Flags:
+  -q, --filter string       filter build information by version that contains the filter
+      --latest              only return the latest build information according to SemVer
+  -p, --package-id string   filter build information by package id
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus build-information list
+octopus build-information ls
+octopus build-info list
+octopus build-info ls --package-id ThePackage
+octopus build-info ls --package-id ThePackage --filter 1.2.3
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-build-information-upload.mdx b/src/pages/docs/cli/_generated/octopus-build-information-upload.mdx
new file mode 100644
index 0000000000..4f044bf5cd
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-build-information-upload.mdx
@@ -0,0 +1,51 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus build-information upload
+description: upload build information for one or more packages to Octopus Deploy
+navOrder: 34
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+upload build information one or more packages to Octopus Deploy.
+
+```text
+Usage:
+  octopus build-information upload [flags]
+
+Aliases:
+  upload, push
+
+Flags:
+  -p, --package-id stringArray   The ID of the package, may be specified multiple times. Any arguments without flags will be treated as package IDs
+      --version string           The version of the package
+      --file string              Path to Octopus Build Information Json file
+      --overwrite-mode string    Action when a build information already exists. Valid values are 'fail', 'overwrite', 'ignore'. Default is 'fail'
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus build-information upload --package-id SomePackage --version 1.0.0 --file buildinfo.octopus
+octopus build-information upload SomePackage --version 1.0.0 --file buildinfo.octopus --overwrite-mode overwrite
+octopus build-information push SomePackage --version 1.0.0 --file buildinfo.octopus
+octopus build-information upload PkgA PkgB PkgC --version 1.0.0 --file buildinfo.octopus
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-build-information-view.mdx b/src/pages/docs/cli/_generated/octopus-build-information-view.mdx
new file mode 100644
index 0000000000..69c55a4d88
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-build-information-view.mdx
@@ -0,0 +1,43 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus build-information view
+description: View a build information
+navOrder: 35
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View a build information in Octopus Deploy
+
+```text
+Usage:
+  octopus build-information view {<id>} [flags]
+
+Flags:
+  -w, --web   Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus build-information view BuildInformation-1
+octopus build-info view BuildInformation-1
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-build-information.mdx b/src/pages/docs/cli/_generated/octopus-build-information.mdx
new file mode 100644
index 0000000000..0554bd994d
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-build-information.mdx
@@ -0,0 +1,50 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus build-information
+description: Manage build information
+navOrder: 30
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage build information in Octopus Deploy
+
+```text
+Usage:
+  octopus build-information [command]
+
+Aliases:
+  build-information, build-info
+
+Available Commands:
+  bulk-delete Bulk delete build information
+  delete Delete a build information
+  help Help about any command
+  list List build information
+  upload upload build information for one or more packages to Octopus Deploy
+  view View a build information
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus build-information [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus build-information upload
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-channel-create.mdx b/src/pages/docs/cli/_generated/octopus-channel-create.mdx
new file mode 100644
index 0000000000..08b6df4694
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-channel-create.mdx
@@ -0,0 +1,47 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus channel create
+description: Create a channel
+navOrder: 37
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a channel in Octopus Deploy
+
+```text
+Usage:
+  octopus channel create [flags]
+
+Flags:
+      --default              Set this channel as default
+  -d, --description string   Description of the channel
+  -l, --lifecycle string     The lifecycle to use for the channel
+  -n, --name string          Name of the channel
+  -p, --project string       Project to create channel in
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus channel create
+octopus channel create --name "The Channel" --project "The Project" --lifecycle "Default Lifecycle" --default
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-channel-delete.mdx b/src/pages/docs/cli/_generated/octopus-channel-delete.mdx
new file mode 100644
index 0000000000..f402b2aacf
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-channel-delete.mdx
@@ -0,0 +1,47 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus channel delete
+description: Delete a channel
+navOrder: 38
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Delete a channel in Octopus Deploy
+
+```text
+Usage:
+  octopus channel delete {<name> | <id>} [flags]
+
+Aliases:
+  delete, del, rm, remove
+
+Flags:
+  -y, --confirm          Don't ask for confirmation before deleting the channel.
+  -p, --project string   Name or ID of the project the channel belongs to
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus channel delete "Hotfix" --project myProject
+octopus channel rm Channels-123 --project myProject -y
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-channel-list.mdx b/src/pages/docs/cli/_generated/octopus-channel-list.mdx
new file mode 100644
index 0000000000..1f4f40880f
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-channel-list.mdx
@@ -0,0 +1,50 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus channel list
+description: List channels
+navOrder: 39
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List channels for a project in Octopus Deploy
+
+```text
+Usage:
+  octopus channel list [flags]
+
+Aliases:
+  list, ls
+
+Flags:
+  -q, --filter string    Filter channels to match only ones with a name containing the given string
+  -p, --project string   Name or ID of the project to list channels for
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus channel list myProject
+octopus channel ls "Other Project"
+octopus channel list --project myProject
+octopus channel list --project myProject --filter "Hotfix"
+octopus channel ls -p myProject -q Hotfix
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-channel-view.mdx b/src/pages/docs/cli/_generated/octopus-channel-view.mdx
new file mode 100644
index 0000000000..76fda959c8
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-channel-view.mdx
@@ -0,0 +1,44 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus channel view
+description: View a channel
+navOrder: 40
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View a channel in Octopus Deploy
+
+```text
+Usage:
+  octopus channel view {<name> | <id>} [flags]
+
+Flags:
+  -p, --project string   Name or ID of the project the channel belongs to
+  -w, --web              Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus channel view "Hotfix" --project myProject
+octopus channel view Channels-123 --project myProject
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-channel.mdx b/src/pages/docs/cli/_generated/octopus-channel.mdx
new file mode 100644
index 0000000000..7345f3d7ef
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-channel.mdx
@@ -0,0 +1,50 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus channel
+description: Manage channels
+navOrder: 36
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage channels in Octopus Deploy
+
+```text
+Usage:
+  octopus channel [command]
+
+Available Commands:
+  create Create a channel
+  delete Delete a channel
+  help Help about any command
+  list List channels
+  view View a channel
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus channel [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus channel create
+octopus channel list --project myProject
+octopus channel view "Hotfix" --project myProject
+octopus channel delete "Hotfix" --project myProject
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-config-get.mdx b/src/pages/docs/cli/_generated/octopus-config-get.mdx
new file mode 100644
index 0000000000..c8772c4c33
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-config-get.mdx
@@ -0,0 +1,28 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus config get
+description: Gets the value of config key for Octopus CLI
+navOrder: 42
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Gets the value of config key for Octopus CLI.
+
+```text
+Usage:
+  octopus config get [key] [flags]
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-config-list.mdx b/src/pages/docs/cli/_generated/octopus-config-list.mdx
new file mode 100644
index 0000000000..281e7149f9
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-config-list.mdx
@@ -0,0 +1,41 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus config list
+description: List values from config file
+navOrder: 43
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List values from config file.
+
+```text
+Usage:
+  octopus config list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus config list"
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-config-set.mdx b/src/pages/docs/cli/_generated/octopus-config-set.mdx
new file mode 100644
index 0000000000..0c9d04aa00
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-config-set.mdx
@@ -0,0 +1,28 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus config set
+description: Set will write the value for given key to Octopus CLI config file
+navOrder: 44
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Set will write the value for given key to Octopus CLI config file.
+
+```text
+Usage:
+  octopus config set [key] [value] [flags]
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-config.mdx b/src/pages/docs/cli/_generated/octopus-config.mdx
new file mode 100644
index 0000000000..476321c12d
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-config.mdx
@@ -0,0 +1,36 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus config
+description: Manage CLI configuration
+navOrder: 41
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage the CLI configuration
+
+```text
+Usage:
+  octopus config [command]
+
+Available Commands:
+  get Gets the value of config key for Octopus CLI
+  help Help about any command
+  list List values from config file
+  set Set will write the value for given key to Octopus CLI config file
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus config [command] --help" for more information about a command.
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-azure-web-app-create.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-azure-web-app-create.mdx
new file mode 100644
index 0000000000..0dd483e28b
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-azure-web-app-create.mdx
@@ -0,0 +1,57 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target azure-web-app create
+description: Create an Azure Web App deployment target
+navOrder: 47
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create an Azure Web App deployment target in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target azure-web-app create [flags]
+
+Aliases:
+  create, new
+
+Flags:
+      --account string          The name or ID of the Azure account
+      --environment strings     Choose at least one environment for the deployment target.
+  -n, --name string             A short, memorable, unique name for this Azure Web App.
+      --resource-group string   The resource group of the Azure Web App
+      --role strings            Choose at least one role that this deployment target will provide (use --tag for tag sets with validation).
+      --tag strings             Target tags in canonical format (TagSetName/TagName).
+      --tenant strings          Associate the deployment target with tenants
+      --tenant-tag strings      Associate the deployment target with tenant tags, should be in the format 'tag set name/tag name'
+      --tenanted-mode string    
+                                Choose the kind of deployments where this deployment target should be included. Default is 'untenanted'
+  -w, --web                     Open in web browser
+      --web-app string          The name of the Azure Web App for this deployment target
+      --web-app-slot string     The name of the Azure Web App Slot for this deployment target
+      --worker-pool string      The worker pool for the deployment target, only required if not using the default worker pool
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target azure-web-app create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-azure-web-app-list.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-azure-web-app-list.mdx
new file mode 100644
index 0000000000..07ac0f1ae8
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-azure-web-app-list.mdx
@@ -0,0 +1,42 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target azure-web-app list
+description: List Azure Web App deployment targets
+navOrder: 48
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List Azure Web App deployment targets in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target azure-web-app list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target azure-web-app list
+octopus deployment-target azure-web-app ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-azure-web-app-view.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-azure-web-app-view.mdx
new file mode 100644
index 0000000000..a4a4681c00
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-azure-web-app-view.mdx
@@ -0,0 +1,43 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target azure-web-app view
+description: View an Azure Web App deployment target
+navOrder: 49
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View an Azure Web App deployment target in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target azure-web-app view {<name> | <id>} [flags]
+
+Flags:
+  -w, --web   Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target azure-web-app view 'Shop Api'
+octopus deployment-target azure-web-app view Machines-100
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-azure-web-app.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-azure-web-app.mdx
new file mode 100644
index 0000000000..4911cdb43c
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-azure-web-app.mdx
@@ -0,0 +1,45 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target azure-web-app
+description: Manage Azure Web App deployment targets
+navOrder: 46
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage Azure Web App deployment targets in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target azure-web-app [command]
+
+Available Commands:
+  create Create an Azure Web App deployment target
+  help Help about any command
+  list List Azure Web App deployment targets
+  view View an Azure Web App deployment target
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus deployment-target azure-web-app [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target azure-web-app list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-cloud-region-create.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-cloud-region-create.mdx
new file mode 100644
index 0000000000..b85a94135f
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-cloud-region-create.mdx
@@ -0,0 +1,53 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target cloud-region create
+description: Create a Cloud Region deployment target
+navOrder: 51
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a Cloud Region deployment target in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target cloud-region create [flags]
+
+Aliases:
+  create, new
+
+Flags:
+      --environment strings    Choose at least one environment for the deployment target.
+  -n, --name string            A short, memorable, unique name for this Cloud Region.
+      --role strings           Choose at least one role that this deployment target will provide (use --tag for tag sets with validation).
+      --tag strings            Target tags in canonical format (TagSetName/TagName).
+      --tenant strings         Associate the deployment target with tenants
+      --tenant-tag strings     Associate the deployment target with tenant tags, should be in the format 'tag set name/tag name'
+      --tenanted-mode string   
+                               Choose the kind of deployments where this deployment target should be included. Default is 'untenanted'
+  -w, --web                    Open in web browser
+      --worker-pool string     The worker pool for the deployment target, only required if not using the default worker pool
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target cloud-region create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-cloud-region-list.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-cloud-region-list.mdx
new file mode 100644
index 0000000000..bc3fce77c7
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-cloud-region-list.mdx
@@ -0,0 +1,42 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target cloud-region list
+description: List Cloud Region deployment targets
+navOrder: 52
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List Cloud Region deployment targets in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target cloud-region list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target cloud-region list
+octopus deployment-target cloud-region ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-cloud-region-view.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-cloud-region-view.mdx
new file mode 100644
index 0000000000..b11f6775a1
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-cloud-region-view.mdx
@@ -0,0 +1,43 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target cloud-region view
+description: View a Cloud Region deployment target
+navOrder: 53
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View a Cloud Region deployment target in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target cloud-region view {<name> | <id>} [flags]
+
+Flags:
+  -w, --web   Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target cloud-region view 'EU'
+octopus deployment-target cloud-region view Machines-100
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-cloud-region.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-cloud-region.mdx
new file mode 100644
index 0000000000..0380731143
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-cloud-region.mdx
@@ -0,0 +1,45 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target cloud-region
+description: Manage Cloud Region deployment targets
+navOrder: 50
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage Cloud Region deployment targets in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target cloud-region [command]
+
+Available Commands:
+  create Create a Cloud Region deployment target
+  help Help about any command
+  list List Cloud Region deployment targets
+  view View a Cloud Region deployment target
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus deployment-target cloud-region [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target cloud-region list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-delete.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-delete.mdx
new file mode 100644
index 0000000000..19769fa4c0
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-delete.mdx
@@ -0,0 +1,46 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target delete
+description: Delete a deployment target
+navOrder: 54
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Delete a deployment target in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target delete {<name> | <id>} [flags]
+
+Aliases:
+  delete, del, rm, remove
+
+Flags:
+  -y, --confirm   Don't ask for confirmation before deleting the deployment target.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target delete
+octopus deployment-target rm
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-kubernetes-create.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-kubernetes-create.mdx
new file mode 100644
index 0000000000..74fb552f0f
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-kubernetes-create.mdx
@@ -0,0 +1,81 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target kubernetes create
+description: Create a Kubernetes deployment target
+navOrder: 56
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a Kubernetes deployment target in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target kubernetes create [flags]
+
+Aliases:
+  create, new
+
+Flags:
+      --account string                          The name of the account to use for authentication.
+      --aks-cluster-name string                 The AKS cluster name.
+      --aks-resource-group-name string          The AKS resource group name.
+      --aks-use-admin-credentials               Enabling this option passes the --admin flag to az aks get-credentials. This is useful for AKS clusters with Azure Active Directory integration.
+      --auth-type string                        The authentication type to use.
+      --certificate string                      Name of Certificate in Octopus Deploy.
+      --certificate-path string                 The path to the CA certificate of the cluster. The default value usually is: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+      --client-certificate string               Name of client certificate in Octopus Deploy
+      --cluster-url string                      Kubernetes cluster URL. Must be an absolute URL. e.g. https://kubernetes.example.com
+      --docker-container-registry string        The feed of the docker container registry to use if running health check in a container on the worker
+      --docker-image-flags string               The image (including the tag) to use from the container registry
+      --eks-assume-service-role                 Assume a different AWS service role.
+      --eks-assumed-role-arn string             ARN of assumed AWS service role.
+      --eks-assumed-role-external-id string     AWS assumed role external ID.
+      --eks-assumed-role-session-duration int   AWS assumed role session duration in seconds. (defaults to 3600 seconds, 1 hour)
+      --eks-assumed-role-session-name string    Session name of assumed AWS service role.
+      --eks-cluster-name string                 AWS EKS Cluster Name
+      --eks-use-service-role                    Execute using the AWS service role for an EC2 instance.
+      --environment strings                     Choose at least one environment for the deployment target.
+      --gke-cluster-name string                 GKE Cluster Name.
+      --gke-impersonate-service-account         Impersonate service accounts.
+      --gke-project string                      GKE Project.
+      --gke-region string                       GKE Region.
+      --gke-service-account-emails string       Service Account Email.
+      --gke-use-vm-service-account              When running in a Compute Engine virtual machine, use the associated VM service account.
+      --gke-zone string                         GKE Zone.
+  -n, --name string                             A short, memorable, unique name for this deployment target.
+      --namespace string                        Kubernetes Namespace.
+      --pod-token-path string                   The path to the token of the pod service account. The default value usually is: /var/run/secrets/kubernetes.io/serviceaccount/token
+      --role strings                            Choose at least one role that this deployment target will provide (use --tag for tag sets with validation).
+      --skip-tls-verification                   Skip the verification of the cluster certificate. This can only be provided if no cluster certificate is specified.
+      --tag strings                             Target tags in canonical format (TagSetName/TagName).
+      --tenant strings                          Associate the deployment target with tenants
+      --tenant-tag strings                      Associate the deployment target with tenant tags, should be in the format 'tag set name/tag name'
+      --tenanted-mode string                    
+                                                Choose the kind of deployments where this deployment target should be included. Default is 'untenanted'
+  -w, --web                                     Open in web browser
+      --worker-pool string                      The worker pool for the deployment target, only required if not using the default worker pool
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target kubernetes create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-kubernetes-list.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-kubernetes-list.mdx
new file mode 100644
index 0000000000..34cb6c9d7a
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-kubernetes-list.mdx
@@ -0,0 +1,42 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target kubernetes list
+description: List Kubernetes deployment targets
+navOrder: 57
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List Kubernetes deployment targets in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target kubernetes list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target kubernetes list
+octopus deployment-target kubernetes ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-kubernetes-view.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-kubernetes-view.mdx
new file mode 100644
index 0000000000..f669a0611d
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-kubernetes-view.mdx
@@ -0,0 +1,42 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target kubernetes view
+description: View a Kubernetes deployment target
+navOrder: 58
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View a Kubernetes deployment target in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target kubernetes view {<name> | <id>} [flags]
+
+Flags:
+  -w, --web   Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target kubernetes view 'target-name'
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-kubernetes.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-kubernetes.mdx
new file mode 100644
index 0000000000..ea88afcab9
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-kubernetes.mdx
@@ -0,0 +1,48 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target kubernetes
+description: Manage Kubernetes deployment targets
+navOrder: 55
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage Kubernetes deployment targets in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target kubernetes [command]
+
+Aliases:
+  kubernetes, k8s
+
+Available Commands:
+  create Create a Kubernetes deployment target
+  help Help about any command
+  list List Kubernetes deployment targets
+  view View a Kubernetes deployment target
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus deployment-target kubernetes [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target kubernetes create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-list.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-list.mdx
new file mode 100644
index 0000000000..5b2a7ea32c
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-list.mdx
@@ -0,0 +1,42 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target list
+description: List deployment targets
+navOrder: 59
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List deployment targets in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target list
+octopus deployment-target ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-listening-tentacle-create.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-listening-tentacle-create.mdx
new file mode 100644
index 0000000000..dc1ac68a56
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-listening-tentacle-create.mdx
@@ -0,0 +1,56 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target listening-tentacle create
+description: Create a Listening Tentacle deployment target
+navOrder: 61
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a Listening Tentacle deployment target in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target listening-tentacle create [flags]
+
+Aliases:
+  create, new
+
+Flags:
+      --environment strings     Choose at least one environment for the deployment target.
+      --machine-policy string   The machine policy for the deployment target to use, only required if not using the Default Machine Policy
+  -n, --name string             A short, memorable, unique name for this Listening Tentacle.
+      --proxy string            Select whether to use a proxy to connect to this Listening Tentacle. If omitted, will connect directly.
+      --role strings            Choose at least one role that this deployment target will provide (use --tag for tag sets with validation).
+      --tag strings             Target tags in canonical format (TagSetName/TagName).
+      --tenant strings          Associate the deployment target with tenants
+      --tenant-tag strings      Associate the deployment target with tenant tags, should be in the format 'tag set name/tag name'
+      --tenanted-mode string    
+                                Choose the kind of deployments where this deployment target should be included. Default is 'untenanted'
+      --thumbprint string       The X509 certificate thumbprint that securely identifies the Tentacle.
+      --url string              The network address at which the Tentacle can be reached.
+  -w, --web                     Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target listening-tentacle create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-listening-tentacle-list.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-listening-tentacle-list.mdx
new file mode 100644
index 0000000000..df02b4f83a
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-listening-tentacle-list.mdx
@@ -0,0 +1,42 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target listening-tentacle list
+description: List Listening Tentacle deployment targets
+navOrder: 62
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List Listening Tentacle deployment targets in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target listening-tentacle list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target listening-tentacle list
+octopus deployment-target listening-tentacle ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-listening-tentacle-view.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-listening-tentacle-view.mdx
new file mode 100644
index 0000000000..8d39dba202
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-listening-tentacle-view.mdx
@@ -0,0 +1,43 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target listening-tentacle view
+description: View a Listening Tentacle deployment target
+navOrder: 63
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View a Listening Tentacle deployment target in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target listening-tentacle view {<name> | <id>} [flags]
+
+Flags:
+  -w, --web   Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target listening-tentacle view 'EU'
+octopus deployment-target listening-tentacle view Machines-100
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-listening-tentacle.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-listening-tentacle.mdx
new file mode 100644
index 0000000000..bf4d0e5430
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-listening-tentacle.mdx
@@ -0,0 +1,45 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target listening-tentacle
+description: Manage Listening Tentacle deployment targets
+navOrder: 60
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage Listening Tentacle deployment targets in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target listening-tentacle [command]
+
+Available Commands:
+  create Create a Listening Tentacle deployment target
+  help Help about any command
+  list List Listening Tentacle deployment targets
+  view View a Listening Tentacle deployment target
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus deployment-target listening-tentacle [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target listening-tentacle list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-polling-tentacle-list.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-polling-tentacle-list.mdx
new file mode 100644
index 0000000000..95c895eb16
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-polling-tentacle-list.mdx
@@ -0,0 +1,42 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target polling-tentacle list
+description: List Polling Tentacle deployment targets
+navOrder: 65
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List Polling Tentacle deployment targets in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target polling-tentacle list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target polling-tentacle list
+octopus deployment-target polling-tentacle ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-polling-tentacle-view.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-polling-tentacle-view.mdx
new file mode 100644
index 0000000000..fd9f95b848
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-polling-tentacle-view.mdx
@@ -0,0 +1,43 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target polling-tentacle view
+description: View a Polling Tentacle deployment target
+navOrder: 66
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View a Polling Tentacle deployment target in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target polling-tentacle view {<name> | <id>} [flags]
+
+Flags:
+  -w, --web   Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target polling-tentacle view 'EU'
+octopus deployment-target polling-tentacle view Machines-100
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-polling-tentacle.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-polling-tentacle.mdx
new file mode 100644
index 0000000000..09c6914ce5
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-polling-tentacle.mdx
@@ -0,0 +1,44 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target polling-tentacle
+description: Manage Polling Tentacle deployment targets
+navOrder: 64
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage Polling Tentacle deployment targets in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target polling-tentacle [command]
+
+Available Commands:
+  help Help about any command
+  list List Polling Tentacle deployment targets
+  view View a Polling Tentacle deployment target
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus deployment-target polling-tentacle [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target polling-tentacle list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-ssh-create.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-ssh-create.mdx
new file mode 100644
index 0000000000..7d96856adb
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-ssh-create.mdx
@@ -0,0 +1,60 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target ssh create
+description: Create a SSH deployment target
+navOrder: 68
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a SSH deployment target in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target ssh create [flags]
+
+Aliases:
+  create, new
+
+Flags:
+      --account string          The name or ID of the SSH key pair or username/password account
+      --environment strings     Choose at least one environment for the deployment target.
+      --fingerprint string      The host fingerprint of the SSH target.
+      --host string             The hostname or IP address of the SSH target to connect to.
+      --machine-policy string   The machine policy for the deployment target to use, only required if not using the Default Machine Policy
+  -n, --name string             A short, memorable, unique name for this deployment target.
+      --platform string         The platform to use for the self-contained Calamari. Options are 'linux-x64', 'linux-arm64', 'linux-arm' or 'osx-x64'
+      --port int                The port to connect to the SSH target on.
+      --proxy string            Select whether to use a proxy to connect to this SSH target. If omitted, will connect directly.
+      --role strings            Choose at least one role that this deployment target will provide (use --tag for tag sets with validation).
+      --runtime string          The runtime to use to run Calamari on the SSH target. Options are 'self-contained' or 'mono'
+      --tag strings             Target tags in canonical format (TagSetName/TagName).
+      --tenant strings          Associate the deployment target with tenants
+      --tenant-tag strings      Associate the deployment target with tenant tags, should be in the format 'tag set name/tag name'
+      --tenanted-mode string    
+                                Choose the kind of deployments where this deployment target should be included. Default is 'untenanted'
+  -w, --web                     Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target ssh create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-ssh-list.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-ssh-list.mdx
new file mode 100644
index 0000000000..d5ae31244a
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-ssh-list.mdx
@@ -0,0 +1,42 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target ssh list
+description: List SSH deployment targets
+navOrder: 69
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List SSH deployment targets in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target ssh list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target ssh list
+octopus deployment-target ssh ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-ssh-view.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-ssh-view.mdx
new file mode 100644
index 0000000000..b5e5e390b2
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-ssh-view.mdx
@@ -0,0 +1,43 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target ssh view
+description: View a SSH deployment target
+navOrder: 70
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View a SSH deployment target in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target ssh view {<name> | <id>} [flags]
+
+Flags:
+  -w, --web   Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target ssh view 'linux-web-server'
+octopus deployment-target ssh view Machines-100
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-ssh.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-ssh.mdx
new file mode 100644
index 0000000000..fa4bd7acbc
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-ssh.mdx
@@ -0,0 +1,45 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target ssh
+description: Manage SSH deployment targets
+navOrder: 67
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage SSH deployment targets in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target ssh [command]
+
+Available Commands:
+  create Create a SSH deployment target
+  help Help about any command
+  list List SSH deployment targets
+  view View a SSH deployment target
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus deployment-target ssh [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target ssh create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target-view.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target-view.mdx
new file mode 100644
index 0000000000..a0572309b6
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target-view.mdx
@@ -0,0 +1,43 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target view
+description: View a deployment target
+navOrder: 71
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View a deployment target in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target view {<name> | <id>} [flags]
+
+Flags:
+  -w, --web   Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target view Machines-100
+octopus deployment-target view 'web-server'
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-deployment-target.mdx b/src/pages/docs/cli/_generated/octopus-deployment-target.mdx
new file mode 100644
index 0000000000..6a1005353d
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-deployment-target.mdx
@@ -0,0 +1,51 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus deployment-target
+description: Manage deployment targets
+navOrder: 45
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage deployment targets in Octopus Deploy
+
+```text
+Usage:
+  octopus deployment-target [command]
+
+Available Commands:
+  azure-web-app Manage Azure Web App deployment targets
+  cloud-region Manage Cloud Region deployment targets
+  delete Delete a deployment target
+  help Help about any command
+  kubernetes Manage Kubernetes deployment targets
+  list List deployment targets
+  listening-tentacle Manage Listening Tentacle deployment targets
+  polling-tentacle Manage Polling Tentacle deployment targets
+  ssh Manage SSH deployment targets
+  view View a deployment target
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus deployment-target [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus deployment-target list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-environment-create.mdx b/src/pages/docs/cli/_generated/octopus-environment-create.mdx
new file mode 100644
index 0000000000..6540a3487b
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-environment-create.mdx
@@ -0,0 +1,48 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus environment create
+description: Create an environment
+navOrder: 73
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a environment in Octopus Deploy
+
+```text
+Usage:
+  octopus environment create [flags]
+
+Aliases:
+  create, new
+
+Flags:
+      --allow-dynamic-infrastructure   Allow dynamic infrastructure
+  -d, --description string             Description of the environment
+  -n, --name string                    Name of the environment
+  -t, --tag stringArray                Tag to apply to environment, must use canonical name: <tag_set>/<tag_name>
+      --use-guided-failure             Use guided failure mode by default
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus environment create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-environment-delete.mdx b/src/pages/docs/cli/_generated/octopus-environment-delete.mdx
new file mode 100644
index 0000000000..6220ad3b92
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-environment-delete.mdx
@@ -0,0 +1,46 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus environment delete
+description: Delete an environment
+navOrder: 74
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Delete an environment in Octopus Deploy
+
+```text
+Usage:
+  octopus environment delete {<name> | <id>} [flags]
+
+Aliases:
+  delete, del, rm, remove
+
+Flags:
+  -y, --confirm   Don't ask for confirmation before deleting the environment.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus environment delete
+octopus environment rm
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-environment-list.mdx b/src/pages/docs/cli/_generated/octopus-environment-list.mdx
new file mode 100644
index 0000000000..6dac8df6de
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-environment-list.mdx
@@ -0,0 +1,42 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus environment list
+description: List environments
+navOrder: 75
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List environments in Octopus Deploy
+
+```text
+Usage:
+  octopus environment list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus environment list
+octopus environment ls"
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-environment-tag.mdx b/src/pages/docs/cli/_generated/octopus-environment-tag.mdx
new file mode 100644
index 0000000000..536b64da81
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-environment-tag.mdx
@@ -0,0 +1,42 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus environment tag
+description: Override tags for an environment
+navOrder: 76
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Override tags for an environment in Octopus Deploy
+
+```text
+Usage:
+  octopus environment tag [flags]
+
+Flags:
+      --environment string   Name or ID of the environment you wish to update
+  -t, --tag stringArray      Tag to apply to environment, must use canonical name: <tag_set>/<tag_name>
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus environment tag Environment-1
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-environment.mdx b/src/pages/docs/cli/_generated/octopus-environment.mdx
new file mode 100644
index 0000000000..543629483d
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-environment.mdx
@@ -0,0 +1,48 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus environment
+description: Manage environments
+navOrder: 72
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage environments in Octopus Deploy
+
+```text
+Usage:
+  octopus environment [command]
+
+Available Commands:
+  create Create an environment
+  delete Delete an environment
+  help Help about any command
+  list List environments
+  tag Override tags for an environment
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus environment [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus environment list
+octopus environment ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-ephemeral-environment-create.mdx b/src/pages/docs/cli/_generated/octopus-ephemeral-environment-create.mdx
new file mode 100644
index 0000000000..7e426d453c
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-ephemeral-environment-create.mdx
@@ -0,0 +1,45 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus ephemeral-environment create
+description: Create an ephemeral environment
+navOrder: 78
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create an ephemeral environment in Octopus Deploy
+
+```text
+Usage:
+  octopus ephemeral-environment create [flags]
+
+Aliases:
+  create, new
+
+Flags:
+  -n, --name string      Name of the environment
+  -p, --project string   Name of the project
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus ephemeral-environment create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-ephemeral-environment-deprovision-environment.mdx b/src/pages/docs/cli/_generated/octopus-ephemeral-environment-deprovision-environment.mdx
new file mode 100644
index 0000000000..a42bbf0d68
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-ephemeral-environment-deprovision-environment.mdx
@@ -0,0 +1,41 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus ephemeral-environment deprovision-environment
+description: Deprovision an environment
+navOrder: 79
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Deprovision an environment
+
+```text
+Usage:
+  octopus ephemeral-environment deprovision-environment [flags]
+
+Flags:
+  -n, --name string   Name of the environment
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus ephemeral-environment deprovision-environment --name PR-1234
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-ephemeral-environment-deprovision-project.mdx b/src/pages/docs/cli/_generated/octopus-ephemeral-environment-deprovision-project.mdx
new file mode 100644
index 0000000000..1856f33007
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-ephemeral-environment-deprovision-project.mdx
@@ -0,0 +1,42 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus ephemeral-environment deprovision-project
+description: Deprovision an ephemeral environment for a project
+navOrder: 80
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Deprovision an ephemeral environment in Octopus Deploy for a specific project
+
+```text
+Usage:
+  octopus ephemeral-environment deprovision-project [flags]
+
+Flags:
+  -n, --name string      Name of the environment
+  -p, --project string   Name of the project
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus ephemeral-environment deprovision-project
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-ephemeral-environment.mdx b/src/pages/docs/cli/_generated/octopus-ephemeral-environment.mdx
new file mode 100644
index 0000000000..5dfe7a28cc
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-ephemeral-environment.mdx
@@ -0,0 +1,46 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus ephemeral-environment
+description: Manage ephemeral environments
+navOrder: 77
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage ephemeral environments in Octopus Deploy
+
+```text
+Usage:
+  octopus ephemeral-environment [command]
+
+Available Commands:
+  create Create an ephemeral environment
+  deprovision-environment Deprovision an environment
+  deprovision-project Deprovision an ephemeral environment for a project
+  help Help about any command
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus ephemeral-environment [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus ephemeral-environment create --name "MyEphemeralEnvironment" --project "MyProject"
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-login.mdx b/src/pages/docs/cli/_generated/octopus-login.mdx
new file mode 100644
index 0000000000..914fa70a67
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-login.mdx
@@ -0,0 +1,48 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus login
+description: Login to Octopus
+navOrder: 81
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Login to your Octopus server using OpenID Connect (OIDC) or an API key. If no arguments are provided then login will be done interactively allowing creation of an API key.
+
+```text
+Usage:
+  octopus login [flags]
+
+Flags:
+      --api-key string              The API key to login with if using API keys
+      --id-token string             The ID token from your OIDC provider to login with if using OIDC
+      --ignore-ssl-errors           Whether to ignore SSL errors
+      --server string               The URL of the Octopus Server to login to
+      --service-account-id string   The ID of the service account to login with if using OIDC
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus login
+octopus login --server https://my.octopus.app --service-account-id b1a6f20f-0ec7-4e9a-938e-db800f945b37 --id-token eyJhbGciOiJQUzI1NiIs...
+octopus login --server https://my.octopus.app --api-key API-APIKEY123
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-logout.mdx b/src/pages/docs/cli/_generated/octopus-logout.mdx
new file mode 100644
index 0000000000..6463dcd5bb
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-logout.mdx
@@ -0,0 +1,28 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus logout
+description: Logout of Octopus
+navOrder: 82
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Logout of your Octopus server
+
+```text
+Usage:
+  octopus logout [flags]
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-package-delete.mdx b/src/pages/docs/cli/_generated/octopus-package-delete.mdx
new file mode 100644
index 0000000000..9249116507
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-package-delete.mdx
@@ -0,0 +1,49 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus package delete
+description: Delete a package
+navOrder: 84
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Delete a package in Octopus Deploy
+
+```text
+Usage:
+  octopus package delete {<id>} [flags]
+
+Aliases:
+  delete, del, rm, remove
+
+Flags:
+  -y, --confirm             Don't ask for confirmation before deleting the package.
+  -p, --package-id string   The Package ID of the package to delete
+  -v, --version string      The version of the package to delete
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus package delete Packages-1
+octopus package rm Packages-1
+octopus package del --package-id ThePackage --version 1.0.0
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-package-list.mdx b/src/pages/docs/cli/_generated/octopus-package-list.mdx
new file mode 100644
index 0000000000..5515416bbd
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-package-list.mdx
@@ -0,0 +1,48 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus package list
+description: List packages
+navOrder: 85
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List packages in Octopus Deploy
+
+```text
+Usage:
+  octopus package list [flags]
+
+Aliases:
+  list, ls
+
+Flags:
+  -q, --filter string   filter packages to match only ones that contain the given string
+      --limit int32     limit the maximum number of results that will be returned
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus package list
+octopus package list --limit 50 --filter SomePackage
+octopus package ls -n 30 -q SomePackage
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-package-nuget-create.mdx b/src/pages/docs/cli/_generated/octopus-package-nuget-create.mdx
new file mode 100644
index 0000000000..9849520eb5
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-package-nuget-create.mdx
@@ -0,0 +1,54 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus package nuget create
+description: Create nuget
+navOrder: 87
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create nuget package
+
+```text
+Usage:
+  octopus package nuget create [flags]
+
+Flags:
+      --id string                 The ID of the package
+  -v, --version string            The version of the package, must be a valid SemVer.
+      --base-path string          Root folder containing the contents to zip.
+      --out-folder string         Folder into which the zip file will be written.
+      --include strings           Add a file pattern to include, relative to the base path e.g. /bin/*.dll; defaults to "**".
+      --exclude strings           Add a file pattern to exclude, relative to the base path e.g. **/*.config; applied after --include.
+      --verbose                   Verbose output.
+      --overwrite                 Allow an existing package file of the same ID/version to be overwritten.
+      --author strings            Add author/s to the package metadata.
+      --title string              The title of the package.
+      --description string        A description of the package, defaults to "A deployment package created from files on disk.".
+      --releaseNotes string       Release notes for this version of the package.
+      --releaseNotesFile string   A file containing release notes for this version of the package.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus package nuget create --id SomePackage --version 1.0.0
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-package-nuget.mdx b/src/pages/docs/cli/_generated/octopus-package-nuget.mdx
new file mode 100644
index 0000000000..f5de83eb2d
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-package-nuget.mdx
@@ -0,0 +1,43 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus package nuget
+description: Package as NuPkg
+navOrder: 86
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Package as NuPkg for Octopus Deploy
+
+```text
+Usage:
+  octopus package nuget [command]
+
+Available Commands:
+  create Create nuget
+  help Help about any command
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus package nuget [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus package nuget create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-package-upload.mdx b/src/pages/docs/cli/_generated/octopus-package-upload.mdx
new file mode 100644
index 0000000000..7f40518f4b
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-package-upload.mdx
@@ -0,0 +1,54 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus package upload
+description: Upload one or more packages to Octopus Deploy
+navOrder: 88
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Upload one or more packages to Octopus Deploy. Glob patterns are supported. Delta compression is off by default.
+
+```text
+Usage:
+  octopus package upload [flags]
+
+Aliases:
+  upload, push
+
+Flags:
+  -p, --package stringArray     Package to upload, may be specified multiple times. Any arguments without flags will be treated as packages
+      --overwrite-mode string   Action when a package already exists. Valid values are 'fail', 'overwrite', 'ignore'. Default is 'fail'
+      --continue-on-error       When uploading multiple packages, controls whether the CLI continues after a failed upload. Default is to abort
+  -d, --use-delta-compression   Attempt to use delta compression when uploading. Off by default. As a recent addition to the CLI, it should be considered in beta.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus package upload --package SomePackage.1.0.0.zip
+octopus package upload SomePackage.1.0.0.tar.gz --overwrite-mode overwrite
+octopus package push SomePackage.1.0.0.zip
+octopus package upload bin/**/*.zip --continue-on-error
+octopus package upload PkgA.1.0.0.zip PkgB.2.0.0.tar.gz PkgC.1.0.0.nupkg
+octopus package upload --package SomePackage.2.0.0.zip --use-delta-compression
+octopus package upload SomePackage.2.0.0.zip --delta # alias for --use-delta-compression
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-package-versions.mdx b/src/pages/docs/cli/_generated/octopus-package-versions.mdx
new file mode 100644
index 0000000000..99f6c2099f
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-package-versions.mdx
@@ -0,0 +1,49 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus package versions
+description: List versions of a package
+navOrder: 89
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List versions of a package.
+
+```text
+Usage:
+  octopus package versions [flags]
+
+Aliases:
+  versions, show
+
+Flags:
+      --package string   package ID to show versions for. required.
+  -q, --filter string    filter packages to match only ones that contain the given string
+      --limit int32      limit the maximum number of results that will be returned
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus package versions --package SomePackage
+octopus package versions SomePackage --filter beta --limit 5
+octopus package show SomePackage -n 2
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-package-zip-create.mdx b/src/pages/docs/cli/_generated/octopus-package-zip-create.mdx
new file mode 100644
index 0000000000..b5c9c72094
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-package-zip-create.mdx
@@ -0,0 +1,49 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus package zip create
+description: Create zip
+navOrder: 91
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create zip package
+
+```text
+Usage:
+  octopus package zip create [flags]
+
+Flags:
+      --id string           The ID of the package.
+  -v, --version string      The version of the package, must be a valid SemVer.
+      --base-path string    Root folder containing the contents to zip.
+      --out-folder string   Folder into which the zip file will be written.
+      --include strings     Add a file pattern to include, relative to the base path e.g. /bin/*.dll; defaults to "**".
+      --exclude strings     Add a file pattern to exclude, relative to the base path e.g. **/*.config; applied after --include.
+      --verbose             Verbose output.
+      --overwrite           Allow an existing package file of the same ID/version to be overwritten.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus package zip create --id SomePackage --version 1.0.0
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-package-zip.mdx b/src/pages/docs/cli/_generated/octopus-package-zip.mdx
new file mode 100644
index 0000000000..a60e795002
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-package-zip.mdx
@@ -0,0 +1,43 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus package zip
+description: Package as zip
+navOrder: 90
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Package as zip for Octopus Deploy
+
+```text
+Usage:
+  octopus package zip [command]
+
+Available Commands:
+  create Create zip
+  help Help about any command
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus package zip [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus package zip create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-package.mdx b/src/pages/docs/cli/_generated/octopus-package.mdx
new file mode 100644
index 0000000000..3a1cc8f4df
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-package.mdx
@@ -0,0 +1,48 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus package
+description: Manage packages
+navOrder: 83
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage packages in Octopus Deploy
+
+```text
+Usage:
+  octopus package [command]
+
+Available Commands:
+  delete Delete a package
+  help Help about any command
+  list List packages
+  nuget Package as NuPkg
+  upload Upload one or more packages to Octopus Deploy
+  versions List versions of a package
+  zip Package as zip
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus package [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus package upload
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-branch-create.mdx b/src/pages/docs/cli/_generated/octopus-project-branch-create.mdx
new file mode 100644
index 0000000000..564e7933ee
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-branch-create.mdx
@@ -0,0 +1,48 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project branch create
+description: Create a Git branch for a project
+navOrder: 94
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a Git branch for a project in Octopus Deploy
+
+```text
+Usage:
+  octopus project branch create [flags]
+
+Aliases:
+  create, add
+
+Flags:
+      --base-branch string   The git-ref branch to create a new branch from
+  -n, --name string          The name of the branch
+  -p, --project string       The project
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project branch create
+octopus project branch create --project "Deploy Website" --name branch-name --base-branch refs/heads/main
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-branch-list.mdx b/src/pages/docs/cli/_generated/octopus-project-branch-list.mdx
new file mode 100644
index 0000000000..f1d4f526f5
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-branch-list.mdx
@@ -0,0 +1,47 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project branch list
+description: List project branches
+navOrder: 95
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List project branches in Octopus Deploy
+
+```text
+Usage:
+  octopus project branch list [flags]
+
+Aliases:
+  list, ls
+
+Flags:
+      --git-ref string   The git-ref for the Config-As-Code branch
+  -p, --project string   The project
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project branch list "Deploy Website"
+octopus project variable ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-branch.mdx b/src/pages/docs/cli/_generated/octopus-project-branch.mdx
new file mode 100644
index 0000000000..f60807e753
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-branch.mdx
@@ -0,0 +1,46 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project branch
+description: Manage project branches
+navOrder: 93
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage project branches in Octopus Deploy
+
+```text
+Usage:
+  octopus project branch [command]
+
+Available Commands:
+  create Create a Git branch for a project
+  help Help about any command
+  list List project branches
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus project branch [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project branch list "Deploy Web App"
+octopus project branch create -p "Deploy Web App" --new-branch-name add-name-variable --base-branch refs/heads/main -
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-clone.mdx b/src/pages/docs/cli/_generated/octopus-project-clone.mdx
new file mode 100644
index 0000000000..c6f6b0f8b2
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-clone.mdx
@@ -0,0 +1,48 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project clone
+description: Clone a project
+navOrder: 96
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Clone a project in Octopus Deploy
+
+```text
+Usage:
+  octopus project clone [flags]
+
+Flags:
+  -n, --name string          Name of the project
+  -d, --description string   Description of the project
+      --source string        Name of the source project
+  -g, --group string         Project group of the project
+  -l, --lifecycle string     Lifecycle of the project
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project clone
+octopus project clone --name 'New Project' --source 'Old Project'
+octopus project clone --name 'Deploy web app 2' --source 'Deploy web app' --lifecycle 'Test Only Lifecycle' --group 'Web App Project Group'
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-connect.mdx b/src/pages/docs/cli/_generated/octopus-project-connect.mdx
new file mode 100644
index 0000000000..2bf1c70191
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-connect.mdx
@@ -0,0 +1,47 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project connect
+description: Connect a tenant to a project
+navOrder: 97
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Connect a tenant to a project in Octopus Deploy
+
+```text
+Usage:
+  octopus project connect [flags]
+
+Flags:
+      --enable-tenant-deployments   Update the project to support tenanted deployments, if required
+      --env stringArray             The environments to connect to the tenant (can be specified multiple times)
+  -e, --environment stringArray     The environments to connect to the tenant (can be specified multiple times)
+  -p, --project string              Name, ID or Slug of the project to connect to the tenant
+  -t, --tenant string               Name or Id of the tenant
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project connect
+octopus project connect --tenant "Bobs Wood Shop" --project "Deploy web site" --environment "Production"
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-convert.mdx b/src/pages/docs/cli/_generated/octopus-project-convert.mdx
new file mode 100644
index 0000000000..6cd24e42d5
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-convert.mdx
@@ -0,0 +1,53 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project convert
+description: Convert a project to use Config As Code
+navOrder: 98
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Convert a project to use Config As Code in Octopus Deploy
+
+```text
+Usage:
+  octopus project convert [flags]
+
+Flags:
+      --git-base-path string                   The directory where Octopus should store the project files in the repository. Default is '.octopus/'
+      --git-branch string                      The default branch to use for Config As Code. Default is 'main'.
+      --git-credential-store string            The location to store the supplied Git credentials. Options are library or project. Default is library
+      --git-credentials string                 The Id or name of the Git credentials stored in Octopus
+      --git-initial-commit string              The initial commit message for configuring Config As Code.
+      --git-initial-commit-branch string       The branch to initially commit Config As Code settings. Only required if 'git-branch' is listed as a 'git-protected-branch-pattern'. Default value is 'octopus-vcs-conversion'.
+      --git-password string                    The password to authenticate with Git
+      --git-protected-branch-pattern strings   Git branches which are protected from having Config As Code settings committed directly
+      --git-url string                         Url of the Git repository for storing project configuration
+      --git-username string                    The username to authenticate with Git
+  -p, --project string                         Name, ID or Slug of the project to convert
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project convert
+octopus project convert --project "Deploy web site" --git-url https://github.com/orgname/reponame"
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-create.mdx b/src/pages/docs/cli/_generated/octopus-project-create.mdx
new file mode 100644
index 0000000000..1e7f5ce4d4
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-create.mdx
@@ -0,0 +1,59 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project create
+description: Create a project
+navOrder: 99
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a project in Octopus Deploy
+
+```text
+Usage:
+  octopus project create [flags]
+
+Flags:
+  -n, --name string                            Name of the project
+  -d, --description string                     Description of the project
+  -g, --group string                           Project group of the project
+  -l, --lifecycle string                       Lifecycle of the project
+      --process-vcs                            Use Config As Code for the project
+  -t, --tag stringArray                        Tag to apply to project, must use canonical name: <tag_set>/<tag_name>
+      --git-url string                         Url of the Git repository for storing project configuration
+      --git-branch string                      The default branch to use for Config As Code. Default is 'main'.
+      --git-credentials string                 The Id or name of the Git credentials stored in Octopus
+      --git-username string                    The username to authenticate with Git
+      --git-password string                    The password to authenticate with Git
+      --git-credential-store string            The location to store the supplied Git credentials. Options are library or project. Default is library
+      --git-initial-commit string              The initial commit message for configuring Config As Code.
+      --git-base-path string                   The directory where Octopus should store the project files in the repository. Default is '.octopus/'
+      --git-initial-commit-branch string       The branch to initially commit Config As Code settings. Only required if 'git-branch' is listed as a 'git-protected-branch-pattern'. Default value is 'octopus-vcs-conversion'.
+      --git-protected-branch-pattern strings   Git branches which are protected from having Config As Code settings committed directly
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project create
+octopus project create --process-vcs
+octopus project create --name 'Deploy web app' --lifecycle 'Default Lifecycle' --group 'Default Project Group'
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-delete.mdx b/src/pages/docs/cli/_generated/octopus-project-delete.mdx
new file mode 100644
index 0000000000..f32810d536
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-delete.mdx
@@ -0,0 +1,46 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project delete
+description: Delete a project
+navOrder: 100
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Delete a project in Octopus Deploy
+
+```text
+Usage:
+  octopus project delete {<name> | <id> | <slug>} [flags]
+
+Aliases:
+  delete, del, rm, remove
+
+Flags:
+  -y, --confirm   Don't ask for confirmation before deleting the project.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project delete
+octopus project rm
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-disable.mdx b/src/pages/docs/cli/_generated/octopus-project-disable.mdx
new file mode 100644
index 0000000000..f2e06002f6
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-disable.mdx
@@ -0,0 +1,37 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project disable
+description: Disable a project
+navOrder: 101
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Disable a project in Octopus Deploy
+
+```text
+Usage:
+  octopus project disable [flags]
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project disable
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-disconnect.mdx b/src/pages/docs/cli/_generated/octopus-project-disconnect.mdx
new file mode 100644
index 0000000000..ff4453422d
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-disconnect.mdx
@@ -0,0 +1,45 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project disconnect
+description: Disconnect a tenant from a project
+navOrder: 102
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Disconnect a tenant from a project in Octopus Deploy
+
+```text
+Usage:
+  octopus project disconnect [flags]
+
+Flags:
+  -y, --confirm          Don't ask for confirmation disconnecting the project.
+  -p, --project string   Name, ID or Slug of the project to connect to the tenant
+  -t, --tenant string    Name or Id of the tenant
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project disconnect
+octopus project disconnect --tenant "Test Tenant" --project "Deploy web site" --confirm
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-enable.mdx b/src/pages/docs/cli/_generated/octopus-project-enable.mdx
new file mode 100644
index 0000000000..1070577400
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-enable.mdx
@@ -0,0 +1,37 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project enable
+description: Enable a project
+navOrder: 103
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Enable a project in Octopus Deploy
+
+```text
+Usage:
+  octopus project enable [flags]
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project enable
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-group-create.mdx b/src/pages/docs/cli/_generated/octopus-project-group-create.mdx
new file mode 100644
index 0000000000..a827485f9e
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-group-create.mdx
@@ -0,0 +1,45 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project-group create
+description: Create a project group
+navOrder: 116
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a project group in Octopus Deploy
+
+```text
+Usage:
+  octopus project-group create [flags]
+
+Aliases:
+  create, new
+
+Flags:
+  -n, --name string          Name of the project group
+  -d, --description string   Description of the project group
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project-group create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-group-delete.mdx b/src/pages/docs/cli/_generated/octopus-project-group-delete.mdx
new file mode 100644
index 0000000000..ff8e9fd6d6
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-group-delete.mdx
@@ -0,0 +1,46 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project-group delete
+description: Delete a project group
+navOrder: 117
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Delete a project group in Octopus Deploy
+
+```text
+Usage:
+  octopus project-group delete {<name> | <id>} [flags]
+
+Aliases:
+  delete, del, rm, remove
+
+Flags:
+  -y, --confirm   Don't ask for confirmation before deleting the project group.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project-group delete
+octopus project-group rm
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-group-list.mdx b/src/pages/docs/cli/_generated/octopus-project-group-list.mdx
new file mode 100644
index 0000000000..7d74a4f02e
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-group-list.mdx
@@ -0,0 +1,42 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project-group list
+description: List project groups
+navOrder: 118
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List project groups in Octopus Deploy
+
+```text
+Usage:
+  octopus project-group list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project-group list
+octopus project-group ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-group-view.mdx b/src/pages/docs/cli/_generated/octopus-project-group-view.mdx
new file mode 100644
index 0000000000..bdeee1b169
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-group-view.mdx
@@ -0,0 +1,43 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project-group view
+description: View a project group
+navOrder: 119
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View a project group in Octopus Deploy
+
+```text
+Usage:
+  octopus project-group view {<name> | <id> | <slug>} [flags]
+
+Flags:
+  -w, --web   Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project-group view 'Default Project Group'
+octopus project-group view ProjectGroups-9000
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-group.mdx b/src/pages/docs/cli/_generated/octopus-project-group.mdx
new file mode 100644
index 0000000000..944217225c
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-group.mdx
@@ -0,0 +1,48 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project-group
+description: Manage project groups
+navOrder: 115
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage project groups in Octopus Deploy
+
+```text
+Usage:
+  octopus project-group [command]
+
+Available Commands:
+  create Create a project group
+  delete Delete a project group
+  help Help about any command
+  list List project groups
+  view View a project group
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus project-group [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project-group list
+octopus project-group ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-list.mdx b/src/pages/docs/cli/_generated/octopus-project-list.mdx
new file mode 100644
index 0000000000..64d9d66a1d
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-list.mdx
@@ -0,0 +1,42 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project list
+description: List projects
+navOrder: 104
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List projects in Octopus Deploy
+
+```text
+Usage:
+  octopus project list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project list
+octopus project ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-tag.mdx b/src/pages/docs/cli/_generated/octopus-project-tag.mdx
new file mode 100644
index 0000000000..266636b882
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-tag.mdx
@@ -0,0 +1,42 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project tag
+description: Override tags for a project
+navOrder: 105
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Override tags for a project in Octopus Deploy
+
+```text
+Usage:
+  octopus project tag [flags]
+
+Flags:
+      --project string    Name or ID of the project you wish to update
+  -t, --tag stringArray   Tag to apply to project, must use canonical name: <tag_set>/<tag_name>
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project tag Project-1
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-variables-create.mdx b/src/pages/docs/cli/_generated/octopus-project-variables-create.mdx
new file mode 100644
index 0000000000..f5f94ca9aa
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-variables-create.mdx
@@ -0,0 +1,66 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project variables create
+description: Create a variable for a project
+navOrder: 107
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a variable for a project in Octopus Deploy
+
+```text
+Usage:
+  octopus project variables create [flags]
+
+Aliases:
+  create, add
+
+Flags:
+      --channel-scope strings            Assign channel scopes to the variable. Multiple scopes can be supplied.
+      --environment-scope strings        Assign environment scopes to the variable. Multiple scopes can be supplied.
+      --git-ref string                   The GitRef for the Config-As-Code branch
+  -n, --name string                      The name of the variable
+      --process-scope strings            Assign process scopes to the variable. Valid scopes are 'deployment' or a runbook name. Multiple scopes can be supplied.
+  -p, --project string                   The project
+      --prompt-description string        Description for the prompted variable
+      --prompt-dropdown-option strings   Options for a dropdown prompt. May be specified multiple times. Must be in format 'value|description'
+      --prompt-label string              The label for the prompted variable
+      --prompt-required                  Prompt will require a value for deployment
+      --prompt-type string               The input type for the prompted variable. Valid values are 'text', 'multiline-text', 'checkbox' and 'dropdown'
+      --prompted                         Make a prompted variable
+      --role-scope strings               Assign role scopes to the variable. Multiple scopes can be supplied.
+      --step-scope strings               Assign process step scopes to the variable. Multiple scopes can be supplied.
+      --tag-scope strings                Assign tag scopes to the variable. Multiple scopes can be supplied.
+      --target-scope strings             Assign deployment target scopes to the variable. Multiple scopes can be supplied.
+  -t, --type string                      The type of variable. Valid values are text, sensitive, workerpool, awsaccount, azureaccount, googleaccount, certificate. Default is text
+      --value string                     The value to set on the variable
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project variable create
+octopus project variable create --project "Deploy Website" --name "variable name" --value "abc"
+octopus project variable create --name "variable name" --value "passwordABC" --type sensitive
+octopus project variable create --name "variable name" --value "abc" --scope environment='test'
+octopus project variable create --name "variable name" --value "abc" --scope environment='test' --git-ref refs/heads/main
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-variables-delete.mdx b/src/pages/docs/cli/_generated/octopus-project-variables-delete.mdx
new file mode 100644
index 0000000000..2d0a2010e2
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-variables-delete.mdx
@@ -0,0 +1,51 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project variables delete
+description: Delete a project variable
+navOrder: 108
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Delete a project variable in Octopus Deploy
+
+```text
+Usage:
+  octopus project variables delete {<name>} [flags]
+
+Aliases:
+  delete, del, rm, remove
+
+Flags:
+  -y, --confirm          Don't ask for confirmation before deleting the project variable.
+      --git-ref string   The GitRef for the Config-As-Code branch
+      --id string        The id of the specific variable value to delete
+  -n, --name string      The name of the variable
+  -p, --project string   The project
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project variable delete --name "variable Name" --project "Deploy Site" 
+octopus project variable delete --name "variable Name" --id 26a58596-4cd9-e072-7215-7e15cb796dd2 --project "Deploy Site" --confirm 
+octopus project variable delete --name "variable Name" --project "Deploy Site" --git-ref "refs/heads/main"
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-variables-exclude.mdx b/src/pages/docs/cli/_generated/octopus-project-variables-exclude.mdx
new file mode 100644
index 0000000000..e00e8e8777
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-variables-exclude.mdx
@@ -0,0 +1,44 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project variables exclude
+description: Exclude a variable set from a project
+navOrder: 109
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Exclude a variable set from a project in Octopus Deploy
+
+```text
+Usage:
+  octopus project variables exclude [flags]
+
+Flags:
+  -p, --project string             The project
+      --variable-set stringArray   The name of the library variable set
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project variable exclude
+octopus project variable exclude --variable-set "Slack Variables"
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-variables-include.mdx b/src/pages/docs/cli/_generated/octopus-project-variables-include.mdx
new file mode 100644
index 0000000000..62b0e3ab59
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-variables-include.mdx
@@ -0,0 +1,44 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project variables include
+description: Include a variable set in a project
+navOrder: 110
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Include a variable set in a project in Octopus Deploy
+
+```text
+Usage:
+  octopus project variables include [flags]
+
+Flags:
+  -p, --project string             The project
+      --variable-set stringArray   The name of the library variable set
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project variable include
+octopus project variable include --variable-set "Slack Variables"
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-variables-list.mdx b/src/pages/docs/cli/_generated/octopus-project-variables-list.mdx
new file mode 100644
index 0000000000..fec99c5160
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-variables-list.mdx
@@ -0,0 +1,48 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project variables list
+description: List project variables
+navOrder: 111
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List project variables in Octopus Deploy
+
+```text
+Usage:
+  octopus project variables list [flags]
+
+Aliases:
+  list, ls
+
+Flags:
+      --git-ref string   The GitRef for the Config-As-Code branch
+  -p, --project string   The project
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project variable list "Deploy Website"
+octopus project variable list -p "Deploy Website" --git-ref refs/heads/main
+octopus project variable ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-variables-update.mdx b/src/pages/docs/cli/_generated/octopus-project-variables-update.mdx
new file mode 100644
index 0000000000..4c40fc424a
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-variables-update.mdx
@@ -0,0 +1,59 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project variables update
+description: Update the value of a project variable
+navOrder: 112
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Update the value of a project variable in Octopus Deploy
+
+```text
+Usage:
+  octopus project variables update [flags]
+
+Flags:
+      --channel-scope strings       Assign channel scopes to the variable. Multiple scopes can be supplied.
+      --environment-scope strings   Assign environment scopes to the variable. Multiple scopes can be supplied.
+      --git-ref string              The GitRef for the Config-As-Code branch
+      --id string                   The variable id to update
+  -n, --name string                 The name of the variable
+      --process-scope strings       Assign process scopes to the variable. Valid scopes are 'deployment' or a runbook name. Multiple scopes can be supplied.
+  -p, --project string              The project
+      --role-scope strings          Assign role scopes to the variable. Multiple scopes can be supplied.
+      --step-scope strings          Assign process step scopes to the variable. Multiple scopes can be supplied.
+      --tag-scope strings           Assign tag scopes to the variable. Multiple scopes can be supplied.
+      --target-scope strings        Assign deployment target scopes to the variable. Multiple scopes can be supplied.
+      --unscoped                    Remove all shared from the variable, cannot be used with shared
+      --value string                The value to set on the variable
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project variable update
+octopus project variable update --name "variable name" --value "abc"
+octopus project variable update --name "variable name" --value "password"
+octopus project variable update --name "variable name" --unscoped
+octopus project variable update --name "variable name" --environment-scope test
+octopus project variable update -p "Deploy Website" --name "variable name" --value "updated" --git-ref refs/heads/main
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-variables-view.mdx b/src/pages/docs/cli/_generated/octopus-project-variables-view.mdx
new file mode 100644
index 0000000000..9f3f838ba4
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-variables-view.mdx
@@ -0,0 +1,48 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project variables view
+description: View all values of a project variable
+navOrder: 113
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View all values of a project variable in Octopus Deploy
+
+```text
+Usage:
+  octopus project variables view [flags]
+
+Aliases:
+  view, ls
+
+Flags:
+      --id string        The Id of the specifically scoped variable
+  -p, --project string   The project containing the variable
+  -w, --web              Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project variable view
+octopus project variable view DatabaseName --project "Vet Clinic"
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-variables.mdx b/src/pages/docs/cli/_generated/octopus-project-variables.mdx
new file mode 100644
index 0000000000..964368546f
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-variables.mdx
@@ -0,0 +1,55 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project variables
+description: Manage project variables
+navOrder: 106
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage project variables in Octopus Deploy
+
+```text
+Usage:
+  octopus project variables [command]
+
+Aliases:
+  variables, variable
+
+Available Commands:
+  create Create a variable for a project
+  delete Delete a project variable
+  exclude Exclude a variable set from a project
+  help Help about any command
+  include Include a variable set in a project
+  list List project variables
+  update Update the value of a project variable
+  view View all values of a project variable
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus project variables [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project variable list "Deploy Web App"
+octopus project variable view --name "DatabaseName" --project Deploy
+octopus project variable update
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project-view.mdx b/src/pages/docs/cli/_generated/octopus-project-view.mdx
new file mode 100644
index 0000000000..6dc3ab0e4d
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project-view.mdx
@@ -0,0 +1,44 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project view
+description: View a project
+navOrder: 114
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View a project in Octopus Deploy
+
+```text
+Usage:
+  octopus project view {<name> | <id> | <slug>} [flags]
+
+Flags:
+  -w, --web   Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project view 'Deploy Web App'
+octopus project view Projects-9000
+octopus project view deploy-web-app
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-project.mdx b/src/pages/docs/cli/_generated/octopus-project.mdx
new file mode 100644
index 0000000000..5368318922
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-project.mdx
@@ -0,0 +1,60 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus project
+description: Manage projects
+navOrder: 92
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage projects in Octopus Deploy
+
+```text
+Usage:
+  octopus project [command]
+
+Aliases:
+  project, proj
+
+Available Commands:
+  branch Manage project branches
+  clone Clone a project
+  connect Connect a tenant to a project
+  convert Convert a project to use Config As Code
+  create Create a project
+  delete Delete a project
+  disable Disable a project
+  disconnect Disconnect a tenant from a project
+  enable Enable a project
+  help Help about any command
+  list List projects
+  tag Override tags for a project
+  variables Manage project variables
+  view View a project
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus project [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus project list
+octopus project ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-release-create.mdx b/src/pages/docs/cli/_generated/octopus-release-create.mdx
new file mode 100644
index 0000000000..cabca11e02
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-release-create.mdx
@@ -0,0 +1,65 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus release create
+description: Create a release
+navOrder: 121
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a release in Octopus Deploy
+
+```text
+Usage:
+  octopus release create [flags]
+
+Flags:
+  -p, --project string              Name or ID of the project to create the release in
+  -c, --channel string              Name or ID of the channel to use
+  -r, --git-ref string              Git Reference e.g. refs/heads/main. Only relevant for config-as-code projects
+      --git-commit string           Git Commit Hash; Specify this in addition to Git Reference if you want to reference a commit other than the latest for that branch/tag.
+      --package-version string      Default version to use for all Packages
+      --release-notes string        Release notes to attach
+      --release-notes-file string   Release notes to attach (from file)
+  -v, --version string              Override the Release Version
+  -x, --ignore-existing             If a release with the same version exists, do nothing instead of failing.
+      --ignore-channel-rules        Allow creation of a release where channel rules would otherwise prevent it.
+      --package stringArray         Version specification for a specific package. You may specify this multiple times.
+                                    Format as {package}:{version}, {step}:{version} or {package-ref-name}:{packageOrStep}:{version}
+                                    If the package ID or step name contains a colon, slash, or equals sign (such as Maven coordinates like com.example:my-artifact), escape that character with a backslash:
+                                        --package "com.example\:my-artifact:1.0"
+                                    This escape syntax requires Octopus CLI 2.21.2 or later and Octopus Server 2025.4.10680 or later.
+      --git-resource stringArray    Git reference for a specific Git resource.
+                                    Format as {step}:{git-ref}, {step}:{git-resource-name}:{git-ref}
+                                    You may specify this multiple times
+      --custom-field stringArray    Custom field value to set on the release.
+                                    Format as {name}:{value}. You may specify multiple times
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus release create --project MyProject --channel Beta --version 1.2.3
+octopus release create -p MyProject -c Beta -v 1.2.3
+octopus release create -p MyProject -c default --package "utils:1.2.3" --package "utils:InstallOnly:5.6.7"
+octopus release create -p MyProject --package "com.example\:my-artifact:1.0"
+octopus release create -p MyProject -c Beta --no-prompt
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-release-delete.mdx b/src/pages/docs/cli/_generated/octopus-release-delete.mdx
new file mode 100644
index 0000000000..57f480cc4c
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-release-delete.mdx
@@ -0,0 +1,48 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus release delete
+description: Delete a release
+navOrder: 122
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Delete a release in Octopus Deploy
+
+```text
+Usage:
+  octopus release delete [flags]
+
+Aliases:
+  delete, del, rm
+
+Flags:
+  -p, --project string        Name or ID of the project to delete releases in
+  -v, --version stringArray   Release version to delete, can be specified multiple times
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus release delete myProject 2.0
+octopus release delete --project myProject --version 2.0
+octopus release rm "Other Project" -v 2.0
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-release-deploy.mdx b/src/pages/docs/cli/_generated/octopus-release-deploy.mdx
new file mode 100644
index 0000000000..9ae5ca3eab
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-release-deploy.mdx
@@ -0,0 +1,62 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-25
+title: octopus release deploy
+description: Deploy releases
+navOrder: 123
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Deploy releases in Octopus Deploy
+
+```text
+Usage:
+  octopus release deploy [flags]
+
+Flags:
+  -p, --project string                             Name or ID of the project to deploy the release from
+      --version string                             Release version to deploy
+  -e, --environment stringArray                    Deploy to this environment (can be specified multiple times)
+      --tenant stringArray                         Deploy to this tenant (can be specified multiple times)
+      --tenant-tag stringArray                     Deploy to tenants matching this tag (can be specified multiple times). Format is 'Tag Set Name/Tag Name', such as 'Regions/South'.
+      --deploy-at string                           Deploy at a later time. Deploy now if omitted. TODO date formats and timezones!
+      --deploy-at-expiry string                    Cancel the deployment if it hasn't started within this time period.
+  -v, --variable stringArray                       Set the value for a prompted variable in the format Label:Value
+      --update-variables                           Overwrite the release variable snapshot by re-importing variables from the project.
+      --skip stringArray                           Exclude specific steps from the deployment
+      --guided-failure string                      Enable Guided failure mode (true/false/default)
+      --priority string                            Jump the task queue ahead of other queued tasks (true/false/default). Requires the Priority Tasks feature, and the TaskPrioritize permission to set true.
+      --force-package-download                     Force re-download of packages
+      --deployment-target stringArray              Deploy to this target (can be specified multiple times)
+      --exclude-deployment-target stringArray      Deploy to targets except for this (can be specified multiple times)
+      --deployment-freeze-name stringArray         Override this deployment freeze (can be specified multiple times)
+      --deployment-freeze-override-reason string   Reason for overriding a deployment freeze
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus release deploy  # fully interactive
+octopus release deploy --project MyProject --version 1.0 --environment Dev
+octopus release deploy --project MyProject --version 1.0 --tenant-tag Regions/East --tenant-tag Regions/South
+octopus release deploy -p MyProject --version 1.0 -e Dev --skip InstallStep --variable VarName:VarValue
+octopus release deploy -p MyProject --version 1.0 -e Dev --force-package-download --guided-failure true -f basic
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-release-list.mdx b/src/pages/docs/cli/_generated/octopus-release-list.mdx
new file mode 100644
index 0000000000..802043e7a3
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-release-list.mdx
@@ -0,0 +1,47 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus release list
+description: List releases
+navOrder: 124
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List releases in Octopus Deploy
+
+```text
+Usage:
+  octopus release list [flags]
+
+Aliases:
+  list, ls
+
+Flags:
+  -p, --project string   Name or ID of the project to list releases for
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus release list myProject
+octopus release ls "Other Project"
+octopus release list --project myProject
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-release-progression-allow.mdx b/src/pages/docs/cli/_generated/octopus-release-progression-allow.mdx
new file mode 100644
index 0000000000..047476a3ce
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-release-progression-allow.mdx
@@ -0,0 +1,48 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus release progression allow
+description: Allows a release to progress to the next phase.
+navOrder: 126
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Allows a release to progress to the next phase in Octopus Deploy.
+
+```text
+Usage:
+  octopus release progression allow [flags]
+
+Aliases:
+  allow, allow-releaseprogression
+
+Flags:
+  -p, --project string   Name or ID of the project.
+  -v, --version string   Release version/number.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus release progression allow --project MyProject --version 1.2.3
+octopus release progression allow -p MyProject -v 1.2.3
+octopus release progression allow -p MyProject -v 1.2.3 --no-prompt
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-release-progression-prevent.mdx b/src/pages/docs/cli/_generated/octopus-release-progression-prevent.mdx
new file mode 100644
index 0000000000..85ab72fbf4
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-release-progression-prevent.mdx
@@ -0,0 +1,49 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus release progression prevent
+description: Prevents a release from progression to the next phase
+navOrder: 127
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Prevents a release from progression to the next phase in Octopus Deploy
+
+```text
+Usage:
+  octopus release progression prevent [flags]
+
+Aliases:
+  prevent, prevent-releaseprogression
+
+Flags:
+  -p, --project string   Name or ID of the project.
+  -v, --version string   Release version/number.
+  -r, --reason string    Reason to prevent this release from progressing to the next phase.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus release progression prevent --project MyProject --version 1.2.3 --reason "It's broken"
+octopus release progression prevent -p MyProject -v 1.2.3 -r "It's broken"
+octopus release progression prevent -p MyProject -v 1.2.3 -r "It's broken" --no-prompt
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-release-progression.mdx b/src/pages/docs/cli/_generated/octopus-release-progression.mdx
new file mode 100644
index 0000000000..3fa164d3b1
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-release-progression.mdx
@@ -0,0 +1,46 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus release progression
+description: Manage progression of a release
+navOrder: 125
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage progression of a release in Octopus Deploy
+
+```text
+Usage:
+  octopus release progression [command]
+
+Available Commands:
+  allow Allows a release to progress to the next phase.
+  help Help about any command
+  prevent Prevents a release from progression to the next phase
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus release progression [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus release progression prevent
+octopus release progression allow
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-release.mdx b/src/pages/docs/cli/_generated/octopus-release.mdx
new file mode 100644
index 0000000000..2dfd314060
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-release.mdx
@@ -0,0 +1,47 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus release
+description: Manage releases
+navOrder: 120
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage releases in Octopus Deploy
+
+```text
+Usage:
+  octopus release [command]
+
+Available Commands:
+  create Create a release
+  delete Delete a release
+  deploy Deploy releases
+  help Help about any command
+  list List releases
+  progression Manage progression of a release
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus release [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus release list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-runbook-delete.mdx b/src/pages/docs/cli/_generated/octopus-runbook-delete.mdx
new file mode 100644
index 0000000000..40a4b0e84a
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-runbook-delete.mdx
@@ -0,0 +1,49 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus runbook delete
+description: Delete a runbook
+navOrder: 129
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Delete a runbook in Octopus Deploy
+
+```text
+Usage:
+  octopus runbook delete {<name> | <id>} [flags]
+
+Aliases:
+  delete, del, rm, remove
+
+Flags:
+  -y, --confirm          Don't ask for confirmation before deleting the runbook.
+      --git-ref string   Git reference to delete runbook for e.g. refs/heads/main. Only relevant for config-as-code projects where runbooks are stored in Git.
+  -p, --project string   Name or ID of the project to delete a runbook from
+  -r, --runbook string   Name or ID of the runbook to delete
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus runbook delete
+octopus runbook rm
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-runbook-list.mdx b/src/pages/docs/cli/_generated/octopus-runbook-list.mdx
new file mode 100644
index 0000000000..b359197f2b
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-runbook-list.mdx
@@ -0,0 +1,50 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus runbook list
+description: List runbooks
+navOrder: 130
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List runbooks in Octopus Deploy
+
+```text
+Usage:
+  octopus runbook list [flags]
+
+Aliases:
+  list, ls
+
+Flags:
+  -q, --filter string    filter runbooks to match only ones with a name containing the given string
+      --git-ref string   Git reference to list runbooks for e.g. refs/heads/main. Only relevant for config-as-code projects where runbooks are stored in Git.
+      --limit int32      limit the maximum number of results that will be returned
+  -p, --project string   Name or ID of the project to list runbooks for
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus runbook list SomeProject
+octopus runbook list --project SomeProject --limit 50 --filter SomeKeyword
+octopus runbook ls -p SomeProject -n 30 -q SomeKeyword
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-runbook-run.mdx b/src/pages/docs/cli/_generated/octopus-runbook-run.mdx
new file mode 100644
index 0000000000..8041cb816f
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-runbook-run.mdx
@@ -0,0 +1,68 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-25
+title: octopus runbook run
+description: Run runbooks in Octopus Deploy
+navOrder: 131
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Run runbooks in Octopus Deploy
+
+```text
+Usage:
+  octopus runbook run [flags]
+
+Flags:
+  -p, --project string                   Name or ID of the project to run the runbook from
+  -n, --name string                      Name of the runbook to run
+      --runbook-tag stringArray          Run all runbooks matching this tag (can be specified multiple times). Format is 'Tag Set Name/Tag Name'. Mutually exclusive with --name.
+  -e, --environment stringArray          Run in this environment (can be specified multiple times)
+      --tenant stringArray               Run for this tenant (can be specified multiple times)
+      --tenant-tag stringArray           Run for tenants matching this tag (can be specified multiple times). Format is 'Tag Set Name/Tag Name', such as 'Regions/South'.
+      --run-at string                    Run at a later time. Run now if omitted. TODO date formats and timezones!
+      --run-at-expiry string             Cancel a scheduled run if it hasn't started within this time period.
+  -v, --variable stringArray             Set the value for a prompted variable in the format Label:Value
+      --snapshot string                  Name or ID of the snapshot to run. If not supplied, the command will attempt to use the published snapshot.
+      --skip stringArray                 Exclude specific steps from the runbook
+      --guided-failure string            Enable Guided failure mode (true/false/default)
+      --priority string                  Jump the task queue ahead of other queued tasks (true/false/default). Requires the Priority Tasks feature. For runbook runs, 'default' is the same as 'false'.
+      --force-package-download           Force re-download of packages
+      --run-target stringArray           Run on this target (can be specified multiple times)
+      --exclude-run-target stringArray   Run on targets except for this (can be specified multiple times)
+      --git-ref string                   Git Reference e.g. refs/heads/main. Only relevant for config-as-code projects where runbooks are stored in Git.
+      --package-version string           Default version to use for all packages. Only relevant for config-as-code projects where runbooks are stored in Git.
+      --package stringArray              Version specification for a specific package.
+                                         Format as {package}:{version}, {step}:{version} or {package-ref-name}:{packageOrStep}:{version}
+                                         You may specify this multiple times.
+                                         Only relevant for config-as-code projects where runbooks are stored in Git.
+      --git-resource stringArray         Git reference for a specific Git resource.
+                                         Format as {step}:{git-ref}, {step}:{git-resource-name}:{git-ref}
+                                         You may specify this multiple times.
+                                         Only relevant for config-as-code projects where runbooks are stored in Git.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus runbook run  # fully interactive
+octopus runbook run --project MyProject --runbook "Rebuild DB indexes"
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-runbook-snapshot-create.mdx b/src/pages/docs/cli/_generated/octopus-runbook-snapshot-create.mdx
new file mode 100644
index 0000000000..013d21d3e0
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-runbook-snapshot-create.mdx
@@ -0,0 +1,61 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus runbook snapshot create
+description: Create a runbook snapshot
+navOrder: 133
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a runbook snapshot in Octopus Deploy
+
+```text
+Usage:
+  octopus runbook snapshot create [flags]
+
+Aliases:
+  create, new
+
+Flags:
+      --git-resource stringArray     Git reference for a specific Git resource.
+                                     Format as {step}:{git-ref}, {step}:{git-resource-name}:{git-ref}
+                                     You may specify this multiple times.
+                                     Only relevant for config-as-code projects where runbooks are stored in Git.
+  -n, --name string                  Override the snapshot name
+      --package stringArray          Version specification a specific packages.
+                                     Format as {package}:{version}, {step}:{version} or {package-ref-name}:{packageOrStep}:{version}
+                                     You may specify this multiple times
+      --package-version string       Default version to use for all packages. Only relevant for config-as-code projects where runbooks are stored in Git.
+  -p, --project string               Name or ID of the project where the runbook is
+      --publish                      Publish the snapshot immediately
+  -r, --runbook string               Name or ID of the runbook to create the snapshot for
+      --snapshot-notes string        Release notes to attach
+      --snapshot-notes-file string   Release notes to attach (from file)
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus runbook snapshot create --project MyProject --runbook "Rebuild DB Indexes"
+octopus runbook snapshot create --project MyProject --runbook "Rebuild DB Indexes" --name "My cool snapshot"
+octopus runbook snapshot create -p MyProject -r "Restart App" --package "azure-cli:1.2.3" --no-prompt
+octopus runbook snapshot create -p MyProject -r "Restart App" --git-resource "Script step from Git:refs/heads/dev-branch" --publish --no-prompt
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-runbook-snapshot-list.mdx b/src/pages/docs/cli/_generated/octopus-runbook-snapshot-list.mdx
new file mode 100644
index 0000000000..37ffa14313
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-runbook-snapshot-list.mdx
@@ -0,0 +1,48 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus runbook snapshot list
+description: List runbook snapshots
+navOrder: 134
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List runbook snapshots in Octopus Deploy
+
+```text
+Usage:
+  octopus runbook snapshot list [flags]
+
+Aliases:
+  list, ls
+
+Flags:
+      --limit int32      Limit the maximum number of results that will be returned (default 2147483647)
+  -p, --project string   Name or ID of the project to list runbook snapshots for
+  -r, --runbook string   Name or ID of the runbook to list snapshots for
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus runbook snapshot list --project "Deploy Web App" --runbook "Run maintenance"
+octopus runbook snapshot ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-runbook-snapshot-publish.mdx b/src/pages/docs/cli/_generated/octopus-runbook-snapshot-publish.mdx
new file mode 100644
index 0000000000..33f1277211
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-runbook-snapshot-publish.mdx
@@ -0,0 +1,44 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus runbook snapshot publish
+description: Publish a runbook snapshot
+navOrder: 135
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Publish a runbook snapshot in Octopus Deploy
+
+```text
+Usage:
+  octopus runbook snapshot publish [flags]
+
+Flags:
+  -p, --project string    Name or ID of the project where the runbook is
+  -r, --runbook string    Name or ID of the runbook to publish an existing snapshot
+      --snapshot string   Name or ID of the snapshot to publish
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus runbook snapshot publish --project MyProject --runbook "Rebuild DB Indexes" --snapshot "Snapshot 40C9ENM"
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-runbook-snapshot.mdx b/src/pages/docs/cli/_generated/octopus-runbook-snapshot.mdx
new file mode 100644
index 0000000000..c517271245
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-runbook-snapshot.mdx
@@ -0,0 +1,47 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus runbook snapshot
+description: Manage runbook snapshots
+navOrder: 132
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage runbook snapshots in Octopus Deploy
+
+```text
+Usage:
+  octopus runbook snapshot [command]
+
+Available Commands:
+  create Create a runbook snapshot
+  help Help about any command
+  list List runbook snapshots
+  publish Publish a runbook snapshot
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus runbook snapshot [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus runbook snapshot create
+octopus runbook snapshot list
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-runbook.mdx b/src/pages/docs/cli/_generated/octopus-runbook.mdx
new file mode 100644
index 0000000000..b287fbc4f1
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-runbook.mdx
@@ -0,0 +1,48 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus runbook
+description: Manage runbooks
+navOrder: 128
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage runbooks in Octopus Deploy
+
+```text
+Usage:
+  octopus runbook [command]
+
+Available Commands:
+  delete Delete a runbook
+  help Help about any command
+  list List runbooks
+  run Run runbooks in Octopus Deploy
+  snapshot Manage runbook snapshots
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus runbook [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus runbook list
+octopus runbook run
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-space-create.mdx b/src/pages/docs/cli/_generated/octopus-space-create.mdx
new file mode 100644
index 0000000000..9203f27b4c
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-space-create.mdx
@@ -0,0 +1,47 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus space create
+description: Create a space
+navOrder: 137
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a space in Octopus Deploy
+
+```text
+Usage:
+  octopus space create [flags]
+
+Aliases:
+  create, new
+
+Flags:
+  -d, --description string   Description of the space
+  -n, --name string          Name of the space
+  -t, --team stringArray     The teams to manage the space (can be specified multiple times)
+  -u, --user stringArray     The users to manage the space (can be specified multiple times)
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus space create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-space-delete.mdx b/src/pages/docs/cli/_generated/octopus-space-delete.mdx
new file mode 100644
index 0000000000..2de678a0c2
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-space-delete.mdx
@@ -0,0 +1,46 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus space delete
+description: Delete a space
+navOrder: 138
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Delete a space in Octopus Deploy
+
+```text
+Usage:
+  octopus space delete {<name> | <id>} [flags]
+
+Aliases:
+  delete, del, rm, remove
+
+Flags:
+  -y, --confirm   Don't ask for confirmation before deleting the space.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus space delete
+octopus space rm
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-space-list.mdx b/src/pages/docs/cli/_generated/octopus-space-list.mdx
new file mode 100644
index 0000000000..c8080250a0
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-space-list.mdx
@@ -0,0 +1,40 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus space list
+description: List spaces
+navOrder: 139
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List spaces in Octopus Deploy
+
+```text
+Usage:
+  octopus space list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus space list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-space-view.mdx b/src/pages/docs/cli/_generated/octopus-space-view.mdx
new file mode 100644
index 0000000000..b9a00a2e13
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-space-view.mdx
@@ -0,0 +1,39 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus space view
+description: View a space
+navOrder: 140
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View a space in Octopus Deploy
+
+```text
+Usage:
+  octopus space view {<name> | <id>} [flags]
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus space view 'Pattern - Blue-Green'
+octopus space view Spaces-302
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-space.mdx b/src/pages/docs/cli/_generated/octopus-space.mdx
new file mode 100644
index 0000000000..bb663470a9
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-space.mdx
@@ -0,0 +1,48 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus space
+description: Manage spaces
+navOrder: 136
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage spaces in Octopus Deploy
+
+```text
+Usage:
+  octopus space [command]
+
+Available Commands:
+  create Create a space
+  delete Delete a space
+  help Help about any command
+  list List spaces
+  view View a space
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus space [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus space list
+octopus space view Spaces-302
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-task-wait.mdx b/src/pages/docs/cli/_generated/octopus-task-wait.mdx
new file mode 100644
index 0000000000..e66eb0ddb9
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-task-wait.mdx
@@ -0,0 +1,44 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus task wait
+description: Wait for task(s) to finish
+navOrder: 142
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Wait for a provided list of task(s) to finish
+
+```text
+Usage:
+  octopus task wait [TaskIDs] [flags]
+
+Flags:
+      --cancel-on-timeout   Cancel the tasks if the wait timeout is reached
+      --poll-interval int   Polling interval in seconds to check task status during wait (default 10)
+      --progress            Show detailed progress of the tasks
+      --timeout int         Time in seconds to wait for the tasks to complete (default 600)
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus task wait
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-task.mdx b/src/pages/docs/cli/_generated/octopus-task.mdx
new file mode 100644
index 0000000000..a251e8932f
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-task.mdx
@@ -0,0 +1,34 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus task
+description: Manage tasks
+navOrder: 141
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage tasks in Octopus Deploy
+
+```text
+Usage:
+  octopus task [command]
+
+Available Commands:
+  help Help about any command
+  wait Wait for task(s) to finish
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus task [command] --help" for more information about a command.
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-tenant-clone.mdx b/src/pages/docs/cli/_generated/octopus-tenant-clone.mdx
new file mode 100644
index 0000000000..5dea35841f
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-tenant-clone.mdx
@@ -0,0 +1,45 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus tenant clone
+description: Clone a tenant
+navOrder: 144
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Clone a tenant in Octopus Deploy
+
+```text
+Usage:
+  octopus tenant clone [flags]
+
+Flags:
+  -d, --description string     Description of the new tenant
+  -n, --name string            Name of the new tenant
+      --source-tenant string   Name of the source tenant
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus tenant clone
+octopus tenant clone --name "Gary's Cakes" --source-tenant "Bob's Wood Shop" 
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-tenant-connect.mdx b/src/pages/docs/cli/_generated/octopus-tenant-connect.mdx
new file mode 100644
index 0000000000..24d9ae986d
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-tenant-connect.mdx
@@ -0,0 +1,47 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus tenant connect
+description: Connect a tenant to a project
+navOrder: 145
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Connect a tenant to a project in Octopus Deploy
+
+```text
+Usage:
+  octopus tenant connect [flags]
+
+Flags:
+      --enable-tenant-deployments   Update the project to support tenanted deployments, if required
+      --env stringArray             The environments to connect to the tenant (can be specified multiple times)
+  -e, --environment stringArray     The environments to connect to the tenant (can be specified multiple times)
+  -p, --project string              Name, ID or Slug of the project to connect to the tenant
+  -t, --tenant string               Name or Id of the tenant
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus tenant connect
+octopus tenant connect --tenant "Bobs Wood Shop" --project "Deploy web site" --environment "Production"
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-tenant-create.mdx b/src/pages/docs/cli/_generated/octopus-tenant-create.mdx
new file mode 100644
index 0000000000..3bf802a70b
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-tenant-create.mdx
@@ -0,0 +1,46 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus tenant create
+description: Create a tenant
+navOrder: 146
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a tenant in Octopus Deploy
+
+```text
+Usage:
+  octopus tenant create [flags]
+
+Aliases:
+  create, new
+
+Flags:
+  -d, --description string   Description of the tenant
+  -n, --name string          Name of the tenant
+  -t, --tag stringArray      Tag to apply to tenant, must use canonical name: <tag_set>/<tag_name>
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus tenant create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-tenant-delete.mdx b/src/pages/docs/cli/_generated/octopus-tenant-delete.mdx
new file mode 100644
index 0000000000..60e342b9a5
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-tenant-delete.mdx
@@ -0,0 +1,46 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus tenant delete
+description: Delete a tenant
+navOrder: 147
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Delete a tenant in Octopus Deploy
+
+```text
+Usage:
+  octopus tenant delete {<name> | <id>} [flags]
+
+Aliases:
+  delete, del, rm, remove
+
+Flags:
+  -y, --confirm   Don't ask for confirmation before deleting the tenant.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus tenant delete
+octopus tenant rm
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-tenant-disable.mdx b/src/pages/docs/cli/_generated/octopus-tenant-disable.mdx
new file mode 100644
index 0000000000..cfaf63b1dd
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-tenant-disable.mdx
@@ -0,0 +1,39 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus tenant disable
+description: Disable a tenant
+navOrder: 148
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Disable a tenant in Octopus Deploy
+
+```text
+Usage:
+  octopus tenant disable {<name> | <id>} [flags]
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus tenant disable Tenants-1
+octopus tenant disable 'Tenant'
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-tenant-disconnect.mdx b/src/pages/docs/cli/_generated/octopus-tenant-disconnect.mdx
new file mode 100644
index 0000000000..36917f9e1c
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-tenant-disconnect.mdx
@@ -0,0 +1,45 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus tenant disconnect
+description: Disconnect a tenant from a project
+navOrder: 149
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Disconnect a tenant from a project in Octopus Deploy
+
+```text
+Usage:
+  octopus tenant disconnect [flags]
+
+Flags:
+  -y, --confirm          Don't ask for confirmation disconnecting the project.
+  -p, --project string   Name, ID or Slug of the project to connect to the tenant
+  -t, --tenant string    Name or Id of the tenant
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus tenant disconnect
+octopus tenant disconnect --tenant "Test Tenant" --project "Deploy web site" --confirm
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-tenant-enable.mdx b/src/pages/docs/cli/_generated/octopus-tenant-enable.mdx
new file mode 100644
index 0000000000..7226637591
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-tenant-enable.mdx
@@ -0,0 +1,39 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus tenant enable
+description: Enable a tenant
+navOrder: 150
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Enable a tenant in Octopus Deploy
+
+```text
+Usage:
+  octopus tenant enable {<name> | <id>} [flags]
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus tenant enable Tenants-1
+octopus tenant enable 'Tenant'
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-tenant-list.mdx b/src/pages/docs/cli/_generated/octopus-tenant-list.mdx
new file mode 100644
index 0000000000..6da23e1c26
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-tenant-list.mdx
@@ -0,0 +1,42 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus tenant list
+description: List tenants
+navOrder: 151
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List tenants in Octopus Deploy
+
+```text
+Usage:
+  octopus tenant list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus tenant list
+octopus tenant ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-tenant-tag.mdx b/src/pages/docs/cli/_generated/octopus-tenant-tag.mdx
new file mode 100644
index 0000000000..8a72b9c3e4
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-tenant-tag.mdx
@@ -0,0 +1,42 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus tenant tag
+description: Override tags for a tenant
+navOrder: 152
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Override tags for a tenant in Octopus Deploy
+
+```text
+Usage:
+  octopus tenant tag [flags]
+
+Flags:
+  -t, --tag stringArray   Tag to apply to tenant, must use canonical name: <tag_set>/<tag_name>
+      --tenant string     Name or ID of the tenant you wish to update
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus tenant tag Tenant-1
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-tenant-variables-list.mdx b/src/pages/docs/cli/_generated/octopus-tenant-variables-list.mdx
new file mode 100644
index 0000000000..fb14e4c835
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-tenant-variables-list.mdx
@@ -0,0 +1,47 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus tenant variables list
+description: List tenant variables
+navOrder: 154
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List tenant variables in Octopus Deploy
+
+```text
+Usage:
+  octopus tenant variables list [<name> | <id>] [flags]
+
+Aliases:
+  list, ls
+
+Flags:
+  -t, --tenant string   The tenant
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus tenant variables list "Bobs Wood Shop"
+octopus tenant variables list --tenant "Bobs Wood Shop"
+octopus tenant variables ls Tenant-123
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-tenant-variables-update.mdx b/src/pages/docs/cli/_generated/octopus-tenant-variables-update.mdx
new file mode 100644
index 0000000000..1884bd98eb
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-tenant-variables-update.mdx
@@ -0,0 +1,49 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus tenant variables update
+description: Update the value of a tenant variable
+navOrder: 155
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Update the value of a tenant variable in Octopus Deploy
+
+```text
+Usage:
+  octopus tenant variables update [flags]
+
+Flags:
+      --environment strings           Assign environment scopes to the variable. Multiple scopes can be supplied.
+  -l, --library-variable-set string   The library variable set
+  -n, --name string                   The name of the variable
+  -p, --project string                The project
+  -t, --tenant string                 The tenant
+      --value string                  The value to set on the variable
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus tenant variables update
+octopus tenant variables update --tenant "Bobs Fish Shack" --name "site-name" --value "Bob's Fish Shack" --project "Awesome Web Site" --environment "Test"
+octopus tenant variables update --tenant "Sally's Tackle Truck" --name dbPassword --value "12345" --library-variable-set "Shared Variables"
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-tenant-variables.mdx b/src/pages/docs/cli/_generated/octopus-tenant-variables.mdx
new file mode 100644
index 0000000000..a060de7a93
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-tenant-variables.mdx
@@ -0,0 +1,49 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus tenant variables
+description: Manage tenant variables
+navOrder: 153
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage tenant variables in Octopus Deploy
+
+```text
+Usage:
+  octopus tenant variables [command]
+
+Aliases:
+  variables, variable
+
+Available Commands:
+  help Help about any command
+  list List tenant variables
+  update Update the value of a tenant variable
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus tenant variables [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus tenant variables list "Bobs Wood Shop"
+octopus tenant variables update --tenant "Bobs Fish Shack" --name "site-name" --value "Bob's Fish Shack" --project "Awesome Web Site" --environment "Test"
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-tenant-view.mdx b/src/pages/docs/cli/_generated/octopus-tenant-view.mdx
new file mode 100644
index 0000000000..1c1c6abf28
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-tenant-view.mdx
@@ -0,0 +1,45 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus tenant view
+description: View a tenant
+navOrder: 156
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View a tenant in Octopus Deploy
+
+```text
+Usage:
+  octopus tenant view [<name> | <id>] [flags]
+
+Flags:
+  -t, --tenant string   The tenant
+  -w, --web             Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus tenant view Tenants-1
+octopus tenant view 'Tenant'
+octopus tenant view --tenant 'Tenant'
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-tenant.mdx b/src/pages/docs/cli/_generated/octopus-tenant.mdx
new file mode 100644
index 0000000000..fb1b29a2d5
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-tenant.mdx
@@ -0,0 +1,55 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus tenant
+description: Manage tenants
+navOrder: 143
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage tenants in Octopus Deploy
+
+```text
+Usage:
+  octopus tenant [command]
+
+Available Commands:
+  clone Clone a tenant
+  connect Connect a tenant to a project
+  create Create a tenant
+  delete Delete a tenant
+  disable Disable a tenant
+  disconnect Disconnect a tenant from a project
+  enable Enable a tenant
+  help Help about any command
+  list List tenants
+  tag Override tags for a tenant
+  variables Manage tenant variables
+  view View a tenant
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus tenant [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus tenant list
+octopus tenant ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-user-delete.mdx b/src/pages/docs/cli/_generated/octopus-user-delete.mdx
new file mode 100644
index 0000000000..b87424ef8f
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-user-delete.mdx
@@ -0,0 +1,46 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus user delete
+description: Delete a user
+navOrder: 158
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Delete a user in Octopus Deploy
+
+```text
+Usage:
+  octopus user delete {<name> | <id>} [flags]
+
+Aliases:
+  delete, del, rm, remove
+
+Flags:
+  -y, --confirm   Don't ask for confirmation before deleting the user.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus user delete some-user-name
+octopus user rm Users-123
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-user-list.mdx b/src/pages/docs/cli/_generated/octopus-user-list.mdx
new file mode 100644
index 0000000000..056b3d4bdb
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-user-list.mdx
@@ -0,0 +1,42 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus user list
+description: List users
+navOrder: 159
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List users in Octopus Deploy
+
+```text
+Usage:
+  octopus user list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus user list
+octopus user ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-user.mdx b/src/pages/docs/cli/_generated/octopus-user.mdx
new file mode 100644
index 0000000000..5c523a7d2e
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-user.mdx
@@ -0,0 +1,46 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus user
+description: Manage users
+navOrder: 157
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage user in Octopus Deploy
+
+```text
+Usage:
+  octopus user [command]
+
+Available Commands:
+  delete Delete a user
+  help Help about any command
+  list List users
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus user [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus user list
+octopus user ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-delete.mdx b/src/pages/docs/cli/_generated/octopus-worker-delete.mdx
new file mode 100644
index 0000000000..65d3f60bc9
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-delete.mdx
@@ -0,0 +1,46 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker delete
+description: Delete a worker
+navOrder: 161
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Delete a worker in Octopus Deploy
+
+```text
+Usage:
+  octopus worker delete {<name> | <id>} [flags]
+
+Aliases:
+  delete, del, rm, remove
+
+Flags:
+  -y, --confirm   Don't ask for confirmation before deleting the worker.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker delete
+octopus worker rm
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-list.mdx b/src/pages/docs/cli/_generated/octopus-worker-list.mdx
new file mode 100644
index 0000000000..9f5047114e
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-list.mdx
@@ -0,0 +1,40 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker list
+description: List workers
+navOrder: 162
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List workers in Octopus Deploy
+
+```text
+Usage:
+  octopus worker list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-listening-tentacle-create.mdx b/src/pages/docs/cli/_generated/octopus-worker-listening-tentacle-create.mdx
new file mode 100644
index 0000000000..288b8a09d6
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-listening-tentacle-create.mdx
@@ -0,0 +1,48 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker listening-tentacle create
+description: Create a listening tentacle worker
+navOrder: 164
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a listening tentacle worker in Octopus Deploy
+
+```text
+Usage:
+  octopus worker listening-tentacle create [flags]
+
+Flags:
+      --machine-policy string   The machine policy for the deployment target to use, only required if not using the Default Machine Policy
+  -n, --name string             A short, memorable, unique name for this Listening Tentacle worker.
+      --proxy string            Select whether to use a proxy to connect to this Listening Tentacle. If omitted, will connect directly.
+      --thumbprint string       The X509 certificate thumbprint that securely identifies the Tentacle.
+      --url string              The network address at which the Listening Tentacle can be reached.
+  -w, --web                     Open in web browser
+      --worker-pool strings     The pools of which the worker will be a member.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker listening-tentacle create
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-listening-tentacle-list.mdx b/src/pages/docs/cli/_generated/octopus-worker-listening-tentacle-list.mdx
new file mode 100644
index 0000000000..d397ad78b9
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-listening-tentacle-list.mdx
@@ -0,0 +1,41 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker listening-tentacle list
+description: List Listening Tentacle workers
+navOrder: 165
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List Listening Tentacle workers in Octopus Deploy
+
+```text
+Usage:
+  octopus worker listening-tentacle list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker listening-tentacle list
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-listening-tentacle-view.mdx b/src/pages/docs/cli/_generated/octopus-worker-listening-tentacle-view.mdx
new file mode 100644
index 0000000000..fd610d6f75
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-listening-tentacle-view.mdx
@@ -0,0 +1,43 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker listening-tentacle view
+description: View a Listening Tentacle worker
+navOrder: 166
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View a Listening Tentacle worker in Octopus Deploy
+
+```text
+Usage:
+  octopus worker listening-tentacle view {<name> | <id>} [flags]
+
+Flags:
+  -w, --web   Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker listening-tentacle view 'WindowsWorker'
+octopus worker listening-tentacle view Machines-100
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-listening-tentacle.mdx b/src/pages/docs/cli/_generated/octopus-worker-listening-tentacle.mdx
new file mode 100644
index 0000000000..ae51aa6756
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-listening-tentacle.mdx
@@ -0,0 +1,45 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker listening-tentacle
+description: Manage Listening Tentacle workers
+navOrder: 163
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage Listening Tentacle workers in Octopus Deploy
+
+```text
+Usage:
+  octopus worker listening-tentacle [command]
+
+Available Commands:
+  create Create a listening tentacle worker
+  help Help about any command
+  list List Listening Tentacle workers
+  view View a Listening Tentacle worker
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus worker listening-tentacle [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker listening-tentacle list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-polling-tentacle-list.mdx b/src/pages/docs/cli/_generated/octopus-worker-polling-tentacle-list.mdx
new file mode 100644
index 0000000000..1b3adc9913
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-polling-tentacle-list.mdx
@@ -0,0 +1,40 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker polling-tentacle list
+description: List Polling Tentacle workers
+navOrder: 168
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List Polling Tentacle workers in Octopus Deploy
+
+```text
+Usage:
+  octopus worker polling-tentacle list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker polling-tentacle list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-polling-tentacle-view.mdx b/src/pages/docs/cli/_generated/octopus-worker-polling-tentacle-view.mdx
new file mode 100644
index 0000000000..de5ad5f41d
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-polling-tentacle-view.mdx
@@ -0,0 +1,43 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker polling-tentacle view
+description: View a Polling Tentacle worker
+navOrder: 169
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View a Polling Tentacle worker in Octopus Deploy
+
+```text
+Usage:
+  octopus worker polling-tentacle view {<name> | <id>} [flags]
+
+Flags:
+  -w, --web   Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker polling-tentacle view 'WindowsWorker'
+octopus worker polling-tentacle view Machines-100
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-polling-tentacle.mdx b/src/pages/docs/cli/_generated/octopus-worker-polling-tentacle.mdx
new file mode 100644
index 0000000000..603a3fbdb3
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-polling-tentacle.mdx
@@ -0,0 +1,44 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker polling-tentacle
+description: Manage Polling Tentacle workers
+navOrder: 167
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage Polling Tentacle workers in Octopus Deploy
+
+```text
+Usage:
+  octopus worker polling-tentacle [command]
+
+Available Commands:
+  help Help about any command
+  list List Polling Tentacle workers
+  view View a Polling Tentacle worker
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus worker polling-tentacle [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker polling-tentacle list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-pool-delete.mdx b/src/pages/docs/cli/_generated/octopus-worker-pool-delete.mdx
new file mode 100644
index 0000000000..001bf50943
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-pool-delete.mdx
@@ -0,0 +1,46 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker-pool delete
+description: Delete a worker pool
+navOrder: 176
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Delete a worker pool in Octopus Deploy
+
+```text
+Usage:
+  octopus worker-pool delete {<name> | <id>} [flags]
+
+Aliases:
+  delete, del, rm, remove
+
+Flags:
+  -y, --confirm   Don't ask for confirmation before deleting the worker pool.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker-pool delete
+octopus worker-pool rm
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-pool-dynamic-create.mdx b/src/pages/docs/cli/_generated/octopus-worker-pool-dynamic-create.mdx
new file mode 100644
index 0000000000..a6feb6a54f
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-pool-dynamic-create.mdx
@@ -0,0 +1,45 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker-pool dynamic create
+description: Create a dynamic worker pool
+navOrder: 178
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a dynamic worker pool in Octopus Deploy
+
+```text
+Usage:
+  octopus worker-pool dynamic create [flags]
+
+Flags:
+      --description string   Description of the worker pool.
+  -n, --name string          A short, memorable, unique name for this worker pool.
+  -w, --web                  Open in web browser
+      --worker-type string   The worker type to use for all leased workers.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker-pool dynamic create
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-pool-dynamic-view.mdx b/src/pages/docs/cli/_generated/octopus-worker-pool-dynamic-view.mdx
new file mode 100644
index 0000000000..e2e7d1fb7d
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-pool-dynamic-view.mdx
@@ -0,0 +1,43 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker-pool dynamic view
+description: View a dynamic worker pool
+navOrder: 179
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View a dynamic worker pool in Octopus Deploy
+
+```text
+Usage:
+  octopus worker-pool dynamic view {<name> | <id>} [flags]
+
+Flags:
+  -w, --web   Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker-pool dynamic view WorkerPools-3
+octopus worker-pool dynamic view 'Hosted Workers'
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-pool-dynamic.mdx b/src/pages/docs/cli/_generated/octopus-worker-pool-dynamic.mdx
new file mode 100644
index 0000000000..2bfc9cf87b
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-pool-dynamic.mdx
@@ -0,0 +1,44 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker-pool dynamic
+description: Manage dynamic worker pools
+navOrder: 177
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage dynamic worker pools in Octopus Deploy
+
+```text
+Usage:
+  octopus worker-pool dynamic [command]
+
+Available Commands:
+  create Create a dynamic worker pool
+  help Help about any command
+  view View a dynamic worker pool
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus worker-pool dynamic [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker-pool dynamic view
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-pool-list.mdx b/src/pages/docs/cli/_generated/octopus-worker-pool-list.mdx
new file mode 100644
index 0000000000..4dd801dd5e
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-pool-list.mdx
@@ -0,0 +1,40 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker-pool list
+description: List worker pools
+navOrder: 180
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List worker pools in Octopus Deploy
+
+```text
+Usage:
+  octopus worker-pool list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker-pool list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-pool-static-create.mdx b/src/pages/docs/cli/_generated/octopus-worker-pool-static-create.mdx
new file mode 100644
index 0000000000..af5dd35637
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-pool-static-create.mdx
@@ -0,0 +1,44 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker-pool static create
+description: Create a static worker pool
+navOrder: 182
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a static worker pool in Octopus Deploy
+
+```text
+Usage:
+  octopus worker-pool static create [flags]
+
+Flags:
+      --description string   Description of the worker pool.
+  -n, --name string          A short, memorable, unique name for this worker pool.
+  -w, --web                  Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker-pool static create
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-pool-static-view.mdx b/src/pages/docs/cli/_generated/octopus-worker-pool-static-view.mdx
new file mode 100644
index 0000000000..b23ac2aa7c
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-pool-static-view.mdx
@@ -0,0 +1,43 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker-pool static view
+description: View a static worker pool
+navOrder: 183
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View a static worker pool in Octopus Deploy
+
+```text
+Usage:
+  octopus worker-pool static view {<name> | <id>} [flags]
+
+Flags:
+  -w, --web   Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker-pool static view WorkerPools-3
+octopus worker-pool static view 'windows workers'
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-pool-static.mdx b/src/pages/docs/cli/_generated/octopus-worker-pool-static.mdx
new file mode 100644
index 0000000000..65ad67318d
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-pool-static.mdx
@@ -0,0 +1,44 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker-pool static
+description: Manage static worker pools
+navOrder: 181
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage static worker pools in Octopus Deploy
+
+```text
+Usage:
+  octopus worker-pool static [command]
+
+Available Commands:
+  create Create a static worker pool
+  help Help about any command
+  view View a static worker pool
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus worker-pool static [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker-pool static view
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-pool-view.mdx b/src/pages/docs/cli/_generated/octopus-worker-pool-view.mdx
new file mode 100644
index 0000000000..c12d619a9d
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-pool-view.mdx
@@ -0,0 +1,43 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker-pool view
+description: View a worker pool
+navOrder: 184
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View a worker pool in Octopus Deploy
+
+```text
+Usage:
+  octopus worker-pool view {<name> | <id>} [flags]
+
+Flags:
+  -w, --web   Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker-pool view WorkerPools-3
+octopus worker-pool view 'linux workers'
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-pool.mdx b/src/pages/docs/cli/_generated/octopus-worker-pool.mdx
new file mode 100644
index 0000000000..7366f4d12f
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-pool.mdx
@@ -0,0 +1,49 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker-pool
+description: Manage worker pools
+navOrder: 175
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage worker pools in Octopus Deploy
+
+```text
+Usage:
+  octopus worker-pool [command]
+
+Available Commands:
+  delete Delete a worker pool
+  dynamic Manage dynamic worker pools
+  help Help about any command
+  list List worker pools
+  static Manage static worker pools
+  view View a worker pool
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus worker-pool [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker-pool list
+octopus worker-pool ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-ssh-create.mdx b/src/pages/docs/cli/_generated/octopus-worker-ssh-create.mdx
new file mode 100644
index 0000000000..6b0ae23f90
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-ssh-create.mdx
@@ -0,0 +1,51 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker ssh create
+description: Create a SSH worker
+navOrder: 171
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Create a SSH worker in Octopus Deploy
+
+```text
+Usage:
+  octopus worker ssh create [flags]
+
+Flags:
+      --account string          The name or ID of the SSH key pair or username/password account
+      --fingerprint string      The host fingerprint of the worker.
+      --host string             The hostname or IP address of the worker to connect to.
+      --machine-policy string   The machine policy for the deployment target to use, only required if not using the Default Machine Policy
+  -n, --name string             A short, memorable, unique name for this worker.
+      --platform string         The platform to use for the self-contained Calamari. Options are 'linux-x64', 'linux-arm64', 'linux-arm' or 'osx-x64'
+      --port int                The port to connect to the worker on.
+      --proxy string            Select whether to use a proxy to connect to this SSH worker. If omitted, will connect directly.
+      --runtime string          The runtime to use to run Calamari on the worker. Options are 'self-contained' or 'mono'
+  -w, --web                     Open in web browser
+      --worker-pool strings     The pools of which the worker will be a member.
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker ssh create
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-ssh-list.mdx b/src/pages/docs/cli/_generated/octopus-worker-ssh-list.mdx
new file mode 100644
index 0000000000..0b0f089421
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-ssh-list.mdx
@@ -0,0 +1,40 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker ssh list
+description: List SSH workers
+navOrder: 172
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+List SSH workers in Octopus Deploy
+
+```text
+Usage:
+  octopus worker ssh list [flags]
+
+Aliases:
+  list, ls
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker ssh list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-ssh-view.mdx b/src/pages/docs/cli/_generated/octopus-worker-ssh-view.mdx
new file mode 100644
index 0000000000..35646b7fa3
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-ssh-view.mdx
@@ -0,0 +1,43 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker ssh view
+description: View a SSH worker
+navOrder: 173
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View a SSH worker in Octopus Deploy
+
+```text
+Usage:
+  octopus worker ssh view {<name> | <id>} [flags]
+
+Flags:
+  -w, --web   Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker ssh view 'linux-worker'
+octopus worker ssh view Machines-100
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-ssh.mdx b/src/pages/docs/cli/_generated/octopus-worker-ssh.mdx
new file mode 100644
index 0000000000..bfded4b629
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-ssh.mdx
@@ -0,0 +1,45 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker ssh
+description: Manage SSH workers
+navOrder: 170
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage SSH workers in Octopus Deploy
+
+```text
+Usage:
+  octopus worker ssh [command]
+
+Available Commands:
+  create Create a SSH worker
+  help Help about any command
+  list List SSH workers
+  view View a SSH worker
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus worker ssh [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker SSH list
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker-view.mdx b/src/pages/docs/cli/_generated/octopus-worker-view.mdx
new file mode 100644
index 0000000000..6f09802ba2
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker-view.mdx
@@ -0,0 +1,43 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker view
+description: View a worker
+navOrder: 174
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+View a worker in Octopus Deploy
+
+```text
+Usage:
+  octopus worker view {<name> | <id>} [flags]
+
+Flags:
+  -w, --web   Open in web browser
+
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker view Machines-100
+octopus worker view 'worker'
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus-worker.mdx b/src/pages/docs/cli/_generated/octopus-worker.mdx
new file mode 100644
index 0000000000..423a96e111
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus-worker.mdx
@@ -0,0 +1,50 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-08-20
+title: octopus worker
+description: Manage workers
+navOrder: 160
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Manage workers in Octopus Deploy
+
+```text
+Usage:
+  octopus worker [command]
+
+Available Commands:
+  delete Delete a worker
+  help Help about any command
+  list List workers
+  listening-tentacle Manage Listening Tentacle workers
+  polling-tentacle Manage Polling Tentacle workers
+  ssh Manage SSH workers
+  view View a worker
+
+Global Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+
+
+Use "octopus worker [command] --help" for more information about a command.
+```
+
+## Examples
+
+<SamplesInstance />
+
+```bash
+octopus worker list
+octopus worker ls
+
+
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/_generated/octopus.mdx b/src/pages/docs/cli/_generated/octopus.mdx
new file mode 100644
index 0000000000..429c4becfd
--- /dev/null
+++ b/src/pages/docs/cli/_generated/octopus.mdx
@@ -0,0 +1,56 @@
+---
+layout: src/layouts/Cli.astro
+pubDate: 2023-01-01
+modDate: 2026-04-19
+title: octopus
+description: Octopus Deploy CLI
+navOrder: 0
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+Work seamlessly with Octopus Deploy from the command line.
+
+```text
+Usage:
+  octopus <command> [flags]
+  octopus [command]
+
+Available Commands:
+  account Manage accounts
+  api Execute a raw API GET request
+  build-information Manage build information
+  channel Manage channels
+  config Manage CLI configuration
+  deployment-target Manage deployment targets
+  environment Manage environments
+  ephemeral-environment Manage ephemeral environments
+  help Help about any command
+  login Login to Octopus
+  logout Logout of Octopus
+  package Manage packages
+  project Manage projects
+  project-group Manage project groups
+  release Manage releases
+  runbook Manage runbooks
+  space Manage spaces
+  task Manage tasks
+  tenant Manage tenants
+  user Manage users
+  worker Manage workers
+  worker-pool Manage worker pools
+
+Flags:
+  -h, --help                   Show help for a command
+      --no-prompt              Disable prompting in interactive mode
+  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
+  -s, --space string           Specify the space for operations
+  -v, --version                Prints version information
+
+
+Use "octopus [command] --help" for more information about a command.
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/index.mdx b/src/pages/docs/cli/index.mdx
new file mode 100644
index 0000000000..86a019d953
--- /dev/null
+++ b/src/pages/docs/cli/index.mdx
@@ -0,0 +1,26 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2026-08-31
+title: Octopus CLI
+navTitle: Overview
+crumbTitle: CLI
+description: The all-new Octopus CLI
+navOrder: 1
+hideInThisSection: true
+---
+import CliCommands from 'src/shared-content/cli/commands.include.md';
+
+The Octopus CLI is a command line tool that builds on top of the [Octopus Deploy REST API](/docs/octopus-rest-api). With the Octopus CLI you can push your application packages for deployment as either Zip or NuGet packages, and manage your environments, deployments, projects, and workers.
+
+The Octopus CLI can be used on Windows, Mac, Linux and Docker. For installation options and direct downloads, visit the [CLI Readme](https://github.com/OctopusDeploy/cli/blob/main/README.md).
+
+:::div{.hint}
+The Octopus CLI is built and maintained by the Octopus Deploy team, but it is also open source. You can [view the Octopus CLI project on GitHub](https://github.com/OctopusDeploy/cli), which leans heavily on the [go-octopusdeploy library](https://github.com/OctopusDeploy/go-octopusdeploy).
+:::
+
+## Commands \{#octopusCommandLine-Commands}
+
+`octopus` supports the following commands:
+
+<CliCommands />
diff --git a/src/pages/docs/cli/octopus-cli/allow-releaseprogression.mdx b/src/pages/docs/cli/octopus-cli/allow-releaseprogression.mdx
new file mode 100644
index 0000000000..fdca51cb3a
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/allow-releaseprogression.mdx
@@ -0,0 +1,93 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Allow release progression
+description: Allows a release to progress to next phase
+navOrder: 100
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to allow a release to progress to next phase.
+
+```text
+Allows a release to progress to the next phase.
+
+Usage: octo allow-releaseprogression [<options>]
+
+Where [<options>] is any of:
+
+Allowing release progression:
+
+      --project=VALUE        Name or ID of the project.
+      --version, --releaseNumber=VALUE
+                             Release version/number.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic example
+
+<SamplesInstance />
+
+This example removes the [prevent progression](/docs/releases/prevent-release-progression) flag from a release, allowing it to proceed to the next environment.
+
+```bash
+octo allow-releaseprogression --project="Octo Pet Shop" --releaseNumber="2020.08.03.82" --space="Target - Hybrid" --server="https://samples.octopus.app" --apiKey="MyApiKey"
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/octopus-cli/build-information.mdx b/src/pages/docs/cli/octopus-cli/build-information.mdx
new file mode 100644
index 0000000000..528d7fb403
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/build-information.mdx
@@ -0,0 +1,120 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Build information
+description: Pushes build information to Octopus Server.
+navOrder: 100
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to push build information to the Octopus Server.
+
+```text
+Pushes build information to Octopus Server.
+
+Usage: octo build-information [<options>]
+
+Where [<options>] is any of:
+
+Build information pushing:
+
+      --package-id=VALUE     The ID of the package. Specify multiple packages
+                             by specifying this argument multiple times:
+                             --package-id 'MyCompany.MyApp' --package-id
+                             'MyCompany.MyApp2'.
+      --version=VALUE        The version of the package; defaults to a
+                             timestamp-based version.
+      --file=VALUE           Octopus Build Information Json file.
+      --overwrite-mode=VALUE Determines behavior if the package already
+                             exists in the repository. Valid values are
+                             FailIfExists, OverwriteExisting and
+                             IgnoreIfExists. Default is FailIfExists.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic Example
+
+<SamplesInstance />
+
+This example uploads [build information](/docs/packaging-applications/build-servers/build-information) contained in buildInfo.json to Octopus Deploy for the specified package and version.
+
+```json
+{
+  "BuildEnvironment":"BitBucket",
+  "Branch":"main",
+  "BuildNumber":"288",
+  "BuildUrl":"https://bitbucket.org/octopussamples/petclinic/addon/pipelines/home#!/results/288",
+  "VcsType":"Git",
+  "VcsRoot":"http://bitbucket.org/octopussamples/petclinic",
+  "VcsCommitNumber":"314cf2c3ee916c92a384c2796a6abe332d678e4f",
+  "Commits":[
+      {
+         "Id":"314cf2c3ee916c92a384c2796a6abe332d678e4f",
+         "Comment":"PET-1 - test runbook with 0.15.0 of pipe"
+      }
+   ]
+}
+```
+
+```bash
+octo build-information --package-id="PetClinic.web" --version="1.0.200803.1002" --file="buildInfo.json" --server="http://samples.octopus.app" --apiKey="API-MyKey" --space="Target - Wildfly"
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
+- [Build information](/docs/packaging-applications/build-servers/build-information)
diff --git a/src/pages/docs/cli/octopus-cli/clean-environment.md b/src/pages/docs/cli/octopus-cli/clean-environment.md
new file mode 100644
index 0000000000..4beb355db8
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/clean-environment.md
@@ -0,0 +1,107 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Clean environments
+description: Using the Octopus CLI to delete/remove machines with a particular status from environments on your Octopus instance.
+navOrder: 100
+---
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to delete/remove machines with a particular status from environments on your Octopus instance.
+
+This is most useful when your environments can have temporary/ephemeral machines. The best example of this is in virtualized or cloud environments where new machines are created and destroyed frequently.
+
+```text
+Cleans all Offline Machines from an Environment.
+
+Usage: octo clean-environment [<options>]
+
+Where [<options>] is any of:
+
+Cleanup:
+
+      --environment=VALUE    Name of an environment to clean up.
+      --status=VALUE         Status of Machines clean up (Online, Offline,
+                             Unknown, NeedsUpgrade, CalamariNeedsUpgrade,
+                             Disabled). Can be specified many times.
+      --health-status, --healthStatus=VALUE
+                             Health status of Machines to clean up (Healthy,
+                             Unavailable, Unknown, HasWarnings, Unhealthy).
+                             Can be specified many times.
+      --disabled=VALUE       [Optional] Disabled status filter of Machine to
+                             clean up.
+      --calamari-outdated=VALUE
+                             [Optional] State of Calamari to clean up. By
+                             default ignores Calamari state.
+      --tentacle-outdated=VALUE
+                             [Optional] State of Tentacle version to clean u-
+                             p. By default, ignores Tentacle state.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic example {#Cleaningenvironments-Basicexample}
+
+The following command cleans any *offline* machines from the Production environment:
+
+```bash
+octo clean-environment --environment Production --status Offline --server http://MyOctopusServerURL.com --apikey MyAPIKey
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
+- [Environments](/docs/infrastructure/environments)
+- [Automatically clean up environments](/docs/deployments/patterns/elastic-and-transient-environments/cleaning-up-environments)
diff --git a/src/pages/docs/cli/octopus-cli/clean-workerpool.mdx b/src/pages/docs/cli/octopus-cli/clean-workerpool.mdx
new file mode 100644
index 0000000000..29d7b8ee40
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/clean-workerpool.mdx
@@ -0,0 +1,115 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Clean Worker pool
+description: Cleans all Offline Workers from a Worker Pool
+navOrder: 100
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to clean all offline Workers from a Worker pool.
+
+```text
+Cleans all Offline Workers from a WorkerPool.
+
+Usage: octo clean-workerpool [<options>]
+
+Where [<options>] is any of:
+
+WorkerPool Cleanup:
+
+      --workerPool=VALUE     Name of a worker pool to clean up.
+      --health-status=VALUE  Health status of Workers to clean up. Valid
+                             values are Healthy, Unavailable, Unknown,
+                             HasWarnings and Unhealthy. Can be specified many
+                             times.
+      --disabled=VALUE       [Optional] Disabled status filter of Worker to
+                             clean up.
+      --calamari-outdated=VALUE
+                             [Optional] State of Calamari to clean up. By
+                             default ignores Calamari state.
+      --tentacle-outdated=VALUE
+                             [Optional] State of Tentacle version to clean u-
+                             p. By default, ignores Tentacle state.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic examples
+
+<SamplesInstance />
+
+This example cleans all workers in the Default Worker Pool which have a health-status of `Unhealthy` in the `Pattern - Rolling` space:
+
+```bash
+octo clean-workerpool --workerPool="Default Worker Pool" --health-status="Unhealthy" --space="Pattern - Rolling" --server="https://samples.octopus.app/" --apiKey="MyApiKey"
+```
+
+This example cleans all workers from the Default Worker Pool where they are disabled and have one of the following health-status values:
+
+- `Healthy`
+- `Unhealthy`
+- `Unknown`
+
+```bash
+octo clean-workerpool --workerPool="Default Worker Pool" --health-status="Healthy" --health-status="Unhealthy" --health-status="Unknown" --disabled=True --space="Pattern - Rolling" --server="https://samples.octopus.app/" --apiKey="MyApiKey"
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
+- [Workers](/docs/infrastructure/workers)
+- [Worker Pools](/docs/infrastructure/workers/worker-pools)
diff --git a/src/pages/docs/cli/octopus-cli/complete.md b/src/pages/docs/cli/octopus-cli/complete.md
new file mode 100644
index 0000000000..269967ebee
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/complete.md
@@ -0,0 +1,51 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Complete
+description: Supports command line auto completion.
+navOrder: 100
+---
+
+Supports command line auto-completion.
+
+**complete options**
+
+```text
+Supports command line auto completion.
+
+Usage: octo complete <command> [<options>]
+
+Where <command> is the current command line to filter auto-completions.
+
+Where [<options>] is any of:
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+```
+
+## Basic example
+
+This example displays supported commands that start with `list`:
+
+```bash
+octo complete list
+```
+
+This returns the following results:
+
+```text
+list-deployments
+list-environments
+list-latestdeployments
+list-machines
+list-projects
+list-releases
+list-tenants
+list-workerpools
+list-workers
+```
diff --git a/src/pages/docs/cli/octopus-cli/create-autodeployoverride.md b/src/pages/docs/cli/octopus-cli/create-autodeployoverride.md
new file mode 100644
index 0000000000..ceb1cc693a
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/create-autodeployoverride.md
@@ -0,0 +1,119 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2024-06-25
+title: Create auto deployment overrides in Octopus
+navTitle: Create auto deployment override
+description: Using the Octopus CLI to create automatic deployment release overrides.
+navOrder: 100
+---
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to create automatic deployment release overrides.
+
+```text
+Overrides the release that auto deploy will use.
+
+Usage: octo create-autodeployoverride [<options>]
+
+Where [<options>] is any of:
+
+Auto deploy release override:
+
+      --project=VALUE        Name of the project.
+      --environment=VALUE    Name of an environment the override will apply
+                             to. Specify this argument multiple times to add
+                             multiple environments.
+      --version, --releaseNumber=VALUE
+                             Release number to use for auto deployments.
+      --tenant=VALUE         [Optional] Name of a tenant the override will
+                             apply to. Specify this argument multiple times
+                             to add multiple tenants or use `*` wildcard for
+                             all tenants.
+      --tenantTag=VALUE      [Optional] A tenant tag used to match tenants
+                             that the override will apply to. Specify this
+                             argument multiple times to add multiple tenant
+                             tags
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic example
+
+The following creates an automatic deployment release override for version 1.3.0 of the project *HelloWorld* to the environment Development:
+
+```bash
+octo create-autodeployoverride --project HelloWorld --environment Development --version 1.3.0 --server https://your-octopus-url --apikey API-YOUR-KEY
+```
+
+## Tenanted example (by name)
+
+The following creates an automatic deployment release override for version 1.3.0 of the project *HelloWorld* to the environment Development for the tenant *Acme*:
+
+```bash
+octo create-autodeployoverride --project HelloWorld --environment Development --tenant Acme --version 1.3.0 --server https://your-octopus-url --apikey API-YOUR-KEY
+```
+
+## Tenanted example (by tags)
+
+The following creates an automatic deployment release override for version 1.3.0 of the project *HelloWorld* to the environment Development for all tenants with the *Hosting/Cloud* tag:
+
+```bash
+octo create-autodeployoverride --project HelloWorld --environment Development --tenanttag Hosting/Cloud --version 1.3.0 --server https://your-octopus-url --apikey API-YOUR-KEY
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
+- [Automatic deployments](/docs/projects/project-triggers/deployment-target-triggers)
diff --git a/src/pages/docs/cli/octopus-cli/create-channel.md b/src/pages/docs/cli/octopus-cli/create-channel.md
new file mode 100644
index 0000000000..f078eea37c
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/create-channel.md
@@ -0,0 +1,103 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Create channel
+description: Using the Octopus CLI to create channels.
+navOrder: 100
+---
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to create channels on your Octopus instance.
+
+```text
+Creates a channel for a project.
+
+Usage: octo create-channel [<options>]
+
+Where [<options>] is any of:
+
+Create:
+
+      --project=VALUE        The name of the project in which to create the
+                             channel.
+      --channel=VALUE        The name of the channel to create.
+      --description=VALUE    [Optional] A description of the channel.
+      --lifecycle=VALUE      [Optional] if specified, the name of the
+                             lifecycle to use for promoting releases through
+                             this channel, otherwise this channel will
+                             inherit the project lifecycle.
+      --make-default-channel [Optional, Flag] if specified, set the new
+                             channel to be the default channel replacing any
+                             existing default channel.
+      --update-existing      [Optional, Flag] if specified, updates the
+                             matching channel if it already exists, otherwise
+                             this command will fail if a matching channel
+                             already exists.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic example {#Creatingchannels-Basicexample}
+
+The following command creates a channel in *MyProject* called *Experimental* using the *Test Only* lifecycle instead:
+
+```bash
+octo create-channel --project MyProject --name Experimental --lifecycle "Test Only" --server http://MyOctopusServerURL.com --apikey MyAPIKey
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
+- [Channels](/docs/releases/channels)
diff --git a/src/pages/docs/cli/octopus-cli/create-environment.md b/src/pages/docs/cli/octopus-cli/create-environment.md
new file mode 100644
index 0000000000..09c9786c41
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/create-environment.md
@@ -0,0 +1,91 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Create environment
+description: Using the Octopus CLI to create environments.
+navOrder: 100
+---
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to create environments on your Octopus instance.
+
+```text
+Creates a deployment environment.
+
+Usage: octo create-environment [<options>]
+
+Where [<options>] is any of:
+
+Environment creation:
+
+      --name=VALUE           The name of the environment.
+      --ignoreIfExists       If the environment already exists, an error will
+                             be returned. Set this flag to ignore the error.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic example {#Creatingenvironments-Basicexample}
+
+The following command creates an environment called UAT:
+
+```bash
+octo create-environment --name UAT --server http://MyOctopusServerURL.com --apikey MyAPIKey
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
+- [Environments](/docs/infrastructure/environments)
diff --git a/src/pages/docs/cli/octopus-cli/create-project.md b/src/pages/docs/cli/octopus-cli/create-project.md
new file mode 100644
index 0000000000..ce349e851e
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/create-project.md
@@ -0,0 +1,96 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Create project
+description: Using the Octopus CLI to create projects.
+navOrder: 100
+---
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to create a project inside a project group.
+
+```text
+Creates a project.
+
+Usage: octo create-project [<options>]
+
+Where [<options>] is any of:
+
+Project creation:
+
+      --name=VALUE           The name of the project.
+      --projectGroup=VALUE   The name of the project group to add this
+                             project to. If the group doesn't exist, it will
+                             be created.
+      --lifecycle=VALUE      The name of the lifecycle that the project will
+                             use.
+      --ignoreIfExists       If the project already exists, an error will be
+                             returned. Set this flag to ignore the error.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic example {#Creatingprojects-Basicexample}
+
+The following command creates a project called *MyWebApp* into the project group *MyProjectGroup*:
+
+```bash
+octo create-project --name MyWebApp --projectgroup MyProjectGroup --server http://MyOctopusServerURL.com --apikey MyAPIKey
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
+- [Projects](/docs/projects)
diff --git a/src/pages/docs/cli/octopus-cli/create-release.md b/src/pages/docs/cli/octopus-cli/create-release.md
new file mode 100644
index 0000000000..d9b9f6c819
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/create-release.md
@@ -0,0 +1,289 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2024-12-16
+title: Create release
+description: Using the Octopus CLI to create releases.
+navOrder: 100
+---
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to automate the creation of releases using the **`create-release`** command. This allows you to easily integrate Octopus with other continuous integration servers.
+
+This command creates a release, and optionally deploy it to one or more environments:
+
+```text
+Creates (and, optionally, deploys) a release.
+
+Usage: octo create-release [<options>]
+
+Where [<options>] is any of:
+
+Release creation:
+
+      --project=VALUE        Name or ID of the project.
+      --defaultPackageVersion, --packageVersion=VALUE
+                             Default version number of all packages to use
+                             for this release. Override per-package using --
+                             package.
+      --gitCommit=VALUE      [Optional] Git commit to use when creating the
+                             release. Use in conjunction with the --gitRef
+                             parameter to select any previous commit.
+      --ref, --gitRef=VALUE  [Optional] Git reference to use when creating
+                             the release.
+      --version, --releaseNumber=VALUE
+                             [Optional] Release number to use for the new
+                             release.
+      --channel=VALUE        [Optional] Name or ID of the channel to use for
+                             the new release. Omit this argument to
+                             automatically select the best channel.
+      --package=VALUE        [Optional] Version number to use for a package
+                             in the release. Format: StepName:Version or
+                             PackageID:Version or
+                             StepName:PackageName:Version. StepName,
+                             PackageID, and PackageName can be replaced with
+                             an asterisk. An asterisk will be assumed for
+                             StepName, PackageID, or PackageName if they are
+                             omitted.
+      --packagesFolder=VALUE [Optional] A folder containing NuGet packages
+                             from which we should get versions.
+      --releaseNotes=VALUE   [Optional] Release Notes for the new release.
+                             Styling with Markdown is supported.
+      --releaseNoteFile, --releaseNotesFile=VALUE
+                             [Optional] Path to a file that contains Release
+                             Notes for the new release. Supports Markdown
+                             files.
+      --ignoreExisting       [Optional, Flag] Don't create this release if
+                             there is already one with the same version
+                             number.
+      --ignoreChannelRules   [Optional, Flag] Create the release ignoring any
+                             version rules specified by the channel.
+      --packagePrerelease=VALUE
+                             [Optional] Pre-release for latest version of all
+                             packages to use for this release. This argument
+                             supports regex patterns.
+      --whatIf               [Optional, Flag] Perform a dry run but don't
+                             actually create/deploy release.
+
+Deployment:
+
+      --progress             [Optional] Show progress of the deployment.
+      --forcePackageDownload [Optional] Whether to force downloading of
+                             already installed packages (flag, default false).
+      --waitForDeployment    [Optional] Whether to wait synchronously for
+                             deployment to finish.
+      --deploymentTimeout=VALUE
+                             [Optional] Specifies maximum time (time span
+                             format) that the console session will wait for
+                             the deployment to finish(default 00:10:00). This
+                             will not stop the deployment. Requires --
+                             waitForDeployment parameter set.
+      --cancelOnTimeout      [Optional] Whether to cancel the deployment if
+                             the deployment timeout is reached (flag, default
+                             false).
+      --deploymentCheckSleepCycle=VALUE
+                             [Optional] Specifies how much time (time span
+                             format) should elapse between deployment status
+                             checks (default 00:00:10).
+      --guidedFailure=VALUE  [Optional] Whether to use guided failure mode.
+                             (True or False. If not specified, will use
+                             default setting from environment).
+      --specificMachines=VALUE
+                             [Optional] A comma-separated list of machine
+                             names to target in the deployed environment. If
+                             not specified all machines in the environment
+                             will be considered.
+      --excludeMachines=VALUE
+                             [Optional] A comma-separated list of machine
+                             names to exclude in the deployed environment. If
+                             not specified all machines in the environment
+                             will be considered.
+      --force                [Optional] If a project is configured to skip
+                             packages with already-installed versions,
+                             override this setting to force re-deployment
+                             (flag, default false).
+      --skip=VALUE           [Optional] Skip a step by name.
+      --noRawLog             [Optional] Don't print the raw log of failed
+                             tasks.
+      --rawLogFile=VALUE     [Optional] Redirect the raw log of failed tasks
+                             to a file.
+  -v, --variable=VALUE       [Optional] Specifies the value for a prompted
+                             variable in the format Label:Value. For JSON
+                             values, embedded quotation marks should be
+                             escaped with a backslash.
+      --deployAt=VALUE       [Optional] Time at which deployment should start
+                             (scheduled deployment), specified as any valid
+                             DateTimeOffset format, and assuming the time
+                             zone is the current local time zone.
+      --noDeployAfter=VALUE  [Optional] Time at which scheduled deployment
+                             should expire, specified as any valid
+                             DateTimeOffset format, and assuming the time
+                             zone is the current local time zone.
+      --tenant=VALUE         [Optional] Create a deployment for the tenant
+                             with this name or ID; specify this argument
+                             multiple times to add multiple tenants or use
+                             `*` wildcard to deploy to all tenants who are
+                             ready for this release (according to lifecycle).
+      --tenantTag=VALUE      [Optional] Create a deployment for tenants
+                             matching this tag; specify this argument
+                             multiple times to build a query/filter with
+                             multiple tags, just like you can in the user
+                             interface.
+      --deployTo=VALUE       [Optional] Name or ID of the environment to
+                             automatically deploy to, e.g., 'Production' or
+                             'Environments-1'; specify this argument multiple
+                             times to deploy to multiple environments.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic Examples
+
+This creates a new release of the *HelloWorld* project using the latest available NuGet packages for each step in the project. The version number of the release will be the highest version according to the [Release Versioning](/docs/releases/release-versioning) project setting:
+
+```bash
+octo create-release --project HelloWorld --server https://your-octopus-url --apiKey API-YOUR-KEY
+```
+
+This creates a release with a specified release number, overriding the [Release Versioning](/docs/releases/release-versioning) project setting:
+
+```bash
+octo create-release --project HelloWorld --version 1.0.3 --server https://your-octopus-url --apiKey API-YOUR-KEY
+```
+
+## Version controlled projects
+
+For projects that use the [Config as Code feature](/docs/projects/version-control) (they are version controlled), you can create a release pointing at a git reference, e.g. a branch name or tag. This example creates a release using the branch name of `main`:
+
+```bash
+octo create-release --project HelloWorld --version 1.0.3 --server https://your-octopus-url --apiKey API-YOUR-KEY --gitRef main
+```
+
+:::div{.warning}
+If the provided project is **not a version controlled one**, passing `--gitRef` (or `--gitCommit`) will result in an error as these parameters are only valid for projects that are version controlled.
+:::
+
+## Specifying the Package Version
+
+For each step that has a package, the version is determined in the following order:
+
+ 1. The step name matches a `--package` parameter or a file filename found by `--packagesFolder`.
+ 1. The package id matches a `--package` parameter or a file found by `--packagesFolder`.
+ 1. The value from the `--defaultpackageversion` or `--packageversion` parameter.
+
+ If there are duplicate names/ids resulting from the `--package` and `--packagesFolder` parameters, the last one specified is used.
+
+### Option --packageVersion
+
+This creates a release *(1.0.3)* with a specified NuGet package version *(1.0.1)*:
+
+```bash
+octo create-release --project HelloWorld --version 1.0.3 --packageVersion 1.0.1 --server https://your-octopus-url --apiKey API-YOUR-KEY
+```
+
+### Option --package
+
+This creates a release for a project with multiple packages, each with a different version. You can specify a step name and version pair with this option, allowing you to use different versions of the same package for different steps:
+
+```bash
+octo create-release --project HelloWorld --version 1.0.3 --package StepA:1.0.1 --package StepB:1.0.2 --server https://your-octopus-url --apiKey API-YOUR-KEY
+```
+
+If you want to use a specific version of a package for `StepA`, and the latest version of the package available for `StepB`, you can simply omit the parameter for the second step/package:
+
+```bash
+octo create-release --project HelloWorld --version 1.0.3 --package StepA:1.0.1 --server https://your-octopus-url --apiKey API-YOUR-KEY
+```
+
+The example above uses `1.0.1` for `StepA`, and the latest version available at the moment for `StepB`.
+
+For steps which have multiple packages (e.g. *Run a Script* steps can [reference multiple packages](/docs/deployments/custom-scripts/run-a-script-step/#referencing-packages
+)), the format `StepName:PackageName:Version` can also be used:  
+
+```bash
+octo create-release --project HelloWorld --version 1.0.3 --package StepA:Acme.Web:1.0.0 --package StepA:Acme.Data:2.0.0 --server https://your-octopus-url --apiKey API-YOUR-KEY
+```
+
+In the example above, `StepA` uses `1.0.0` for `Acme.Web` and `2.0.0` for `Acme.Data`.
+
+### Option --packagesFolder
+
+This creates a release for a project with multiple packages, by taking the version for each package from a folder containing the packages (this approach works well if your build server has just built the packages):
+
+```bash
+octo create-release --project HelloWorld --version 1.0.3 --packagesFolder packages --server https://your-octopus-url --apiKey API-YOUR-KEY
+```
+
+## Deploying a release after creating it
+
+To create a release **and** deploy it to an environment named Production:
+
+```bash
+octo create-release --project HelloWorld --deployto Production --server https://your-octopus-url --apiKey API-YOUR-KEY --progress
+```
+
+:::div{.hint}
+**A note on lifecycle phases with automated deployment:**
+If the `--deployTo` parameter is specified and the [lifecycle](/docs/releases/lifecycles) of the project you are deploying to is set to *Deploy automatically* when a release is created, it's possible multiple deployments to the same environment will be triggered.
+:::
+
+## Release notes supported syntax
+
+We use [Showdown](https://github.com/showdownjs/showdown) to render release notes on the dashboard.
+Showdown supports the common markdown syntax as well as a rich set of extras such as tables and task lists. For the full list see <https://github.com/showdownjs/showdown/wiki/Showdown's-Markdown-syntax>.
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
+- [Releases](/docs/releases)
diff --git a/src/pages/docs/cli/octopus-cli/create-workerpool.mdx b/src/pages/docs/cli/octopus-cli/create-workerpool.mdx
new file mode 100644
index 0000000000..31ce7bb9e4
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/create-workerpool.mdx
@@ -0,0 +1,100 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Create Worker pool
+description: Creates a pool for workers
+navOrder: 100
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to create a worker pool.
+
+```text
+Creates a pool for workers.
+
+Usage: octo create-workerpool [<options>]
+
+Where [<options>] is any of:
+
+WorkerPool creation:
+
+      --name=VALUE           The name of the worker pool.
+      --ignoreIfExists       If the pool already exists, an error will be
+                             returned. Set this flag to ignore the error.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic examples
+
+<SamplesInstance />
+
+This example creates a worker pool named **Docker Worker Pool** in the `Pattern - Rolling` space:
+
+```bash
+octo create-workerpool --name="Docker Worker Pool" --space="Pattern - Rolling" --server="https://samples.octopus.app/" --apiKey="MyApiKey"
+```
+
+This example creates a worker pool named **Docker Worker Pool** in the `Pattern - Rolling` space, and ignore any errors if the pool already exists:
+
+```bash
+octo create-workerpool --name="Docker Worker Pool" --ignoreIfExists --space="Pattern - Rolling"  --server="https://samples.octopus.app/" --apiKey="MyApiKey"
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
+- [Worker pools](/docs/infrastructure/workers/worker-pools)
diff --git a/src/pages/docs/cli/octopus-cli/delete-autodeployoverride.md b/src/pages/docs/cli/octopus-cli/delete-autodeployoverride.md
new file mode 100644
index 0000000000..55f24fcb82
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/delete-autodeployoverride.md
@@ -0,0 +1,116 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2024-06-25
+title: Delete auto deploy override
+description: Using the Octopus CLI to delete automatic deployment release overrides.
+navOrder: 100
+---
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to delete automatic deployment release overrides.
+
+```text
+Deletes auto deploy release overrides.
+
+Usage: octo delete-autodeployoverride [<options>]
+
+Where [<options>] is any of:
+
+Delete auto deploy release override:
+
+      --project=VALUE        Name of the project.
+      --environment=VALUE    Name of an environment the override will apply
+                             to. Specify this argument multiple times to add
+                             multiple environments.
+      --tenant=VALUE         [Optional] Name of a tenant the override will
+                             apply to. Specify this argument multiple times
+                             to add multiple tenants or use `*` wildcard for
+                             all tenants.
+      --tenantTag=VALUE      [Optional] A tenant tag used to match tenants
+                             that the override will apply to. Specify this
+                             argument multiple times to add multiple tenant
+                             tags
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic example
+
+The following deletes an automatic deployment release override for the project *HelloWorld* to the environment Development:
+
+```bash
+octo delete-autodeployoverride --project HelloWorld --environment Development --server https://your-octopus-url --apikey API-YOUR-KEY
+```
+
+## Tenanted example (by name)
+
+The following deletes an automatic deployment release override for the project *HelloWorld* to the environment Development for the tenant *Acme*:
+
+```bash
+octo delete-autodeployoverride --project HelloWorld --environment Development --tenant Acme --server https://your-octopus-url --apikey API-YOUR-KEY
+```
+
+## tenanted example (by tags)
+
+The following deletes an automatic deployment release override for the project *HelloWorld* to the environment Development for all tenants with the *Hosting/Cloud* tag:
+
+```bash
+octo delete-autodeployoverride --project HelloWorld --environment Development --tenanttag Hosting/Cloud --server https://your-octopus-url --apikey API-YOUR-KEY
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
+- [Automatic deployments](/docs/projects/project-triggers/deployment-target-triggers)
diff --git a/src/pages/docs/cli/octopus-cli/delete-package.md b/src/pages/docs/cli/octopus-cli/delete-package.md
new file mode 100644
index 0000000000..6671e3ed5d
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/delete-package.md
@@ -0,0 +1,78 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Delete package
+description: Deletes a package from the built-in NuGet repository in an Octopus Server.
+navOrder: 100
+---
+
+Deletes a package from the built-in NuGet repository in an Octopus Server.
+
+**delete-package options**
+
+```text
+Deletes a package from the built-in NuGet repository in an Octopus Server.
+
+Usage: octo delete-package [<options>]
+
+Where [<options>] is any of:
+
+Deletion:
+
+      --packageId=VALUE      Id of the package.
+      --version=VALUE        Version number of the package.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
diff --git a/src/pages/docs/cli/octopus-cli/delete-project.md b/src/pages/docs/cli/octopus-cli/delete-project.md
new file mode 100644
index 0000000000..9bf29836f7
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/delete-project.md
@@ -0,0 +1,77 @@
+---
+layout: src/layouts/Default.astro
+title: Delete project
+pubDate: 2023-07-17
+modDate: 2023-07-17
+description: Deletes a project.
+navOrder: 100
+---
+
+Deletes a project.
+
+**delete-project options**
+
+```text
+Deletes a project.
+
+Usage: octo delete-project [<options>]
+
+Where [<options>] is any of:
+
+Project deletion:
+
+      --name=VALUE           The name of the project.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
diff --git a/src/pages/docs/cli/octopus-cli/delete-releases.mdx b/src/pages/docs/cli/octopus-cli/delete-releases.mdx
new file mode 100644
index 0000000000..7af1e7c05b
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/delete-releases.mdx
@@ -0,0 +1,117 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Delete releases
+description: Deletes a range of releases
+navOrder: 100
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+The [Octopus CLI](/docs/cli/octopus-cli/) can be used to delete a range of [releases](/docs/releases).
+
+```text
+Deletes a range of releases.
+
+Usage: octo delete-releases [<options>]
+
+Where [<options>] is any of:
+
+Deletion:
+
+      --project=VALUE        Name of the project.
+      --minVersion=VALUE     Minimum (inclusive) version number for the range
+                             of versions to delete.
+      --maxVersion=VALUE     Maximum (inclusive) version number for the range
+                             of versions to delete.
+      --channel=VALUE        [Optional] if specified, only releases
+                             associated with the channel will be deleted;
+                             specify this argument multiple times to target
+                             multiple channels.
+      --whatIf               [Optional, Flag] if specified, releases won't
+                             actually be deleted, but will be listed as if
+                             simulating the command.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic examples
+
+<SamplesInstance />
+
+This example deletes releases in the `PetClinic - rolling deploy` project in the `Pattern - Rolling` space that match the following version range:
+
+- Minimum version: `2020.07.06.17`
+- Maximum version: `2020.07.06.18`
+
+```bash
+octo delete-releases --project="PetClinic - rolling deploy" --space="Pattern - Rolling" --minVersion="2020.07.06.17" --maxVersion="2020.07.06.18" --server="https://samples.octopus.app/" --apiKey="MyApiKey"
+```
+
+This example uses the `--whatIf` flag to display the releases that *would* be deleted in the `PetClinic - rolling deploy` project in the `Pattern - Rolling` space which match the following version range:
+
+- Minimum version: `2020.07.06.16`
+- Maximum version: `2020.07.06.20`
+
+This can be useful where you want to check the releases that would be deleted, before actually deleting them:
+
+```bash
+octo delete-releases --project="PetClinic - rolling deploy" --space="Pattern - Rolling" --minVersion="2020.07.06.16" --maxVersion="2020.07.06.20" --whatIf --server="https://samples.octopus.app/" --apiKey="MyApiKey"
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
+- [releases](/docs/releases)
diff --git a/src/pages/docs/cli/octopus-cli/deploy-release.md b/src/pages/docs/cli/octopus-cli/deploy-release.md
new file mode 100644
index 0000000000..bfcebc2e29
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/deploy-release.md
@@ -0,0 +1,178 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2024-12-16
+title: Deploy release
+description: Using the Octopus CLI to deploy releases.
+navOrder: 100
+---
+
+The [Octopus CLI](/docs/cli/octopus-cli/) can be used to deploy releases that have [already been created](/docs/cli/octopus-cli/create-release).
+
+```text
+Deploys a release.
+
+Usage: octo deploy-release [<options>]
+
+Where [<options>] is any of:
+
+Deployment:
+
+      --progress             [Optional] Show progress of the deployment.
+      --forcePackageDownload [Optional] Whether to force downloading of
+                             already installed packages (flag, default false).
+      --waitForDeployment    [Optional] Whether to wait synchronously for
+                             deployment to finish.
+      --deploymentTimeout=VALUE
+                             [Optional] Specifies maximum time (timespan
+                             format) that the console session will wait for
+                             the deployment to finish(default 00:10:00). This
+                             will not stop the deployment. Requires --
+                             waitForDeployment parameter set.
+      --cancelOnTimeout      [Optional] Whether to cancel the deployment if
+                             the deployment timeout is reached (flag, default
+                             false).
+      --deploymentCheckSleepCycle=VALUE
+                             [Optional] Specifies how much time (timespan
+                             format) should elapse between deployment status
+                             checks (default 00:00:10).
+      --guidedFailure=VALUE  [Optional] Whether to use guided failure mode.
+                             (True or False. If not specified, will use
+                             default setting from environment).
+      --specificMachines=VALUE
+                             [Optional] A comma-separated list of machine
+                             names to target in the deployed environment. If
+                             not specified all machines in the environment
+                             will be considered.
+      --excludeMachines=VALUE
+                             [Optional] A comma-separated list of machine
+                             names to exclude in the deployed environment. If
+                             not specified all machines in the environment
+                             will be considered.
+      --force                [Optional] If a project is configured to skip
+                             packages with already-installed versions,
+                             override this setting to force re-deployment
+                             (flag, default false).
+      --skip=VALUE           [Optional] Skip a step by name.
+      --noRawLog             [Optional] Don't print the raw log of failed
+                             tasks.
+      --rawLogFile=VALUE     [Optional] Redirect the raw log of failed tasks
+                             to a file.
+  -v, --variable=VALUE       [Optional] Specifies the value for a prompted
+                             variable in the format Label:Value. For JSON
+                             values, embedded quotation marks should be
+                             escaped with a backslash.
+      --deployAt=VALUE       [Optional] Time at which deployment should start
+                             (scheduled deployment), specified as any valid
+                             DateTimeOffset format, and assuming the time
+                             zone is the current local time zone.
+      --noDeployAfter=VALUE  [Optional] Time at which scheduled deployment
+                             should expire, specified as any valid
+                             DateTimeOffset format, and assuming the time
+                             zone is the current local time zone.
+      --tenant=VALUE         [Optional] Create a deployment for the tenant
+                             with this name or ID; specify this argument
+                             multiple times to add multiple tenants or use
+                             `*` wildcard to deploy to all tenants who are
+                             ready for this release (according to lifecycle).
+      --tenantTag=VALUE      [Optional] Create a deployment for tenants
+                             matching this tag; specify this argument
+                             multiple times to build a query/filter with
+                             multiple tags, just like you can in the user
+                             interface.
+      --project=VALUE        Name or ID of the project.
+      --deployTo=VALUE       Name or ID of the environment to deploy to, e.g-
+                             ., 'Production' or 'Environments-1'; specify
+                             this argument multiple times to deploy to
+                             multiple environments.
+      --releaseNumber, --version=VALUE
+                             Version number of the release to deploy. Or
+                             specify --version=latest for the latest release.
+      --channel=VALUE        [Optional] Name or ID of the channel to use when
+                             getting the release to deploy.
+      --updateVariables      Overwrite the variable snapshot for the release
+                             by re-importing the variables from the project.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic Examples {#basic-examples}
+
+This example deploys release 1.0.0 of the *HelloWorld* project to the Production environment:
+
+```bash
+octo deploy-release --project HelloWorld --releaseNumber 1.0.0 --deployto Production --server https://your-octopus-url --apiKey API-YOUR-KEY
+```
+
+This deploys the latest release in the *1.x Normal* Channel of the *HelloWorld* project to the Production environment:
+
+```bash
+octo deploy-release --project HelloWorld --channel "1.x Normal" --version latest --deployto Production --server https://your-octopus-url --apiKey API-YOUR-KEY
+```
+
+This deploys the latest release in the *1.x Normal* Channel of the *HelloWorld* project to the Production environment for the Tenants tagged as *Upgrade Ring/Early Adopters*:
+
+```bash
+octo deploy-release --project HelloWorld --channel "1.x Normal" --version latest --deployto Production --tenantTag "Upgrade Ring/Early Adopters" --server https://your-octopus-url --apiKey API-YOUR-KEY
+```
+
+:::div{.success}
+You can deploy to ALL tenants in an environment by using the `--tenant=*` argument. This instructs Octopus to create a deployment for each tenant which is ready for that Release to be deployed to the project/environment.
+:::
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
+- [Releases](/docs/releases)
diff --git a/src/pages/docs/cli/octopus-cli/disable-project.md b/src/pages/docs/cli/octopus-cli/disable-project.md
new file mode 100644
index 0000000000..cacc188b0f
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/disable-project.md
@@ -0,0 +1,77 @@
+---
+layout: src/layouts/Default.astro
+title: Disable project
+pubDate: 2023-07-17
+modDate: 2023-07-17
+description: Disables a project.
+navOrder: 100
+---
+
+Disables a project.
+
+**disable-project options**
+
+```text
+Disables a project.
+
+Usage: octo disable-project [<options>]
+
+Where [<options>] is any of:
+
+Project disablement:
+
+      --name=VALUE           The name of the project.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
diff --git a/src/pages/docs/cli/octopus-cli/dump-deployments.mdx b/src/pages/docs/cli/octopus-cli/dump-deployments.mdx
new file mode 100644
index 0000000000..f4ea261237
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/dump-deployments.mdx
@@ -0,0 +1,97 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Dump deployments
+description: Writes deployments to an XML file that can be imported in Excel.
+navOrder: 100
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to write deployments to an XML file that can be imported in Excel.
+
+```text
+Writes deployments to an XML file that can be imported in Excel.
+
+Usage: octo dump-deployments [<options>]
+
+Where [<options>] is any of:
+
+Dumper:
+
+      --filePath=VALUE       The full path and name of the export file
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic example
+
+<SamplesInstance />
+
+This example writes out deployment information from the `Default` space to a temp directory:
+
+Windows:
+
+```bash
+octo dump-deployments --filePath="C:\temp\octo-deployments.xml" --server="https://samples.octopus.app" --apiKey="MyApiKey"
+```
+
+Linux:
+
+```bash
+octo dump-deployments --filePath="/tmp/octo-deployments.xml" --space="Pattern - Rolling" --server="https://samples.octopus.app" --apiKey="MyApiKey"
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/octopus-cli/export.md b/src/pages/docs/cli/octopus-cli/export.md
new file mode 100644
index 0000000000..17273bf187
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/export.md
@@ -0,0 +1,21 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Export
+description: Using the Octopus CLI to export items from one Octopus Server to import into another.
+navOrder: 100
+---
+
+:::div{.warning}
+The export command has been **deprecated**. The recommended way to export data from an Octopus instance is with the **Export/Import Projects** feature that was released in **Octopus 2021.1**. Learn more: [Exporting and Importing Projects](/docs/projects/export-import).
+
+If you are running an earlier version of Octopus, please see our [data migration](/docs/administration/data/data-migration) section for alternative options.
+:::
+
+When you try to run **export**, you'll now receive the following error:
+
+```text
+The octo import/export commands have been deprecated. See [https://g.octopushq.com/DataMigration](https://g.octopushq.com/DataMigration) for alternative options.
+Exit code: -1
+```
diff --git a/src/pages/docs/cli/octopus-cli/formatted-output.md b/src/pages/docs/cli/octopus-cli/formatted-output.md
new file mode 100644
index 0000000000..0765dd07cc
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/formatted-output.md
@@ -0,0 +1,62 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: JSON formatted output
+description: Formatting output from the Octopus CLI
+navOrder: 1
+---
+
+Most commands support printing the result in JSON format.
+
+:::div{.warning}
+[Dump Deployment](/docs/cli/octopus-cli/dump-deployments/), [Export](/docs/cli/octopus-cli/export/) and [Import](/docs/cli/octopus-cli/import) do not support JSON output.
+:::
+
+To access JSON formatted output, use the `--outputformat=json` parameter.
+
+```bash
+octo list-projects --server https://your-octopus-url --apiKey API-YOUR-KEY --outputformat=json
+```
+
+This command outputs the list of projects in parsable JSON format:
+
+```json
+[
+  {
+    "Id": "Projects-81",
+    "Name": "Phoenix"
+  },
+  {
+    "Id": "Projects-61",
+    "Name": "OctoFX"
+  },
+]
+```
+
+You can also work with the JSON output in PowerShell:
+
+```powershell
+$json = (./octo list-releases --server https://your-octopus-url --apikey API-YOUR-KEY --project=OctoLifecycle --outputformat=json) | ConvertFrom-Json
+$json | select -expand Releases | where {[datetime]$_.Assembled -gt ((Get-Date).AddMonths(-1))}
+```
+
+This script writes out a list of releases for the last month:
+
+```text
+Version Assembled                     PackageVersions ReleaseNotes
+------- ---------                     --------------- ------------
+0.0.16  2018-01-04T14:27:25.221+10:00 Deploy1 0.0.1
+0.0.15  2018-01-04T14:14:29.369+10:00 Deploy1 0.0.1
+0.0.14  2018-01-04T14:06:55.799+10:00 Deploy1 0.0.1
+0.0.13  2018-01-04T14:06:44.784+10:00 Deploy1 0.0.1
+0.0.12  2018-01-04T13:44:29.273+10:00 Deploy1 0.0.1
+0.0.11  2017-12-18T09:36:44.995+10:00 Deploy 0.0.1    
+0.0.10  2017-12-18T09:26:22.671+10:00 Deploy 0.0.1    
+0.0.9   2017-12-18T09:25:02.342+10:00 Deploy 0.0.1    
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/octopus-cli/import.md b/src/pages/docs/cli/octopus-cli/import.md
new file mode 100644
index 0000000000..b0966222ee
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/import.md
@@ -0,0 +1,21 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Import
+description: Using the Octopus CLI to import items exported from another Octopus Server.
+navOrder: 100
+---
+
+:::div{.warning}
+The import command has been **deprecated**. The recommended way to import data to an Octopus instance is with the **Export/Import Projects** feature that was released in **Octopus 2021.1**. Learn more: [Exporting and Importing Projects](/docs/projects/export-import).
+
+If you are running an earlier version of Octopus, please see our [data migration](/docs/administration/data/data-migration) section for alternative options.
+:::
+
+When you try to run **import**, you'll now receive the following error:
+
+```text
+The octo import/export commands have been deprecated. See [https://g.octopushq.com/DataMigration](https://g.octopushq.com/DataMigration) for alternative options.
+Exit code: -1
+```
diff --git a/src/pages/docs/cli/octopus-cli/index.mdx b/src/pages/docs/cli/octopus-cli/index.mdx
new file mode 100644
index 0000000000..226133bebc
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/index.mdx
@@ -0,0 +1,113 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2024-03-05
+title: Octo Command Line (CLI) in Octopus (Deprecated)
+navTitle: Octo Command Line (CLI) (Deprecated)
+description: The Octo CLI is the Octopus command line tool that builds on top of the Octopus REST API.
+navOrder: 100
+hideInThisSection: true
+robots: noindex, follow
+meta:
+  - name: canonical
+    content: https://octopus.com/docs/cli
+---
+import OctopusCli from 'src/shared-content/concepts/octopus-cli.include.md';
+import OctoAutocompleteTabCompletion from 'src/shared-content/octopus-cli/octo-autocomplete-tab-completion.include.md';
+
+:::div{.hint}
+The Octo CLI has been replaced by the <a href="/docs/cli">new Octopus CLI</a>. We will no longer provide feature or security updates to the Octo CLI and we recommend making the swap to the new Octopus CLI as soon as it's practical to do so.
+:::
+
+The Octo CLI is a command line tool that builds on top of the [Octopus Deploy REST API](/docs/octopus-rest-api). With the Octo CLI you can package your applications for deployment as either Zip or NuGet packages, and manage your environments, deployments, channels, projects, and workers.
+
+The Octo CLI, which leans heavily on the [Octopus Clients library](https://github.com/OctopusDeploy/OctopusClients), is built and maintained by the Octopus Deploy team, but it is also open source. The Octo CLI can be used on Windows, Mac, Linux, Docker, and as a .NET Core global tool. For installation options and direct downloads, visit the [Octopus CLI Project on GitHub](https://github.com/OctopusDeploy/OctopusCli).
+
+## Commands \{#octoCommandLine-Commands}
+
+`octo` supports the following commands:
+
+- **[allow-releaseprogression](/docs/cli/octopus-cli/allow-releaseprogression)**:  Allows a release to progress to the next phase.
+- **[build-information](/docs/cli/octopus-cli/build-information)**:  Pushes build information to Octopus Server.
+- **[clean-environment](/docs/cli/octopus-cli/clean-environment)**:  Cleans all Offline Machines from an Environment.
+- **[clean-workerpool](/docs/cli/octopus-cli/clean-workerpool)**:  Cleans all Offline Workers from a WorkerPool.
+- **[complete](/docs/cli/octopus-cli/complete)**:  Supports command line auto completion.
+- **[create-autodeployoverride](/docs/cli/octopus-cli/create-autodeployoverride)**:  Overrides the release that auto deploy will use.
+- **[create-channel](/docs/cli/octopus-cli/create-channel)**:  Creates a channel for a project.
+- **[create-environment](/docs/cli/octopus-cli/create-environment)**:  Creates a deployment environment.
+- **[create-project](/docs/cli/octopus-cli/create-project)**:  Creates a project.
+- **[create-release](/docs/cli/octopus-cli/create-release)**:  Creates (and, optionally, deploys) a release.
+- **[create-workerpool](/docs/cli/octopus-cli/create-workerpool)**:  Creates a pool for workers.
+- **[delete-autodeployoverride](/docs/cli/octopus-cli/delete-autodeployoverride)**:  Deletes auto deploy release overrides.
+- **[delete-package](/docs/cli/octopus-cli/delete-package)**:  Deletes a package from the built-in NuGet repository in an Octopus Server.
+- **[delete-project](/docs/cli/octopus-cli/delete-project)**:  Deletes a project.
+- **[delete-releases](/docs/cli/octopus-cli/delete-releases)**:  Deletes a range of releases.
+- **[deploy-release](/docs/cli/octopus-cli/deploy-release)**:  Deploys a release.
+- **[disable-project](/docs/cli/octopus-cli/disable-project)**:  Disables a project.
+- **[dump-deployments](/docs/cli/octopus-cli/dump-deployments)**:  Writes deployments to an XML file that can be imported in Excel.
+- **[export](/docs/cli/octopus-cli/export)**:  Exports an object to a JSON file. Deprecated. Please see [https://g.octopushq.com/DataMigration](https://g.octopushq.com/DataMigration) for alternative options.
+- **[import](/docs/cli/octopus-cli/import)**:  Imports an Octopus object from an export file. Deprecated. Please see [https://g.octopushq.com/DataMigration](https://g.octopushq.com/DataMigration) for alternative options.
+- **[install-autocomplete](/docs/cli/octopus-cli/install-autocomplete)**:  Install a shell auto-complete script into your shell profile, if they aren't already there. Supports pwsh, zsh, bash & PowerShell.
+- **[list-deployments](/docs/cli/octopus-cli/list-deployments)**:  Lists a number of deployments by project, environment or by tenant.
+- **[list-environments](/docs/cli/octopus-cli/list-environments)**:  Lists environments.
+- **[list-latestdeployments](/docs/cli/octopus-cli/list-latestdeployments)**:  Lists the releases last-deployed in each environment.
+- **[list-machines](/docs/cli/octopus-cli/list-machines)**:  Lists all machines.
+- **[list-projects](/docs/cli/octopus-cli/list-projects)**:  Lists all projects.
+- **[list-releases](/docs/cli/octopus-cli/list-releases)**:  Lists releases by project.
+- **[list-tenants](/docs/cli/octopus-cli/list-tenants)**:  Lists tenants.
+- **[list-workerpools](/docs/cli/octopus-cli/list-workerpools)**:  Lists worker pools.
+- **[list-workers](/docs/cli/octopus-cli/list-workers)**:  Lists all workers.
+- **[pack](/docs/cli/octopus-cli/pack)**:  Creates a package (.nupkg or .zip) from files on disk, without needing a .nuspec or .csproj.
+- **[prevent-releaseprogression](/docs/cli/octopus-cli/prevent-releaseprogression)**:  Prevents a release from progressing to the next phase.
+- **[promote-release](/docs/cli/octopus-cli/promote-release)**:  Promotes a release.
+- **[push](/docs/cli/octopus-cli/push)**:  Pushes a package (.nupkg, .zip, .tar.gz, .jar, .war, etc.) package to the built-in NuGet repository in an Octopus Server.
+- **[push-metadata](/docs/cli/octopus-cli/push-metadata)**:  Pushes package metadata to Octopus Server.  Deprecated. Please use the build-information command for Octopus Server 2019.10.0 and above.
+- **[run-runbook](/docs/cli/octopus-cli/run-runbook)**:  Runs a Runbook.
+- **[version](/docs/cli/octopus-cli/version)**:  Outputs Octopus CLI version.
+
+## General usage \{#OctopusCLI-GeneralUsage}
+
+All commands take the form of:
+
+```powershell
+octo <command> [<options>]
+```
+
+You can see a list of commands using:
+
+```powershell
+octo help
+```
+
+And you can get help for a specific command using:
+
+```powershell
+octo help <command>
+octo <command> --help
+```
+
+Arguments are not case sensitive and can take the following forms:
+
+```powershell
+--project OctoFX                # Space between argument name and value
+--project=OctoFX                # Equal sign between argument name and value
+--project "OctoFX Web Site"     # Argument values with spaces need to be quoted
+"--project=OctoFX Web Site"     # If using equals, quote both the name and value, not just the value
+```
+
+All commands require you to pass the URL of the Octopus Server's API endpoint, and an API key which is used to authenticate you.
+
+```bash
+octo ... --server https://your-octopus-url --apiKey API-YOUR-KEY
+```
+
+Most commands also support [JSON formatted output](/docs/cli/octopus-cli/formatted-output).
+
+:::div{.success}
+**Create an API key**
+Learn about [how to create an API key](/docs/octopus-rest-api/how-to-create-an-api-key).
+:::
+
+The server URL, API key, username and password can be set as the environment variables `OCTOPUS_CLI_SERVER`, `OCTOPUS_CLI_API_KEY`, `OCTOPUS_CLI_USERNAME` and `OCTOPUS_CLI_PASSWORD` respectively. Values set via command line arguments take precedence over environment variables.
+
+<OctoAutocompleteTabCompletion />
diff --git a/src/pages/docs/cli/octopus-cli/install-autocomplete.mdx b/src/pages/docs/cli/octopus-cli/install-autocomplete.mdx
new file mode 100644
index 0000000000..06869650c5
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/install-autocomplete.mdx
@@ -0,0 +1,39 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Install autocomplete
+description: Install a shell auto-complete script into your shell profile, if they aren't already there. Supports pwsh, zsh, bash & PowerShell.
+navOrder: 100
+---
+import OctoAutocompleteTabCompletion from 'src/shared-content/octopus-cli/octo-autocomplete-tab-completion.include.md';
+
+Install a shell auto-complete script into your shell profile, if they aren't already there. Supports pwsh, zsh, bash, and PowerShell.
+
+**install-autocomplete options**
+
+```text
+Install a shell auto-complete script into your shell profile, if they aren't already there. Supports pwsh, zsh, bash & PowerShell.
+
+Usage: octo install-autocomplete [<options>]
+
+Where [<options>] is any of:
+
+Install AutoComplete:
+
+      --shell=VALUE          The type of shell to install auto-complete
+                             scripts for. This will alter your shell
+                             configuration files. Supported shells are Bash,
+                             PowerShell, Pwsh and Zsh.
+      --dryRun               [Optional] Dry run will output the proposed
+                             changes to console, instead of writing to disk.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+```
+
+<OctoAutocompleteTabCompletion />
diff --git a/src/pages/docs/cli/octopus-cli/install-global-tool.md b/src/pages/docs/cli/octopus-cli/install-global-tool.md
new file mode 100644
index 0000000000..22fedeb24e
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/install-global-tool.md
@@ -0,0 +1,79 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Octopus CLI Global Tool
+description: Octopus CLI installation
+navOrder: 0
+---
+
+You can install the Octopus CLI as a .NET Core [Global Tool](https://docs.microsoft.com/en-us/dotnet/core/tools/global-tools). This requires that you have the [.NET Core SDK](https://dotnet.microsoft.com/download/) installed.
+
+## Specific location
+
+A local installation can be done into a specified location using the `--tool-path` parameter.
+
+```bash
+dotnet tool install Octopus.DotNet.Cli --tool-path /path/for/tool --version <version>
+```
+
+This will install the Octopus CLI into the specified location and generate a platform specific executable called `dotnet-octo` into the specified location. In order to enable `dotnet` to find your custom tool location, you will need to add the tool location to the current environment path.
+
+**PowerShell**
+
+```powershell
+$env:PATH = "your\tool\folder;" + $env:PATH
+```
+
+**Bash**
+
+```bash
+export PATH="$PATH:/your/tool/folder"
+```
+
+Once the tool folder is in the path you can run the Octopus CLI commands with .NET: `dotnet octo pack`.
+
+## User installation
+
+In order to install The Octopus CLI for the current user you can do so by installing the tool globally using
+`--global` flag.
+
+```bash
+dotnet tool install Octopus.DotNet.Cli --global --version 4.39.1
+```
+
+You may also omit the `--version` parameter to install the latest version of the tools.
+
+Check the output to make sure the installation works correctly. After the installation has completed, you can run the following to verify the version the Octopus CLI that was installed:
+
+```bash
+dotnet octo --version
+```
+
+### Updating
+
+In order to update to the latest version of the tool you can use the `dotnet update` command
+
+```bash
+dotnet tool update Octopus.DotNet.Cli --global
+```
+
+If you would like to update to a specific version or downgrade to an older version you can do
+so by first uninstalling the tool and installing it again.
+
+```bash
+dotnet tool uninstall Octopus.DotNet.Cli --global
+dotnet tool install Octopus.DotNet.Cli --global --version <version>
+```
+
+## Troubleshooting installation
+
+If you run into any issues installing the Octopus CLI as a global tool then these steps might help.
+
+### Unable to install due to 401 unauthorized error
+
+If you receive an error that states `Response status code does not indicate success: 401 (Unauthorized)` this might be due to a nuget feed configured in the `nuget.config` file that requires authentication.
+
+A workaround is to try using the `--ignore-failed-sources` switch.
+
+For more information, see this [.NET SDK GitHub issue](https://github.com/dotnet/sdk/issues/9555).
diff --git a/src/pages/docs/cli/octopus-cli/list-deployments.mdx b/src/pages/docs/cli/octopus-cli/list-deployments.mdx
new file mode 100644
index 0000000000..b216c1a65b
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/list-deployments.mdx
@@ -0,0 +1,116 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2024-06-25
+title: List deployments
+description: List a number of deployments by project, environment or by tenant.
+navOrder: 100
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to list deployments by project, environment, or tenant:
+
+```text
+Lists a number of deployments by project, environment or by tenant.
+
+Usage: octo list-deployments [<options>]
+
+Where [<options>] is any of:
+
+Listing:
+
+      --project=VALUE        [Optional] Name of a project to filter by. Can
+                             be specified many times.
+      --environment=VALUE    [Optional] Name of an environment to filter by.
+                             Can be specified many times.
+      --tenant=VALUE         [Optional] Name of a tenant to filter by. Can be
+                             specified many times.
+      --number=VALUE         [Optional] number of results to return, default
+                             is 30
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic Example
+
+<SamplesInstance />
+
+This example lists deployments for the specified project:
+
+```text
+octo.exe list-deployments --project="Octo Pet Shop - DB" --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Tenants - SaaS"
+```
+
+This example lists the latest 5 deployments for the specified project:
+
+```text
+octo.exe list-deployments --project="Octo Pet Shop - DB" --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Tenants - SaaS" --number="5"
+```
+
+This example lists the latest 5 deployments to production:
+
+```text
+octo.exe list-deployments --project="Octo Pet Shop - DB" --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Tenants - SaaS" --number="5" --environment="Production"
+```
+
+This example lists the latest 5 deployments to production for tenant Petlife:
+
+```bash
+octo list-deployments --project="Octo Pet Shop - DB" --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Tenants - SaaS" --number="5" --environment="Production" --tenant="Petlife"
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/octopus-cli/list-environments.mdx b/src/pages/docs/cli/octopus-cli/list-environments.mdx
new file mode 100644
index 0000000000..c52248909f
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/list-environments.mdx
@@ -0,0 +1,88 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2024-06-25
+title: List environments
+description: List environments
+navOrder: 100
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to list the environments on your Octopus instance.
+
+```text
+Lists environments.
+
+Usage: octo list-environments [<options>]
+
+Where [<options>] is any of:
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic example
+
+<SamplesInstance />
+
+This example lists environments for space [Target - Docker](https://samples.octopus.app/app#/Spaces-103):
+
+```bash
+octo list-environments --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Target - Docker"
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
+- [Environments](/docs/infrastructure/environments)
diff --git a/src/pages/docs/cli/octopus-cli/list-latestdeployments.mdx b/src/pages/docs/cli/octopus-cli/list-latestdeployments.mdx
new file mode 100644
index 0000000000..7dd557b294
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/list-latestdeployments.mdx
@@ -0,0 +1,106 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2024-06-25
+title: List latest deployments
+description: List the releases last-deployed in each environment
+navOrder: 100
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to list the releases last deployed in each environment.
+
+```text
+Lists the releases last-deployed in each environment.
+
+Usage: octo list-latestdeployments [<options>]
+
+Where [<options>] is any of:
+
+Listing:
+
+      --project=VALUE        Name of a project to filter by. Can be specified
+                             many times.
+      --environment=VALUE    Name of an environment to filter by. Can be
+                             specified many times.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic example
+
+<SamplesInstance />
+
+This example lists the latest deployment to Production for project `DACPAC SQL Server` in space [Target - SQL Server](https://samples.octopus.app/app#/Spaces-106):
+
+```bash
+octo list-latestdeployments --project="DACPAC SQL Server" --environment="Production" --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Target - SQL Server"
+```
+
+This example lists the latest deployment to Test and Production for project `DACPAC SQL Server` in space [Target - SQL Server](https://samples.octopus.app/app#/Spaces-106):
+
+```bash
+octo list-latestdeployments --project="DACPAC SQL Server" --environment="Test" --environment="Production" --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Target - SQL Server"
+```
+
+This example lists the latest deployment to Test and Production for project `DACPAC SQL Server` and `DBUp SQL Server` in space [Target - SQL Server](https://samples.octopus.app/app#/Spaces-106):
+
+```bash
+octo list-latestdeployments --project="DACPAC SQL Server" --environment="Test" --environment="Production" --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Target - SQL Server" --project="DBUp SQL Server"
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/octopus-cli/list-machines.mdx b/src/pages/docs/cli/octopus-cli/list-machines.mdx
new file mode 100644
index 0000000000..d556481975
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/list-machines.mdx
@@ -0,0 +1,125 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2024-06-25
+title: List machines
+description: Lists all machines
+navOrder: 100
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to list all machines in your environments.
+
+```text
+Lists all machines.
+
+Usage: octo list-machines [<options>]
+
+Where [<options>] is any of:
+
+Listing:
+
+      --environment=VALUE    Name of an environment to filter by. Can be
+                             specified many times.
+      --status=VALUE         [Optional] Status of Machines filter by (Online,
+                             Offline, Unknown, NeedsUpgrade,
+                             CalamariNeedsUpgrade, Disabled). Can be
+                             specified many times.
+      --health-status, --healthStatus=VALUE
+                             [Optional] Health status of Machines filter by
+                             (Healthy, Unavailable, Unknown, HasWarnings,
+                             Unhealthy). Can be specified many times.
+      --disabled=VALUE       [Optional] Disabled status filter of Machine.
+      --calamari-outdated=VALUE
+                             [Optional] State of Calamari to filter. By
+                             default ignores Calamari state.
+      --tentacle-outdated=VALUE
+                             [Optional] State of Tentacle version to filter.
+                             By default, ignores Tentacle state.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic examples
+
+<SamplesInstance />
+
+This example lists all machines on the instance:
+
+```bash
+octo list-machines --server="https://your-octopus-url" --apiKey="API-YOUR-KEY"
+```
+
+This example lists all machines that are in the Test environment:
+
+```bash
+octo list-machines --server="https://your-octopus-url" --apiKey="API-YOUR-KEY" --environment="Test"
+```
+
+This example lists all machines that are in the Development environment and the Production environment:
+
+```bash
+octo list-machines --server="https://your-octopus-url" --apiKey="API-YOUR-KEY" --environment="Development" --environment="Production"
+```
+
+This example lists all machines that need a Calamari upgrade in space [Target - Hybrid](https://samples.octopus.app/app#/Spaces-342):
+
+```bash
+octo list-machines --server="https://your-octopus-url" --apiKey="API-YOUR-KEY" --calamari-outdated="true" --space="Target - Hybrid"
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/octopus-cli/list-projects.md b/src/pages/docs/cli/octopus-cli/list-projects.md
new file mode 100644
index 0000000000..c7b5ddd959
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/list-projects.md
@@ -0,0 +1,85 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2024-06-25
+title: List projects
+description: Lists all projects
+navOrder: 100
+---
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to list the project in your Octopus instance.
+
+```text
+Lists all projects.
+
+Usage: octo list-projects [<options>]
+
+Where [<options>] is any of:
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic example
+
+This example displays the projects within the default space:
+
+```bash
+octo list-projects --server="http://MyOctopusServer" --apiKey="API-YOUR-KEY" 
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
+- [Projects](/docs/projects)
diff --git a/src/pages/docs/cli/octopus-cli/list-releases.mdx b/src/pages/docs/cli/octopus-cli/list-releases.mdx
new file mode 100644
index 0000000000..e4ec94b73f
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/list-releases.mdx
@@ -0,0 +1,100 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2024-06-25
+title: List releases
+description: List releases by project
+navOrder: 100
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to list releases by project.
+
+```text
+Lists releases by project.
+
+Usage: octo list-releases [<options>]
+
+Where [<options>] is any of:
+
+Listing:
+
+      --project=VALUE        Name of a project to filter by. Can be specified
+                             many times.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic examples
+
+<SamplesInstance />
+
+This example lists all releases for the Wingtip Toys project on the default space:
+
+```bash
+octo list-releases --project="WingtipToys" --server="https://your-octopus-url" --apiKey="API-YOUR-KEY"
+```
+
+This example lists all releases for projects `DbUp - AWS RDS`, `Flyway - AWS RDS`, and `RoundhousE - AWS RDS` on space [Target - MySQL](https://samples.octopus.app/app#/Spaces-242):
+
+```bash
+octo list-releases --project="DbUp - AWS RDS" --project="Flyway - AWS RDS" --project="RoundhousE - AWS RDS" --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Target - MySQL"
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
+- [Releases](/docs/releases)
+- [Projects](/docs/projects)
diff --git a/src/pages/docs/cli/octopus-cli/list-tenants.mdx b/src/pages/docs/cli/octopus-cli/list-tenants.mdx
new file mode 100644
index 0000000000..9da130bb8f
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/list-tenants.mdx
@@ -0,0 +1,93 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2024-06-25
+title: List tenants
+description: List tenants
+navOrder: 100
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to List tenants.
+
+```text
+Lists tenants.
+
+Usage: octo list-tenants [<options>]
+
+Where [<options>] is any of:
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic examples
+
+<SamplesInstance />
+
+This example lists the tenants on the default space:
+
+```bash
+octo list-tenants --server="https://your-octopus-url" --apiKey="API-YOUR-KEY"
+```
+
+This example lists the tenants in the space [Pattern - Tenants](https://samples.octopus.app/app#/Spaces-682):
+
+```bash
+octo list-tenants --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Pattern - Tenants"
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/octopus-cli/list-workerpools.mdx b/src/pages/docs/cli/octopus-cli/list-workerpools.mdx
new file mode 100644
index 0000000000..09fc149338
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/list-workerpools.mdx
@@ -0,0 +1,94 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2024-06-25
+title: List Worker pools
+description: List worker pools
+navOrder: 100
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to list all Worker pools.
+
+```text
+Lists worker pools.
+
+Usage: octo list-workerpools [<options>]
+
+Where [<options>] is any of:
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic examples
+
+<SamplesInstance />
+
+This example lists the worker pools in the default space:
+
+```bash
+octo list-workerpools --server="https://your-octopus-url" --apiKey="API-YOUR-KEY"
+```
+
+This example lists the worker pools in space [Target - PostgreSQL](https://samples.octopus.app/app#/Spaces-243):
+
+```bash
+octo list-workerpools --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Target - PostgreSQL"
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
+- [Worker pools](/docs/infrastructure/workers/worker-pools)
diff --git a/src/pages/docs/cli/octopus-cli/list-workers.mdx b/src/pages/docs/cli/octopus-cli/list-workers.mdx
new file mode 100644
index 0000000000..dc87ef4116
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/list-workers.mdx
@@ -0,0 +1,120 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2024-06-25
+title: List Workers
+description: Lists all workers
+navOrder: 100
+---
+import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to list all Workers.
+
+```text
+Lists all workers.
+
+Usage: octo list-workers [<options>]
+
+Where [<options>] is any of:
+
+Listing Workers:
+
+      --workerPool=VALUE     Name of a worker pool to filter by. Can be
+                             specified many times.
+      --status=VALUE         [Optional] Status of Machines filter by (Online,
+                             Offline, Unknown, NeedsUpgrade,
+                             CalamariNeedsUpgrade, Disabled). Can be
+                             specified many times.
+      --health-status, --healthStatus=VALUE
+                             [Optional] Health status of Machines filter by
+                             (Healthy, Unavailable, Unknown, HasWarnings,
+                             Unhealthy). Can be specified many times.
+      --disabled=VALUE       [Optional] Disabled status filter of Machine.
+      --calamari-outdated=VALUE
+                             [Optional] State of Calamari to filter. By
+                             default ignores Calamari state.
+      --tentacle-outdated=VALUE
+                             [Optional] State of Tentacle version to filter.
+                             By default, ignores Tentacle state.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic examples
+
+<SamplesInstance />
+
+This example lists worker machines in the `Default worker pool` in the default space:
+
+```bash
+octo list-workers --workerPool="Default worker pool" --server="https://your-octopus-url" --apiKey="API-YOUR-KEY"
+```
+
+This example lists all workers in MyWorkerPool that are disabled:
+
+```bash
+octo list-workers --workerPool="MyWorkerPool" --server="https://your-octopus-url" --apiKey="API-YOUR-KEY" --disabled="true"
+```
+
+This example lists all workers with a status of `Unknown` in the [Target - NGINX](https://samples.octopus.app/app#/Spaces-104) space:
+
+```bash
+octo list-workers --workerPool="Default worker pool" --server="https://samples.octopus.com" --apiKey="API-YOUR-KEY" --space="Target - NGINX" --health-status="Unknown"
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
+- [Workers](/docs/infrastructure/workers)
diff --git a/src/pages/docs/cli/octopus-cli/pack.md b/src/pages/docs/cli/octopus-cli/pack.md
new file mode 100644
index 0000000000..77efed02ad
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/pack.md
@@ -0,0 +1,95 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Pack
+description: Creates a package (.nupkg or .zip) from files on disk, without needing a .nuspec or .csproj
+navOrder: 100
+---
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to create packages (.nupkg or .zip) from files on disk, without needing a .nuspec or .csproj file.
+
+```text
+Creates a package (.nupkg or .zip) from files on disk, without needing a .nuspec or .csproj.
+
+Usage: octo pack [<options>]
+
+Where [<options>] is any of:
+
+Basic options:
+
+      --id=VALUE             The ID of the package; e.g. MyCompany.MyApp.
+      --format=VALUE         Package format. Valid values are Zip and NuPkg.
+                             Default is NuPkg, though we recommend Zip going
+                             forward.
+      --version=VALUE        [Optional] The version of the package; must be a
+                             valid SemVer; defaults to a timestamp-based
+                             version.
+      --outFolder=VALUE      [Optional] The folder into which the generated
+                             NuPkg file will be written; defaults to '.'.
+      --basePath=VALUE       [Optional] The root folder containing files and
+                             folders to pack; defaults to '.'.
+      --verbose              [Optional] verbose output.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+
+NuGet packages:
+
+      --author=VALUE         [Optional, Multiple] Add an author to the
+                             package metadata; defaults to the current user.
+      --title=VALUE          [Optional] The title of the package.
+      --description=VALUE    [Optional] A description of the package;
+                             defaults to a generic description.
+      --releaseNotes=VALUE   [Optional] Release notes for this version of the
+                             package.
+      --releaseNotesFile=VALUE
+                             [Optional] A file containing release notes for
+                             this version of the package.
+
+Zip packages:
+
+      --compressionLevel=VALUE
+                             [Optional] Sets the compression level of the
+                             package. Valid values are None, Fast and Optima-
+                             l. Default is Optimal.
+
+Advanced options:
+
+      --include=VALUE        [Optional, Multiple] Add a file pattern to
+                             include, relative to the base path e.g. /bin/-
+                             *.dll - if none are specified, defaults to **.
+      --overwrite            [Optional] Allow an existing package file of the
+                             same ID/version to be overwritten.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+```
+
+## Basic example
+
+This example packs the contents of a temp directory:
+
+Windows:
+
+```bash
+octo pack --id="MyPackage" --format="zip" --version="1.0.0.0" --basePath="c:\temp\MyPackage" --outFolder="c:\temp"
+```
+
+Linux:
+
+```bash
+octo pack --id="MyPackage" --format="zip" --version="1.0.0.0" --basePath="/tmp/MyPackage" --outFolder="/tmp"
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
+- [Create packages with the Octopus CLI](/docs/packaging-applications/create-packages/octopus-cli)
diff --git a/src/pages/docs/cli/octopus-cli/prevent-releaseprogression.md b/src/pages/docs/cli/octopus-cli/prevent-releaseprogression.md
new file mode 100644
index 0000000000..6b7b2d8669
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/prevent-releaseprogression.md
@@ -0,0 +1,92 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2024-06-25
+title: Prevent release progression
+description: Prevents a release from progressing to next phase
+navOrder: 100
+---
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to prevent a release from progressing to next phase.
+
+```text
+Prevents a release from progressing to the next phase.
+
+Usage: octo prevent-releaseprogression [<options>]
+
+Where [<options>] is any of:
+
+Preventing release progression:
+
+      --project=VALUE        Name or ID of the project.
+      --version, --releaseNumber=VALUE
+                             Release version/number.
+      --reason=VALUE         Reason to prevent this release from progressing
+                             to next phase.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic example
+
+This example prevents release 1.0.0.0 of WingtipToys from being deployed to the next environment:
+
+```bash
+octo prevent-releaseprogression --project="WingtipToys" --releaseNumber="1.0.0.0" --reason="Invalid cast conversion exception" --server="https://your-octopus-url" --apiKey="API-YOUR-KEY"
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/octopus-cli/promote-release.md b/src/pages/docs/cli/octopus-cli/promote-release.md
new file mode 100644
index 0000000000..aa0bfe607c
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/promote-release.md
@@ -0,0 +1,162 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Promote release
+description: Using the Octopus CLI to promote releases between environments.
+navOrder: 100
+---
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to promote a release from one environment to another.
+
+```text
+Promotes a release.
+
+Usage: octo promote-release [<options>]
+
+Where [<options>] is any of:
+
+Release Promotion:
+
+      --project=VALUE        Name or ID of the project.
+      --from=VALUE           Name or ID of the environment to get the current
+                             deployment from, e.g., 'Staging' or
+                             'Environments-2'.
+      --to, --deployTo=VALUE Name or ID of the environment to deploy to, e.g-
+                             ., 'Production' or 'Environments-1'.
+      --updateVariables      Overwrite the variable snapshot for the release
+                             by re-importing the variables from the project.
+      --latestSuccessful     Use the latest successful release to promote.
+
+Deployment:
+
+      --progress             [Optional] Show progress of the deployment.
+      --forcePackageDownload [Optional] Whether to force downloading of
+                             already installed packages (flag, default false).
+      --waitForDeployment    [Optional] Whether to wait synchronously for
+                             deployment to finish.
+      --deploymentTimeout=VALUE
+                             [Optional] Specifies maximum time (timespan
+                             format) that the console session will wait for
+                             the deployment to finish(default 00:10:00). This
+                             will not stop the deployment. Requires --
+                             waitForDeployment parameter set.
+      --cancelOnTimeout      [Optional] Whether to cancel the deployment if
+                             the deployment timeout is reached (flag, default
+                             false).
+      --deploymentCheckSleepCycle=VALUE
+                             [Optional] Specifies how much time (timespan
+                             format) should elapse between deployment status
+                             checks (default 00:00:10).
+      --guidedFailure=VALUE  [Optional] Whether to use guided failure mode.
+                             (True or False. If not specified, will use
+                             default setting from environment).
+      --specificMachines=VALUE
+                             [Optional] A comma-separated list of machine
+                             names to target in the deployed environment. If
+                             not specified all machines in the environment
+                             will be considered.
+      --excludeMachines=VALUE
+                             [Optional] A comma-separated list of machine
+                             names to exclude in the deployed environment. If
+                             not specified all machines in the environment
+                             will be considered.
+      --force                [Optional] If a project is configured to skip
+                             packages with already-installed versions,
+                             override this setting to force re-deployment
+                             (flag, default false).
+      --skip=VALUE           [Optional] Skip a step by name.
+      --noRawLog             [Optional] Don't print the raw log of failed
+                             tasks.
+      --rawLogFile=VALUE     [Optional] Redirect the raw log of failed tasks
+                             to a file.
+  -v, --variable=VALUE       [Optional] Specifies the value for a prompted
+                             variable in the format Label:Value. For JSON
+                             values, embedded quotation marks should be
+                             escaped with a backslash.
+      --deployAt=VALUE       [Optional] Time at which deployment should start
+                             (scheduled deployment), specified as any valid
+                             DateTimeOffset format, and assuming the time
+                             zone is the current local time zone.
+      --noDeployAfter=VALUE  [Optional] Time at which scheduled deployment
+                             should expire, specified as any valid
+                             DateTimeOffset format, and assuming the time
+                             zone is the current local time zone.
+      --tenant=VALUE         [Optional] Create a deployment for the tenant
+                             with this name or ID; specify this argument
+                             multiple times to add multiple tenants or use
+                             `*` wildcard to deploy to all tenants who are
+                             ready for this release (according to lifecycle).
+      --tenantTag=VALUE      [Optional] Create a deployment for tenants
+                             matching this tag; specify this argument
+                             multiple times to build a query/filter with
+                             multiple tags, just like you can in the user
+                             interface.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic Example {#Promotingreleases-Basicexample}
+
+The following command promotes the latest release of the *Web* project deployed to Development to the environment Staging.
+
+```bash
+octo promote-release --project Web --from Development --to Staging -progress --server http://MyOctopusServerURL.com --apikey MyAPIKey
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
+- [Releases](/docs/releases)
diff --git a/src/pages/docs/cli/octopus-cli/push-metadata.md b/src/pages/docs/cli/octopus-cli/push-metadata.md
new file mode 100644
index 0000000000..8bc5a2b2ae
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/push-metadata.md
@@ -0,0 +1,96 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Push metadata
+description: Pushes package metadata to Octopus Server.
+navOrder: 100
+---
+
+This command has been deprecated. Please use the [build-information](/docs/cli/octopus-cli/build-information) command for Octopus Server 2019.10.0 and above.
+
+Pushes package metadata (and [build information](/docs/packaging-applications/build-servers/build-information)) to your Octopus Server.
+
+```text
+Pushes package metadata to Octopus Server.  Deprecated. Please use the build-information command for Octopus Server 2019.10.0 and above.
+
+Usage: octo push-metadata [<options>]
+
+Where [<options>] is any of:
+
+Package metadata pushing:
+
+      --package-id=VALUE     The ID of the package, e.g., 'MyCompany.MyApp'.
+      --version=VALUE        The version of the package; defaults to a
+                             timestamp-based version.
+      --metadata-file=VALUE  Octopus Package metadata Json file.
+      --overwrite-mode=VALUE Determines behavior if the package already
+                             exists in the repository. Valid values are
+                             FailIfExists, OverwriteExisting and
+                             IgnoreIfExists. Default is FailIfExists.
+      --replace-existing     If the package metadata already exists in the
+                             repository, the default behavior is to reject
+                             the new package metadata being pushed. You can
+                             pass this flag to overwrite the existing package
+                             metadata. This flag may be deprecated in a
+                             future version; passing it is the same as using
+                             the OverwriteExisting overwrite-mode.
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/octopus-cli/push.md b/src/pages/docs/cli/octopus-cli/push.md
new file mode 100644
index 0000000000..4c7e2793ad
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/push.md
@@ -0,0 +1,117 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2024-06-25
+title: Push
+description: Pushes a package (.nupkg, .zip, .tar.gz, etc.) package to the built-in NuGet repository in an Octopus Server.
+navOrder: 100
+---
+
+Pushes a [package](/docs/packaging-applications/create-packages) (.nupkg, .zip, .tar.gz, etc.) package to the built-in NuGet repository in an Octopus Server.
+
+Learn more about the [built-in repository](/docs/packaging-applications/package-repositories/built-in-repository).
+
+**push options**
+
+```text
+Pushes a package (.nupkg, .zip, .tar.gz, .jar, .war, etc.) package to the built-in NuGet repository in an Octopus Server.
+
+Usage: octo push [<options>]
+
+Where [<options>] is any of:
+
+Package pushing:
+
+      --package=VALUE        Package file to push. Specify multiple packages
+                             by specifying this argument multiple times:
+                             --package package1 --package package2.
+      --overwrite-mode=VALUE Determines behavior if the package already
+                             exists in the repository. Valid values are
+                             FailIfExists, OverwriteExisting and
+                             IgnoreIfExists. Default is FailIfExists.
+      --replace-existing     If the package already exists in the repository,
+                             the default behavior is to reject the new
+                             package being pushed. You can pass this flag to
+                             overwrite the existing package. This flag may be
+                             deprecated in a future version; passing it is
+                             the same as using the OverwriteExisting
+                             overwrite-mode.
+      --use-delta-compression=VALUE
+                             Allows disabling of delta compression when
+                             uploading packages to the Octopus Server. (True
+                             or False. Defaults to true.)
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic example
+
+This example pushes a package to the built-in Octopus Deploy repository:
+
+Windows:
+
+```bash
+octo push --package="c:\temp\MyPackage.1.0.0.0.zip" --server="https://your-octopus-url" --apiKey="API-YOUR-KEY"
+```
+
+Linux:
+
+```bash
+octo push --package="/tmp/MyPackage.1.0.0.0.zip" --server="https://your-octopus-url" --apiKey="API-YOUR-KEY"
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/octopus-cli/run-runbook.md b/src/pages/docs/cli/octopus-cli/run-runbook.md
new file mode 100644
index 0000000000..32cef65cdd
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/run-runbook.md
@@ -0,0 +1,186 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Run a runbook
+description: Using the Octopus CLI to run a runbook.
+navOrder: 100
+---
+
+The [Octopus CLI](/docs/cli/octopus-cli) can be used to run runbooks that have already been created.
+
+```text
+Runs a Runbook.
+
+Usage: octo run-runbook [<options>]
+
+Where [<options>] is any of:
+
+Run Runbook:
+
+      --project=VALUE        Name or ID of the project that contains the
+                             Runbook. This is required.
+      --runbook=VALUE        Name or ID of the runbook. If the name is
+                             supplied, the project parameter must also be
+                             specified.
+      --environment=VALUE    Name or ID of the environment to run in, e.g .,
+                             'Production' or 'Environments-1'; specify this
+                             argument multiple times to run in multiple
+                             environments.
+      --snapshot=VALUE       [Optional] Name or ID of the snapshot to run. If
+                             not supplied, the command will attempt to use
+                             the published snapshot.
+      --forcePackageDownload [Optional] Whether to force downloading of
+                             already installed packages (flag, default false).
+      --guidedFailure=VALUE  [Optional] Whether to use Guided Failure mode.
+                             (True or False. If not specified, will use
+                             default setting from environment)
+      --specificMachines=VALUE
+                             [Optional] A comma-separated list of machine
+                             names to target in the specified environment/s.
+                             If not specified all machines in the environment
+                             will be considered.
+      --excludeMachines=VALUE
+                             [Optional] A comma-separated list of machine
+                             names to exclude in the specified environment/s.
+                             If not specified all machines in the environment
+                             will be considered.
+      --tenant=VALUE         [Optional] Run a runbook on the tenant with this
+                             name or ID; specify this argument multiple times
+                             to add multiple tenants or use `*` wildcard to
+                             deploy to all tenants who are ready for this
+                             release (according to lifecycle).
+      --tenantTag=VALUE      [Optional] Run a runbook on the tenants matching
+                             this tag; specify this argument multiple times
+                             to build a query/filter with multiple tags, just
+                             like you can in the user interface.
+      --skip=VALUE           [Optional] Skip a step by name
+      --runAt=VALUE          [Optional] Time at which runbook run should
+                             start (scheduled run), specified as any valid
+                             DateTimeOffset format, and assuming the time
+                             zone is the current local time zone.
+      --noRunAfter=VALUE     [Optional] Time at which scheduled runbook run
+                             should expire, specified as any valid
+                             DateTimeOffset format, and assuming the time
+                             zone is the current local time zone.
+  -v, --variable=VALUE       [Optional] Specifies the value for a prompted
+                             variable in the format Name:Value. For JSON
+                             values, embedded quotation marks should be
+                             escaped with a backslash.
+      --waitForRun           [Optional] Whether to wait synchronously for
+                             deployment to finish.
+      --progress             [Optional] Show progress of the runbook run
+      --runTimeout=VALUE     [Optional] Specifies maximum time (time span
+                             format) that the console session will wait for
+                             the runbook run to finish (default 00:10:00).
+                             This will not stop the run. Requires --
+                             waitForRun parameter to be set.
+      --cancelOnTimeout      [Optional] Whether to cancel the runbook run if
+                             the run timeout is reached (flag, default false).
+      --runCheckSleepCycle=VALUE
+                             [Optional] Specifies how much time (time span
+                             format) should elapse between runbook run status
+                             checks (default 00:00:10)
+      --noRawLog             [Optional] Don't print the raw log of failed
+                             tasks
+      --rawLogFile=VALUE     [Optional] Redirect the raw log of failed tasks
+                             to a file
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+      --outputFormat=VALUE   [Optional] Output format, valid options are
+                             Default or Json
+      --server=VALUE         [Optional] The base URL for your Octopus Server,
+                             e.g., 'https://octopus.example.com/'. This URL
+                             can also be set in the OCTOPUS_CLI_SERVER
+                             environment variable.
+      --apiKey=VALUE         [Optional] Your API key. Get this from the user
+                             profile page. You must provide an apiKey or
+                             username and password. If the guest account is
+                             enabled, a key of API-GUEST can be used. This
+                             key can also be set in the OCTOPUS_CLI_API_KEY
+                             environment variable.
+      --user=VALUE           [Optional] Username to use when authenticating
+                             with the server. You must provide an apiKey or
+                             username and password. This Username can also be
+                             set in the OCTOPUS_CLI_USERNAME environment
+                             variable.
+      --pass=VALUE           [Optional] Password to use when authenticating
+                             with the server. This Password can also be set
+                             in the OCTOPUS_CLI_PASSWORD environment variable.
+      --configFile=VALUE     [Optional] Text file of default values, with one
+                             'key = value' per line.
+      --debug                [Optional] Enable debug logging.
+      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
+                             uses HTTPS but the certificate is not trusted on
+                             this machine. Any certificate errors will be
+                             ignored. WARNING: this option may create a
+                             security vulnerability.
+      --enableServiceMessages
+                             [Optional] Enable TeamCity or Team Foundation
+                             Build service messages when logging.
+      --timeout=VALUE        [Optional] Timeout in seconds for network
+                             operations. Default is 600.
+      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
+                             'https://proxy.example.com'.
+      --proxyUser=VALUE      [Optional] The username for the proxy.
+      --proxyPass=VALUE      [Optional] The password for the proxy. If both
+                             the username and password are omitted and
+                             proxyAddress is specified, the default
+                             credentials are used.
+      --space=VALUE          [Optional] The name or ID of a space within
+                             which this command will be executed. The default
+                             space will be used if it is omitted.
+      --logLevel=VALUE       [Optional] The log level. Valid options are
+                             verbose, debug, information, warning, error and
+                             fatal. Defaults to 'debug'.
+```
+
+## Basic Examples {#basic-examples}
+
+This runs a runbook using the published snapshot:
+
+```bash
+octo run-runbook --runbook="Hello World"  \
+                 --project="Smurfs"       \
+                 --environment="Test"     \
+                 --server="https://your-octopus-url" \
+                 --apiKey="API-YOUR-KEY"
+```
+
+This runs a runbook using a specific snapshot (e.g., Snapshot XXXXX):
+
+```bash
+octo run-runbook --runbook="Hello World"       \
+                 --project="Smurfs"            \
+                 --environment="Test"          \
+                 --snapshot="Snapshot XXXXX" \
+                 --server="https://your-octopus-url"    \
+                 --apiKey="API-YOUR-KEY"
+```
+
+To specify multiple environments, you can use the following:
+
+```bash
+octo run-runbook --runbook="Hello World"  \
+                 --project="Smurfs"       \
+                 --environment="Test"     \
+                 --environment="Dev"      \
+                 --server="https://your-octopus-url" \
+                 --apiKey="API-YOUR-KEY"
+```
+
+:::div{.success}
+You can run a runbook on ALL tenants in an environment by using the `--tenant=*` argument.
+:::
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Runbooks](/docs/runbooks)
+- [Octopus REST API](/docs/octopus-rest-api)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/cli/octopus-cli/version.md b/src/pages/docs/cli/octopus-cli/version.md
new file mode 100644
index 0000000000..f2ee531535
--- /dev/null
+++ b/src/pages/docs/cli/octopus-cli/version.md
@@ -0,0 +1,38 @@
+---
+layout: src/layouts/Default.astro
+pubDate: 2023-01-01
+modDate: 2023-01-01
+title: Version
+description: Output the Octopus CLI command line tool version.
+navOrder: 100
+---
+
+This command returns the version of the Octopus CLI tool version.
+
+```text
+Outputs Octopus CLI version.
+
+Usage: octo version [<options>]
+
+Where [<options>] is any of:
+
+Common options:
+
+      --help                 [Optional] Print help for a command.
+      --helpOutputFormat=VALUE
+                             [Optional] Output format for help, valid options
+                             are Default or Json
+```
+
+## Basic example
+
+This example displays the version of the Octopus CLI:
+
+```bash
+octo --version
+```
+
+## Learn more
+
+- [Octopus CLI](/docs/cli/octopus-cli)
+- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/deployments/databases/mysql-flyway/index.md b/src/pages/docs/deployments/databases/mysql-flyway/index.md
index 0438000d2d..8ccc718306 100644
--- a/src/pages/docs/deployments/databases/mysql-flyway/index.md
+++ b/src/pages/docs/deployments/databases/mysql-flyway/index.md
@@ -58,7 +58,7 @@ Flyway itself is already compiled, so there's no need to do anything for buildin
 Within a Jenkins project, navigate to **Build Environment**, and in the **Build** section, click **Add Build Step** and choose **Octopus Deploy Package application**.
 
 :::div{.hint}
-The [Octopus Deploy Jenkins plugin](/docs/packaging-applications/build-servers/jenkins/#install-the-octopus-jenkins-plugin) needs to be installed to use these templates.  You also need to download the [Octopus CLI](/docs/octopus-rest-api/octopus-cli) on to the Jenkins build agent(s).
+The [Octopus Deploy Jenkins plugin](/docs/packaging-applications/build-servers/jenkins/#install-the-octopus-jenkins-plugin) needs to be installed to use these templates.  You also need to download the [Octopus CLI](/docs/cli/octopus-cli) on to the Jenkins build agent(s).
 :::
 
 Fill in the inputs:
diff --git a/src/pages/docs/deployments/patterns/elastic-and-transient-environments/keeping-deployment-targets-up-to-date.md b/src/pages/docs/deployments/patterns/elastic-and-transient-environments/keeping-deployment-targets-up-to-date.md
index 31d2da8015..06ed4e50cd 100644
--- a/src/pages/docs/deployments/patterns/elastic-and-transient-environments/keeping-deployment-targets-up-to-date.md
+++ b/src/pages/docs/deployments/patterns/elastic-and-transient-environments/keeping-deployment-targets-up-to-date.md
@@ -60,7 +60,7 @@ To test the trigger, we will disable a deployment target, deploy to that target'
 
 ## Overriding the release used for automatic deployments {#override-release-for-automatic-deployments}
 
-Automatic deployments attempts to calculate the release to use for a project and environment (using the *current* and *successful* release that has been deployed, as shown in your Project Overview dashboard). In some cases the calculated release may not be the release that should be automatically deployed, or Octopus may not be able to find a deployment for an environment (maybe you have a release, but have not yet deployed it anywhere). It is possible to explicitly set the release that should be automatically deployed by overriding the automatic-deployment-release. Overrides can be configured using the [Octopus CLI](/docs/octopus-rest-api/octopus-cli/) or through [Octopus.Client](/docs/octopus-rest-api/octopus.client). Overrides define a release for a project when deploying to an environment (this can, for example, be useful for cloud-testing-automation when standing up new cloud infrastructure). For multi-tenanted deployments, overrides may be configured for each environment/tenant combination.
+Automatic deployments attempts to calculate the release to use for a project and environment (using the *current* and *successful* release that has been deployed, as shown in your Project Overview dashboard). In some cases the calculated release may not be the release that should be automatically deployed, or Octopus may not be able to find a deployment for an environment (maybe you have a release, but have not yet deployed it anywhere). It is possible to explicitly set the release that should be automatically deployed by overriding the automatic-deployment-release. Overrides can be configured using the [Octopus CLI](/docs/cli/octopus-cli/) or through [Octopus.Client](/docs/octopus-rest-api/octopus.client). Overrides define a release for a project when deploying to an environment (this can, for example, be useful for cloud-testing-automation when standing up new cloud infrastructure). For multi-tenanted deployments, overrides may be configured for each environment/tenant combination.
 
 **Octopus.Client**
 
diff --git a/src/pages/docs/deployments/patterns/rollbacks/index.md b/src/pages/docs/deployments/patterns/rollbacks/index.md
index 66c7e29edb..7b958955b1 100644
--- a/src/pages/docs/deployments/patterns/rollbacks/index.md
+++ b/src/pages/docs/deployments/patterns/rollbacks/index.md
@@ -110,7 +110,7 @@ The usage will be:
 
 ## Automatic trigger of rollbacks
 
-Using the [Octopus CLI](/docs/octopus-rest-api/octopus-cli/deploy-release), or [one of our step templates](https://library.octopus.com/step-templates/0dac2fe6-91d5-4c05-bdfb-1b97adf1e12e/actiontemplate-deploy-child-octopus-deploy-project) it is possible to automatically trigger a rollback process.  
+Using the [Octopus CLI](/docs/cli/octopus-cli/deploy-release), or [one of our step templates](https://library.octopus.com/step-templates/0dac2fe6-91d5-4c05-bdfb-1b97adf1e12e/actiontemplate-deploy-child-octopus-deploy-project) it is possible to automatically trigger a rollback process.  
 
 While it is possible to automatically trigger a rollback, this is not something we recommend unless you have a robust testing suite and you've tested your rollback process multiple times.  We recommend first manually triggering the rollback.  Once you are confident in your rollback process, look into updating your process to be automatically triggered.
 
diff --git a/src/pages/docs/getting-started-guides/octopus-concepts/octopus-cli.md b/src/pages/docs/getting-started-guides/octopus-concepts/octopus-cli.md
index 179d7af5b1..248236f205 100644
--- a/src/pages/docs/getting-started-guides/octopus-concepts/octopus-cli.md
+++ b/src/pages/docs/getting-started-guides/octopus-concepts/octopus-cli.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli
+redirect: https://octopus.com/docs/cli/octopus-cli
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/getting-started/octopus-concepts/octopus-cli.md b/src/pages/docs/getting-started/octopus-concepts/octopus-cli.md
index 179d7af5b1..248236f205 100644
--- a/src/pages/docs/getting-started/octopus-concepts/octopus-cli.md
+++ b/src/pages/docs/getting-started/octopus-concepts/octopus-cli.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli
+redirect: https://octopus.com/docs/cli/octopus-cli
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/llms-full.txt.ts b/src/pages/docs/llms-full.txt.ts
index 05d3c82e47..9a68f72e08 100644
--- a/src/pages/docs/llms-full.txt.ts
+++ b/src/pages/docs/llms-full.txt.ts
@@ -1,6 +1,6 @@
 import { accelerator } from '@lib/accelerator';
 import { SITE } from '@config';
-import { flattenGeneratedApiPath } from '@lib/generatedApiPaths';
+import { flattenGeneratedPath } from '@lib/generatedPaths';
 import {
   compareForLlmSurfaces,
   eligibleForMarkdown,
@@ -39,7 +39,7 @@ async function getData() {
     if (!verdict.eligible) continue;
 
     const url = accelerator.urlFormatter.formatAddress(
-      flattenGeneratedApiPath(article.url ?? '')
+      flattenGeneratedPath(article.url ?? '')
     );
     if (!url.startsWith(subfolderPrefix)) continue;
     if (url.endsWith('/')) continue;
diff --git a/src/pages/docs/llms.txt.ts b/src/pages/docs/llms.txt.ts
index 40104a8801..cb66815676 100644
--- a/src/pages/docs/llms.txt.ts
+++ b/src/pages/docs/llms.txt.ts
@@ -2,7 +2,7 @@
 
 import { accelerator } from '@lib/accelerator';
 import { SITE } from '@config';
-import { flattenGeneratedApiPath } from '@lib/generatedApiPaths';
+import { flattenGeneratedPath } from '@lib/generatedPaths';
 import {
   compareForLlmSurfaces,
   eligibleForMarkdown,
@@ -41,7 +41,7 @@ async function getData() {
     if (!verdict.eligible) continue;
 
     const url = accelerator.urlFormatter.formatAddress(
-      flattenGeneratedApiPath(article.url ?? '')
+      flattenGeneratedPath(article.url ?? '')
     );
     if (!url.startsWith(subfolderPrefix)) continue;
     if (url.endsWith('/')) continue;
diff --git a/src/pages/docs/octopus-concepts/octo.exe.md b/src/pages/docs/octopus-concepts/octo.exe.md
index 179d7af5b1..248236f205 100644
--- a/src/pages/docs/octopus-concepts/octo.exe.md
+++ b/src/pages/docs/octopus-concepts/octo.exe.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli
+redirect: https://octopus.com/docs/cli/octopus-cli
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-concepts/octopus-cli.md b/src/pages/docs/octopus-concepts/octopus-cli.md
index 179d7af5b1..248236f205 100644
--- a/src/pages/docs/octopus-concepts/octopus-cli.md
+++ b/src/pages/docs/octopus-concepts/octopus-cli.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli
+redirect: https://octopus.com/docs/cli/octopus-cli
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/index.md b/src/pages/docs/octopus-rest-api/cli/index.md
index ae305855ea..bb897a50db 100644
--- a/src/pages/docs/octopus-rest-api/cli/index.md
+++ b/src/pages/docs/octopus-rest-api/cli/index.md
@@ -1,207 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: CLI
-description: The all-new Octopus CLI
-navOrder: 100
-hideInThisSection: true
----
-
-The Octopus CLI is a command line tool that builds on top of the [Octopus Deploy REST API](/docs/octopus-rest-api). With the Octopus CLI you can push your application packages for deployment as either Zip or NuGet packages, and manage your environments, deployments, projects, and workers.
-
-The Octopus CLI can be used on Windows, Mac, Linux and Docker. For installation options and direct downloads, visit the [CLI Readme](https://github.com/OctopusDeploy/cli/blob/main/README.md).
-
-:::div{.hint}
-The Octopus CLI is built and maintained by the Octopus Deploy team, but it is also open source. You can [view the Octopus CLI project on GitHub](https://github.com/OctopusDeploy/cli), which leans heavily on the [go-octopusdeploy library](https://github.com/OctopusDeploy/go-octopusdeploy).
-:::
-
-## Commands {#octopusCommandLine-Commands}
-
-`octopus` supports the following commands:
-
-- **[octopus](/docs/octopus-rest-api/cli/octopus)**:  Octopus Deploy CLI.
-- **[octopus account](/docs/octopus-rest-api/cli/octopus-account)**:  Manage accounts.
-- **[octopus account aws](/docs/octopus-rest-api/cli/octopus-account-aws)**:  Manage AWS accounts.
-- **[octopus account aws create](/docs/octopus-rest-api/cli/octopus-account-aws-create)**:  Create an AWS account.
-- **[octopus account aws list](/docs/octopus-rest-api/cli/octopus-account-aws-list)**:  List AWS accounts.
-- **[octopus account azure](/docs/octopus-rest-api/cli/octopus-account-azure)**:  Manage Azure subscription accounts.
-- **[octopus account azure create](/docs/octopus-rest-api/cli/octopus-account-azure-create)**:  Create an Azure subscription account.
-- **[octopus account azure list](/docs/octopus-rest-api/cli/octopus-account-azure-list)**:  List Azure subscription accounts.
-- **[octopus account azure-oidc](/docs/octopus-rest-api/cli/octopus-account-azure-oidc)**:  Manage Azure OpenID Connect accounts.
-- **[octopus account azure-oidc create](/docs/octopus-rest-api/cli/octopus-account-azure-oidc-create)**:  Create an Azure OpenID Connect account.
-- **[octopus account azure-oidc list](/docs/octopus-rest-api/cli/octopus-account-azure-oidc-list)**:  List Azure OpenID Connect accounts.
-- **[octopus account create](/docs/octopus-rest-api/cli/octopus-account-create)**:  Create an account.
-- **[octopus account delete](/docs/octopus-rest-api/cli/octopus-account-delete)**:  Delete an account.
-- **[octopus account gcp](/docs/octopus-rest-api/cli/octopus-account-gcp)**:  Manage Google Cloud accounts.
-- **[octopus account gcp create](/docs/octopus-rest-api/cli/octopus-account-gcp-create)**:  Create a Google Cloud account.
-- **[octopus account gcp list](/docs/octopus-rest-api/cli/octopus-account-gcp-list)**:  List Google Cloud accounts.
-- **[octopus account generic-oidc](/docs/octopus-rest-api/cli/octopus-account-generic-oidc)**:  Manage Generic OpenID Connect accounts.
-- **[octopus account generic-oidc create](/docs/octopus-rest-api/cli/octopus-account-generic-oidc-create)**:  Create an Generic OpenID Connect account.
-- **[octopus account generic-oidc list](/docs/octopus-rest-api/cli/octopus-account-generic-oidc-list)**:  List Generic OpenID Connect accounts.
-- **[octopus account list](/docs/octopus-rest-api/cli/octopus-account-list)**:  List accounts.
-- **[octopus account ssh](/docs/octopus-rest-api/cli/octopus-account-ssh)**:  Manage SSH Key Pair accounts.
-- **[octopus account ssh create](/docs/octopus-rest-api/cli/octopus-account-ssh-create)**:  Create a SSH Key Pair account.
-- **[octopus account ssh list](/docs/octopus-rest-api/cli/octopus-account-ssh-list)**:  List SSH Key Pair accounts.
-- **[octopus account token](/docs/octopus-rest-api/cli/octopus-account-token)**:  Manage Token accounts.
-- **[octopus account token create](/docs/octopus-rest-api/cli/octopus-account-token-create)**:  Create a Token account.
-- **[octopus account token list](/docs/octopus-rest-api/cli/octopus-account-token-list)**:  List Token accounts.
-- **[octopus account username](/docs/octopus-rest-api/cli/octopus-account-username)**:  Manage Username/Password accounts.
-- **[octopus account username create](/docs/octopus-rest-api/cli/octopus-account-username-create)**:  Create a Username/Password account.
-- **[octopus account username list](/docs/octopus-rest-api/cli/octopus-account-username-list)**:  List Username/Password accounts.
-- **[octopus api](/docs/octopus-rest-api/cli/octopus-api)**:  Execute a raw API GET request.
-- **[octopus build-information](/docs/octopus-rest-api/cli/octopus-build-information)**:  Manage build information.
-- **[octopus build-information bulk-delete](/docs/octopus-rest-api/cli/octopus-build-information-bulk-delete)**:  Bulk delete build information.
-- **[octopus build-information delete](/docs/octopus-rest-api/cli/octopus-build-information-delete)**:  Delete a build information.
-- **[octopus build-information list](/docs/octopus-rest-api/cli/octopus-build-information-list)**:  List build information.
-- **[octopus build-information upload](/docs/octopus-rest-api/cli/octopus-build-information-upload)**:  upload build information for one or more packages to Octopus Deploy.
-- **[octopus build-information view](/docs/octopus-rest-api/cli/octopus-build-information-view)**:  View a build information.
-- **[octopus channel](/docs/octopus-rest-api/cli/octopus-channel)**:  Manage channels.
-- **[octopus channel create](/docs/octopus-rest-api/cli/octopus-channel-create)**:  Create a channel.
-- **[octopus channel delete](/docs/octopus-rest-api/cli/octopus-channel-delete)**:  Delete a channel.
-- **[octopus channel list](/docs/octopus-rest-api/cli/octopus-channel-list)**:  List channels.
-- **[octopus channel view](/docs/octopus-rest-api/cli/octopus-channel-view)**:  View a channel.
-- **[octopus config](/docs/octopus-rest-api/cli/octopus-config)**:  Manage CLI configuration.
-- **[octopus config get](/docs/octopus-rest-api/cli/octopus-config-get)**:  Gets the value of config key for Octopus CLI.
-- **[octopus config list](/docs/octopus-rest-api/cli/octopus-config-list)**:  List values from config file.
-- **[octopus config set](/docs/octopus-rest-api/cli/octopus-config-set)**:  Set will write the value for given key to Octopus CLI config file.
-- **[octopus deployment-target](/docs/octopus-rest-api/cli/octopus-deployment-target)**:  Manage deployment targets.
-- **[octopus deployment-target azure-web-app](/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app)**:  Manage Azure Web App deployment targets.
-- **[octopus deployment-target azure-web-app create](/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-create)**:  Create an Azure Web App deployment target.
-- **[octopus deployment-target azure-web-app list](/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-list)**:  List Azure Web App deployment targets.
-- **[octopus deployment-target azure-web-app view](/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-view)**:  View an Azure Web App deployment target.
-- **[octopus deployment-target cloud-region](/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region)**:  Manage Cloud Region deployment targets.
-- **[octopus deployment-target cloud-region create](/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-create)**:  Create a Cloud Region deployment target.
-- **[octopus deployment-target cloud-region list](/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-list)**:  List Cloud Region deployment targets.
-- **[octopus deployment-target cloud-region view](/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-view)**:  View a Cloud Region deployment target.
-- **[octopus deployment-target delete](/docs/octopus-rest-api/cli/octopus-deployment-target-delete)**:  Delete a deployment target.
-- **[octopus deployment-target kubernetes](/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes)**:  Manage Kubernetes deployment targets.
-- **[octopus deployment-target kubernetes create](/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-create)**:  Create a Kubernetes deployment target.
-- **[octopus deployment-target kubernetes list](/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-list)**:  List Kubernetes deployment targets.
-- **[octopus deployment-target kubernetes view](/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-view)**:  View a Kubernetes deployment target.
-- **[octopus deployment-target list](/docs/octopus-rest-api/cli/octopus-deployment-target-list)**:  List deployment targets.
-- **[octopus deployment-target listening-tentacle](/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle)**:  Manage Listening Tentacle deployment targets.
-- **[octopus deployment-target listening-tentacle create](/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-create)**:  Create a Listening Tentacle deployment target.
-- **[octopus deployment-target listening-tentacle list](/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-list)**:  List Listening Tentacle deployment targets.
-- **[octopus deployment-target listening-tentacle view](/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-view)**:  View a Listening Tentacle deployment target.
-- **[octopus deployment-target polling-tentacle](/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle)**:  Manage Polling Tentacle deployment targets.
-- **[octopus deployment-target polling-tentacle list](/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-list)**:  List Polling Tentacle deployment targets.
-- **[octopus deployment-target polling-tentacle view](/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-view)**:  View a Polling Tentacle deployment target.
-- **[octopus deployment-target ssh](/docs/octopus-rest-api/cli/octopus-deployment-target-ssh)**:  Manage SSH deployment targets.
-- **[octopus deployment-target ssh create](/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-create)**:  Create a SSH deployment target.
-- **[octopus deployment-target ssh list](/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-list)**:  List SSH deployment targets.
-- **[octopus deployment-target ssh view](/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-view)**:  View a SSH deployment target.
-- **[octopus deployment-target view](/docs/octopus-rest-api/cli/octopus-deployment-target-view)**:  View a deployment target.
-- **[octopus environment](/docs/octopus-rest-api/cli/octopus-environment)**:  Manage environments.
-- **[octopus environment create](/docs/octopus-rest-api/cli/octopus-environment-create)**:  Create an environment.
-- **[octopus environment delete](/docs/octopus-rest-api/cli/octopus-environment-delete)**:  Delete an environment.
-- **[octopus environment list](/docs/octopus-rest-api/cli/octopus-environment-list)**:  List environments.
-- **[octopus environment tag](/docs/octopus-rest-api/cli/octopus-environment-tag)**:  Override tags for an environment.
-- **[octopus ephemeral-environment](/docs/octopus-rest-api/cli/octopus-ephemeral-environment)**:  Manage ephemeral environments.
-- **[octopus ephemeral-environment create](/docs/octopus-rest-api/cli/octopus-ephemeral-environment-create)**:  Create an ephemeral environment.
-- **[octopus ephemeral-environment deprovision-environment](/docs/octopus-rest-api/cli/octopus-ephemeral-environment-deprovision-environment)**:  Deprovision an environment.
-- **[octopus ephemeral-environment deprovision-project](/docs/octopus-rest-api/cli/octopus-ephemeral-environment-deprovision-project)**:  Deprovision an ephemeral environment for a project.
-- **[octopus login](/docs/octopus-rest-api/cli/octopus-login)**:  Login to Octopus.
-- **[octopus logout](/docs/octopus-rest-api/cli/octopus-logout)**:  Logout of Octopus.
-- **[octopus package](/docs/octopus-rest-api/cli/octopus-package)**:  Manage packages.
-- **[octopus package delete](/docs/octopus-rest-api/cli/octopus-package-delete)**:  Delete a package.
-- **[octopus package list](/docs/octopus-rest-api/cli/octopus-package-list)**:  List packages.
-- **[octopus package nuget](/docs/octopus-rest-api/cli/octopus-package-nuget)**:  Package as NuPkg.
-- **[octopus package nuget create](/docs/octopus-rest-api/cli/octopus-package-nuget-create)**:  Create nuget.
-- **[octopus package upload](/docs/octopus-rest-api/cli/octopus-package-upload)**:  Upload one or more packages to Octopus Deploy.
-- **[octopus package versions](/docs/octopus-rest-api/cli/octopus-package-versions)**:  List versions of a package.
-- **[octopus package zip](/docs/octopus-rest-api/cli/octopus-package-zip)**:  Package as zip.
-- **[octopus package zip create](/docs/octopus-rest-api/cli/octopus-package-zip-create)**:  Create zip.
-- **[octopus project](/docs/octopus-rest-api/cli/octopus-project)**:  Manage projects.
-- **[octopus project branch](/docs/octopus-rest-api/cli/octopus-project-branch)**:  Manage project branches.
-- **[octopus project branch create](/docs/octopus-rest-api/cli/octopus-project-branch-create)**:  Create a Git branch for a project.
-- **[octopus project branch list](/docs/octopus-rest-api/cli/octopus-project-branch-list)**:  List project branches.
-- **[octopus project clone](/docs/octopus-rest-api/cli/octopus-project-clone)**:  Clone a project.
-- **[octopus project connect](/docs/octopus-rest-api/cli/octopus-project-connect)**:  Connect a tenant to a project.
-- **[octopus project convert](/docs/octopus-rest-api/cli/octopus-project-convert)**:  Convert a project to use Config As Code.
-- **[octopus project create](/docs/octopus-rest-api/cli/octopus-project-create)**:  Create a project.
-- **[octopus project delete](/docs/octopus-rest-api/cli/octopus-project-delete)**:  Delete a project.
-- **[octopus project disable](/docs/octopus-rest-api/cli/octopus-project-disable)**:  Disable a project.
-- **[octopus project disconnect](/docs/octopus-rest-api/cli/octopus-project-disconnect)**:  Disconnect a tenant from a project.
-- **[octopus project enable](/docs/octopus-rest-api/cli/octopus-project-enable)**:  Enable a project.
-- **[octopus project list](/docs/octopus-rest-api/cli/octopus-project-list)**:  List projects.
-- **[octopus project tag](/docs/octopus-rest-api/cli/octopus-project-tag)**:  Override tags for a project.
-- **[octopus project variables](/docs/octopus-rest-api/cli/octopus-project-variables)**:  Manage project variables.
-- **[octopus project variables create](/docs/octopus-rest-api/cli/octopus-project-variables-create)**:  Create a variable for a project.
-- **[octopus project variables delete](/docs/octopus-rest-api/cli/octopus-project-variables-delete)**:  Delete a project variable.
-- **[octopus project variables exclude](/docs/octopus-rest-api/cli/octopus-project-variables-exclude)**:  Exclude a variable set from a project.
-- **[octopus project variables include](/docs/octopus-rest-api/cli/octopus-project-variables-include)**:  Include a variable set in a project.
-- **[octopus project variables list](/docs/octopus-rest-api/cli/octopus-project-variables-list)**:  List project variables.
-- **[octopus project variables update](/docs/octopus-rest-api/cli/octopus-project-variables-update)**:  Update the value of a project variable.
-- **[octopus project variables view](/docs/octopus-rest-api/cli/octopus-project-variables-view)**:  View all values of a project variable.
-- **[octopus project view](/docs/octopus-rest-api/cli/octopus-project-view)**:  View a project.
-- **[octopus project-group](/docs/octopus-rest-api/cli/octopus-project-group)**:  Manage project groups.
-- **[octopus project-group create](/docs/octopus-rest-api/cli/octopus-project-group-create)**:  Create a project group.
-- **[octopus project-group delete](/docs/octopus-rest-api/cli/octopus-project-group-delete)**:  Delete a project group.
-- **[octopus project-group list](/docs/octopus-rest-api/cli/octopus-project-group-list)**:  List project groups.
-- **[octopus project-group view](/docs/octopus-rest-api/cli/octopus-project-group-view)**:  View a project group.
-- **[octopus release](/docs/octopus-rest-api/cli/octopus-release)**:  Manage releases.
-- **[octopus release create](/docs/octopus-rest-api/cli/octopus-release-create)**:  Create a release.
-- **[octopus release delete](/docs/octopus-rest-api/cli/octopus-release-delete)**:  Delete a release.
-- **[octopus release deploy](/docs/octopus-rest-api/cli/octopus-release-deploy)**:  Deploy releases.
-- **[octopus release list](/docs/octopus-rest-api/cli/octopus-release-list)**:  List releases.
-- **[octopus release progression](/docs/octopus-rest-api/cli/octopus-release-progression)**:  Manage progression of a release.
-- **[octopus release progression allow](/docs/octopus-rest-api/cli/octopus-release-progression-allow)**:  Allows a release to progress to the next phase..
-- **[octopus release progression prevent](/docs/octopus-rest-api/cli/octopus-release-progression-prevent)**:  Prevents a release from progression to the next phase.
-- **[octopus runbook](/docs/octopus-rest-api/cli/octopus-runbook)**:  Manage runbooks.
-- **[octopus runbook delete](/docs/octopus-rest-api/cli/octopus-runbook-delete)**:  Delete a runbook.
-- **[octopus runbook list](/docs/octopus-rest-api/cli/octopus-runbook-list)**:  List runbooks.
-- **[octopus runbook run](/docs/octopus-rest-api/cli/octopus-runbook-run)**:  Run runbooks in Octopus Deploy.
-- **[octopus runbook snapshot](/docs/octopus-rest-api/cli/octopus-runbook-snapshot)**:  Manage runbook snapshots.
-- **[octopus runbook snapshot create](/docs/octopus-rest-api/cli/octopus-runbook-snapshot-create)**:  Create a runbook snapshot.
-- **[octopus runbook snapshot list](/docs/octopus-rest-api/cli/octopus-runbook-snapshot-list)**:  List runbook snapshots.
-- **[octopus runbook snapshot publish](/docs/octopus-rest-api/cli/octopus-runbook-snapshot-publish)**:  Publish a runbook snapshot.
-- **[octopus space](/docs/octopus-rest-api/cli/octopus-space)**:  Manage spaces.
-- **[octopus space create](/docs/octopus-rest-api/cli/octopus-space-create)**:  Create a space.
-- **[octopus space delete](/docs/octopus-rest-api/cli/octopus-space-delete)**:  Delete a space.
-- **[octopus space list](/docs/octopus-rest-api/cli/octopus-space-list)**:  List spaces.
-- **[octopus space view](/docs/octopus-rest-api/cli/octopus-space-view)**:  View a space.
-- **[octopus task](/docs/octopus-rest-api/cli/octopus-task)**:  Manage tasks.
-- **[octopus task wait](/docs/octopus-rest-api/cli/octopus-task-wait)**:  Wait for task(s) to finish.
-- **[octopus tenant](/docs/octopus-rest-api/cli/octopus-tenant)**:  Manage tenants.
-- **[octopus tenant clone](/docs/octopus-rest-api/cli/octopus-tenant-clone)**:  Clone a tenant.
-- **[octopus tenant connect](/docs/octopus-rest-api/cli/octopus-tenant-connect)**:  Connect a tenant to a project.
-- **[octopus tenant create](/docs/octopus-rest-api/cli/octopus-tenant-create)**:  Create a tenant.
-- **[octopus tenant delete](/docs/octopus-rest-api/cli/octopus-tenant-delete)**:  Delete a tenant.
-- **[octopus tenant disable](/docs/octopus-rest-api/cli/octopus-tenant-disable)**:  Disable a tenant.
-- **[octopus tenant disconnect](/docs/octopus-rest-api/cli/octopus-tenant-disconnect)**:  Disconnect a tenant from a project.
-- **[octopus tenant enable](/docs/octopus-rest-api/cli/octopus-tenant-enable)**:  Enable a tenant.
-- **[octopus tenant list](/docs/octopus-rest-api/cli/octopus-tenant-list)**:  List tenants.
-- **[octopus tenant tag](/docs/octopus-rest-api/cli/octopus-tenant-tag)**:  Override tags for a tenant.
-- **[octopus tenant variables](/docs/octopus-rest-api/cli/octopus-tenant-variables)**:  Manage tenant variables.
-- **[octopus tenant variables list](/docs/octopus-rest-api/cli/octopus-tenant-variables-list)**:  List tenant variables.
-- **[octopus tenant variables update](/docs/octopus-rest-api/cli/octopus-tenant-variables-update)**:  Update the value of a tenant variable.
-- **[octopus tenant view](/docs/octopus-rest-api/cli/octopus-tenant-view)**:  View a tenant.
-- **[octopus user](/docs/octopus-rest-api/cli/octopus-user)**:  Manage users.
-- **[octopus user delete](/docs/octopus-rest-api/cli/octopus-user-delete)**:  Delete a user.
-- **[octopus user list](/docs/octopus-rest-api/cli/octopus-user-list)**:  List users.
-- **[octopus worker](/docs/octopus-rest-api/cli/octopus-worker)**:  Manage workers.
-- **[octopus worker delete](/docs/octopus-rest-api/cli/octopus-worker-delete)**:  Delete a worker.
-- **[octopus worker list](/docs/octopus-rest-api/cli/octopus-worker-list)**:  List workers.
-- **[octopus worker listening-tentacle](/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle)**:  Manage Listening Tentacle workers.
-- **[octopus worker listening-tentacle create](/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-create)**:  Create a listening tentacle worker.
-- **[octopus worker listening-tentacle list](/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-list)**:  List Listening Tentacle workers.
-- **[octopus worker listening-tentacle view](/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-view)**:  View a Listening Tentacle worker.
-- **[octopus worker polling-tentacle](/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle)**:  Manage Polling Tentacle workers.
-- **[octopus worker polling-tentacle list](/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-list)**:  List Polling Tentacle workers.
-- **[octopus worker polling-tentacle view](/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-view)**:  View a Polling Tentacle worker.
-- **[octopus worker ssh](/docs/octopus-rest-api/cli/octopus-worker-ssh)**:  Manage SSH workers.
-- **[octopus worker ssh create](/docs/octopus-rest-api/cli/octopus-worker-ssh-create)**:  Create a SSH worker.
-- **[octopus worker ssh list](/docs/octopus-rest-api/cli/octopus-worker-ssh-list)**:  List SSH workers.
-- **[octopus worker ssh view](/docs/octopus-rest-api/cli/octopus-worker-ssh-view)**:  View a SSH worker.
-- **[octopus worker view](/docs/octopus-rest-api/cli/octopus-worker-view)**:  View a worker.
-- **[octopus worker-pool](/docs/octopus-rest-api/cli/octopus-worker-pool)**:  Manage worker pools.
-- **[octopus worker-pool delete](/docs/octopus-rest-api/cli/octopus-worker-pool-delete)**:  Delete a worker pool.
-- **[octopus worker-pool dynamic](/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic)**:  Manage dynamic worker pools.
-- **[octopus worker-pool dynamic create](/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-create)**:  Create a dynamic worker pool.
-- **[octopus worker-pool dynamic view](/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-view)**:  View a dynamic worker pool.
-- **[octopus worker-pool list](/docs/octopus-rest-api/cli/octopus-worker-pool-list)**:  List worker pools.
-- **[octopus worker-pool static](/docs/octopus-rest-api/cli/octopus-worker-pool-static)**:  Manage static worker pools.
-- **[octopus worker-pool static create](/docs/octopus-rest-api/cli/octopus-worker-pool-static-create)**:  Create a static worker pool.
-- **[octopus worker-pool static view](/docs/octopus-rest-api/cli/octopus-worker-pool-static-view)**:  View a static worker pool.
-- **[octopus worker-pool view](/docs/octopus-rest-api/cli/octopus-worker-pool-view)**:  View a worker pool.
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-aws-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-aws-create.mdx
index ee3e318748..4fbbcf863d 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-aws-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-aws-create.mdx
@@ -1,50 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-aws-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account aws create
-description: Create an AWS account
-navOrder: 3
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create an AWS account in Octopus Deploy
-
-```text
-Usage:
-  octopus account aws create [flags]
-
-Aliases:
-  create, new
-
-Flags:
-      --access-key string         The AWS access key to use when authenticating against Amazon Web Services.
-  -d, --description string        A summary explaining the use of the account to other users.
-  -D, --description-file file     Read the description from file
-  -e, --environment stringArray   The environments that are allowed to use this account
-  -n, --name string               A short, memorable, unique name for this account.
-      --region string             The AWS region to use for this account.
-      --secret-key string         The AWS secret key to use when authenticating against Amazon Web Services.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account aws create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-aws-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-aws-list.mdx
index 2f54e3bf49..c6a5a07690 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-aws-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-aws-list.mdx
@@ -1,40 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-aws-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account aws list
-description: List AWS accounts
-navOrder: 4
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List AWS accounts in Octopus Deploy
-
-```text
-Usage:
-  octopus account aws list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account aws list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-aws.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-aws.mdx
index c452e79ebb..f18252915f 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-aws.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-aws.mdx
@@ -1,44 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-aws
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account aws
-description: Manage AWS accounts
-navOrder: 2
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage AWS accounts in Octopus Deploy
-
-```text
-Usage:
-  octopus account aws [command]
-
-Available Commands:
-  create Create an AWS account
-  help Help about any command
-  list List AWS accounts
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus account aws [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account aws list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-create.mdx
index 0868276f8c..41d8461a2a 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-create.mdx
@@ -1,54 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-azure-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account azure create
-description: Create an Azure subscription account
-navOrder: 6
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create an Azure subscription account in Octopus Deploy
-
-```text
-Usage:
-  octopus account azure create [flags]
-
-Aliases:
-  create, new
-
-Flags:
-  -d, -- string                               A summary explaining the use of the account to other users.
-      --ad-endpoint-base-uri string           Set this only if you need to override the default Active Directory Endpoint.
-      --application-id string                 Your Azure Active Directory Application ID.
-      --application-key string                The password for the Azure Active Directory application.
-      --azure-environment string              Set only if you are using an isolated Azure Environment. Configure isolated Azure Environment. Valid option are AzureChinaCloud, AzureChinaCloud, AzureGermanCloud or AzureUSGovernment
-  -D, --description-file file                 Read the description from file
-  -e, --environment stringArray               The environments that are allowed to use this account
-  -n, --name string                           A short, memorable, unique name for this account.
-      --resource-management-base-uri string   Set this only if you need to override the default Resource Management Endpoint.
-      --subscription-id string                Your Azure subscription ID.
-      --tenant-id string                      Your Azure Active Directory Tenant ID.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account azure create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-list.mdx
index b4bf5659c9..5e6a7e7909 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-list.mdx
@@ -1,40 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-azure-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account azure list
-description: List Azure subscription accounts
-navOrder: 7
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List Azure subscription accounts in Octopus Deploy
-
-```text
-Usage:
-  octopus account azure list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account azure list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc-create.mdx
index 774ffccd15..e900c2f3df 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc-create.mdx
@@ -1,57 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-azure-oidc-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account azure-oidc create
-description: Create an Azure OpenID Connect account
-navOrder: 9
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create an Azure OpenID Connect account in Octopus Deploy
-
-```text
-Usage:
-  octopus account azure-oidc create [flags]
-
-Aliases:
-  create, new
-
-Flags:
-  -d, -- string                                A summary explaining the use of the account to other users.
-  -T, --accounttest-subject-keys stringArray   The subject keys used for an account test
-      --ad-endpoint-base-uri string            Set this only if you need to override the default Active Directory Endpoint.
-      --application-id string                  Your Azure Active Directory Application ID.
-      --audience string                        The audience claim for the federated credentials. Defaults to api://AzureADTokenExchange
-      --azure-environment string               Set only if you are using an isolated Azure Environment. Configure isolated Azure Environment. Valid option are AzureChinaCloud, AzureChinaCloud, AzureGermanCloud or AzureUSGovernment
-  -D, --description-file file                  Read the description from file
-  -e, --environment stringArray                The environments that are allowed to use this account
-  -E, --execution-subject-keys stringArray     The subject keys used for a deployment or runbook
-  -H, --health-subject-keys stringArray        The subject keys used for a health check
-  -n, --name string                            A short, memorable, unique name for this account.
-      --resource-management-base-uri string    Set this only if you need to override the default Resource Management Endpoint.
-      --subscription-id string                 Your Azure subscription ID.
-      --tenant-id string                       Your Azure Active Directory Tenant ID.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account azure-oidc create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc-list.mdx
index 14f4af2014..7bd42ee8c6 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc-list.mdx
@@ -1,40 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-azure-oidc-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account azure-oidc list
-description: List Azure OpenID Connect accounts
-navOrder: 10
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List Azure OpenID Connect accounts in Octopus Deploy
-
-```text
-Usage:
-  octopus account azure-oidc list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account azure-oidc list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc.mdx
index e0d1679076..fce9a9cd28 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc.mdx
@@ -1,44 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-azure-oidc
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account azure-oidc
-description: Manage Azure OpenID Connect accounts
-navOrder: 8
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage Azure OpenID Connect accounts in Octopus Deploy
-
-```text
-Usage:
-  octopus account azure-oidc [command]
-
-Available Commands:
-  create Create an Azure OpenID Connect account
-  help Help about any command
-  list List Azure OpenID Connect accounts
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus account azure-oidc [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account azure-oidc list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-azure.mdx
index 961b08432c..f9ccf62f8a 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-azure.mdx
@@ -1,44 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-azure
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account azure
-description: Manage Azure subscription accounts
-navOrder: 5
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage Azure subscription accounts in Octopus Deploy
-
-```text
-Usage:
-  octopus account azure [command]
-
-Available Commands:
-  create Create an Azure subscription account
-  help Help about any command
-  list List Azure subscription accounts
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus account azure [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account azure list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-create.mdx
index 74d38a89c0..7b2e734c0e 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-create.mdx
@@ -1,40 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account create
-description: Create an account
-navOrder: 11
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create an account in Octopus Deploy
-
-```text
-Usage:
-  octopus account create [flags]
-
-Aliases:
-  create, new
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-delete.mdx
index 4dd362a08b..6b8dc2faf2 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-delete.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-delete.mdx
@@ -1,46 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-delete
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account delete
-description: Delete an account
-navOrder: 12
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Delete an account in Octopus Deploy
-
-```text
-Usage:
-  octopus account delete {<name> | <id>} [flags]
-
-Aliases:
-  delete, del, rm, remove
-
-Flags:
-  -y, --confirm   Don't ask for confirmation before deleting the account.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account delete
-octopus account rm
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp-create.mdx
index 9d29495e67..a2697ce38f 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp-create.mdx
@@ -1,48 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-gcp-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account gcp create
-description: Create a Google Cloud account
-navOrder: 14
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a Google Cloud account in Octopus Deploy
-
-```text
-Usage:
-  octopus account gcp create [flags]
-
-Aliases:
-  create, new
-
-Flags:
-  -d, --description string        A summary explaining the use of the account to other users.
-  -D, --description-file file     Read the description from file
-  -e, --environment stringArray   The environments that are allowed to use this account
-  -K, --key-file string           The json key file to use when authenticating against Google Cloud.
-  -n, --name string               A short, memorable, unique name for this account.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account gcp create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp-list.mdx
index b71da2d0e9..9920174af9 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp-list.mdx
@@ -1,40 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-gcp-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account gcp list
-description: List Google Cloud accounts
-navOrder: 15
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List Google Cloud accounts in Octopus Deploy
-
-```text
-Usage:
-  octopus account gcp list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account gcp list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp.mdx
index 7c295f158e..091bb9d56e 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp.mdx
@@ -1,44 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-gcp
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account gcp
-description: Manage Google Cloud accounts
-navOrder: 13
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage Google Cloud accounts in Octopus Deploy
-
-```text
-Usage:
-  octopus account gcp [command]
-
-Available Commands:
-  create Create a Google Cloud account
-  help Help about any command
-  list List Google Cloud accounts
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus account gcp [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account gcp list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc-create.mdx
index 586c1fb325..f3efcfe6f9 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc-create.mdx
@@ -1,49 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-generic-oidc-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account generic-oidc create
-description: Create an Generic OpenID Connect account
-navOrder: 17
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create an Generic OpenID Connect account in Octopus Deploy
-
-```text
-Usage:
-  octopus account generic-oidc create [flags]
-
-Aliases:
-  create, new
-
-Flags:
-  -d, -- string                              A summary explaining the use of the account to other users.
-      --audience string                      The audience claim for the federated credentials. Defaults to api://default
-  -D, --description-file file                Read the description from file
-  -e, --environment stringArray              The environments that are allowed to use this account
-  -E, --execution-subject-keys stringArray   The subject keys used for a deployment or runbook
-  -n, --name string                          A short, memorable, unique name for this account.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account generic-oidc create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc-list.mdx
index 95b05eb4dc..38b8ba5b32 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc-list.mdx
@@ -1,40 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-generic-oidc-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account generic-oidc list
-description: List Generic OpenID Connect accounts
-navOrder: 18
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List Generic OpenID Connect accounts in Octopus Deploy
-
-```text
-Usage:
-  octopus account generic-oidc list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account generic-oidc list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc.mdx
index 2932b16f9f..725d78beba 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc.mdx
@@ -1,44 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-generic-oidc
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account generic-oidc
-description: Manage Generic OpenID Connect accounts
-navOrder: 16
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage Generic OpenID Connect accounts in Octopus Deploy
-
-```text
-Usage:
-  octopus account generic-oidc [command]
-
-Available Commands:
-  create Create an Generic OpenID Connect account
-  help Help about any command
-  list List Generic OpenID Connect accounts
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus account generic-oidc [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account generic-oidc list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-list.mdx
index 4cc51401a7..f82b1ffccd 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-list.mdx
@@ -1,40 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account list
-description: List accounts
-navOrder: 19
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List accounts in Octopus Deploy
-
-```text
-Usage:
-  octopus account list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh-create.mdx
index 5c7fc4ab2c..b70bd47d59 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh-create.mdx
@@ -1,50 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-ssh-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account ssh create
-description: Create a SSH Key Pair account
-navOrder: 21
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a SSH Key Pair account in Octopus Deploy
-
-```text
-Usage:
-  octopus account ssh create [flags]
-
-Aliases:
-  create, new
-
-Flags:
-  -d, --description string        A summary explaining the use of the account to other users.
-  -D, --description-file file     Read the description from file.
-  -e, --environment stringArray   The environments that are allowed to use this account.
-  -n, --name string               A short, memorable, unique name for this account.
-  -p, --passphrase string         The passphrase for the private key, if required.
-  -K, --private-key string        Path to the private key file portion of the key pair.
-  -u, --username string           The username to use when authenticating against the remote host.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account ssh create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh-list.mdx
index 5ddceb1849..1235a41ab3 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh-list.mdx
@@ -1,40 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-ssh-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account ssh list
-description: List SSH Key Pair accounts
-navOrder: 22
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List SSH Key Pair accounts in Octopus Deploy
-
-```text
-Usage:
-  octopus account ssh list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account ssh list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh.mdx
index 6e911aeb83..00a5ecfbe8 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh.mdx
@@ -1,44 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-ssh
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account ssh
-description: Manage SSH Key Pair accounts
-navOrder: 20
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage SSH Key Pair accounts in Octopus Deploy
-
-```text
-Usage:
-  octopus account ssh [command]
-
-Available Commands:
-  create Create a SSH Key Pair account
-  help Help about any command
-  list List SSH Key Pair accounts
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus account ssh [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account ssh list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-token-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-token-create.mdx
index 13a1c73222..6a4654d51b 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-token-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-token-create.mdx
@@ -1,48 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-token-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account token create
-description: Create a Token account
-navOrder: 24
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a Token account in Octopus Deploy
-
-```text
-Usage:
-  octopus account token create [flags]
-
-Aliases:
-  create, new
-
-Flags:
-  -d, -- string                   A summary explaining the use of the account to other users.
-  -D, --description-file file     Read the description from file.
-  -e, --environment stringArray   The environments that are allowed to use this account.
-  -n, --name string               A short, memorable, unique name for this account.
-  -t, --token string              The password to use to when authenticating against the remote host.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account token create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-token-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-token-list.mdx
index d8ba2d4d37..49d66d2d2b 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-token-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-token-list.mdx
@@ -1,40 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-token-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account token list
-description: List Token accounts
-navOrder: 25
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List Token accounts in Octopus Deploy
-
-```text
-Usage:
-  octopus account token list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account token list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-token.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-token.mdx
index 4ef1883497..bfb3f81d0b 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-token.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-token.mdx
@@ -1,44 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-token
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account token
-description: Manage Token accounts
-navOrder: 23
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage Token accounts in Octopus Deploy
-
-```text
-Usage:
-  octopus account token [command]
-
-Available Commands:
-  create Create a Token account
-  help Help about any command
-  list List Token accounts
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus account token [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account token list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-username-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-username-create.mdx
index 152b12cdff..e108f7420c 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-username-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-username-create.mdx
@@ -1,47 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-username-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account username create
-description: Create a Username/Password account
-navOrder: 27
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a Username/Password account in Octopus Deploy
-
-```text
-Usage:
-  octopus account username create [flags]
-
-Flags:
-  -d, --description string        A summary explaining the use of the account to other users.
-  -D, --description-file file     Read the description from file.
-  -e, --environment stringArray   The environments that are allowed to use this account.
-  -n, --name string               A short, memorable, unique name for this account.
-  -p, --password string           The password to use to when authenticating against the remote host.
-  -u, --username string           The username to use when authenticating against the remote host.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account username create"
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-username-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-username-list.mdx
index a89a6f0a5c..3a7b88ace5 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-username-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-username-list.mdx
@@ -1,41 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-username-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account username list
-description: List Username/Password accounts
-navOrder: 28
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List Username/Password accounts in Octopus Deploy
-
-```text
-Usage:
-  octopus account username list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account username list"
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-username.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-username.mdx
index 02e5c91e7f..6f837ecee3 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-username.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account-username.mdx
@@ -1,44 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account-username
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account username
-description: Manage Username/Password accounts
-navOrder: 26
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage Username/Password accounts in Octopus Deploy
-
-```text
-Usage:
-  octopus account username [command]
-
-Available Commands:
-  create Create a Username/Password account
-  help Help about any command
-  list List Username/Password accounts
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus account username [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account username list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account.mdx
index a4fb130d55..b7d5caf15b 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-account.mdx
@@ -1,53 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-account
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus account
-description: Manage accounts
-navOrder: 1
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage accounts in Octopus Deploy
-
-```text
-Usage:
-  octopus account [command]
-
-Available Commands:
-  aws Manage AWS accounts
-  azure Manage Azure subscription accounts
-  azure-oidc Manage Azure OpenID Connect accounts
-  create Create an account
-  delete Delete an account
-  gcp Manage Google Cloud accounts
-  generic-oidc Manage Generic OpenID Connect accounts
-  help Help about any command
-  list List accounts
-  ssh Manage SSH Key Pair accounts
-  token Manage Token accounts
-  username Manage Username/Password accounts
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus account [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus account list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-api.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-api.mdx
index 110b5e2089..3dced63487 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-api.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-api.mdx
@@ -1,40 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-api
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus api
-description: Execute a raw API GET request
-navOrder: 29
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Execute an authenticated GET request against the Octopus Server API and print the JSON response.
-
-```text
-Usage:
-  octopus api <url> [flags]
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus api /api
-octopus api /api/spaces
-octopus api /api/Spaces-1/projects
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-bulk-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-build-information-bulk-delete.mdx
index 1adb2b7f95..c4e3897ce5 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-bulk-delete.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-build-information-bulk-delete.mdx
@@ -1,46 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-build-information-bulk-delete
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus build-information bulk-delete
-description: Bulk delete build information
-navOrder: 31
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Bulk delete build information in Octopus Deploy
-
-```text
-Usage:
-  octopus build-information bulk-delete [flags]
-
-Flags:
-  -y, --confirm               Don't ask for confirmation before deleting the build information.
-      --package-id string     the package id of the build information.
-      --version stringArray   the version of the build information, may be specified multiple times.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus build-information bulk-delete
-octopus build-info --package-id ThePackage
-octopus build-info --package-id ThePackage --version 1.0.0 --version 1.0.1
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-build-information-delete.mdx
index 362f937711..8e8d2497f9 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-delete.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-build-information-delete.mdx
@@ -1,49 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-build-information-delete
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus build-information delete
-description: Delete a build information
-navOrder: 32
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Delete a build information in Octopus Deploy
-
-```text
-Usage:
-  octopus build-information delete <id> [flags]
-
-Aliases:
-  delete, del, rm, remove
-
-Flags:
-  -y, --confirm             Don't ask for confirmation before deleting the build information.
-  -p, --package-id string   The Package ID of the build information to delete
-  -v, --version string      The version of the build information to delete
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus build-information delete BuildInformation-1
-octopus build-info rm BuildInformation-1
-octopus build-info del --package-id ThePackage --version 1.2.3
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-build-information-list.mdx
index b961a6c97a..4a2a15af1e 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-build-information-list.mdx
@@ -1,51 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-build-information-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus build-information list
-description: List build information
-navOrder: 33
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List build information in Octopus Deploy
-
-```text
-Usage:
-  octopus build-information list [flags]
-
-Aliases:
-  list, ls
-
-Flags:
-  -q, --filter string       filter build information by version that contains the filter
-      --latest              only return the latest build information according to SemVer
-  -p, --package-id string   filter build information by package id
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus build-information list
-octopus build-information ls
-octopus build-info list
-octopus build-info ls --package-id ThePackage
-octopus build-info ls --package-id ThePackage --filter 1.2.3
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-upload.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-build-information-upload.mdx
index 72be8afe1c..5bcf8791de 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-upload.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-build-information-upload.mdx
@@ -1,51 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-build-information-upload
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus build-information upload
-description: upload build information for one or more packages to Octopus Deploy
-navOrder: 34
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-upload build information one or more packages to Octopus Deploy.
-
-```text
-Usage:
-  octopus build-information upload [flags]
-
-Aliases:
-  upload, push
-
-Flags:
-  -p, --package-id stringArray   The ID of the package, may be specified multiple times. Any arguments without flags will be treated as package IDs
-      --version string           The version of the package
-      --file string              Path to Octopus Build Information Json file
-      --overwrite-mode string    Action when a build information already exists. Valid values are 'fail', 'overwrite', 'ignore'. Default is 'fail'
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus build-information upload --package-id SomePackage --version 1.0.0 --file buildinfo.octopus
-octopus build-information upload SomePackage --version 1.0.0 --file buildinfo.octopus --overwrite-mode overwrite
-octopus build-information push SomePackage --version 1.0.0 --file buildinfo.octopus
-octopus build-information upload PkgA PkgB PkgC --version 1.0.0 --file buildinfo.octopus
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-build-information-view.mdx
index 6274071475..3f20c74768 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-build-information-view.mdx
@@ -1,43 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-build-information-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus build-information view
-description: View a build information
-navOrder: 35
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View a build information in Octopus Deploy
-
-```text
-Usage:
-  octopus build-information view {<id>} [flags]
-
-Flags:
-  -w, --web   Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus build-information view BuildInformation-1
-octopus build-info view BuildInformation-1
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-build-information.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-build-information.mdx
index fbe4a1c4d1..e52da5debc 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-build-information.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-build-information.mdx
@@ -1,50 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-build-information
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus build-information
-description: Manage build information
-navOrder: 30
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage build information in Octopus Deploy
-
-```text
-Usage:
-  octopus build-information [command]
-
-Aliases:
-  build-information, build-info
-
-Available Commands:
-  bulk-delete Bulk delete build information
-  delete Delete a build information
-  help Help about any command
-  list List build information
-  upload upload build information for one or more packages to Octopus Deploy
-  view View a build information
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus build-information [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus build-information upload
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-channel-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-channel-create.mdx
index 3fe624430b..69f7b6945d 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-channel-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-channel-create.mdx
@@ -1,47 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-channel-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus channel create
-description: Create a channel
-navOrder: 37
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a channel in Octopus Deploy
-
-```text
-Usage:
-  octopus channel create [flags]
-
-Flags:
-      --default              Set this channel as default
-  -d, --description string   Description of the channel
-  -l, --lifecycle string     The lifecycle to use for the channel
-  -n, --name string          Name of the channel
-  -p, --project string       Project to create channel in
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus channel create
-octopus channel create --name "The Channel" --project "The Project" --lifecycle "Default Lifecycle" --default
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-channel-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-channel-delete.mdx
index 1611481373..c1606b2aef 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-channel-delete.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-channel-delete.mdx
@@ -1,47 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-channel-delete
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus channel delete
-description: Delete a channel
-navOrder: 38
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Delete a channel in Octopus Deploy
-
-```text
-Usage:
-  octopus channel delete {<name> | <id>} [flags]
-
-Aliases:
-  delete, del, rm, remove
-
-Flags:
-  -y, --confirm          Don't ask for confirmation before deleting the channel.
-  -p, --project string   Name or ID of the project the channel belongs to
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus channel delete "Hotfix" --project myProject
-octopus channel rm Channels-123 --project myProject -y
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-channel-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-channel-list.mdx
index b2887892ae..ba620474a4 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-channel-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-channel-list.mdx
@@ -1,50 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-channel-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus channel list
-description: List channels
-navOrder: 39
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List channels for a project in Octopus Deploy
-
-```text
-Usage:
-  octopus channel list [flags]
-
-Aliases:
-  list, ls
-
-Flags:
-  -q, --filter string    Filter channels to match only ones with a name containing the given string
-  -p, --project string   Name or ID of the project to list channels for
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus channel list myProject
-octopus channel ls "Other Project"
-octopus channel list --project myProject
-octopus channel list --project myProject --filter "Hotfix"
-octopus channel ls -p myProject -q Hotfix
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-channel-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-channel-view.mdx
index 97a456daba..66986723c5 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-channel-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-channel-view.mdx
@@ -1,44 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-channel-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus channel view
-description: View a channel
-navOrder: 40
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View a channel in Octopus Deploy
-
-```text
-Usage:
-  octopus channel view {<name> | <id>} [flags]
-
-Flags:
-  -p, --project string   Name or ID of the project the channel belongs to
-  -w, --web              Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus channel view "Hotfix" --project myProject
-octopus channel view Channels-123 --project myProject
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-channel.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-channel.mdx
index d70e471a0f..6c3b9656a5 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-channel.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-channel.mdx
@@ -1,50 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-channel
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus channel
-description: Manage channels
-navOrder: 36
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage channels in Octopus Deploy
-
-```text
-Usage:
-  octopus channel [command]
-
-Available Commands:
-  create Create a channel
-  delete Delete a channel
-  help Help about any command
-  list List channels
-  view View a channel
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus channel [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus channel create
-octopus channel list --project myProject
-octopus channel view "Hotfix" --project myProject
-octopus channel delete "Hotfix" --project myProject
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-config-get.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-config-get.mdx
index 1bfe210816..e1a6dd5ea7 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-config-get.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-config-get.mdx
@@ -1,28 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-config-get
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus config get
-description: Gets the value of config key for Octopus CLI
-navOrder: 42
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Gets the value of config key for Octopus CLI.
-
-```text
-Usage:
-  octopus config get [key] [flags]
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-config-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-config-list.mdx
index 7efc10b833..8735854bcb 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-config-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-config-list.mdx
@@ -1,41 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-config-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus config list
-description: List values from config file
-navOrder: 43
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List values from config file.
-
-```text
-Usage:
-  octopus config list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus config list"
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-config-set.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-config-set.mdx
index a894b328ac..2772e238ee 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-config-set.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-config-set.mdx
@@ -1,28 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-config-set
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus config set
-description: Set will write the value for given key to Octopus CLI config file
-navOrder: 44
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Set will write the value for given key to Octopus CLI config file.
-
-```text
-Usage:
-  octopus config set [key] [value] [flags]
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-config.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-config.mdx
index 41e732286e..343ac600e7 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-config.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-config.mdx
@@ -1,36 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-config
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus config
-description: Manage CLI configuration
-navOrder: 41
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage the CLI configuration
-
-```text
-Usage:
-  octopus config [command]
-
-Available Commands:
-  get Gets the value of config key for Octopus CLI
-  help Help about any command
-  list List values from config file
-  set Set will write the value for given key to Octopus CLI config file
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus config [command] --help" for more information about a command.
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-create.mdx
index dd31d27de2..26d684fe60 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-create.mdx
@@ -1,57 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-azure-web-app-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target azure-web-app create
-description: Create an Azure Web App deployment target
-navOrder: 47
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create an Azure Web App deployment target in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target azure-web-app create [flags]
-
-Aliases:
-  create, new
-
-Flags:
-      --account string          The name or ID of the Azure account
-      --environment strings     Choose at least one environment for the deployment target.
-  -n, --name string             A short, memorable, unique name for this Azure Web App.
-      --resource-group string   The resource group of the Azure Web App
-      --role strings            Choose at least one role that this deployment target will provide (use --tag for tag sets with validation).
-      --tag strings             Target tags in canonical format (TagSetName/TagName).
-      --tenant strings          Associate the deployment target with tenants
-      --tenant-tag strings      Associate the deployment target with tenant tags, should be in the format 'tag set name/tag name'
-      --tenanted-mode string    
-                                Choose the kind of deployments where this deployment target should be included. Default is 'untenanted'
-  -w, --web                     Open in web browser
-      --web-app string          The name of the Azure Web App for this deployment target
-      --web-app-slot string     The name of the Azure Web App Slot for this deployment target
-      --worker-pool string      The worker pool for the deployment target, only required if not using the default worker pool
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target azure-web-app create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-list.mdx
index dde6c21799..3c4b3c5edc 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-list.mdx
@@ -1,42 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-azure-web-app-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target azure-web-app list
-description: List Azure Web App deployment targets
-navOrder: 48
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List Azure Web App deployment targets in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target azure-web-app list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target azure-web-app list
-octopus deployment-target azure-web-app ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-view.mdx
index abf10e1a84..bba4862730 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-view.mdx
@@ -1,43 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-azure-web-app-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target azure-web-app view
-description: View an Azure Web App deployment target
-navOrder: 49
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View an Azure Web App deployment target in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target azure-web-app view {<name> | <id>} [flags]
-
-Flags:
-  -w, --web   Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target azure-web-app view 'Shop Api'
-octopus deployment-target azure-web-app view Machines-100
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app.mdx
index a94cf235f1..fabb23a197 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app.mdx
@@ -1,45 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-azure-web-app
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target azure-web-app
-description: Manage Azure Web App deployment targets
-navOrder: 46
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage Azure Web App deployment targets in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target azure-web-app [command]
-
-Available Commands:
-  create Create an Azure Web App deployment target
-  help Help about any command
-  list List Azure Web App deployment targets
-  view View an Azure Web App deployment target
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus deployment-target azure-web-app [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target azure-web-app list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-create.mdx
index 1f08c72f45..06cb431fa5 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-create.mdx
@@ -1,53 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-cloud-region-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target cloud-region create
-description: Create a Cloud Region deployment target
-navOrder: 51
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a Cloud Region deployment target in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target cloud-region create [flags]
-
-Aliases:
-  create, new
-
-Flags:
-      --environment strings    Choose at least one environment for the deployment target.
-  -n, --name string            A short, memorable, unique name for this Cloud Region.
-      --role strings           Choose at least one role that this deployment target will provide (use --tag for tag sets with validation).
-      --tag strings            Target tags in canonical format (TagSetName/TagName).
-      --tenant strings         Associate the deployment target with tenants
-      --tenant-tag strings     Associate the deployment target with tenant tags, should be in the format 'tag set name/tag name'
-      --tenanted-mode string   
-                               Choose the kind of deployments where this deployment target should be included. Default is 'untenanted'
-  -w, --web                    Open in web browser
-      --worker-pool string     The worker pool for the deployment target, only required if not using the default worker pool
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target cloud-region create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-list.mdx
index eaf2db82e3..660d77d109 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-list.mdx
@@ -1,42 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-cloud-region-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target cloud-region list
-description: List Cloud Region deployment targets
-navOrder: 52
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List Cloud Region deployment targets in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target cloud-region list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target cloud-region list
-octopus deployment-target cloud-region ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-view.mdx
index 5039e1577a..9035a4b9dd 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-view.mdx
@@ -1,43 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-cloud-region-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target cloud-region view
-description: View a Cloud Region deployment target
-navOrder: 53
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View a Cloud Region deployment target in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target cloud-region view {<name> | <id>} [flags]
-
-Flags:
-  -w, --web   Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target cloud-region view 'EU'
-octopus deployment-target cloud-region view Machines-100
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region.mdx
index 9076823bd3..907d7e6549 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region.mdx
@@ -1,45 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-cloud-region
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target cloud-region
-description: Manage Cloud Region deployment targets
-navOrder: 50
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage Cloud Region deployment targets in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target cloud-region [command]
-
-Available Commands:
-  create Create a Cloud Region deployment target
-  help Help about any command
-  list List Cloud Region deployment targets
-  view View a Cloud Region deployment target
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus deployment-target cloud-region [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target cloud-region list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-delete.mdx
index 0ab87f585d..ed1b75d8e8 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-delete.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-delete.mdx
@@ -1,46 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-delete
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target delete
-description: Delete a deployment target
-navOrder: 54
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Delete a deployment target in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target delete {<name> | <id>} [flags]
-
-Aliases:
-  delete, del, rm, remove
-
-Flags:
-  -y, --confirm   Don't ask for confirmation before deleting the deployment target.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target delete
-octopus deployment-target rm
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-create.mdx
index 4c531fa064..a32cd29a71 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-create.mdx
@@ -1,81 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-kubernetes-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target kubernetes create
-description: Create a Kubernetes deployment target
-navOrder: 56
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a Kubernetes deployment target in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target kubernetes create [flags]
-
-Aliases:
-  create, new
-
-Flags:
-      --account string                          The name of the account to use for authentication.
-      --aks-cluster-name string                 The AKS cluster name.
-      --aks-resource-group-name string          The AKS resource group name.
-      --aks-use-admin-credentials               Enabling this option passes the --admin flag to az aks get-credentials. This is useful for AKS clusters with Azure Active Directory integration.
-      --auth-type string                        The authentication type to use.
-      --certificate string                      Name of Certificate in Octopus Deploy.
-      --certificate-path string                 The path to the CA certificate of the cluster. The default value usually is: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-      --client-certificate string               Name of client certificate in Octopus Deploy
-      --cluster-url string                      Kubernetes cluster URL. Must be an absolute URL. e.g. https://kubernetes.example.com
-      --docker-container-registry string        The feed of the docker container registry to use if running health check in a container on the worker
-      --docker-image-flags string               The image (including the tag) to use from the container registry
-      --eks-assume-service-role                 Assume a different AWS service role.
-      --eks-assumed-role-arn string             ARN of assumed AWS service role.
-      --eks-assumed-role-external-id string     AWS assumed role external ID.
-      --eks-assumed-role-session-duration int   AWS assumed role session duration in seconds. (defaults to 3600 seconds, 1 hour)
-      --eks-assumed-role-session-name string    Session name of assumed AWS service role.
-      --eks-cluster-name string                 AWS EKS Cluster Name
-      --eks-use-service-role                    Execute using the AWS service role for an EC2 instance.
-      --environment strings                     Choose at least one environment for the deployment target.
-      --gke-cluster-name string                 GKE Cluster Name.
-      --gke-impersonate-service-account         Impersonate service accounts.
-      --gke-project string                      GKE Project.
-      --gke-region string                       GKE Region.
-      --gke-service-account-emails string       Service Account Email.
-      --gke-use-vm-service-account              When running in a Compute Engine virtual machine, use the associated VM service account.
-      --gke-zone string                         GKE Zone.
-  -n, --name string                             A short, memorable, unique name for this deployment target.
-      --namespace string                        Kubernetes Namespace.
-      --pod-token-path string                   The path to the token of the pod service account. The default value usually is: /var/run/secrets/kubernetes.io/serviceaccount/token
-      --role strings                            Choose at least one role that this deployment target will provide (use --tag for tag sets with validation).
-      --skip-tls-verification                   Skip the verification of the cluster certificate. This can only be provided if no cluster certificate is specified.
-      --tag strings                             Target tags in canonical format (TagSetName/TagName).
-      --tenant strings                          Associate the deployment target with tenants
-      --tenant-tag strings                      Associate the deployment target with tenant tags, should be in the format 'tag set name/tag name'
-      --tenanted-mode string                    
-                                                Choose the kind of deployments where this deployment target should be included. Default is 'untenanted'
-  -w, --web                                     Open in web browser
-      --worker-pool string                      The worker pool for the deployment target, only required if not using the default worker pool
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target kubernetes create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-list.mdx
index 83187f43e4..2cabaf1905 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-list.mdx
@@ -1,42 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-kubernetes-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target kubernetes list
-description: List Kubernetes deployment targets
-navOrder: 57
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List Kubernetes deployment targets in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target kubernetes list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target kubernetes list
-octopus deployment-target kubernetes ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-view.mdx
index 0d16d3bb3a..586840b470 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-view.mdx
@@ -1,42 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-kubernetes-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target kubernetes view
-description: View a Kubernetes deployment target
-navOrder: 58
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View a Kubernetes deployment target in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target kubernetes view {<name> | <id>} [flags]
-
-Flags:
-  -w, --web   Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target kubernetes view 'target-name'
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes.mdx
index dcfaa6cff0..009a802754 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes.mdx
@@ -1,48 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-kubernetes
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target kubernetes
-description: Manage Kubernetes deployment targets
-navOrder: 55
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage Kubernetes deployment targets in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target kubernetes [command]
-
-Aliases:
-  kubernetes, k8s
-
-Available Commands:
-  create Create a Kubernetes deployment target
-  help Help about any command
-  list List Kubernetes deployment targets
-  view View a Kubernetes deployment target
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus deployment-target kubernetes [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target kubernetes create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-list.mdx
index 01e5676318..6268b60155 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-list.mdx
@@ -1,42 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target list
-description: List deployment targets
-navOrder: 59
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List deployment targets in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target list
-octopus deployment-target ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-create.mdx
index 609efb68f0..2eb3dda767 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-create.mdx
@@ -1,56 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-listening-tentacle-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target listening-tentacle create
-description: Create a Listening Tentacle deployment target
-navOrder: 61
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a Listening Tentacle deployment target in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target listening-tentacle create [flags]
-
-Aliases:
-  create, new
-
-Flags:
-      --environment strings     Choose at least one environment for the deployment target.
-      --machine-policy string   The machine policy for the deployment target to use, only required if not using the Default Machine Policy
-  -n, --name string             A short, memorable, unique name for this Listening Tentacle.
-      --proxy string            Select whether to use a proxy to connect to this Listening Tentacle. If omitted, will connect directly.
-      --role strings            Choose at least one role that this deployment target will provide (use --tag for tag sets with validation).
-      --tag strings             Target tags in canonical format (TagSetName/TagName).
-      --tenant strings          Associate the deployment target with tenants
-      --tenant-tag strings      Associate the deployment target with tenant tags, should be in the format 'tag set name/tag name'
-      --tenanted-mode string    
-                                Choose the kind of deployments where this deployment target should be included. Default is 'untenanted'
-      --thumbprint string       The X509 certificate thumbprint that securely identifies the Tentacle.
-      --url string              The network address at which the Tentacle can be reached.
-  -w, --web                     Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target listening-tentacle create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-list.mdx
index b612d63e84..4fff271d14 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-list.mdx
@@ -1,42 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-listening-tentacle-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target listening-tentacle list
-description: List Listening Tentacle deployment targets
-navOrder: 62
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List Listening Tentacle deployment targets in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target listening-tentacle list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target listening-tentacle list
-octopus deployment-target listening-tentacle ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-view.mdx
index 8bd1ee5c76..335da0b9c6 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-view.mdx
@@ -1,43 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-listening-tentacle-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target listening-tentacle view
-description: View a Listening Tentacle deployment target
-navOrder: 63
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View a Listening Tentacle deployment target in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target listening-tentacle view {<name> | <id>} [flags]
-
-Flags:
-  -w, --web   Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target listening-tentacle view 'EU'
-octopus deployment-target listening-tentacle view Machines-100
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle.mdx
index a6c8bfeefa..acdc2d77bf 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle.mdx
@@ -1,45 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-listening-tentacle
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target listening-tentacle
-description: Manage Listening Tentacle deployment targets
-navOrder: 60
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage Listening Tentacle deployment targets in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target listening-tentacle [command]
-
-Available Commands:
-  create Create a Listening Tentacle deployment target
-  help Help about any command
-  list List Listening Tentacle deployment targets
-  view View a Listening Tentacle deployment target
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus deployment-target listening-tentacle [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target listening-tentacle list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-list.mdx
index 0e8fb67e10..de1597b265 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-list.mdx
@@ -1,42 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-polling-tentacle-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target polling-tentacle list
-description: List Polling Tentacle deployment targets
-navOrder: 65
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List Polling Tentacle deployment targets in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target polling-tentacle list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target polling-tentacle list
-octopus deployment-target polling-tentacle ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-view.mdx
index e195dc691e..b691b9fc00 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-view.mdx
@@ -1,43 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-polling-tentacle-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target polling-tentacle view
-description: View a Polling Tentacle deployment target
-navOrder: 66
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View a Polling Tentacle deployment target in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target polling-tentacle view {<name> | <id>} [flags]
-
-Flags:
-  -w, --web   Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target polling-tentacle view 'EU'
-octopus deployment-target polling-tentacle view Machines-100
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle.mdx
index 7d40a293cb..c679701957 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle.mdx
@@ -1,44 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-polling-tentacle
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target polling-tentacle
-description: Manage Polling Tentacle deployment targets
-navOrder: 64
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage Polling Tentacle deployment targets in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target polling-tentacle [command]
-
-Available Commands:
-  help Help about any command
-  list List Polling Tentacle deployment targets
-  view View a Polling Tentacle deployment target
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus deployment-target polling-tentacle [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target polling-tentacle list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-create.mdx
index fc8c0acea3..8d1ee4770c 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-create.mdx
@@ -1,60 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-ssh-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target ssh create
-description: Create a SSH deployment target
-navOrder: 68
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a SSH deployment target in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target ssh create [flags]
-
-Aliases:
-  create, new
-
-Flags:
-      --account string          The name or ID of the SSH key pair or username/password account
-      --environment strings     Choose at least one environment for the deployment target.
-      --fingerprint string      The host fingerprint of the SSH target.
-      --host string             The hostname or IP address of the SSH target to connect to.
-      --machine-policy string   The machine policy for the deployment target to use, only required if not using the Default Machine Policy
-  -n, --name string             A short, memorable, unique name for this deployment target.
-      --platform string         The platform to use for the self-contained Calamari. Options are 'linux-x64', 'linux-arm64', 'linux-arm' or 'osx-x64'
-      --port int                The port to connect to the SSH target on.
-      --proxy string            Select whether to use a proxy to connect to this SSH target. If omitted, will connect directly.
-      --role strings            Choose at least one role that this deployment target will provide (use --tag for tag sets with validation).
-      --runtime string          The runtime to use to run Calamari on the SSH target. Options are 'self-contained' or 'mono'
-      --tag strings             Target tags in canonical format (TagSetName/TagName).
-      --tenant strings          Associate the deployment target with tenants
-      --tenant-tag strings      Associate the deployment target with tenant tags, should be in the format 'tag set name/tag name'
-      --tenanted-mode string    
-                                Choose the kind of deployments where this deployment target should be included. Default is 'untenanted'
-  -w, --web                     Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target ssh create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-list.mdx
index 422c81872e..88c7b6c456 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-list.mdx
@@ -1,42 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-ssh-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target ssh list
-description: List SSH deployment targets
-navOrder: 69
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List SSH deployment targets in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target ssh list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target ssh list
-octopus deployment-target ssh ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-view.mdx
index c2f0edc46f..e790b4847a 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-view.mdx
@@ -1,43 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-ssh-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target ssh view
-description: View a SSH deployment target
-navOrder: 70
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View a SSH deployment target in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target ssh view {<name> | <id>} [flags]
-
-Flags:
-  -w, --web   Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target ssh view 'linux-web-server'
-octopus deployment-target ssh view Machines-100
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh.mdx
index d14e9d4929..64c075b0bc 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh.mdx
@@ -1,45 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-ssh
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target ssh
-description: Manage SSH deployment targets
-navOrder: 67
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage SSH deployment targets in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target ssh [command]
-
-Available Commands:
-  create Create a SSH deployment target
-  help Help about any command
-  list List SSH deployment targets
-  view View a SSH deployment target
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus deployment-target ssh [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target ssh create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-view.mdx
index e7b1c80c38..d7efc33a1e 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-view.mdx
@@ -1,43 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target view
-description: View a deployment target
-navOrder: 71
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View a deployment target in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target view {<name> | <id>} [flags]
-
-Flags:
-  -w, --web   Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target view Machines-100
-octopus deployment-target view 'web-server'
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target.mdx
index d141ef2f72..ab3c3e8a43 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target.mdx
@@ -1,51 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-deployment-target
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus deployment-target
-description: Manage deployment targets
-navOrder: 45
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage deployment targets in Octopus Deploy
-
-```text
-Usage:
-  octopus deployment-target [command]
-
-Available Commands:
-  azure-web-app Manage Azure Web App deployment targets
-  cloud-region Manage Cloud Region deployment targets
-  delete Delete a deployment target
-  help Help about any command
-  kubernetes Manage Kubernetes deployment targets
-  list List deployment targets
-  listening-tentacle Manage Listening Tentacle deployment targets
-  polling-tentacle Manage Polling Tentacle deployment targets
-  ssh Manage SSH deployment targets
-  view View a deployment target
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus deployment-target [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus deployment-target list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-environment-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-environment-create.mdx
index a25c370005..a87b6a2833 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-environment-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-environment-create.mdx
@@ -1,48 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-environment-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus environment create
-description: Create an environment
-navOrder: 73
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a environment in Octopus Deploy
-
-```text
-Usage:
-  octopus environment create [flags]
-
-Aliases:
-  create, new
-
-Flags:
-      --allow-dynamic-infrastructure   Allow dynamic infrastructure
-  -d, --description string             Description of the environment
-  -n, --name string                    Name of the environment
-  -t, --tag stringArray                Tag to apply to environment, must use canonical name: <tag_set>/<tag_name>
-      --use-guided-failure             Use guided failure mode by default
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus environment create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-environment-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-environment-delete.mdx
index d9a662965a..1045077c01 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-environment-delete.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-environment-delete.mdx
@@ -1,46 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-environment-delete
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus environment delete
-description: Delete an environment
-navOrder: 74
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Delete an environment in Octopus Deploy
-
-```text
-Usage:
-  octopus environment delete {<name> | <id>} [flags]
-
-Aliases:
-  delete, del, rm, remove
-
-Flags:
-  -y, --confirm   Don't ask for confirmation before deleting the environment.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus environment delete
-octopus environment rm
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-environment-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-environment-list.mdx
index b57eed64fc..c8dc679aad 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-environment-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-environment-list.mdx
@@ -1,42 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-environment-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus environment list
-description: List environments
-navOrder: 75
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List environments in Octopus Deploy
-
-```text
-Usage:
-  octopus environment list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus environment list
-octopus environment ls"
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-environment-tag.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-environment-tag.mdx
index 66c77cae80..2949651000 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-environment-tag.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-environment-tag.mdx
@@ -1,42 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-environment-tag
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus environment tag
-description: Override tags for an environment
-navOrder: 76
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Override tags for an environment in Octopus Deploy
-
-```text
-Usage:
-  octopus environment tag [flags]
-
-Flags:
-      --environment string   Name or ID of the environment you wish to update
-  -t, --tag stringArray      Tag to apply to environment, must use canonical name: <tag_set>/<tag_name>
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus environment tag Environment-1
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-environment.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-environment.mdx
index 2303f477b2..12dd675cf9 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-environment.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-environment.mdx
@@ -1,48 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-environment
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus environment
-description: Manage environments
-navOrder: 72
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage environments in Octopus Deploy
-
-```text
-Usage:
-  octopus environment [command]
-
-Available Commands:
-  create Create an environment
-  delete Delete an environment
-  help Help about any command
-  list List environments
-  tag Override tags for an environment
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus environment [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus environment list
-octopus environment ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-create.mdx
index 2af172ff63..08407a222d 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-create.mdx
@@ -1,45 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-ephemeral-environment-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus ephemeral-environment create
-description: Create an ephemeral environment
-navOrder: 78
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create an ephemeral environment in Octopus Deploy
-
-```text
-Usage:
-  octopus ephemeral-environment create [flags]
-
-Aliases:
-  create, new
-
-Flags:
-  -n, --name string      Name of the environment
-  -p, --project string   Name of the project
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus ephemeral-environment create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-deprovision-environment.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-deprovision-environment.mdx
index c840fb9298..b223cb5d49 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-deprovision-environment.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-deprovision-environment.mdx
@@ -1,41 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-ephemeral-environment-deprovision-environment
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus ephemeral-environment deprovision-environment
-description: Deprovision an environment
-navOrder: 79
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Deprovision an environment
-
-```text
-Usage:
-  octopus ephemeral-environment deprovision-environment [flags]
-
-Flags:
-  -n, --name string   Name of the environment
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus ephemeral-environment deprovision-environment --name PR-1234
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-deprovision-project.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-deprovision-project.mdx
index c893b29b24..889b2139da 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-deprovision-project.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-deprovision-project.mdx
@@ -1,42 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-ephemeral-environment-deprovision-project
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus ephemeral-environment deprovision-project
-description: Deprovision an ephemeral environment for a project
-navOrder: 80
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Deprovision an ephemeral environment in Octopus Deploy for a specific project
-
-```text
-Usage:
-  octopus ephemeral-environment deprovision-project [flags]
-
-Flags:
-  -n, --name string      Name of the environment
-  -p, --project string   Name of the project
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus ephemeral-environment deprovision-project
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment.mdx
index a442062e93..255829d3e0 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment.mdx
@@ -1,46 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-ephemeral-environment
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus ephemeral-environment
-description: Manage ephemeral environments
-navOrder: 77
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage ephemeral environments in Octopus Deploy
-
-```text
-Usage:
-  octopus ephemeral-environment [command]
-
-Available Commands:
-  create Create an ephemeral environment
-  deprovision-environment Deprovision an environment
-  deprovision-project Deprovision an ephemeral environment for a project
-  help Help about any command
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus ephemeral-environment [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus ephemeral-environment create --name "MyEphemeralEnvironment" --project "MyProject"
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-login.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-login.mdx
index eb8373a73b..e3c8f94c6f 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-login.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-login.mdx
@@ -1,48 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-login
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus login
-description: Login to Octopus
-navOrder: 81
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Login to your Octopus server using OpenID Connect (OIDC) or an API key. If no arguments are provided then login will be done interactively allowing creation of an API key.
-
-```text
-Usage:
-  octopus login [flags]
-
-Flags:
-      --api-key string              The API key to login with if using API keys
-      --id-token string             The ID token from your OIDC provider to login with if using OIDC
-      --ignore-ssl-errors           Whether to ignore SSL errors
-      --server string               The URL of the Octopus Server to login to
-      --service-account-id string   The ID of the service account to login with if using OIDC
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus login
-octopus login --server https://my.octopus.app --service-account-id b1a6f20f-0ec7-4e9a-938e-db800f945b37 --id-token eyJhbGciOiJQUzI1NiIs...
-octopus login --server https://my.octopus.app --api-key API-APIKEY123
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-logout.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-logout.mdx
index bdfea8a716..e020d3d2ed 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-logout.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-logout.mdx
@@ -1,28 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-logout
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus logout
-description: Logout of Octopus
-navOrder: 82
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Logout of your Octopus server
-
-```text
-Usage:
-  octopus logout [flags]
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-package-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-package-delete.mdx
index 000ef5ea16..4ecc9ad383 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-package-delete.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-package-delete.mdx
@@ -1,49 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-package-delete
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus package delete
-description: Delete a package
-navOrder: 84
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Delete a package in Octopus Deploy
-
-```text
-Usage:
-  octopus package delete {<id>} [flags]
-
-Aliases:
-  delete, del, rm, remove
-
-Flags:
-  -y, --confirm             Don't ask for confirmation before deleting the package.
-  -p, --package-id string   The Package ID of the package to delete
-  -v, --version string      The version of the package to delete
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus package delete Packages-1
-octopus package rm Packages-1
-octopus package del --package-id ThePackage --version 1.0.0
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-package-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-package-list.mdx
index 9f65e405cc..e564c52109 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-package-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-package-list.mdx
@@ -1,48 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-package-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus package list
-description: List packages
-navOrder: 85
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List packages in Octopus Deploy
-
-```text
-Usage:
-  octopus package list [flags]
-
-Aliases:
-  list, ls
-
-Flags:
-  -q, --filter string   filter packages to match only ones that contain the given string
-      --limit int32     limit the maximum number of results that will be returned
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus package list
-octopus package list --limit 50 --filter SomePackage
-octopus package ls -n 30 -q SomePackage
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-package-nuget-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-package-nuget-create.mdx
index 51115a6f00..eca0b8e860 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-package-nuget-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-package-nuget-create.mdx
@@ -1,54 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-package-nuget-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus package nuget create
-description: Create nuget
-navOrder: 87
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create nuget package
-
-```text
-Usage:
-  octopus package nuget create [flags]
-
-Flags:
-      --id string                 The ID of the package
-  -v, --version string            The version of the package, must be a valid SemVer.
-      --base-path string          Root folder containing the contents to zip.
-      --out-folder string         Folder into which the zip file will be written.
-      --include strings           Add a file pattern to include, relative to the base path e.g. /bin/*.dll; defaults to "**".
-      --exclude strings           Add a file pattern to exclude, relative to the base path e.g. **/*.config; applied after --include.
-      --verbose                   Verbose output.
-      --overwrite                 Allow an existing package file of the same ID/version to be overwritten.
-      --author strings            Add author/s to the package metadata.
-      --title string              The title of the package.
-      --description string        A description of the package, defaults to "A deployment package created from files on disk.".
-      --releaseNotes string       Release notes for this version of the package.
-      --releaseNotesFile string   A file containing release notes for this version of the package.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus package nuget create --id SomePackage --version 1.0.0
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-package-nuget.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-package-nuget.mdx
index cfe699e772..51c6ca02e6 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-package-nuget.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-package-nuget.mdx
@@ -1,43 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-package-nuget
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus package nuget
-description: Package as NuPkg
-navOrder: 86
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Package as NuPkg for Octopus Deploy
-
-```text
-Usage:
-  octopus package nuget [command]
-
-Available Commands:
-  create Create nuget
-  help Help about any command
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus package nuget [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus package nuget create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-package-upload.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-package-upload.mdx
index 63eef1f195..11fa8f5869 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-package-upload.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-package-upload.mdx
@@ -1,54 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-package-upload
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus package upload
-description: Upload one or more packages to Octopus Deploy
-navOrder: 88
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Upload one or more packages to Octopus Deploy. Glob patterns are supported. Delta compression is off by default.
-
-```text
-Usage:
-  octopus package upload [flags]
-
-Aliases:
-  upload, push
-
-Flags:
-  -p, --package stringArray     Package to upload, may be specified multiple times. Any arguments without flags will be treated as packages
-      --overwrite-mode string   Action when a package already exists. Valid values are 'fail', 'overwrite', 'ignore'. Default is 'fail'
-      --continue-on-error       When uploading multiple packages, controls whether the CLI continues after a failed upload. Default is to abort
-  -d, --use-delta-compression   Attempt to use delta compression when uploading. Off by default. As a recent addition to the CLI, it should be considered in beta.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus package upload --package SomePackage.1.0.0.zip
-octopus package upload SomePackage.1.0.0.tar.gz --overwrite-mode overwrite
-octopus package push SomePackage.1.0.0.zip
-octopus package upload bin/**/*.zip --continue-on-error
-octopus package upload PkgA.1.0.0.zip PkgB.2.0.0.tar.gz PkgC.1.0.0.nupkg
-octopus package upload --package SomePackage.2.0.0.zip --use-delta-compression
-octopus package upload SomePackage.2.0.0.zip --delta # alias for --use-delta-compression
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-package-versions.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-package-versions.mdx
index 00253a3b67..a2c29b78fd 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-package-versions.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-package-versions.mdx
@@ -1,49 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-package-versions
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus package versions
-description: List versions of a package
-navOrder: 89
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List versions of a package.
-
-```text
-Usage:
-  octopus package versions [flags]
-
-Aliases:
-  versions, show
-
-Flags:
-      --package string   package ID to show versions for. required.
-  -q, --filter string    filter packages to match only ones that contain the given string
-      --limit int32      limit the maximum number of results that will be returned
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus package versions --package SomePackage
-octopus package versions SomePackage --filter beta --limit 5
-octopus package show SomePackage -n 2
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-package-zip-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-package-zip-create.mdx
index e6b508f990..3bbd05ae7f 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-package-zip-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-package-zip-create.mdx
@@ -1,49 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-package-zip-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus package zip create
-description: Create zip
-navOrder: 91
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create zip package
-
-```text
-Usage:
-  octopus package zip create [flags]
-
-Flags:
-      --id string           The ID of the package.
-  -v, --version string      The version of the package, must be a valid SemVer.
-      --base-path string    Root folder containing the contents to zip.
-      --out-folder string   Folder into which the zip file will be written.
-      --include strings     Add a file pattern to include, relative to the base path e.g. /bin/*.dll; defaults to "**".
-      --exclude strings     Add a file pattern to exclude, relative to the base path e.g. **/*.config; applied after --include.
-      --verbose             Verbose output.
-      --overwrite           Allow an existing package file of the same ID/version to be overwritten.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus package zip create --id SomePackage --version 1.0.0
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-package-zip.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-package-zip.mdx
index 31d000abb2..88bf3ae317 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-package-zip.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-package-zip.mdx
@@ -1,43 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-package-zip
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus package zip
-description: Package as zip
-navOrder: 90
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Package as zip for Octopus Deploy
-
-```text
-Usage:
-  octopus package zip [command]
-
-Available Commands:
-  create Create zip
-  help Help about any command
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus package zip [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus package zip create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-package.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-package.mdx
index edf03c5b7e..5dd018cff0 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-package.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-package.mdx
@@ -1,48 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-package
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus package
-description: Manage packages
-navOrder: 83
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage packages in Octopus Deploy
-
-```text
-Usage:
-  octopus package [command]
-
-Available Commands:
-  delete Delete a package
-  help Help about any command
-  list List packages
-  nuget Package as NuPkg
-  upload Upload one or more packages to Octopus Deploy
-  versions List versions of a package
-  zip Package as zip
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus package [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus package upload
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-branch-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-branch-create.mdx
index 1f5d461790..ffd68e831b 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-branch-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-branch-create.mdx
@@ -1,48 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-branch-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project branch create
-description: Create a Git branch for a project
-navOrder: 94
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a Git branch for a project in Octopus Deploy
-
-```text
-Usage:
-  octopus project branch create [flags]
-
-Aliases:
-  create, add
-
-Flags:
-      --base-branch string   The git-ref branch to create a new branch from
-  -n, --name string          The name of the branch
-  -p, --project string       The project
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project branch create
-octopus project branch create --project "Deploy Website" --name branch-name --base-branch refs/heads/main
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-branch-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-branch-list.mdx
index 54f2046a8c..d7d465f93e 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-branch-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-branch-list.mdx
@@ -1,47 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-branch-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project branch list
-description: List project branches
-navOrder: 95
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List project branches in Octopus Deploy
-
-```text
-Usage:
-  octopus project branch list [flags]
-
-Aliases:
-  list, ls
-
-Flags:
-      --git-ref string   The git-ref for the Config-As-Code branch
-  -p, --project string   The project
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project branch list "Deploy Website"
-octopus project variable ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-branch.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-branch.mdx
index eebf615235..e791b3ee57 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-branch.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-branch.mdx
@@ -1,46 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-branch
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project branch
-description: Manage project branches
-navOrder: 93
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage project branches in Octopus Deploy
-
-```text
-Usage:
-  octopus project branch [command]
-
-Available Commands:
-  create Create a Git branch for a project
-  help Help about any command
-  list List project branches
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus project branch [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project branch list "Deploy Web App"
-octopus project branch create -p "Deploy Web App" --new-branch-name add-name-variable --base-branch refs/heads/main -
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-clone.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-clone.mdx
index 06aec3f28d..b07bcf8d4a 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-clone.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-clone.mdx
@@ -1,48 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-clone
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project clone
-description: Clone a project
-navOrder: 96
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Clone a project in Octopus Deploy
-
-```text
-Usage:
-  octopus project clone [flags]
-
-Flags:
-  -n, --name string          Name of the project
-  -d, --description string   Description of the project
-      --source string        Name of the source project
-  -g, --group string         Project group of the project
-  -l, --lifecycle string     Lifecycle of the project
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project clone
-octopus project clone --name 'New Project' --source 'Old Project'
-octopus project clone --name 'Deploy web app 2' --source 'Deploy web app' --lifecycle 'Test Only Lifecycle' --group 'Web App Project Group'
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-connect.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-connect.mdx
index 4c89308057..0a5c833322 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-connect.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-connect.mdx
@@ -1,47 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-connect
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project connect
-description: Connect a tenant to a project
-navOrder: 97
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Connect a tenant to a project in Octopus Deploy
-
-```text
-Usage:
-  octopus project connect [flags]
-
-Flags:
-      --enable-tenant-deployments   Update the project to support tenanted deployments, if required
-      --env stringArray             The environments to connect to the tenant (can be specified multiple times)
-  -e, --environment stringArray     The environments to connect to the tenant (can be specified multiple times)
-  -p, --project string              Name, ID or Slug of the project to connect to the tenant
-  -t, --tenant string               Name or Id of the tenant
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project connect
-octopus project connect --tenant "Bobs Wood Shop" --project "Deploy web site" --environment "Production"
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-convert.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-convert.mdx
index b6e56f66c3..89e4907116 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-convert.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-convert.mdx
@@ -1,53 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-convert
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project convert
-description: Convert a project to use Config As Code
-navOrder: 98
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Convert a project to use Config As Code in Octopus Deploy
-
-```text
-Usage:
-  octopus project convert [flags]
-
-Flags:
-      --git-base-path string                   The directory where Octopus should store the project files in the repository. Default is '.octopus/'
-      --git-branch string                      The default branch to use for Config As Code. Default is 'main'.
-      --git-credential-store string            The location to store the supplied Git credentials. Options are library or project. Default is library
-      --git-credentials string                 The Id or name of the Git credentials stored in Octopus
-      --git-initial-commit string              The initial commit message for configuring Config As Code.
-      --git-initial-commit-branch string       The branch to initially commit Config As Code settings. Only required if 'git-branch' is listed as a 'git-protected-branch-pattern'. Default value is 'octopus-vcs-conversion'.
-      --git-password string                    The password to authenticate with Git
-      --git-protected-branch-pattern strings   Git branches which are protected from having Config As Code settings committed directly
-      --git-url string                         Url of the Git repository for storing project configuration
-      --git-username string                    The username to authenticate with Git
-  -p, --project string                         Name, ID or Slug of the project to convert
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project convert
-octopus project convert --project "Deploy web site" --git-url https://github.com/orgname/reponame"
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-create.mdx
index 8b3cbd582b..ba1bcf1da9 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-create.mdx
@@ -1,59 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project create
-description: Create a project
-navOrder: 99
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a project in Octopus Deploy
-
-```text
-Usage:
-  octopus project create [flags]
-
-Flags:
-  -n, --name string                            Name of the project
-  -d, --description string                     Description of the project
-  -g, --group string                           Project group of the project
-  -l, --lifecycle string                       Lifecycle of the project
-      --process-vcs                            Use Config As Code for the project
-  -t, --tag stringArray                        Tag to apply to project, must use canonical name: <tag_set>/<tag_name>
-      --git-url string                         Url of the Git repository for storing project configuration
-      --git-branch string                      The default branch to use for Config As Code. Default is 'main'.
-      --git-credentials string                 The Id or name of the Git credentials stored in Octopus
-      --git-username string                    The username to authenticate with Git
-      --git-password string                    The password to authenticate with Git
-      --git-credential-store string            The location to store the supplied Git credentials. Options are library or project. Default is library
-      --git-initial-commit string              The initial commit message for configuring Config As Code.
-      --git-base-path string                   The directory where Octopus should store the project files in the repository. Default is '.octopus/'
-      --git-initial-commit-branch string       The branch to initially commit Config As Code settings. Only required if 'git-branch' is listed as a 'git-protected-branch-pattern'. Default value is 'octopus-vcs-conversion'.
-      --git-protected-branch-pattern strings   Git branches which are protected from having Config As Code settings committed directly
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project create
-octopus project create --process-vcs
-octopus project create --name 'Deploy web app' --lifecycle 'Default Lifecycle' --group 'Default Project Group'
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-delete.mdx
index 2ddebfa443..7e6a7154f9 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-delete.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-delete.mdx
@@ -1,46 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-delete
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project delete
-description: Delete a project
-navOrder: 100
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Delete a project in Octopus Deploy
-
-```text
-Usage:
-  octopus project delete {<name> | <id> | <slug>} [flags]
-
-Aliases:
-  delete, del, rm, remove
-
-Flags:
-  -y, --confirm   Don't ask for confirmation before deleting the project.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project delete
-octopus project rm
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-disable.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-disable.mdx
index 4282c1cfed..75d302a281 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-disable.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-disable.mdx
@@ -1,37 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-disable
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project disable
-description: Disable a project
-navOrder: 101
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Disable a project in Octopus Deploy
-
-```text
-Usage:
-  octopus project disable [flags]
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project disable
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-disconnect.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-disconnect.mdx
index 1039a32b20..7a417e2d30 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-disconnect.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-disconnect.mdx
@@ -1,45 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-disconnect
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project disconnect
-description: Disconnect a tenant from a project
-navOrder: 102
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Disconnect a tenant from a project in Octopus Deploy
-
-```text
-Usage:
-  octopus project disconnect [flags]
-
-Flags:
-  -y, --confirm          Don't ask for confirmation disconnecting the project.
-  -p, --project string   Name, ID or Slug of the project to connect to the tenant
-  -t, --tenant string    Name or Id of the tenant
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project disconnect
-octopus project disconnect --tenant "Test Tenant" --project "Deploy web site" --confirm
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-enable.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-enable.mdx
index 9a67230acc..a853e50f7d 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-enable.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-enable.mdx
@@ -1,37 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-enable
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project enable
-description: Enable a project
-navOrder: 103
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Enable a project in Octopus Deploy
-
-```text
-Usage:
-  octopus project enable [flags]
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project enable
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-group-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-group-create.mdx
index 1068451bc1..b387ecaeac 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-group-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-group-create.mdx
@@ -1,45 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-group-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project-group create
-description: Create a project group
-navOrder: 116
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a project group in Octopus Deploy
-
-```text
-Usage:
-  octopus project-group create [flags]
-
-Aliases:
-  create, new
-
-Flags:
-  -n, --name string          Name of the project group
-  -d, --description string   Description of the project group
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project-group create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-group-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-group-delete.mdx
index 78a024e805..8d546dfff0 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-group-delete.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-group-delete.mdx
@@ -1,46 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-group-delete
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project-group delete
-description: Delete a project group
-navOrder: 117
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Delete a project group in Octopus Deploy
-
-```text
-Usage:
-  octopus project-group delete {<name> | <id>} [flags]
-
-Aliases:
-  delete, del, rm, remove
-
-Flags:
-  -y, --confirm   Don't ask for confirmation before deleting the project group.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project-group delete
-octopus project-group rm
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-group-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-group-list.mdx
index 2a615218b8..f2be546ab5 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-group-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-group-list.mdx
@@ -1,42 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-group-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project-group list
-description: List project groups
-navOrder: 118
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List project groups in Octopus Deploy
-
-```text
-Usage:
-  octopus project-group list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project-group list
-octopus project-group ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-group-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-group-view.mdx
index fdd7af7e80..49c9f978a5 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-group-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-group-view.mdx
@@ -1,43 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-group-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project-group view
-description: View a project group
-navOrder: 119
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View a project group in Octopus Deploy
-
-```text
-Usage:
-  octopus project-group view {<name> | <id> | <slug>} [flags]
-
-Flags:
-  -w, --web   Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project-group view 'Default Project Group'
-octopus project-group view ProjectGroups-9000
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-group.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-group.mdx
index 4159af70f1..b012147f49 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-group.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-group.mdx
@@ -1,48 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-group
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project-group
-description: Manage project groups
-navOrder: 115
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage project groups in Octopus Deploy
-
-```text
-Usage:
-  octopus project-group [command]
-
-Available Commands:
-  create Create a project group
-  delete Delete a project group
-  help Help about any command
-  list List project groups
-  view View a project group
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus project-group [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project-group list
-octopus project-group ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-list.mdx
index fe239ff58c..c9073910a8 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-list.mdx
@@ -1,42 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project list
-description: List projects
-navOrder: 104
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List projects in Octopus Deploy
-
-```text
-Usage:
-  octopus project list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project list
-octopus project ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-tag.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-tag.mdx
index 8c6ff90a82..2f174b89ec 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-tag.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-tag.mdx
@@ -1,42 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-tag
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project tag
-description: Override tags for a project
-navOrder: 105
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Override tags for a project in Octopus Deploy
-
-```text
-Usage:
-  octopus project tag [flags]
-
-Flags:
-      --project string    Name or ID of the project you wish to update
-  -t, --tag stringArray   Tag to apply to project, must use canonical name: <tag_set>/<tag_name>
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project tag Project-1
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-create.mdx
index 09eb394356..c7fb5b958a 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-create.mdx
@@ -1,66 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-variables-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project variables create
-description: Create a variable for a project
-navOrder: 107
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a variable for a project in Octopus Deploy
-
-```text
-Usage:
-  octopus project variables create [flags]
-
-Aliases:
-  create, add
-
-Flags:
-      --channel-scope strings            Assign channel scopes to the variable. Multiple scopes can be supplied.
-      --environment-scope strings        Assign environment scopes to the variable. Multiple scopes can be supplied.
-      --git-ref string                   The GitRef for the Config-As-Code branch
-  -n, --name string                      The name of the variable
-      --process-scope strings            Assign process scopes to the variable. Valid scopes are 'deployment' or a runbook name. Multiple scopes can be supplied.
-  -p, --project string                   The project
-      --prompt-description string        Description for the prompted variable
-      --prompt-dropdown-option strings   Options for a dropdown prompt. May be specified multiple times. Must be in format 'value|description'
-      --prompt-label string              The label for the prompted variable
-      --prompt-required                  Prompt will require a value for deployment
-      --prompt-type string               The input type for the prompted variable. Valid values are 'text', 'multiline-text', 'checkbox' and 'dropdown'
-      --prompted                         Make a prompted variable
-      --role-scope strings               Assign role scopes to the variable. Multiple scopes can be supplied.
-      --step-scope strings               Assign process step scopes to the variable. Multiple scopes can be supplied.
-      --tag-scope strings                Assign tag scopes to the variable. Multiple scopes can be supplied.
-      --target-scope strings             Assign deployment target scopes to the variable. Multiple scopes can be supplied.
-  -t, --type string                      The type of variable. Valid values are text, sensitive, workerpool, awsaccount, azureaccount, googleaccount, certificate. Default is text
-      --value string                     The value to set on the variable
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project variable create
-octopus project variable create --project "Deploy Website" --name "variable name" --value "abc"
-octopus project variable create --name "variable name" --value "passwordABC" --type sensitive
-octopus project variable create --name "variable name" --value "abc" --scope environment='test'
-octopus project variable create --name "variable name" --value "abc" --scope environment='test' --git-ref refs/heads/main
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-delete.mdx
index d372f73011..070879482d 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-delete.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-delete.mdx
@@ -1,51 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-variables-delete
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project variables delete
-description: Delete a project variable
-navOrder: 108
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Delete a project variable in Octopus Deploy
-
-```text
-Usage:
-  octopus project variables delete {<name>} [flags]
-
-Aliases:
-  delete, del, rm, remove
-
-Flags:
-  -y, --confirm          Don't ask for confirmation before deleting the project variable.
-      --git-ref string   The GitRef for the Config-As-Code branch
-      --id string        The id of the specific variable value to delete
-  -n, --name string      The name of the variable
-  -p, --project string   The project
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project variable delete --name "variable Name" --project "Deploy Site" 
-octopus project variable delete --name "variable Name" --id 26a58596-4cd9-e072-7215-7e15cb796dd2 --project "Deploy Site" --confirm 
-octopus project variable delete --name "variable Name" --project "Deploy Site" --git-ref "refs/heads/main"
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-exclude.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-exclude.mdx
index e2802d15b6..ea0b327a8e 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-exclude.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-exclude.mdx
@@ -1,44 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-variables-exclude
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project variables exclude
-description: Exclude a variable set from a project
-navOrder: 109
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Exclude a variable set from a project in Octopus Deploy
-
-```text
-Usage:
-  octopus project variables exclude [flags]
-
-Flags:
-  -p, --project string             The project
-      --variable-set stringArray   The name of the library variable set
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project variable exclude
-octopus project variable exclude --variable-set "Slack Variables"
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-include.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-include.mdx
index e407b14b7b..6fc4999309 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-include.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-include.mdx
@@ -1,44 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-variables-include
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project variables include
-description: Include a variable set in a project
-navOrder: 110
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Include a variable set in a project in Octopus Deploy
-
-```text
-Usage:
-  octopus project variables include [flags]
-
-Flags:
-  -p, --project string             The project
-      --variable-set stringArray   The name of the library variable set
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project variable include
-octopus project variable include --variable-set "Slack Variables"
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-list.mdx
index b23a6d6d6d..0544be5484 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-list.mdx
@@ -1,48 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-variables-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project variables list
-description: List project variables
-navOrder: 111
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List project variables in Octopus Deploy
-
-```text
-Usage:
-  octopus project variables list [flags]
-
-Aliases:
-  list, ls
-
-Flags:
-      --git-ref string   The GitRef for the Config-As-Code branch
-  -p, --project string   The project
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project variable list "Deploy Website"
-octopus project variable list -p "Deploy Website" --git-ref refs/heads/main
-octopus project variable ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-update.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-update.mdx
index ace53679d6..68ca6c6ef5 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-update.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-update.mdx
@@ -1,59 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-variables-update
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project variables update
-description: Update the value of a project variable
-navOrder: 112
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Update the value of a project variable in Octopus Deploy
-
-```text
-Usage:
-  octopus project variables update [flags]
-
-Flags:
-      --channel-scope strings       Assign channel scopes to the variable. Multiple scopes can be supplied.
-      --environment-scope strings   Assign environment scopes to the variable. Multiple scopes can be supplied.
-      --git-ref string              The GitRef for the Config-As-Code branch
-      --id string                   The variable id to update
-  -n, --name string                 The name of the variable
-      --process-scope strings       Assign process scopes to the variable. Valid scopes are 'deployment' or a runbook name. Multiple scopes can be supplied.
-  -p, --project string              The project
-      --role-scope strings          Assign role scopes to the variable. Multiple scopes can be supplied.
-      --step-scope strings          Assign process step scopes to the variable. Multiple scopes can be supplied.
-      --tag-scope strings           Assign tag scopes to the variable. Multiple scopes can be supplied.
-      --target-scope strings        Assign deployment target scopes to the variable. Multiple scopes can be supplied.
-      --unscoped                    Remove all shared from the variable, cannot be used with shared
-      --value string                The value to set on the variable
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project variable update
-octopus project variable update --name "variable name" --value "abc"
-octopus project variable update --name "variable name" --value "password"
-octopus project variable update --name "variable name" --unscoped
-octopus project variable update --name "variable name" --environment-scope test
-octopus project variable update -p "Deploy Website" --name "variable name" --value "updated" --git-ref refs/heads/main
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-view.mdx
index 1f746465fb..06348acdc5 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-view.mdx
@@ -1,48 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-variables-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project variables view
-description: View all values of a project variable
-navOrder: 113
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View all values of a project variable in Octopus Deploy
-
-```text
-Usage:
-  octopus project variables view [flags]
-
-Aliases:
-  view, ls
-
-Flags:
-      --id string        The Id of the specifically scoped variable
-  -p, --project string   The project containing the variable
-  -w, --web              Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project variable view
-octopus project variable view DatabaseName --project "Vet Clinic"
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables.mdx
index e442ae860d..cd800f142c 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables.mdx
@@ -1,55 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-variables
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project variables
-description: Manage project variables
-navOrder: 106
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage project variables in Octopus Deploy
-
-```text
-Usage:
-  octopus project variables [command]
-
-Aliases:
-  variables, variable
-
-Available Commands:
-  create Create a variable for a project
-  delete Delete a project variable
-  exclude Exclude a variable set from a project
-  help Help about any command
-  include Include a variable set in a project
-  list List project variables
-  update Update the value of a project variable
-  view View all values of a project variable
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus project variables [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project variable list "Deploy Web App"
-octopus project variable view --name "DatabaseName" --project Deploy
-octopus project variable update
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-view.mdx
index 76a2f582ce..5efeb0c1f6 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project-view.mdx
@@ -1,44 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project view
-description: View a project
-navOrder: 114
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View a project in Octopus Deploy
-
-```text
-Usage:
-  octopus project view {<name> | <id> | <slug>} [flags]
-
-Flags:
-  -w, --web   Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project view 'Deploy Web App'
-octopus project view Projects-9000
-octopus project view deploy-web-app
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project.mdx
index 2aeedb2036..ef92c8a859 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-project.mdx
@@ -1,60 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-project
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus project
-description: Manage projects
-navOrder: 92
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage projects in Octopus Deploy
-
-```text
-Usage:
-  octopus project [command]
-
-Aliases:
-  project, proj
-
-Available Commands:
-  branch Manage project branches
-  clone Clone a project
-  connect Connect a tenant to a project
-  convert Convert a project to use Config As Code
-  create Create a project
-  delete Delete a project
-  disable Disable a project
-  disconnect Disconnect a tenant from a project
-  enable Enable a project
-  help Help about any command
-  list List projects
-  tag Override tags for a project
-  variables Manage project variables
-  view View a project
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus project [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus project list
-octopus project ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-release-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-release-create.mdx
index 5145117263..227733f69c 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-release-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-release-create.mdx
@@ -1,65 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-release-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus release create
-description: Create a release
-navOrder: 121
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a release in Octopus Deploy
-
-```text
-Usage:
-  octopus release create [flags]
-
-Flags:
-  -p, --project string              Name or ID of the project to create the release in
-  -c, --channel string              Name or ID of the channel to use
-  -r, --git-ref string              Git Reference e.g. refs/heads/main. Only relevant for config-as-code projects
-      --git-commit string           Git Commit Hash; Specify this in addition to Git Reference if you want to reference a commit other than the latest for that branch/tag.
-      --package-version string      Default version to use for all Packages
-      --release-notes string        Release notes to attach
-      --release-notes-file string   Release notes to attach (from file)
-  -v, --version string              Override the Release Version
-  -x, --ignore-existing             If a release with the same version exists, do nothing instead of failing.
-      --ignore-channel-rules        Allow creation of a release where channel rules would otherwise prevent it.
-      --package stringArray         Version specification for a specific package. You may specify this multiple times.
-                                    Format as {package}:{version}, {step}:{version} or {package-ref-name}:{packageOrStep}:{version}
-                                    If the package ID or step name contains a colon, slash, or equals sign (such as Maven coordinates like com.example:my-artifact), escape that character with a backslash:
-                                        --package "com.example\:my-artifact:1.0"
-                                    This escape syntax requires Octopus CLI 2.21.2 or later and Octopus Server 2025.4.10680 or later.
-      --git-resource stringArray    Git reference for a specific Git resource.
-                                    Format as {step}:{git-ref}, {step}:{git-resource-name}:{git-ref}
-                                    You may specify this multiple times
-      --custom-field stringArray    Custom field value to set on the release.
-                                    Format as {name}:{value}. You may specify multiple times
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus release create --project MyProject --channel Beta --version 1.2.3
-octopus release create -p MyProject -c Beta -v 1.2.3
-octopus release create -p MyProject -c default --package "utils:1.2.3" --package "utils:InstallOnly:5.6.7"
-octopus release create -p MyProject --package "com.example\:my-artifact:1.0"
-octopus release create -p MyProject -c Beta --no-prompt
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-release-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-release-delete.mdx
index 81559717fe..0b16ee5527 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-release-delete.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-release-delete.mdx
@@ -1,48 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-release-delete
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus release delete
-description: Delete a release
-navOrder: 122
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Delete a release in Octopus Deploy
-
-```text
-Usage:
-  octopus release delete [flags]
-
-Aliases:
-  delete, del, rm
-
-Flags:
-  -p, --project string        Name or ID of the project to delete releases in
-  -v, --version stringArray   Release version to delete, can be specified multiple times
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus release delete myProject 2.0
-octopus release delete --project myProject --version 2.0
-octopus release rm "Other Project" -v 2.0
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-release-deploy.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-release-deploy.mdx
index b4ee6addac..7235de1260 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-release-deploy.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-release-deploy.mdx
@@ -1,62 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-release-deploy
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-25
-title: octopus release deploy
-description: Deploy releases
-navOrder: 123
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Deploy releases in Octopus Deploy
-
-```text
-Usage:
-  octopus release deploy [flags]
-
-Flags:
-  -p, --project string                             Name or ID of the project to deploy the release from
-      --version string                             Release version to deploy
-  -e, --environment stringArray                    Deploy to this environment (can be specified multiple times)
-      --tenant stringArray                         Deploy to this tenant (can be specified multiple times)
-      --tenant-tag stringArray                     Deploy to tenants matching this tag (can be specified multiple times). Format is 'Tag Set Name/Tag Name', such as 'Regions/South'.
-      --deploy-at string                           Deploy at a later time. Deploy now if omitted. TODO date formats and timezones!
-      --deploy-at-expiry string                    Cancel the deployment if it hasn't started within this time period.
-  -v, --variable stringArray                       Set the value for a prompted variable in the format Label:Value
-      --update-variables                           Overwrite the release variable snapshot by re-importing variables from the project.
-      --skip stringArray                           Exclude specific steps from the deployment
-      --guided-failure string                      Enable Guided failure mode (true/false/default)
-      --priority string                            Jump the task queue ahead of other queued tasks (true/false/default). Requires the Priority Tasks feature, and the TaskPrioritize permission to set true.
-      --force-package-download                     Force re-download of packages
-      --deployment-target stringArray              Deploy to this target (can be specified multiple times)
-      --exclude-deployment-target stringArray      Deploy to targets except for this (can be specified multiple times)
-      --deployment-freeze-name stringArray         Override this deployment freeze (can be specified multiple times)
-      --deployment-freeze-override-reason string   Reason for overriding a deployment freeze
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus release deploy  # fully interactive
-octopus release deploy --project MyProject --version 1.0 --environment Dev
-octopus release deploy --project MyProject --version 1.0 --tenant-tag Regions/East --tenant-tag Regions/South
-octopus release deploy -p MyProject --version 1.0 -e Dev --skip InstallStep --variable VarName:VarValue
-octopus release deploy -p MyProject --version 1.0 -e Dev --force-package-download --guided-failure true -f basic
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-release-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-release-list.mdx
index c05c803792..0fd43c6ad8 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-release-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-release-list.mdx
@@ -1,47 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-release-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus release list
-description: List releases
-navOrder: 124
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List releases in Octopus Deploy
-
-```text
-Usage:
-  octopus release list [flags]
-
-Aliases:
-  list, ls
-
-Flags:
-  -p, --project string   Name or ID of the project to list releases for
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus release list myProject
-octopus release ls "Other Project"
-octopus release list --project myProject
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-release-progression-allow.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-release-progression-allow.mdx
index 4cb14ba168..12a426b89b 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-release-progression-allow.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-release-progression-allow.mdx
@@ -1,48 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-release-progression-allow
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus release progression allow
-description: Allows a release to progress to the next phase.
-navOrder: 126
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Allows a release to progress to the next phase in Octopus Deploy.
-
-```text
-Usage:
-  octopus release progression allow [flags]
-
-Aliases:
-  allow, allow-releaseprogression
-
-Flags:
-  -p, --project string   Name or ID of the project.
-  -v, --version string   Release version/number.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus release progression allow --project MyProject --version 1.2.3
-octopus release progression allow -p MyProject -v 1.2.3
-octopus release progression allow -p MyProject -v 1.2.3 --no-prompt
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-release-progression-prevent.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-release-progression-prevent.mdx
index 14f4cac67c..42f671009b 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-release-progression-prevent.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-release-progression-prevent.mdx
@@ -1,49 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-release-progression-prevent
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus release progression prevent
-description: Prevents a release from progression to the next phase
-navOrder: 127
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Prevents a release from progression to the next phase in Octopus Deploy
-
-```text
-Usage:
-  octopus release progression prevent [flags]
-
-Aliases:
-  prevent, prevent-releaseprogression
-
-Flags:
-  -p, --project string   Name or ID of the project.
-  -v, --version string   Release version/number.
-  -r, --reason string    Reason to prevent this release from progressing to the next phase.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus release progression prevent --project MyProject --version 1.2.3 --reason "It's broken"
-octopus release progression prevent -p MyProject -v 1.2.3 -r "It's broken"
-octopus release progression prevent -p MyProject -v 1.2.3 -r "It's broken" --no-prompt
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-release-progression.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-release-progression.mdx
index f9a8ca2ba0..67c4c36250 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-release-progression.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-release-progression.mdx
@@ -1,46 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-release-progression
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus release progression
-description: Manage progression of a release
-navOrder: 125
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage progression of a release in Octopus Deploy
-
-```text
-Usage:
-  octopus release progression [command]
-
-Available Commands:
-  allow Allows a release to progress to the next phase.
-  help Help about any command
-  prevent Prevents a release from progression to the next phase
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus release progression [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus release progression prevent
-octopus release progression allow
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-release.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-release.mdx
index d790715cb5..73644a0e87 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-release.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-release.mdx
@@ -1,47 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-release
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus release
-description: Manage releases
-navOrder: 120
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage releases in Octopus Deploy
-
-```text
-Usage:
-  octopus release [command]
-
-Available Commands:
-  create Create a release
-  delete Delete a release
-  deploy Deploy releases
-  help Help about any command
-  list List releases
-  progression Manage progression of a release
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus release [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus release list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-delete.mdx
index 9b8bf97c50..9bd1a70e1e 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-delete.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-delete.mdx
@@ -1,49 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-runbook-delete
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus runbook delete
-description: Delete a runbook
-navOrder: 129
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Delete a runbook in Octopus Deploy
-
-```text
-Usage:
-  octopus runbook delete {<name> | <id>} [flags]
-
-Aliases:
-  delete, del, rm, remove
-
-Flags:
-  -y, --confirm          Don't ask for confirmation before deleting the runbook.
-      --git-ref string   Git reference to delete runbook for e.g. refs/heads/main. Only relevant for config-as-code projects where runbooks are stored in Git.
-  -p, --project string   Name or ID of the project to delete a runbook from
-  -r, --runbook string   Name or ID of the runbook to delete
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus runbook delete
-octopus runbook rm
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-list.mdx
index 410c2b53c4..1d643a7096 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-list.mdx
@@ -1,50 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-runbook-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus runbook list
-description: List runbooks
-navOrder: 130
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List runbooks in Octopus Deploy
-
-```text
-Usage:
-  octopus runbook list [flags]
-
-Aliases:
-  list, ls
-
-Flags:
-  -q, --filter string    filter runbooks to match only ones with a name containing the given string
-      --git-ref string   Git reference to list runbooks for e.g. refs/heads/main. Only relevant for config-as-code projects where runbooks are stored in Git.
-      --limit int32      limit the maximum number of results that will be returned
-  -p, --project string   Name or ID of the project to list runbooks for
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus runbook list SomeProject
-octopus runbook list --project SomeProject --limit 50 --filter SomeKeyword
-octopus runbook ls -p SomeProject -n 30 -q SomeKeyword
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-run.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-run.mdx
index ab6a004400..2df85fab43 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-run.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-run.mdx
@@ -1,68 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-runbook-run
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-25
-title: octopus runbook run
-description: Run runbooks in Octopus Deploy
-navOrder: 131
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Run runbooks in Octopus Deploy
-
-```text
-Usage:
-  octopus runbook run [flags]
-
-Flags:
-  -p, --project string                   Name or ID of the project to run the runbook from
-  -n, --name string                      Name of the runbook to run
-      --runbook-tag stringArray          Run all runbooks matching this tag (can be specified multiple times). Format is 'Tag Set Name/Tag Name'. Mutually exclusive with --name.
-  -e, --environment stringArray          Run in this environment (can be specified multiple times)
-      --tenant stringArray               Run for this tenant (can be specified multiple times)
-      --tenant-tag stringArray           Run for tenants matching this tag (can be specified multiple times). Format is 'Tag Set Name/Tag Name', such as 'Regions/South'.
-      --run-at string                    Run at a later time. Run now if omitted. TODO date formats and timezones!
-      --run-at-expiry string             Cancel a scheduled run if it hasn't started within this time period.
-  -v, --variable stringArray             Set the value for a prompted variable in the format Label:Value
-      --snapshot string                  Name or ID of the snapshot to run. If not supplied, the command will attempt to use the published snapshot.
-      --skip stringArray                 Exclude specific steps from the runbook
-      --guided-failure string            Enable Guided failure mode (true/false/default)
-      --priority string                  Jump the task queue ahead of other queued tasks (true/false/default). Requires the Priority Tasks feature. For runbook runs, 'default' is the same as 'false'.
-      --force-package-download           Force re-download of packages
-      --run-target stringArray           Run on this target (can be specified multiple times)
-      --exclude-run-target stringArray   Run on targets except for this (can be specified multiple times)
-      --git-ref string                   Git Reference e.g. refs/heads/main. Only relevant for config-as-code projects where runbooks are stored in Git.
-      --package-version string           Default version to use for all packages. Only relevant for config-as-code projects where runbooks are stored in Git.
-      --package stringArray              Version specification for a specific package.
-                                         Format as {package}:{version}, {step}:{version} or {package-ref-name}:{packageOrStep}:{version}
-                                         You may specify this multiple times.
-                                         Only relevant for config-as-code projects where runbooks are stored in Git.
-      --git-resource stringArray         Git reference for a specific Git resource.
-                                         Format as {step}:{git-ref}, {step}:{git-resource-name}:{git-ref}
-                                         You may specify this multiple times.
-                                         Only relevant for config-as-code projects where runbooks are stored in Git.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus runbook run  # fully interactive
-octopus runbook run --project MyProject --runbook "Rebuild DB indexes"
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-create.mdx
index 0e49d3a8f2..0fbc0f4891 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-create.mdx
@@ -1,61 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-runbook-snapshot-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus runbook snapshot create
-description: Create a runbook snapshot
-navOrder: 133
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a runbook snapshot in Octopus Deploy
-
-```text
-Usage:
-  octopus runbook snapshot create [flags]
-
-Aliases:
-  create, new
-
-Flags:
-      --git-resource stringArray     Git reference for a specific Git resource.
-                                     Format as {step}:{git-ref}, {step}:{git-resource-name}:{git-ref}
-                                     You may specify this multiple times.
-                                     Only relevant for config-as-code projects where runbooks are stored in Git.
-  -n, --name string                  Override the snapshot name
-      --package stringArray          Version specification a specific packages.
-                                     Format as {package}:{version}, {step}:{version} or {package-ref-name}:{packageOrStep}:{version}
-                                     You may specify this multiple times
-      --package-version string       Default version to use for all packages. Only relevant for config-as-code projects where runbooks are stored in Git.
-  -p, --project string               Name or ID of the project where the runbook is
-      --publish                      Publish the snapshot immediately
-  -r, --runbook string               Name or ID of the runbook to create the snapshot for
-      --snapshot-notes string        Release notes to attach
-      --snapshot-notes-file string   Release notes to attach (from file)
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus runbook snapshot create --project MyProject --runbook "Rebuild DB Indexes"
-octopus runbook snapshot create --project MyProject --runbook "Rebuild DB Indexes" --name "My cool snapshot"
-octopus runbook snapshot create -p MyProject -r "Restart App" --package "azure-cli:1.2.3" --no-prompt
-octopus runbook snapshot create -p MyProject -r "Restart App" --git-resource "Script step from Git:refs/heads/dev-branch" --publish --no-prompt
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-list.mdx
index b1ebdc34fc..3bb3f696c1 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-list.mdx
@@ -1,48 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-runbook-snapshot-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus runbook snapshot list
-description: List runbook snapshots
-navOrder: 134
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List runbook snapshots in Octopus Deploy
-
-```text
-Usage:
-  octopus runbook snapshot list [flags]
-
-Aliases:
-  list, ls
-
-Flags:
-      --limit int32      Limit the maximum number of results that will be returned (default 2147483647)
-  -p, --project string   Name or ID of the project to list runbook snapshots for
-  -r, --runbook string   Name or ID of the runbook to list snapshots for
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus runbook snapshot list --project "Deploy Web App" --runbook "Run maintenance"
-octopus runbook snapshot ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-publish.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-publish.mdx
index 21188c4286..85a487fb48 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-publish.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-publish.mdx
@@ -1,44 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-runbook-snapshot-publish
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus runbook snapshot publish
-description: Publish a runbook snapshot
-navOrder: 135
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Publish a runbook snapshot in Octopus Deploy
-
-```text
-Usage:
-  octopus runbook snapshot publish [flags]
-
-Flags:
-  -p, --project string    Name or ID of the project where the runbook is
-  -r, --runbook string    Name or ID of the runbook to publish an existing snapshot
-      --snapshot string   Name or ID of the snapshot to publish
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus runbook snapshot publish --project MyProject --runbook "Rebuild DB Indexes" --snapshot "Snapshot 40C9ENM"
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot.mdx
index ca5a105f91..2973ccd91f 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot.mdx
@@ -1,47 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-runbook-snapshot
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus runbook snapshot
-description: Manage runbook snapshots
-navOrder: 132
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage runbook snapshots in Octopus Deploy
-
-```text
-Usage:
-  octopus runbook snapshot [command]
-
-Available Commands:
-  create Create a runbook snapshot
-  help Help about any command
-  list List runbook snapshots
-  publish Publish a runbook snapshot
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus runbook snapshot [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus runbook snapshot create
-octopus runbook snapshot list
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-runbook.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-runbook.mdx
index 423b686478..37ff9365e3 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-runbook.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-runbook.mdx
@@ -1,48 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-runbook
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus runbook
-description: Manage runbooks
-navOrder: 128
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage runbooks in Octopus Deploy
-
-```text
-Usage:
-  octopus runbook [command]
-
-Available Commands:
-  delete Delete a runbook
-  help Help about any command
-  list List runbooks
-  run Run runbooks in Octopus Deploy
-  snapshot Manage runbook snapshots
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus runbook [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus runbook list
-octopus runbook run
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-space-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-space-create.mdx
index 4d15df63e0..b272c30aa7 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-space-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-space-create.mdx
@@ -1,47 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-space-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus space create
-description: Create a space
-navOrder: 137
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a space in Octopus Deploy
-
-```text
-Usage:
-  octopus space create [flags]
-
-Aliases:
-  create, new
-
-Flags:
-  -d, --description string   Description of the space
-  -n, --name string          Name of the space
-  -t, --team stringArray     The teams to manage the space (can be specified multiple times)
-  -u, --user stringArray     The users to manage the space (can be specified multiple times)
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus space create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-space-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-space-delete.mdx
index 673483e1ee..12969ac4e9 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-space-delete.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-space-delete.mdx
@@ -1,46 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-space-delete
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus space delete
-description: Delete a space
-navOrder: 138
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Delete a space in Octopus Deploy
-
-```text
-Usage:
-  octopus space delete {<name> | <id>} [flags]
-
-Aliases:
-  delete, del, rm, remove
-
-Flags:
-  -y, --confirm   Don't ask for confirmation before deleting the space.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus space delete
-octopus space rm
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-space-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-space-list.mdx
index e1fff9d0cd..235ef560e6 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-space-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-space-list.mdx
@@ -1,40 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-space-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus space list
-description: List spaces
-navOrder: 139
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List spaces in Octopus Deploy
-
-```text
-Usage:
-  octopus space list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus space list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-space-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-space-view.mdx
index 81063089d0..18d2c6dc0b 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-space-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-space-view.mdx
@@ -1,39 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-space-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus space view
-description: View a space
-navOrder: 140
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View a space in Octopus Deploy
-
-```text
-Usage:
-  octopus space view {<name> | <id>} [flags]
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus space view 'Pattern - Blue-Green'
-octopus space view Spaces-302
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-space.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-space.mdx
index b246176a29..a2b0f0e188 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-space.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-space.mdx
@@ -1,48 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-space
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus space
-description: Manage spaces
-navOrder: 136
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage spaces in Octopus Deploy
-
-```text
-Usage:
-  octopus space [command]
-
-Available Commands:
-  create Create a space
-  delete Delete a space
-  help Help about any command
-  list List spaces
-  view View a space
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus space [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus space list
-octopus space view Spaces-302
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-task-wait.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-task-wait.mdx
index fc14b010dd..8861e15d78 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-task-wait.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-task-wait.mdx
@@ -1,44 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-task-wait
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus task wait
-description: Wait for task(s) to finish
-navOrder: 142
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Wait for a provided list of task(s) to finish
-
-```text
-Usage:
-  octopus task wait [TaskIDs] [flags]
-
-Flags:
-      --cancel-on-timeout   Cancel the tasks if the wait timeout is reached
-      --poll-interval int   Polling interval in seconds to check task status during wait (default 10)
-      --progress            Show detailed progress of the tasks
-      --timeout int         Time in seconds to wait for the tasks to complete (default 600)
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus task wait
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-task.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-task.mdx
index c46d057fa1..d96482a5af 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-task.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-task.mdx
@@ -1,34 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-task
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus task
-description: Manage tasks
-navOrder: 141
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage tasks in Octopus Deploy
-
-```text
-Usage:
-  octopus task [command]
-
-Available Commands:
-  help Help about any command
-  wait Wait for task(s) to finish
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus task [command] --help" for more information about a command.
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-clone.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-clone.mdx
index e00d482cc8..ec0ef5e3cf 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-clone.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-clone.mdx
@@ -1,45 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-tenant-clone
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus tenant clone
-description: Clone a tenant
-navOrder: 144
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Clone a tenant in Octopus Deploy
-
-```text
-Usage:
-  octopus tenant clone [flags]
-
-Flags:
-  -d, --description string     Description of the new tenant
-  -n, --name string            Name of the new tenant
-      --source-tenant string   Name of the source tenant
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus tenant clone
-octopus tenant clone --name "Gary's Cakes" --source-tenant "Bob's Wood Shop" 
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-connect.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-connect.mdx
index 72151a950a..753d94b59b 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-connect.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-connect.mdx
@@ -1,47 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-tenant-connect
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus tenant connect
-description: Connect a tenant to a project
-navOrder: 145
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Connect a tenant to a project in Octopus Deploy
-
-```text
-Usage:
-  octopus tenant connect [flags]
-
-Flags:
-      --enable-tenant-deployments   Update the project to support tenanted deployments, if required
-      --env stringArray             The environments to connect to the tenant (can be specified multiple times)
-  -e, --environment stringArray     The environments to connect to the tenant (can be specified multiple times)
-  -p, --project string              Name, ID or Slug of the project to connect to the tenant
-  -t, --tenant string               Name or Id of the tenant
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus tenant connect
-octopus tenant connect --tenant "Bobs Wood Shop" --project "Deploy web site" --environment "Production"
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-create.mdx
index 90ac4f8d42..b89413ce8c 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-create.mdx
@@ -1,46 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-tenant-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus tenant create
-description: Create a tenant
-navOrder: 146
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a tenant in Octopus Deploy
-
-```text
-Usage:
-  octopus tenant create [flags]
-
-Aliases:
-  create, new
-
-Flags:
-  -d, --description string   Description of the tenant
-  -n, --name string          Name of the tenant
-  -t, --tag stringArray      Tag to apply to tenant, must use canonical name: <tag_set>/<tag_name>
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus tenant create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-delete.mdx
index 3c761902f4..bb2c7c25c7 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-delete.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-delete.mdx
@@ -1,46 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-tenant-delete
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus tenant delete
-description: Delete a tenant
-navOrder: 147
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Delete a tenant in Octopus Deploy
-
-```text
-Usage:
-  octopus tenant delete {<name> | <id>} [flags]
-
-Aliases:
-  delete, del, rm, remove
-
-Flags:
-  -y, --confirm   Don't ask for confirmation before deleting the tenant.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus tenant delete
-octopus tenant rm
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-disable.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-disable.mdx
index 19dd340880..6ba3b2d681 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-disable.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-disable.mdx
@@ -1,39 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-tenant-disable
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus tenant disable
-description: Disable a tenant
-navOrder: 148
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Disable a tenant in Octopus Deploy
-
-```text
-Usage:
-  octopus tenant disable {<name> | <id>} [flags]
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus tenant disable Tenants-1
-octopus tenant disable 'Tenant'
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-disconnect.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-disconnect.mdx
index fb3d026dbd..21d122ecc6 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-disconnect.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-disconnect.mdx
@@ -1,45 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-tenant-disconnect
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus tenant disconnect
-description: Disconnect a tenant from a project
-navOrder: 149
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Disconnect a tenant from a project in Octopus Deploy
-
-```text
-Usage:
-  octopus tenant disconnect [flags]
-
-Flags:
-  -y, --confirm          Don't ask for confirmation disconnecting the project.
-  -p, --project string   Name, ID or Slug of the project to connect to the tenant
-  -t, --tenant string    Name or Id of the tenant
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus tenant disconnect
-octopus tenant disconnect --tenant "Test Tenant" --project "Deploy web site" --confirm
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-enable.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-enable.mdx
index 5559205db4..f3565f5d3e 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-enable.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-enable.mdx
@@ -1,39 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-tenant-enable
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus tenant enable
-description: Enable a tenant
-navOrder: 150
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Enable a tenant in Octopus Deploy
-
-```text
-Usage:
-  octopus tenant enable {<name> | <id>} [flags]
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus tenant enable Tenants-1
-octopus tenant enable 'Tenant'
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-list.mdx
index b19da100df..6b5389a642 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-list.mdx
@@ -1,42 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-tenant-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus tenant list
-description: List tenants
-navOrder: 151
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List tenants in Octopus Deploy
-
-```text
-Usage:
-  octopus tenant list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus tenant list
-octopus tenant ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-tag.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-tag.mdx
index a00987e23b..a52218b67c 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-tag.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-tag.mdx
@@ -1,42 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-tenant-tag
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus tenant tag
-description: Override tags for a tenant
-navOrder: 152
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Override tags for a tenant in Octopus Deploy
-
-```text
-Usage:
-  octopus tenant tag [flags]
-
-Flags:
-  -t, --tag stringArray   Tag to apply to tenant, must use canonical name: <tag_set>/<tag_name>
-      --tenant string     Name or ID of the tenant you wish to update
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus tenant tag Tenant-1
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables-list.mdx
index a7493ef458..ef1fc49e79 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables-list.mdx
@@ -1,47 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-tenant-variables-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus tenant variables list
-description: List tenant variables
-navOrder: 154
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List tenant variables in Octopus Deploy
-
-```text
-Usage:
-  octopus tenant variables list [<name> | <id>] [flags]
-
-Aliases:
-  list, ls
-
-Flags:
-  -t, --tenant string   The tenant
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus tenant variables list "Bobs Wood Shop"
-octopus tenant variables list --tenant "Bobs Wood Shop"
-octopus tenant variables ls Tenant-123
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables-update.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables-update.mdx
index d8b40c4254..4bdac655e8 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables-update.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables-update.mdx
@@ -1,49 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-tenant-variables-update
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus tenant variables update
-description: Update the value of a tenant variable
-navOrder: 155
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Update the value of a tenant variable in Octopus Deploy
-
-```text
-Usage:
-  octopus tenant variables update [flags]
-
-Flags:
-      --environment strings           Assign environment scopes to the variable. Multiple scopes can be supplied.
-  -l, --library-variable-set string   The library variable set
-  -n, --name string                   The name of the variable
-  -p, --project string                The project
-  -t, --tenant string                 The tenant
-      --value string                  The value to set on the variable
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus tenant variables update
-octopus tenant variables update --tenant "Bobs Fish Shack" --name "site-name" --value "Bob's Fish Shack" --project "Awesome Web Site" --environment "Test"
-octopus tenant variables update --tenant "Sally's Tackle Truck" --name dbPassword --value "12345" --library-variable-set "Shared Variables"
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables.mdx
index 1bbe2ba475..da0b0584c5 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables.mdx
@@ -1,49 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-tenant-variables
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus tenant variables
-description: Manage tenant variables
-navOrder: 153
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage tenant variables in Octopus Deploy
-
-```text
-Usage:
-  octopus tenant variables [command]
-
-Aliases:
-  variables, variable
-
-Available Commands:
-  help Help about any command
-  list List tenant variables
-  update Update the value of a tenant variable
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus tenant variables [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus tenant variables list "Bobs Wood Shop"
-octopus tenant variables update --tenant "Bobs Fish Shack" --name "site-name" --value "Bob's Fish Shack" --project "Awesome Web Site" --environment "Test"
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-view.mdx
index f59ee8a5d4..b093e7a79f 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-view.mdx
@@ -1,45 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-tenant-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus tenant view
-description: View a tenant
-navOrder: 156
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View a tenant in Octopus Deploy
-
-```text
-Usage:
-  octopus tenant view [<name> | <id>] [flags]
-
-Flags:
-  -t, --tenant string   The tenant
-  -w, --web             Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus tenant view Tenants-1
-octopus tenant view 'Tenant'
-octopus tenant view --tenant 'Tenant'
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant.mdx
index 759d890dfa..6e2cff10c7 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-tenant.mdx
@@ -1,55 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-tenant
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus tenant
-description: Manage tenants
-navOrder: 143
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage tenants in Octopus Deploy
-
-```text
-Usage:
-  octopus tenant [command]
-
-Available Commands:
-  clone Clone a tenant
-  connect Connect a tenant to a project
-  create Create a tenant
-  delete Delete a tenant
-  disable Disable a tenant
-  disconnect Disconnect a tenant from a project
-  enable Enable a tenant
-  help Help about any command
-  list List tenants
-  tag Override tags for a tenant
-  variables Manage tenant variables
-  view View a tenant
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus tenant [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus tenant list
-octopus tenant ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-user-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-user-delete.mdx
index 731f4c783f..04a862342d 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-user-delete.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-user-delete.mdx
@@ -1,46 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-user-delete
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus user delete
-description: Delete a user
-navOrder: 158
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Delete a user in Octopus Deploy
-
-```text
-Usage:
-  octopus user delete {<name> | <id>} [flags]
-
-Aliases:
-  delete, del, rm, remove
-
-Flags:
-  -y, --confirm   Don't ask for confirmation before deleting the user.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus user delete some-user-name
-octopus user rm Users-123
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-user-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-user-list.mdx
index 9b726034f1..e7b056c25e 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-user-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-user-list.mdx
@@ -1,42 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-user-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus user list
-description: List users
-navOrder: 159
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List users in Octopus Deploy
-
-```text
-Usage:
-  octopus user list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus user list
-octopus user ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-user.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-user.mdx
index b34e3a4674..3acf19889e 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-user.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-user.mdx
@@ -1,46 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-user
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus user
-description: Manage users
-navOrder: 157
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage user in Octopus Deploy
-
-```text
-Usage:
-  octopus user [command]
-
-Available Commands:
-  delete Delete a user
-  help Help about any command
-  list List users
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus user [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus user list
-octopus user ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-delete.mdx
index bada7c68ba..bc5f2e37c6 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-delete.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-delete.mdx
@@ -1,46 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-delete
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker delete
-description: Delete a worker
-navOrder: 161
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Delete a worker in Octopus Deploy
-
-```text
-Usage:
-  octopus worker delete {<name> | <id>} [flags]
-
-Aliases:
-  delete, del, rm, remove
-
-Flags:
-  -y, --confirm   Don't ask for confirmation before deleting the worker.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker delete
-octopus worker rm
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-list.mdx
index fe72d48651..83ba701c23 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-list.mdx
@@ -1,40 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker list
-description: List workers
-navOrder: 162
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List workers in Octopus Deploy
-
-```text
-Usage:
-  octopus worker list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-create.mdx
index abe061386c..19fefdd1f2 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-create.mdx
@@ -1,48 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-listening-tentacle-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker listening-tentacle create
-description: Create a listening tentacle worker
-navOrder: 164
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a listening tentacle worker in Octopus Deploy
-
-```text
-Usage:
-  octopus worker listening-tentacle create [flags]
-
-Flags:
-      --machine-policy string   The machine policy for the deployment target to use, only required if not using the Default Machine Policy
-  -n, --name string             A short, memorable, unique name for this Listening Tentacle worker.
-      --proxy string            Select whether to use a proxy to connect to this Listening Tentacle. If omitted, will connect directly.
-      --thumbprint string       The X509 certificate thumbprint that securely identifies the Tentacle.
-      --url string              The network address at which the Listening Tentacle can be reached.
-  -w, --web                     Open in web browser
-      --worker-pool strings     The pools of which the worker will be a member.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker listening-tentacle create
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-list.mdx
index 889548c881..8b1a874338 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-list.mdx
@@ -1,41 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-listening-tentacle-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker listening-tentacle list
-description: List Listening Tentacle workers
-navOrder: 165
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List Listening Tentacle workers in Octopus Deploy
-
-```text
-Usage:
-  octopus worker listening-tentacle list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker listening-tentacle list
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-view.mdx
index a1fb793b61..ee27f0d3bb 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-view.mdx
@@ -1,43 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-listening-tentacle-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker listening-tentacle view
-description: View a Listening Tentacle worker
-navOrder: 166
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View a Listening Tentacle worker in Octopus Deploy
-
-```text
-Usage:
-  octopus worker listening-tentacle view {<name> | <id>} [flags]
-
-Flags:
-  -w, --web   Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker listening-tentacle view 'WindowsWorker'
-octopus worker listening-tentacle view Machines-100
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle.mdx
index e761c99b37..e593809815 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle.mdx
@@ -1,45 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-listening-tentacle
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker listening-tentacle
-description: Manage Listening Tentacle workers
-navOrder: 163
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage Listening Tentacle workers in Octopus Deploy
-
-```text
-Usage:
-  octopus worker listening-tentacle [command]
-
-Available Commands:
-  create Create a listening tentacle worker
-  help Help about any command
-  list List Listening Tentacle workers
-  view View a Listening Tentacle worker
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus worker listening-tentacle [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker listening-tentacle list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-list.mdx
index 7a0e0650ff..f0c0c08182 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-list.mdx
@@ -1,40 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-polling-tentacle-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker polling-tentacle list
-description: List Polling Tentacle workers
-navOrder: 168
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List Polling Tentacle workers in Octopus Deploy
-
-```text
-Usage:
-  octopus worker polling-tentacle list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker polling-tentacle list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-view.mdx
index 4ae1c09137..308f816dfd 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-view.mdx
@@ -1,43 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-polling-tentacle-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker polling-tentacle view
-description: View a Polling Tentacle worker
-navOrder: 169
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View a Polling Tentacle worker in Octopus Deploy
-
-```text
-Usage:
-  octopus worker polling-tentacle view {<name> | <id>} [flags]
-
-Flags:
-  -w, --web   Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker polling-tentacle view 'WindowsWorker'
-octopus worker polling-tentacle view Machines-100
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle.mdx
index 7ec8c52692..0063366fbf 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle.mdx
@@ -1,44 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-polling-tentacle
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker polling-tentacle
-description: Manage Polling Tentacle workers
-navOrder: 167
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage Polling Tentacle workers in Octopus Deploy
-
-```text
-Usage:
-  octopus worker polling-tentacle [command]
-
-Available Commands:
-  help Help about any command
-  list List Polling Tentacle workers
-  view View a Polling Tentacle worker
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus worker polling-tentacle [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker polling-tentacle list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-delete.mdx
index ab653c7977..e8c50cd24c 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-delete.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-delete.mdx
@@ -1,46 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-pool-delete
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker-pool delete
-description: Delete a worker pool
-navOrder: 176
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Delete a worker pool in Octopus Deploy
-
-```text
-Usage:
-  octopus worker-pool delete {<name> | <id>} [flags]
-
-Aliases:
-  delete, del, rm, remove
-
-Flags:
-  -y, --confirm   Don't ask for confirmation before deleting the worker pool.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker-pool delete
-octopus worker-pool rm
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-create.mdx
index fc209c8d42..884b022dc9 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-create.mdx
@@ -1,45 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-pool-dynamic-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker-pool dynamic create
-description: Create a dynamic worker pool
-navOrder: 178
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a dynamic worker pool in Octopus Deploy
-
-```text
-Usage:
-  octopus worker-pool dynamic create [flags]
-
-Flags:
-      --description string   Description of the worker pool.
-  -n, --name string          A short, memorable, unique name for this worker pool.
-  -w, --web                  Open in web browser
-      --worker-type string   The worker type to use for all leased workers.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker-pool dynamic create
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-view.mdx
index 6133242b22..da95d9de5d 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-view.mdx
@@ -1,43 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-pool-dynamic-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker-pool dynamic view
-description: View a dynamic worker pool
-navOrder: 179
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View a dynamic worker pool in Octopus Deploy
-
-```text
-Usage:
-  octopus worker-pool dynamic view {<name> | <id>} [flags]
-
-Flags:
-  -w, --web   Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker-pool dynamic view WorkerPools-3
-octopus worker-pool dynamic view 'Hosted Workers'
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic.mdx
index b661c87480..abdf1985ba 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic.mdx
@@ -1,44 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-pool-dynamic
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker-pool dynamic
-description: Manage dynamic worker pools
-navOrder: 177
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage dynamic worker pools in Octopus Deploy
-
-```text
-Usage:
-  octopus worker-pool dynamic [command]
-
-Available Commands:
-  create Create a dynamic worker pool
-  help Help about any command
-  view View a dynamic worker pool
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus worker-pool dynamic [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker-pool dynamic view
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-list.mdx
index a7d4730e47..513f552885 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-list.mdx
@@ -1,40 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-pool-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker-pool list
-description: List worker pools
-navOrder: 180
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List worker pools in Octopus Deploy
-
-```text
-Usage:
-  octopus worker-pool list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker-pool list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static-create.mdx
index 082a47a03e..ca51e616cb 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static-create.mdx
@@ -1,44 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-pool-static-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker-pool static create
-description: Create a static worker pool
-navOrder: 182
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a static worker pool in Octopus Deploy
-
-```text
-Usage:
-  octopus worker-pool static create [flags]
-
-Flags:
-      --description string   Description of the worker pool.
-  -n, --name string          A short, memorable, unique name for this worker pool.
-  -w, --web                  Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker-pool static create
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static-view.mdx
index deeb8698a6..fa8723ab0b 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static-view.mdx
@@ -1,43 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-pool-static-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker-pool static view
-description: View a static worker pool
-navOrder: 183
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View a static worker pool in Octopus Deploy
-
-```text
-Usage:
-  octopus worker-pool static view {<name> | <id>} [flags]
-
-Flags:
-  -w, --web   Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker-pool static view WorkerPools-3
-octopus worker-pool static view 'windows workers'
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static.mdx
index c64f21a16f..96cae60e0e 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static.mdx
@@ -1,44 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-pool-static
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker-pool static
-description: Manage static worker pools
-navOrder: 181
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage static worker pools in Octopus Deploy
-
-```text
-Usage:
-  octopus worker-pool static [command]
-
-Available Commands:
-  create Create a static worker pool
-  help Help about any command
-  view View a static worker pool
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus worker-pool static [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker-pool static view
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-view.mdx
index d8ddecf535..b6661c93b8 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-view.mdx
@@ -1,43 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-pool-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker-pool view
-description: View a worker pool
-navOrder: 184
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View a worker pool in Octopus Deploy
-
-```text
-Usage:
-  octopus worker-pool view {<name> | <id>} [flags]
-
-Flags:
-  -w, --web   Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker-pool view WorkerPools-3
-octopus worker-pool view 'linux workers'
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool.mdx
index 98cf8e1611..cf5e422625 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool.mdx
@@ -1,49 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-pool
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker-pool
-description: Manage worker pools
-navOrder: 175
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage worker pools in Octopus Deploy
-
-```text
-Usage:
-  octopus worker-pool [command]
-
-Available Commands:
-  delete Delete a worker pool
-  dynamic Manage dynamic worker pools
-  help Help about any command
-  list List worker pools
-  static Manage static worker pools
-  view View a worker pool
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus worker-pool [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker-pool list
-octopus worker-pool ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-create.mdx
index 06b5256124..50bfc28b4c 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-create.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-create.mdx
@@ -1,51 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-ssh-create
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker ssh create
-description: Create a SSH worker
-navOrder: 171
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Create a SSH worker in Octopus Deploy
-
-```text
-Usage:
-  octopus worker ssh create [flags]
-
-Flags:
-      --account string          The name or ID of the SSH key pair or username/password account
-      --fingerprint string      The host fingerprint of the worker.
-      --host string             The hostname or IP address of the worker to connect to.
-      --machine-policy string   The machine policy for the deployment target to use, only required if not using the Default Machine Policy
-  -n, --name string             A short, memorable, unique name for this worker.
-      --platform string         The platform to use for the self-contained Calamari. Options are 'linux-x64', 'linux-arm64', 'linux-arm' or 'osx-x64'
-      --port int                The port to connect to the worker on.
-      --proxy string            Select whether to use a proxy to connect to this SSH worker. If omitted, will connect directly.
-      --runtime string          The runtime to use to run Calamari on the worker. Options are 'self-contained' or 'mono'
-  -w, --web                     Open in web browser
-      --worker-pool strings     The pools of which the worker will be a member.
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker ssh create
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-list.mdx
index 148c2a1da8..499d4b883e 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-list.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-list.mdx
@@ -1,40 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-ssh-list
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker ssh list
-description: List SSH workers
-navOrder: 172
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-List SSH workers in Octopus Deploy
-
-```text
-Usage:
-  octopus worker ssh list [flags]
-
-Aliases:
-  list, ls
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker ssh list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-view.mdx
index 608917898c..3663dcb836 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-view.mdx
@@ -1,43 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-ssh-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker ssh view
-description: View a SSH worker
-navOrder: 173
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View a SSH worker in Octopus Deploy
-
-```text
-Usage:
-  octopus worker ssh view {<name> | <id>} [flags]
-
-Flags:
-  -w, --web   Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker ssh view 'linux-worker'
-octopus worker ssh view Machines-100
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh.mdx
index abf97610b4..6ed3cf8f6c 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh.mdx
@@ -1,45 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-ssh
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker ssh
-description: Manage SSH workers
-navOrder: 170
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage SSH workers in Octopus Deploy
-
-```text
-Usage:
-  octopus worker ssh [command]
-
-Available Commands:
-  create Create a SSH worker
-  help Help about any command
-  list List SSH workers
-  view View a SSH worker
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus worker ssh [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker SSH list
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-view.mdx
index 4e008f47d7..09e772182f 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-view.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker-view.mdx
@@ -1,43 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker-view
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker view
-description: View a worker
-navOrder: 174
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-View a worker in Octopus Deploy
-
-```text
-Usage:
-  octopus worker view {<name> | <id>} [flags]
-
-Flags:
-  -w, --web   Open in web browser
-
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker view Machines-100
-octopus worker view 'worker'
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker.mdx
index a1bbe61e1c..f1b439b799 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus-worker.mdx
@@ -1,50 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-worker
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-08-20
-title: octopus worker
-description: Manage workers
-navOrder: 160
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Manage workers in Octopus Deploy
-
-```text
-Usage:
-  octopus worker [command]
-
-Available Commands:
-  delete Delete a worker
-  help Help about any command
-  list List workers
-  listening-tentacle Manage Listening Tentacle workers
-  polling-tentacle Manage Polling Tentacle workers
-  ssh Manage SSH workers
-  view View a worker
-
-Global Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-
-
-Use "octopus worker [command] --help" for more information about a command.
-```
-
-## Examples
-
-<SamplesInstance />
-
-```bash
-octopus worker list
-octopus worker ls
-
-
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus.mdx b/src/pages/docs/octopus-rest-api/cli/octopus.mdx
index 421ae258fc..93870b63c6 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus.mdx
+++ b/src/pages/docs/octopus-rest-api/cli/octopus.mdx
@@ -1,56 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2026-04-19
-title: octopus
-description: Octopus Deploy CLI
-navOrder: 0
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-Work seamlessly with Octopus Deploy from the command line.
-
-```text
-Usage:
-  octopus <command> [flags]
-  octopus [command]
-
-Available Commands:
-  account Manage accounts
-  api Execute a raw API GET request
-  build-information Manage build information
-  channel Manage channels
-  config Manage CLI configuration
-  deployment-target Manage deployment targets
-  environment Manage environments
-  ephemeral-environment Manage ephemeral environments
-  help Help about any command
-  login Login to Octopus
-  logout Logout of Octopus
-  package Manage packages
-  project Manage projects
-  project-group Manage project groups
-  release Manage releases
-  runbook Manage runbooks
-  space Manage spaces
-  task Manage tasks
-  tenant Manage tenants
-  user Manage users
-  worker Manage workers
-  worker-pool Manage worker pools
-
-Flags:
-  -h, --help                   Show help for a command
-      --no-prompt              Disable prompting in interactive mode
-  -f, --output-format string   Specify the output format for a command ("json", "table", or "basic") (default "table")
-  -s, --space string           Specify the space for operations
-  -v, --version                Prints version information
-
-
-Use "octopus [command] --help" for more information about a command.
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account.md b/src/pages/docs/octopus-rest-api/cli/octopus_account.md
index 51ed8f5028..b7d5caf15b 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account
+redirect: https://octopus.com/docs/cli/octopus-account
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_aws.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_aws.md
index c25e4ad5a3..f18252915f 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_aws.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_aws.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-aws
+redirect: https://octopus.com/docs/cli/octopus-account-aws
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_aws_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_aws_create.md
index 4f2b41d99b..4fbbcf863d 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_aws_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_aws_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-aws-create
+redirect: https://octopus.com/docs/cli/octopus-account-aws-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_aws_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_aws_list.md
index 9a14ddf4f3..c6a5a07690 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_aws_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_aws_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-aws-list
+redirect: https://octopus.com/docs/cli/octopus-account-aws-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_azure.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_azure.md
index dbb10ce452..f9ccf62f8a 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_azure.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_azure.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-azure
+redirect: https://octopus.com/docs/cli/octopus-account-azure
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_azure_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_azure_create.md
index ead8f58c0a..41d8461a2a 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_azure_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_azure_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-azure-create
+redirect: https://octopus.com/docs/cli/octopus-account-azure-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_azure_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_azure_list.md
index b1bd1b954c..5e6a7e7909 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_azure_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_azure_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-azure-list
+redirect: https://octopus.com/docs/cli/octopus-account-azure-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_create.md
index e66da5d8b1..7b2e734c0e 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-create
+redirect: https://octopus.com/docs/cli/octopus-account-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_delete.md
index eab8c1e31f..6b8dc2faf2 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_delete.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_delete.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-delete
+redirect: https://octopus.com/docs/cli/octopus-account-delete
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp.md
index 276e296e7b..091bb9d56e 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-gcp
+redirect: https://octopus.com/docs/cli/octopus-account-gcp
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp_create.md
index c5dd965b0a..a2697ce38f 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-gcp-create
+redirect: https://octopus.com/docs/cli/octopus-account-gcp-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp_list.md
index 56c313ccc5..9920174af9 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-gcp-list
+redirect: https://octopus.com/docs/cli/octopus-account-gcp-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_list.md
index f1d785ed1a..f82b1ffccd 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-list
+redirect: https://octopus.com/docs/cli/octopus-account-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh.md
index cfd8a11030..00a5ecfbe8 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-ssh
+redirect: https://octopus.com/docs/cli/octopus-account-ssh
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh_create.md
index cd10d1ce76..b70bd47d59 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-ssh-create
+redirect: https://octopus.com/docs/cli/octopus-account-ssh-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh_list.md
index 828011427f..1235a41ab3 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-ssh-list
+redirect: https://octopus.com/docs/cli/octopus-account-ssh-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_token.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_token.md
index f1551a74d7..bfb3f81d0b 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_token.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_token.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-token
+redirect: https://octopus.com/docs/cli/octopus-account-token
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_token_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_token_create.md
index 517164ff65..6a4654d51b 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_token_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_token_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-token-create
+redirect: https://octopus.com/docs/cli/octopus-account-token-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_token_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_token_list.md
index 21e92913da..49d66d2d2b 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_token_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_token_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-token-list
+redirect: https://octopus.com/docs/cli/octopus-account-token-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_username.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_username.md
index 8bc7526250..6f837ecee3 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_username.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_username.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-username
+redirect: https://octopus.com/docs/cli/octopus-account-username
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_username_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_username_create.md
index c1777ecef7..e108f7420c 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_username_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_username_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-username-create
+redirect: https://octopus.com/docs/cli/octopus-account-username-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_username_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_username_list.md
index e89498bc1d..3a7b88ace5 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_username_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_account_username_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-account-username-list
+redirect: https://octopus.com/docs/cli/octopus-account-username-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_config.md b/src/pages/docs/octopus-rest-api/cli/octopus_config.md
index 12aaf895a7..343ac600e7 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_config.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_config.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-config
+redirect: https://octopus.com/docs/cli/octopus-config
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_config_get.md b/src/pages/docs/octopus-rest-api/cli/octopus_config_get.md
index 43479e66f3..e1a6dd5ea7 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_config_get.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_config_get.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-config-get
+redirect: https://octopus.com/docs/cli/octopus-config-get
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_config_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_config_list.md
index 467bf9995b..8735854bcb 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_config_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_config_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-config-list
+redirect: https://octopus.com/docs/cli/octopus-config-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_config_set.md b/src/pages/docs/octopus-rest-api/cli/octopus_config_set.md
index 6be97a00f7..2772e238ee 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_config_set.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_config_set.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-config-set
+redirect: https://octopus.com/docs/cli/octopus-config-set
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target.md
index 36a8e420ed..ab3c3e8a43 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target
+redirect: https://octopus.com/docs/cli/octopus-deployment-target
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app.md
index a74b92e751..fabb23a197 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-azure-web-app
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_create.md
index 34ec113b09..26d684fe60 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-create
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-azure-web-app-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_list.md
index 6ae0ed144c..3c4b3c5edc 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-list
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-azure-web-app-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_view.md
index 24bb56336c..bba4862730 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_view.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_view.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-view
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-azure-web-app-view
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region.md
index 5a563f3d25..907d7e6549 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-cloud-region
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_create.md
index 28f800deb5..06cb431fa5 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-create
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-cloud-region-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_list.md
index 48cf0138b1..660d77d109 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-list
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-cloud-region-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_view.md
index 6d1593a977..9035a4b9dd 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_view.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_view.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-view
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-cloud-region-view
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_delete.md
index 3bf0611875..ed1b75d8e8 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_delete.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_delete.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-delete
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-delete
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes.md
index a1575ff76a..009a802754 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-kubernetes
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_create.md
index ab95bc5ec7..a32cd29a71 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-create
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-kubernetes-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_list.md
index 4b1c4d13df..2cabaf1905 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-list
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-kubernetes-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_view.md
index 06ee9d1d0c..586840b470 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_view.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_view.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-view
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-kubernetes-view
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_list.md
index 38b1b6e1d0..6268b60155 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-list
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle.md
index 2f79bae29d..acdc2d77bf 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-listening-tentacle
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_create.md
index 7a7c27e912..2eb3dda767 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-create
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-listening-tentacle-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_list.md
index cebf95528a..4fff271d14 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-list
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-listening-tentacle-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_view.md
index 988d616212..335da0b9c6 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_view.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_view.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-view
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-listening-tentacle-view
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle.md
index ecbe906808..c679701957 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-polling-tentacle
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle_list.md
index b2c6fcdff8..de1597b265 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-list
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-polling-tentacle-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle_view.md
index 022783bd14..b691b9fc00 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle_view.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle_view.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-view
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-polling-tentacle-view
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh.md
index cf301a3cf2..64c075b0bc 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-ssh
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-ssh
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_create.md
index 0803ca8667..8d1ee4770c 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-create
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-ssh-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_list.md
index 6f6b654faf..88c7b6c456 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-list
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-ssh-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_view.md
index edf6683247..e790b4847a 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_view.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_view.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-view
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-ssh-view
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_view.md
index a08bb0c904..d7efc33a1e 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_view.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_view.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-deployment-target-view
+redirect: https://octopus.com/docs/cli/octopus-deployment-target-view
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_environment.md b/src/pages/docs/octopus-rest-api/cli/octopus_environment.md
index d4cfe998f5..12dd675cf9 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_environment.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_environment.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-environment
+redirect: https://octopus.com/docs/cli/octopus-environment
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_environment_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_environment_delete.md
index bf64be020e..1045077c01 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_environment_delete.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_environment_delete.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-environment-delete
+redirect: https://octopus.com/docs/cli/octopus-environment-delete
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_environment_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_environment_list.md
index 5e56c627f6..c8dc679aad 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_environment_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_environment_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-environment-list
+redirect: https://octopus.com/docs/cli/octopus-environment-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_package.md b/src/pages/docs/octopus-rest-api/cli/octopus_package.md
index aa169bf43a..5dd018cff0 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_package.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_package.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-package
+redirect: https://octopus.com/docs/cli/octopus-package
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_package_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_package_list.md
index 5581d7f68a..e564c52109 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_package_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_package_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-package-list
+redirect: https://octopus.com/docs/cli/octopus-package-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_package_upload.md b/src/pages/docs/octopus-rest-api/cli/octopus_package_upload.md
index 368df9105c..11fa8f5869 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_package_upload.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_package_upload.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-package-upload
+redirect: https://octopus.com/docs/cli/octopus-package-upload
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_package_versions.md b/src/pages/docs/octopus-rest-api/cli/octopus_package_versions.md
index 4e6afd5e31..a2c29b78fd 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_package_versions.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_package_versions.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-package-versions
+redirect: https://octopus.com/docs/cli/octopus-package-versions
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project-group.md b/src/pages/docs/octopus-rest-api/cli/octopus_project-group.md
index 3fdb70ff72..b012147f49 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project-group.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_project-group.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-project-group
+redirect: https://octopus.com/docs/cli/octopus-project-group
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project-group_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_project-group_create.md
index bb1d6821ba..b387ecaeac 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project-group_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_project-group_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-project-group-create
+redirect: https://octopus.com/docs/cli/octopus-project-group-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project-group_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_project-group_delete.md
index 0be7da8254..8d546dfff0 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project-group_delete.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_project-group_delete.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-project-group-delete
+redirect: https://octopus.com/docs/cli/octopus-project-group-delete
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project-group_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_project-group_list.md
index db3ec6c3de..f2be546ab5 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project-group_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_project-group_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-project-group-list
+redirect: https://octopus.com/docs/cli/octopus-project-group-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project-group_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_project-group_view.md
index 8cd35eb18d..49c9f978a5 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project-group_view.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_project-group_view.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-project-group-view
+redirect: https://octopus.com/docs/cli/octopus-project-group-view
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project.md b/src/pages/docs/octopus-rest-api/cli/octopus_project.md
index 8279f22245..ef92c8a859 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_project.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-project
+redirect: https://octopus.com/docs/cli/octopus-project
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project_connect.md b/src/pages/docs/octopus-rest-api/cli/octopus_project_connect.md
index 54ed108c7e..0a5c833322 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project_connect.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_project_connect.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-project-connect
+redirect: https://octopus.com/docs/cli/octopus-project-connect
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project_convert.md b/src/pages/docs/octopus-rest-api/cli/octopus_project_convert.md
index b3d7be761d..89e4907116 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project_convert.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_project_convert.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-project-convert
+redirect: https://octopus.com/docs/cli/octopus-project-convert
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_project_create.md
index e1a758e8e8..ba1bcf1da9 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_project_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-project-create
+redirect: https://octopus.com/docs/cli/octopus-project-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_project_delete.md
index 5603512f11..7e6a7154f9 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project_delete.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_project_delete.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-project-delete
+redirect: https://octopus.com/docs/cli/octopus-project-delete
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project_disconnect.md b/src/pages/docs/octopus-rest-api/cli/octopus_project_disconnect.md
index d69afc32bd..7a417e2d30 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project_disconnect.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_project_disconnect.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-project-disconnect
+redirect: https://octopus.com/docs/cli/octopus-project-disconnect
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_project_list.md
index 7776b40f84..c9073910a8 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_project_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-project-list
+redirect: https://octopus.com/docs/cli/octopus-project-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_project_view.md
index 396db6427e..5efeb0c1f6 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project_view.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_project_view.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-project-view
+redirect: https://octopus.com/docs/cli/octopus-project-view
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_release.md b/src/pages/docs/octopus-rest-api/cli/octopus_release.md
index 0a1e46304f..73644a0e87 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_release.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_release.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-release
+redirect: https://octopus.com/docs/cli/octopus-release
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_release_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_release_create.md
index 1916feefc8..227733f69c 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_release_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_release_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-release-create
+redirect: https://octopus.com/docs/cli/octopus-release-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_release_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_release_delete.md
index d3a539bcc7..0b16ee5527 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_release_delete.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_release_delete.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-release-delete
+redirect: https://octopus.com/docs/cli/octopus-release-delete
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_release_deploy.md b/src/pages/docs/octopus-rest-api/cli/octopus_release_deploy.md
index 02e6499a6a..7235de1260 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_release_deploy.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_release_deploy.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-release-deploy
+redirect: https://octopus.com/docs/cli/octopus-release-deploy
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_release_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_release_list.md
index 42024141dc..0fd43c6ad8 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_release_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_release_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-release-list
+redirect: https://octopus.com/docs/cli/octopus-release-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_runbook.md b/src/pages/docs/octopus-rest-api/cli/octopus_runbook.md
index 6c5e44a141..37ff9365e3 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_runbook.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_runbook.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-runbook
+redirect: https://octopus.com/docs/cli/octopus-runbook
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_runbook_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_runbook_list.md
index 0935b0ef4c..1d643a7096 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_runbook_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_runbook_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-runbook-list
+redirect: https://octopus.com/docs/cli/octopus-runbook-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_runbook_run.md b/src/pages/docs/octopus-rest-api/cli/octopus_runbook_run.md
index e1d42f03fb..2df85fab43 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_runbook_run.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_runbook_run.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-runbook-run
+redirect: https://octopus.com/docs/cli/octopus-runbook-run
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_space.md b/src/pages/docs/octopus-rest-api/cli/octopus_space.md
index 91e0bae443..a2b0f0e188 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_space.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_space.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-space
+redirect: https://octopus.com/docs/cli/octopus-space
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_space_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_space_create.md
index 17accb9807..b272c30aa7 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_space_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_space_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-space-create
+redirect: https://octopus.com/docs/cli/octopus-space-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_space_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_space_delete.md
index 0c3fe3b4cb..12969ac4e9 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_space_delete.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_space_delete.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-space-delete
+redirect: https://octopus.com/docs/cli/octopus-space-delete
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_space_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_space_list.md
index 4bf078bdbf..235ef560e6 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_space_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_space_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-space-list
+redirect: https://octopus.com/docs/cli/octopus-space-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_space_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_space_view.md
index 82f4c2b109..18d2c6dc0b 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_space_view.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_space_view.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-space-view
+redirect: https://octopus.com/docs/cli/octopus-space-view
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_task.md b/src/pages/docs/octopus-rest-api/cli/octopus_task.md
index 8eddbd9ac4..d96482a5af 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_task.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_task.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-task
+redirect: https://octopus.com/docs/cli/octopus-task
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_task_wait.md b/src/pages/docs/octopus-rest-api/cli/octopus_task_wait.md
index f6f11d0b24..8861e15d78 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_task_wait.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_task_wait.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-task-wait
+redirect: https://octopus.com/docs/cli/octopus-task-wait
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_tenant.md b/src/pages/docs/octopus-rest-api/cli/octopus_tenant.md
index 459c59ad16..6e2cff10c7 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_tenant.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_tenant.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-tenant
+redirect: https://octopus.com/docs/cli/octopus-tenant
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_clone.md b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_clone.md
index 77786c80aa..ec0ef5e3cf 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_clone.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_clone.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-tenant-clone
+redirect: https://octopus.com/docs/cli/octopus-tenant-clone
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_connect.md b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_connect.md
index 015e899754..753d94b59b 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_connect.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_connect.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-tenant-connect
+redirect: https://octopus.com/docs/cli/octopus-tenant-connect
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_create.md
index 77dc46e5ca..b89413ce8c 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-tenant-create
+redirect: https://octopus.com/docs/cli/octopus-tenant-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_delete.md
index fe58387a1f..bb2c7c25c7 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_delete.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_delete.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-tenant-delete
+redirect: https://octopus.com/docs/cli/octopus-tenant-delete
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_disconnect.md b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_disconnect.md
index 71af286e9f..21d122ecc6 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_disconnect.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_disconnect.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-tenant-disconnect
+redirect: https://octopus.com/docs/cli/octopus-tenant-disconnect
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_list.md
index 456e72feef..6b5389a642 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-tenant-list
+redirect: https://octopus.com/docs/cli/octopus-tenant-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_tag.md b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_tag.md
index a7565fe81f..a52218b67c 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_tag.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_tag.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-tenant-tag
+redirect: https://octopus.com/docs/cli/octopus-tenant-tag
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_view.md
index e04a23f4f6..b093e7a79f 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_view.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_view.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-tenant-view
+redirect: https://octopus.com/docs/cli/octopus-tenant-view
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_user.md b/src/pages/docs/octopus-rest-api/cli/octopus_user.md
index cdfb9c76c2..3acf19889e 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_user.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_user.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-user
+redirect: https://octopus.com/docs/cli/octopus-user
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_user_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_user_delete.md
index 52fd8cf019..04a862342d 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_user_delete.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_user_delete.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-user-delete
+redirect: https://octopus.com/docs/cli/octopus-user-delete
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_user_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_user_list.md
index 60a2b8148c..e7b056c25e 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_user_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_user_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-user-list
+redirect: https://octopus.com/docs/cli/octopus-user-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool.md
index 61aa22f5ee..cf5e422625 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-pool
+redirect: https://octopus.com/docs/cli/octopus-worker-pool
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_delete.md
index 1101b1b29d..e8c50cd24c 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_delete.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_delete.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-pool-delete
+redirect: https://octopus.com/docs/cli/octopus-worker-pool-delete
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic.md
index 8a602dfab3..abdf1985ba 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic
+redirect: https://octopus.com/docs/cli/octopus-worker-pool-dynamic
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic_create.md
index 8183b64734..884b022dc9 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-create
+redirect: https://octopus.com/docs/cli/octopus-worker-pool-dynamic-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic_view.md
index fbdc5cd5d2..da95d9de5d 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic_view.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic_view.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-view
+redirect: https://octopus.com/docs/cli/octopus-worker-pool-dynamic-view
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_list.md
index 132fce708d..513f552885 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-pool-list
+redirect: https://octopus.com/docs/cli/octopus-worker-pool-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static.md
index ac5fd35b0a..96cae60e0e 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-pool-static
+redirect: https://octopus.com/docs/cli/octopus-worker-pool-static
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static_create.md
index 63368d687b..ca51e616cb 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-pool-static-create
+redirect: https://octopus.com/docs/cli/octopus-worker-pool-static-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static_view.md
index 11f6e6a52f..fa8723ab0b 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static_view.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static_view.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-pool-static-view
+redirect: https://octopus.com/docs/cli/octopus-worker-pool-static-view
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_view.md
index cf89144eeb..b6661c93b8 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_view.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_view.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-pool-view
+redirect: https://octopus.com/docs/cli/octopus-worker-pool-view
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker.md
index b6b6854442..f1b439b799 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker
+redirect: https://octopus.com/docs/cli/octopus-worker
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_delete.md
index 64efa0cc40..bc5f2e37c6 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_delete.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker_delete.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-delete
+redirect: https://octopus.com/docs/cli/octopus-worker-delete
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_list.md
index 13eeb41d51..83ba701c23 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-list
+redirect: https://octopus.com/docs/cli/octopus-worker-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle.md
index 4e1979e572..e593809815 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle
+redirect: https://octopus.com/docs/cli/octopus-worker-listening-tentacle
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_create.md
index 865fe2f8b8..19fefdd1f2 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-create
+redirect: https://octopus.com/docs/cli/octopus-worker-listening-tentacle-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_list.md
index 4ba344921e..8b1a874338 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-list
+redirect: https://octopus.com/docs/cli/octopus-worker-listening-tentacle-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_view.md
index b1c61ced33..ee27f0d3bb 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_view.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_view.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-view
+redirect: https://octopus.com/docs/cli/octopus-worker-listening-tentacle-view
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle.md
index 28d59d4ee8..0063366fbf 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle
+redirect: https://octopus.com/docs/cli/octopus-worker-polling-tentacle
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle_list.md
index c7550924a9..f0c0c08182 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-list
+redirect: https://octopus.com/docs/cli/octopus-worker-polling-tentacle-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle_view.md
index b5e06a1b72..308f816dfd 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle_view.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle_view.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-view
+redirect: https://octopus.com/docs/cli/octopus-worker-polling-tentacle-view
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh.md
index 0eb6dd46bd..6ed3cf8f6c 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-ssh
+redirect: https://octopus.com/docs/cli/octopus-worker-ssh
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_create.md
index c8110d2cc1..50bfc28b4c 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_create.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_create.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-ssh-create
+redirect: https://octopus.com/docs/cli/octopus-worker-ssh-create
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_list.md
index c8f5ca4717..499d4b883e 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_list.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_list.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-ssh-list
+redirect: https://octopus.com/docs/cli/octopus-worker-ssh-list
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_view.md
index df2142a367..3663dcb836 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_view.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_view.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-ssh-view
+redirect: https://octopus.com/docs/cli/octopus-worker-ssh-view
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_view.md
index d1053fb518..09e772182f 100644
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_view.md
+++ b/src/pages/docs/octopus-rest-api/cli/octopus_worker_view.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/cli/octopus-worker-view
+redirect: https://octopus.com/docs/cli/octopus-worker-view
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/index.mdx b/src/pages/docs/octopus-rest-api/index.mdx
index 2e61a5c610..ad1b3be062 100644
--- a/src/pages/docs/octopus-rest-api/index.mdx
+++ b/src/pages/docs/octopus-rest-api/index.mdx
@@ -30,7 +30,7 @@ The Octopus CLI is a command line tool that builds on top of the [Octopus Deploy
 
 The Octopus CLI can be used on Windows, Mac, Linux, and Docker. For installation options and direct downloads, visit the [CLI Readme](https://github.com/OctopusDeploy/cli/blob/main/README.md).
 
-For more information see [Octopus Command Line (CLI)](/docs/octopus-rest-api/cli).
+For more information see [Octopus Command Line (CLI)](/docs/cli).
 
 ## Next steps
 
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/build-information.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/build-information.md
index ec09fa45ae..1507b01378 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/build-information.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/build-information.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/build-information
+redirect: https://octopus.com/docs/cli/octopus-cli/build-information
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/clean-environment.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/clean-environment.md
index f040038a3f..90acacef11 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/clean-environment.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/clean-environment.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/clean-environment
+redirect: https://octopus.com/docs/cli/octopus-cli/clean-environment
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/clean-workerpool.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/clean-workerpool.md
index 27d8f3527c..b7a2aa2d92 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/clean-workerpool.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/clean-workerpool.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/clean-workerpool
+redirect: https://octopus.com/docs/cli/octopus-cli/clean-workerpool
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-autodeployoverride.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-autodeployoverride.md
index ad5bd1d8d7..a726fe83a2 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-autodeployoverride.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-autodeployoverride.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/create-autodeployoverride
+redirect: https://octopus.com/docs/cli/octopus-cli/create-autodeployoverride
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-channel.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-channel.md
index b5a89ba83d..a5dc611608 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-channel.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-channel.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/create-channel
+redirect: https://octopus.com/docs/cli/octopus-cli/create-channel
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-environment.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-environment.md
index 8514a6172b..20b25bf5a2 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-environment.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-environment.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/create-environment
+redirect: https://octopus.com/docs/cli/octopus-cli/create-environment
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-project.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-project.md
index 01863222d4..29f58bba1b 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-project.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-project.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/create-project
+redirect: https://octopus.com/docs/cli/octopus-cli/create-project
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-release.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-release.md
index 9d394e6299..0e37e5424a 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-release.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-release.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/create-release
+redirect: https://octopus.com/docs/cli/octopus-cli/create-release
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-workerpool.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-workerpool.md
index 7b7fbc6e5e..64719c6641 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-workerpool.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-workerpool.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/create-workerpool
+redirect: https://octopus.com/docs/cli/octopus-cli/create-workerpool
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/delete-autodeployoverride.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/delete-autodeployoverride.md
index b20c094575..0daa571716 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/delete-autodeployoverride.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/delete-autodeployoverride.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/delete-autodeployoverride
+redirect: https://octopus.com/docs/cli/octopus-cli/delete-autodeployoverride
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/delete-releases.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/delete-releases.md
index f9c4f3b693..934448f2f0 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/delete-releases.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/delete-releases.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/delete-releases
+redirect: https://octopus.com/docs/cli/octopus-cli/delete-releases
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/deploy-release.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/deploy-release.md
index 50f730afd4..abdf7b7e5d 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/deploy-release.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/deploy-release.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/deploy-release
+redirect: https://octopus.com/docs/cli/octopus-cli/deploy-release
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/dump-deployments.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/dump-deployments.md
index ce8240c6f1..3ed38b1b9f 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/dump-deployments.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/dump-deployments.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/dump-deployments
+redirect: https://octopus.com/docs/cli/octopus-cli/dump-deployments
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/export.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/export.md
index 5f3e01ad66..81cf85b330 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/export.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/export.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/export
+redirect: https://octopus.com/docs/cli/octopus-cli/export
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/formatted-output.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/formatted-output.md
index 6bfc78bf08..b82253da68 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/formatted-output.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/formatted-output.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/formatted-output
+redirect: https://octopus.com/docs/cli/octopus-cli/formatted-output
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/import.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/import.md
index 66a011bee9..837353206c 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/import.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/import.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/import
+redirect: https://octopus.com/docs/cli/octopus-cli/import
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/index.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/index.md
index 179d7af5b1..248236f205 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/index.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/index.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli
+redirect: https://octopus.com/docs/cli/octopus-cli
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/install-global-tool.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/install-global-tool.md
index 69ebdd2b57..ba2b23769e 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/install-global-tool.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/install-global-tool.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/install-global-tool
+redirect: https://octopus.com/docs/cli/octopus-cli/install-global-tool
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-deployments.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-deployments.md
index 17e8e230c9..123370ef8e 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-deployments.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-deployments.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/list-deployments
+redirect: https://octopus.com/docs/cli/octopus-cli/list-deployments
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-environments.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-environments.md
index 260f0234c9..a499e2c41d 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-environments.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-environments.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/list-environments
+redirect: https://octopus.com/docs/cli/octopus-cli/list-environments
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-latestdeployments.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-latestdeployments.md
index 6c618a0cac..3129c1cf1b 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-latestdeployments.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-latestdeployments.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/list-latestdeployments
+redirect: https://octopus.com/docs/cli/octopus-cli/list-latestdeployments
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-machines.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-machines.md
index 1d0eb7958b..4c5cb3a1f7 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-machines.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-machines.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/list-machines
+redirect: https://octopus.com/docs/cli/octopus-cli/list-machines
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-projects.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-projects.md
index b9f656d9b0..06ca504bc5 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-projects.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-projects.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/list-projects
+redirect: https://octopus.com/docs/cli/octopus-cli/list-projects
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-releases.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-releases.md
index 648e2ab5e4..6e6fbde7b0 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-releases.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-releases.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/list-releases
+redirect: https://octopus.com/docs/cli/octopus-cli/list-releases
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-tenants.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-tenants.md
index 610b26b961..a660388425 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-tenants.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-tenants.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/list-tenants
+redirect: https://octopus.com/docs/cli/octopus-cli/list-tenants
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-workerpools.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-workerpools.md
index 0a8d0d45c1..4261e02409 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-workerpools.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-workerpools.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/list-workerpools
+redirect: https://octopus.com/docs/cli/octopus-cli/list-workerpools
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-workers.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-workers.md
index 76f23d7ad5..ebc1989a9c 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-workers.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-workers.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/list-workers
+redirect: https://octopus.com/docs/cli/octopus-cli/list-workers
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/pack.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/pack.md
index c08d12e172..c6e9f04366 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/pack.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/pack.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/pack
+redirect: https://octopus.com/docs/cli/octopus-cli/pack
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/promote-release.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/promote-release.md
index 506be5dfc2..aec1efcf36 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/promote-release.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/promote-release.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/promote-release
+redirect: https://octopus.com/docs/cli/octopus-cli/promote-release
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/push-metadata.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/push-metadata.md
index 3b8e31d596..2fd6a8f9d2 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/push-metadata.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/push-metadata.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/push-metadata
+redirect: https://octopus.com/docs/cli/octopus-cli/push-metadata
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/push.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/push.md
index b74c3d113a..cc158e6143 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/push.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/push.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/push
+redirect: https://octopus.com/docs/cli/octopus-cli/push
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/version.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/version.md
index 66a0ce586f..3ae3637afb 100644
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/version.md
+++ b/src/pages/docs/octopus-rest-api/octo.exe-command-line/version.md
@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Redirect.astro
 title: Redirect
-redirect: https://octopus.com/docs/octopus-rest-api/octopus-cli/version
+redirect: https://octopus.com/docs/cli/octopus-cli/version
 pubDate:  2023-01-01
 navSearch: false
 navSitemap: false
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/allow-releaseprogression.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/allow-releaseprogression.mdx
index 720a6df5ff..2080c6d76b 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/allow-releaseprogression.mdx
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/allow-releaseprogression.mdx
@@ -1,93 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/allow-releaseprogression
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Allow release progression
-description: Allows a release to progress to next phase
-navOrder: 100
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to allow a release to progress to next phase.
-
-```text
-Allows a release to progress to the next phase.
-
-Usage: octo allow-releaseprogression [<options>]
-
-Where [<options>] is any of:
-
-Allowing release progression:
-
-      --project=VALUE        Name or ID of the project.
-      --version, --releaseNumber=VALUE
-                             Release version/number.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic example
-
-<SamplesInstance />
-
-This example removes the [prevent progression](/docs/releases/prevent-release-progression) flag from a release, allowing it to proceed to the next environment.
-
-```bash
-octo allow-releaseprogression --project="Octo Pet Shop" --releaseNumber="2020.08.03.82" --space="Target - Hybrid" --server="https://samples.octopus.app" --apiKey="MyApiKey"
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/build-information.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/build-information.mdx
index 31035ca92d..1507b01378 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/build-information.mdx
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/build-information.mdx
@@ -1,120 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/build-information
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Build information
-description: Pushes build information to Octopus Server.
-navOrder: 100
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to push build information to the Octopus Server.
-
-```text
-Pushes build information to Octopus Server.
-
-Usage: octo build-information [<options>]
-
-Where [<options>] is any of:
-
-Build information pushing:
-
-      --package-id=VALUE     The ID of the package. Specify multiple packages
-                             by specifying this argument multiple times:
-                             --package-id 'MyCompany.MyApp' --package-id
-                             'MyCompany.MyApp2'.
-      --version=VALUE        The version of the package; defaults to a
-                             timestamp-based version.
-      --file=VALUE           Octopus Build Information Json file.
-      --overwrite-mode=VALUE Determines behavior if the package already
-                             exists in the repository. Valid values are
-                             FailIfExists, OverwriteExisting and
-                             IgnoreIfExists. Default is FailIfExists.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic Example
-
-<SamplesInstance />
-
-This example uploads [build information](/docs/packaging-applications/build-servers/build-information) contained in buildInfo.json to Octopus Deploy for the specified package and version.
-
-```json
-{
-  "BuildEnvironment":"BitBucket",
-  "Branch":"main",
-  "BuildNumber":"288",
-  "BuildUrl":"https://bitbucket.org/octopussamples/petclinic/addon/pipelines/home#!/results/288",
-  "VcsType":"Git",
-  "VcsRoot":"http://bitbucket.org/octopussamples/petclinic",
-  "VcsCommitNumber":"314cf2c3ee916c92a384c2796a6abe332d678e4f",
-  "Commits":[
-      {
-         "Id":"314cf2c3ee916c92a384c2796a6abe332d678e4f",
-         "Comment":"PET-1 - test runbook with 0.15.0 of pipe"
-      }
-   ]
-}
-```
-
-```bash
-octo build-information --package-id="PetClinic.web" --version="1.0.200803.1002" --file="buildInfo.json" --server="http://samples.octopus.app" --apiKey="API-MyKey" --space="Target - Wildfly"
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
-- [Build information](/docs/packaging-applications/build-servers/build-information)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/clean-environment.md b/src/pages/docs/octopus-rest-api/octopus-cli/clean-environment.md
index 18c24b4203..90acacef11 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/clean-environment.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/clean-environment.md
@@ -1,107 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/clean-environment
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Clean environments
-description: Using the Octopus CLI to delete/remove machines with a particular status from environments on your Octopus instance.
-navOrder: 100
----
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to delete/remove machines with a particular status from environments on your Octopus instance.
-
-This is most useful when your environments can have temporary/ephemeral machines. The best example of this is in virtualized or cloud environments where new machines are created and destroyed frequently.
-
-```text
-Cleans all Offline Machines from an Environment.
-
-Usage: octo clean-environment [<options>]
-
-Where [<options>] is any of:
-
-Cleanup:
-
-      --environment=VALUE    Name of an environment to clean up.
-      --status=VALUE         Status of Machines clean up (Online, Offline,
-                             Unknown, NeedsUpgrade, CalamariNeedsUpgrade,
-                             Disabled). Can be specified many times.
-      --health-status, --healthStatus=VALUE
-                             Health status of Machines to clean up (Healthy,
-                             Unavailable, Unknown, HasWarnings, Unhealthy).
-                             Can be specified many times.
-      --disabled=VALUE       [Optional] Disabled status filter of Machine to
-                             clean up.
-      --calamari-outdated=VALUE
-                             [Optional] State of Calamari to clean up. By
-                             default ignores Calamari state.
-      --tentacle-outdated=VALUE
-                             [Optional] State of Tentacle version to clean u-
-                             p. By default, ignores Tentacle state.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic example {#Cleaningenvironments-Basicexample}
-
-The following command cleans any *offline* machines from the Production environment:
-
-```bash
-octo clean-environment --environment Production --status Offline --server http://MyOctopusServerURL.com --apikey MyAPIKey
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
-- [Environments](/docs/infrastructure/environments)
-- [Automatically clean up environments](/docs/deployments/patterns/elastic-and-transient-environments/cleaning-up-environments)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/clean-workerpool.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/clean-workerpool.mdx
index 6fca37f5b0..b7a2aa2d92 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/clean-workerpool.mdx
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/clean-workerpool.mdx
@@ -1,115 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/clean-workerpool
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Clean Worker pool
-description: Cleans all Offline Workers from a Worker Pool
-navOrder: 100
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to clean all offline Workers from a Worker pool.
-
-```text
-Cleans all Offline Workers from a WorkerPool.
-
-Usage: octo clean-workerpool [<options>]
-
-Where [<options>] is any of:
-
-WorkerPool Cleanup:
-
-      --workerPool=VALUE     Name of a worker pool to clean up.
-      --health-status=VALUE  Health status of Workers to clean up. Valid
-                             values are Healthy, Unavailable, Unknown,
-                             HasWarnings and Unhealthy. Can be specified many
-                             times.
-      --disabled=VALUE       [Optional] Disabled status filter of Worker to
-                             clean up.
-      --calamari-outdated=VALUE
-                             [Optional] State of Calamari to clean up. By
-                             default ignores Calamari state.
-      --tentacle-outdated=VALUE
-                             [Optional] State of Tentacle version to clean u-
-                             p. By default, ignores Tentacle state.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic examples
-
-<SamplesInstance />
-
-This example cleans all workers in the Default Worker Pool which have a health-status of `Unhealthy` in the `Pattern - Rolling` space:
-
-```bash
-octo clean-workerpool --workerPool="Default Worker Pool" --health-status="Unhealthy" --space="Pattern - Rolling" --server="https://samples.octopus.app/" --apiKey="MyApiKey"
-```
-
-This example cleans all workers from the Default Worker Pool where they are disabled and have one of the following health-status values:
-
-- `Healthy`
-- `Unhealthy`
-- `Unknown`
-
-```bash
-octo clean-workerpool --workerPool="Default Worker Pool" --health-status="Healthy" --health-status="Unhealthy" --health-status="Unknown" --disabled=True --space="Pattern - Rolling" --server="https://samples.octopus.app/" --apiKey="MyApiKey"
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
-- [Workers](/docs/infrastructure/workers)
-- [Worker Pools](/docs/infrastructure/workers/worker-pools)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/complete.md b/src/pages/docs/octopus-rest-api/octopus-cli/complete.md
index 269967ebee..63b2b00e4c 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/complete.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/complete.md
@@ -1,51 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/complete
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Complete
-description: Supports command line auto completion.
-navOrder: 100
----
-
-Supports command line auto-completion.
-
-**complete options**
-
-```text
-Supports command line auto completion.
-
-Usage: octo complete <command> [<options>]
-
-Where <command> is the current command line to filter auto-completions.
-
-Where [<options>] is any of:
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-```
-
-## Basic example
-
-This example displays supported commands that start with `list`:
-
-```bash
-octo complete list
-```
-
-This returns the following results:
-
-```text
-list-deployments
-list-environments
-list-latestdeployments
-list-machines
-list-projects
-list-releases
-list-tenants
-list-workerpools
-list-workers
-```
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/create-autodeployoverride.md b/src/pages/docs/octopus-rest-api/octopus-cli/create-autodeployoverride.md
index c2422ea1a8..a726fe83a2 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/create-autodeployoverride.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/create-autodeployoverride.md
@@ -1,119 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/create-autodeployoverride
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2024-06-25
-title: Create auto deployment overrides in Octopus
-navTitle: Create auto deployment override
-description: Using the Octopus CLI to create automatic deployment release overrides.
-navOrder: 100
----
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to create automatic deployment release overrides.
-
-```text
-Overrides the release that auto deploy will use.
-
-Usage: octo create-autodeployoverride [<options>]
-
-Where [<options>] is any of:
-
-Auto deploy release override:
-
-      --project=VALUE        Name of the project.
-      --environment=VALUE    Name of an environment the override will apply
-                             to. Specify this argument multiple times to add
-                             multiple environments.
-      --version, --releaseNumber=VALUE
-                             Release number to use for auto deployments.
-      --tenant=VALUE         [Optional] Name of a tenant the override will
-                             apply to. Specify this argument multiple times
-                             to add multiple tenants or use `*` wildcard for
-                             all tenants.
-      --tenantTag=VALUE      [Optional] A tenant tag used to match tenants
-                             that the override will apply to. Specify this
-                             argument multiple times to add multiple tenant
-                             tags
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic example
-
-The following creates an automatic deployment release override for version 1.3.0 of the project *HelloWorld* to the environment Development:
-
-```bash
-octo create-autodeployoverride --project HelloWorld --environment Development --version 1.3.0 --server https://your-octopus-url --apikey API-YOUR-KEY
-```
-
-## Tenanted example (by name)
-
-The following creates an automatic deployment release override for version 1.3.0 of the project *HelloWorld* to the environment Development for the tenant *Acme*:
-
-```bash
-octo create-autodeployoverride --project HelloWorld --environment Development --tenant Acme --version 1.3.0 --server https://your-octopus-url --apikey API-YOUR-KEY
-```
-
-## Tenanted example (by tags)
-
-The following creates an automatic deployment release override for version 1.3.0 of the project *HelloWorld* to the environment Development for all tenants with the *Hosting/Cloud* tag:
-
-```bash
-octo create-autodeployoverride --project HelloWorld --environment Development --tenanttag Hosting/Cloud --version 1.3.0 --server https://your-octopus-url --apikey API-YOUR-KEY
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
-- [Automatic deployments](/docs/projects/project-triggers/deployment-target-triggers)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/create-channel.md b/src/pages/docs/octopus-rest-api/octopus-cli/create-channel.md
index 4db505ee04..a5dc611608 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/create-channel.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/create-channel.md
@@ -1,103 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/create-channel
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Create channel
-description: Using the Octopus CLI to create channels.
-navOrder: 100
----
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to create channels on your Octopus instance.
-
-```text
-Creates a channel for a project.
-
-Usage: octo create-channel [<options>]
-
-Where [<options>] is any of:
-
-Create:
-
-      --project=VALUE        The name of the project in which to create the
-                             channel.
-      --channel=VALUE        The name of the channel to create.
-      --description=VALUE    [Optional] A description of the channel.
-      --lifecycle=VALUE      [Optional] if specified, the name of the
-                             lifecycle to use for promoting releases through
-                             this channel, otherwise this channel will
-                             inherit the project lifecycle.
-      --make-default-channel [Optional, Flag] if specified, set the new
-                             channel to be the default channel replacing any
-                             existing default channel.
-      --update-existing      [Optional, Flag] if specified, updates the
-                             matching channel if it already exists, otherwise
-                             this command will fail if a matching channel
-                             already exists.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic example {#Creatingchannels-Basicexample}
-
-The following command creates a channel in *MyProject* called *Experimental* using the *Test Only* lifecycle instead:
-
-```bash
-octo create-channel --project MyProject --name Experimental --lifecycle "Test Only" --server http://MyOctopusServerURL.com --apikey MyAPIKey
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
-- [Channels](/docs/releases/channels)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/create-environment.md b/src/pages/docs/octopus-rest-api/octopus-cli/create-environment.md
index bf114798a5..20b25bf5a2 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/create-environment.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/create-environment.md
@@ -1,91 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/create-environment
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Create environment
-description: Using the Octopus CLI to create environments.
-navOrder: 100
----
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to create environments on your Octopus instance.
-
-```text
-Creates a deployment environment.
-
-Usage: octo create-environment [<options>]
-
-Where [<options>] is any of:
-
-Environment creation:
-
-      --name=VALUE           The name of the environment.
-      --ignoreIfExists       If the environment already exists, an error will
-                             be returned. Set this flag to ignore the error.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic example {#Creatingenvironments-Basicexample}
-
-The following command creates an environment called UAT:
-
-```bash
-octo create-environment --name UAT --server http://MyOctopusServerURL.com --apikey MyAPIKey
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
-- [Environments](/docs/infrastructure/environments)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/create-project.md b/src/pages/docs/octopus-rest-api/octopus-cli/create-project.md
index 4c8be9c75b..29f58bba1b 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/create-project.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/create-project.md
@@ -1,96 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/create-project
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Create project
-description: Using the Octopus CLI to create projects.
-navOrder: 100
----
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to create a project inside a project group.
-
-```text
-Creates a project.
-
-Usage: octo create-project [<options>]
-
-Where [<options>] is any of:
-
-Project creation:
-
-      --name=VALUE           The name of the project.
-      --projectGroup=VALUE   The name of the project group to add this
-                             project to. If the group doesn't exist, it will
-                             be created.
-      --lifecycle=VALUE      The name of the lifecycle that the project will
-                             use.
-      --ignoreIfExists       If the project already exists, an error will be
-                             returned. Set this flag to ignore the error.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic example {#Creatingprojects-Basicexample}
-
-The following command creates a project called *MyWebApp* into the project group *MyProjectGroup*:
-
-```bash
-octo create-project --name MyWebApp --projectgroup MyProjectGroup --server http://MyOctopusServerURL.com --apikey MyAPIKey
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
-- [Projects](/docs/projects)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/create-release.md b/src/pages/docs/octopus-rest-api/octopus-cli/create-release.md
index 19e0abcbb7..0e37e5424a 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/create-release.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/create-release.md
@@ -1,289 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/create-release
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2024-12-16
-title: Create release
-description: Using the Octopus CLI to create releases.
-navOrder: 100
----
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to automate the creation of releases using the **`create-release`** command. This allows you to easily integrate Octopus with other continuous integration servers.
-
-This command creates a release, and optionally deploy it to one or more environments:
-
-```text
-Creates (and, optionally, deploys) a release.
-
-Usage: octo create-release [<options>]
-
-Where [<options>] is any of:
-
-Release creation:
-
-      --project=VALUE        Name or ID of the project.
-      --defaultPackageVersion, --packageVersion=VALUE
-                             Default version number of all packages to use
-                             for this release. Override per-package using --
-                             package.
-      --gitCommit=VALUE      [Optional] Git commit to use when creating the
-                             release. Use in conjunction with the --gitRef
-                             parameter to select any previous commit.
-      --ref, --gitRef=VALUE  [Optional] Git reference to use when creating
-                             the release.
-      --version, --releaseNumber=VALUE
-                             [Optional] Release number to use for the new
-                             release.
-      --channel=VALUE        [Optional] Name or ID of the channel to use for
-                             the new release. Omit this argument to
-                             automatically select the best channel.
-      --package=VALUE        [Optional] Version number to use for a package
-                             in the release. Format: StepName:Version or
-                             PackageID:Version or
-                             StepName:PackageName:Version. StepName,
-                             PackageID, and PackageName can be replaced with
-                             an asterisk. An asterisk will be assumed for
-                             StepName, PackageID, or PackageName if they are
-                             omitted.
-      --packagesFolder=VALUE [Optional] A folder containing NuGet packages
-                             from which we should get versions.
-      --releaseNotes=VALUE   [Optional] Release Notes for the new release.
-                             Styling with Markdown is supported.
-      --releaseNoteFile, --releaseNotesFile=VALUE
-                             [Optional] Path to a file that contains Release
-                             Notes for the new release. Supports Markdown
-                             files.
-      --ignoreExisting       [Optional, Flag] Don't create this release if
-                             there is already one with the same version
-                             number.
-      --ignoreChannelRules   [Optional, Flag] Create the release ignoring any
-                             version rules specified by the channel.
-      --packagePrerelease=VALUE
-                             [Optional] Pre-release for latest version of all
-                             packages to use for this release. This argument
-                             supports regex patterns.
-      --whatIf               [Optional, Flag] Perform a dry run but don't
-                             actually create/deploy release.
-
-Deployment:
-
-      --progress             [Optional] Show progress of the deployment.
-      --forcePackageDownload [Optional] Whether to force downloading of
-                             already installed packages (flag, default false).
-      --waitForDeployment    [Optional] Whether to wait synchronously for
-                             deployment to finish.
-      --deploymentTimeout=VALUE
-                             [Optional] Specifies maximum time (time span
-                             format) that the console session will wait for
-                             the deployment to finish(default 00:10:00). This
-                             will not stop the deployment. Requires --
-                             waitForDeployment parameter set.
-      --cancelOnTimeout      [Optional] Whether to cancel the deployment if
-                             the deployment timeout is reached (flag, default
-                             false).
-      --deploymentCheckSleepCycle=VALUE
-                             [Optional] Specifies how much time (time span
-                             format) should elapse between deployment status
-                             checks (default 00:00:10).
-      --guidedFailure=VALUE  [Optional] Whether to use guided failure mode.
-                             (True or False. If not specified, will use
-                             default setting from environment).
-      --specificMachines=VALUE
-                             [Optional] A comma-separated list of machine
-                             names to target in the deployed environment. If
-                             not specified all machines in the environment
-                             will be considered.
-      --excludeMachines=VALUE
-                             [Optional] A comma-separated list of machine
-                             names to exclude in the deployed environment. If
-                             not specified all machines in the environment
-                             will be considered.
-      --force                [Optional] If a project is configured to skip
-                             packages with already-installed versions,
-                             override this setting to force re-deployment
-                             (flag, default false).
-      --skip=VALUE           [Optional] Skip a step by name.
-      --noRawLog             [Optional] Don't print the raw log of failed
-                             tasks.
-      --rawLogFile=VALUE     [Optional] Redirect the raw log of failed tasks
-                             to a file.
-  -v, --variable=VALUE       [Optional] Specifies the value for a prompted
-                             variable in the format Label:Value. For JSON
-                             values, embedded quotation marks should be
-                             escaped with a backslash.
-      --deployAt=VALUE       [Optional] Time at which deployment should start
-                             (scheduled deployment), specified as any valid
-                             DateTimeOffset format, and assuming the time
-                             zone is the current local time zone.
-      --noDeployAfter=VALUE  [Optional] Time at which scheduled deployment
-                             should expire, specified as any valid
-                             DateTimeOffset format, and assuming the time
-                             zone is the current local time zone.
-      --tenant=VALUE         [Optional] Create a deployment for the tenant
-                             with this name or ID; specify this argument
-                             multiple times to add multiple tenants or use
-                             `*` wildcard to deploy to all tenants who are
-                             ready for this release (according to lifecycle).
-      --tenantTag=VALUE      [Optional] Create a deployment for tenants
-                             matching this tag; specify this argument
-                             multiple times to build a query/filter with
-                             multiple tags, just like you can in the user
-                             interface.
-      --deployTo=VALUE       [Optional] Name or ID of the environment to
-                             automatically deploy to, e.g., 'Production' or
-                             'Environments-1'; specify this argument multiple
-                             times to deploy to multiple environments.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic Examples
-
-This creates a new release of the *HelloWorld* project using the latest available NuGet packages for each step in the project. The version number of the release will be the highest version according to the [Release Versioning](/docs/releases/release-versioning) project setting:
-
-```bash
-octo create-release --project HelloWorld --server https://your-octopus-url --apiKey API-YOUR-KEY
-```
-
-This creates a release with a specified release number, overriding the [Release Versioning](/docs/releases/release-versioning) project setting:
-
-```bash
-octo create-release --project HelloWorld --version 1.0.3 --server https://your-octopus-url --apiKey API-YOUR-KEY
-```
-
-## Version controlled projects
-
-For projects that use the [Config as Code feature](/docs/projects/version-control) (they are version controlled), you can create a release pointing at a git reference, e.g. a branch name or tag. This example creates a release using the branch name of `main`:
-
-```bash
-octo create-release --project HelloWorld --version 1.0.3 --server https://your-octopus-url --apiKey API-YOUR-KEY --gitRef main
-```
-
-:::div{.warning}
-If the provided project is **not a version controlled one**, passing `--gitRef` (or `--gitCommit`) will result in an error as these parameters are only valid for projects that are version controlled.
-:::
-
-## Specifying the Package Version
-
-For each step that has a package, the version is determined in the following order:
-
- 1. The step name matches a `--package` parameter or a file filename found by `--packagesFolder`.
- 1. The package id matches a `--package` parameter or a file found by `--packagesFolder`.
- 1. The value from the `--defaultpackageversion` or `--packageversion` parameter.
-
- If there are duplicate names/ids resulting from the `--package` and `--packagesFolder` parameters, the last one specified is used.
-
-### Option --packageVersion
-
-This creates a release *(1.0.3)* with a specified NuGet package version *(1.0.1)*:
-
-```bash
-octo create-release --project HelloWorld --version 1.0.3 --packageVersion 1.0.1 --server https://your-octopus-url --apiKey API-YOUR-KEY
-```
-
-### Option --package
-
-This creates a release for a project with multiple packages, each with a different version. You can specify a step name and version pair with this option, allowing you to use different versions of the same package for different steps:
-
-```bash
-octo create-release --project HelloWorld --version 1.0.3 --package StepA:1.0.1 --package StepB:1.0.2 --server https://your-octopus-url --apiKey API-YOUR-KEY
-```
-
-If you want to use a specific version of a package for `StepA`, and the latest version of the package available for `StepB`, you can simply omit the parameter for the second step/package:
-
-```bash
-octo create-release --project HelloWorld --version 1.0.3 --package StepA:1.0.1 --server https://your-octopus-url --apiKey API-YOUR-KEY
-```
-
-The example above uses `1.0.1` for `StepA`, and the latest version available at the moment for `StepB`.
-
-For steps which have multiple packages (e.g. *Run a Script* steps can [reference multiple packages](/docs/deployments/custom-scripts/run-a-script-step/#referencing-packages
-)), the format `StepName:PackageName:Version` can also be used:  
-
-```bash
-octo create-release --project HelloWorld --version 1.0.3 --package StepA:Acme.Web:1.0.0 --package StepA:Acme.Data:2.0.0 --server https://your-octopus-url --apiKey API-YOUR-KEY
-```
-
-In the example above, `StepA` uses `1.0.0` for `Acme.Web` and `2.0.0` for `Acme.Data`.
-
-### Option --packagesFolder
-
-This creates a release for a project with multiple packages, by taking the version for each package from a folder containing the packages (this approach works well if your build server has just built the packages):
-
-```bash
-octo create-release --project HelloWorld --version 1.0.3 --packagesFolder packages --server https://your-octopus-url --apiKey API-YOUR-KEY
-```
-
-## Deploying a release after creating it
-
-To create a release **and** deploy it to an environment named Production:
-
-```bash
-octo create-release --project HelloWorld --deployto Production --server https://your-octopus-url --apiKey API-YOUR-KEY --progress
-```
-
-:::div{.hint}
-**A note on lifecycle phases with automated deployment:**
-If the `--deployTo` parameter is specified and the [lifecycle](/docs/releases/lifecycles) of the project you are deploying to is set to *Deploy automatically* when a release is created, it's possible multiple deployments to the same environment will be triggered.
-:::
-
-## Release notes supported syntax
-
-We use [Showdown](https://github.com/showdownjs/showdown) to render release notes on the dashboard.
-Showdown supports the common markdown syntax as well as a rich set of extras such as tables and task lists. For the full list see <https://github.com/showdownjs/showdown/wiki/Showdown's-Markdown-syntax>.
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
-- [Releases](/docs/releases)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/create-workerpool.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/create-workerpool.mdx
index 43b548bc99..64719c6641 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/create-workerpool.mdx
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/create-workerpool.mdx
@@ -1,100 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/create-workerpool
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Create Worker pool
-description: Creates a pool for workers
-navOrder: 100
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to create a worker pool.
-
-```text
-Creates a pool for workers.
-
-Usage: octo create-workerpool [<options>]
-
-Where [<options>] is any of:
-
-WorkerPool creation:
-
-      --name=VALUE           The name of the worker pool.
-      --ignoreIfExists       If the pool already exists, an error will be
-                             returned. Set this flag to ignore the error.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic examples
-
-<SamplesInstance />
-
-This example creates a worker pool named **Docker Worker Pool** in the `Pattern - Rolling` space:
-
-```bash
-octo create-workerpool --name="Docker Worker Pool" --space="Pattern - Rolling" --server="https://samples.octopus.app/" --apiKey="MyApiKey"
-```
-
-This example creates a worker pool named **Docker Worker Pool** in the `Pattern - Rolling` space, and ignore any errors if the pool already exists:
-
-```bash
-octo create-workerpool --name="Docker Worker Pool" --ignoreIfExists --space="Pattern - Rolling"  --server="https://samples.octopus.app/" --apiKey="MyApiKey"
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
-- [Worker pools](/docs/infrastructure/workers/worker-pools)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/delete-autodeployoverride.md b/src/pages/docs/octopus-rest-api/octopus-cli/delete-autodeployoverride.md
index b9d70e6b06..0daa571716 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/delete-autodeployoverride.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/delete-autodeployoverride.md
@@ -1,116 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/delete-autodeployoverride
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2024-06-25
-title: Delete auto deploy override
-description: Using the Octopus CLI to delete automatic deployment release overrides.
-navOrder: 100
----
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to delete automatic deployment release overrides.
-
-```text
-Deletes auto deploy release overrides.
-
-Usage: octo delete-autodeployoverride [<options>]
-
-Where [<options>] is any of:
-
-Delete auto deploy release override:
-
-      --project=VALUE        Name of the project.
-      --environment=VALUE    Name of an environment the override will apply
-                             to. Specify this argument multiple times to add
-                             multiple environments.
-      --tenant=VALUE         [Optional] Name of a tenant the override will
-                             apply to. Specify this argument multiple times
-                             to add multiple tenants or use `*` wildcard for
-                             all tenants.
-      --tenantTag=VALUE      [Optional] A tenant tag used to match tenants
-                             that the override will apply to. Specify this
-                             argument multiple times to add multiple tenant
-                             tags
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic example
-
-The following deletes an automatic deployment release override for the project *HelloWorld* to the environment Development:
-
-```bash
-octo delete-autodeployoverride --project HelloWorld --environment Development --server https://your-octopus-url --apikey API-YOUR-KEY
-```
-
-## Tenanted example (by name)
-
-The following deletes an automatic deployment release override for the project *HelloWorld* to the environment Development for the tenant *Acme*:
-
-```bash
-octo delete-autodeployoverride --project HelloWorld --environment Development --tenant Acme --server https://your-octopus-url --apikey API-YOUR-KEY
-```
-
-## tenanted example (by tags)
-
-The following deletes an automatic deployment release override for the project *HelloWorld* to the environment Development for all tenants with the *Hosting/Cloud* tag:
-
-```bash
-octo delete-autodeployoverride --project HelloWorld --environment Development --tenanttag Hosting/Cloud --server https://your-octopus-url --apikey API-YOUR-KEY
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
-- [Automatic deployments](/docs/projects/project-triggers/deployment-target-triggers)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/delete-package.md b/src/pages/docs/octopus-rest-api/octopus-cli/delete-package.md
index 6671e3ed5d..190f360dd4 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/delete-package.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/delete-package.md
@@ -1,78 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/delete-package
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Delete package
-description: Deletes a package from the built-in NuGet repository in an Octopus Server.
-navOrder: 100
----
-
-Deletes a package from the built-in NuGet repository in an Octopus Server.
-
-**delete-package options**
-
-```text
-Deletes a package from the built-in NuGet repository in an Octopus Server.
-
-Usage: octo delete-package [<options>]
-
-Where [<options>] is any of:
-
-Deletion:
-
-      --packageId=VALUE      Id of the package.
-      --version=VALUE        Version number of the package.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/delete-project.md b/src/pages/docs/octopus-rest-api/octopus-cli/delete-project.md
index 9bf29836f7..ea4a90512a 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/delete-project.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/delete-project.md
@@ -1,77 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/delete-project
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-title: Delete project
-pubDate: 2023-07-17
-modDate: 2023-07-17
-description: Deletes a project.
-navOrder: 100
----
-
-Deletes a project.
-
-**delete-project options**
-
-```text
-Deletes a project.
-
-Usage: octo delete-project [<options>]
-
-Where [<options>] is any of:
-
-Project deletion:
-
-      --name=VALUE           The name of the project.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/delete-releases.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/delete-releases.mdx
index cc6881717b..934448f2f0 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/delete-releases.mdx
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/delete-releases.mdx
@@ -1,117 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/delete-releases
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Delete releases
-description: Deletes a range of releases
-navOrder: 100
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli/) can be used to delete a range of [releases](/docs/releases).
-
-```text
-Deletes a range of releases.
-
-Usage: octo delete-releases [<options>]
-
-Where [<options>] is any of:
-
-Deletion:
-
-      --project=VALUE        Name of the project.
-      --minVersion=VALUE     Minimum (inclusive) version number for the range
-                             of versions to delete.
-      --maxVersion=VALUE     Maximum (inclusive) version number for the range
-                             of versions to delete.
-      --channel=VALUE        [Optional] if specified, only releases
-                             associated with the channel will be deleted;
-                             specify this argument multiple times to target
-                             multiple channels.
-      --whatIf               [Optional, Flag] if specified, releases won't
-                             actually be deleted, but will be listed as if
-                             simulating the command.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic examples
-
-<SamplesInstance />
-
-This example deletes releases in the `PetClinic - rolling deploy` project in the `Pattern - Rolling` space that match the following version range:
-
-- Minimum version: `2020.07.06.17`
-- Maximum version: `2020.07.06.18`
-
-```bash
-octo delete-releases --project="PetClinic - rolling deploy" --space="Pattern - Rolling" --minVersion="2020.07.06.17" --maxVersion="2020.07.06.18" --server="https://samples.octopus.app/" --apiKey="MyApiKey"
-```
-
-This example uses the `--whatIf` flag to display the releases that *would* be deleted in the `PetClinic - rolling deploy` project in the `Pattern - Rolling` space which match the following version range:
-
-- Minimum version: `2020.07.06.16`
-- Maximum version: `2020.07.06.20`
-
-This can be useful where you want to check the releases that would be deleted, before actually deleting them:
-
-```bash
-octo delete-releases --project="PetClinic - rolling deploy" --space="Pattern - Rolling" --minVersion="2020.07.06.16" --maxVersion="2020.07.06.20" --whatIf --server="https://samples.octopus.app/" --apiKey="MyApiKey"
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
-- [releases](/docs/releases)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/deploy-release.md b/src/pages/docs/octopus-rest-api/octopus-cli/deploy-release.md
index b014fc6e28..abdf7b7e5d 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/deploy-release.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/deploy-release.md
@@ -1,178 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/deploy-release
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2024-12-16
-title: Deploy release
-description: Using the Octopus CLI to deploy releases.
-navOrder: 100
----
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli/) can be used to deploy releases that have [already been created](/docs/octopus-rest-api/octopus-cli/create-release).
-
-```text
-Deploys a release.
-
-Usage: octo deploy-release [<options>]
-
-Where [<options>] is any of:
-
-Deployment:
-
-      --progress             [Optional] Show progress of the deployment.
-      --forcePackageDownload [Optional] Whether to force downloading of
-                             already installed packages (flag, default false).
-      --waitForDeployment    [Optional] Whether to wait synchronously for
-                             deployment to finish.
-      --deploymentTimeout=VALUE
-                             [Optional] Specifies maximum time (timespan
-                             format) that the console session will wait for
-                             the deployment to finish(default 00:10:00). This
-                             will not stop the deployment. Requires --
-                             waitForDeployment parameter set.
-      --cancelOnTimeout      [Optional] Whether to cancel the deployment if
-                             the deployment timeout is reached (flag, default
-                             false).
-      --deploymentCheckSleepCycle=VALUE
-                             [Optional] Specifies how much time (timespan
-                             format) should elapse between deployment status
-                             checks (default 00:00:10).
-      --guidedFailure=VALUE  [Optional] Whether to use guided failure mode.
-                             (True or False. If not specified, will use
-                             default setting from environment).
-      --specificMachines=VALUE
-                             [Optional] A comma-separated list of machine
-                             names to target in the deployed environment. If
-                             not specified all machines in the environment
-                             will be considered.
-      --excludeMachines=VALUE
-                             [Optional] A comma-separated list of machine
-                             names to exclude in the deployed environment. If
-                             not specified all machines in the environment
-                             will be considered.
-      --force                [Optional] If a project is configured to skip
-                             packages with already-installed versions,
-                             override this setting to force re-deployment
-                             (flag, default false).
-      --skip=VALUE           [Optional] Skip a step by name.
-      --noRawLog             [Optional] Don't print the raw log of failed
-                             tasks.
-      --rawLogFile=VALUE     [Optional] Redirect the raw log of failed tasks
-                             to a file.
-  -v, --variable=VALUE       [Optional] Specifies the value for a prompted
-                             variable in the format Label:Value. For JSON
-                             values, embedded quotation marks should be
-                             escaped with a backslash.
-      --deployAt=VALUE       [Optional] Time at which deployment should start
-                             (scheduled deployment), specified as any valid
-                             DateTimeOffset format, and assuming the time
-                             zone is the current local time zone.
-      --noDeployAfter=VALUE  [Optional] Time at which scheduled deployment
-                             should expire, specified as any valid
-                             DateTimeOffset format, and assuming the time
-                             zone is the current local time zone.
-      --tenant=VALUE         [Optional] Create a deployment for the tenant
-                             with this name or ID; specify this argument
-                             multiple times to add multiple tenants or use
-                             `*` wildcard to deploy to all tenants who are
-                             ready for this release (according to lifecycle).
-      --tenantTag=VALUE      [Optional] Create a deployment for tenants
-                             matching this tag; specify this argument
-                             multiple times to build a query/filter with
-                             multiple tags, just like you can in the user
-                             interface.
-      --project=VALUE        Name or ID of the project.
-      --deployTo=VALUE       Name or ID of the environment to deploy to, e.g-
-                             ., 'Production' or 'Environments-1'; specify
-                             this argument multiple times to deploy to
-                             multiple environments.
-      --releaseNumber, --version=VALUE
-                             Version number of the release to deploy. Or
-                             specify --version=latest for the latest release.
-      --channel=VALUE        [Optional] Name or ID of the channel to use when
-                             getting the release to deploy.
-      --updateVariables      Overwrite the variable snapshot for the release
-                             by re-importing the variables from the project.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic Examples {#basic-examples}
-
-This example deploys release 1.0.0 of the *HelloWorld* project to the Production environment:
-
-```bash
-octo deploy-release --project HelloWorld --releaseNumber 1.0.0 --deployto Production --server https://your-octopus-url --apiKey API-YOUR-KEY
-```
-
-This deploys the latest release in the *1.x Normal* Channel of the *HelloWorld* project to the Production environment:
-
-```bash
-octo deploy-release --project HelloWorld --channel "1.x Normal" --version latest --deployto Production --server https://your-octopus-url --apiKey API-YOUR-KEY
-```
-
-This deploys the latest release in the *1.x Normal* Channel of the *HelloWorld* project to the Production environment for the Tenants tagged as *Upgrade Ring/Early Adopters*:
-
-```bash
-octo deploy-release --project HelloWorld --channel "1.x Normal" --version latest --deployto Production --tenantTag "Upgrade Ring/Early Adopters" --server https://your-octopus-url --apiKey API-YOUR-KEY
-```
-
-:::div{.success}
-You can deploy to ALL tenants in an environment by using the `--tenant=*` argument. This instructs Octopus to create a deployment for each tenant which is ready for that Release to be deployed to the project/environment.
-:::
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
-- [Releases](/docs/releases)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/disable-project.md b/src/pages/docs/octopus-rest-api/octopus-cli/disable-project.md
index cacc188b0f..2436403e3a 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/disable-project.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/disable-project.md
@@ -1,77 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/disable-project
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-title: Disable project
-pubDate: 2023-07-17
-modDate: 2023-07-17
-description: Disables a project.
-navOrder: 100
----
-
-Disables a project.
-
-**disable-project options**
-
-```text
-Disables a project.
-
-Usage: octo disable-project [<options>]
-
-Where [<options>] is any of:
-
-Project disablement:
-
-      --name=VALUE           The name of the project.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/dump-deployments.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/dump-deployments.mdx
index b3ead53e0a..3ed38b1b9f 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/dump-deployments.mdx
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/dump-deployments.mdx
@@ -1,97 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/dump-deployments
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Dump deployments
-description: Writes deployments to an XML file that can be imported in Excel.
-navOrder: 100
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to write deployments to an XML file that can be imported in Excel.
-
-```text
-Writes deployments to an XML file that can be imported in Excel.
-
-Usage: octo dump-deployments [<options>]
-
-Where [<options>] is any of:
-
-Dumper:
-
-      --filePath=VALUE       The full path and name of the export file
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic example
-
-<SamplesInstance />
-
-This example writes out deployment information from the `Default` space to a temp directory:
-
-Windows:
-
-```bash
-octo dump-deployments --filePath="C:\temp\octo-deployments.xml" --server="https://samples.octopus.app" --apiKey="MyApiKey"
-```
-
-Linux:
-
-```bash
-octo dump-deployments --filePath="/tmp/octo-deployments.xml" --space="Pattern - Rolling" --server="https://samples.octopus.app" --apiKey="MyApiKey"
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/export.md b/src/pages/docs/octopus-rest-api/octopus-cli/export.md
index 17273bf187..81cf85b330 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/export.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/export.md
@@ -1,21 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/export
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Export
-description: Using the Octopus CLI to export items from one Octopus Server to import into another.
-navOrder: 100
----
-
-:::div{.warning}
-The export command has been **deprecated**. The recommended way to export data from an Octopus instance is with the **Export/Import Projects** feature that was released in **Octopus 2021.1**. Learn more: [Exporting and Importing Projects](/docs/projects/export-import).
-
-If you are running an earlier version of Octopus, please see our [data migration](/docs/administration/data/data-migration) section for alternative options.
-:::
-
-When you try to run **export**, you'll now receive the following error:
-
-```text
-The octo import/export commands have been deprecated. See [https://g.octopushq.com/DataMigration](https://g.octopushq.com/DataMigration) for alternative options.
-Exit code: -1
-```
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/formatted-output.md b/src/pages/docs/octopus-rest-api/octopus-cli/formatted-output.md
index f3ac480849..b82253da68 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/formatted-output.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/formatted-output.md
@@ -1,62 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/formatted-output
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: JSON formatted output
-description: Formatting output from the Octopus CLI
-navOrder: 1
----
-
-Most commands support printing the result in JSON format.
-
-:::div{.warning}
-[Dump Deployment](/docs/octopus-rest-api/octopus-cli/dump-deployments/), [Export](/docs/octopus-rest-api/octopus-cli/export/) and [Import](/docs/octopus-rest-api/octopus-cli/import) do not support JSON output.
-:::
-
-To access JSON formatted output, use the `--outputformat=json` parameter.
-
-```bash
-octo list-projects --server https://your-octopus-url --apiKey API-YOUR-KEY --outputformat=json
-```
-
-This command outputs the list of projects in parsable JSON format:
-
-```json
-[
-  {
-    "Id": "Projects-81",
-    "Name": "Phoenix"
-  },
-  {
-    "Id": "Projects-61",
-    "Name": "OctoFX"
-  },
-]
-```
-
-You can also work with the JSON output in PowerShell:
-
-```powershell
-$json = (./octo list-releases --server https://your-octopus-url --apikey API-YOUR-KEY --project=OctoLifecycle --outputformat=json) | ConvertFrom-Json
-$json | select -expand Releases | where {[datetime]$_.Assembled -gt ((Get-Date).AddMonths(-1))}
-```
-
-This script writes out a list of releases for the last month:
-
-```text
-Version Assembled                     PackageVersions ReleaseNotes
-------- ---------                     --------------- ------------
-0.0.16  2018-01-04T14:27:25.221+10:00 Deploy1 0.0.1
-0.0.15  2018-01-04T14:14:29.369+10:00 Deploy1 0.0.1
-0.0.14  2018-01-04T14:06:55.799+10:00 Deploy1 0.0.1
-0.0.13  2018-01-04T14:06:44.784+10:00 Deploy1 0.0.1
-0.0.12  2018-01-04T13:44:29.273+10:00 Deploy1 0.0.1
-0.0.11  2017-12-18T09:36:44.995+10:00 Deploy 0.0.1    
-0.0.10  2017-12-18T09:26:22.671+10:00 Deploy 0.0.1    
-0.0.9   2017-12-18T09:25:02.342+10:00 Deploy 0.0.1    
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/import.md b/src/pages/docs/octopus-rest-api/octopus-cli/import.md
index b0966222ee..837353206c 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/import.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/import.md
@@ -1,21 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/import
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Import
-description: Using the Octopus CLI to import items exported from another Octopus Server.
-navOrder: 100
----
-
-:::div{.warning}
-The import command has been **deprecated**. The recommended way to import data to an Octopus instance is with the **Export/Import Projects** feature that was released in **Octopus 2021.1**. Learn more: [Exporting and Importing Projects](/docs/projects/export-import).
-
-If you are running an earlier version of Octopus, please see our [data migration](/docs/administration/data/data-migration) section for alternative options.
-:::
-
-When you try to run **import**, you'll now receive the following error:
-
-```text
-The octo import/export commands have been deprecated. See [https://g.octopushq.com/DataMigration](https://g.octopushq.com/DataMigration) for alternative options.
-Exit code: -1
-```
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/index.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/index.mdx
index 04963ae276..248236f205 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/index.mdx
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/index.mdx
@@ -1,113 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2024-03-05
-title: Octo Command Line (CLI) in Octopus (Deprecated)
-navTitle: Octo Command Line (CLI) (Deprecated)
-description: The Octo CLI is the Octopus command line tool that builds on top of the Octopus REST API.
-navOrder: 100
-hideInThisSection: true
-robots: noindex, follow
-meta:
-  - name: canonical
-    content: https://octopus.com/docs/octopus-rest-api/cli
----
-import OctopusCli from 'src/shared-content/concepts/octopus-cli.include.md';
-import OctoAutocompleteTabCompletion from 'src/shared-content/octopus-cli/octo-autocomplete-tab-completion.include.md';
-
-:::div{.hint}
-The Octo CLI has been replaced by the <a href="/docs/octopus-rest-api/cli">new Octopus CLI</a>. We will no longer provide feature or security updates to the Octo CLI and we recommend making the swap to the new Octopus CLI as soon as it's practical to do so.
-:::
-
-The Octo CLI is a command line tool that builds on top of the [Octopus Deploy REST API](/docs/octopus-rest-api). With the Octo CLI you can package your applications for deployment as either Zip or NuGet packages, and manage your environments, deployments, channels, projects, and workers.
-
-The Octo CLI, which leans heavily on the [Octopus Clients library](https://github.com/OctopusDeploy/OctopusClients), is built and maintained by the Octopus Deploy team, but it is also open source. The Octo CLI can be used on Windows, Mac, Linux, Docker, and as a .NET Core global tool. For installation options and direct downloads, visit the [Octopus CLI Project on GitHub](https://github.com/OctopusDeploy/OctopusCli).
-
-## Commands \{#octoCommandLine-Commands}
-
-`octo` supports the following commands:
-
-- **[allow-releaseprogression](/docs/octopus-rest-api/octopus-cli/allow-releaseprogression)**:  Allows a release to progress to the next phase.
-- **[build-information](/docs/octopus-rest-api/octopus-cli/build-information)**:  Pushes build information to Octopus Server.
-- **[clean-environment](/docs/octopus-rest-api/octopus-cli/clean-environment)**:  Cleans all Offline Machines from an Environment.
-- **[clean-workerpool](/docs/octopus-rest-api/octopus-cli/clean-workerpool)**:  Cleans all Offline Workers from a WorkerPool.
-- **[complete](/docs/octopus-rest-api/octopus-cli/complete)**:  Supports command line auto completion.
-- **[create-autodeployoverride](/docs/octopus-rest-api/octopus-cli/create-autodeployoverride)**:  Overrides the release that auto deploy will use.
-- **[create-channel](/docs/octopus-rest-api/octopus-cli/create-channel)**:  Creates a channel for a project.
-- **[create-environment](/docs/octopus-rest-api/octopus-cli/create-environment)**:  Creates a deployment environment.
-- **[create-project](/docs/octopus-rest-api/octopus-cli/create-project)**:  Creates a project.
-- **[create-release](/docs/octopus-rest-api/octopus-cli/create-release)**:  Creates (and, optionally, deploys) a release.
-- **[create-workerpool](/docs/octopus-rest-api/octopus-cli/create-workerpool)**:  Creates a pool for workers.
-- **[delete-autodeployoverride](/docs/octopus-rest-api/octopus-cli/delete-autodeployoverride)**:  Deletes auto deploy release overrides.
-- **[delete-package](/docs/octopus-rest-api/octopus-cli/delete-package)**:  Deletes a package from the built-in NuGet repository in an Octopus Server.
-- **[delete-project](/docs/octopus-rest-api/octopus-cli/delete-project)**:  Deletes a project.
-- **[delete-releases](/docs/octopus-rest-api/octopus-cli/delete-releases)**:  Deletes a range of releases.
-- **[deploy-release](/docs/octopus-rest-api/octopus-cli/deploy-release)**:  Deploys a release.
-- **[disable-project](/docs/octopus-rest-api/octopus-cli/disable-project)**:  Disables a project.
-- **[dump-deployments](/docs/octopus-rest-api/octopus-cli/dump-deployments)**:  Writes deployments to an XML file that can be imported in Excel.
-- **[export](/docs/octopus-rest-api/octopus-cli/export)**:  Exports an object to a JSON file. Deprecated. Please see [https://g.octopushq.com/DataMigration](https://g.octopushq.com/DataMigration) for alternative options.
-- **[import](/docs/octopus-rest-api/octopus-cli/import)**:  Imports an Octopus object from an export file. Deprecated. Please see [https://g.octopushq.com/DataMigration](https://g.octopushq.com/DataMigration) for alternative options.
-- **[install-autocomplete](/docs/octopus-rest-api/octopus-cli/install-autocomplete)**:  Install a shell auto-complete script into your shell profile, if they aren't already there. Supports pwsh, zsh, bash & PowerShell.
-- **[list-deployments](/docs/octopus-rest-api/octopus-cli/list-deployments)**:  Lists a number of deployments by project, environment or by tenant.
-- **[list-environments](/docs/octopus-rest-api/octopus-cli/list-environments)**:  Lists environments.
-- **[list-latestdeployments](/docs/octopus-rest-api/octopus-cli/list-latestdeployments)**:  Lists the releases last-deployed in each environment.
-- **[list-machines](/docs/octopus-rest-api/octopus-cli/list-machines)**:  Lists all machines.
-- **[list-projects](/docs/octopus-rest-api/octopus-cli/list-projects)**:  Lists all projects.
-- **[list-releases](/docs/octopus-rest-api/octopus-cli/list-releases)**:  Lists releases by project.
-- **[list-tenants](/docs/octopus-rest-api/octopus-cli/list-tenants)**:  Lists tenants.
-- **[list-workerpools](/docs/octopus-rest-api/octopus-cli/list-workerpools)**:  Lists worker pools.
-- **[list-workers](/docs/octopus-rest-api/octopus-cli/list-workers)**:  Lists all workers.
-- **[pack](/docs/octopus-rest-api/octopus-cli/pack)**:  Creates a package (.nupkg or .zip) from files on disk, without needing a .nuspec or .csproj.
-- **[prevent-releaseprogression](/docs/octopus-rest-api/octopus-cli/prevent-releaseprogression)**:  Prevents a release from progressing to the next phase.
-- **[promote-release](/docs/octopus-rest-api/octopus-cli/promote-release)**:  Promotes a release.
-- **[push](/docs/octopus-rest-api/octopus-cli/push)**:  Pushes a package (.nupkg, .zip, .tar.gz, .jar, .war, etc.) package to the built-in NuGet repository in an Octopus Server.
-- **[push-metadata](/docs/octopus-rest-api/octopus-cli/push-metadata)**:  Pushes package metadata to Octopus Server.  Deprecated. Please use the build-information command for Octopus Server 2019.10.0 and above.
-- **[run-runbook](/docs/octopus-rest-api/octopus-cli/run-runbook)**:  Runs a Runbook.
-- **[version](/docs/octopus-rest-api/octopus-cli/version)**:  Outputs Octopus CLI version.
-
-## General usage \{#OctopusCLI-GeneralUsage}
-
-All commands take the form of:
-
-```powershell
-octo <command> [<options>]
-```
-
-You can see a list of commands using:
-
-```powershell
-octo help
-```
-
-And you can get help for a specific command using:
-
-```powershell
-octo help <command>
-octo <command> --help
-```
-
-Arguments are not case sensitive and can take the following forms:
-
-```powershell
---project OctoFX                # Space between argument name and value
---project=OctoFX                # Equal sign between argument name and value
---project "OctoFX Web Site"     # Argument values with spaces need to be quoted
-"--project=OctoFX Web Site"     # If using equals, quote both the name and value, not just the value
-```
-
-All commands require you to pass the URL of the Octopus Server's API endpoint, and an API key which is used to authenticate you.
-
-```bash
-octo ... --server https://your-octopus-url --apiKey API-YOUR-KEY
-```
-
-Most commands also support [JSON formatted output](/docs/octopus-rest-api/octopus-cli/formatted-output).
-
-:::div{.success}
-**Create an API key**
-Learn about [how to create an API key](/docs/octopus-rest-api/how-to-create-an-api-key).
-:::
-
-The server URL, API key, username and password can be set as the environment variables `OCTOPUS_CLI_SERVER`, `OCTOPUS_CLI_API_KEY`, `OCTOPUS_CLI_USERNAME` and `OCTOPUS_CLI_PASSWORD` respectively. Values set via command line arguments take precedence over environment variables.
-
-<OctoAutocompleteTabCompletion />
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/install-autocomplete.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/install-autocomplete.mdx
index 06869650c5..047bc18a19 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/install-autocomplete.mdx
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/install-autocomplete.mdx
@@ -1,39 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/install-autocomplete
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Install autocomplete
-description: Install a shell auto-complete script into your shell profile, if they aren't already there. Supports pwsh, zsh, bash & PowerShell.
-navOrder: 100
----
-import OctoAutocompleteTabCompletion from 'src/shared-content/octopus-cli/octo-autocomplete-tab-completion.include.md';
-
-Install a shell auto-complete script into your shell profile, if they aren't already there. Supports pwsh, zsh, bash, and PowerShell.
-
-**install-autocomplete options**
-
-```text
-Install a shell auto-complete script into your shell profile, if they aren't already there. Supports pwsh, zsh, bash & PowerShell.
-
-Usage: octo install-autocomplete [<options>]
-
-Where [<options>] is any of:
-
-Install AutoComplete:
-
-      --shell=VALUE          The type of shell to install auto-complete
-                             scripts for. This will alter your shell
-                             configuration files. Supported shells are Bash,
-                             PowerShell, Pwsh and Zsh.
-      --dryRun               [Optional] Dry run will output the proposed
-                             changes to console, instead of writing to disk.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-```
-
-<OctoAutocompleteTabCompletion />
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/install-global-tool.md b/src/pages/docs/octopus-rest-api/octopus-cli/install-global-tool.md
index 22fedeb24e..ba2b23769e 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/install-global-tool.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/install-global-tool.md
@@ -1,79 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/install-global-tool
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Octopus CLI Global Tool
-description: Octopus CLI installation
-navOrder: 0
----
-
-You can install the Octopus CLI as a .NET Core [Global Tool](https://docs.microsoft.com/en-us/dotnet/core/tools/global-tools). This requires that you have the [.NET Core SDK](https://dotnet.microsoft.com/download/) installed.
-
-## Specific location
-
-A local installation can be done into a specified location using the `--tool-path` parameter.
-
-```bash
-dotnet tool install Octopus.DotNet.Cli --tool-path /path/for/tool --version <version>
-```
-
-This will install the Octopus CLI into the specified location and generate a platform specific executable called `dotnet-octo` into the specified location. In order to enable `dotnet` to find your custom tool location, you will need to add the tool location to the current environment path.
-
-**PowerShell**
-
-```powershell
-$env:PATH = "your\tool\folder;" + $env:PATH
-```
-
-**Bash**
-
-```bash
-export PATH="$PATH:/your/tool/folder"
-```
-
-Once the tool folder is in the path you can run the Octopus CLI commands with .NET: `dotnet octo pack`.
-
-## User installation
-
-In order to install The Octopus CLI for the current user you can do so by installing the tool globally using
-`--global` flag.
-
-```bash
-dotnet tool install Octopus.DotNet.Cli --global --version 4.39.1
-```
-
-You may also omit the `--version` parameter to install the latest version of the tools.
-
-Check the output to make sure the installation works correctly. After the installation has completed, you can run the following to verify the version the Octopus CLI that was installed:
-
-```bash
-dotnet octo --version
-```
-
-### Updating
-
-In order to update to the latest version of the tool you can use the `dotnet update` command
-
-```bash
-dotnet tool update Octopus.DotNet.Cli --global
-```
-
-If you would like to update to a specific version or downgrade to an older version you can do
-so by first uninstalling the tool and installing it again.
-
-```bash
-dotnet tool uninstall Octopus.DotNet.Cli --global
-dotnet tool install Octopus.DotNet.Cli --global --version <version>
-```
-
-## Troubleshooting installation
-
-If you run into any issues installing the Octopus CLI as a global tool then these steps might help.
-
-### Unable to install due to 401 unauthorized error
-
-If you receive an error that states `Response status code does not indicate success: 401 (Unauthorized)` this might be due to a nuget feed configured in the `nuget.config` file that requires authentication.
-
-A workaround is to try using the `--ignore-failed-sources` switch.
-
-For more information, see this [.NET SDK GitHub issue](https://github.com/dotnet/sdk/issues/9555).
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/list-deployments.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/list-deployments.mdx
index 6bb12a2538..123370ef8e 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/list-deployments.mdx
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/list-deployments.mdx
@@ -1,116 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/list-deployments
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2024-06-25
-title: List deployments
-description: List a number of deployments by project, environment or by tenant.
-navOrder: 100
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to list deployments by project, environment, or tenant:
-
-```text
-Lists a number of deployments by project, environment or by tenant.
-
-Usage: octo list-deployments [<options>]
-
-Where [<options>] is any of:
-
-Listing:
-
-      --project=VALUE        [Optional] Name of a project to filter by. Can
-                             be specified many times.
-      --environment=VALUE    [Optional] Name of an environment to filter by.
-                             Can be specified many times.
-      --tenant=VALUE         [Optional] Name of a tenant to filter by. Can be
-                             specified many times.
-      --number=VALUE         [Optional] number of results to return, default
-                             is 30
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic Example
-
-<SamplesInstance />
-
-This example lists deployments for the specified project:
-
-```text
-octo.exe list-deployments --project="Octo Pet Shop - DB" --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Tenants - SaaS"
-```
-
-This example lists the latest 5 deployments for the specified project:
-
-```text
-octo.exe list-deployments --project="Octo Pet Shop - DB" --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Tenants - SaaS" --number="5"
-```
-
-This example lists the latest 5 deployments to production:
-
-```text
-octo.exe list-deployments --project="Octo Pet Shop - DB" --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Tenants - SaaS" --number="5" --environment="Production"
-```
-
-This example lists the latest 5 deployments to production for tenant Petlife:
-
-```bash
-octo list-deployments --project="Octo Pet Shop - DB" --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Tenants - SaaS" --number="5" --environment="Production" --tenant="Petlife"
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/list-environments.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/list-environments.mdx
index 0ad7a9957b..a499e2c41d 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/list-environments.mdx
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/list-environments.mdx
@@ -1,88 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/list-environments
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2024-06-25
-title: List environments
-description: List environments
-navOrder: 100
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to list the environments on your Octopus instance.
-
-```text
-Lists environments.
-
-Usage: octo list-environments [<options>]
-
-Where [<options>] is any of:
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic example
-
-<SamplesInstance />
-
-This example lists environments for space [Target - Docker](https://samples.octopus.app/app#/Spaces-103):
-
-```bash
-octo list-environments --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Target - Docker"
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
-- [Environments](/docs/infrastructure/environments)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/list-latestdeployments.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/list-latestdeployments.mdx
index 6d75816a5a..3129c1cf1b 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/list-latestdeployments.mdx
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/list-latestdeployments.mdx
@@ -1,106 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/list-latestdeployments
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2024-06-25
-title: List latest deployments
-description: List the releases last-deployed in each environment
-navOrder: 100
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to list the releases last deployed in each environment.
-
-```text
-Lists the releases last-deployed in each environment.
-
-Usage: octo list-latestdeployments [<options>]
-
-Where [<options>] is any of:
-
-Listing:
-
-      --project=VALUE        Name of a project to filter by. Can be specified
-                             many times.
-      --environment=VALUE    Name of an environment to filter by. Can be
-                             specified many times.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic example
-
-<SamplesInstance />
-
-This example lists the latest deployment to Production for project `DACPAC SQL Server` in space [Target - SQL Server](https://samples.octopus.app/app#/Spaces-106):
-
-```bash
-octo list-latestdeployments --project="DACPAC SQL Server" --environment="Production" --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Target - SQL Server"
-```
-
-This example lists the latest deployment to Test and Production for project `DACPAC SQL Server` in space [Target - SQL Server](https://samples.octopus.app/app#/Spaces-106):
-
-```bash
-octo list-latestdeployments --project="DACPAC SQL Server" --environment="Test" --environment="Production" --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Target - SQL Server"
-```
-
-This example lists the latest deployment to Test and Production for project `DACPAC SQL Server` and `DBUp SQL Server` in space [Target - SQL Server](https://samples.octopus.app/app#/Spaces-106):
-
-```bash
-octo list-latestdeployments --project="DACPAC SQL Server" --environment="Test" --environment="Production" --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Target - SQL Server" --project="DBUp SQL Server"
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/list-machines.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/list-machines.mdx
index b0c06ffffb..4c5cb3a1f7 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/list-machines.mdx
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/list-machines.mdx
@@ -1,125 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/list-machines
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2024-06-25
-title: List machines
-description: Lists all machines
-navOrder: 100
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to list all machines in your environments.
-
-```text
-Lists all machines.
-
-Usage: octo list-machines [<options>]
-
-Where [<options>] is any of:
-
-Listing:
-
-      --environment=VALUE    Name of an environment to filter by. Can be
-                             specified many times.
-      --status=VALUE         [Optional] Status of Machines filter by (Online,
-                             Offline, Unknown, NeedsUpgrade,
-                             CalamariNeedsUpgrade, Disabled). Can be
-                             specified many times.
-      --health-status, --healthStatus=VALUE
-                             [Optional] Health status of Machines filter by
-                             (Healthy, Unavailable, Unknown, HasWarnings,
-                             Unhealthy). Can be specified many times.
-      --disabled=VALUE       [Optional] Disabled status filter of Machine.
-      --calamari-outdated=VALUE
-                             [Optional] State of Calamari to filter. By
-                             default ignores Calamari state.
-      --tentacle-outdated=VALUE
-                             [Optional] State of Tentacle version to filter.
-                             By default, ignores Tentacle state.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic examples
-
-<SamplesInstance />
-
-This example lists all machines on the instance:
-
-```bash
-octo list-machines --server="https://your-octopus-url" --apiKey="API-YOUR-KEY"
-```
-
-This example lists all machines that are in the Test environment:
-
-```bash
-octo list-machines --server="https://your-octopus-url" --apiKey="API-YOUR-KEY" --environment="Test"
-```
-
-This example lists all machines that are in the Development environment and the Production environment:
-
-```bash
-octo list-machines --server="https://your-octopus-url" --apiKey="API-YOUR-KEY" --environment="Development" --environment="Production"
-```
-
-This example lists all machines that need a Calamari upgrade in space [Target - Hybrid](https://samples.octopus.app/app#/Spaces-342):
-
-```bash
-octo list-machines --server="https://your-octopus-url" --apiKey="API-YOUR-KEY" --calamari-outdated="true" --space="Target - Hybrid"
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/list-projects.md b/src/pages/docs/octopus-rest-api/octopus-cli/list-projects.md
index 25cf4e2b4b..06ca504bc5 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/list-projects.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/list-projects.md
@@ -1,85 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/list-projects
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2024-06-25
-title: List projects
-description: Lists all projects
-navOrder: 100
----
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to list the project in your Octopus instance.
-
-```text
-Lists all projects.
-
-Usage: octo list-projects [<options>]
-
-Where [<options>] is any of:
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic example
-
-This example displays the projects within the default space:
-
-```bash
-octo list-projects --server="http://MyOctopusServer" --apiKey="API-YOUR-KEY" 
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
-- [Projects](/docs/projects)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/list-releases.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/list-releases.mdx
index 8d13d5922e..6e6fbde7b0 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/list-releases.mdx
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/list-releases.mdx
@@ -1,100 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/list-releases
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2024-06-25
-title: List releases
-description: List releases by project
-navOrder: 100
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to list releases by project.
-
-```text
-Lists releases by project.
-
-Usage: octo list-releases [<options>]
-
-Where [<options>] is any of:
-
-Listing:
-
-      --project=VALUE        Name of a project to filter by. Can be specified
-                             many times.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic examples
-
-<SamplesInstance />
-
-This example lists all releases for the Wingtip Toys project on the default space:
-
-```bash
-octo list-releases --project="WingtipToys" --server="https://your-octopus-url" --apiKey="API-YOUR-KEY"
-```
-
-This example lists all releases for projects `DbUp - AWS RDS`, `Flyway - AWS RDS`, and `RoundhousE - AWS RDS` on space [Target - MySQL](https://samples.octopus.app/app#/Spaces-242):
-
-```bash
-octo list-releases --project="DbUp - AWS RDS" --project="Flyway - AWS RDS" --project="RoundhousE - AWS RDS" --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Target - MySQL"
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
-- [Releases](/docs/releases)
-- [Projects](/docs/projects)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/list-tenants.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/list-tenants.mdx
index c8d09447be..a660388425 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/list-tenants.mdx
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/list-tenants.mdx
@@ -1,93 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/list-tenants
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2024-06-25
-title: List tenants
-description: List tenants
-navOrder: 100
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to List tenants.
-
-```text
-Lists tenants.
-
-Usage: octo list-tenants [<options>]
-
-Where [<options>] is any of:
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic examples
-
-<SamplesInstance />
-
-This example lists the tenants on the default space:
-
-```bash
-octo list-tenants --server="https://your-octopus-url" --apiKey="API-YOUR-KEY"
-```
-
-This example lists the tenants in the space [Pattern - Tenants](https://samples.octopus.app/app#/Spaces-682):
-
-```bash
-octo list-tenants --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Pattern - Tenants"
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/list-workerpools.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/list-workerpools.mdx
index c6e58c39ec..4261e02409 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/list-workerpools.mdx
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/list-workerpools.mdx
@@ -1,94 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/list-workerpools
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2024-06-25
-title: List Worker pools
-description: List worker pools
-navOrder: 100
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to list all Worker pools.
-
-```text
-Lists worker pools.
-
-Usage: octo list-workerpools [<options>]
-
-Where [<options>] is any of:
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic examples
-
-<SamplesInstance />
-
-This example lists the worker pools in the default space:
-
-```bash
-octo list-workerpools --server="https://your-octopus-url" --apiKey="API-YOUR-KEY"
-```
-
-This example lists the worker pools in space [Target - PostgreSQL](https://samples.octopus.app/app#/Spaces-243):
-
-```bash
-octo list-workerpools --server="https://samples.octopus.app" --apiKey="API-YOUR-KEY" --space="Target - PostgreSQL"
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
-- [Worker pools](/docs/infrastructure/workers/worker-pools)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/list-workers.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/list-workers.mdx
index 44aa84bc37..ebc1989a9c 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/list-workers.mdx
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/list-workers.mdx
@@ -1,120 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/list-workers
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2024-06-25
-title: List Workers
-description: Lists all workers
-navOrder: 100
----
-import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to list all Workers.
-
-```text
-Lists all workers.
-
-Usage: octo list-workers [<options>]
-
-Where [<options>] is any of:
-
-Listing Workers:
-
-      --workerPool=VALUE     Name of a worker pool to filter by. Can be
-                             specified many times.
-      --status=VALUE         [Optional] Status of Machines filter by (Online,
-                             Offline, Unknown, NeedsUpgrade,
-                             CalamariNeedsUpgrade, Disabled). Can be
-                             specified many times.
-      --health-status, --healthStatus=VALUE
-                             [Optional] Health status of Machines filter by
-                             (Healthy, Unavailable, Unknown, HasWarnings,
-                             Unhealthy). Can be specified many times.
-      --disabled=VALUE       [Optional] Disabled status filter of Machine.
-      --calamari-outdated=VALUE
-                             [Optional] State of Calamari to filter. By
-                             default ignores Calamari state.
-      --tentacle-outdated=VALUE
-                             [Optional] State of Tentacle version to filter.
-                             By default, ignores Tentacle state.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic examples
-
-<SamplesInstance />
-
-This example lists worker machines in the `Default worker pool` in the default space:
-
-```bash
-octo list-workers --workerPool="Default worker pool" --server="https://your-octopus-url" --apiKey="API-YOUR-KEY"
-```
-
-This example lists all workers in MyWorkerPool that are disabled:
-
-```bash
-octo list-workers --workerPool="MyWorkerPool" --server="https://your-octopus-url" --apiKey="API-YOUR-KEY" --disabled="true"
-```
-
-This example lists all workers with a status of `Unknown` in the [Target - NGINX](https://samples.octopus.app/app#/Spaces-104) space:
-
-```bash
-octo list-workers --workerPool="Default worker pool" --server="https://samples.octopus.com" --apiKey="API-YOUR-KEY" --space="Target - NGINX" --health-status="Unknown"
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
-- [Workers](/docs/infrastructure/workers)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/pack.md b/src/pages/docs/octopus-rest-api/octopus-cli/pack.md
index 385a46b215..c6e9f04366 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/pack.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/pack.md
@@ -1,95 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/pack
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Pack
-description: Creates a package (.nupkg or .zip) from files on disk, without needing a .nuspec or .csproj
-navOrder: 100
----
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to create packages (.nupkg or .zip) from files on disk, without needing a .nuspec or .csproj file.
-
-```text
-Creates a package (.nupkg or .zip) from files on disk, without needing a .nuspec or .csproj.
-
-Usage: octo pack [<options>]
-
-Where [<options>] is any of:
-
-Basic options:
-
-      --id=VALUE             The ID of the package; e.g. MyCompany.MyApp.
-      --format=VALUE         Package format. Valid values are Zip and NuPkg.
-                             Default is NuPkg, though we recommend Zip going
-                             forward.
-      --version=VALUE        [Optional] The version of the package; must be a
-                             valid SemVer; defaults to a timestamp-based
-                             version.
-      --outFolder=VALUE      [Optional] The folder into which the generated
-                             NuPkg file will be written; defaults to '.'.
-      --basePath=VALUE       [Optional] The root folder containing files and
-                             folders to pack; defaults to '.'.
-      --verbose              [Optional] verbose output.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-
-NuGet packages:
-
-      --author=VALUE         [Optional, Multiple] Add an author to the
-                             package metadata; defaults to the current user.
-      --title=VALUE          [Optional] The title of the package.
-      --description=VALUE    [Optional] A description of the package;
-                             defaults to a generic description.
-      --releaseNotes=VALUE   [Optional] Release notes for this version of the
-                             package.
-      --releaseNotesFile=VALUE
-                             [Optional] A file containing release notes for
-                             this version of the package.
-
-Zip packages:
-
-      --compressionLevel=VALUE
-                             [Optional] Sets the compression level of the
-                             package. Valid values are None, Fast and Optima-
-                             l. Default is Optimal.
-
-Advanced options:
-
-      --include=VALUE        [Optional, Multiple] Add a file pattern to
-                             include, relative to the base path e.g. /bin/-
-                             *.dll - if none are specified, defaults to **.
-      --overwrite            [Optional] Allow an existing package file of the
-                             same ID/version to be overwritten.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-```
-
-## Basic example
-
-This example packs the contents of a temp directory:
-
-Windows:
-
-```bash
-octo pack --id="MyPackage" --format="zip" --version="1.0.0.0" --basePath="c:\temp\MyPackage" --outFolder="c:\temp"
-```
-
-Linux:
-
-```bash
-octo pack --id="MyPackage" --format="zip" --version="1.0.0.0" --basePath="/tmp/MyPackage" --outFolder="/tmp"
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
-- [Create packages with the Octopus CLI](/docs/packaging-applications/create-packages/octopus-cli)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/prevent-releaseprogression.md b/src/pages/docs/octopus-rest-api/octopus-cli/prevent-releaseprogression.md
index 05e06c62b7..f21131462e 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/prevent-releaseprogression.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/prevent-releaseprogression.md
@@ -1,92 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/prevent-releaseprogression
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2024-06-25
-title: Prevent release progression
-description: Prevents a release from progressing to next phase
-navOrder: 100
----
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to prevent a release from progressing to next phase.
-
-```text
-Prevents a release from progressing to the next phase.
-
-Usage: octo prevent-releaseprogression [<options>]
-
-Where [<options>] is any of:
-
-Preventing release progression:
-
-      --project=VALUE        Name or ID of the project.
-      --version, --releaseNumber=VALUE
-                             Release version/number.
-      --reason=VALUE         Reason to prevent this release from progressing
-                             to next phase.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic example
-
-This example prevents release 1.0.0.0 of WingtipToys from being deployed to the next environment:
-
-```bash
-octo prevent-releaseprogression --project="WingtipToys" --releaseNumber="1.0.0.0" --reason="Invalid cast conversion exception" --server="https://your-octopus-url" --apiKey="API-YOUR-KEY"
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/promote-release.md b/src/pages/docs/octopus-rest-api/octopus-cli/promote-release.md
index d6818412b2..aec1efcf36 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/promote-release.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/promote-release.md
@@ -1,162 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/promote-release
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Promote release
-description: Using the Octopus CLI to promote releases between environments.
-navOrder: 100
----
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to promote a release from one environment to another.
-
-```text
-Promotes a release.
-
-Usage: octo promote-release [<options>]
-
-Where [<options>] is any of:
-
-Release Promotion:
-
-      --project=VALUE        Name or ID of the project.
-      --from=VALUE           Name or ID of the environment to get the current
-                             deployment from, e.g., 'Staging' or
-                             'Environments-2'.
-      --to, --deployTo=VALUE Name or ID of the environment to deploy to, e.g-
-                             ., 'Production' or 'Environments-1'.
-      --updateVariables      Overwrite the variable snapshot for the release
-                             by re-importing the variables from the project.
-      --latestSuccessful     Use the latest successful release to promote.
-
-Deployment:
-
-      --progress             [Optional] Show progress of the deployment.
-      --forcePackageDownload [Optional] Whether to force downloading of
-                             already installed packages (flag, default false).
-      --waitForDeployment    [Optional] Whether to wait synchronously for
-                             deployment to finish.
-      --deploymentTimeout=VALUE
-                             [Optional] Specifies maximum time (timespan
-                             format) that the console session will wait for
-                             the deployment to finish(default 00:10:00). This
-                             will not stop the deployment. Requires --
-                             waitForDeployment parameter set.
-      --cancelOnTimeout      [Optional] Whether to cancel the deployment if
-                             the deployment timeout is reached (flag, default
-                             false).
-      --deploymentCheckSleepCycle=VALUE
-                             [Optional] Specifies how much time (timespan
-                             format) should elapse between deployment status
-                             checks (default 00:00:10).
-      --guidedFailure=VALUE  [Optional] Whether to use guided failure mode.
-                             (True or False. If not specified, will use
-                             default setting from environment).
-      --specificMachines=VALUE
-                             [Optional] A comma-separated list of machine
-                             names to target in the deployed environment. If
-                             not specified all machines in the environment
-                             will be considered.
-      --excludeMachines=VALUE
-                             [Optional] A comma-separated list of machine
-                             names to exclude in the deployed environment. If
-                             not specified all machines in the environment
-                             will be considered.
-      --force                [Optional] If a project is configured to skip
-                             packages with already-installed versions,
-                             override this setting to force re-deployment
-                             (flag, default false).
-      --skip=VALUE           [Optional] Skip a step by name.
-      --noRawLog             [Optional] Don't print the raw log of failed
-                             tasks.
-      --rawLogFile=VALUE     [Optional] Redirect the raw log of failed tasks
-                             to a file.
-  -v, --variable=VALUE       [Optional] Specifies the value for a prompted
-                             variable in the format Label:Value. For JSON
-                             values, embedded quotation marks should be
-                             escaped with a backslash.
-      --deployAt=VALUE       [Optional] Time at which deployment should start
-                             (scheduled deployment), specified as any valid
-                             DateTimeOffset format, and assuming the time
-                             zone is the current local time zone.
-      --noDeployAfter=VALUE  [Optional] Time at which scheduled deployment
-                             should expire, specified as any valid
-                             DateTimeOffset format, and assuming the time
-                             zone is the current local time zone.
-      --tenant=VALUE         [Optional] Create a deployment for the tenant
-                             with this name or ID; specify this argument
-                             multiple times to add multiple tenants or use
-                             `*` wildcard to deploy to all tenants who are
-                             ready for this release (according to lifecycle).
-      --tenantTag=VALUE      [Optional] Create a deployment for tenants
-                             matching this tag; specify this argument
-                             multiple times to build a query/filter with
-                             multiple tags, just like you can in the user
-                             interface.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic Example {#Promotingreleases-Basicexample}
-
-The following command promotes the latest release of the *Web* project deployed to Development to the environment Staging.
-
-```bash
-octo promote-release --project Web --from Development --to Staging -progress --server http://MyOctopusServerURL.com --apikey MyAPIKey
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
-- [Releases](/docs/releases)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/push-metadata.md b/src/pages/docs/octopus-rest-api/octopus-cli/push-metadata.md
index 288d8f1001..2fd6a8f9d2 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/push-metadata.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/push-metadata.md
@@ -1,96 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/push-metadata
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Push metadata
-description: Pushes package metadata to Octopus Server.
-navOrder: 100
----
-
-This command has been deprecated. Please use the [build-information](/docs/octopus-rest-api/octopus-cli/build-information) command for Octopus Server 2019.10.0 and above.
-
-Pushes package metadata (and [build information](/docs/packaging-applications/build-servers/build-information)) to your Octopus Server.
-
-```text
-Pushes package metadata to Octopus Server.  Deprecated. Please use the build-information command for Octopus Server 2019.10.0 and above.
-
-Usage: octo push-metadata [<options>]
-
-Where [<options>] is any of:
-
-Package metadata pushing:
-
-      --package-id=VALUE     The ID of the package, e.g., 'MyCompany.MyApp'.
-      --version=VALUE        The version of the package; defaults to a
-                             timestamp-based version.
-      --metadata-file=VALUE  Octopus Package metadata Json file.
-      --overwrite-mode=VALUE Determines behavior if the package already
-                             exists in the repository. Valid values are
-                             FailIfExists, OverwriteExisting and
-                             IgnoreIfExists. Default is FailIfExists.
-      --replace-existing     If the package metadata already exists in the
-                             repository, the default behavior is to reject
-                             the new package metadata being pushed. You can
-                             pass this flag to overwrite the existing package
-                             metadata. This flag may be deprecated in a
-                             future version; passing it is the same as using
-                             the OverwriteExisting overwrite-mode.
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/push.md b/src/pages/docs/octopus-rest-api/octopus-cli/push.md
index e480e92da2..cc158e6143 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/push.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/push.md
@@ -1,117 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/push
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2024-06-25
-title: Push
-description: Pushes a package (.nupkg, .zip, .tar.gz, etc.) package to the built-in NuGet repository in an Octopus Server.
-navOrder: 100
----
-
-Pushes a [package](/docs/packaging-applications/create-packages) (.nupkg, .zip, .tar.gz, etc.) package to the built-in NuGet repository in an Octopus Server.
-
-Learn more about the [built-in repository](/docs/packaging-applications/package-repositories/built-in-repository).
-
-**push options**
-
-```text
-Pushes a package (.nupkg, .zip, .tar.gz, .jar, .war, etc.) package to the built-in NuGet repository in an Octopus Server.
-
-Usage: octo push [<options>]
-
-Where [<options>] is any of:
-
-Package pushing:
-
-      --package=VALUE        Package file to push. Specify multiple packages
-                             by specifying this argument multiple times:
-                             --package package1 --package package2.
-      --overwrite-mode=VALUE Determines behavior if the package already
-                             exists in the repository. Valid values are
-                             FailIfExists, OverwriteExisting and
-                             IgnoreIfExists. Default is FailIfExists.
-      --replace-existing     If the package already exists in the repository,
-                             the default behavior is to reject the new
-                             package being pushed. You can pass this flag to
-                             overwrite the existing package. This flag may be
-                             deprecated in a future version; passing it is
-                             the same as using the OverwriteExisting
-                             overwrite-mode.
-      --use-delta-compression=VALUE
-                             Allows disabling of delta compression when
-                             uploading packages to the Octopus Server. (True
-                             or False. Defaults to true.)
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic example
-
-This example pushes a package to the built-in Octopus Deploy repository:
-
-Windows:
-
-```bash
-octo push --package="c:\temp\MyPackage.1.0.0.0.zip" --server="https://your-octopus-url" --apiKey="API-YOUR-KEY"
-```
-
-Linux:
-
-```bash
-octo push --package="/tmp/MyPackage.1.0.0.0.zip" --server="https://your-octopus-url" --apiKey="API-YOUR-KEY"
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/run-runbook.md b/src/pages/docs/octopus-rest-api/octopus-cli/run-runbook.md
index 4f3717175c..a67323ba24 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/run-runbook.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/run-runbook.md
@@ -1,186 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/run-runbook
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Run a runbook
-description: Using the Octopus CLI to run a runbook.
-navOrder: 100
----
-
-The [Octopus CLI](/docs/octopus-rest-api/octopus-cli) can be used to run runbooks that have already been created.
-
-```text
-Runs a Runbook.
-
-Usage: octo run-runbook [<options>]
-
-Where [<options>] is any of:
-
-Run Runbook:
-
-      --project=VALUE        Name or ID of the project that contains the
-                             Runbook. This is required.
-      --runbook=VALUE        Name or ID of the runbook. If the name is
-                             supplied, the project parameter must also be
-                             specified.
-      --environment=VALUE    Name or ID of the environment to run in, e.g .,
-                             'Production' or 'Environments-1'; specify this
-                             argument multiple times to run in multiple
-                             environments.
-      --snapshot=VALUE       [Optional] Name or ID of the snapshot to run. If
-                             not supplied, the command will attempt to use
-                             the published snapshot.
-      --forcePackageDownload [Optional] Whether to force downloading of
-                             already installed packages (flag, default false).
-      --guidedFailure=VALUE  [Optional] Whether to use Guided Failure mode.
-                             (True or False. If not specified, will use
-                             default setting from environment)
-      --specificMachines=VALUE
-                             [Optional] A comma-separated list of machine
-                             names to target in the specified environment/s.
-                             If not specified all machines in the environment
-                             will be considered.
-      --excludeMachines=VALUE
-                             [Optional] A comma-separated list of machine
-                             names to exclude in the specified environment/s.
-                             If not specified all machines in the environment
-                             will be considered.
-      --tenant=VALUE         [Optional] Run a runbook on the tenant with this
-                             name or ID; specify this argument multiple times
-                             to add multiple tenants or use `*` wildcard to
-                             deploy to all tenants who are ready for this
-                             release (according to lifecycle).
-      --tenantTag=VALUE      [Optional] Run a runbook on the tenants matching
-                             this tag; specify this argument multiple times
-                             to build a query/filter with multiple tags, just
-                             like you can in the user interface.
-      --skip=VALUE           [Optional] Skip a step by name
-      --runAt=VALUE          [Optional] Time at which runbook run should
-                             start (scheduled run), specified as any valid
-                             DateTimeOffset format, and assuming the time
-                             zone is the current local time zone.
-      --noRunAfter=VALUE     [Optional] Time at which scheduled runbook run
-                             should expire, specified as any valid
-                             DateTimeOffset format, and assuming the time
-                             zone is the current local time zone.
-  -v, --variable=VALUE       [Optional] Specifies the value for a prompted
-                             variable in the format Name:Value. For JSON
-                             values, embedded quotation marks should be
-                             escaped with a backslash.
-      --waitForRun           [Optional] Whether to wait synchronously for
-                             deployment to finish.
-      --progress             [Optional] Show progress of the runbook run
-      --runTimeout=VALUE     [Optional] Specifies maximum time (time span
-                             format) that the console session will wait for
-                             the runbook run to finish (default 00:10:00).
-                             This will not stop the run. Requires --
-                             waitForRun parameter to be set.
-      --cancelOnTimeout      [Optional] Whether to cancel the runbook run if
-                             the run timeout is reached (flag, default false).
-      --runCheckSleepCycle=VALUE
-                             [Optional] Specifies how much time (time span
-                             format) should elapse between runbook run status
-                             checks (default 00:00:10)
-      --noRawLog             [Optional] Don't print the raw log of failed
-                             tasks
-      --rawLogFile=VALUE     [Optional] Redirect the raw log of failed tasks
-                             to a file
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-      --outputFormat=VALUE   [Optional] Output format, valid options are
-                             Default or Json
-      --server=VALUE         [Optional] The base URL for your Octopus Server,
-                             e.g., 'https://octopus.example.com/'. This URL
-                             can also be set in the OCTOPUS_CLI_SERVER
-                             environment variable.
-      --apiKey=VALUE         [Optional] Your API key. Get this from the user
-                             profile page. You must provide an apiKey or
-                             username and password. If the guest account is
-                             enabled, a key of API-GUEST can be used. This
-                             key can also be set in the OCTOPUS_CLI_API_KEY
-                             environment variable.
-      --user=VALUE           [Optional] Username to use when authenticating
-                             with the server. You must provide an apiKey or
-                             username and password. This Username can also be
-                             set in the OCTOPUS_CLI_USERNAME environment
-                             variable.
-      --pass=VALUE           [Optional] Password to use when authenticating
-                             with the server. This Password can also be set
-                             in the OCTOPUS_CLI_PASSWORD environment variable.
-      --configFile=VALUE     [Optional] Text file of default values, with one
-                             'key = value' per line.
-      --debug                [Optional] Enable debug logging.
-      --ignoreSslErrors      [Optional] Set this flag if your Octopus Server
-                             uses HTTPS but the certificate is not trusted on
-                             this machine. Any certificate errors will be
-                             ignored. WARNING: this option may create a
-                             security vulnerability.
-      --enableServiceMessages
-                             [Optional] Enable TeamCity or Team Foundation
-                             Build service messages when logging.
-      --timeout=VALUE        [Optional] Timeout in seconds for network
-                             operations. Default is 600.
-      --proxy=VALUE          [Optional] The URL of the proxy to use, e.g.,
-                             'https://proxy.example.com'.
-      --proxyUser=VALUE      [Optional] The username for the proxy.
-      --proxyPass=VALUE      [Optional] The password for the proxy. If both
-                             the username and password are omitted and
-                             proxyAddress is specified, the default
-                             credentials are used.
-      --space=VALUE          [Optional] The name or ID of a space within
-                             which this command will be executed. The default
-                             space will be used if it is omitted.
-      --logLevel=VALUE       [Optional] The log level. Valid options are
-                             verbose, debug, information, warning, error and
-                             fatal. Defaults to 'debug'.
-```
-
-## Basic Examples {#basic-examples}
-
-This runs a runbook using the published snapshot:
-
-```bash
-octo run-runbook --runbook="Hello World"  \
-                 --project="Smurfs"       \
-                 --environment="Test"     \
-                 --server="https://your-octopus-url" \
-                 --apiKey="API-YOUR-KEY"
-```
-
-This runs a runbook using a specific snapshot (e.g., Snapshot XXXXX):
-
-```bash
-octo run-runbook --runbook="Hello World"       \
-                 --project="Smurfs"            \
-                 --environment="Test"          \
-                 --snapshot="Snapshot XXXXX" \
-                 --server="https://your-octopus-url"    \
-                 --apiKey="API-YOUR-KEY"
-```
-
-To specify multiple environments, you can use the following:
-
-```bash
-octo run-runbook --runbook="Hello World"  \
-                 --project="Smurfs"       \
-                 --environment="Test"     \
-                 --environment="Dev"      \
-                 --server="https://your-octopus-url" \
-                 --apiKey="API-YOUR-KEY"
-```
-
-:::div{.success}
-You can run a runbook on ALL tenants in an environment by using the `--tenant=*` argument.
-:::
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Runbooks](/docs/runbooks)
-- [Octopus REST API](/docs/octopus-rest-api)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/version.md b/src/pages/docs/octopus-rest-api/octopus-cli/version.md
index 51a4b1d9a2..3ae3637afb 100644
--- a/src/pages/docs/octopus-rest-api/octopus-cli/version.md
+++ b/src/pages/docs/octopus-rest-api/octopus-cli/version.md
@@ -1,38 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli/version
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
 ---
-layout: src/layouts/Default.astro
-pubDate: 2023-01-01
-modDate: 2023-01-01
-title: Version
-description: Output the Octopus CLI command line tool version.
-navOrder: 100
----
-
-This command returns the version of the Octopus CLI tool version.
-
-```text
-Outputs Octopus CLI version.
-
-Usage: octo version [<options>]
-
-Where [<options>] is any of:
-
-Common options:
-
-      --help                 [Optional] Print help for a command.
-      --helpOutputFormat=VALUE
-                             [Optional] Output format for help, valid options
-                             are Default or Json
-```
-
-## Basic example
-
-This example displays the version of the Octopus CLI:
-
-```bash
-octo --version
-```
-
-## Learn more
-
-- [Octopus CLI](/docs/octopus-rest-api/octopus-cli)
-- [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/pages/docs/packaging-applications/build-servers/bamboo.md b/src/pages/docs/packaging-applications/build-servers/bamboo.md
index e9c5a40351..c55038c072 100644
--- a/src/pages/docs/packaging-applications/build-servers/bamboo.md
+++ b/src/pages/docs/packaging-applications/build-servers/bamboo.md
@@ -15,11 +15,11 @@ Alternative features to flow artifacts from your CI system into Octopus are; [ex
 If you are an Atlassian Data Center user and Octopus customer and need help reach out to [Octopus Support](https://octopus.com/support).
 :::
 
-The Octopus Deploy add-on for Bamboo allowed packages to be uploaded to an Octopus Server, as well as creating, deploying and promoting releases to your Octopus Deploy [environments](/docs/infrastructure/environments/). The add-on does this by running the [Octopus CLI](/docs/octopus-rest-api/octopus-cli).
+The Octopus Deploy add-on for Bamboo allowed packages to be uploaded to an Octopus Server, as well as creating, deploying and promoting releases to your Octopus Deploy [environments](/docs/infrastructure/environments/). The add-on does this by running the [Octopus CLI](/docs/cli/octopus-cli).
 
 ## Getting started
 
-The plugin relies on a local copy of the [Octopus CLI](/docs/octopus-rest-api/octopus-cli) being available to the build agent. The command line tool can be downloaded from the [Octopus Deploy Download page](https://octopus.com/downloads).
+The plugin relies on a local copy of the [Octopus CLI](/docs/cli/octopus-cli) being available to the build agent. The command line tool can be downloaded from the [Octopus Deploy Download page](https://octopus.com/downloads).
 
 Note that while the command line tool package is largely self-contained, some Linux distributions require additional libraries to be installed before .NET Core applications will run. These packages are documented at the [Get started with .NET Core](https://www.microsoft.com/net/core) website.
 
@@ -97,7 +97,7 @@ Selecting the `Overwrite existing package` option means that any existing local
 
 Pushing the package to Octopus Deploy is done with the `Octopus Deploy: Push Packages` task. In addition to the [common configuration fields](#commonConfiguration), this task requires the paths to the packages to be pushed and forcing package uploads.
 
-This step runs the [push command](/docs/octopus-rest-api/octopus-cli/push) on the command line tool.
+This step runs the [push command](/docs/cli/octopus-cli/push) on the command line tool.
 
 ### Package paths
 
@@ -119,7 +119,7 @@ The `Overwrite mode` option can be used to control what should happen if the pac
 
 Creating a release is done with the `Octopus Deploy: Create Release` task. In addition to the [common configuration fields](#commonConfiguration), this task requires the Octopus Deploy project to create the release for and the version number of the release.
 
-This steps runs the [create-release command](/docs/octopus-rest-api/octopus-cli/create-release) on the command line tool.
+This steps runs the [create-release command](/docs/cli/octopus-cli/create-release) on the command line tool.
 
 ### Project
 
@@ -151,7 +151,7 @@ Tick this option, as it allows builds to be rebuilt. Otherwise, rebuilds will at
 
 Releases can be deployed with the `Octopus Deploy: Deploy Release` task. In addition to the [common configuration fields](#commonConfiguration), this task requires the Octopus Deploy project to deploy, the environments to deploy to, and the release number to deploy.
 
-This steps runs the [deploy-release command](/docs/octopus-rest-api/octopus-cli/deploy-release) on the command line tool.
+This steps runs the [deploy-release command](/docs/cli/octopus-cli/deploy-release) on the command line tool.
 
 ### Project
 
@@ -173,7 +173,7 @@ The `Release Number` field defines the release version number to deploy. This sh
 
 Releases can be promoted to new environments with the `Octopus Deploy: Promote Release` task. In addition to the [common configuration fields](#commonConfiguration), this task requires the Octopus Deploy project to deploy, the environment to promote from, and the environment to promote to.
 
-This steps runs the [promote-release command](/docs/octopus-rest-api/octopus-cli/promote-release) on the command line tool.
+This steps runs the [promote-release command](/docs/cli/octopus-cli/promote-release) on the command line tool.
 
 :::div{.warning}
 Because the promotion from one environment to another is not tied to any particular release number, adding this task to a Bamboo build plan means every time the plan is run (or more importantly rerun), releases will be promoted between environments. This is almost certainly not the desired result, and so it is not recommended that promotions be done as part of a Bamboo build plan.
@@ -223,7 +223,7 @@ The `Enable debug logging` option is used to enable detailed logging from the co
 
 The `Additional command line arguments` field is used to specify additional arguments to pass to the command line tool.
 You can find more information on the arguments accepted by the command line tool on the
-[Octopus CLI](/docs/octopus-rest-api/octopus-cli) page.
+[Octopus CLI](/docs/cli/octopus-cli) page.
 
 ## Using Bamboo deployment plans
 
diff --git a/src/pages/docs/packaging-applications/build-servers/bitbucket-pipelines/index.mdx b/src/pages/docs/packaging-applications/build-servers/bitbucket-pipelines/index.mdx
index 8954d7bf43..b4c481813d 100644
--- a/src/pages/docs/packaging-applications/build-servers/bitbucket-pipelines/index.mdx
+++ b/src/pages/docs/packaging-applications/build-servers/bitbucket-pipelines/index.mdx
@@ -28,7 +28,7 @@ Octopus Deploy will be used to take those packages and to push them to developme
 
 Octopus Deploy can be integrated with BitBucket Pipelines in two ways:
 
-- Using the up-to-date [Octopus CLI Docker image](https://hub.docker.com/r/octopusdeploy/octo/) of the [Octopus CLI](/docs/octopus-rest-api/octopus-cli) command-line tool.
+- Using the up-to-date [Octopus CLI Docker image](https://hub.docker.com/r/octopusdeploy/octo/) of the [Octopus CLI](/docs/cli/octopus-cli) command-line tool.
 - Using the new **experimental** BitBucket Pipe called [octopus-cli-run](https://bitbucket.org/octopusdeploy/octopus-cli-run/src/master/README/).
 
 :::div{.warning}
diff --git a/src/pages/docs/packaging-applications/build-servers/codefresh-pipelines.md b/src/pages/docs/packaging-applications/build-servers/codefresh-pipelines.md
index 8852602713..a678985c05 100644
--- a/src/pages/docs/packaging-applications/build-servers/codefresh-pipelines.md
+++ b/src/pages/docs/packaging-applications/build-servers/codefresh-pipelines.md
@@ -13,7 +13,7 @@ Codefresh is a docker-native CI/CD platform
 
 ## Integrating with Codefresh Pipelines
 
-Codefresh pipelines allow you to customize steps to create, deploy and promote releases to your Octopus Deploy [environments](/docs/infrastructure/environments/). The steps do this by running the [Octopus CLI](/docs/octopus-rest-api/octopus-cli) inside a Docker container.
+Codefresh pipelines allow you to customize steps to create, deploy and promote releases to your Octopus Deploy [environments](/docs/infrastructure/environments/). The steps do this by running the [Octopus CLI](/docs/cli/octopus-cli) inside a Docker container.
 
 Octopus Deploy has several custom pipeline steps available:
 
diff --git a/src/pages/docs/packaging-applications/build-servers/github-actions.mdx b/src/pages/docs/packaging-applications/build-servers/github-actions.mdx
index cfe282d271..e33d3c5fea 100644
--- a/src/pages/docs/packaging-applications/build-servers/github-actions.mdx
+++ b/src/pages/docs/packaging-applications/build-servers/github-actions.mdx
@@ -121,7 +121,7 @@ jobs:
 
 To help you package your files for deployment, Octopus Deploy provides actions to [Create a Zip Package](https://github.com/marketplace/actions/create-zip-package-for-octopus-deploy) or [Create a NuGet Package](https://github.com/marketplace/actions/create-nuget-package-for-octopus-deploy).
 
-Alternatively, you can [Install the Octopus CLI](https://github.com/marketplace/actions/install-octopus-cli) and create packages using the [pack command](https://octopus.com/docs/octopus-rest-api/octopus-cli/pack).
+Alternatively, you can [Install the Octopus CLI](https://github.com/marketplace/actions/install-octopus-cli) and create packages using the [pack command](https://octopus.com/docs/cli/octopus-cli/pack).
 
 Once your packages are created, simply push them to the Octopus Server built-in repository using our [Push Packages](https://github.com/marketplace/actions/push-package-to-octopus-deploy) Octopus Action.
 
diff --git a/src/pages/docs/packaging-applications/build-servers/jenkins/index.mdx b/src/pages/docs/packaging-applications/build-servers/jenkins/index.mdx
index f0cac06dcc..ababee5541 100644
--- a/src/pages/docs/packaging-applications/build-servers/jenkins/index.mdx
+++ b/src/pages/docs/packaging-applications/build-servers/jenkins/index.mdx
@@ -50,13 +50,13 @@ Learn [how to create an API key](/docs/octopus-rest-api/how-to-create-an-api-key
 
 ### Octopus CLI
 
-This is a good time to install the [Octopus CLI](/docs/octopus-rest-api/octopus-cli).
+This is a good time to install the [Octopus CLI](/docs/cli/octopus-cli).
 
- The [OctopusDeploy Plugin](https://plugins.jenkins.io/octopusdeploy/) is a wrapper for the [Octopus CLI](/docs/octopus-rest-api/octopus-cli), the Octopus command line tool for creating and deploying releases, such as `/home/your-user-name/.dotnet/tools/dotnet-octo`.
+ The [OctopusDeploy Plugin](https://plugins.jenkins.io/octopusdeploy/) is a wrapper for the [Octopus CLI](/docs/cli/octopus-cli), the Octopus command line tool for creating and deploying releases, such as `/home/your-user-name/.dotnet/tools/dotnet-octo`.
 
 You can do either of these:
 
-  - Use the `dotnet tool install` command to install it, the [Octopus CLI Global Tool](/docs/octopus-rest-api/octopus-cli/install-global-tool) this works great on Linux and Windows.
+  - Use the `dotnet tool install` command to install it, the [Octopus CLI Global Tool](/docs/cli/octopus-cli/install-global-tool) this works great on Linux and Windows.
   - [Download Octopus CLI](https://octopus.com/downloads) and extract it to a folder on your Jenkins server, such as `C:\Tools\Octo` or `/usr/local/bin`.
 
 Then we can let the plugin know where it is installed.
@@ -108,11 +108,11 @@ The Octopus Jenkins plugin comes with these Octopus Build Steps:
 
 Octopus supports multiple [package formats](/docs/packaging-applications/#supported-formats) for deploying your software.
 
-You can configure your Jenkins project to [package](/docs/octopus-rest-api/octopus-cli/pack) your application or other files on disk, without the need of any specification files, e.g. `.nuspec`.
+You can configure your Jenkins project to [package](/docs/cli/octopus-cli/pack) your application or other files on disk, without the need of any specification files, e.g. `.nuspec`.
 
 The two supported formats are `zip` and `nuget`.
 
-To see the full set of additional arguments that can be supplied see the [pack documentation](/docs/octopus-rest-api/octopus-cli/pack)
+To see the full set of additional arguments that can be supplied see the [pack documentation](/docs/cli/octopus-cli/pack)
 
 [Pack syntax for Pipeline](/docs/packaging-applications/build-servers/jenkins/pipeline/#pack)
 
@@ -170,7 +170,7 @@ Jenkins is compiling our code and publishing packages to Octopus Deploy. If we w
 
 :::div{.success}
 **Octopus CLI more information**
-Learn more about the [Octopus CLI](/docs/octopus-rest-api/octopus-cli) and the arguments it accepts.
+Learn more about the [Octopus CLI](/docs/cli/octopus-cli) and the arguments it accepts.
 :::
 
 When this job runs, Jenkins will now not only build and publish packages, it will also create a release in Octopus Deploy.
diff --git a/src/pages/docs/packaging-applications/build-servers/jenkins/pipeline.md b/src/pages/docs/packaging-applications/build-servers/jenkins/pipeline.md
index 149c795401..f48da146a4 100644
--- a/src/pages/docs/packaging-applications/build-servers/jenkins/pipeline.md
+++ b/src/pages/docs/packaging-applications/build-servers/jenkins/pipeline.md
@@ -35,7 +35,7 @@ Step name: ***octopusPack***
 | `outputPath` | No | Path to write final package. Defaults to `.`. |
 | `packageVersion` | No | Package version, defaults to a timestamp-based version. |
 | `verboseLogging` | No | Turn on verbose logging. Valid values are `true` or `false`. |
-| `additionalArgs` | No | Additional arguments to pass to the Octopus CLI [pack](/docs/octopus-rest-api/octopus-cli/pack) command. |
+| `additionalArgs` | No | Additional arguments to pass to the Octopus CLI [pack](/docs/cli/octopus-cli/pack) command. |
 
 Example:
 
@@ -66,7 +66,7 @@ Step name: ***octopusPushPackage***
 | `packagePaths` | Yes | The path to the package. |
 | `overwriteMode` | Yes | Valid values are `FailIfExists`, `OverwriteExisting` or `IgnoreIfExists`. |
 | `verboseLogging` | No | Turn on verbose logging. Valid values are `true` or `false`. |
-| `additionalArgs` | No | Additional arguments to pass to the Octopus CLI [push](/docs/octopus-rest-api/octopus-cli/push) command. |
+| `additionalArgs` | No | Additional arguments to pass to the Octopus CLI [push](/docs/cli/octopus-cli/push) command. |
 
 Example:
 
@@ -125,7 +125,7 @@ Step: ***octopusPushBuildInformation***
 | `gitBranch` | No | The branch that was checked out in the repository. Available via `git checkout`. |
 | `gitCommit` | No | The commit ID of the most recent commit on the branch. Available via `git checkout`. |
 | `verboseLogging` | No | Turn on verbose logging. Valid values are `true` or `false`. |
-| `additionalArgs` | No | Additional arguments to pass to the Octopus CLI [build-information](/docs/octopus-rest-api/octopus-cli/build-information) command. |
+| `additionalArgs` | No | Additional arguments to pass to the Octopus CLI [build-information](/docs/cli/octopus-cli/build-information) command. |
 
 Example:
 
@@ -191,7 +191,7 @@ Step: ***octopusCreateRelease***
 | `releaseNotesSource` | No | Valid values are `file` or `scm`. |
 | `releaseNotesFile` | Conditional | The file path for release notes, required if `releaseNotesSource` is `file`. |
 | `verboseLogging` | No | Turn on verbose logging. Valid values are `true` or `false`. |
-| `additionalArgs` | No | Additional arguments to pass to the Octopus CLI [create-release](/docs/octopus-rest-api/octopus-cli/create-release) command. |
+| `additionalArgs` | No | Additional arguments to pass to the Octopus CLI [create-release](/docs/cli/octopus-cli/create-release) command. |
 
 Example:
 
@@ -235,7 +235,7 @@ Step: ***octopusDeployRelease***
 | `deploymentTimeout` | No | How long to wait for deployment. Format is `HH:mm:ss`. Default is `00:10:00`. |
 | `variables` | No | Set prompted variable values. Format is `key1=value1\nkey2=value2`. |
 | `verboseLogging` | No | Turn on verbose logging. Valid values are `true` or `false`. |
-| `additionalArgs` | No | Additional arguments to pass to the Octopus CLI [deploy-release](/docs/octopus-rest-api/octopus-cli/deploy-release) command. |
+| `additionalArgs` | No | Additional arguments to pass to the Octopus CLI [deploy-release](/docs/cli/octopus-cli/deploy-release) command. |
 
 Example:
 
diff --git a/src/pages/docs/packaging-applications/build-servers/teamcity.mdx b/src/pages/docs/packaging-applications/build-servers/teamcity.mdx
index d4691cd041..336da4fc2e 100644
--- a/src/pages/docs/packaging-applications/build-servers/teamcity.mdx
+++ b/src/pages/docs/packaging-applications/build-servers/teamcity.mdx
@@ -27,7 +27,7 @@ The Octopus TeamCity plugin comes with these custom build runners:
 6. **Octopus Deploy: Promote Release**
     Promotes an *existing* release from one environment to another.
 
-The plugin is simply a wrapper for the [Octopus CLI](/docs/octopus-rest-api/octopus-cli), the Octopus command line tool for creating and deploying releases.
+The plugin is simply a wrapper for the [Octopus CLI](/docs/cli/octopus-cli), the Octopus command line tool for creating and deploying releases.
 
 <TeamCityInstall />
 
diff --git a/src/pages/docs/packaging-applications/build-servers/tfs-azure-devops/using-octopus-extension/index.mdx b/src/pages/docs/packaging-applications/build-servers/tfs-azure-devops/using-octopus-extension/index.mdx
index f36eefda3f..83c9b73bcd 100644
--- a/src/pages/docs/packaging-applications/build-servers/tfs-azure-devops/using-octopus-extension/index.mdx
+++ b/src/pages/docs/packaging-applications/build-servers/tfs-azure-devops/using-octopus-extension/index.mdx
@@ -149,7 +149,7 @@ Add a step to your build or release process, search for **Push Packages(s) to Oc
     Replace: "true"
 ```
 
-See the [Extension Marketplace page](https://marketplace.visualstudio.com/items?itemName=octopusdeploy.octopus-deploy-build-release-tasks) for a description of the fields (or the [Octopus CLI options](/docs/octopus-rest-api/octopus-cli/push) for more details).
+See the [Extension Marketplace page](https://marketplace.visualstudio.com/items?itemName=octopusdeploy.octopus-deploy-build-release-tasks) for a description of the fields (or the [Octopus CLI options](/docs/cli/octopus-cli/push) for more details).
 
 ### Add a push package build information to Octopus step
 
@@ -185,7 +185,7 @@ Version 6 of this step has changed name to **OctopusBuildInformation** and the *
     Replace: "false"
 ```
 
-See the [Extension Marketplace page](https://marketplace.visualstudio.com/items?itemName=octopusdeploy.octopus-deploy-build-release-tasks) for a description of the fields (or the [Octopus CLI options](/docs/octopus-rest-api/octopus-cli/build-information) for more details).
+See the [Extension Marketplace page](https://marketplace.visualstudio.com/items?itemName=octopusdeploy.octopus-deploy-build-release-tasks) for a description of the fields (or the [Octopus CLI options](/docs/cli/octopus-cli/build-information) for more details).
 
 :::div{.hint}
 There are known compatibility issues with the build link generated by the Octopus extension in some versions of formerly named Team Foundation Server. See our [extension compatibility](/docs/packaging-applications/build-servers/tfs-azure-devops/using-octopus-extension/extension-compatibility/#build-information-compatibility) page for more information.
@@ -212,7 +212,7 @@ Add a step to your Build or Release process, search for **Create Octopus Release
     ProjectName: "OctoFX"
 ```
 
-See the [Extension Marketplace page](https://marketplace.visualstudio.com/items?itemName=octopusdeploy.octopus-deploy-build-release-tasks) for a description of the fields (or the [Octopus CLI options](/docs/octopus-rest-api/octopus-cli/create-release) for more details).
+See the [Extension Marketplace page](https://marketplace.visualstudio.com/items?itemName=octopusdeploy.octopus-deploy-build-release-tasks) for a description of the fields (or the [Octopus CLI options](/docs/cli/octopus-cli/create-release) for more details).
 
 ### Add a deploy Octopus release step
 
@@ -261,7 +261,7 @@ Add a step to your Build or Release process,search for **Deploy Octopus Release*
       VIP Customers
 ```
 
-See the [Extension Marketplace page](https://marketplace.visualstudio.com/items?itemName=octopusdeploy.octopus-deploy-build-release-tasks) for a description of the fields (or the [Octopus CLI options](/docs/octopus-rest-api/octopus-cli/deploy-release) for more details).
+See the [Extension Marketplace page](https://marketplace.visualstudio.com/items?itemName=octopusdeploy.octopus-deploy-build-release-tasks) for a description of the fields (or the [Octopus CLI options](/docs/cli/octopus-cli/deploy-release) for more details).
 
 ## Add a Run Runbook step
 
@@ -294,7 +294,7 @@ Add a step to your build or release process, search for **Promote Octopus Releas
     To: "Production"
 ```
 
-See the [Extension Marketplace page](https://marketplace.visualstudio.com/items?itemName=octopusdeploy.octopus-deploy-build-release-tasks) for a description of the fields (or the [Octopus CLI options](/docs/octopus-rest-api/octopus-cli/deploy-release) for more details).
+See the [Extension Marketplace page](https://marketplace.visualstudio.com/items?itemName=octopusdeploy.octopus-deploy-build-release-tasks) for a description of the fields (or the [Octopus CLI options](/docs/cli/octopus-cli/deploy-release) for more details).
 
 ## Add an Await Task \{#await-task}
 
diff --git a/src/pages/docs/packaging-applications/build-servers/tfs-azure-devops/using-octopus-extension/install-octopus-cli-capability.md b/src/pages/docs/packaging-applications/build-servers/tfs-azure-devops/using-octopus-extension/install-octopus-cli-capability.md
index 7c06fe812b..074971d4bc 100644
--- a/src/pages/docs/packaging-applications/build-servers/tfs-azure-devops/using-octopus-extension/install-octopus-cli-capability.md
+++ b/src/pages/docs/packaging-applications/build-servers/tfs-azure-devops/using-octopus-extension/install-octopus-cli-capability.md
@@ -6,7 +6,7 @@ title: Installing the Octopus CLI as a capability
 description: This guide covers how to add the Octopus CLI as a capability to your Azure DevOps custom build agents.
 ---
 
-Tasks in the Octopus extension use the [Octopus CLI](/docs/octopus-rest-api/octopus-cli) to execute commands with an instance of Octopus. As a result, the Octopus CLI is required to be installed and available on an agent before subsequent tasks run. There are two ways to fulfill this requirement:
+Tasks in the Octopus extension use the [Octopus CLI](/docs/cli/octopus-cli) to execute commands with an instance of Octopus. As a result, the Octopus CLI is required to be installed and available on an agent before subsequent tasks run. There are two ways to fulfill this requirement:
 
 1. Use the tool installer task, **Octopus CLI Installer** as part of a build pipeline definition
 2. Install the Octopus CLI into a [self-hosted agent](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/agents#install)
diff --git a/src/pages/docs/packaging-applications/build-servers/troubleshooting-integrations-with-build-servers.md b/src/pages/docs/packaging-applications/build-servers/troubleshooting-integrations-with-build-servers.md
index 514736389a..fed96d2331 100644
--- a/src/pages/docs/packaging-applications/build-servers/troubleshooting-integrations-with-build-servers.md
+++ b/src/pages/docs/packaging-applications/build-servers/troubleshooting-integrations-with-build-servers.md
@@ -9,7 +9,7 @@ navOrder: 80
 
 Making your build server work with your deployment server is a key aspect of any successful Continuous Integration (CI) story. For this reason, at Octopus we put a lot of effort in supporting integrations with pretty much any build server technology in the market.
 
-A key player in this story is our command line tool [Octopus CLI](/docs/octopus-rest-api/octopus-cli). This tool exposes some of the most important functionalities of Octopus through easy commands that can be included in pretty much any process. It was built using `.NET core` so it can be used in Windows, Linux and Mac environments.
+A key player in this story is our command line tool [Octopus CLI](/docs/cli/octopus-cli). This tool exposes some of the most important functionalities of Octopus through easy commands that can be included in pretty much any process. It was built using `.NET core` so it can be used in Windows, Linux and Mac environments.
 
 If you are reading this doc, odds are you already tried to run an Octopus-related step in your build process and something didn't work the way you expected it. The goal of this document is to explain how all our integration steps work on the background so anyone can troubleshoot them on their own.
 
@@ -41,13 +41,13 @@ The same holds true for this **Package Application** step in Azure DevOps and it
 
 ![The Azure DevOps log output for the Package Application step](/docs/img/packaging-applications/build-servers/images/5672465.png)
 
-The bottom line is that every step will in the end call an Octopus CLI command. For the full list of commands [check our documentation](/docs/octopus-rest-api/octopus-cli).
+The bottom line is that every step will in the end call an Octopus CLI command. For the full list of commands [check our documentation](/docs/cli/octopus-cli).
 
 ### Troubleshooting the error {#Octopus-Steps-Troubleshooting-the-error}
 
 As shown in the above screenshots, the exact `octo` command that was executed (and failed) will be printed in the logs. So the best way to troubleshoot that error would be to copy the full command, and try to run it yourself by [downloading the Octopus CLI to your local machine](https://octopus.com/downloads). A few tips and gotchas for this:
 
-- If you are not familiar with the Octopus CLI, then [read our documentation about it](/docs/octopus-rest-api/octopus-cli). Understanding how the command you are troubleshooting works will be critical for your success.
+- If you are not familiar with the Octopus CLI, then [read our documentation about it](/docs/cli/octopus-cli). Understanding how the command you are troubleshooting works will be critical for your success.
 
 - Your build server will most likely execute the `octo` command from a build agent machine, which won't be identical to your workstation (mostly network-wise). Keep this in mind when troubleshooting your `octo` command, and if possible always try to run it from the same machine that your build server is using as build agent.
 
diff --git a/src/pages/docs/packaging-applications/create-packages/octopus-cli.md b/src/pages/docs/packaging-applications/create-packages/octopus-cli.md
index 017632b94d..763cec8183 100644
--- a/src/pages/docs/packaging-applications/create-packages/octopus-cli.md
+++ b/src/pages/docs/packaging-applications/create-packages/octopus-cli.md
@@ -19,9 +19,9 @@ After installation, you can run the following to verify the version of the Octop
 octopus --version
 ```
 
-For more installation details, options, and update instructions, see [The Octopus CLI Global Tool](/docs/octopus-rest-api/cli).
+For more installation details, options, and update instructions, see [The Octopus CLI Global Tool](/docs/cli).
 
-For a full list of the `package` command options see [Octopus CLI - Package](/docs/octopus-rest-api/cli/octopus-package) or run the following command:
+For a full list of the `package` command options see [Octopus CLI - Package](/docs/cli/octopus-package) or run the following command:
 
 ```powershell
 octopus package --help
diff --git a/src/pages/docs/projects/ephemeral-environments/index.md b/src/pages/docs/projects/ephemeral-environments/index.md
index eb2920ddf1..c1a42925b4 100644
--- a/src/pages/docs/projects/ephemeral-environments/index.md
+++ b/src/pages/docs/projects/ephemeral-environments/index.md
@@ -118,7 +118,7 @@ A release can be created using the:
 - Octopus Web Portal
 - Octopus API
 - [`OctopusDeploy/create-release-action` GitHub Action](https://github.com/OctopusDeploy/create-release-action)
-- [Octopus CLI](/docs/octopus-rest-api/cli)
+- [Octopus CLI](/docs/cli)
 
 :::div{.hint}
 **Tip:**
@@ -132,7 +132,7 @@ If automatic deployment is not selected, ephemeral environments can be created u
 - Octopus Web Portal
 - Octopus API
 - [`OctopusDeploy/create-ephemeral-environment` GitHub Action](https://github.com/OctopusDeploy/create-ephemeral-environment)
-- [Octopus CLI](/docs/octopus-rest-api/cli)
+- [Octopus CLI](/docs/cli)
 
 To manually create an ephemeral environment in the Octopus portal, visit the Ephemeral Environments page within the project then:
 
@@ -200,7 +200,7 @@ Ephemeral environments can be deprovisioned via the:
 - Octopus Web Portal
 - Octopus API
 - [`OctopusDeploy/deprovision-ephemeral-environment` GitHub Action](https://github.com/OctopusDeploy/deprovision-ephemeral-environment)
-- [Octopus CLI](/docs/octopus-rest-api/cli)
+- [Octopus CLI](/docs/cli)
 
 To deprovision an ephemeral environment in the Octopus portal:
 
diff --git a/src/pages/docs/projects/project-triggers/built-in-package-repository-triggers.md b/src/pages/docs/projects/project-triggers/built-in-package-repository-triggers.md
index fa56891a34..1cfa4cb634 100644
--- a/src/pages/docs/projects/project-triggers/built-in-package-repository-triggers.md
+++ b/src/pages/docs/projects/project-triggers/built-in-package-repository-triggers.md
@@ -44,7 +44,7 @@ The release number that is created is guided by the Release Versioning setting u
 
 You must select the [channels](/docs/releases/channels) that will be used for any automatically created releases. This means that **only one channel for each project can have a built-in package repository trigger enabled at any one time.** This can be painful, and here are some points you can consider:
 
-- Use one of the [build-server extensions](/docs/packaging-applications/build-servers/), or the [Octopus CLI](/docs/octopus-rest-api/octopus-cli/create-release) to create releases instead of using triggers - this will automatically determine the best channel based on the release being created
+- Use one of the [build-server extensions](/docs/packaging-applications/build-servers/), or the [Octopus CLI](/docs/cli/octopus-cli/create-release) to create releases instead of using triggers - this will automatically determine the best channel based on the release being created
 - Choose the channel that will be used most commonly for automatically creating releases, and create releases manually for the other channels.
 - Try creating some releases manually for the selected channel to make sure it works as expected.
 
diff --git a/src/pages/docs/projects/project-triggers/deployment-target-triggers.md b/src/pages/docs/projects/project-triggers/deployment-target-triggers.md
index b695f33eeb..dda3334bfe 100644
--- a/src/pages/docs/projects/project-triggers/deployment-target-triggers.md
+++ b/src/pages/docs/projects/project-triggers/deployment-target-triggers.md
@@ -74,10 +74,10 @@ Deployment target triggers let you configure unattended deployment behavior that
 
 When a deployment target trigger fires, the following rules are applied:
 
-- By default, Octopus will re-run the *currently successful* deployment for the project/environment/tenant combination. You can override this behavior by configuring an [auto deploy override](/docs/octopus-rest-api/octopus-cli/create-autodeployoverride). Note, if multiple identical deployment targets all become available within the same 30 second polling window, they will all be included in the same automatic deployment. This could happen if you scale your web farm up by four nodes, and all four nodes finish provisioning within the same time window. However, this kind of behavior should not be expected or relied on (one or more of the targets might fall outside the 30 second window).
+- By default, Octopus will re-run the *currently successful* deployment for the project/environment/tenant combination. You can override this behavior by configuring an [auto deploy override](/docs/cli/octopus-cli/create-autodeployoverride). Note, if multiple identical deployment targets all become available within the same 30 second polling window, they will all be included in the same automatic deployment. This could happen if you scale your web farm up by four nodes, and all four nodes finish provisioning within the same time window. However, this kind of behavior should not be expected or relied on (one or more of the targets might fall outside the 30 second window).
 - The steps that were run for the *currently successful* deployment will be run for the deployment targets that triggered the deployment. This includes [manual intervention](/docs/projects/built-in-step-templates/manual-intervention-and-approvals/) and [guided failure](/docs/releases/guided-failures) steps. Note, if you skip steps in a manual deployment, they will be skipped in the subsequent automatic deployment. If you need to run a deployment and skip some steps, there are two ways you can reset the skipped steps:
   1. Re-running the entire deployment of the same release again (we generally recommend designing your steps so they can be re-run without negative side-effects).
-  2. Configuring an [auto deploy override](/docs/octopus-rest-api/octopus-cli/create-autodeployoverride) for the same release to the same environment/tenant (this will result in a new deployment being generated without the manually skipped steps).
+  2. Configuring an [auto deploy override](/docs/cli/octopus-cli/create-autodeployoverride) for the same release to the same environment/tenant (this will result in a new deployment being generated without the manually skipped steps).
 - If a deployment of a release fails, Octopus will continue deploying the last successful deployment. This ensures auto-deployments will continue, even if a release has been updated and failed.
 
 ## The order of deployment target triggers
@@ -102,7 +102,7 @@ The [Chain Deployment](https://library.octopus.com/step-template/actiontemplate-
 
 ### Specifying a specific release to be deployed
 
-If you need to specify a specific release, either because the release hasn't been deployed yet, or Octopus is calculating the wrong release for a particular situation, you can configure an [auto deploy override](/docs/octopus-rest-api/octopus-cli/create-autodeployoverride/) to override the default automatic deployment behavior.  This is useful for scenarios like [immutable infrastructure](/docs/deployments/patterns/elastic-and-transient-environments/immutable-infrastructure/), [deploying to transient targets](/docs/deployments/patterns/elastic-and-transient-environments/deploying-to-transient-targets), and force deployment target triggers to use a specific release for a specific environment/tenant.
+If you need to specify a specific release, either because the release hasn't been deployed yet, or Octopus is calculating the wrong release for a particular situation, you can configure an [auto deploy override](/docs/cli/octopus-cli/create-autodeployoverride/) to override the default automatic deployment behavior.  This is useful for scenarios like [immutable infrastructure](/docs/deployments/patterns/elastic-and-transient-environments/immutable-infrastructure/), [deploying to transient targets](/docs/deployments/patterns/elastic-and-transient-environments/deploying-to-transient-targets), and force deployment target triggers to use a specific release for a specific environment/tenant.
 
 ## Deployment target trigger subscription notifications
 
@@ -118,7 +118,7 @@ Octopus will attempt to automatically deploy the current releases for the enviro
 
 - Octopus will not automatically deploy a release if the deployment for that release was not successful (this can be a failed deployment or even a canceled deployment)
 
-You will need you to complete a successful deployment again before auto-deployments can continue for the given release, or configure an [auto deploy override](/docs/octopus-rest-api/octopus-cli/create-autodeployoverride).
+You will need you to complete a successful deployment again before auto-deployments can continue for the given release, or configure an [auto deploy override](/docs/cli/octopus-cli/create-autodeployoverride).
 
 ### Investigate the diagnostic logs
 
diff --git a/src/pages/docs/projects/variables/prompted-variables.md b/src/pages/docs/projects/variables/prompted-variables.md
index 6b74198ffb..e574500645 100644
--- a/src/pages/docs/projects/variables/prompted-variables.md
+++ b/src/pages/docs/projects/variables/prompted-variables.md
@@ -49,7 +49,7 @@ When deploying (not creating a release), you'll be prompted to provide a value f
 
 These variables will be ordered alphabetically by label (or name, if the variable label is not provided).
 
-A value can also be passed to a prompted variable when using the Octopus CLI through the `--variable` parameter of the [octopus release deploy](/docs/octopus-rest-api/cli/octopus-release-deploy) command.
+A value can also be passed to a prompted variable when using the Octopus CLI through the `--variable` parameter of the [octopus release deploy](/docs/cli/octopus-release-deploy) command.
 
 ```bash
 octopus release deploy ... --variable "Missile launch code:LAUNCH123" --variable "Variable 2:Some value"
diff --git a/src/pages/docs/projects/version-control/creating-release-from-a-build-server-plug-in.mdx b/src/pages/docs/projects/version-control/creating-release-from-a-build-server-plug-in.mdx
index e75cd0be67..a85a36bed5 100644
--- a/src/pages/docs/projects/version-control/creating-release-from-a-build-server-plug-in.mdx
+++ b/src/pages/docs/projects/version-control/creating-release-from-a-build-server-plug-in.mdx
@@ -95,7 +95,7 @@ The *Git Reference* and *Git Commit* fields above select the branch/commit of th
 This is supported by:
 
 - The [create-release GitHub Action](https://github.com/OctopusDeploy/create-release-action) (`v4.2.0` and later) via the `git_resources` input.
-- The [Octopus CLI](/docs/octopus-rest-api/cli/octopus-release-create) via the `--git-resource` flag.
+- The [Octopus CLI](/docs/cli/octopus-release-create) via the `--git-resource` flag.
 
 The value format is `StepName:GitRef` or `StepName:GitResourceName:GitRef`. As with *Git Reference* above, resolve the ref per event so the release tracks the feature branch — use `github.head_ref` on pull requests and `github.ref_name` on pushes (not `github.ref`, which is `refs/pull/<n>/merge` on pull requests):
 
diff --git a/src/pages/docs/releases/channels/index.md b/src/pages/docs/releases/channels/index.md
index f07f28b7e9..e07313c311 100644
--- a/src/pages/docs/releases/channels/index.md
+++ b/src/pages/docs/releases/channels/index.md
@@ -301,7 +301,7 @@ The package list allows you to select the version of each package involved in th
 
 ### Using build server extensions or the Octopus CLI
 
-When using one of the [build server extensions](/docs/octopus-rest-api/) or the [Octopus CLI](/docs/octopus-rest-api/octopus-cli/create-release) to create releases, you can either let Octopus automatically choose the correct channel for your release (this is the default behavior), or choose a specific channel yourself.
+When using one of the [build server extensions](/docs/octopus-rest-api/) or the [Octopus CLI](/docs/cli/octopus-cli/create-release) to create releases, you can either let Octopus automatically choose the correct channel for your release (this is the default behavior), or choose a specific channel yourself.
 
 ### Built-in package repository triggers
 
diff --git a/src/pages/docs/releases/creating-a-release.md b/src/pages/docs/releases/creating-a-release.md
index 07118a613b..e6ad9b714a 100644
--- a/src/pages/docs/releases/creating-a-release.md
+++ b/src/pages/docs/releases/creating-a-release.md
@@ -44,7 +44,7 @@ Deployments scheduled for the future can be viewed under the Project Overview pa
 
 ### Schedule deployments with the Octopus CLI
 
-For everyone using the [Octopus CLI](/docs/octopus-rest-api/cli), you can use the following option:
+For everyone using the [Octopus CLI](/docs/cli), you can use the following option:
 
 ```powershell
 octopus release deploy --deploy-at "2014-07-12 17:54:00 +11:00" --project HelloWorld -- version 1.0.0 --environment Production
diff --git a/src/pages/docs/releases/deleting-releases.md b/src/pages/docs/releases/deleting-releases.md
index aadc0e65d1..997122ecdd 100644
--- a/src/pages/docs/releases/deleting-releases.md
+++ b/src/pages/docs/releases/deleting-releases.md
@@ -16,6 +16,6 @@ Deleting individual releases can be done by entering the release page and select
 ![Delete release from release page](/docs/img/releases/images/delete-release-from-release-page.png)
 :::
 
-You can also delete a batch of releases by specifying a release version range in the Octopus CLI. An example can be found in our [Octopus CLI documentation](/docs/octopus-rest-api/octopus-cli/delete-releases).
+You can also delete a batch of releases by specifying a release version range in the Octopus CLI. An example can be found in our [Octopus CLI documentation](/docs/cli/octopus-cli/delete-releases).
 
 Consider automating data clean up by configuring [retention policies](/docs/administration/retention-policies).
diff --git a/src/pages/docs/sitemap.xml.ts b/src/pages/docs/sitemap.xml.ts
index 89391a8d92..a35166336c 100644
--- a/src/pages/docs/sitemap.xml.ts
+++ b/src/pages/docs/sitemap.xml.ts
@@ -5,7 +5,7 @@ import { accelerator } from '@lib/accelerator';
 import { SITE } from '@config';
 import { PostFiltering } from 'astro-accelerator-utils';
 import { isUnderConstruction } from '@lib/underConstruction';
-import { flattenGeneratedApiPath } from '@lib/generatedApiPaths';
+import { flattenGeneratedPath } from '@lib/generatedPaths';
 
 async function getData() {
   //@ts-ignore
@@ -23,7 +23,7 @@ async function getData() {
     const addToSitemap = PostFiltering.showInSitemap(article);
 
     let url = accelerator.urlFormatter.formatAddress(
-      flattenGeneratedApiPath(article.url ?? '')
+      flattenGeneratedPath(article.url ?? '')
     );
 
     if (article.frontmatter.layout == 'src/layouts/Author.astro') {
diff --git a/src/pages/docs/tenants/index.md b/src/pages/docs/tenants/index.md
index 15b1bc53d2..2269c67cc3 100644
--- a/src/pages/docs/tenants/index.md
+++ b/src/pages/docs/tenants/index.md
@@ -80,7 +80,7 @@ You often want to define different variable values for each tenant, like databas
 
 ### Tenant-provided variables are not snapshotted
 
-When you [create a release](/docs/octopus-rest-api/octopus-cli/create-release/) in Octopus Deploy, we take a snapshot of the deployment process and the current state of the [project variables](https://octopus.com/docs/projects/variables). However, we do not take a snapshot of tenant variables. This lets you add new tenants at any time and deploy to them without creating a new release. This means any changes you make to tenant variables take immediate effect.
+When you [create a release](/docs/cli/octopus-cli/create-release/) in Octopus Deploy, we take a snapshot of the deployment process and the current state of the [project variables](https://octopus.com/docs/projects/variables). However, we do not take a snapshot of tenant variables. This lets you add new tenants at any time and deploy to them without creating a new release. This means any changes you make to tenant variables take immediate effect.
 
 Learn more about [tenant variables](/docs/tenants/tenant-variables) in our documentation.
 
diff --git a/src/pages/docs/tenants/tag-sets.md b/src/pages/docs/tenants/tag-sets.md
index 985c156cfe..87f4457008 100644
--- a/src/pages/docs/tenants/tag-sets.md
+++ b/src/pages/docs/tenants/tag-sets.md
@@ -84,7 +84,7 @@ For example:
 
 You can use canonical names when:
 
-- Deploying releases using [build server integrations](/docs/octopus-rest-api/) or the [Octopus CLI](/docs/octopus-rest-api/octopus-cli/).
+- Deploying releases using [build server integrations](/docs/octopus-rest-api/) or the [Octopus CLI](/docs/cli/octopus-cli/).
 - Scoping variables to tags.
 - Automating Octopus via the [Octopus REST API](/docs/octopus-rest-api).
 
diff --git a/src/pages/docs/tenants/tenant-deployment-faq.md b/src/pages/docs/tenants/tenant-deployment-faq.md
index a510a7495a..b58d4cd2f4 100644
--- a/src/pages/docs/tenants/tenant-deployment-faq.md
+++ b/src/pages/docs/tenants/tenant-deployment-faq.md
@@ -25,7 +25,7 @@ No. A tenant is treated like a smaller slice of an environment. Octopus creates
 
 ## Can I deploy to multiple tenants at the same time?
 
-Yes! You can create multiple tenanted deployments at the same time very easily by using the Octopus UI, The Octopus CLI or any of the build server extensions. You can choose multiple tenants using [tenant tags](/docs/tenants/tenant-tags/) or all tenants in an environment. For more information refer to [deploying releases with the Octopus CLI](/docs/octopus-rest-api/octopus-cli/deploy-release) and [deploying to multiple tenants using tags](/docs/tenants/tenant-tags/#deploying-to-multiple-tenants-tags).
+Yes! You can create multiple tenanted deployments at the same time very easily by using the Octopus UI, The Octopus CLI or any of the build server extensions. You can choose multiple tenants using [tenant tags](/docs/tenants/tenant-tags/) or all tenants in an environment. For more information refer to [deploying releases with the Octopus CLI](/docs/cli/octopus-cli/deploy-release) and [deploying to multiple tenants using tags](/docs/tenants/tenant-tags/#deploying-to-multiple-tenants-tags).
 
 ## Can I control the order in which tenanted deployments execute?
 
diff --git a/src/pages/docs/tenants/tenant-tags.md b/src/pages/docs/tenants/tenant-tags.md
index 0ff0e40259..f8f97efba6 100644
--- a/src/pages/docs/tenants/tenant-tags.md
+++ b/src/pages/docs/tenants/tenant-tags.md
@@ -75,7 +75,7 @@ octopus release deploy --project "My Project" --version "1.0.1" --tenant-tag "Re
 
 You can use tenant tags when:
 
-- Deploying releases using [build server integrations](/docs/octopus-rest-api/) or the [Octopus CLI](/docs/octopus-rest-api/octopus-cli/deploy-release).
+- Deploying releases using [build server integrations](/docs/octopus-rest-api/) or the [Octopus CLI](/docs/cli/octopus-cli/deploy-release).
 - Scoping a deployment target to one or more tenants when registering a new Tentacle - read more in our [tenant infrastructure](/docs/tenants/tenant-infrastructure) section.
 - Automating Octopus via the [Octopus REST API](/docs/octopus-rest-api).
 
diff --git a/src/pages/docs/tenants/tenant-variables.mdx b/src/pages/docs/tenants/tenant-variables.mdx
index 6332076c9a..6e4200c422 100644
--- a/src/pages/docs/tenants/tenant-variables.mdx
+++ b/src/pages/docs/tenants/tenant-variables.mdx
@@ -140,6 +140,6 @@ If you don't have the necessary permissions, you will receive an error like this
 
 ## Snapshots \{#tenant-variables-and-snapshots}
 
-When you [create a release](/docs/octopus-rest-api/octopus-cli/create-release/) in Octopus we take a snapshot of the deployment process and the current state of the [project variables](/docs/projects/variables).
+When you [create a release](/docs/cli/octopus-cli/create-release/) in Octopus we take a snapshot of the deployment process and the current state of the [project variables](/docs/projects/variables).
 
 However, we *don't* take a snapshot of tenant variables. This enables you to add new tenants at any time and deploy to them without creating a new release. This means any changes you make to tenant-variables will take immediate effect.
diff --git a/src/shared-content/cli/commands.include.md b/src/shared-content/cli/commands.include.md
new file mode 100644
index 0000000000..012a453fd1
--- /dev/null
+++ b/src/shared-content/cli/commands.include.md
@@ -0,0 +1,185 @@
+- **[octopus](/docs/cli/octopus)**:  Octopus Deploy CLI.
+- **[octopus account](/docs/cli/octopus-account)**:  Manage accounts.
+- **[octopus account aws](/docs/cli/octopus-account-aws)**:  Manage AWS accounts.
+- **[octopus account aws create](/docs/cli/octopus-account-aws-create)**:  Create an AWS account.
+- **[octopus account aws list](/docs/cli/octopus-account-aws-list)**:  List AWS accounts.
+- **[octopus account azure](/docs/cli/octopus-account-azure)**:  Manage Azure subscription accounts.
+- **[octopus account azure create](/docs/cli/octopus-account-azure-create)**:  Create an Azure subscription account.
+- **[octopus account azure list](/docs/cli/octopus-account-azure-list)**:  List Azure subscription accounts.
+- **[octopus account azure-oidc](/docs/cli/octopus-account-azure-oidc)**:  Manage Azure OpenID Connect accounts.
+- **[octopus account azure-oidc create](/docs/cli/octopus-account-azure-oidc-create)**:  Create an Azure OpenID Connect account.
+- **[octopus account azure-oidc list](/docs/cli/octopus-account-azure-oidc-list)**:  List Azure OpenID Connect accounts.
+- **[octopus account create](/docs/cli/octopus-account-create)**:  Create an account.
+- **[octopus account delete](/docs/cli/octopus-account-delete)**:  Delete an account.
+- **[octopus account gcp](/docs/cli/octopus-account-gcp)**:  Manage Google Cloud accounts.
+- **[octopus account gcp create](/docs/cli/octopus-account-gcp-create)**:  Create a Google Cloud account.
+- **[octopus account gcp list](/docs/cli/octopus-account-gcp-list)**:  List Google Cloud accounts.
+- **[octopus account generic-oidc](/docs/cli/octopus-account-generic-oidc)**:  Manage Generic OpenID Connect accounts.
+- **[octopus account generic-oidc create](/docs/cli/octopus-account-generic-oidc-create)**:  Create an Generic OpenID Connect account.
+- **[octopus account generic-oidc list](/docs/cli/octopus-account-generic-oidc-list)**:  List Generic OpenID Connect accounts.
+- **[octopus account list](/docs/cli/octopus-account-list)**:  List accounts.
+- **[octopus account ssh](/docs/cli/octopus-account-ssh)**:  Manage SSH Key Pair accounts.
+- **[octopus account ssh create](/docs/cli/octopus-account-ssh-create)**:  Create a SSH Key Pair account.
+- **[octopus account ssh list](/docs/cli/octopus-account-ssh-list)**:  List SSH Key Pair accounts.
+- **[octopus account token](/docs/cli/octopus-account-token)**:  Manage Token accounts.
+- **[octopus account token create](/docs/cli/octopus-account-token-create)**:  Create a Token account.
+- **[octopus account token list](/docs/cli/octopus-account-token-list)**:  List Token accounts.
+- **[octopus account username](/docs/cli/octopus-account-username)**:  Manage Username/Password accounts.
+- **[octopus account username create](/docs/cli/octopus-account-username-create)**:  Create a Username/Password account.
+- **[octopus account username list](/docs/cli/octopus-account-username-list)**:  List Username/Password accounts.
+- **[octopus api](/docs/cli/octopus-api)**:  Execute a raw API GET request.
+- **[octopus build-information](/docs/cli/octopus-build-information)**:  Manage build information.
+- **[octopus build-information bulk-delete](/docs/cli/octopus-build-information-bulk-delete)**:  Bulk delete build information.
+- **[octopus build-information delete](/docs/cli/octopus-build-information-delete)**:  Delete a build information.
+- **[octopus build-information list](/docs/cli/octopus-build-information-list)**:  List build information.
+- **[octopus build-information upload](/docs/cli/octopus-build-information-upload)**:  upload build information for one or more packages to Octopus Deploy.
+- **[octopus build-information view](/docs/cli/octopus-build-information-view)**:  View a build information.
+- **[octopus channel](/docs/cli/octopus-channel)**:  Manage channels.
+- **[octopus channel create](/docs/cli/octopus-channel-create)**:  Create a channel.
+- **[octopus channel delete](/docs/cli/octopus-channel-delete)**:  Delete a channel.
+- **[octopus channel list](/docs/cli/octopus-channel-list)**:  List channels.
+- **[octopus channel view](/docs/cli/octopus-channel-view)**:  View a channel.
+- **[octopus config](/docs/cli/octopus-config)**:  Manage CLI configuration.
+- **[octopus config get](/docs/cli/octopus-config-get)**:  Gets the value of config key for Octopus CLI.
+- **[octopus config list](/docs/cli/octopus-config-list)**:  List values from config file.
+- **[octopus config set](/docs/cli/octopus-config-set)**:  Set will write the value for given key to Octopus CLI config file.
+- **[octopus deployment-target](/docs/cli/octopus-deployment-target)**:  Manage deployment targets.
+- **[octopus deployment-target azure-web-app](/docs/cli/octopus-deployment-target-azure-web-app)**:  Manage Azure Web App deployment targets.
+- **[octopus deployment-target azure-web-app create](/docs/cli/octopus-deployment-target-azure-web-app-create)**:  Create an Azure Web App deployment target.
+- **[octopus deployment-target azure-web-app list](/docs/cli/octopus-deployment-target-azure-web-app-list)**:  List Azure Web App deployment targets.
+- **[octopus deployment-target azure-web-app view](/docs/cli/octopus-deployment-target-azure-web-app-view)**:  View an Azure Web App deployment target.
+- **[octopus deployment-target cloud-region](/docs/cli/octopus-deployment-target-cloud-region)**:  Manage Cloud Region deployment targets.
+- **[octopus deployment-target cloud-region create](/docs/cli/octopus-deployment-target-cloud-region-create)**:  Create a Cloud Region deployment target.
+- **[octopus deployment-target cloud-region list](/docs/cli/octopus-deployment-target-cloud-region-list)**:  List Cloud Region deployment targets.
+- **[octopus deployment-target cloud-region view](/docs/cli/octopus-deployment-target-cloud-region-view)**:  View a Cloud Region deployment target.
+- **[octopus deployment-target delete](/docs/cli/octopus-deployment-target-delete)**:  Delete a deployment target.
+- **[octopus deployment-target kubernetes](/docs/cli/octopus-deployment-target-kubernetes)**:  Manage Kubernetes deployment targets.
+- **[octopus deployment-target kubernetes create](/docs/cli/octopus-deployment-target-kubernetes-create)**:  Create a Kubernetes deployment target.
+- **[octopus deployment-target kubernetes list](/docs/cli/octopus-deployment-target-kubernetes-list)**:  List Kubernetes deployment targets.
+- **[octopus deployment-target kubernetes view](/docs/cli/octopus-deployment-target-kubernetes-view)**:  View a Kubernetes deployment target.
+- **[octopus deployment-target list](/docs/cli/octopus-deployment-target-list)**:  List deployment targets.
+- **[octopus deployment-target listening-tentacle](/docs/cli/octopus-deployment-target-listening-tentacle)**:  Manage Listening Tentacle deployment targets.
+- **[octopus deployment-target listening-tentacle create](/docs/cli/octopus-deployment-target-listening-tentacle-create)**:  Create a Listening Tentacle deployment target.
+- **[octopus deployment-target listening-tentacle list](/docs/cli/octopus-deployment-target-listening-tentacle-list)**:  List Listening Tentacle deployment targets.
+- **[octopus deployment-target listening-tentacle view](/docs/cli/octopus-deployment-target-listening-tentacle-view)**:  View a Listening Tentacle deployment target.
+- **[octopus deployment-target polling-tentacle](/docs/cli/octopus-deployment-target-polling-tentacle)**:  Manage Polling Tentacle deployment targets.
+- **[octopus deployment-target polling-tentacle list](/docs/cli/octopus-deployment-target-polling-tentacle-list)**:  List Polling Tentacle deployment targets.
+- **[octopus deployment-target polling-tentacle view](/docs/cli/octopus-deployment-target-polling-tentacle-view)**:  View a Polling Tentacle deployment target.
+- **[octopus deployment-target ssh](/docs/cli/octopus-deployment-target-ssh)**:  Manage SSH deployment targets.
+- **[octopus deployment-target ssh create](/docs/cli/octopus-deployment-target-ssh-create)**:  Create a SSH deployment target.
+- **[octopus deployment-target ssh list](/docs/cli/octopus-deployment-target-ssh-list)**:  List SSH deployment targets.
+- **[octopus deployment-target ssh view](/docs/cli/octopus-deployment-target-ssh-view)**:  View a SSH deployment target.
+- **[octopus deployment-target view](/docs/cli/octopus-deployment-target-view)**:  View a deployment target.
+- **[octopus environment](/docs/cli/octopus-environment)**:  Manage environments.
+- **[octopus environment create](/docs/cli/octopus-environment-create)**:  Create an environment.
+- **[octopus environment delete](/docs/cli/octopus-environment-delete)**:  Delete an environment.
+- **[octopus environment list](/docs/cli/octopus-environment-list)**:  List environments.
+- **[octopus environment tag](/docs/cli/octopus-environment-tag)**:  Override tags for an environment.
+- **[octopus ephemeral-environment](/docs/cli/octopus-ephemeral-environment)**:  Manage ephemeral environments.
+- **[octopus ephemeral-environment create](/docs/cli/octopus-ephemeral-environment-create)**:  Create an ephemeral environment.
+- **[octopus ephemeral-environment deprovision-environment](/docs/cli/octopus-ephemeral-environment-deprovision-environment)**:  Deprovision an environment.
+- **[octopus ephemeral-environment deprovision-project](/docs/cli/octopus-ephemeral-environment-deprovision-project)**:  Deprovision an ephemeral environment for a project.
+- **[octopus login](/docs/cli/octopus-login)**:  Login to Octopus.
+- **[octopus logout](/docs/cli/octopus-logout)**:  Logout of Octopus.
+- **[octopus package](/docs/cli/octopus-package)**:  Manage packages.
+- **[octopus package delete](/docs/cli/octopus-package-delete)**:  Delete a package.
+- **[octopus package list](/docs/cli/octopus-package-list)**:  List packages.
+- **[octopus package nuget](/docs/cli/octopus-package-nuget)**:  Package as NuPkg.
+- **[octopus package nuget create](/docs/cli/octopus-package-nuget-create)**:  Create nuget.
+- **[octopus package upload](/docs/cli/octopus-package-upload)**:  Upload one or more packages to Octopus Deploy.
+- **[octopus package versions](/docs/cli/octopus-package-versions)**:  List versions of a package.
+- **[octopus package zip](/docs/cli/octopus-package-zip)**:  Package as zip.
+- **[octopus package zip create](/docs/cli/octopus-package-zip-create)**:  Create zip.
+- **[octopus project](/docs/cli/octopus-project)**:  Manage projects.
+- **[octopus project branch](/docs/cli/octopus-project-branch)**:  Manage project branches.
+- **[octopus project branch create](/docs/cli/octopus-project-branch-create)**:  Create a Git branch for a project.
+- **[octopus project branch list](/docs/cli/octopus-project-branch-list)**:  List project branches.
+- **[octopus project clone](/docs/cli/octopus-project-clone)**:  Clone a project.
+- **[octopus project connect](/docs/cli/octopus-project-connect)**:  Connect a tenant to a project.
+- **[octopus project convert](/docs/cli/octopus-project-convert)**:  Convert a project to use Config As Code.
+- **[octopus project create](/docs/cli/octopus-project-create)**:  Create a project.
+- **[octopus project delete](/docs/cli/octopus-project-delete)**:  Delete a project.
+- **[octopus project disable](/docs/cli/octopus-project-disable)**:  Disable a project.
+- **[octopus project disconnect](/docs/cli/octopus-project-disconnect)**:  Disconnect a tenant from a project.
+- **[octopus project enable](/docs/cli/octopus-project-enable)**:  Enable a project.
+- **[octopus project list](/docs/cli/octopus-project-list)**:  List projects.
+- **[octopus project tag](/docs/cli/octopus-project-tag)**:  Override tags for a project.
+- **[octopus project variables](/docs/cli/octopus-project-variables)**:  Manage project variables.
+- **[octopus project variables create](/docs/cli/octopus-project-variables-create)**:  Create a variable for a project.
+- **[octopus project variables delete](/docs/cli/octopus-project-variables-delete)**:  Delete a project variable.
+- **[octopus project variables exclude](/docs/cli/octopus-project-variables-exclude)**:  Exclude a variable set from a project.
+- **[octopus project variables include](/docs/cli/octopus-project-variables-include)**:  Include a variable set in a project.
+- **[octopus project variables list](/docs/cli/octopus-project-variables-list)**:  List project variables.
+- **[octopus project variables update](/docs/cli/octopus-project-variables-update)**:  Update the value of a project variable.
+- **[octopus project variables view](/docs/cli/octopus-project-variables-view)**:  View all values of a project variable.
+- **[octopus project view](/docs/cli/octopus-project-view)**:  View a project.
+- **[octopus project-group](/docs/cli/octopus-project-group)**:  Manage project groups.
+- **[octopus project-group create](/docs/cli/octopus-project-group-create)**:  Create a project group.
+- **[octopus project-group delete](/docs/cli/octopus-project-group-delete)**:  Delete a project group.
+- **[octopus project-group list](/docs/cli/octopus-project-group-list)**:  List project groups.
+- **[octopus project-group view](/docs/cli/octopus-project-group-view)**:  View a project group.
+- **[octopus release](/docs/cli/octopus-release)**:  Manage releases.
+- **[octopus release create](/docs/cli/octopus-release-create)**:  Create a release.
+- **[octopus release delete](/docs/cli/octopus-release-delete)**:  Delete a release.
+- **[octopus release deploy](/docs/cli/octopus-release-deploy)**:  Deploy releases.
+- **[octopus release list](/docs/cli/octopus-release-list)**:  List releases.
+- **[octopus release progression](/docs/cli/octopus-release-progression)**:  Manage progression of a release.
+- **[octopus release progression allow](/docs/cli/octopus-release-progression-allow)**:  Allows a release to progress to the next phase..
+- **[octopus release progression prevent](/docs/cli/octopus-release-progression-prevent)**:  Prevents a release from progression to the next phase.
+- **[octopus runbook](/docs/cli/octopus-runbook)**:  Manage runbooks.
+- **[octopus runbook delete](/docs/cli/octopus-runbook-delete)**:  Delete a runbook.
+- **[octopus runbook list](/docs/cli/octopus-runbook-list)**:  List runbooks.
+- **[octopus runbook run](/docs/cli/octopus-runbook-run)**:  Run runbooks in Octopus Deploy.
+- **[octopus runbook snapshot](/docs/cli/octopus-runbook-snapshot)**:  Manage runbook snapshots.
+- **[octopus runbook snapshot create](/docs/cli/octopus-runbook-snapshot-create)**:  Create a runbook snapshot.
+- **[octopus runbook snapshot list](/docs/cli/octopus-runbook-snapshot-list)**:  List runbook snapshots.
+- **[octopus runbook snapshot publish](/docs/cli/octopus-runbook-snapshot-publish)**:  Publish a runbook snapshot.
+- **[octopus space](/docs/cli/octopus-space)**:  Manage spaces.
+- **[octopus space create](/docs/cli/octopus-space-create)**:  Create a space.
+- **[octopus space delete](/docs/cli/octopus-space-delete)**:  Delete a space.
+- **[octopus space list](/docs/cli/octopus-space-list)**:  List spaces.
+- **[octopus space view](/docs/cli/octopus-space-view)**:  View a space.
+- **[octopus task](/docs/cli/octopus-task)**:  Manage tasks.
+- **[octopus task wait](/docs/cli/octopus-task-wait)**:  Wait for task(s) to finish.
+- **[octopus tenant](/docs/cli/octopus-tenant)**:  Manage tenants.
+- **[octopus tenant clone](/docs/cli/octopus-tenant-clone)**:  Clone a tenant.
+- **[octopus tenant connect](/docs/cli/octopus-tenant-connect)**:  Connect a tenant to a project.
+- **[octopus tenant create](/docs/cli/octopus-tenant-create)**:  Create a tenant.
+- **[octopus tenant delete](/docs/cli/octopus-tenant-delete)**:  Delete a tenant.
+- **[octopus tenant disable](/docs/cli/octopus-tenant-disable)**:  Disable a tenant.
+- **[octopus tenant disconnect](/docs/cli/octopus-tenant-disconnect)**:  Disconnect a tenant from a project.
+- **[octopus tenant enable](/docs/cli/octopus-tenant-enable)**:  Enable a tenant.
+- **[octopus tenant list](/docs/cli/octopus-tenant-list)**:  List tenants.
+- **[octopus tenant tag](/docs/cli/octopus-tenant-tag)**:  Override tags for a tenant.
+- **[octopus tenant variables](/docs/cli/octopus-tenant-variables)**:  Manage tenant variables.
+- **[octopus tenant variables list](/docs/cli/octopus-tenant-variables-list)**:  List tenant variables.
+- **[octopus tenant variables update](/docs/cli/octopus-tenant-variables-update)**:  Update the value of a tenant variable.
+- **[octopus tenant view](/docs/cli/octopus-tenant-view)**:  View a tenant.
+- **[octopus user](/docs/cli/octopus-user)**:  Manage users.
+- **[octopus user delete](/docs/cli/octopus-user-delete)**:  Delete a user.
+- **[octopus user list](/docs/cli/octopus-user-list)**:  List users.
+- **[octopus worker](/docs/cli/octopus-worker)**:  Manage workers.
+- **[octopus worker delete](/docs/cli/octopus-worker-delete)**:  Delete a worker.
+- **[octopus worker list](/docs/cli/octopus-worker-list)**:  List workers.
+- **[octopus worker listening-tentacle](/docs/cli/octopus-worker-listening-tentacle)**:  Manage Listening Tentacle workers.
+- **[octopus worker listening-tentacle create](/docs/cli/octopus-worker-listening-tentacle-create)**:  Create a listening tentacle worker.
+- **[octopus worker listening-tentacle list](/docs/cli/octopus-worker-listening-tentacle-list)**:  List Listening Tentacle workers.
+- **[octopus worker listening-tentacle view](/docs/cli/octopus-worker-listening-tentacle-view)**:  View a Listening Tentacle worker.
+- **[octopus worker polling-tentacle](/docs/cli/octopus-worker-polling-tentacle)**:  Manage Polling Tentacle workers.
+- **[octopus worker polling-tentacle list](/docs/cli/octopus-worker-polling-tentacle-list)**:  List Polling Tentacle workers.
+- **[octopus worker polling-tentacle view](/docs/cli/octopus-worker-polling-tentacle-view)**:  View a Polling Tentacle worker.
+- **[octopus worker ssh](/docs/cli/octopus-worker-ssh)**:  Manage SSH workers.
+- **[octopus worker ssh create](/docs/cli/octopus-worker-ssh-create)**:  Create a SSH worker.
+- **[octopus worker ssh list](/docs/cli/octopus-worker-ssh-list)**:  List SSH workers.
+- **[octopus worker ssh view](/docs/cli/octopus-worker-ssh-view)**:  View a SSH worker.
+- **[octopus worker view](/docs/cli/octopus-worker-view)**:  View a worker.
+- **[octopus worker-pool](/docs/cli/octopus-worker-pool)**:  Manage worker pools.
+- **[octopus worker-pool delete](/docs/cli/octopus-worker-pool-delete)**:  Delete a worker pool.
+- **[octopus worker-pool dynamic](/docs/cli/octopus-worker-pool-dynamic)**:  Manage dynamic worker pools.
+- **[octopus worker-pool dynamic create](/docs/cli/octopus-worker-pool-dynamic-create)**:  Create a dynamic worker pool.
+- **[octopus worker-pool dynamic view](/docs/cli/octopus-worker-pool-dynamic-view)**:  View a dynamic worker pool.
+- **[octopus worker-pool list](/docs/cli/octopus-worker-pool-list)**:  List worker pools.
+- **[octopus worker-pool static](/docs/cli/octopus-worker-pool-static)**:  Manage static worker pools.
+- **[octopus worker-pool static create](/docs/cli/octopus-worker-pool-static-create)**:  Create a static worker pool.
+- **[octopus worker-pool static view](/docs/cli/octopus-worker-pool-static-view)**:  View a static worker pool.
+- **[octopus worker-pool view](/docs/cli/octopus-worker-pool-view)**:  View a worker pool.
diff --git a/src/shared-content/octopus-rest-api/octopus-project-variables-include.mdx b/src/shared-content/octopus-rest-api/octopus-project-variables-include.mdx
index b4460e95ad..60312f2a93 100644
--- a/src/shared-content/octopus-rest-api/octopus-project-variables-include.mdx
+++ b/src/shared-content/octopus-rest-api/octopus-project-variables-include.mdx
@@ -37,5 +37,5 @@ octopus project variable include --variable-set "Slack Variables"
 
 ## Learn more
 
-- [Octopus CLI](/docs/octopus-rest-api/cli)
+- [Octopus CLI](/docs/cli)
 - [Creating API keys](/docs/octopus-rest-api/how-to-create-an-api-key)
diff --git a/src/themes/octopus/utilities/mdxContentCore.ts b/src/themes/octopus/utilities/mdxContentCore.ts
index 21d7ab1714..6135adb2c6 100644
--- a/src/themes/octopus/utilities/mdxContentCore.ts
+++ b/src/themes/octopus/utilities/mdxContentCore.ts
@@ -1,4 +1,4 @@
-import { flattenGeneratedApiPath } from '../../../lib/generatedApiPaths';
+import { flattenGeneratedPath } from '../../../lib/generatedPaths';
 
 export type SharedContentLookup = (absolutePath: string) => string | undefined;
 
@@ -270,7 +270,7 @@ export type NavSortable = {
 
 // Returns null for the docs root index.
 export function pathToSlug(relPath: string): string | null {
-  const flattened = flattenGeneratedApiPath(relPath);
+  const flattened = flattenGeneratedPath(relPath);
   const noExt = flattened.replace(/\.(md|mdx)$/i, '');
   if (noExt === flattened) return null;
   if (noExt === 'index') return null;
diff --git a/tests/docs-search.spec.ts b/tests/docs-search.spec.ts
index 8c939ac364..f2740d72b2 100644
--- a/tests/docs-search.spec.ts
+++ b/tests/docs-search.spec.ts
@@ -551,7 +551,7 @@ test('a command wins when the query asks for one', async ({ page }) => {
   });
   await expect(site.locator('[role="option"]').first()).toHaveAttribute(
     'href',
-    '/docs/octopus-rest-api/cli/octopus-release-create/'
+    '/docs/cli/octopus-release-create/'
   );
 });
 

From 07e39aaad7d861b631df2d2478d2c35288a18820 Mon Sep 17 00:00:00 2001
From: William Laugesen <will.laugesen@octopus.com>
Date: Mon, 31 Aug 2026 18:01:27 +1200
Subject: [PATCH 2/7] Route /docs/cli to the CLI tab

The CLI pages have left the REST API tree, so the rule that found them there
follows them. Nothing nests inside anything else now, which is what the note
about testing order was for.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 src/scripts/search-engine.ts | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/scripts/search-engine.ts b/src/scripts/search-engine.ts
index 340ac9cf21..01fff5040d 100644
--- a/src/scripts/search-engine.ts
+++ b/src/scripts/search-engine.ts
@@ -74,19 +74,12 @@ export const FACETS: Facet[] = [
   { key: 'integrations', label: 'Integrations' },
 ];
 
-// Longest-match-first: every CLI page also sits under the REST API tree, so the
-// CLI prefixes have to be tested before the API one they are nested in.
 const SECTIONS: {
   facet: string;
   kind: SearchResult['kind'];
   prefix: RegExp;
 }[] = [
-  {
-    facet: 'cli',
-    kind: 'command',
-    prefix:
-      /^\/docs\/octopus-rest-api\/(cli|octopus-cli|[a-z.]+-command-line)(\/|$)/,
-  },
+  { facet: 'cli', kind: 'command', prefix: /^\/docs\/cli(\/|$)/ },
   { facet: 'api', kind: 'command', prefix: /^\/docs\/octopus-rest-api(\/|$)/ },
   {
     facet: 'integrations',

From 07560a5daba4dade724a20bdb13a86cde0afd15c Mon Sep 17 00:00:00 2001
From: William Laugesen <will.laugesen@octopus.com>
Date: Mon, 31 Aug 2026 18:01:38 +1200
Subject: [PATCH 3/7] Fill the promotion shortlist with candidates it can be
 chosen from

`namedPage` fetches the first LANDING_CANDIDATES of the shortlist and then drops
whatever `claimsName` refuses, so a shortlist headed by pages it will refuse is
spent before a usable candidate is reached and the page the query names is never
promoted. Reference pages are refused unless the query asks for the reference,
so they are left out of that search rather than fetched and dropped.

Searching "deployment targets" filled all five slots with reference pages,
refused all five, and fell back to a getting-started page over
/docs/infrastructure/deployment-targets, which ranks 36th on raw score and is
the reason the shortlist exists.

The exclusion is written as `not`, because a bare array of filter values is read
as AND: `section: ['docs', 'integrations']` asks for the pages that are both and
matches none.

A narrowed tab already restricts the shortlist to one section, so only the
unfiltered search needs this.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 src/layouts/Cli.astro                 |  7 ++++---
 src/scripts/search-engine-pagefind.ts | 23 ++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/layouts/Cli.astro b/src/layouts/Cli.astro
index fb59c44258..6b20a20492 100644
--- a/src/layouts/Cli.astro
+++ b/src/layouts/Cli.astro
@@ -31,15 +31,16 @@ import DocsSearch from '../components/DocsSearch.astro';
 // restyled without touching the hand-written pages beside it.
 //
 // It is laid out as a docs page: the middle column, the area nav and the table
-// of contents beside it. A shape of its own goes here, and the ~185 pages take
-// it without a sweep of their frontmatter.
+// of contents beside it. When the reference needs a look of its own, it changes
+// here and all 185 pages pick it up.
 //
 // There is no "Edit on GitHub". These pages are written by gen-docs in
 // OctopusDeploy/cli and land in _generated, so the file the button would open is
 // overwritten by the next sync; correcting one of them means changing the
 // template in that repo. Api.astro leaves it out for the same reason.
 //
-// Copy as markdown stays: these pages have a .md of their own to hand over.
+// Copy as markdown stays, because these pages do have a .md version to copy.
+// Api.astro has it turned off only because it does not work there yet.
 
 type Props = {
   // The nav this page appears in. Optional, and normally left alone: these
diff --git a/src/scripts/search-engine-pagefind.ts b/src/scripts/search-engine-pagefind.ts
index 02a088b87a..7b59a3b740 100644
--- a/src/scripts/search-engine-pagefind.ts
+++ b/src/scripts/search-engine-pagefind.ts
@@ -359,6 +359,27 @@ export function pagefindEngine(bundlePath: string): SearchEngine {
         const filters =
           facet && facet !== 'all' ? { section: [facet] } : undefined;
 
+        // The shortlist `namedPage` picks a page to promote from.
+        //
+        // With a tab selected, its filter already narrows the shortlist to the
+        // right section, so use it as it is. Without one, exclude the API and
+        // CLI results: `namedPage` reads only the first few and skips reference
+        // pages anyway, so left in they fill every slot and it finds nothing to
+        // promote. Unless the query asks for the reference, which can promote
+        // one.
+        //
+        // Excluding, rather than naming the two sections to keep, because
+        // Pagefind reads a plain array as "all of these at once". Measured for
+        // "deployment targets": section: ['docs', 'integrations'] returns 0,
+        // section: { not: { any: ['api', 'cli'] } } returns 97.
+        const landingFilters =
+          filters === undefined && !ASKS_FOR_REFERENCE.test(query.toLowerCase())
+            ? {
+                landing: ['true'],
+                section: { not: { any: [...REFERENCE_FACETS] } },
+              }
+            : { ...filters, landing: ['true'] };
+
         // Three searches at once, because a second await here would sit in front
         // of every fragment fetch below it. The first supplies the rows; the
         // second says whether the query has any answer at all, and only runs
@@ -368,7 +389,7 @@ export function pagefindEngine(bundlePath: string): SearchEngine {
         const [response, wholeCorpus, landing] = await Promise.all([
           api.search(query, { filters }),
           filters ? api.search(query) : null,
-          api.search(query, { filters: { ...filters, landing: ['true'] } }),
+          api.search(query, { filters: landingFilters }),
         ]);
         const unfiltered = wholeCorpus ?? response;
 

From 3d9a18e3d665eed76c743a43cabdbe04d779f090 Mon Sep 17 00:00:00 2001
From: William Laugesen <will.laugesen@octopus.com>
Date: Tue, 1 Sep 2026 09:21:02 +1200
Subject: [PATCH 4/7] Keep a redirect at the root of each moved folder, not on
 every page

The per-page stubs are 381 files of frontmatter carrying no content, and every
one is a page the build renders. /docs/octopus-rest-api/cli and
/docs/octopus-rest-api/octopus-cli keep theirs so the section urls still land
somewhere, and octo.exe-command-line goes entirely: it redirected to the Octo
CLI pages, which have their own root redirect now.

Deep urls under those folders 404 rather than redirecting. Nothing in the repo
links to them.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 .../octopus-rest-api/cli/octopus-account-aws-create.mdx  | 9 ---------
 .../octopus-rest-api/cli/octopus-account-aws-list.mdx    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-account-aws.mdx    | 9 ---------
 .../cli/octopus-account-azure-create.mdx                 | 9 ---------
 .../octopus-rest-api/cli/octopus-account-azure-list.mdx  | 9 ---------
 .../cli/octopus-account-azure-oidc-create.mdx            | 9 ---------
 .../cli/octopus-account-azure-oidc-list.mdx              | 9 ---------
 .../octopus-rest-api/cli/octopus-account-azure-oidc.mdx  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-account-azure.mdx  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-account-create.mdx | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-account-delete.mdx | 9 ---------
 .../octopus-rest-api/cli/octopus-account-gcp-create.mdx  | 9 ---------
 .../octopus-rest-api/cli/octopus-account-gcp-list.mdx    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-account-gcp.mdx    | 9 ---------
 .../cli/octopus-account-generic-oidc-create.mdx          | 9 ---------
 .../cli/octopus-account-generic-oidc-list.mdx            | 9 ---------
 .../cli/octopus-account-generic-oidc.mdx                 | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-account-list.mdx   | 9 ---------
 .../octopus-rest-api/cli/octopus-account-ssh-create.mdx  | 9 ---------
 .../octopus-rest-api/cli/octopus-account-ssh-list.mdx    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-account-ssh.mdx    | 9 ---------
 .../cli/octopus-account-token-create.mdx                 | 9 ---------
 .../octopus-rest-api/cli/octopus-account-token-list.mdx  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-account-token.mdx  | 9 ---------
 .../cli/octopus-account-username-create.mdx              | 9 ---------
 .../cli/octopus-account-username-list.mdx                | 9 ---------
 .../octopus-rest-api/cli/octopus-account-username.mdx    | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus-account.mdx  | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus-api.mdx      | 9 ---------
 .../cli/octopus-build-information-bulk-delete.mdx        | 9 ---------
 .../cli/octopus-build-information-delete.mdx             | 9 ---------
 .../cli/octopus-build-information-list.mdx               | 9 ---------
 .../cli/octopus-build-information-upload.mdx             | 9 ---------
 .../cli/octopus-build-information-view.mdx               | 9 ---------
 .../octopus-rest-api/cli/octopus-build-information.mdx   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-channel-create.mdx | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-channel-delete.mdx | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-channel-list.mdx   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-channel-view.mdx   | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus-channel.mdx  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-config-get.mdx     | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-config-list.mdx    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-config-set.mdx     | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus-config.mdx   | 9 ---------
 .../octopus-deployment-target-azure-web-app-create.mdx   | 9 ---------
 .../cli/octopus-deployment-target-azure-web-app-list.mdx | 9 ---------
 .../cli/octopus-deployment-target-azure-web-app-view.mdx | 9 ---------
 .../cli/octopus-deployment-target-azure-web-app.mdx      | 9 ---------
 .../octopus-deployment-target-cloud-region-create.mdx    | 9 ---------
 .../cli/octopus-deployment-target-cloud-region-list.mdx  | 9 ---------
 .../cli/octopus-deployment-target-cloud-region-view.mdx  | 9 ---------
 .../cli/octopus-deployment-target-cloud-region.mdx       | 9 ---------
 .../cli/octopus-deployment-target-delete.mdx             | 9 ---------
 .../cli/octopus-deployment-target-kubernetes-create.mdx  | 9 ---------
 .../cli/octopus-deployment-target-kubernetes-list.mdx    | 9 ---------
 .../cli/octopus-deployment-target-kubernetes-view.mdx    | 9 ---------
 .../cli/octopus-deployment-target-kubernetes.mdx         | 9 ---------
 .../cli/octopus-deployment-target-list.mdx               | 9 ---------
 ...topus-deployment-target-listening-tentacle-create.mdx | 9 ---------
 ...octopus-deployment-target-listening-tentacle-list.mdx | 9 ---------
 ...octopus-deployment-target-listening-tentacle-view.mdx | 9 ---------
 .../cli/octopus-deployment-target-listening-tentacle.mdx | 9 ---------
 .../octopus-deployment-target-polling-tentacle-list.mdx  | 9 ---------
 .../octopus-deployment-target-polling-tentacle-view.mdx  | 9 ---------
 .../cli/octopus-deployment-target-polling-tentacle.mdx   | 9 ---------
 .../cli/octopus-deployment-target-ssh-create.mdx         | 9 ---------
 .../cli/octopus-deployment-target-ssh-list.mdx           | 9 ---------
 .../cli/octopus-deployment-target-ssh-view.mdx           | 9 ---------
 .../cli/octopus-deployment-target-ssh.mdx                | 9 ---------
 .../cli/octopus-deployment-target-view.mdx               | 9 ---------
 .../octopus-rest-api/cli/octopus-deployment-target.mdx   | 9 ---------
 .../octopus-rest-api/cli/octopus-environment-create.mdx  | 9 ---------
 .../octopus-rest-api/cli/octopus-environment-delete.mdx  | 9 ---------
 .../octopus-rest-api/cli/octopus-environment-list.mdx    | 9 ---------
 .../octopus-rest-api/cli/octopus-environment-tag.mdx     | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-environment.mdx    | 9 ---------
 .../cli/octopus-ephemeral-environment-create.mdx         | 9 ---------
 ...pus-ephemeral-environment-deprovision-environment.mdx | 9 ---------
 ...octopus-ephemeral-environment-deprovision-project.mdx | 9 ---------
 .../cli/octopus-ephemeral-environment.mdx                | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus-login.mdx    | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus-logout.mdx   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-package-delete.mdx | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-package-list.mdx   | 9 ---------
 .../cli/octopus-package-nuget-create.mdx                 | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-package-nuget.mdx  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-package-upload.mdx | 9 ---------
 .../octopus-rest-api/cli/octopus-package-versions.mdx    | 9 ---------
 .../octopus-rest-api/cli/octopus-package-zip-create.mdx  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-package-zip.mdx    | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus-package.mdx  | 9 ---------
 .../cli/octopus-project-branch-create.mdx                | 9 ---------
 .../octopus-rest-api/cli/octopus-project-branch-list.mdx | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-project-branch.mdx | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-project-clone.mdx  | 9 ---------
 .../octopus-rest-api/cli/octopus-project-connect.mdx     | 9 ---------
 .../octopus-rest-api/cli/octopus-project-convert.mdx     | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-project-create.mdx | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-project-delete.mdx | 9 ---------
 .../octopus-rest-api/cli/octopus-project-disable.mdx     | 9 ---------
 .../octopus-rest-api/cli/octopus-project-disconnect.mdx  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-project-enable.mdx | 9 ---------
 .../cli/octopus-project-group-create.mdx                 | 9 ---------
 .../cli/octopus-project-group-delete.mdx                 | 9 ---------
 .../octopus-rest-api/cli/octopus-project-group-list.mdx  | 9 ---------
 .../octopus-rest-api/cli/octopus-project-group-view.mdx  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-project-group.mdx  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-project-list.mdx   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-project-tag.mdx    | 9 ---------
 .../cli/octopus-project-variables-create.mdx             | 9 ---------
 .../cli/octopus-project-variables-delete.mdx             | 9 ---------
 .../cli/octopus-project-variables-exclude.mdx            | 9 ---------
 .../cli/octopus-project-variables-include.mdx            | 9 ---------
 .../cli/octopus-project-variables-list.mdx               | 9 ---------
 .../cli/octopus-project-variables-update.mdx             | 9 ---------
 .../cli/octopus-project-variables-view.mdx               | 9 ---------
 .../octopus-rest-api/cli/octopus-project-variables.mdx   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-project-view.mdx   | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus-project.mdx  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-release-create.mdx | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-release-delete.mdx | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-release-deploy.mdx | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-release-list.mdx   | 9 ---------
 .../cli/octopus-release-progression-allow.mdx            | 9 ---------
 .../cli/octopus-release-progression-prevent.mdx          | 9 ---------
 .../octopus-rest-api/cli/octopus-release-progression.mdx | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus-release.mdx  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-runbook-delete.mdx | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-runbook-list.mdx   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-runbook-run.mdx    | 9 ---------
 .../cli/octopus-runbook-snapshot-create.mdx              | 9 ---------
 .../cli/octopus-runbook-snapshot-list.mdx                | 9 ---------
 .../cli/octopus-runbook-snapshot-publish.mdx             | 9 ---------
 .../octopus-rest-api/cli/octopus-runbook-snapshot.mdx    | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus-runbook.mdx  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-space-create.mdx   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-space-delete.mdx   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-space-list.mdx     | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-space-view.mdx     | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus-space.mdx    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-task-wait.mdx      | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus-task.mdx     | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-tenant-clone.mdx   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-tenant-connect.mdx | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-tenant-create.mdx  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-tenant-delete.mdx  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-tenant-disable.mdx | 9 ---------
 .../octopus-rest-api/cli/octopus-tenant-disconnect.mdx   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-tenant-enable.mdx  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-tenant-list.mdx    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-tenant-tag.mdx     | 9 ---------
 .../cli/octopus-tenant-variables-list.mdx                | 9 ---------
 .../cli/octopus-tenant-variables-update.mdx              | 9 ---------
 .../octopus-rest-api/cli/octopus-tenant-variables.mdx    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-tenant-view.mdx    | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus-tenant.mdx   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-user-delete.mdx    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-user-list.mdx      | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus-user.mdx     | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-worker-delete.mdx  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-worker-list.mdx    | 9 ---------
 .../cli/octopus-worker-listening-tentacle-create.mdx     | 9 ---------
 .../cli/octopus-worker-listening-tentacle-list.mdx       | 9 ---------
 .../cli/octopus-worker-listening-tentacle-view.mdx       | 9 ---------
 .../cli/octopus-worker-listening-tentacle.mdx            | 9 ---------
 .../cli/octopus-worker-polling-tentacle-list.mdx         | 9 ---------
 .../cli/octopus-worker-polling-tentacle-view.mdx         | 9 ---------
 .../cli/octopus-worker-polling-tentacle.mdx              | 9 ---------
 .../octopus-rest-api/cli/octopus-worker-pool-delete.mdx  | 9 ---------
 .../cli/octopus-worker-pool-dynamic-create.mdx           | 9 ---------
 .../cli/octopus-worker-pool-dynamic-view.mdx             | 9 ---------
 .../octopus-rest-api/cli/octopus-worker-pool-dynamic.mdx | 9 ---------
 .../octopus-rest-api/cli/octopus-worker-pool-list.mdx    | 9 ---------
 .../cli/octopus-worker-pool-static-create.mdx            | 9 ---------
 .../cli/octopus-worker-pool-static-view.mdx              | 9 ---------
 .../octopus-rest-api/cli/octopus-worker-pool-static.mdx  | 9 ---------
 .../octopus-rest-api/cli/octopus-worker-pool-view.mdx    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-worker-pool.mdx    | 9 ---------
 .../octopus-rest-api/cli/octopus-worker-ssh-create.mdx   | 9 ---------
 .../octopus-rest-api/cli/octopus-worker-ssh-list.mdx     | 9 ---------
 .../octopus-rest-api/cli/octopus-worker-ssh-view.mdx     | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-worker-ssh.mdx     | 9 ---------
 .../docs/octopus-rest-api/cli/octopus-worker-view.mdx    | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus-worker.mdx   | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus.mdx          | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus_account.md   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_account_aws.md     | 9 ---------
 .../octopus-rest-api/cli/octopus_account_aws_create.md   | 9 ---------
 .../octopus-rest-api/cli/octopus_account_aws_list.md     | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_account_azure.md   | 9 ---------
 .../octopus-rest-api/cli/octopus_account_azure_create.md | 9 ---------
 .../octopus-rest-api/cli/octopus_account_azure_list.md   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_account_create.md  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_account_delete.md  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_account_gcp.md     | 9 ---------
 .../octopus-rest-api/cli/octopus_account_gcp_create.md   | 9 ---------
 .../octopus-rest-api/cli/octopus_account_gcp_list.md     | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_account_list.md    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_account_ssh.md     | 9 ---------
 .../octopus-rest-api/cli/octopus_account_ssh_create.md   | 9 ---------
 .../octopus-rest-api/cli/octopus_account_ssh_list.md     | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_account_token.md   | 9 ---------
 .../octopus-rest-api/cli/octopus_account_token_create.md | 9 ---------
 .../octopus-rest-api/cli/octopus_account_token_list.md   | 9 ---------
 .../octopus-rest-api/cli/octopus_account_username.md     | 9 ---------
 .../cli/octopus_account_username_create.md               | 9 ---------
 .../cli/octopus_account_username_list.md                 | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus_config.md    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_config_get.md      | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_config_list.md     | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_config_set.md      | 9 ---------
 .../octopus-rest-api/cli/octopus_deployment-target.md    | 9 ---------
 .../cli/octopus_deployment-target_azure-web-app.md       | 9 ---------
 .../octopus_deployment-target_azure-web-app_create.md    | 9 ---------
 .../cli/octopus_deployment-target_azure-web-app_list.md  | 9 ---------
 .../cli/octopus_deployment-target_azure-web-app_view.md  | 9 ---------
 .../cli/octopus_deployment-target_cloud-region.md        | 9 ---------
 .../cli/octopus_deployment-target_cloud-region_create.md | 9 ---------
 .../cli/octopus_deployment-target_cloud-region_list.md   | 9 ---------
 .../cli/octopus_deployment-target_cloud-region_view.md   | 9 ---------
 .../cli/octopus_deployment-target_delete.md              | 9 ---------
 .../cli/octopus_deployment-target_kubernetes.md          | 9 ---------
 .../cli/octopus_deployment-target_kubernetes_create.md   | 9 ---------
 .../cli/octopus_deployment-target_kubernetes_list.md     | 9 ---------
 .../cli/octopus_deployment-target_kubernetes_view.md     | 9 ---------
 .../cli/octopus_deployment-target_list.md                | 9 ---------
 .../cli/octopus_deployment-target_listening-tentacle.md  | 9 ---------
 ...ctopus_deployment-target_listening-tentacle_create.md | 9 ---------
 .../octopus_deployment-target_listening-tentacle_list.md | 9 ---------
 .../octopus_deployment-target_listening-tentacle_view.md | 9 ---------
 .../cli/octopus_deployment-target_polling-tentacle.md    | 9 ---------
 .../octopus_deployment-target_polling-tentacle_list.md   | 9 ---------
 .../octopus_deployment-target_polling-tentacle_view.md   | 9 ---------
 .../cli/octopus_deployment-target_ssh.md                 | 9 ---------
 .../cli/octopus_deployment-target_ssh_create.md          | 9 ---------
 .../cli/octopus_deployment-target_ssh_list.md            | 9 ---------
 .../cli/octopus_deployment-target_ssh_view.md            | 9 ---------
 .../cli/octopus_deployment-target_view.md                | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_environment.md     | 9 ---------
 .../octopus-rest-api/cli/octopus_environment_delete.md   | 9 ---------
 .../octopus-rest-api/cli/octopus_environment_list.md     | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus_package.md   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_package_list.md    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_package_upload.md  | 9 ---------
 .../octopus-rest-api/cli/octopus_package_versions.md     | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_project-group.md   | 9 ---------
 .../octopus-rest-api/cli/octopus_project-group_create.md | 9 ---------
 .../octopus-rest-api/cli/octopus_project-group_delete.md | 9 ---------
 .../octopus-rest-api/cli/octopus_project-group_list.md   | 9 ---------
 .../octopus-rest-api/cli/octopus_project-group_view.md   | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus_project.md   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_project_connect.md | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_project_convert.md | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_project_create.md  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_project_delete.md  | 9 ---------
 .../octopus-rest-api/cli/octopus_project_disconnect.md   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_project_list.md    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_project_view.md    | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus_release.md   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_release_create.md  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_release_delete.md  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_release_deploy.md  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_release_list.md    | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus_runbook.md   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_runbook_list.md    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_runbook_run.md     | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus_space.md     | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_space_create.md    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_space_delete.md    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_space_list.md      | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_space_view.md      | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus_task.md      | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus_task_wait.md | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus_tenant.md    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_tenant_clone.md    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_tenant_connect.md  | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_tenant_create.md   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_tenant_delete.md   | 9 ---------
 .../octopus-rest-api/cli/octopus_tenant_disconnect.md    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_tenant_list.md     | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_tenant_tag.md      | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_tenant_view.md     | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus_user.md      | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_user_delete.md     | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus_user_list.md | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_worker-pool.md     | 9 ---------
 .../octopus-rest-api/cli/octopus_worker-pool_delete.md   | 9 ---------
 .../octopus-rest-api/cli/octopus_worker-pool_dynamic.md  | 9 ---------
 .../cli/octopus_worker-pool_dynamic_create.md            | 9 ---------
 .../cli/octopus_worker-pool_dynamic_view.md              | 9 ---------
 .../octopus-rest-api/cli/octopus_worker-pool_list.md     | 9 ---------
 .../octopus-rest-api/cli/octopus_worker-pool_static.md   | 9 ---------
 .../cli/octopus_worker-pool_static_create.md             | 9 ---------
 .../cli/octopus_worker-pool_static_view.md               | 9 ---------
 .../octopus-rest-api/cli/octopus_worker-pool_view.md     | 9 ---------
 src/pages/docs/octopus-rest-api/cli/octopus_worker.md    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_worker_delete.md   | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_worker_list.md     | 9 ---------
 .../cli/octopus_worker_listening-tentacle.md             | 9 ---------
 .../cli/octopus_worker_listening-tentacle_create.md      | 9 ---------
 .../cli/octopus_worker_listening-tentacle_list.md        | 9 ---------
 .../cli/octopus_worker_listening-tentacle_view.md        | 9 ---------
 .../cli/octopus_worker_polling-tentacle.md               | 9 ---------
 .../cli/octopus_worker_polling-tentacle_list.md          | 9 ---------
 .../cli/octopus_worker_polling-tentacle_view.md          | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_worker_ssh.md      | 9 ---------
 .../octopus-rest-api/cli/octopus_worker_ssh_create.md    | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_worker_ssh_list.md | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_worker_ssh_view.md | 9 ---------
 .../docs/octopus-rest-api/cli/octopus_worker_view.md     | 9 ---------
 .../octo.exe-command-line/build-information.md           | 9 ---------
 .../octo.exe-command-line/clean-environment.md           | 9 ---------
 .../octo.exe-command-line/clean-workerpool.md            | 9 ---------
 .../octo.exe-command-line/create-autodeployoverride.md   | 9 ---------
 .../octo.exe-command-line/create-channel.md              | 9 ---------
 .../octo.exe-command-line/create-environment.md          | 9 ---------
 .../octo.exe-command-line/create-project.md              | 9 ---------
 .../octo.exe-command-line/create-release.md              | 9 ---------
 .../octo.exe-command-line/create-workerpool.md           | 9 ---------
 .../octo.exe-command-line/delete-autodeployoverride.md   | 9 ---------
 .../octo.exe-command-line/delete-releases.md             | 9 ---------
 .../octo.exe-command-line/deploy-release.md              | 9 ---------
 .../octo.exe-command-line/dump-deployments.md            | 9 ---------
 .../octopus-rest-api/octo.exe-command-line/export.md     | 9 ---------
 .../octo.exe-command-line/formatted-output.md            | 9 ---------
 .../octopus-rest-api/octo.exe-command-line/import.md     | 9 ---------
 .../docs/octopus-rest-api/octo.exe-command-line/index.md | 9 ---------
 .../octo.exe-command-line/install-global-tool.md         | 9 ---------
 .../octo.exe-command-line/list-deployments.md            | 9 ---------
 .../octo.exe-command-line/list-environments.md           | 9 ---------
 .../octo.exe-command-line/list-latestdeployments.md      | 9 ---------
 .../octo.exe-command-line/list-machines.md               | 9 ---------
 .../octo.exe-command-line/list-projects.md               | 9 ---------
 .../octo.exe-command-line/list-releases.md               | 9 ---------
 .../octo.exe-command-line/list-tenants.md                | 9 ---------
 .../octo.exe-command-line/list-workerpools.md            | 9 ---------
 .../octo.exe-command-line/list-workers.md                | 9 ---------
 .../docs/octopus-rest-api/octo.exe-command-line/pack.md  | 9 ---------
 .../octo.exe-command-line/promote-release.md             | 9 ---------
 .../octo.exe-command-line/push-metadata.md               | 9 ---------
 .../docs/octopus-rest-api/octo.exe-command-line/push.md  | 9 ---------
 .../octopus-rest-api/octo.exe-command-line/version.md    | 9 ---------
 .../octopus-cli/allow-releaseprogression.mdx             | 9 ---------
 .../octopus-rest-api/octopus-cli/build-information.mdx   | 9 ---------
 .../octopus-rest-api/octopus-cli/clean-environment.md    | 9 ---------
 .../octopus-rest-api/octopus-cli/clean-workerpool.mdx    | 9 ---------
 src/pages/docs/octopus-rest-api/octopus-cli/complete.md  | 9 ---------
 .../octopus-cli/create-autodeployoverride.md             | 9 ---------
 .../docs/octopus-rest-api/octopus-cli/create-channel.md  | 9 ---------
 .../octopus-rest-api/octopus-cli/create-environment.md   | 9 ---------
 .../docs/octopus-rest-api/octopus-cli/create-project.md  | 9 ---------
 .../docs/octopus-rest-api/octopus-cli/create-release.md  | 9 ---------
 .../octopus-rest-api/octopus-cli/create-workerpool.mdx   | 9 ---------
 .../octopus-cli/delete-autodeployoverride.md             | 9 ---------
 .../docs/octopus-rest-api/octopus-cli/delete-package.md  | 9 ---------
 .../docs/octopus-rest-api/octopus-cli/delete-project.md  | 9 ---------
 .../octopus-rest-api/octopus-cli/delete-releases.mdx     | 9 ---------
 .../docs/octopus-rest-api/octopus-cli/deploy-release.md  | 9 ---------
 .../docs/octopus-rest-api/octopus-cli/disable-project.md | 9 ---------
 .../octopus-rest-api/octopus-cli/dump-deployments.mdx    | 9 ---------
 src/pages/docs/octopus-rest-api/octopus-cli/export.md    | 9 ---------
 .../octopus-rest-api/octopus-cli/formatted-output.md     | 9 ---------
 src/pages/docs/octopus-rest-api/octopus-cli/import.md    | 9 ---------
 .../octopus-cli/install-autocomplete.mdx                 | 9 ---------
 .../octopus-rest-api/octopus-cli/install-global-tool.md  | 9 ---------
 .../octopus-rest-api/octopus-cli/list-deployments.mdx    | 9 ---------
 .../octopus-rest-api/octopus-cli/list-environments.mdx   | 9 ---------
 .../octopus-cli/list-latestdeployments.mdx               | 9 ---------
 .../docs/octopus-rest-api/octopus-cli/list-machines.mdx  | 9 ---------
 .../docs/octopus-rest-api/octopus-cli/list-projects.md   | 9 ---------
 .../docs/octopus-rest-api/octopus-cli/list-releases.mdx  | 9 ---------
 .../docs/octopus-rest-api/octopus-cli/list-tenants.mdx   | 9 ---------
 .../octopus-rest-api/octopus-cli/list-workerpools.mdx    | 9 ---------
 .../docs/octopus-rest-api/octopus-cli/list-workers.mdx   | 9 ---------
 src/pages/docs/octopus-rest-api/octopus-cli/pack.md      | 9 ---------
 .../octopus-cli/prevent-releaseprogression.md            | 9 ---------
 .../docs/octopus-rest-api/octopus-cli/promote-release.md | 9 ---------
 .../docs/octopus-rest-api/octopus-cli/push-metadata.md   | 9 ---------
 src/pages/docs/octopus-rest-api/octopus-cli/push.md      | 9 ---------
 .../docs/octopus-rest-api/octopus-cli/run-runbook.md     | 9 ---------
 src/pages/docs/octopus-rest-api/octopus-cli/version.md   | 9 ---------
 381 files changed, 3429 deletions(-)
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-aws-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-aws-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-aws.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-azure-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-azure-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-azure.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-delete.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-gcp-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-gcp-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-gcp.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-ssh-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-ssh-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-ssh.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-token-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-token-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-token.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-username-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-username-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account-username.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-account.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-api.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-build-information-bulk-delete.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-build-information-delete.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-build-information-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-build-information-upload.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-build-information-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-build-information.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-channel-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-channel-delete.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-channel-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-channel-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-channel.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-config-get.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-config-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-config-set.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-config.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-delete.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-deployment-target.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-environment-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-environment-delete.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-environment-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-environment-tag.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-environment.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-deprovision-environment.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-deprovision-project.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-login.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-logout.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-package-delete.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-package-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-package-nuget-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-package-nuget.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-package-upload.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-package-versions.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-package-zip-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-package-zip.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-package.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-branch-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-branch-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-branch.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-clone.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-connect.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-convert.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-delete.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-disable.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-disconnect.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-enable.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-group-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-group-delete.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-group-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-group-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-group.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-tag.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-variables-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-variables-delete.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-variables-exclude.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-variables-include.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-variables-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-variables-update.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-variables-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-variables.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-project.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-release-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-release-delete.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-release-deploy.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-release-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-release-progression-allow.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-release-progression-prevent.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-release-progression.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-release.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-runbook-delete.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-runbook-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-runbook-run.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-publish.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-runbook.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-space-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-space-delete.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-space-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-space-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-space.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-task-wait.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-task.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-tenant-clone.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-tenant-connect.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-tenant-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-tenant-delete.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-tenant-disable.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-tenant-disconnect.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-tenant-enable.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-tenant-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-tenant-tag.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables-update.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-tenant-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-tenant.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-user-delete.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-user-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-user.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-delete.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-delete.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-pool.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-create.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-list.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker-view.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus-worker.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_aws.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_aws_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_aws_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_azure.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_azure_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_azure_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_delete.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_gcp.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_gcp_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_gcp_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_ssh.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_ssh_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_ssh_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_token.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_token_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_token_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_username.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_username_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_account_username_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_config.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_config_get.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_config_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_config_set.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_view.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_view.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_delete.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_view.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_view.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle_view.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_view.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_view.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_environment.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_environment_delete.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_environment_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_package.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_package_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_package_upload.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_package_versions.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_project-group.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_project-group_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_project-group_delete.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_project-group_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_project-group_view.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_project.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_project_connect.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_project_convert.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_project_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_project_delete.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_project_disconnect.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_project_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_project_view.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_release.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_release_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_release_delete.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_release_deploy.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_release_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_runbook.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_runbook_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_runbook_run.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_space.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_space_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_space_delete.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_space_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_space_view.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_task.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_task_wait.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_tenant.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_tenant_clone.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_tenant_connect.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_tenant_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_tenant_delete.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_tenant_disconnect.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_tenant_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_tenant_tag.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_tenant_view.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_user.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_user_delete.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_user_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker-pool.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_delete.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic_view.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static_view.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_view.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker_delete.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_view.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle_view.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_create.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_list.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_view.md
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/octopus_worker_view.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/build-information.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/clean-environment.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/clean-workerpool.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/create-autodeployoverride.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/create-channel.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/create-environment.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/create-project.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/create-release.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/create-workerpool.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/delete-autodeployoverride.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/delete-releases.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/deploy-release.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/dump-deployments.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/export.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/formatted-output.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/import.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/index.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/install-global-tool.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/list-deployments.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/list-environments.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/list-latestdeployments.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/list-machines.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/list-projects.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/list-releases.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/list-tenants.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/list-workerpools.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/list-workers.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/pack.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/promote-release.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/push-metadata.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/push.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octo.exe-command-line/version.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/allow-releaseprogression.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/build-information.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/clean-environment.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/clean-workerpool.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/complete.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/create-autodeployoverride.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/create-channel.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/create-environment.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/create-project.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/create-release.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/create-workerpool.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/delete-autodeployoverride.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/delete-package.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/delete-project.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/delete-releases.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/deploy-release.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/disable-project.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/dump-deployments.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/export.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/formatted-output.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/import.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/install-autocomplete.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/install-global-tool.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/list-deployments.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/list-environments.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/list-latestdeployments.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/list-machines.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/list-projects.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/list-releases.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/list-tenants.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/list-workerpools.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/list-workers.mdx
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/pack.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/prevent-releaseprogression.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/promote-release.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/push-metadata.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/push.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/run-runbook.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/version.md

diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-aws-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-aws-create.mdx
deleted file mode 100644
index 4fbbcf863d..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-aws-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-aws-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-aws-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-aws-list.mdx
deleted file mode 100644
index c6a5a07690..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-aws-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-aws-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-aws.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-aws.mdx
deleted file mode 100644
index f18252915f..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-aws.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-aws
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-create.mdx
deleted file mode 100644
index 41d8461a2a..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-azure-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-list.mdx
deleted file mode 100644
index 5e6a7e7909..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-azure-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc-create.mdx
deleted file mode 100644
index e900c2f3df..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-azure-oidc-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc-list.mdx
deleted file mode 100644
index 7bd42ee8c6..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-azure-oidc-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc.mdx
deleted file mode 100644
index fce9a9cd28..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure-oidc.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-azure-oidc
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-azure.mdx
deleted file mode 100644
index f9ccf62f8a..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-azure.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-azure
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-create.mdx
deleted file mode 100644
index 7b2e734c0e..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-delete.mdx
deleted file mode 100644
index 6b8dc2faf2..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-delete.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp-create.mdx
deleted file mode 100644
index a2697ce38f..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-gcp-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp-list.mdx
deleted file mode 100644
index 9920174af9..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-gcp-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp.mdx
deleted file mode 100644
index 091bb9d56e..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-gcp.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-gcp
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc-create.mdx
deleted file mode 100644
index f3efcfe6f9..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-generic-oidc-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc-list.mdx
deleted file mode 100644
index 38b8ba5b32..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-generic-oidc-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc.mdx
deleted file mode 100644
index 725d78beba..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-generic-oidc.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-generic-oidc
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-list.mdx
deleted file mode 100644
index f82b1ffccd..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh-create.mdx
deleted file mode 100644
index b70bd47d59..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-ssh-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh-list.mdx
deleted file mode 100644
index 1235a41ab3..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-ssh-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh.mdx
deleted file mode 100644
index 00a5ecfbe8..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-ssh.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-ssh
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-token-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-token-create.mdx
deleted file mode 100644
index 6a4654d51b..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-token-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-token-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-token-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-token-list.mdx
deleted file mode 100644
index 49d66d2d2b..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-token-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-token-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-token.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-token.mdx
deleted file mode 100644
index bfb3f81d0b..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-token.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-token
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-username-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-username-create.mdx
deleted file mode 100644
index e108f7420c..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-username-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-username-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-username-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-username-list.mdx
deleted file mode 100644
index 3a7b88ace5..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-username-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-username-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account-username.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account-username.mdx
deleted file mode 100644
index 6f837ecee3..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account-username.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-username
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-account.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-account.mdx
deleted file mode 100644
index b7d5caf15b..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-account.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-api.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-api.mdx
deleted file mode 100644
index 3dced63487..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-api.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-api
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-bulk-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-build-information-bulk-delete.mdx
deleted file mode 100644
index c4e3897ce5..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-bulk-delete.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-build-information-bulk-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-build-information-delete.mdx
deleted file mode 100644
index 8e8d2497f9..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-delete.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-build-information-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-build-information-list.mdx
deleted file mode 100644
index 4a2a15af1e..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-build-information-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-upload.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-build-information-upload.mdx
deleted file mode 100644
index 5bcf8791de..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-upload.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-build-information-upload
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-build-information-view.mdx
deleted file mode 100644
index 3f20c74768..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-build-information-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-build-information-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-build-information.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-build-information.mdx
deleted file mode 100644
index e52da5debc..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-build-information.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-build-information
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-channel-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-channel-create.mdx
deleted file mode 100644
index 69f7b6945d..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-channel-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-channel-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-channel-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-channel-delete.mdx
deleted file mode 100644
index c1606b2aef..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-channel-delete.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-channel-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-channel-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-channel-list.mdx
deleted file mode 100644
index ba620474a4..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-channel-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-channel-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-channel-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-channel-view.mdx
deleted file mode 100644
index 66986723c5..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-channel-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-channel-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-channel.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-channel.mdx
deleted file mode 100644
index 6c3b9656a5..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-channel.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-channel
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-config-get.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-config-get.mdx
deleted file mode 100644
index e1a6dd5ea7..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-config-get.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-config-get
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-config-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-config-list.mdx
deleted file mode 100644
index 8735854bcb..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-config-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-config-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-config-set.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-config-set.mdx
deleted file mode 100644
index 2772e238ee..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-config-set.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-config-set
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-config.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-config.mdx
deleted file mode 100644
index 343ac600e7..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-config.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-config
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-create.mdx
deleted file mode 100644
index 26d684fe60..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-azure-web-app-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-list.mdx
deleted file mode 100644
index 3c4b3c5edc..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-azure-web-app-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-view.mdx
deleted file mode 100644
index bba4862730..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-azure-web-app-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app.mdx
deleted file mode 100644
index fabb23a197..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-azure-web-app.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-azure-web-app
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-create.mdx
deleted file mode 100644
index 06cb431fa5..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-cloud-region-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-list.mdx
deleted file mode 100644
index 660d77d109..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-cloud-region-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-view.mdx
deleted file mode 100644
index 9035a4b9dd..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-cloud-region-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region.mdx
deleted file mode 100644
index 907d7e6549..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-cloud-region.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-cloud-region
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-delete.mdx
deleted file mode 100644
index ed1b75d8e8..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-delete.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-create.mdx
deleted file mode 100644
index a32cd29a71..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-kubernetes-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-list.mdx
deleted file mode 100644
index 2cabaf1905..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-kubernetes-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-view.mdx
deleted file mode 100644
index 586840b470..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-kubernetes-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes.mdx
deleted file mode 100644
index 009a802754..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-kubernetes.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-kubernetes
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-list.mdx
deleted file mode 100644
index 6268b60155..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-create.mdx
deleted file mode 100644
index 2eb3dda767..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-listening-tentacle-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-list.mdx
deleted file mode 100644
index 4fff271d14..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-listening-tentacle-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-view.mdx
deleted file mode 100644
index 335da0b9c6..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-listening-tentacle-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle.mdx
deleted file mode 100644
index acdc2d77bf..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-listening-tentacle.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-listening-tentacle
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-list.mdx
deleted file mode 100644
index de1597b265..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-polling-tentacle-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-view.mdx
deleted file mode 100644
index b691b9fc00..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-polling-tentacle-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle.mdx
deleted file mode 100644
index c679701957..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-polling-tentacle.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-polling-tentacle
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-create.mdx
deleted file mode 100644
index 8d1ee4770c..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-ssh-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-list.mdx
deleted file mode 100644
index 88c7b6c456..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-ssh-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-view.mdx
deleted file mode 100644
index e790b4847a..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-ssh-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh.mdx
deleted file mode 100644
index 64c075b0bc..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-ssh.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-ssh
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-view.mdx
deleted file mode 100644
index d7efc33a1e..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target.mdx
deleted file mode 100644
index ab3c3e8a43..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-deployment-target.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-environment-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-environment-create.mdx
deleted file mode 100644
index a87b6a2833..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-environment-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-environment-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-environment-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-environment-delete.mdx
deleted file mode 100644
index 1045077c01..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-environment-delete.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-environment-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-environment-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-environment-list.mdx
deleted file mode 100644
index c8dc679aad..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-environment-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-environment-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-environment-tag.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-environment-tag.mdx
deleted file mode 100644
index 2949651000..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-environment-tag.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-environment-tag
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-environment.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-environment.mdx
deleted file mode 100644
index 12dd675cf9..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-environment.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-environment
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-create.mdx
deleted file mode 100644
index 08407a222d..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-ephemeral-environment-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-deprovision-environment.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-deprovision-environment.mdx
deleted file mode 100644
index b223cb5d49..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-deprovision-environment.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-ephemeral-environment-deprovision-environment
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-deprovision-project.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-deprovision-project.mdx
deleted file mode 100644
index 889b2139da..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment-deprovision-project.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-ephemeral-environment-deprovision-project
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment.mdx
deleted file mode 100644
index 255829d3e0..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-ephemeral-environment.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-ephemeral-environment
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-login.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-login.mdx
deleted file mode 100644
index e3c8f94c6f..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-login.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-login
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-logout.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-logout.mdx
deleted file mode 100644
index e020d3d2ed..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-logout.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-logout
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-package-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-package-delete.mdx
deleted file mode 100644
index 4ecc9ad383..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-package-delete.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-package-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-package-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-package-list.mdx
deleted file mode 100644
index e564c52109..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-package-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-package-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-package-nuget-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-package-nuget-create.mdx
deleted file mode 100644
index eca0b8e860..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-package-nuget-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-package-nuget-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-package-nuget.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-package-nuget.mdx
deleted file mode 100644
index 51c6ca02e6..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-package-nuget.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-package-nuget
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-package-upload.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-package-upload.mdx
deleted file mode 100644
index 11fa8f5869..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-package-upload.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-package-upload
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-package-versions.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-package-versions.mdx
deleted file mode 100644
index a2c29b78fd..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-package-versions.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-package-versions
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-package-zip-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-package-zip-create.mdx
deleted file mode 100644
index 3bbd05ae7f..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-package-zip-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-package-zip-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-package-zip.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-package-zip.mdx
deleted file mode 100644
index 88bf3ae317..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-package-zip.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-package-zip
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-package.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-package.mdx
deleted file mode 100644
index 5dd018cff0..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-package.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-package
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-branch-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-branch-create.mdx
deleted file mode 100644
index ffd68e831b..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-branch-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-branch-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-branch-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-branch-list.mdx
deleted file mode 100644
index d7d465f93e..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-branch-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-branch-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-branch.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-branch.mdx
deleted file mode 100644
index e791b3ee57..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-branch.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-branch
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-clone.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-clone.mdx
deleted file mode 100644
index b07bcf8d4a..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-clone.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-clone
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-connect.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-connect.mdx
deleted file mode 100644
index 0a5c833322..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-connect.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-connect
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-convert.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-convert.mdx
deleted file mode 100644
index 89e4907116..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-convert.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-convert
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-create.mdx
deleted file mode 100644
index ba1bcf1da9..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-delete.mdx
deleted file mode 100644
index 7e6a7154f9..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-delete.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-disable.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-disable.mdx
deleted file mode 100644
index 75d302a281..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-disable.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-disable
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-disconnect.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-disconnect.mdx
deleted file mode 100644
index 7a417e2d30..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-disconnect.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-disconnect
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-enable.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-enable.mdx
deleted file mode 100644
index a853e50f7d..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-enable.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-enable
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-group-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-group-create.mdx
deleted file mode 100644
index b387ecaeac..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-group-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-group-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-group-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-group-delete.mdx
deleted file mode 100644
index 8d546dfff0..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-group-delete.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-group-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-group-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-group-list.mdx
deleted file mode 100644
index f2be546ab5..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-group-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-group-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-group-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-group-view.mdx
deleted file mode 100644
index 49c9f978a5..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-group-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-group-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-group.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-group.mdx
deleted file mode 100644
index b012147f49..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-group.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-group
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-list.mdx
deleted file mode 100644
index c9073910a8..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-tag.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-tag.mdx
deleted file mode 100644
index 2f174b89ec..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-tag.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-tag
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-create.mdx
deleted file mode 100644
index c7fb5b958a..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-variables-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-delete.mdx
deleted file mode 100644
index 070879482d..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-delete.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-variables-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-exclude.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-exclude.mdx
deleted file mode 100644
index ea0b327a8e..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-exclude.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-variables-exclude
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-include.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-include.mdx
deleted file mode 100644
index 6fc4999309..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-include.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-variables-include
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-list.mdx
deleted file mode 100644
index 0544be5484..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-variables-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-update.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-update.mdx
deleted file mode 100644
index 68ca6c6ef5..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-update.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-variables-update
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-view.mdx
deleted file mode 100644
index 06348acdc5..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-variables-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-variables.mdx
deleted file mode 100644
index cd800f142c..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-variables.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-variables
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project-view.mdx
deleted file mode 100644
index 5efeb0c1f6..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-project.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-project.mdx
deleted file mode 100644
index ef92c8a859..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-project.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-release-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-release-create.mdx
deleted file mode 100644
index 227733f69c..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-release-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-release-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-release-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-release-delete.mdx
deleted file mode 100644
index 0b16ee5527..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-release-delete.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-release-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-release-deploy.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-release-deploy.mdx
deleted file mode 100644
index 7235de1260..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-release-deploy.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-release-deploy
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-release-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-release-list.mdx
deleted file mode 100644
index 0fd43c6ad8..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-release-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-release-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-release-progression-allow.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-release-progression-allow.mdx
deleted file mode 100644
index 12a426b89b..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-release-progression-allow.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-release-progression-allow
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-release-progression-prevent.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-release-progression-prevent.mdx
deleted file mode 100644
index 42f671009b..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-release-progression-prevent.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-release-progression-prevent
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-release-progression.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-release-progression.mdx
deleted file mode 100644
index 67c4c36250..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-release-progression.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-release-progression
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-release.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-release.mdx
deleted file mode 100644
index 73644a0e87..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-release.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-release
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-delete.mdx
deleted file mode 100644
index 9bd1a70e1e..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-delete.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-runbook-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-list.mdx
deleted file mode 100644
index 1d643a7096..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-runbook-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-run.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-run.mdx
deleted file mode 100644
index 2df85fab43..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-run.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-runbook-run
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-create.mdx
deleted file mode 100644
index 0fbc0f4891..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-runbook-snapshot-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-list.mdx
deleted file mode 100644
index 3bb3f696c1..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-runbook-snapshot-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-publish.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-publish.mdx
deleted file mode 100644
index 85a487fb48..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot-publish.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-runbook-snapshot-publish
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot.mdx
deleted file mode 100644
index 2973ccd91f..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-runbook-snapshot.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-runbook-snapshot
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-runbook.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-runbook.mdx
deleted file mode 100644
index 37ff9365e3..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-runbook.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-runbook
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-space-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-space-create.mdx
deleted file mode 100644
index b272c30aa7..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-space-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-space-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-space-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-space-delete.mdx
deleted file mode 100644
index 12969ac4e9..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-space-delete.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-space-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-space-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-space-list.mdx
deleted file mode 100644
index 235ef560e6..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-space-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-space-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-space-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-space-view.mdx
deleted file mode 100644
index 18d2c6dc0b..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-space-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-space-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-space.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-space.mdx
deleted file mode 100644
index a2b0f0e188..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-space.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-space
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-task-wait.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-task-wait.mdx
deleted file mode 100644
index 8861e15d78..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-task-wait.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-task-wait
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-task.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-task.mdx
deleted file mode 100644
index d96482a5af..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-task.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-task
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-clone.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-clone.mdx
deleted file mode 100644
index ec0ef5e3cf..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-clone.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-clone
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-connect.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-connect.mdx
deleted file mode 100644
index 753d94b59b..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-connect.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-connect
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-create.mdx
deleted file mode 100644
index b89413ce8c..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-delete.mdx
deleted file mode 100644
index bb2c7c25c7..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-delete.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-disable.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-disable.mdx
deleted file mode 100644
index 6ba3b2d681..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-disable.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-disable
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-disconnect.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-disconnect.mdx
deleted file mode 100644
index 21d122ecc6..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-disconnect.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-disconnect
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-enable.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-enable.mdx
deleted file mode 100644
index f3565f5d3e..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-enable.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-enable
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-list.mdx
deleted file mode 100644
index 6b5389a642..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-tag.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-tag.mdx
deleted file mode 100644
index a52218b67c..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-tag.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-tag
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables-list.mdx
deleted file mode 100644
index ef1fc49e79..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-variables-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables-update.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables-update.mdx
deleted file mode 100644
index 4bdac655e8..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables-update.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-variables-update
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables.mdx
deleted file mode 100644
index da0b0584c5..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-variables.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-variables
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant-view.mdx
deleted file mode 100644
index b093e7a79f..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-tenant.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-tenant.mdx
deleted file mode 100644
index 6e2cff10c7..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-tenant.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-user-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-user-delete.mdx
deleted file mode 100644
index 04a862342d..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-user-delete.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-user-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-user-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-user-list.mdx
deleted file mode 100644
index e7b056c25e..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-user-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-user-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-user.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-user.mdx
deleted file mode 100644
index 3acf19889e..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-user.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-user
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-delete.mdx
deleted file mode 100644
index bc5f2e37c6..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-delete.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-list.mdx
deleted file mode 100644
index 83ba701c23..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-create.mdx
deleted file mode 100644
index 19fefdd1f2..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-listening-tentacle-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-list.mdx
deleted file mode 100644
index 8b1a874338..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-listening-tentacle-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-view.mdx
deleted file mode 100644
index ee27f0d3bb..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-listening-tentacle-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle.mdx
deleted file mode 100644
index e593809815..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-listening-tentacle.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-listening-tentacle
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-list.mdx
deleted file mode 100644
index f0c0c08182..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-polling-tentacle-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-view.mdx
deleted file mode 100644
index 308f816dfd..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-polling-tentacle-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle.mdx
deleted file mode 100644
index 0063366fbf..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-polling-tentacle.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-polling-tentacle
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-delete.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-delete.mdx
deleted file mode 100644
index e8c50cd24c..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-delete.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-create.mdx
deleted file mode 100644
index 884b022dc9..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool-dynamic-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-view.mdx
deleted file mode 100644
index da95d9de5d..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool-dynamic-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic.mdx
deleted file mode 100644
index abdf1985ba..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-dynamic.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool-dynamic
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-list.mdx
deleted file mode 100644
index 513f552885..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static-create.mdx
deleted file mode 100644
index ca51e616cb..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool-static-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static-view.mdx
deleted file mode 100644
index fa8723ab0b..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool-static-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static.mdx
deleted file mode 100644
index 96cae60e0e..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-static.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool-static
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-view.mdx
deleted file mode 100644
index b6661c93b8..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool.mdx
deleted file mode 100644
index cf5e422625..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-pool.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-create.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-create.mdx
deleted file mode 100644
index 50bfc28b4c..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-create.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-ssh-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-list.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-list.mdx
deleted file mode 100644
index 499d4b883e..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-list.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-ssh-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-view.mdx
deleted file mode 100644
index 3663dcb836..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-ssh-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh.mdx
deleted file mode 100644
index 6ed3cf8f6c..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-ssh.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-ssh
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker-view.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker-view.mdx
deleted file mode 100644
index 09e772182f..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker-view.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus-worker.mdx b/src/pages/docs/octopus-rest-api/cli/octopus-worker.mdx
deleted file mode 100644
index f1b439b799..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus-worker.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus.mdx b/src/pages/docs/octopus-rest-api/cli/octopus.mdx
deleted file mode 100644
index 93870b63c6..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account.md b/src/pages/docs/octopus-rest-api/cli/octopus_account.md
deleted file mode 100644
index b7d5caf15b..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_aws.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_aws.md
deleted file mode 100644
index f18252915f..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_aws.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-aws
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_aws_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_aws_create.md
deleted file mode 100644
index 4fbbcf863d..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_aws_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-aws-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_aws_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_aws_list.md
deleted file mode 100644
index c6a5a07690..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_aws_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-aws-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_azure.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_azure.md
deleted file mode 100644
index f9ccf62f8a..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_azure.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-azure
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_azure_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_azure_create.md
deleted file mode 100644
index 41d8461a2a..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_azure_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-azure-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_azure_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_azure_list.md
deleted file mode 100644
index 5e6a7e7909..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_azure_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-azure-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_create.md
deleted file mode 100644
index 7b2e734c0e..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_delete.md
deleted file mode 100644
index 6b8dc2faf2..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_delete.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp.md
deleted file mode 100644
index 091bb9d56e..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-gcp
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp_create.md
deleted file mode 100644
index a2697ce38f..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-gcp-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp_list.md
deleted file mode 100644
index 9920174af9..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_gcp_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-gcp-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_list.md
deleted file mode 100644
index f82b1ffccd..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh.md
deleted file mode 100644
index 00a5ecfbe8..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-ssh
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh_create.md
deleted file mode 100644
index b70bd47d59..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-ssh-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh_list.md
deleted file mode 100644
index 1235a41ab3..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_ssh_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-ssh-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_token.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_token.md
deleted file mode 100644
index bfb3f81d0b..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_token.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-token
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_token_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_token_create.md
deleted file mode 100644
index 6a4654d51b..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_token_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-token-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_token_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_token_list.md
deleted file mode 100644
index 49d66d2d2b..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_token_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-token-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_username.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_username.md
deleted file mode 100644
index 6f837ecee3..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_username.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-username
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_username_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_username_create.md
deleted file mode 100644
index e108f7420c..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_username_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-username-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_account_username_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_account_username_list.md
deleted file mode 100644
index 3a7b88ace5..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_account_username_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-account-username-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_config.md b/src/pages/docs/octopus-rest-api/cli/octopus_config.md
deleted file mode 100644
index 343ac600e7..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_config.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-config
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_config_get.md b/src/pages/docs/octopus-rest-api/cli/octopus_config_get.md
deleted file mode 100644
index e1a6dd5ea7..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_config_get.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-config-get
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_config_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_config_list.md
deleted file mode 100644
index 8735854bcb..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_config_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-config-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_config_set.md b/src/pages/docs/octopus-rest-api/cli/octopus_config_set.md
deleted file mode 100644
index 2772e238ee..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_config_set.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-config-set
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target.md
deleted file mode 100644
index ab3c3e8a43..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app.md
deleted file mode 100644
index fabb23a197..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-azure-web-app
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_create.md
deleted file mode 100644
index 26d684fe60..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-azure-web-app-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_list.md
deleted file mode 100644
index 3c4b3c5edc..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-azure-web-app-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_view.md
deleted file mode 100644
index bba4862730..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_azure-web-app_view.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-azure-web-app-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region.md
deleted file mode 100644
index 907d7e6549..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-cloud-region
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_create.md
deleted file mode 100644
index 06cb431fa5..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-cloud-region-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_list.md
deleted file mode 100644
index 660d77d109..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-cloud-region-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_view.md
deleted file mode 100644
index 9035a4b9dd..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_cloud-region_view.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-cloud-region-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_delete.md
deleted file mode 100644
index ed1b75d8e8..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_delete.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes.md
deleted file mode 100644
index 009a802754..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-kubernetes
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_create.md
deleted file mode 100644
index a32cd29a71..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-kubernetes-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_list.md
deleted file mode 100644
index 2cabaf1905..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-kubernetes-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_view.md
deleted file mode 100644
index 586840b470..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_kubernetes_view.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-kubernetes-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_list.md
deleted file mode 100644
index 6268b60155..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle.md
deleted file mode 100644
index acdc2d77bf..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-listening-tentacle
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_create.md
deleted file mode 100644
index 2eb3dda767..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-listening-tentacle-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_list.md
deleted file mode 100644
index 4fff271d14..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-listening-tentacle-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_view.md
deleted file mode 100644
index 335da0b9c6..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_listening-tentacle_view.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-listening-tentacle-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle.md
deleted file mode 100644
index c679701957..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-polling-tentacle
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle_list.md
deleted file mode 100644
index de1597b265..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-polling-tentacle-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle_view.md
deleted file mode 100644
index b691b9fc00..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_polling-tentacle_view.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-polling-tentacle-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh.md
deleted file mode 100644
index 64c075b0bc..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-ssh
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_create.md
deleted file mode 100644
index 8d1ee4770c..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-ssh-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_list.md
deleted file mode 100644
index 88c7b6c456..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-ssh-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_view.md
deleted file mode 100644
index e790b4847a..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_ssh_view.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-ssh-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_view.md
deleted file mode 100644
index d7efc33a1e..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_deployment-target_view.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-deployment-target-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_environment.md b/src/pages/docs/octopus-rest-api/cli/octopus_environment.md
deleted file mode 100644
index 12dd675cf9..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_environment.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-environment
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_environment_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_environment_delete.md
deleted file mode 100644
index 1045077c01..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_environment_delete.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-environment-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_environment_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_environment_list.md
deleted file mode 100644
index c8dc679aad..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_environment_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-environment-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_package.md b/src/pages/docs/octopus-rest-api/cli/octopus_package.md
deleted file mode 100644
index 5dd018cff0..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_package.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-package
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_package_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_package_list.md
deleted file mode 100644
index e564c52109..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_package_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-package-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_package_upload.md b/src/pages/docs/octopus-rest-api/cli/octopus_package_upload.md
deleted file mode 100644
index 11fa8f5869..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_package_upload.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-package-upload
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_package_versions.md b/src/pages/docs/octopus-rest-api/cli/octopus_package_versions.md
deleted file mode 100644
index a2c29b78fd..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_package_versions.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-package-versions
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project-group.md b/src/pages/docs/octopus-rest-api/cli/octopus_project-group.md
deleted file mode 100644
index b012147f49..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project-group.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-group
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project-group_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_project-group_create.md
deleted file mode 100644
index b387ecaeac..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project-group_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-group-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project-group_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_project-group_delete.md
deleted file mode 100644
index 8d546dfff0..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project-group_delete.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-group-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project-group_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_project-group_list.md
deleted file mode 100644
index f2be546ab5..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project-group_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-group-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project-group_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_project-group_view.md
deleted file mode 100644
index 49c9f978a5..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project-group_view.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-group-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project.md b/src/pages/docs/octopus-rest-api/cli/octopus_project.md
deleted file mode 100644
index ef92c8a859..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project_connect.md b/src/pages/docs/octopus-rest-api/cli/octopus_project_connect.md
deleted file mode 100644
index 0a5c833322..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project_connect.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-connect
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project_convert.md b/src/pages/docs/octopus-rest-api/cli/octopus_project_convert.md
deleted file mode 100644
index 89e4907116..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project_convert.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-convert
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_project_create.md
deleted file mode 100644
index ba1bcf1da9..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_project_delete.md
deleted file mode 100644
index 7e6a7154f9..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project_delete.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project_disconnect.md b/src/pages/docs/octopus-rest-api/cli/octopus_project_disconnect.md
deleted file mode 100644
index 7a417e2d30..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project_disconnect.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-disconnect
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_project_list.md
deleted file mode 100644
index c9073910a8..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_project_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_project_view.md
deleted file mode 100644
index 5efeb0c1f6..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_project_view.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-project-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_release.md b/src/pages/docs/octopus-rest-api/cli/octopus_release.md
deleted file mode 100644
index 73644a0e87..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_release.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-release
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_release_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_release_create.md
deleted file mode 100644
index 227733f69c..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_release_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-release-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_release_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_release_delete.md
deleted file mode 100644
index 0b16ee5527..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_release_delete.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-release-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_release_deploy.md b/src/pages/docs/octopus-rest-api/cli/octopus_release_deploy.md
deleted file mode 100644
index 7235de1260..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_release_deploy.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-release-deploy
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_release_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_release_list.md
deleted file mode 100644
index 0fd43c6ad8..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_release_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-release-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_runbook.md b/src/pages/docs/octopus-rest-api/cli/octopus_runbook.md
deleted file mode 100644
index 37ff9365e3..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_runbook.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-runbook
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_runbook_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_runbook_list.md
deleted file mode 100644
index 1d643a7096..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_runbook_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-runbook-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_runbook_run.md b/src/pages/docs/octopus-rest-api/cli/octopus_runbook_run.md
deleted file mode 100644
index 2df85fab43..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_runbook_run.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-runbook-run
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_space.md b/src/pages/docs/octopus-rest-api/cli/octopus_space.md
deleted file mode 100644
index a2b0f0e188..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_space.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-space
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_space_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_space_create.md
deleted file mode 100644
index b272c30aa7..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_space_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-space-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_space_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_space_delete.md
deleted file mode 100644
index 12969ac4e9..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_space_delete.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-space-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_space_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_space_list.md
deleted file mode 100644
index 235ef560e6..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_space_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-space-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_space_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_space_view.md
deleted file mode 100644
index 18d2c6dc0b..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_space_view.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-space-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_task.md b/src/pages/docs/octopus-rest-api/cli/octopus_task.md
deleted file mode 100644
index d96482a5af..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_task.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-task
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_task_wait.md b/src/pages/docs/octopus-rest-api/cli/octopus_task_wait.md
deleted file mode 100644
index 8861e15d78..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_task_wait.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-task-wait
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_tenant.md b/src/pages/docs/octopus-rest-api/cli/octopus_tenant.md
deleted file mode 100644
index 6e2cff10c7..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_tenant.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_clone.md b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_clone.md
deleted file mode 100644
index ec0ef5e3cf..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_clone.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-clone
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_connect.md b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_connect.md
deleted file mode 100644
index 753d94b59b..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_connect.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-connect
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_create.md
deleted file mode 100644
index b89413ce8c..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_delete.md
deleted file mode 100644
index bb2c7c25c7..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_delete.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_disconnect.md b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_disconnect.md
deleted file mode 100644
index 21d122ecc6..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_disconnect.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-disconnect
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_list.md
deleted file mode 100644
index 6b5389a642..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_tag.md b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_tag.md
deleted file mode 100644
index a52218b67c..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_tag.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-tag
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_tenant_view.md
deleted file mode 100644
index b093e7a79f..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_tenant_view.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-tenant-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_user.md b/src/pages/docs/octopus-rest-api/cli/octopus_user.md
deleted file mode 100644
index 3acf19889e..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_user.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-user
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_user_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_user_delete.md
deleted file mode 100644
index 04a862342d..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_user_delete.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-user-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_user_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_user_list.md
deleted file mode 100644
index e7b056c25e..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_user_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-user-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool.md
deleted file mode 100644
index cf5e422625..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_delete.md
deleted file mode 100644
index e8c50cd24c..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_delete.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic.md
deleted file mode 100644
index abdf1985ba..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool-dynamic
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic_create.md
deleted file mode 100644
index 884b022dc9..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool-dynamic-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic_view.md
deleted file mode 100644
index da95d9de5d..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_dynamic_view.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool-dynamic-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_list.md
deleted file mode 100644
index 513f552885..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static.md
deleted file mode 100644
index 96cae60e0e..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool-static
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static_create.md
deleted file mode 100644
index ca51e616cb..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool-static-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static_view.md
deleted file mode 100644
index fa8723ab0b..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_static_view.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool-static-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_view.md
deleted file mode 100644
index b6661c93b8..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker-pool_view.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-pool-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker.md
deleted file mode 100644
index f1b439b799..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_delete.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_delete.md
deleted file mode 100644
index bc5f2e37c6..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_delete.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-delete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_list.md
deleted file mode 100644
index 83ba701c23..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle.md
deleted file mode 100644
index e593809815..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-listening-tentacle
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_create.md
deleted file mode 100644
index 19fefdd1f2..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-listening-tentacle-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_list.md
deleted file mode 100644
index 8b1a874338..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-listening-tentacle-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_view.md
deleted file mode 100644
index ee27f0d3bb..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_listening-tentacle_view.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-listening-tentacle-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle.md
deleted file mode 100644
index 0063366fbf..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-polling-tentacle
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle_list.md
deleted file mode 100644
index f0c0c08182..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-polling-tentacle-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle_view.md
deleted file mode 100644
index 308f816dfd..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_polling-tentacle_view.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-polling-tentacle-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh.md
deleted file mode 100644
index 6ed3cf8f6c..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-ssh
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_create.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_create.md
deleted file mode 100644
index 50bfc28b4c..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_create.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-ssh-create
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_list.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_list.md
deleted file mode 100644
index 499d4b883e..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_list.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-ssh-list
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_view.md
deleted file mode 100644
index 3663dcb836..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_ssh_view.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-ssh-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/cli/octopus_worker_view.md b/src/pages/docs/octopus-rest-api/cli/octopus_worker_view.md
deleted file mode 100644
index 09e772182f..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/octopus_worker_view.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-worker-view
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/build-information.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/build-information.md
deleted file mode 100644
index 1507b01378..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/build-information.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/build-information
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/clean-environment.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/clean-environment.md
deleted file mode 100644
index 90acacef11..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/clean-environment.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/clean-environment
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/clean-workerpool.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/clean-workerpool.md
deleted file mode 100644
index b7a2aa2d92..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/clean-workerpool.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/clean-workerpool
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-autodeployoverride.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-autodeployoverride.md
deleted file mode 100644
index a726fe83a2..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-autodeployoverride.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-autodeployoverride
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-channel.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-channel.md
deleted file mode 100644
index a5dc611608..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-channel.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-channel
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-environment.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-environment.md
deleted file mode 100644
index 20b25bf5a2..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-environment.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-environment
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-project.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-project.md
deleted file mode 100644
index 29f58bba1b..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-project.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-project
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-release.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-release.md
deleted file mode 100644
index 0e37e5424a..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-release.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-release
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-workerpool.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-workerpool.md
deleted file mode 100644
index 64719c6641..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/create-workerpool.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-workerpool
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/delete-autodeployoverride.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/delete-autodeployoverride.md
deleted file mode 100644
index 0daa571716..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/delete-autodeployoverride.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/delete-autodeployoverride
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/delete-releases.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/delete-releases.md
deleted file mode 100644
index 934448f2f0..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/delete-releases.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/delete-releases
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/deploy-release.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/deploy-release.md
deleted file mode 100644
index abdf7b7e5d..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/deploy-release.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/deploy-release
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/dump-deployments.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/dump-deployments.md
deleted file mode 100644
index 3ed38b1b9f..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/dump-deployments.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/dump-deployments
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/export.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/export.md
deleted file mode 100644
index 81cf85b330..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/export.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/export
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/formatted-output.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/formatted-output.md
deleted file mode 100644
index b82253da68..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/formatted-output.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/formatted-output
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/import.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/import.md
deleted file mode 100644
index 837353206c..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/import.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/import
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/index.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/index.md
deleted file mode 100644
index 248236f205..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/install-global-tool.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/install-global-tool.md
deleted file mode 100644
index ba2b23769e..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/install-global-tool.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/install-global-tool
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-deployments.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-deployments.md
deleted file mode 100644
index 123370ef8e..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-deployments.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-deployments
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-environments.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-environments.md
deleted file mode 100644
index a499e2c41d..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-environments.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-environments
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-latestdeployments.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-latestdeployments.md
deleted file mode 100644
index 3129c1cf1b..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-latestdeployments.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-latestdeployments
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-machines.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-machines.md
deleted file mode 100644
index 4c5cb3a1f7..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-machines.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-machines
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-projects.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-projects.md
deleted file mode 100644
index 06ca504bc5..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-projects.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-projects
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-releases.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-releases.md
deleted file mode 100644
index 6e6fbde7b0..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-releases.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-releases
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-tenants.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-tenants.md
deleted file mode 100644
index a660388425..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-tenants.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-tenants
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-workerpools.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-workerpools.md
deleted file mode 100644
index 4261e02409..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-workerpools.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-workerpools
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-workers.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-workers.md
deleted file mode 100644
index ebc1989a9c..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/list-workers.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-workers
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/pack.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/pack.md
deleted file mode 100644
index c6e9f04366..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/pack.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/pack
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/promote-release.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/promote-release.md
deleted file mode 100644
index aec1efcf36..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/promote-release.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/promote-release
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/push-metadata.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/push-metadata.md
deleted file mode 100644
index 2fd6a8f9d2..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/push-metadata.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/push-metadata
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/push.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/push.md
deleted file mode 100644
index cc158e6143..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/push.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/push
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octo.exe-command-line/version.md b/src/pages/docs/octopus-rest-api/octo.exe-command-line/version.md
deleted file mode 100644
index 3ae3637afb..0000000000
--- a/src/pages/docs/octopus-rest-api/octo.exe-command-line/version.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/version
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/allow-releaseprogression.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/allow-releaseprogression.mdx
deleted file mode 100644
index 2080c6d76b..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/allow-releaseprogression.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/allow-releaseprogression
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/build-information.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/build-information.mdx
deleted file mode 100644
index 1507b01378..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/build-information.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/build-information
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/clean-environment.md b/src/pages/docs/octopus-rest-api/octopus-cli/clean-environment.md
deleted file mode 100644
index 90acacef11..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/clean-environment.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/clean-environment
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/clean-workerpool.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/clean-workerpool.mdx
deleted file mode 100644
index b7a2aa2d92..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/clean-workerpool.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/clean-workerpool
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/complete.md b/src/pages/docs/octopus-rest-api/octopus-cli/complete.md
deleted file mode 100644
index 63b2b00e4c..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/complete.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/complete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/create-autodeployoverride.md b/src/pages/docs/octopus-rest-api/octopus-cli/create-autodeployoverride.md
deleted file mode 100644
index a726fe83a2..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/create-autodeployoverride.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-autodeployoverride
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/create-channel.md b/src/pages/docs/octopus-rest-api/octopus-cli/create-channel.md
deleted file mode 100644
index a5dc611608..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/create-channel.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-channel
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/create-environment.md b/src/pages/docs/octopus-rest-api/octopus-cli/create-environment.md
deleted file mode 100644
index 20b25bf5a2..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/create-environment.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-environment
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/create-project.md b/src/pages/docs/octopus-rest-api/octopus-cli/create-project.md
deleted file mode 100644
index 29f58bba1b..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/create-project.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-project
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/create-release.md b/src/pages/docs/octopus-rest-api/octopus-cli/create-release.md
deleted file mode 100644
index 0e37e5424a..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/create-release.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-release
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/create-workerpool.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/create-workerpool.mdx
deleted file mode 100644
index 64719c6641..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/create-workerpool.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-workerpool
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/delete-autodeployoverride.md b/src/pages/docs/octopus-rest-api/octopus-cli/delete-autodeployoverride.md
deleted file mode 100644
index 0daa571716..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/delete-autodeployoverride.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/delete-autodeployoverride
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/delete-package.md b/src/pages/docs/octopus-rest-api/octopus-cli/delete-package.md
deleted file mode 100644
index 190f360dd4..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/delete-package.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/delete-package
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/delete-project.md b/src/pages/docs/octopus-rest-api/octopus-cli/delete-project.md
deleted file mode 100644
index ea4a90512a..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/delete-project.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/delete-project
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/delete-releases.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/delete-releases.mdx
deleted file mode 100644
index 934448f2f0..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/delete-releases.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/delete-releases
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/deploy-release.md b/src/pages/docs/octopus-rest-api/octopus-cli/deploy-release.md
deleted file mode 100644
index abdf7b7e5d..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/deploy-release.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/deploy-release
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/disable-project.md b/src/pages/docs/octopus-rest-api/octopus-cli/disable-project.md
deleted file mode 100644
index 2436403e3a..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/disable-project.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/disable-project
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/dump-deployments.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/dump-deployments.mdx
deleted file mode 100644
index 3ed38b1b9f..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/dump-deployments.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/dump-deployments
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/export.md b/src/pages/docs/octopus-rest-api/octopus-cli/export.md
deleted file mode 100644
index 81cf85b330..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/export.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/export
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/formatted-output.md b/src/pages/docs/octopus-rest-api/octopus-cli/formatted-output.md
deleted file mode 100644
index b82253da68..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/formatted-output.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/formatted-output
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/import.md b/src/pages/docs/octopus-rest-api/octopus-cli/import.md
deleted file mode 100644
index 837353206c..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/import.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/import
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/install-autocomplete.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/install-autocomplete.mdx
deleted file mode 100644
index 047bc18a19..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/install-autocomplete.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/install-autocomplete
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/install-global-tool.md b/src/pages/docs/octopus-rest-api/octopus-cli/install-global-tool.md
deleted file mode 100644
index ba2b23769e..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/install-global-tool.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/install-global-tool
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/list-deployments.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/list-deployments.mdx
deleted file mode 100644
index 123370ef8e..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/list-deployments.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-deployments
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/list-environments.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/list-environments.mdx
deleted file mode 100644
index a499e2c41d..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/list-environments.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-environments
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/list-latestdeployments.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/list-latestdeployments.mdx
deleted file mode 100644
index 3129c1cf1b..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/list-latestdeployments.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-latestdeployments
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/list-machines.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/list-machines.mdx
deleted file mode 100644
index 4c5cb3a1f7..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/list-machines.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-machines
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/list-projects.md b/src/pages/docs/octopus-rest-api/octopus-cli/list-projects.md
deleted file mode 100644
index 06ca504bc5..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/list-projects.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-projects
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/list-releases.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/list-releases.mdx
deleted file mode 100644
index 6e6fbde7b0..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/list-releases.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-releases
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/list-tenants.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/list-tenants.mdx
deleted file mode 100644
index a660388425..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/list-tenants.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-tenants
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/list-workerpools.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/list-workerpools.mdx
deleted file mode 100644
index 4261e02409..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/list-workerpools.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-workerpools
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/list-workers.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/list-workers.mdx
deleted file mode 100644
index ebc1989a9c..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/list-workers.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-workers
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/pack.md b/src/pages/docs/octopus-rest-api/octopus-cli/pack.md
deleted file mode 100644
index c6e9f04366..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/pack.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/pack
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/prevent-releaseprogression.md b/src/pages/docs/octopus-rest-api/octopus-cli/prevent-releaseprogression.md
deleted file mode 100644
index f21131462e..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/prevent-releaseprogression.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/prevent-releaseprogression
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/promote-release.md b/src/pages/docs/octopus-rest-api/octopus-cli/promote-release.md
deleted file mode 100644
index aec1efcf36..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/promote-release.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/promote-release
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/push-metadata.md b/src/pages/docs/octopus-rest-api/octopus-cli/push-metadata.md
deleted file mode 100644
index 2fd6a8f9d2..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/push-metadata.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/push-metadata
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/push.md b/src/pages/docs/octopus-rest-api/octopus-cli/push.md
deleted file mode 100644
index cc158e6143..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/push.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/push
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/run-runbook.md b/src/pages/docs/octopus-rest-api/octopus-cli/run-runbook.md
deleted file mode 100644
index a67323ba24..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/run-runbook.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/run-runbook
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/version.md b/src/pages/docs/octopus-rest-api/octopus-cli/version.md
deleted file mode 100644
index 3ae3637afb..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/version.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/version
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----

From d7dbbb1e7c12f71aff7fe95086d62cd7a007dcda Mon Sep 17 00:00:00 2001
From: William Laugesen <will.laugesen@octopus.com>
Date: Tue, 1 Sep 2026 09:43:16 +1200
Subject: [PATCH 5/7] Serve the old CLI urls from the redirect config rather
 than stub files

A page per redirect meant a file of frontmatter with no content for every url
the reference used to answer on. The pattern in astro.config.mjs covers all 185
command urls in one line, and Astro emits the same meta refresh it does for
src/layouts/Redirect.astro, with a noindex the stubs did not carry.

The legacy underscore urls and the pages below octopus-cli/ are not covered:
one is a rename rather than a move, the other is hand-written rather than a
dynamic route, and neither is worth a line each.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 astro.config.mjs                                | 17 +++++++++++++++++
 src/pages/docs/octopus-rest-api/cli/index.md    |  9 ---------
 .../docs/octopus-rest-api/octopus-cli/index.mdx |  9 ---------
 3 files changed, 17 insertions(+), 18 deletions(-)
 delete mode 100644 src/pages/docs/octopus-rest-api/cli/index.md
 delete mode 100644 src/pages/docs/octopus-rest-api/octopus-cli/index.mdx

diff --git a/astro.config.mjs b/astro.config.mjs
index 3baf67563c..f5511df496 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -73,6 +73,23 @@ export default defineConfig({
             ],
         }),
     },
+    // Where the CLI reference used to be served from. A page of its own for each
+    // of these would be ~350 files of frontmatter carrying no content, so the
+    // ones that map cleanly are a pattern here instead. Astro emits the same
+    // meta refresh it does for src/layouts/Redirect.astro.
+    //
+    // The destination has to be a route that exists, and a dynamic one has to
+    // use the parameter name that route declares - `[...generatedFileName]`,
+    // not `[...slug]`, or the build fails with InvalidRedirectDestination.
+    //
+    // The deprecated Octo CLI pages under octopus-cli/ are hand-written rather
+    // than a dynamic route, so only their index is here and the pages below it
+    // are gone.
+    redirects: {
+        '/docs/octopus-rest-api/cli': '/docs/cli',
+        '/docs/octopus-rest-api/cli/[...generatedFileName]': '/docs/cli/[...generatedFileName]',
+        '/docs/octopus-rest-api/octopus-cli': '/docs/cli/octopus-cli',
+    },
     server: {
         port: 3000
     },
diff --git a/src/pages/docs/octopus-rest-api/cli/index.md b/src/pages/docs/octopus-rest-api/cli/index.md
deleted file mode 100644
index bb897a50db..0000000000
--- a/src/pages/docs/octopus-rest-api/cli/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli/index.mdx b/src/pages/docs/octopus-rest-api/octopus-cli/index.mdx
deleted file mode 100644
index 248236f205..0000000000
--- a/src/pages/docs/octopus-rest-api/octopus-cli/index.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----

From 63f40d0a3e1beccd037c7d400a683acdd6e0d8d9 Mon Sep 17 00:00:00 2001
From: William Laugesen <will.laugesen@octopus.com>
Date: Tue, 1 Sep 2026 09:53:59 +1200
Subject: [PATCH 6/7] Remove the api-and-integration redirects to the Octo CLI

44 files pointing at the deprecated Octo CLI pages, from a move in 2023. The
same urls under octopus-rest-api have gone, and these go with them: a pattern in
astro.config.mjs cannot replace them, because the pages they point at are
hand-written files rather than a dynamic route for the destination to bind to.

Nothing in the repo links to them.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 .../octo.exe-command-line/clean-environment.md           | 9 ---------
 .../octo.exe-command-line/clean-workerpool.md            | 9 ---------
 .../octo.exe-command-line/cleaning-environments.md       | 9 ---------
 .../octo.exe-command-line/create-autodeployoverride.md   | 9 ---------
 .../octo.exe-command-line/create-channel.md              | 9 ---------
 .../octo.exe-command-line/create-environment.md          | 9 ---------
 .../octo.exe-command-line/create-project.md              | 9 ---------
 .../octo.exe-command-line/create-release.md              | 9 ---------
 .../octo.exe-command-line/create-workerpool.md           | 9 ---------
 .../deleting-auto-deploy-overrides.md                    | 9 ---------
 .../creating-auto-deploy-overrides/index.md              | 9 ---------
 .../octo.exe-command-line/creating-channels.md           | 9 ---------
 .../octo.exe-command-line/creating-environments.md       | 9 ---------
 .../octo.exe-command-line/creating-projects.md           | 9 ---------
 .../octo.exe-command-line/creating-releases.md           | 9 ---------
 .../octo.exe-command-line/delete-autodeployoverride.md   | 9 ---------
 .../octo.exe-command-line/delete-release.md              | 9 ---------
 .../octo.exe-command-line/delete-releases.md             | 9 ---------
 .../octo.exe-command-line/deleting-releases.md           | 9 ---------
 .../octo.exe-command-line/deploy-release.md              | 9 ---------
 .../octo.exe-command-line/deploying-releases.md          | 9 ---------
 .../octo.exe-command-line/dump-deployments.md            | 9 ---------
 .../api-and-integration/octo.exe-command-line/export.md  | 9 ---------
 .../octo.exe-command-line/formatted-output.md            | 9 ---------
 .../api-and-integration/octo.exe-command-line/import.md  | 9 ---------
 .../api-and-integration/octo.exe-command-line/index.md   | 9 ---------
 .../octo.exe-command-line/install-global-tool.md         | 9 ---------
 .../octo.exe-command-line/list-deployments.md            | 9 ---------
 .../octo.exe-command-line/list-environments.md           | 9 ---------
 .../octo.exe-command-line/list-latestdeployments.md      | 9 ---------
 .../octo.exe-command-line/list-machines.md               | 9 ---------
 .../octo.exe-command-line/list-projects.md               | 9 ---------
 .../octo.exe-command-line/list-releases.md               | 9 ---------
 .../octo.exe-command-line/list-tenants.md                | 9 ---------
 .../octo.exe-command-line/list-workerpools.md            | 9 ---------
 .../octo.exe-command-line/list-workers.md                | 9 ---------
 .../api-and-integration/octo.exe-command-line/pack.md    | 9 ---------
 .../octo.exe-command-line/promote-release.md             | 9 ---------
 .../octo.exe-command-line/promoting-releases.md          | 9 ---------
 .../octo.exe-command-line/push-metadata.md               | 9 ---------
 .../octo.exe-command-line/push-package.md                | 9 ---------
 .../api-and-integration/octo.exe-command-line/push.md    | 9 ---------
 .../octo.exe-command-line/pushing-packages.md            | 9 ---------
 .../api-and-integration/octo.exe-command-line/version.md | 9 ---------
 44 files changed, 396 deletions(-)
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/clean-environment.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/clean-workerpool.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/cleaning-environments.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/create-autodeployoverride.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/create-channel.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/create-environment.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/create-project.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/create-release.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/create-workerpool.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/creating-auto-deploy-overrides/deleting-auto-deploy-overrides.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/creating-auto-deploy-overrides/index.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/creating-channels.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/creating-environments.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/creating-projects.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/creating-releases.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/delete-autodeployoverride.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/delete-release.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/delete-releases.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/deleting-releases.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/deploy-release.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/deploying-releases.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/dump-deployments.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/export.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/formatted-output.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/import.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/index.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/install-global-tool.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/list-deployments.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/list-environments.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/list-latestdeployments.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/list-machines.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/list-projects.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/list-releases.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/list-tenants.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/list-workerpools.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/list-workers.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/pack.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/promote-release.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/promoting-releases.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/push-metadata.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/push-package.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/push.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/pushing-packages.md
 delete mode 100644 src/pages/docs/api-and-integration/octo.exe-command-line/version.md

diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/clean-environment.md b/src/pages/docs/api-and-integration/octo.exe-command-line/clean-environment.md
deleted file mode 100644
index 90acacef11..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/clean-environment.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/clean-environment
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/clean-workerpool.md b/src/pages/docs/api-and-integration/octo.exe-command-line/clean-workerpool.md
deleted file mode 100644
index b7a2aa2d92..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/clean-workerpool.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/clean-workerpool
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/cleaning-environments.md b/src/pages/docs/api-and-integration/octo.exe-command-line/cleaning-environments.md
deleted file mode 100644
index 90acacef11..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/cleaning-environments.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/clean-environment
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/create-autodeployoverride.md b/src/pages/docs/api-and-integration/octo.exe-command-line/create-autodeployoverride.md
deleted file mode 100644
index a726fe83a2..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/create-autodeployoverride.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-autodeployoverride
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/create-channel.md b/src/pages/docs/api-and-integration/octo.exe-command-line/create-channel.md
deleted file mode 100644
index a5dc611608..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/create-channel.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-channel
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/create-environment.md b/src/pages/docs/api-and-integration/octo.exe-command-line/create-environment.md
deleted file mode 100644
index 20b25bf5a2..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/create-environment.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-environment
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/create-project.md b/src/pages/docs/api-and-integration/octo.exe-command-line/create-project.md
deleted file mode 100644
index 29f58bba1b..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/create-project.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-project
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/create-release.md b/src/pages/docs/api-and-integration/octo.exe-command-line/create-release.md
deleted file mode 100644
index 0e37e5424a..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/create-release.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-release
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/create-workerpool.md b/src/pages/docs/api-and-integration/octo.exe-command-line/create-workerpool.md
deleted file mode 100644
index 64719c6641..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/create-workerpool.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-workerpool
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-auto-deploy-overrides/deleting-auto-deploy-overrides.md b/src/pages/docs/api-and-integration/octo.exe-command-line/creating-auto-deploy-overrides/deleting-auto-deploy-overrides.md
deleted file mode 100644
index 0daa571716..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-auto-deploy-overrides/deleting-auto-deploy-overrides.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/delete-autodeployoverride
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-auto-deploy-overrides/index.md b/src/pages/docs/api-and-integration/octo.exe-command-line/creating-auto-deploy-overrides/index.md
deleted file mode 100644
index a726fe83a2..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-auto-deploy-overrides/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-autodeployoverride
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-channels.md b/src/pages/docs/api-and-integration/octo.exe-command-line/creating-channels.md
deleted file mode 100644
index a5dc611608..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-channels.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-channel
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-environments.md b/src/pages/docs/api-and-integration/octo.exe-command-line/creating-environments.md
deleted file mode 100644
index 20b25bf5a2..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-environments.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-environment
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-projects.md b/src/pages/docs/api-and-integration/octo.exe-command-line/creating-projects.md
deleted file mode 100644
index 29f58bba1b..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-projects.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-project
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-releases.md b/src/pages/docs/api-and-integration/octo.exe-command-line/creating-releases.md
deleted file mode 100644
index 0e37e5424a..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/creating-releases.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/create-release
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/delete-autodeployoverride.md b/src/pages/docs/api-and-integration/octo.exe-command-line/delete-autodeployoverride.md
deleted file mode 100644
index 0daa571716..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/delete-autodeployoverride.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/delete-autodeployoverride
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/delete-release.md b/src/pages/docs/api-and-integration/octo.exe-command-line/delete-release.md
deleted file mode 100644
index 934448f2f0..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/delete-release.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/delete-releases
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/delete-releases.md b/src/pages/docs/api-and-integration/octo.exe-command-line/delete-releases.md
deleted file mode 100644
index 934448f2f0..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/delete-releases.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/delete-releases
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/deleting-releases.md b/src/pages/docs/api-and-integration/octo.exe-command-line/deleting-releases.md
deleted file mode 100644
index 934448f2f0..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/deleting-releases.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/delete-releases
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/deploy-release.md b/src/pages/docs/api-and-integration/octo.exe-command-line/deploy-release.md
deleted file mode 100644
index abdf7b7e5d..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/deploy-release.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/deploy-release
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/deploying-releases.md b/src/pages/docs/api-and-integration/octo.exe-command-line/deploying-releases.md
deleted file mode 100644
index abdf7b7e5d..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/deploying-releases.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/deploy-release
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/dump-deployments.md b/src/pages/docs/api-and-integration/octo.exe-command-line/dump-deployments.md
deleted file mode 100644
index 3ed38b1b9f..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/dump-deployments.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/dump-deployments
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/export.md b/src/pages/docs/api-and-integration/octo.exe-command-line/export.md
deleted file mode 100644
index 81cf85b330..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/export.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/export
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/formatted-output.md b/src/pages/docs/api-and-integration/octo.exe-command-line/formatted-output.md
deleted file mode 100644
index b82253da68..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/formatted-output.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/formatted-output
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/import.md b/src/pages/docs/api-and-integration/octo.exe-command-line/import.md
deleted file mode 100644
index 837353206c..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/import.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/import
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/index.md b/src/pages/docs/api-and-integration/octo.exe-command-line/index.md
deleted file mode 100644
index 248236f205..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/install-global-tool.md b/src/pages/docs/api-and-integration/octo.exe-command-line/install-global-tool.md
deleted file mode 100644
index ba2b23769e..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/install-global-tool.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/install-global-tool
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/list-deployments.md b/src/pages/docs/api-and-integration/octo.exe-command-line/list-deployments.md
deleted file mode 100644
index 123370ef8e..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/list-deployments.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-deployments
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/list-environments.md b/src/pages/docs/api-and-integration/octo.exe-command-line/list-environments.md
deleted file mode 100644
index a499e2c41d..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/list-environments.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-environments
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/list-latestdeployments.md b/src/pages/docs/api-and-integration/octo.exe-command-line/list-latestdeployments.md
deleted file mode 100644
index 3129c1cf1b..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/list-latestdeployments.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-latestdeployments
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/list-machines.md b/src/pages/docs/api-and-integration/octo.exe-command-line/list-machines.md
deleted file mode 100644
index 4c5cb3a1f7..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/list-machines.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-machines
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/list-projects.md b/src/pages/docs/api-and-integration/octo.exe-command-line/list-projects.md
deleted file mode 100644
index 06ca504bc5..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/list-projects.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-projects
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/list-releases.md b/src/pages/docs/api-and-integration/octo.exe-command-line/list-releases.md
deleted file mode 100644
index 6e6fbde7b0..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/list-releases.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-releases
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/list-tenants.md b/src/pages/docs/api-and-integration/octo.exe-command-line/list-tenants.md
deleted file mode 100644
index a660388425..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/list-tenants.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-tenants
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/list-workerpools.md b/src/pages/docs/api-and-integration/octo.exe-command-line/list-workerpools.md
deleted file mode 100644
index 4261e02409..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/list-workerpools.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-workerpools
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/list-workers.md b/src/pages/docs/api-and-integration/octo.exe-command-line/list-workers.md
deleted file mode 100644
index ebc1989a9c..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/list-workers.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/list-workers
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/pack.md b/src/pages/docs/api-and-integration/octo.exe-command-line/pack.md
deleted file mode 100644
index c6e9f04366..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/pack.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/pack
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/promote-release.md b/src/pages/docs/api-and-integration/octo.exe-command-line/promote-release.md
deleted file mode 100644
index aec1efcf36..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/promote-release.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/promote-release
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/promoting-releases.md b/src/pages/docs/api-and-integration/octo.exe-command-line/promoting-releases.md
deleted file mode 100644
index aec1efcf36..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/promoting-releases.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/promote-release
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/push-metadata.md b/src/pages/docs/api-and-integration/octo.exe-command-line/push-metadata.md
deleted file mode 100644
index 2fd6a8f9d2..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/push-metadata.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/push-metadata
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/push-package.md b/src/pages/docs/api-and-integration/octo.exe-command-line/push-package.md
deleted file mode 100644
index cc158e6143..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/push-package.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/push
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/push.md b/src/pages/docs/api-and-integration/octo.exe-command-line/push.md
deleted file mode 100644
index cc158e6143..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/push.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/push
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/pushing-packages.md b/src/pages/docs/api-and-integration/octo.exe-command-line/pushing-packages.md
deleted file mode 100644
index cc158e6143..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/pushing-packages.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/push
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----
diff --git a/src/pages/docs/api-and-integration/octo.exe-command-line/version.md b/src/pages/docs/api-and-integration/octo.exe-command-line/version.md
deleted file mode 100644
index 3ae3637afb..0000000000
--- a/src/pages/docs/api-and-integration/octo.exe-command-line/version.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: src/layouts/Redirect.astro
-title: Redirect
-redirect: https://octopus.com/docs/cli/octopus-cli/version
-pubDate:  2023-01-01
-navSearch: false
-navSitemap: false
-navMenu: false
----

From e8f3c6e12f99281a1ece9f75daafc863758856c4 Mon Sep 17 00:00:00 2001
From: William Laugesen <will.laugesen@octopus.com>
Date: Tue, 1 Sep 2026 10:16:21 +1200
Subject: [PATCH 7/7] Redirect the two old CLI section urls from pages, not
 from the config

A redirect that lives in astro.config.mjs is not where anyone looks for one.
These are ordinary pages using src/layouts/Redirect.astro, the same as the other
~1,250 in the repo.

/docs/octopus-rest-api/cli and /docs/octopus-rest-api/octopus-cli redirect.
Everything that used to sit under them 404s.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 astro.config.mjs                               | 17 -----------------
 src/pages/docs/octopus-rest-api/cli.md         |  9 +++++++++
 src/pages/docs/octopus-rest-api/octopus-cli.md |  9 +++++++++
 3 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 src/pages/docs/octopus-rest-api/cli.md
 create mode 100644 src/pages/docs/octopus-rest-api/octopus-cli.md

diff --git a/astro.config.mjs b/astro.config.mjs
index f5511df496..3baf67563c 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -73,23 +73,6 @@ export default defineConfig({
             ],
         }),
     },
-    // Where the CLI reference used to be served from. A page of its own for each
-    // of these would be ~350 files of frontmatter carrying no content, so the
-    // ones that map cleanly are a pattern here instead. Astro emits the same
-    // meta refresh it does for src/layouts/Redirect.astro.
-    //
-    // The destination has to be a route that exists, and a dynamic one has to
-    // use the parameter name that route declares - `[...generatedFileName]`,
-    // not `[...slug]`, or the build fails with InvalidRedirectDestination.
-    //
-    // The deprecated Octo CLI pages under octopus-cli/ are hand-written rather
-    // than a dynamic route, so only their index is here and the pages below it
-    // are gone.
-    redirects: {
-        '/docs/octopus-rest-api/cli': '/docs/cli',
-        '/docs/octopus-rest-api/cli/[...generatedFileName]': '/docs/cli/[...generatedFileName]',
-        '/docs/octopus-rest-api/octopus-cli': '/docs/cli/octopus-cli',
-    },
     server: {
         port: 3000
     },
diff --git a/src/pages/docs/octopus-rest-api/cli.md b/src/pages/docs/octopus-rest-api/cli.md
new file mode 100644
index 0000000000..bb897a50db
--- /dev/null
+++ b/src/pages/docs/octopus-rest-api/cli.md
@@ -0,0 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
+---
diff --git a/src/pages/docs/octopus-rest-api/octopus-cli.md b/src/pages/docs/octopus-rest-api/octopus-cli.md
new file mode 100644
index 0000000000..248236f205
--- /dev/null
+++ b/src/pages/docs/octopus-rest-api/octopus-cli.md
@@ -0,0 +1,9 @@
+---
+layout: src/layouts/Redirect.astro
+title: Redirect
+redirect: https://octopus.com/docs/cli/octopus-cli
+pubDate:  2023-01-01
+navSearch: false
+navSitemap: false
+navMenu: false
+---