Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix typos in FAQ #12803

Merged
merged 2 commits into from
Jan 30, 2023
Merged

fix typos in FAQ #12803

merged 2 commits into from
Jan 30, 2023

Conversation

Oreoxmt
Copy link
Collaborator

@Oreoxmt Oreoxmt commented Jan 28, 2023

Signed-off-by: Aolin [email protected]

What is changed, added or deleted? (Required)

Fix typos (具体看参考) in faq/migration-tidb-faq.md and faq/sql-faq.md

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

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions (in Chinese).

  • master (the latest development version)
  • v6.6 (TiDB 6.6 versions)
  • v6.5 (TiDB 6.5 versions)
  • v6.4 (TiDB 6.4 versions)
  • v6.1 (TiDB 6.1 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)

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

  • This PR is translated from:
  • Other reference link(s):

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

Signed-off-by: Aolin <[email protected]>
@Oreoxmt Oreoxmt added translation/no-need No need to translate this PR. type/bugfix This PR fixes a bug. require-LGT1 Indicates that the PR requires an LGTM. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. labels Jan 28, 2023
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jan 28, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • TomShawn

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@Oreoxmt Oreoxmt requested a review from TomShawn January 28, 2023 08:01
@ti-chi-bot ti-chi-bot requested a review from qiancai January 28, 2023 08:01
@ti-chi-bot ti-chi-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 28, 2023
@Oreoxmt Oreoxmt removed the request for review from qiancai January 28, 2023 08:01
Copy link
Contributor

@TomShawn TomShawn 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-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 28, 2023
@Oreoxmt Oreoxmt closed this Jan 29, 2023
@Oreoxmt Oreoxmt reopened this Jan 29, 2023
@Oreoxmt Oreoxmt closed this Jan 29, 2023
@Oreoxmt Oreoxmt reopened this Jan 29, 2023
@Oreoxmt
Copy link
Collaborator Author

Oreoxmt commented Jan 30, 2023

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: b3fab56

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 30, 2023
@ti-chi-bot ti-chi-bot merged commit 9453a94 into pingcap:master Jan 30, 2023
@Oreoxmt Oreoxmt deleted the fix-typo branch January 30, 2023 00:06
ti-chi-bot pushed a commit to ti-chi-bot/docs-cn that referenced this pull request Jan 30, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Jan 30, 2023
14 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #12818.

ti-chi-bot added a commit that referenced this pull request Jan 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. require-LGT1 Indicates that the PR requires an LGTM. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. translation/no-need No need to translate this PR. type/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants