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

ambiguous words: clarify tools words #9775

Merged
merged 35 commits into from
Jun 15, 2022

Conversation

TomShawn
Copy link
Contributor

@TomShawn TomShawn commented Jun 10, 2022

What is changed, added or deleted? (Required)

ambiguous words: clarify tools words for lighting, dm, dumpling storage space

Except for the BR doc, all changes are confirmed by @sunzhaoyang.

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.1 (TiDB 6.1 versions)
  • v6.0 (TiDB 6.0 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)
  • v4.0 (TiDB 4.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

jiaqizho and others added 28 commits March 10, 2022 11:16
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has not been approved.

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.

@TomShawn TomShawn requested a review from sunzhaoyang June 10, 2022 07:39
@TomShawn TomShawn removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 15, 2022
@@ -72,7 +72,7 @@ BR 可以直接将命令下发到 TiKV 集群来执行备份和恢复,不依
运行 [`br backup`](/br/use-br-command-line-tool.md#br-命令行描述) 命令进行备份前,请确保以下条件:

1. TiDB 集群中没有正在运行中的 DDL。
2. 用于创建备份的存储设备有足够的空间。
2. 用于创建备份的存储设备有足够的空间(具有备份集群的 1/3 的磁盘空间即可)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

confirmed with @3pointer

@TomShawn
Copy link
Contributor Author

/remove-status LGT1
/status LGT2

@ti-chi-bot ti-chi-bot added the status/LGT2 Indicates that a PR has LGTM 2. label Jun 15, 2022
@ti-chi-bot
Copy link
Member

@TomShawn: These labels are not set on the issue: status/lgt1.

In response to this:

/remove-status LGT1
/status LGT2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@TomShawn
Copy link
Contributor Author

/merge

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 15, 2022
@TomShawn
Copy link
Contributor Author

/merge cancel

@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Jun 15, 2022
Copy link
Collaborator

@Oreoxmt Oreoxmt left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@sunzhaoyang sunzhaoyang left a comment

Choose a reason for hiding this comment

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

LGTM

@TomShawn
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 1f42a65

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 15, 2022
@ti-chi-bot ti-chi-bot merged commit 4a4f78f into pingcap:master Jun 15, 2022
@TomShawn TomShawn deleted the ambiguous-words-1 branch June 15, 2022 09:44
ti-chi-bot pushed a commit to ti-chi-bot/docs-cn that referenced this pull request Jun 15, 2022
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #9841.

ti-chi-bot pushed a commit to ti-chi-bot/docs-cn that referenced this pull request Jun 15, 2022
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #9842.

TomShawn added a commit that referenced this pull request Jun 15, 2022
TomShawn added a commit that referenced this pull request Jun 15, 2022
@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 Jun 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ambiguous-words area/migrate Indicates that the Issue or PR belongs to the area of TiDB migration tools. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. type/enhancement The issue or PR belongs to an enhancement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants