From b4fe9614079d706aa010b5018ccc803ad9877011 Mon Sep 17 00:00:00 2001
From: Joyce Fee <joyce@redpanda.com>
Date: Mon, 27 Jul 2026 17:37:34 -0400
Subject: [PATCH 1/4] docs: DOC-2121: Sweep rpk redpanda admin commands for
 26.2 deprecation

Replace deprecated rpk redpanda admin commands with their rpk cluster
replacements across 18 prose files, per redpanda#30332 (shipped 26.2):

- brokers decommission/decommission-status -> rpk cluster brokers ...
- brokers list -> rpk cluster info -b --detailed
- config log-level set -> rpk cluster loggers set

Add the migration table to Deprecated Features, a What's New entry,
and a deprecation note on the admin-addresses flag table. Xrefs to
not-yet-generated rpk-cluster-brokers/loggers pages are left as code
text with TODO(DOC-2121) markers until the 26.2 rpk regen lands.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../kubernetes/k-production-readiness.adoc         |  4 ++--
 .../manual/production/production-readiness.adoc    |  2 +-
 modules/get-started/pages/admin-addresses.adoc     |  2 +-
 .../get-started/pages/release-notes/redpanda.adoc  |  6 ++++++
 .../cluster-maintenance/decommission-brokers.adoc  |  9 +++++----
 .../pages/kubernetes/k-decommission-brokers.adoc   |  9 +++++----
 modules/manage/pages/kubernetes/k-node-pools.adoc  |  2 +-
 modules/manage/pages/kubernetes/k-nodewatcher.adoc |  3 ++-
 .../manage/pages/kubernetes/k-rolling-restart.adoc |  2 +-
 modules/manage/pages/use-admin-api.adoc            |  5 +++--
 modules/manage/partials/gbac-dp.adoc               |  2 +-
 .../troubleshoot/partials/cluster-diagnostics.adoc |  3 ++-
 modules/upgrade/pages/deprecated/index.adoc        | 14 ++++++++++++++
 .../pages/k-migrate-node-pools-manually.adoc       |  4 ++--
 modules/upgrade/pages/k-migrate-node-pools.adoc    |  8 ++++----
 modules/upgrade/pages/k-rolling-upgrade.adoc       |  6 +++---
 modules/upgrade/pages/rolling-upgrade.adoc         |  4 ++--
 .../rolling-upgrades/post-upgrade-tasks.adoc       |  2 +-
 .../rolling-upgrades/rolling-restart-intro.adoc    |  4 ++--
 .../rolling-upgrades/upgrade-your-version.adoc     |  4 ++--
 20 files changed, 60 insertions(+), 35 deletions(-)

diff --git a/modules/deploy/pages/redpanda/kubernetes/k-production-readiness.adoc b/modules/deploy/pages/redpanda/kubernetes/k-production-readiness.adoc
index ce2ea648b5..ef75c37195 100644
--- a/modules/deploy/pages/redpanda/kubernetes/k-production-readiness.adoc
+++ b/modules/deploy/pages/redpanda/kubernetes/k-production-readiness.adoc
@@ -166,7 +166,7 @@ Decommissioning is used to permanently remove a broker from the cluster, such as
 .Input
 [,bash]
 ----
-kubectl exec -n <namespace> <pod-name> -c redpanda -- rpk redpanda admin brokers list -X user=<sasl-username> -X pass=<sasl-password> -X sasl.mechanism=<sasl-mechanism>
+kubectl exec -n <namespace> <pod-name> -c redpanda -- rpk cluster info -b --detailed -X user=<sasl-username> -X pass=<sasl-password> -X sasl.mechanism=<sasl-mechanism>
 ----
 
 .Output
@@ -216,7 +216,7 @@ Check that Redpanda is running the https://github.com/redpanda-data/redpanda/rel
 .Input
 [,bash]
 ----
-kubectl exec -n <namespace> <pod-name> -c redpanda -- rpk redpanda admin brokers list -X user=<sasl-username> -X pass=<sasl-password> -X sasl.mechanism=<sasl-mechanism>
+kubectl exec -n <namespace> <pod-name> -c redpanda -- rpk cluster info -b --detailed -X user=<sasl-username> -X pass=<sasl-password> -X sasl.mechanism=<sasl-mechanism>
 ----
 
 .Output
diff --git a/modules/deploy/pages/redpanda/manual/production/production-readiness.adoc b/modules/deploy/pages/redpanda/manual/production/production-readiness.adoc
index 552f47182f..889c3b3c2a 100644
--- a/modules/deploy/pages/redpanda/manual/production/production-readiness.adoc
+++ b/modules/deploy/pages/redpanda/manual/production/production-readiness.adoc
@@ -538,7 +538,7 @@ Check that no brokers are in a decommissioned state.
 .Input
 [source,bash]
 ---- 
-rpk redpanda admin brokers list
+rpk cluster info -b --detailed
 ----
 
 .Output
diff --git a/modules/get-started/pages/admin-addresses.adoc b/modules/get-started/pages/admin-addresses.adoc
index 15325a735e..cd9b42b326 100644
--- a/modules/get-started/pages/admin-addresses.adoc
+++ b/modules/get-started/pages/admin-addresses.adoc
@@ -26,7 +26,7 @@ The following table shows which `rpk` commands require the `-X admin.hosts` or `
 | `rpk cluster` (all except `rpk cluster info` and `rpk cluster metadata`)
 | `-X admin.hosts`
 
-| `rpk redpanda admin`
+| `rpk redpanda admin` (deprecated in 26.2, see xref:upgrade:deprecated/index.adoc[Deprecated features])
 | `--hosts`
 |===
 
diff --git a/modules/get-started/pages/release-notes/redpanda.adoc b/modules/get-started/pages/release-notes/redpanda.adoc
index a0d27a5b3b..9d8c8e6d4e 100644
--- a/modules/get-started/pages/release-notes/redpanda.adoc
+++ b/modules/get-started/pages/release-notes/redpanda.adoc
@@ -13,3 +13,9 @@ This topic includes new content added in version {page-component-version}. For a
 Redpanda version 26.2 validates a broader set of non-Java Apache Kafka® clients at their current versions that support Kafka 4.x, in addition to the Apache Kafka Java client. Newly validated clients include `confluent-kafka-go` and Sarama for Go, and `kafka-python` and `confluent-kafka-python` for Python. Validation confirms connectivity and correctness across core Kafka APIs, such as produce, consume, and transaction operations.
 
 See xref:develop:kafka-clients.adoc[Kafka Compatibility] for the full list of validated clients and known exceptions.
+
+== Simplified cluster administration commands: `rpk redpanda admin` deprecated
+
+Cluster administration moves fully under `rpk cluster`: broker decommissioning, recommissioning, logger control, and per-broker configuration and partition listings now live alongside the other cluster commands, and `rpk cluster info -b --detailed` reports broker membership, liveness, and versions. The `rpk redpanda admin` command tree is deprecated and hidden from help output. The old commands still work and print a pointer to their replacements, but they are planned for removal in a future major release.
+
+See xref:upgrade:deprecated/index.adoc[Deprecated Features] for the full command migration table.
diff --git a/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc b/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc
index 61d7fe03ed..f670de262d 100644
--- a/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc
+++ b/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc
@@ -185,7 +185,7 @@ To determine the number of cores that are available across the remaining brokers
 
 [,bash]
 ----
-rpk redpanda admin brokers list
+rpk cluster info -b --detailed
 ----
 
 .Example output
@@ -234,7 +234,7 @@ rpk cluster info \
 +
 [,bash]
 ----
-rpk redpanda admin brokers decommission <broker-id> \
+rpk cluster brokers decommission <broker-id> \
   --hosts <broker-url>:<admin-api-port> \
   --force
 ----
@@ -247,7 +247,7 @@ If you see `Success, broker <broker-id> has been decommissioned!`, the broker is
 +
 [,bash]
 ----
-rpk redpanda admin brokers decommission-status <broker-id> \
+rpk cluster brokers decommission-status <broker-id> \
   -X admin.hosts=<broker-url>:<admin-api-port>
 ----
 +
@@ -268,5 +268,6 @@ If these steps do not allow the decommissioning process to complete, enable `TRA
 
 include::shared:partial$suggested-reading.adoc[]
 
-* xref:reference:rpk/rpk-redpanda/rpk-redpanda-admin-brokers-decommission.adoc[`rpk-redpanda-admin-brokers-decommission`]
+// TODO(DOC-2121): Add an xref when the 26.2 rpk regen adds the rpk-cluster-brokers-decommission page.
+* `rpk cluster brokers decommission`
 * https://redpanda.com/blog/raft-protocol-reconfiguration-solution[Engineering a more robust Raft group reconfiguration^]
diff --git a/modules/manage/pages/kubernetes/k-decommission-brokers.adoc b/modules/manage/pages/kubernetes/k-decommission-brokers.adoc
index 894ef9c110..c2f6259340 100644
--- a/modules/manage/pages/kubernetes/k-decommission-brokers.adoc
+++ b/modules/manage/pages/kubernetes/k-decommission-brokers.adoc
@@ -197,7 +197,7 @@ Next, determine the number of cores that are available across the remaining brok
 
 [,bash]
 ----
-rpk redpanda admin brokers list
+rpk cluster info -b --detailed
 ----
 
 .Example output
@@ -297,7 +297,7 @@ NOTE: When scaling in a cluster, you cannot choose which broker is removed. Redp
 +
 ```bash
 kubectl --namespace <namespace> exec -ti <pod-name> -c <container-name> -- \
-  rpk redpanda admin brokers decommission <broker-id>
+  rpk cluster brokers decommission <broker-id>
 ```
 +
 This message is displayed before the decommission process is complete.
@@ -312,7 +312,7 @@ TIP: If the broker is not running, use the `--force` flag.
 +
 ```bash
 kubectl --namespace <namespace> exec -ti <pod-name> -c <container-name> -- \
-  rpk redpanda admin brokers decommission-status <broker-id>
+  rpk cluster brokers decommission-status <broker-id>
 ```
 +
 The output uses cached cluster health data that is refreshed every 10 seconds. When the completion column for all rows is 100%, the broker is decommissioned.
@@ -737,6 +737,7 @@ include::shared:partial$suggested-reading.adoc[]
 
 - xref:manage:kubernetes/k-node-pools.adoc[Node Pools]
 
-- xref:reference:rpk/rpk-redpanda/rpk-redpanda-admin-brokers-decommission.adoc[`rpk-redpanda-admin-brokers-decommission`]
+// TODO(DOC-2121): Add an xref when the 26.2 rpk regen adds the rpk-cluster-brokers-decommission page.
+- `rpk cluster brokers decommission`
 
 - https://redpanda.com/blog/raft-protocol-reconfiguration-solution[Engineering a more robust Raft group reconfiguration^]
diff --git a/modules/manage/pages/kubernetes/k-node-pools.adoc b/modules/manage/pages/kubernetes/k-node-pools.adoc
index a56074de75..a8b38cc6bd 100644
--- a/modules/manage/pages/kubernetes/k-node-pools.adoc
+++ b/modules/manage/pages/kubernetes/k-node-pools.adoc
@@ -428,7 +428,7 @@ Monitor the decommission progress:
 
 [source,bash]
 ----
-rpk redpanda admin brokers list
+rpk cluster info -b --detailed
 ----
 
 Wait until only the Redpanda CR-managed brokers remain.
diff --git a/modules/manage/pages/kubernetes/k-nodewatcher.adoc b/modules/manage/pages/kubernetes/k-nodewatcher.adoc
index 67ed8e278c..a0db4db934 100644
--- a/modules/manage/pages/kubernetes/k-nodewatcher.adoc
+++ b/modules/manage/pages/kubernetes/k-nodewatcher.adoc
@@ -176,4 +176,5 @@ kubectl get persistentvolume --namespace <namespace>
 
 After the PVCUnbinder has finished, xref:manage:kubernetes/k-decommission-brokers.adoc[decommission the broker] that was removed from the node. This is necessary to prevent a potential loss of quorum and ensure cluster stability.
 
-NOTE: Make sure to use the `--force` flag when decommissioning the broker with xref:reference:rpk/rpk-redpanda/rpk-redpanda-admin-brokers-decommission.adoc[`rpk redpanda admin brokers decommission`]. This flag is required when the broker is no longer running.
+// TODO(DOC-2121): Add an xref when the 26.2 rpk regen adds the rpk-cluster-brokers-decommission page.
+NOTE: Make sure to use the `--force` flag when decommissioning the broker with `rpk cluster brokers decommission`. This flag is required when the broker is no longer running.
diff --git a/modules/manage/pages/kubernetes/k-rolling-restart.adoc b/modules/manage/pages/kubernetes/k-rolling-restart.adoc
index a895701006..7d7e6f47d1 100644
--- a/modules/manage/pages/kubernetes/k-rolling-restart.adoc
+++ b/modules/manage/pages/kubernetes/k-rolling-restart.adoc
@@ -124,7 +124,7 @@ To view additional information about your brokers, run:
 
 ```bash
 kubectl exec <pod-name> --namespace <namespace> -c redpanda -- \
-  rpk redpanda admin brokers list
+  rpk cluster info -b --detailed
 ```
 
 include::shared:partial$suggested-reading.adoc[]
diff --git a/modules/manage/pages/use-admin-api.adoc b/modules/manage/pages/use-admin-api.adoc
index a3b6717faf..2990eb75d6 100644
--- a/modules/manage/pages/use-admin-api.adoc
+++ b/modules/manage/pages/use-admin-api.adoc
@@ -64,11 +64,12 @@ curl \
 rpk::
 +
 --
-For Linux deployments only, run xref:reference:rpk/rpk-redpanda/rpk-redpanda-admin-brokers-decommission.adoc[`rpk redpanda admin brokers decommission`]:
+// TODO(DOC-2121): Add an xref when the 26.2 rpk regen adds the rpk-cluster-brokers-decommission page.
+For Linux deployments only, run `rpk cluster brokers decommission`:
 
 [,bash]
 ----
-rpk redpanda admin brokers decommission <broker-id>
+rpk cluster brokers decommission <broker-id>
 ----
 --
 ====
diff --git a/modules/manage/partials/gbac-dp.adoc b/modules/manage/partials/gbac-dp.adoc
index 6808dd2ff2..f94f33daf4 100644
--- a/modules/manage/partials/gbac-dp.adoc
+++ b/modules/manage/partials/gbac-dp.adoc
@@ -417,7 +417,7 @@ rpk cluster config get nested_group_behavior
 +
 [,bash]
 ----
-rpk redpanda admin config log-level set security --level debug
+rpk cluster loggers set security --level debug
 ----
 +
 This helps diagnose incorrect claim paths, missing groups, or token content issues. The debug level reverts automatically after the expiry period (default: 300 seconds).
diff --git a/modules/troubleshoot/partials/cluster-diagnostics.adoc b/modules/troubleshoot/partials/cluster-diagnostics.adoc
index cd748929cd..940f5ae041 100644
--- a/modules/troubleshoot/partials/cluster-diagnostics.adoc
+++ b/modules/troubleshoot/partials/cluster-diagnostics.adoc
@@ -155,7 +155,8 @@ After applying these changes, verify the log level by <<view-redpanda-logs, chec
 
 You can override the log levels for individual subsystems, such as `rpc` and `kafka`, for more detailed logging control. Overrides exist for the entire length of the running Redpanda process.
 
-TIP: To temporarily override the log level for individual subsystems, you can use the xref:reference:rpk/rpk-redpanda/rpk-redpanda-admin-config-log-level-set.adoc[`rpk redpanda admin config log-level set`] command.
+// TODO(DOC-2121): Add an xref when the 26.2 rpk regen adds the rpk-cluster-loggers-set page.
+TIP: To temporarily override the log level for individual subsystems, you can use the `rpk cluster loggers set` command.
 
 . List all available subsystem loggers:
 +
diff --git a/modules/upgrade/pages/deprecated/index.adoc b/modules/upgrade/pages/deprecated/index.adoc
index 95fe9b9733..e5244e30d3 100644
--- a/modules/upgrade/pages/deprecated/index.adoc
+++ b/modules/upgrade/pages/deprecated/index.adoc
@@ -120,6 +120,20 @@ The following `rpk` commands have been modified or have had flag updates.
 |===
 | Deprecated in | Feature  | Details
 
+// This feature is not supported in cloud
+ifndef::env-cloud[]
+| 26.2.1
+| `rpk redpanda admin`
+| The entire `rpk redpanda admin` command tree is deprecated and hidden from help output. The old commands still work and print a pointer to their replacements. Use the following commands instead:
+
+- `rpk redpanda admin brokers decommission` → `rpk cluster brokers decommission`
+- `rpk redpanda admin brokers decommission-status` → `rpk cluster brokers decommission-status`
+- `rpk redpanda admin brokers recommission` → `rpk cluster brokers recommission`
+- `rpk redpanda admin brokers list` → xref:reference:rpk/rpk-cluster/rpk-cluster-info.adoc[`rpk cluster info`] with `-b --detailed --include-decommissioned`
+- `rpk redpanda admin config print` → xref:reference:rpk/rpk-cluster/rpk-cluster-config-list.adoc[`rpk cluster config list`] with `--node-id <ID>`
+- `rpk redpanda admin config log-level set` → `rpk cluster loggers set`
+- `rpk redpanda admin partitions list` → xref:reference:rpk/rpk-cluster/rpk-cluster-partitions-list.adoc[`rpk cluster partitions list`] with `--node-ids <ID>`
+endif::[]
 // This feature is not supported in cloud
 ifndef::env-cloud[]
 | 23.3.1
diff --git a/modules/upgrade/pages/k-migrate-node-pools-manually.adoc b/modules/upgrade/pages/k-migrate-node-pools-manually.adoc
index 624336487a..e313a0849e 100644
--- a/modules/upgrade/pages/k-migrate-node-pools-manually.adoc
+++ b/modules/upgrade/pages/k-migrate-node-pools-manually.adoc
@@ -357,7 +357,7 @@ redpanda-0    2/2     Running     0    11m     10.244.7.3   kind-worker2
 +
 [source,bash]
 ----
-rpk redpanda admin brokers decommission <broker-id>
+rpk cluster brokers decommission <broker-id>
 ----
 +
 The time required depends on the amount of data being migrated from the broker's partitions. If the broker has a large amount of data, this process can take hours. For more details, see xref:manage:kubernetes/k-decommission-brokers.adoc[Decommission Brokers].
@@ -366,7 +366,7 @@ The time required depends on the amount of data being migrated from the broker's
 +
 [source,bash]
 ----
-rpk redpanda admin brokers decommission-status <broker-id>
+rpk cluster brokers decommission-status <broker-id>
 ----
 +
 Wait until you see this message before proceeding:
diff --git a/modules/upgrade/pages/k-migrate-node-pools.adoc b/modules/upgrade/pages/k-migrate-node-pools.adoc
index 654f296c00..2693350d9a 100644
--- a/modules/upgrade/pages/k-migrate-node-pools.adoc
+++ b/modules/upgrade/pages/k-migrate-node-pools.adoc
@@ -162,7 +162,7 @@ List the brokers and confirm their current version:
 
 [source,bash]
 ----
-kubectl exec -n <namespace> redpanda-blue-0 -c redpanda -- rpk redpanda admin brokers list
+kubectl exec -n <namespace> redpanda-blue-0 -c redpanda -- rpk cluster info -b --detailed
 ----
 
 .Expected output
@@ -272,7 +272,7 @@ Verify that all 6 brokers are active and confirm the version split:
 
 [source,bash]
 ----
-kubectl exec -n <namespace> redpanda-blue-0 -c redpanda -- rpk redpanda admin brokers list
+kubectl exec -n <namespace> redpanda-blue-0 -c redpanda -- rpk cluster info -b --detailed
 ----
 
 .Expected output
@@ -306,7 +306,7 @@ Monitor the decommission progress:
 
 [source,bash]
 ----
-kubectl exec -n <namespace> redpanda-green-0 -c redpanda -- rpk redpanda admin brokers list
+kubectl exec -n <namespace> redpanda-green-0 -c redpanda -- rpk cluster info -b --detailed
 ----
 
 You will see blue brokers transition from `active` to `draining` as the operator decommissions them:
@@ -383,7 +383,7 @@ Confirm that all brokers are running the target version:
 
 [source,bash]
 ----
-kubectl exec -n <namespace> redpanda-green-0 -c redpanda -- rpk redpanda admin brokers list
+kubectl exec -n <namespace> redpanda-green-0 -c redpanda -- rpk cluster info -b --detailed
 ----
 
 .Expected output
diff --git a/modules/upgrade/pages/k-rolling-upgrade.adoc b/modules/upgrade/pages/k-rolling-upgrade.adoc
index f625947993..a0888f6b4a 100644
--- a/modules/upgrade/pages/k-rolling-upgrade.adoc
+++ b/modules/upgrade/pages/k-rolling-upgrade.adoc
@@ -25,11 +25,11 @@ Before you perform a rolling upgrade:
 
 - Find the Redpanda version that you are currently running.
 +
-To find your current version of Redpanda, use xref:reference:rpk/rpk-redpanda/rpk-redpanda-admin-brokers-list.adoc[`rpk redpanda admin brokers list`]:
+To find your current version of Redpanda, use xref:reference:rpk/rpk-cluster/rpk-cluster-info.adoc[`rpk cluster info`]:
 +
 ```bash
 kubectl exec <pod-name> --namespace <namespace> -c redpanda -- \
-  rpk redpanda admin brokers list
+  rpk cluster info -b --detailed
 ```
 +
 .Expected output:
@@ -281,7 +281,7 @@ redpanda-post-upgrade-ljqpr             0/1     Completed
 +
 ```bash
 kubectl exec <pod-name> --namespace <namespace> -c redpanda -- \
-  rpk redpanda admin brokers list
+  rpk cluster info -b --detailed
 ```
 
 . If you upgraded from operator v25.1.x to v25.2.x or later, check for Console migration warnings:
diff --git a/modules/upgrade/pages/rolling-upgrade.adoc b/modules/upgrade/pages/rolling-upgrade.adoc
index eff68e5ead..b7ef1f9658 100644
--- a/modules/upgrade/pages/rolling-upgrade.adoc
+++ b/modules/upgrade/pages/rolling-upgrade.adoc
@@ -35,10 +35,10 @@ Linux::
 --
 [,bash]
 ----
-rpk redpanda admin brokers list
+rpk cluster info -b --detailed
 ----
 
-For all available flags, see the xref:reference:rpk/rpk-redpanda/rpk-redpanda-admin-brokers-list.adoc[`rpk redpanda admin brokers list` command reference].
+For all available flags, see the xref:reference:rpk/rpk-cluster/rpk-cluster-info.adoc[`rpk cluster info` command reference].
 
 --
 Docker::
diff --git a/modules/upgrade/partials/rolling-upgrades/post-upgrade-tasks.adoc b/modules/upgrade/partials/rolling-upgrades/post-upgrade-tasks.adoc
index d6282f9550..38b5409d15 100644
--- a/modules/upgrade/partials/rolling-upgrades/post-upgrade-tasks.adoc
+++ b/modules/upgrade/partials/rolling-upgrades/post-upgrade-tasks.adoc
@@ -10,7 +10,7 @@ rpk cluster health
 To view additional information about your brokers, run:
 
 ```bash
-rpk redpanda admin brokers list
+rpk cluster info -b --detailed
 ```
 
 You can also use the link:/api/doc/admin/operation/operation-post_restart_probe[Admin API] to check how much each broker has progressed in recovering its workloads:
diff --git a/modules/upgrade/partials/rolling-upgrades/rolling-restart-intro.adoc b/modules/upgrade/partials/rolling-upgrades/rolling-restart-intro.adoc
index acce5c1235..327553bc0d 100644
--- a/modules/upgrade/partials/rolling-upgrades/rolling-restart-intro.adoc
+++ b/modules/upgrade/partials/rolling-upgrades/rolling-restart-intro.adoc
@@ -11,7 +11,7 @@ If you have topics with `replication.factor=1`, and if you have sufficient disk
 +
 [,bash]
 ----
-rpk redpanda admin brokers list
+rpk cluster info -b --detailed
 ----
 +
 All brokers should show `active` for `MEMBERSHIP` and `true` for `IS-ALIVE`:
@@ -45,7 +45,7 @@ If you have topics with `replication.factor=1`, and if you have sufficient disk
 +
 [,bash]
 ----
-rpk redpanda admin brokers list
+rpk cluster info -b --detailed
 ----
 +
 All brokers should show `active` for `MEMBERSHIP` and `true` for `IS-ALIVE`:
diff --git a/modules/upgrade/partials/rolling-upgrades/upgrade-your-version.adoc b/modules/upgrade/partials/rolling-upgrades/upgrade-your-version.adoc
index 55d21e1516..394f6254a3 100644
--- a/modules/upgrade/partials/rolling-upgrades/upgrade-your-version.adoc
+++ b/modules/upgrade/partials/rolling-upgrades/upgrade-your-version.adoc
@@ -19,7 +19,7 @@ First, check which versions are available and verify your current version:
 yum list --showduplicates redpanda
 
 # Check current version
-rpk redpanda admin brokers list
+rpk cluster info -b --detailed
 ----
 +
 Install the specific version you want to upgrade to. Replace `<version>` with the desired version:
@@ -39,7 +39,7 @@ First, check which versions are available and verify your current version:
 apt list --all-versions redpanda
 
 # Check current version
-rpk redpanda admin brokers list
+rpk cluster info -b --detailed
 ----
 +
 Install the specific version you want to upgrade to. Replace `<version>` with the desired version (for example, `25.1.7-1`):

From 471c36c2ab0ee263de6e673395bf79f07e4ac072 Mon Sep 17 00:00:00 2001
From: JakeSCahill <jake@redpanda.com>
Date: Tue, 28 Jul 2026 12:00:34 +0100
Subject: [PATCH 2/4] fix: replace stale --hosts/--force flags on rpk cluster
 brokers decommission

The new command takes -X admin.hosts (not --hosts), and --force is a
deprecated hidden alias for --skip-liveness-check (verified against
v26.2.1-rc2 rpk and decommission.go). Also match the Deprecated Features
page title in the admin-addresses link text.
---
 modules/get-started/pages/admin-addresses.adoc               | 2 +-
 .../pages/cluster-maintenance/decommission-brokers.adoc      | 5 ++---
 modules/manage/pages/kubernetes/k-decommission-brokers.adoc  | 2 +-
 modules/manage/pages/kubernetes/k-nodewatcher.adoc           | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/get-started/pages/admin-addresses.adoc b/modules/get-started/pages/admin-addresses.adoc
index cd9b42b326..debefd13b3 100644
--- a/modules/get-started/pages/admin-addresses.adoc
+++ b/modules/get-started/pages/admin-addresses.adoc
@@ -26,7 +26,7 @@ The following table shows which `rpk` commands require the `-X admin.hosts` or `
 | `rpk cluster` (all except `rpk cluster info` and `rpk cluster metadata`)
 | `-X admin.hosts`
 
-| `rpk redpanda admin` (deprecated in 26.2, see xref:upgrade:deprecated/index.adoc[Deprecated features])
+| `rpk redpanda admin` (deprecated in 26.2, see xref:upgrade:deprecated/index.adoc[Deprecated Features])
 | `--hosts`
 |===
 
diff --git a/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc b/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc
index f670de262d..56b1f233c3 100644
--- a/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc
+++ b/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc
@@ -235,11 +235,10 @@ rpk cluster info \
 [,bash]
 ----
 rpk cluster brokers decommission <broker-id> \
-  --hosts <broker-url>:<admin-api-port> \
-  --force
+  -X admin.hosts=<broker-url>:<admin-api-port>
 ----
 +
-NOTE: The `--force` flag is required only if the broker is not running.
+NOTE: If the broker is not running, add the `--skip-liveness-check` flag. Without this flag, the command fails when it cannot verify the version of the offline broker.
 +
 If you see `Success, broker <broker-id> has been decommissioned!`, the broker is decommissioned. Otherwise, the decommissioning process is still in progress. You can monitor the decommissioning status to follow its progress.
 
diff --git a/modules/manage/pages/kubernetes/k-decommission-brokers.adoc b/modules/manage/pages/kubernetes/k-decommission-brokers.adoc
index c2f6259340..9b9a1f13f5 100644
--- a/modules/manage/pages/kubernetes/k-decommission-brokers.adoc
+++ b/modules/manage/pages/kubernetes/k-decommission-brokers.adoc
@@ -306,7 +306,7 @@ This message is displayed before the decommission process is complete.
 Success, broker <broker-id> has been decommissioned!
 ```
 +
-TIP: If the broker is not running, use the `--force` flag.
+TIP: If the broker is not running, use the `--skip-liveness-check` flag.
 
 . Monitor the decommissioning status:
 +
diff --git a/modules/manage/pages/kubernetes/k-nodewatcher.adoc b/modules/manage/pages/kubernetes/k-nodewatcher.adoc
index a0db4db934..25ece18a9e 100644
--- a/modules/manage/pages/kubernetes/k-nodewatcher.adoc
+++ b/modules/manage/pages/kubernetes/k-nodewatcher.adoc
@@ -177,4 +177,4 @@ kubectl get persistentvolume --namespace <namespace>
 After the PVCUnbinder has finished, xref:manage:kubernetes/k-decommission-brokers.adoc[decommission the broker] that was removed from the node. This is necessary to prevent a potential loss of quorum and ensure cluster stability.
 
 // TODO(DOC-2121): Add an xref when the 26.2 rpk regen adds the rpk-cluster-brokers-decommission page.
-NOTE: Make sure to use the `--force` flag when decommissioning the broker with `rpk cluster brokers decommission`. This flag is required when the broker is no longer running.
+NOTE: Make sure to use the `--skip-liveness-check` flag when decommissioning the broker with `rpk cluster brokers decommission`. This flag is required when the broker is no longer running.

From e95d2e82673edfb346ad03b39d49064d53a61cd8 Mon Sep 17 00:00:00 2001
From: JakeSCahill <jake@redpanda.com>
Date: Tue, 28 Jul 2026 12:05:01 +0100
Subject: [PATCH 3/4] fix: update stale decommission success message to match
 rpk output

rpk has printed 'Success, broker <id> decommission started.' since at
least 26.1 (verified in decommission.go). The docs claimed a
'has been decommissioned!' message that rpk no longer prints.
---
 .../manage/pages/cluster-maintenance/decommission-brokers.adoc  | 2 +-
 modules/manage/pages/kubernetes/k-decommission-brokers.adoc     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc b/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc
index 56b1f233c3..fddd468a6d 100644
--- a/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc
+++ b/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc
@@ -240,7 +240,7 @@ rpk cluster brokers decommission <broker-id> \
 +
 NOTE: If the broker is not running, add the `--skip-liveness-check` flag. Without this flag, the command fails when it cannot verify the version of the offline broker.
 +
-If you see `Success, broker <broker-id> has been decommissioned!`, the broker is decommissioned. Otherwise, the decommissioning process is still in progress. You can monitor the decommissioning status to follow its progress.
+The command returns `Success, broker <broker-id> decommission started.` when the cluster accepts the request. Decommissioning continues in the background while partitions move off the broker. You can monitor the decommissioning status to follow its progress.
 
 . Monitor the decommissioning status:
 +
diff --git a/modules/manage/pages/kubernetes/k-decommission-brokers.adoc b/modules/manage/pages/kubernetes/k-decommission-brokers.adoc
index 9b9a1f13f5..ae06002332 100644
--- a/modules/manage/pages/kubernetes/k-decommission-brokers.adoc
+++ b/modules/manage/pages/kubernetes/k-decommission-brokers.adoc
@@ -303,7 +303,7 @@ kubectl --namespace <namespace> exec -ti <pod-name> -c <container-name> -- \
 This message is displayed before the decommission process is complete.
 +
 ```bash
-Success, broker <broker-id> has been decommissioned!
+Success, broker <broker-id> decommission started.  Use 'rpk cluster brokers decommission-status <broker-id>' to monitor data movement.
 ```
 +
 TIP: If the broker is not running, use the `--skip-liveness-check` flag.

From 0e39fbda906e95600e25141a86945a6a726539d1 Mon Sep 17 00:00:00 2001
From: Joyce Fee <joyce@redpanda.com>
Date: Tue, 28 Jul 2026 10:41:23 -0400
Subject: [PATCH 4/4] docs: convert DOC-2121 TODO placeholders to xrefs

The 26.2 rpk regen has landed on beta: the rpk-cluster-brokers and
rpk-cluster-loggers reference pages now exist (with page-aliases for
the old rpk-redpanda-admin URLs), so the plain code-font mentions that
were waiting on the regen become real xrefs, and the Deprecated
Features migration table links every replacement command.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../pages/cluster-maintenance/decommission-brokers.adoc   | 3 +--
 .../manage/pages/kubernetes/k-decommission-brokers.adoc   | 3 +--
 modules/manage/pages/kubernetes/k-nodewatcher.adoc        | 3 +--
 modules/manage/pages/use-admin-api.adoc                   | 3 +--
 modules/troubleshoot/partials/cluster-diagnostics.adoc    | 3 +--
 modules/upgrade/pages/deprecated/index.adoc               | 8 ++++----
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc b/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc
index fddd468a6d..f8fd416f93 100644
--- a/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc
+++ b/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc
@@ -267,6 +267,5 @@ If these steps do not allow the decommissioning process to complete, enable `TRA
 
 include::shared:partial$suggested-reading.adoc[]
 
-// TODO(DOC-2121): Add an xref when the 26.2 rpk regen adds the rpk-cluster-brokers-decommission page.
-* `rpk cluster brokers decommission`
+* xref:reference:rpk/rpk-cluster/rpk-cluster-brokers-decommission.adoc[`rpk cluster brokers decommission`]
 * https://redpanda.com/blog/raft-protocol-reconfiguration-solution[Engineering a more robust Raft group reconfiguration^]
diff --git a/modules/manage/pages/kubernetes/k-decommission-brokers.adoc b/modules/manage/pages/kubernetes/k-decommission-brokers.adoc
index ae06002332..98cfc7dcb9 100644
--- a/modules/manage/pages/kubernetes/k-decommission-brokers.adoc
+++ b/modules/manage/pages/kubernetes/k-decommission-brokers.adoc
@@ -737,7 +737,6 @@ include::shared:partial$suggested-reading.adoc[]
 
 - xref:manage:kubernetes/k-node-pools.adoc[Node Pools]
 
-// TODO(DOC-2121): Add an xref when the 26.2 rpk regen adds the rpk-cluster-brokers-decommission page.
-- `rpk cluster brokers decommission`
+- xref:reference:rpk/rpk-cluster/rpk-cluster-brokers-decommission.adoc[`rpk cluster brokers decommission`]
 
 - https://redpanda.com/blog/raft-protocol-reconfiguration-solution[Engineering a more robust Raft group reconfiguration^]
diff --git a/modules/manage/pages/kubernetes/k-nodewatcher.adoc b/modules/manage/pages/kubernetes/k-nodewatcher.adoc
index 25ece18a9e..710c4336cc 100644
--- a/modules/manage/pages/kubernetes/k-nodewatcher.adoc
+++ b/modules/manage/pages/kubernetes/k-nodewatcher.adoc
@@ -176,5 +176,4 @@ kubectl get persistentvolume --namespace <namespace>
 
 After the PVCUnbinder has finished, xref:manage:kubernetes/k-decommission-brokers.adoc[decommission the broker] that was removed from the node. This is necessary to prevent a potential loss of quorum and ensure cluster stability.
 
-// TODO(DOC-2121): Add an xref when the 26.2 rpk regen adds the rpk-cluster-brokers-decommission page.
-NOTE: Make sure to use the `--skip-liveness-check` flag when decommissioning the broker with `rpk cluster brokers decommission`. This flag is required when the broker is no longer running.
+NOTE: Make sure to use the `--skip-liveness-check` flag when decommissioning the broker with xref:reference:rpk/rpk-cluster/rpk-cluster-brokers-decommission.adoc[`rpk cluster brokers decommission`]. This flag is required when the broker is no longer running.
diff --git a/modules/manage/pages/use-admin-api.adoc b/modules/manage/pages/use-admin-api.adoc
index cfb78508b1..761af0d646 100644
--- a/modules/manage/pages/use-admin-api.adoc
+++ b/modules/manage/pages/use-admin-api.adoc
@@ -64,8 +64,7 @@ curl \
 rpk::
 +
 --
-// TODO(DOC-2121): Add an xref when the 26.2 rpk regen adds the rpk-cluster-brokers-decommission page.
-For Linux deployments only, run `rpk cluster brokers decommission`:
+For Linux deployments only, run xref:reference:rpk/rpk-cluster/rpk-cluster-brokers-decommission.adoc[`rpk cluster brokers decommission`]:
 
 [,bash]
 ----
diff --git a/modules/troubleshoot/partials/cluster-diagnostics.adoc b/modules/troubleshoot/partials/cluster-diagnostics.adoc
index 940f5ae041..4bee36907d 100644
--- a/modules/troubleshoot/partials/cluster-diagnostics.adoc
+++ b/modules/troubleshoot/partials/cluster-diagnostics.adoc
@@ -155,8 +155,7 @@ After applying these changes, verify the log level by <<view-redpanda-logs, chec
 
 You can override the log levels for individual subsystems, such as `rpc` and `kafka`, for more detailed logging control. Overrides exist for the entire length of the running Redpanda process.
 
-// TODO(DOC-2121): Add an xref when the 26.2 rpk regen adds the rpk-cluster-loggers-set page.
-TIP: To temporarily override the log level for individual subsystems, you can use the `rpk cluster loggers set` command.
+TIP: To temporarily override the log level for individual subsystems, you can use the xref:reference:rpk/rpk-cluster/rpk-cluster-loggers-set.adoc[`rpk cluster loggers set`] command.
 
 . List all available subsystem loggers:
 +
diff --git a/modules/upgrade/pages/deprecated/index.adoc b/modules/upgrade/pages/deprecated/index.adoc
index e5244e30d3..0cb44b83ce 100644
--- a/modules/upgrade/pages/deprecated/index.adoc
+++ b/modules/upgrade/pages/deprecated/index.adoc
@@ -126,12 +126,12 @@ ifndef::env-cloud[]
 | `rpk redpanda admin`
 | The entire `rpk redpanda admin` command tree is deprecated and hidden from help output. The old commands still work and print a pointer to their replacements. Use the following commands instead:
 
-- `rpk redpanda admin brokers decommission` → `rpk cluster brokers decommission`
-- `rpk redpanda admin brokers decommission-status` → `rpk cluster brokers decommission-status`
-- `rpk redpanda admin brokers recommission` → `rpk cluster brokers recommission`
+- `rpk redpanda admin brokers decommission` → xref:reference:rpk/rpk-cluster/rpk-cluster-brokers-decommission.adoc[`rpk cluster brokers decommission`]
+- `rpk redpanda admin brokers decommission-status` → xref:reference:rpk/rpk-cluster/rpk-cluster-brokers-decommission-status.adoc[`rpk cluster brokers decommission-status`]
+- `rpk redpanda admin brokers recommission` → xref:reference:rpk/rpk-cluster/rpk-cluster-brokers-recommission.adoc[`rpk cluster brokers recommission`]
 - `rpk redpanda admin brokers list` → xref:reference:rpk/rpk-cluster/rpk-cluster-info.adoc[`rpk cluster info`] with `-b --detailed --include-decommissioned`
 - `rpk redpanda admin config print` → xref:reference:rpk/rpk-cluster/rpk-cluster-config-list.adoc[`rpk cluster config list`] with `--node-id <ID>`
-- `rpk redpanda admin config log-level set` → `rpk cluster loggers set`
+- `rpk redpanda admin config log-level set` → xref:reference:rpk/rpk-cluster/rpk-cluster-loggers-set.adoc[`rpk cluster loggers set`]
 - `rpk redpanda admin partitions list` → xref:reference:rpk/rpk-cluster/rpk-cluster-partitions-list.adoc[`rpk cluster partitions list`] with `--node-ids <ID>`
 endif::[]
 // This feature is not supported in cloud