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

Batch fix doc issues in tiup docs #6042

Merged
merged 13 commits into from
Apr 26, 2021

Conversation

TomShawn
Copy link
Contributor

@TomShawn TomShawn commented Apr 15, 2021

What is changed, added or deleted? (Required)

Batch fix typos in tiup docs

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

  • master (the latest development version)
  • v5.0 (TiDB 5.0 versions)
  • 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)?

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

@ti-chi-bot ti-chi-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. missing-translation-status This PR does not have translation status info. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Apr 15, 2021
@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Apr 20, 2021
@TomShawn
Copy link
Contributor Author

/cc @qiancai @lucklove
/translation no-need
/label needs-cherry-pick-5.0
/label needs-cherry-pick-4.0

@ti-chi-bot ti-chi-bot requested review from lucklove and qiancai April 20, 2021 06:53
@ti-chi-bot ti-chi-bot added translation/no-need No need to translate this PR. needs-cherry-pick-5.0 and removed missing-translation-status This PR does not have translation status info. labels Apr 20, 2021
@TomShawn TomShawn marked this pull request as ready for review April 20, 2021 06:53
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 20, 2021
@lucklove
Copy link
Member

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 20, 2021
tiup/tiup-command-list.md Outdated Show resolved Hide resolved
tiup/tiup-command-mirror-clone.md Outdated Show resolved Hide resolved
tiup/tiup-command-mirror-clone.md Show resolved Hide resolved
tiup/tiup-command-mirror-clone.md Show resolved Hide resolved
Comment on lines 46 to 50
### --standalone

该组件是否可独立运行。本参数目前尚未启用。
- 该组件是否可独立运行。本参数目前尚未启用。
- 数据类型:`BOOLEAN`
- 该选项默认关闭,默认值为 `false`。在命令中添加该选项,并传入 `true` 值或不传值,均可开启此功能。
Copy link
Collaborator

Choose a reason for hiding this comment

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

@lucklove, 请问如果此参数尚未启用,对用户就没有什么意义,所以暂时不需要提前放到用户文档里?

Copy link
Member

Choose a reason for hiding this comment

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

可以的

Comment on lines 62 to 66
### --standalone

该组件是否可独立运行。该参数目前尚未启用。
- 该组件是否可独立运行。该参数目前尚未启用。
- 数据类型:`BOOLEAN`
- 该选项默认关闭,默认值为 `false`。在命令中添加该选项,并传入 `true` 值或不传值,均可开启此功能。
Copy link
Collaborator

Choose a reason for hiding this comment

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

@lucklove , 请问如果此参数尚未启用,对用户就没有什么意义,所以暂时不需要提前放到用户文档里?

在组件二进制文件部署之后,会对 TiDB,TiKV 和 PD 组件执行配置检查,检查方式为 `<binary> --config-check <config-file>`,其中 `<bianry>` 为部署的二进制文件的路径,`<config-file>` 为根据用户配置生成的配置文件。
- 在组件二进制文件部署之后,会对 TiDB,TiKV 和 PD 组件执行配置检查,检查方式为 `<binary> --config-check <config-file>`,其中 `<binary>` 为部署的二进制文件的路径,`<config-file>` 为根据用户配置生成的配置文件。
- 数据类型:`BOOLEAN`
- 该选项默认关闭,默认值为 `false`。在命令中添加该选项,并传入 `true` 值或不传值,均可开启此功能。

如果想要跳过该项检查,可以使用该选项。
Copy link
Collaborator

Choose a reason for hiding this comment

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

如果把这句话挪到第一个item 后面, 是否也可以呢?
“如果想要跳过该项检查,可以使用该选项。”

在某些情况下,有可能集群中的某些节点已经宕机,导致无法通过 SSH 连接到节点进行操作,这个时候可以通过 `--force` 选项忽略这些错误。
- 在某些情况下,有可能集群中的某些节点已经宕机,导致无法通过 SSH 连接到节点进行操作,这个时候可以通过 `--force` 选项忽略这些错误。
- 数据类型:`BOOLEAN`
- 该选项默认关闭,默认值为 `false`。在命令中添加该选项,并传入 `true` 值或不传值,均可开启此功能。

### --retain-node-data(StringArray,默认为空)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should the info here about the data type and default value be updated to an unordered list too?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There are hundreds of similar modifications to make in the TiUP docs and the workload can be huge. This PR only updates/refines a part of them. Other unrefined titles will be refined in upcoming PRs.

tiup/tiup-component-dm.md Outdated Show resolved Hide resolved
该选项开启日志清理,若不指定该选项,也不指定 `--all`,则不清理日志。
- 该选项开启日志清理,若不指定该选项,也不指定 `--all`,则不清理日志。
- 数据类型:`BOOLEAN`
- 该选项默认关闭,默认值为 `false`。在命令中添加该选项,并传入 `true` 值或不传值,均可开启此功能。

### --ignore-node(StringArray,默认为空)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should the info here about the data type and default value be updated to an unordered list too?

Copy link
Contributor Author

@TomShawn TomShawn Apr 21, 2021

Choose a reason for hiding this comment

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

There are hundreds of similar modifications to make in the TiUP docs and the workload can be huge. This PR only updates/refines a part of them. Other unrefined titles will be refined in upcoming PRs.

Co-authored-by: Grace Cai <qqzczy@126.com>
tiup/tiup-component-dm.md Outdated Show resolved Hide resolved
@TomShawn
Copy link
Contributor Author

@qiancai All your comments above are addressed in 7a80678. PTAL again. Thanks!

@ti-chi-bot
Copy link
Member

@qiancai: /lgtm is only allowed for the reviewers in list.

In response to this:

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.

@qiancai
Copy link
Collaborator

qiancai commented Apr 26, 2021

/lgtm

@ti-chi-bot
Copy link
Member

@qiancai: /lgtm is only allowed for the reviewers in list.

In response to this:

/lgtm

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.

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CharLotteiu
  • lucklove

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Apr 26, 2021
@TomShawn
Copy link
Contributor Author

/label require-LGT1

@ti-chi-bot ti-chi-bot added the require-LGT1 Indicates that the PR requires an LGTM. label Apr 26, 2021
@TomShawn
Copy link
Contributor Author

/remove-translation no-need
/translation doing
/assign

@ti-chi-bot ti-chi-bot added translation/doing This PR’s assignee is translating this PR. and removed translation/no-need No need to translate this PR. labels Apr 26, 2021
@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: da0123d

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 26, 2021
@ti-chi-bot ti-chi-bot merged commit 3e454f1 into pingcap:master Apr 26, 2021
ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Apr 26, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #6165

@TomShawn TomShawn deleted the fix-typo-tiup-multiple branch April 26, 2021 03:10
ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Apr 26, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #6166

@TomShawn TomShawn added requires-followup This PR requires a follow-up task after being merged. translation/no-need No need to translate this PR. and removed translation/doing This PR’s assignee is translating this PR. labels Jul 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
require-LGT1 Indicates that the PR requires an LGTM. requires-followup This PR requires a follow-up task after being merged. size/XXL Denotes a PR that changes 1000+ 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/no-need No need to translate this PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants