Skip to content

resolve docs that are not in TOC#3981

Merged
ti-srebot merged 5 commits into
pingcap:masterfrom
yikeke:remove-a-file
Jul 17, 2020
Merged

resolve docs that are not in TOC#3981
ti-srebot merged 5 commits into
pingcap:masterfrom
yikeke:remove-a-file

Conversation

@yikeke
Copy link
Copy Markdown
Contributor

@yikeke yikeke commented Jul 16, 2020

What is changed, added or deleted? (Required)

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

This PR resolves the last few docs that are not in TOC.md in docs-cn repo:

  1. remove architecture.md to fix architecture: add tidb-architecture, tidb-computing, tidb-storage #3222
  2. tidb-lightning/tidb-lightning-misuse-handling.md is duplicate with troubleshoot-tidb-lightning.md so removed it
  3. deletes check-cluster-status-using-sql-statements.md and redirects it to system-tables/system-table-sql-diagnostics.md
  4. add TiDB V4.0 Roadmap in TOC
  • 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)?

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

Comment thread architecture.md
@@ -1,32 +0,0 @@
---
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This file is replaced by tidb-architecture.md and the alias has been added there.

This might be related to pingcap/docs#3300 @ran-huang
and https://github.com/pingcap/docs/pull/3094/files#r455682705 @lilin90 @uglyengineer

@yikeke yikeke added needs-cherry-pick-4.0 translation/doing This PR’s assignee is translating this PR. labels Jul 16, 2020
@yikeke yikeke self-assigned this Jul 16, 2020
@yikeke yikeke marked this pull request as ready for review July 17, 2020 03:20
@yikeke yikeke requested review from ran-huang and uglyengineer July 17, 2020 03:21
@yikeke yikeke added require-LGT1 Indicates that the PR requires an LGTM. requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. labels Jul 17, 2020
Copy link
Copy Markdown
Contributor

@ran-huang ran-huang 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 17, 2020
@yikeke
Copy link
Copy Markdown
Contributor Author

yikeke commented Jul 17, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 17, 2020
@ti-srebot
Copy link
Copy Markdown
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit 638fd60 into pingcap:master Jul 17, 2020
ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Jul 17, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Copy Markdown
Contributor

cherry pick to release-4.0 in PR #3985

ti-srebot added a commit that referenced this pull request Jul 17, 2020
* cherry pick #3981 to release-4.0

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

* remove 3 files

* resolve conflicts

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Co-authored-by: yikeke <yikeke@pingcap.com>
@yikeke yikeke changed the title remove a doc that is not in TOC resolve docs that are not in TOC Jul 17, 2020
yikeke pushed a commit to yikeke/docs that referenced this pull request Jul 28, 2020
@yikeke yikeke deleted the remove-a-file branch July 28, 2020 05:07
@yikeke yikeke removed the translation/doing This PR’s assignee is translating this PR. label Jul 28, 2020
@yikeke yikeke added the translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. label Jul 28, 2020
summary: 了解 SQL 诊断功能。
category: reference
aliases: ['/docs-cn/dev/reference/system-databases/sql-diagnosis/','/docs-cn/dev/system-tables/system-table-sql-diagnosis/']
aliases: ['/docs-cn/dev/reference/system-databases/sql-diagnosis/','/docs-cn/dev/system-tables/system-table-sql-diagnosis/','/zh/tidb/dev/check-cluster-status-using-sql-statements']
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Added the '/docs-cn/dev/reference/performance/check-cluster-status-using-sql-statements/' alias back in #4076

ti-srebot pushed a commit to pingcap/docs that referenced this pull request Jul 31, 2020
* align pingcap/docs-cn#3981

* Update troubleshoot-tidb-lightning.md

* add import-example-data.md

* Update TOC.md

Co-authored-by: Lilian Lee <lilin@pingcap.com>
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-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants