Skip to content

Conversation

@SE-Bin
Copy link
Contributor

@SE-Bin SE-Bin commented Jun 29, 2020

add keywords

What is changed, added or deleted? (Required)

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

  • [*] master (the latest development version)
  • [*] v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

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

add keywords
@CLAassistant
Copy link

CLAassistant commented Jun 29, 2020

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions bot requested a review from TomShawn June 29, 2020 12:05
@github-actions github-actions bot added translation/welcome Waits for a contributor to translate this PR and create a PR to the pingcap/docs-cn repository. status/PTAL This PR is ready for reviewing. labels Jun 29, 2020
@TomShawn TomShawn requested a review from tangenta June 29, 2020 12:48
@TomShawn TomShawn added needs-cherry-pick-4.0 special-week PR from Document Special Week. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. and removed translation/welcome Waits for a contributor to translate this PR and create a PR to the pingcap/docs-cn repository. labels Jun 29, 2020
@TomShawn TomShawn requested review from yikeke and removed request for TomShawn June 29, 2020 12:49
@@ -0,0 +1,680 @@
---
Copy link
Contributor

Choose a reason for hiding this comment

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

You should rename keywords-and-reserved-words.md to keywords.md instead of creating a new file keywords.md. See https://github.com/pingcap/docs-cn/pull/3246/files for the exact changes you should make. Also you need to update TOC.md as https://github.com/pingcap/docs-cn/pull/3246/files. @SE-Bin

Copy link
Contributor

Choose a reason for hiding this comment

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

Please sign the CLA here, thanks~ @SE-Bin

@ti-srebot
Copy link
Contributor

@yikeke, @tangenta, PTAL.

Copy link
Contributor

@tangenta tangenta left a comment

Choose a reason for hiding this comment

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

LGTM

@yikeke yikeke requested a review from ran-huang July 2, 2020 05:40
@ran-huang
Copy link
Contributor

Since you create a new keywords.md file, please also delete the old keywords-and-reserved-words.md file in this PR. Thanks~

@ran-huang ran-huang added the status/require-change Needs the author to address comments. label Jul 2, 2020
SE-Bin and others added 8 commits July 3, 2020 13:07
Co-authored-by: Ran <huangran@pingcap.com>
Co-authored-by: Ran <huangran@pingcap.com>
Co-authored-by: Ran <huangran@pingcap.com>
Co-authored-by: Ran <huangran@pingcap.com>
Co-authored-by: Ran <huangran@pingcap.com>
Co-authored-by: Ran <huangran@pingcap.com>
@ran-huang ran-huang changed the title add keywords sql: add keywords Jul 3, 2020
@ran-huang ran-huang removed the status/require-change Needs the author to address comments. label Jul 3, 2020
@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 3, 2020
Copy link
Contributor

@ti-srebot ti-srebot 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
Copy link
Contributor

@ran-huang,Thanks for your review.

@ran-huang ran-huang merged commit 9329f34 into master Jul 3, 2020
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jul 3, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jul 3, 2020
3 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #3142

ran-huang added a commit that referenced this pull request Jul 3, 2020
* cherry pick #3063 to release-4.0

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

* resolve conflicts in aliases

Co-authored-by: Se-L <Seiferbb@126.com>
Co-authored-by: Ran <huangran@pingcap.com>
@ran-huang ran-huang deleted the SE-Bin-KeyWords branch July 3, 2020 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

special-week PR from Document Special Week. status/LGT1 Indicates that a PR has LGTM 1. status/PTAL This PR is ready for reviewing. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants