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

Merge docs special week branch to master #3372

Merged
merged 201 commits into from
May 27, 2020
Merged

Merge docs special week branch to master #3372

merged 201 commits into from
May 27, 2020

Conversation

yikeke
Copy link
Contributor

@yikeke yikeke commented May 27, 2020

What is changed, added or deleted? (Required)

Merge docs special week branch to master

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

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

lilin90 and others added 30 commits May 18, 2020 11:32
* TOC: add database tools section

* fix ci

* relocate the section

* add assignees

* add /faq/licensing-faq.md

* modify assignees
Signed-off-by: nolouch <nolouch@gmail.com>

Co-authored-by: Lilian Lee <lilin@pingcap.com>
Duplicated with TiDB's upgrade manual.

Co-authored-by: ruoxi <zanmato1984@gmail.com>
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
* add tiflash faq

* delete original tiflash faq

* fix ci

* address comment

* Revert "fix ci"

This reverts commit 73dff28.

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
* update tikv configuration about pessimistic transaction

Signed-off-by: youjiali1995 <zlwgx1023@gmail.com>

* Update tikv-configuration-file.md

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>

* Update tikv-configuration-file.md

Co-authored-by: toutdesuite <guizhiluo2014@163.com>

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-authored-by: toutdesuite <guizhiluo2014@163.com>
* tuning: add tune-operating-system

Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>

* refine format and TOC

* Update tune-operating-system.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Update tune-operating-system.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Update tune-operating-system.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Update tune-operating-system.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Update tune-operating-system.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Update tune-operating-system.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Update tune-operating-system.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Update tune-operating-system.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

Co-authored-by: yikeke <yikeke@pingcap.com>
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Co-authored-by: pingcap-github-bot <sre-bot@pingcap.com>
bb7133 and others added 13 commits May 27, 2020 13:08
* combine duplicate doc:

 - sql-statements/sql-statement-show-table-next-row-id.md
 - sql-statements/sql-statement-show-table-next-rowid.md

* fix link

Co-authored-by: yikeke <yikeke@pingcap.com>
Co-authored-by: pingcap-github-bot <sre-bot@pingcap.com>
* resources: update the Figma link (#3230)

* load stats

* add png

* make linter happy

* Update sql-statements/sql-statement-load-stats.md

Co-authored-by: Lynn <zimu_xia@126.com>

* update

Co-authored-by: Caitin <34535727+CaitinChen@users.noreply.github.com>
Co-authored-by: Lynn <zimu_xia@126.com>
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
* architecture: fix link

* Update tidb-computing.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

Co-authored-by: pingcap-github-bot <sre-bot@pingcap.com>
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
* add migration by sql

* update toc

* Update data-migration-route.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Lilian Lee <lilin@pingcap.com>
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* remove duplicate content

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Co-authored-by: Lilian Lee <lilin@pingcap.com>
Co-authored-by: pingcap-github-bot <sre-bot@pingcap.com>
* delete extra aliases

* Update sql-statement-alter-index.md

* Update sql-statement-change-column.md
* update dashboard diagnostics pickture name

Signed-off-by: crazycs520 <crazycs520@gmail.com>

* update link

Signed-off-by: crazycs520 <crazycs520@gmail.com>

* fix typos

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
* add plan_from_cache in slow_query document

* Update identify-slow-queries.md

Co-authored-by: Lilian Lee <lilin@pingcap.com>
* improve location-awareness

Signed-off-by: disksing <i@disksing.com>

* Update location-awareness.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Update location-awareness.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Update location-awareness.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Update location-awareness.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Update location-awareness.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Update location-awareness.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Update location-awareness.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Update location-awareness.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Update location-awareness.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Update location-awareness.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Update location-awareness.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

* rename the file and add an alias

* update title

* fix CI

* fix 2 links

* Update TOC.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Co-authored-by: yikeke <yikeke@pingcap.com>
* remove names and refs

* tidy up TOC; add draft attribute; fix minor issues

* draft:true -> draft: true

* refine TOC

* rename a file; delete extra empty files

* fix 4 dead links due to renaming

* rename a file; add an alias

* <br> -> <br/>
* 修改一些描述的层次格式

* 修改缩进

* Update troubleshoot-high-disk-io.md

* Update troubleshoot-high-disk-io.md

* Update indentation

* Update troubleshoot-high-disk-io.md

* Update troubleshoot-high-disk-io.md

update 一些段落格式

Co-authored-by: Lilian Lee <lilin@pingcap.com>
* add backticks to fix build issues

* remove extra slash

* revert frontmatter changes
@yikeke yikeke marked this pull request as ready for review May 27, 2020 10:01
@yikeke yikeke requested a review from lilin90 May 27, 2020 10:24
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

@lilin90 lilin90 added size/large Changes of a large size. type/refactor The issue belongs to a refactor work. labels May 27, 2020
@yikeke yikeke merged commit a3c0b95 into master May 27, 2020
@yikeke
Copy link
Contributor Author

yikeke commented May 27, 2020

/run-cherry-picker

sre-bot pushed a commit to sre-bot/docs-cn that referenced this pull request May 27, 2020
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor

sre-bot commented May 27, 2020

cherry pick to release-4.0 in PR #3376

yikeke added a commit that referenced this pull request May 27, 2020
* cherry pick #3372 to release-4.0

Signed-off-by: sre-bot <sre-bot@pingcap.com>

* resolve conflicts

* dev -> stable

* delete License FAQ

* add sql-statement-load-stats.md

* Delete key-visualizer-monitoring-tool.md

* delete 3 ticdc extra files

* delete 4 extra files

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Co-authored-by: yikeke <yikeke@pingcap.com>
@lilin90 lilin90 added the special-week PR from Document Special Week. label Mar 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/large Changes of a large size. special-week PR from Document Special Week. type/refactor The issue belongs to a refactor work.
Projects
None yet
Development

Successfully merging this pull request may close these issues.