From 5efe679af62ae74ea2d429d826f7417e47ed1b9d Mon Sep 17 00:00:00 2001 From: Lilian Lee Date: Tue, 12 Aug 2025 19:12:07 +0800 Subject: [PATCH 1/2] This is an automated cherry-pick of #21357 Signed-off-by: ti-chi-bot --- develop/dev-guide-build-cluster-in-cloud.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/develop/dev-guide-build-cluster-in-cloud.md b/develop/dev-guide-build-cluster-in-cloud.md index ec9562c8cc497..37500e3811298 100644 --- a/develop/dev-guide-build-cluster-in-cloud.md +++ b/develop/dev-guide-build-cluster-in-cloud.md @@ -9,7 +9,7 @@ summary: Learn how to build a {{{ .starter }}} cluster in TiDB Cloud and connect -This document walks you through the quickest way to get started with TiDB. You will use [TiDB Cloud](https://www.pingcap.com/tidb-cloud) to create a {{{ .starter }}} cluster, connect to it, and run a sample application on it. +This document walks you through the quickest way to get started with TiDB. You will use [TiDB Cloud](https://www.pingcap.com/tidb-cloud) to create a {{{ .starter }}} (formerly Serverless) cluster, connect to it, and run a sample application on it. If you need to run TiDB on your local machine, see [Starting TiDB Locally](/quick-start-with-tidb.md). @@ -29,7 +29,11 @@ This document walks you through the quickest way to get started with TiDB Cloud. 3. On the [**Clusters**](https://tidbcloud.com/console/clusters) page, click **Create Cluster**. +<<<<<<< HEAD 4. On the **Create Cluster** page, **Serverless** is selected by default. Update the default cluster name if necessary, and then select the [cluster plan](https://docs.pingcap.com/tidbcloud/select-cluster-tier#cluster-plans). +======= +4. On the **Create Cluster** page, **Starter** is selected by default. Update the default cluster name if necessary, and then select the region where you want to create your cluster. +>>>>>>> bd9b17a3f1 (develop: update serverless to starter (#21357)) 5. Click **Create** to create a {{{ .starter }}} cluster. From 9724899f875bd0fa79fbc0b0addccdb1536fd7af Mon Sep 17 00:00:00 2001 From: lilin90 Date: Tue, 12 Aug 2025 19:17:50 +0800 Subject: [PATCH 2/2] Fix merge conflict in cloud cluster build guide Resolved a merge conflict in the dev-guide-build-cluster-in-cloud.md file by keeping the updated instructions for selecting the 'Starter' plan and region when creating a cluster. --- develop/dev-guide-build-cluster-in-cloud.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/develop/dev-guide-build-cluster-in-cloud.md b/develop/dev-guide-build-cluster-in-cloud.md index 37500e3811298..062464ac546d7 100644 --- a/develop/dev-guide-build-cluster-in-cloud.md +++ b/develop/dev-guide-build-cluster-in-cloud.md @@ -29,11 +29,7 @@ This document walks you through the quickest way to get started with TiDB Cloud. 3. On the [**Clusters**](https://tidbcloud.com/console/clusters) page, click **Create Cluster**. -<<<<<<< HEAD -4. On the **Create Cluster** page, **Serverless** is selected by default. Update the default cluster name if necessary, and then select the [cluster plan](https://docs.pingcap.com/tidbcloud/select-cluster-tier#cluster-plans). -======= 4. On the **Create Cluster** page, **Starter** is selected by default. Update the default cluster name if necessary, and then select the region where you want to create your cluster. ->>>>>>> bd9b17a3f1 (develop: update serverless to starter (#21357)) 5. Click **Create** to create a {{{ .starter }}} cluster.