From 560cc1d577c1a7cdedc92e1dc0711f9a6fd63299 Mon Sep 17 00:00:00 2001 From: Grace Cai Date: Sat, 2 Apr 2022 11:54:30 +0800 Subject: [PATCH 1/3] This is an automated cherry-pick of #7986 Signed-off-by: ti-chi-bot --- _index.md | 2 +- overview.md | 4 ++++ quick-start-with-tidb.md | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/_index.md b/_index.md index 32225d333268a..af94118e47b1e 100644 --- a/_index.md +++ b/_index.md @@ -8,7 +8,7 @@ aliases: ['/docs/','/docs/stable/','/docs/v4.0/'] [TiDB](https://github.com/pingcap/tidb) (/’taɪdiːbi:/, "Ti" stands for Titanium) is an open-source, distributed, NewSQL database that supports Hybrid Transactional and Analytical Processing (HTAP) workloads. It is MySQL compatible and features horizontal scalability, strong consistency, and high availability. TiDB can be deployed on-premise or in-cloud. -Designed for the cloud, TiDB provides flexible scalability, reliability and security on the cloud platform. Users can elastically scale TiDB to meet the requirements of their changing workloads. [TiDB Operator](https://docs.pingcap.com/tidb-in-kubernetes/v1.1/tidb-operator-overview) helps manage TiDB on Kubernetes and automates operating tasks, which makes TiDB easier to deploy on any cloud that provides managed Kubernetes. [TiDB Cloud](https://pingcap.com/products/tidbcloud) (Public Preview), the fully-managed TiDB service, is the easiest, most economical, and most resilient way to unlock the full power of [TiDB in the cloud](https://docs.pingcap.com/tidbcloud/beta), allowing you to deploy and run TiDB clusters with just a few clicks. +Designed for the cloud, TiDB provides flexible scalability, reliability and security on the cloud platform. Users can elastically scale TiDB to meet the requirements of their changing workloads. [TiDB Operator](https://docs.pingcap.com/tidb-in-kubernetes/v1.1/tidb-operator-overview) helps manage TiDB on Kubernetes and automates operating tasks, which makes TiDB easier to deploy on any cloud that provides managed Kubernetes. [TiDB Cloud](https://pingcap.com/tidb-cloud/), the fully-managed TiDB service, is the easiest, most economical, and most resilient way to unlock the full power of [TiDB in the cloud](https://docs.pingcap.com/tidbcloud/), allowing you to deploy and run TiDB clusters with just a few clicks. diff --git a/overview.md b/overview.md index 468891ab7099d..a4c7cb782557b 100644 --- a/overview.md +++ b/overview.md @@ -24,7 +24,11 @@ aliases: ['/docs/stable/overview/','/docs/v4.0/overview/','/docs/v4.0/key-featur - **Cloud-native distributed database** +<<<<<<< HEAD TiDB is a distributed database designed for the cloud, providing flexible scalability, reliability and security on the cloud platform. Users can elastically scale TiDB to meet the requirements of their changing workloads. In TiDB, each piece of data has 3 replicas at least, which can be scheduled in different cloud availability zones to tolerate the outage of a whole data center. [TiDB Operator](https://docs.pingcap.com/tidb-in-kubernetes/v1.1/tidb-operator-overview) helps manage TiDB on Kubernetes and automates tasks related to operating the TiDB cluster, which makes TiDB easier to deploy on any cloud that provides managed Kubernetes. [TiDB Cloud](https://pingcap.com/products/tidbcloud) (Beta), the fully-managed TiDB service, is the easiest, most economical, and most resilient way to unlock the full power of [TiDB in the cloud](https://docs.pingcap.com/tidbcloud/beta), allowing you to deploy and run TiDB clusters with just a few clicks. +======= + TiDB is a distributed database designed for the cloud, providing flexible scalability, reliability and security on the cloud platform. Users can elastically scale TiDB to meet the requirements of their changing workloads. In TiDB, each piece of data has 3 replicas at least, which can be scheduled in different cloud availability zones to tolerate the outage of a whole data center. [TiDB Operator](https://docs.pingcap.com/tidb-in-kubernetes/stable/tidb-operator-overview) helps manage TiDB on Kubernetes and automates tasks related to operating the TiDB cluster, which makes TiDB easier to deploy on any cloud that provides managed Kubernetes. [TiDB Cloud](https://pingcap.com/tidb-cloud/), the fully-managed TiDB service, is the easiest, most economical, and most resilient way to unlock the full power of [TiDB in the cloud](https://docs.pingcap.com/tidbcloud/), allowing you to deploy and run TiDB clusters with just a few clicks. +>>>>>>> 361dee2e5 (update the release info of TiDB Cloud (#7986)) - **Compatible with the MySQL 5.7 protocol and MySQL ecosystem** diff --git a/quick-start-with-tidb.md b/quick-start-with-tidb.md index f6954432d18e2..8fa80c4d5076e 100644 --- a/quick-start-with-tidb.md +++ b/quick-start-with-tidb.md @@ -15,9 +15,17 @@ This guide walks you through the quickest way to get started with TiDB. For non- > > The deployment method provided in this guide is **ONLY FOR** quick start, **NOT FOR** production. > +<<<<<<< HEAD > - To deploy an on-premises production cluster, see [production installation guide](/production-deployment-using-tiup.md). > - To deploy TiDB in Kubernetes, see [Get Started with TiDB in Kubernetes](https://docs.pingcap.com/tidb-in-kubernetes/stable/get-started). > - To manage TiDB in the cloud, see [TiDB Cloud Quick Start](https://docs.pingcap.com/tidbcloud/beta/tidb-cloud-quickstart). +======= +> - The deployment method provided in this guide is **ONLY FOR** quick start, **NOT FOR** production. +> +> - To deploy an on-premises production cluster, see [production installation guide](/production-deployment-using-tiup.md). +> - To deploy TiDB in Kubernetes, see [Get Started with TiDB in Kubernetes](https://docs.pingcap.com/tidb-in-kubernetes/stable/get-started). +> - To manage TiDB in the cloud, see [TiDB Cloud Quick Start](https://docs.pingcap.com/tidbcloud/tidb-cloud-quickstart). +>>>>>>> 361dee2e5 (update the release info of TiDB Cloud (#7986)) ## Deploy a local test cluster From 76f006ea5a6d23501605a21127df754a59770383 Mon Sep 17 00:00:00 2001 From: Grace Cai Date: Sat, 2 Apr 2022 12:08:59 +0800 Subject: [PATCH 2/3] Update quick-start-with-tidb.md --- quick-start-with-tidb.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/quick-start-with-tidb.md b/quick-start-with-tidb.md index 8fa80c4d5076e..525afcdd30a16 100644 --- a/quick-start-with-tidb.md +++ b/quick-start-with-tidb.md @@ -15,17 +15,9 @@ This guide walks you through the quickest way to get started with TiDB. For non- > > The deployment method provided in this guide is **ONLY FOR** quick start, **NOT FOR** production. > -<<<<<<< HEAD > - To deploy an on-premises production cluster, see [production installation guide](/production-deployment-using-tiup.md). > - To deploy TiDB in Kubernetes, see [Get Started with TiDB in Kubernetes](https://docs.pingcap.com/tidb-in-kubernetes/stable/get-started). -> - To manage TiDB in the cloud, see [TiDB Cloud Quick Start](https://docs.pingcap.com/tidbcloud/beta/tidb-cloud-quickstart). -======= -> - The deployment method provided in this guide is **ONLY FOR** quick start, **NOT FOR** production. -> -> - To deploy an on-premises production cluster, see [production installation guide](/production-deployment-using-tiup.md). -> - To deploy TiDB in Kubernetes, see [Get Started with TiDB in Kubernetes](https://docs.pingcap.com/tidb-in-kubernetes/stable/get-started). -> - To manage TiDB in the cloud, see [TiDB Cloud Quick Start](https://docs.pingcap.com/tidbcloud/tidb-cloud-quickstart). ->>>>>>> 361dee2e5 (update the release info of TiDB Cloud (#7986)) +> - To manage TiDB in the cloud, see [TiDB Cloud Quick Start](https://docs.pingcap.com/tidbcloud/tidb-cloud-quickstart). ## Deploy a local test cluster From 8349d345fdc5ea3e03b2ee61f02cbf1286fc37f8 Mon Sep 17 00:00:00 2001 From: Grace Cai Date: Sat, 2 Apr 2022 12:11:07 +0800 Subject: [PATCH 3/3] Apply suggestions from code review --- overview.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/overview.md b/overview.md index a4c7cb782557b..e5278a9c94f23 100644 --- a/overview.md +++ b/overview.md @@ -24,11 +24,7 @@ aliases: ['/docs/stable/overview/','/docs/v4.0/overview/','/docs/v4.0/key-featur - **Cloud-native distributed database** -<<<<<<< HEAD - TiDB is a distributed database designed for the cloud, providing flexible scalability, reliability and security on the cloud platform. Users can elastically scale TiDB to meet the requirements of their changing workloads. In TiDB, each piece of data has 3 replicas at least, which can be scheduled in different cloud availability zones to tolerate the outage of a whole data center. [TiDB Operator](https://docs.pingcap.com/tidb-in-kubernetes/v1.1/tidb-operator-overview) helps manage TiDB on Kubernetes and automates tasks related to operating the TiDB cluster, which makes TiDB easier to deploy on any cloud that provides managed Kubernetes. [TiDB Cloud](https://pingcap.com/products/tidbcloud) (Beta), the fully-managed TiDB service, is the easiest, most economical, and most resilient way to unlock the full power of [TiDB in the cloud](https://docs.pingcap.com/tidbcloud/beta), allowing you to deploy and run TiDB clusters with just a few clicks. -======= - TiDB is a distributed database designed for the cloud, providing flexible scalability, reliability and security on the cloud platform. Users can elastically scale TiDB to meet the requirements of their changing workloads. In TiDB, each piece of data has 3 replicas at least, which can be scheduled in different cloud availability zones to tolerate the outage of a whole data center. [TiDB Operator](https://docs.pingcap.com/tidb-in-kubernetes/stable/tidb-operator-overview) helps manage TiDB on Kubernetes and automates tasks related to operating the TiDB cluster, which makes TiDB easier to deploy on any cloud that provides managed Kubernetes. [TiDB Cloud](https://pingcap.com/tidb-cloud/), the fully-managed TiDB service, is the easiest, most economical, and most resilient way to unlock the full power of [TiDB in the cloud](https://docs.pingcap.com/tidbcloud/), allowing you to deploy and run TiDB clusters with just a few clicks. ->>>>>>> 361dee2e5 (update the release info of TiDB Cloud (#7986)) + TiDB is a distributed database designed for the cloud, providing flexible scalability, reliability and security on the cloud platform. Users can elastically scale TiDB to meet the requirements of their changing workloads. In TiDB, each piece of data has 3 replicas at least, which can be scheduled in different cloud availability zones to tolerate the outage of a whole data center. [TiDB Operator](https://docs.pingcap.com/tidb-in-kubernetes/v1.1/tidb-operator-overview) helps manage TiDB on Kubernetes and automates tasks related to operating the TiDB cluster, which makes TiDB easier to deploy on any cloud that provides managed Kubernetes. [TiDB Cloud](https://pingcap.com/tidb-cloud/), the fully-managed TiDB service, is the easiest, most economical, and most resilient way to unlock the full power of [TiDB in the cloud](https://docs.pingcap.com/tidbcloud/), allowing you to deploy and run TiDB clusters with just a few clicks. - **Compatible with the MySQL 5.7 protocol and MySQL ecosystem**