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

Split the original FAQ to multiple files #3240

Merged
merged 43 commits into from
Jul 21, 2020
Merged

Split the original FAQ to multiple files #3240

merged 43 commits into from
Jul 21, 2020

Conversation

Joyinqin
Copy link
Contributor

@Joyinqin Joyinqin commented Jul 11, 2020 •
edited by lilin90
Loading

What is changed, added or deleted? (Required)

Note: One link that jumps to faq/deploy-and-maintain-faq.md (added in #3241) is used in this PR, so we should first merge #3241. Otherwise, the lint check fails.

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

@Joyinqin
Copy link
Contributor Author

/label translation/from-docs-cn

@ti-srebot ti-srebot added the translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. label Jul 11, 2020
@yikeke yikeke requested review from lilin90 and kissmydb July 13, 2020 03:12
TomShawn
TomShawn reviewed Jul 14, 2020
View reviewed changes
faq/migration-tidb-faq.md Outdated Show resolved Hide resolved
TomShawn
TomShawn reviewed Jul 14, 2020
View reviewed changes
faq/sql-faq.md Outdated Show resolved Hide resolved
@lilin90
Copy link
Member

lilin90 commented Jul 14, 2020 •
edited
Loading

@TomShawn Please help @Joyinqin to resolve the conflicts. Thanks!
@Joyinqin Please learn how to resolve a conflict.

@Joyinqin
Copy link
Contributor Author

/label needs-cherry-pick-4. 0

@ti-srebot
Copy link
Contributor

These labels are not found needs-cherry-pick-4. 0.

lilin90
lilin90 requested changes Jul 20, 2020
View reviewed changes
Copy link
Member

@lilin90 lilin90 left a comment

Choose a reason for hiding this comment

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

Some content is missed or incorrect or mistakenly placed. Please also pay attention to format (missing spaces after punctuation within a paragraph, use of code block format, etc.)

TOC.md Outdated Show resolved Hide resolved
tidb-lightning/deploy-tidb-lightning.md Outdated Show resolved Hide resolved
faq/tidb-faq.md Outdated Show resolved Hide resolved
faq/tidb-faq.md Outdated Show resolved Hide resolved
faq/high-availability-faq.md Outdated Show resolved Hide resolved
faq/sql-faq.md Outdated Show resolved Hide resolved
faq/sql-faq.md Show resolved Hide resolved
faq/sql-faq.md Outdated Show resolved Hide resolved
faq/sql-faq.md Outdated Show resolved Hide resolved
faq/sql-faq.md Outdated Show resolved Hide resolved
lilin90
lilin90 reviewed Jul 21, 2020
View reviewed changes
TOC.md Outdated Show resolved Hide resolved
lilin90
lilin90 approved these changes Jul 21, 2020
View reviewed changes
Copy link
Member

@lilin90 lilin90 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 ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 21, 2020
@lilin90 lilin90 merged commit d5a8134 into pingcap:master Jul 21, 2020
@lilin90 lilin90 changed the title Update faq Split the original FAQ to multiple files Jul 21, 2020
@lilin90
Copy link
Member

lilin90 commented Jul 21, 2020

/run-cherry-picker

ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jul 21, 2020
@Joyinqin @ti-srebot
cherry pick pingcap#3240 to release-4.0
8777c6e 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jul 21, 2020
Merged
5 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #3363

lilin90 added a commit that referenced this pull request Jul 21, 2020
@ti-srebot @Joyinqin @lilin90
Split the original FAQ to multiple files (#3240) (#3363)
9b31ca8 
* cherry pick #3240 to release-4.0

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

* Resolve the conflict

Co-authored-by: JoyinQ <56883733+Joyinqin@users.noreply.github.com>
Co-authored-by: Lilian Lee <lilin@pingcap.com>
@TomShawn TomShawn mentioned this pull request Jul 22, 2020
Merged
9 tasks
@lilin90 lilin90 mentioned this pull request Jul 22, 2020
Merged
9 tasks
This was referenced Jul 22, 2020
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TomShawn TomShawn TomShawn left review comments

@lilin90 lilin90 lilin90 approved these changes

@kissmydb kissmydb Awaiting requested review from kissmydb

Assignees
No one assigned
Labels
status/LGT1 Indicates that a PR has LGTM 1. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Joyinqin @lilin90 @TomShawn @ti-srebot