diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md
index 1a26052d8b..3f6961cc66 100644
--- a/docs/src/SUMMARY.md
+++ b/docs/src/SUMMARY.md
@@ -40,7 +40,6 @@
   * [Submit Bug Reports](tour-de-sol/submitting-bugs.md)
 * [Run a Validator](running-validator/README.md)
   * [Validator Requirements](running-validator/validator-reqs.md)
-  * [Choose a Testnet](running-validator/validator-testnet.md)
   * [Start a Validator](running-validator/validator-start.md)
   * [Stake](running-validator/validator-stake.md)
   * [Monitor a Validator](running-validator/validator-monitor.md)
diff --git a/docs/src/install-solana.md b/docs/src/install-solana.md
index 6cbb5bd11f..970276e323 100644
--- a/docs/src/install-solana.md
+++ b/docs/src/install-solana.md
@@ -77,3 +77,55 @@ prebuilt binaries:
 ```bash
 solana-install init
 ```
+
+# Choosing a Cluster
+
+Solana maintains several clusters, each featuring a Solana-owned validator
+that serves as an entrypoint to the cluster.
+
+Current cluster entrypoints:
+
+* Devnet: devnet.solana.com
+* Tour de SOL: tds.solana.com
+
+Application developers should target Devnet. Key differences
+between Devnet and what will be Mainnet:
+
+* Devnet tokens are not real
+* Devnet includes a token faucet for application testing
+* Devnet may be subject to ledger resets
+* Devnet typically runs a newer software version than mainnet
+* Devnet may be maintained by different validators than mainnet
+
+## Configure the Command-line
+
+You can check what cluster the Solana CLI is currently targeting by
+running the following command:
+
+```bash
+solana config get
+```
+
+Use the `solana config set` command to target a different cluster.
+For example, for Devnet, use:
+
+```bash
+solana config set --url http://devnet.solana.com:8899
+```
+
+## Ensure Versions Match
+
+Though not strictly necessary, the CLI will generally work best when its version
+matches the software version running on the cluster. To get the CLI version, run:
+
+```bash
+solana --version
+```
+
+To get the cluster version, run:
+
+```bash
+solana cluster-version
+```
+
+Ensure the CLI version is greater than or equal to the cluster version.
diff --git a/docs/src/running-validator/validator-testnet.md b/docs/src/running-validator/validator-testnet.md
deleted file mode 100644
index e98167c4a3..0000000000
--- a/docs/src/running-validator/validator-testnet.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Choosing a Testnet
-
-Solana maintains several testnets, each featuring a Solana-owned validator
-that serves as an entrypoint to the cluster.
-
-Current testnet entrypoints:
-
-* Stable: devnet.solana.com
-
-Application developers should target the Stable testnet. Key differences
-between the Stable testnet and what will be mainnet:
-
-* Stable testnet tokens are not real
-* Stable testnet includes a token faucet for application testing
-* Stable testnet may be subject to ledger resets
-* Stable testnet typically runs a newer software version than mainnet
-* Stable testnet may be maintained by different validators than mainnet
-
-The Beta testnet is used to showcase and stabilize new features before they
-are tagged for release. Application developers are free to target the Beta
-testnet, but should expect instability and periodic ledger resets. Regarding
-stability, all that can be said is that CI automation was successful.
-
-### Get Testnet Version
-
-You can submit a JSON-RPC request to see the specific software version of the
-cluster. Use this to specify [the software version to install](../install-solana.md).
-
-```bash
-curl -X POST -H 'Content-Type: application/json' -d '{"jsonrpc":"2.0","id":1, "method":"getVersion"}' devnet.solana.com:8899
-```
-Example result:
-`{"jsonrpc":"2.0","result":{"solana-core":"0.21.0"},"id":1}`
-
-## Using a Different Testnet
-
-This guide is written in the context of devnet.solana.com, our most stable
-cluster. To participate in another testnet, modify the commands in the following
-pages, replacing `devnet.solana.com` with your desired testnet.