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.

Sign up for GitHub

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

Jump to bottom

Fix bugs in 5.0 docs #5208

Merged
merged 19 commits into from
Jan 4, 2021
Merged

Fix bugs in 5.0 docs #5208

merged 19 commits into from
Jan 4, 2021

Conversation

TomShawn
Copy link
Contributor

@TomShawn TomShawn commented Dec 30, 2020 •
edited
Loading

What is changed, added or deleted? (Required)

Fix some bugs.

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)?

  • 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

@TomShawn TomShawn added translation/doing This PR’s assignee is translating this PR. size/small Changes of a small size. type/bugfix This PR fixes a bug. status/PTAL This PR is ready for reviewing. needs-cherry-pick-5.0 labels Dec 30, 2020
@TomShawn TomShawn self-assigned this Dec 30, 2020
@sticnarf
Copy link
Contributor

And there are some other wording changes: #5181 (review)

@scsldb also suggests "本特性与 TiDB Binlog 不兼容，开启 TiDB Binlog 时本配置将不生效。" should also be a warning.

@TomShawn
Copy link
Contributor Author

And there are some other wording changes: #5181 (review)

@scsldb also suggests "本特性与 TiDB Binlog 不兼容，开启 TiDB Binlog 时本配置将不生效。" should also be a warning.

Done

@TomShawn TomShawn requested review from sticnarf and scsldb December 30, 2020 09:22
@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 Dec 30, 2020
@TomShawn TomShawn assigned Joyinqin and unassigned TomShawn Dec 30, 2020
sticnarf
sticnarf approved these changes Dec 30, 2020
View reviewed changes
Copy link
Contributor

@sticnarf sticnarf 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

@sticnarf, Thanks for your review. The bot only counts LGTMs from Reviewers and higher roles, but you're still welcome to leave your comments. See the corresponding SIG page for more information. Related SIG: docs(slack).

@TomShawn TomShawn changed the title system-variable: change a note to warning Fix bugs in 5.0 docs Dec 30, 2020
@ti-srebot
Copy link
Contributor

@sticnarf, @scsldb, PTAL.

1 similar comment
@ti-srebot
Copy link
Contributor

@sticnarf, @scsldb, PTAL.

TomShawn
TomShawn commented Jan 4, 2021
View reviewed changes
system-variables.md Outdated Show resolved Hide resolved
@TomShawn TomShawn mentioned this pull request Jan 4, 2021
Merged
10 tasks
@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 4, 2021
TomShawn
TomShawn commented Jan 4, 2021
View reviewed changes
system-variables.md Outdated Show resolved Hide resolved
@TomShawn TomShawn merged commit cefac73 into master Jan 4, 2021
@TomShawn TomShawn deleted the TomShawn-patch-1 branch January 4, 2021 03:21
ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Jan 4, 2021
@TomShawn @ti-srebot
cherry pick pingcap#5208 to release-5.0
6f9a8ae 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Jan 4, 2021
Merged
10 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #5238

TomShawn added a commit that referenced this pull request Jan 4, 2021
@ti-srebot @TomShawn
Fix bugs in 5.0 docs (#5208) (#5238)
0324737 
* cherry pick #5208 to release-5.0

Signed-off-by: ti-srebot <[email protected]>

* Update backup-and-restore-using-dumpling-lightning.md

Co-authored-by: TomShawn <[email protected]>
@TomShawn TomShawn added the requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. label Jan 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yikeke yikeke yikeke approved these changes

@sticnarf sticnarf sticnarf approved these changes

@scsldb scsldb Awaiting requested review from scsldb

Assignees

@Joyinqin Joyinqin

Labels
requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. size/small Changes of a small size. status/LGT1 Indicates that a PR has LGTM 1. status/PTAL This PR is ready for reviewing. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@TomShawn @sticnarf @ti-srebot @yikeke @Joyinqin