Skip to content

Conversation

@TomShawn
Copy link
Contributor

@TomShawn TomShawn commented Jul 21, 2020

What is changed, added or deleted? (Required)

Which TiDB version(s) do your changes apply to? (Required)

What is the related PR or file link(s)?

@TomShawn TomShawn added translation/no-need No need to translate this PR. size/small Changes of a small size. needs-cherry-pick-3.0 type/bugfix This PR fixes a bug. labels Jul 21, 2020
@TomShawn TomShawn requested a review from lilin90 July 21, 2020 02:31
@TomShawn TomShawn changed the title Modify wording faq: update descriptions about deploying TiDB on cloud Jul 21, 2020
faq/tidb-faq.md Outdated
#### 8.1.1 目前 TiDB 云上部署都支持哪些云厂商
Cloud TiDB 目前已经在腾讯云、UCloud 上线,都是数据库一级入口,欢迎大家使用。
TiDB 云上部署目前已经在腾讯云、UCloud 上线,都是数据库一级入口,欢迎大家使用。
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update it according to my suggestions on #4006.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated, PTAL.

Copy link
Member

@lilin90 lilin90 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 21, 2020
@lilin90
Copy link
Member

lilin90 commented Jul 21, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 21, 2020
@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit 8b6f19a into release-3.1 Jul 21, 2020
@TomShawn TomShawn deleted the TomShawn-patch-2 branch July 21, 2020 08:54
ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Jul 21, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-2.1 in PR #4019

ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Jul 21, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-3.0 in PR #4020

ti-srebot added a commit that referenced this pull request Jul 21, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
ti-srebot added a commit that referenced this pull request Jul 21, 2020
* cherry pick #4006 to release-2.1

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

* Update tidb-faq.md

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@lilin90 lilin90 added translation/doing This PR’s assignee is translating this PR. and removed translation/no-need No need to translate this PR. labels Jul 21, 2020
@lilin90
Copy link
Member

lilin90 commented Jul 21, 2020

@TomShawn Please refer to the English version and help update the descriptions in v3.1, v3.0, and v2.1. Thanks!

@TomShawn
Copy link
Contributor Author

TomShawn commented Jul 22, 2020

@TomShawn Please refer to the English version and help update the descriptions in v3.1, v3.0, and v2.1. Thanks!

Sure. Updated in pingcap/docs#3374, PTAL.

@TomShawn TomShawn added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR’s assignee is translating this PR. labels Jul 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/small Changes of a small size. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. type/bugfix This PR fixes a bug.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants