Skip to content

v0.37.x: Rename Tendermint to CometBFT in /docs (backport #197)#250

Merged
cason merged 8 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-197
Feb 8, 2023
Merged

v0.37.x: Rename Tendermint to CometBFT in /docs (backport #197)#250
cason merged 8 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-197

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 1, 2023

This is an automatic backport of pull request #197 done by Mergify.
Cherry-pick of 9883814 has failed:

On branch mergify/bp/v0.37.x/pr-197
Your branch is up to date with 'origin/v0.37.x'.

You are currently cherry-picking commit 98838143f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   docs/.vuepress/config.js
	deleted:    docs/.vuepress/public/logo-bw.svg
	modified:   docs/.vuepress/redirects
	deleted:    docs/DEV_SESSIONS.md
	modified:   docs/DOCS_README.md
	renamed:    docs/app-dev/readme.md -> docs/app-dev/README.md
	modified:   docs/app-dev/getting-started.md
	modified:   docs/architecture/README.md
	modified:   docs/architecture/adr-047-handling-evidence-from-light-client.md
	modified:   docs/architecture/adr-056-light-client-amnesia-attacks.md
	modified:   docs/architecture/adr-059-evidence-composition-and-lifecycle.md
	modified:   docs/architecture/adr-template.md
	renamed:    docs/imgs/bifurcation-point.png -> docs/architecture/img/bifurcation-point.png
	renamed:    docs/imgs/evidence_lifecycle.png -> docs/architecture/img/evidence_lifecycle.png
	renamed:    docs/imgs/light-client-detector.png -> docs/architecture/img/light-client-detector.png
	renamed:    docs/imgs/tm-amnesia-attack.png -> docs/architecture/img/tm-amnesia-attack.png
	renamed:    docs/tendermint-core/README.md -> docs/core/README.md
	renamed:    docs/tendermint-core/block-sync.md -> docs/core/block-sync.md
	renamed:    docs/tendermint-core/light-client.md -> docs/core/light-client.md
	renamed:    docs/tendermint-core/mempool.md -> docs/core/mempool.md
	renamed:    docs/tendermint-core/metrics.md -> docs/core/metrics.md
	new file:   docs/core/rpc.md
	renamed:    docs/tendermint-core/state-sync.md -> docs/core/state-sync.md
	renamed:    docs/tendermint-core/validators.md -> docs/core/validators.md
	deleted:    docs/imgs/contributing.png
	deleted:    docs/imgs/cosmos-tendermint-stack-4k.jpg
	renamed:    docs/tendermint-core/sentry_layout.png -> docs/imgs/sentry_layout.png
	renamed:    docs/tendermint-core/local_config.png -> docs/imgs/sentry_local_config.png
	deleted:    docs/imgs/tcp-window.png
	deleted:    docs/imgs/tm-application-example.png
	deleted:    docs/imgs/tm-transaction-flow.png
	deleted:    docs/imgs/tmint-logo-blue.png
	modified:   docs/introduction/README.md
	modified:   docs/introduction/install.md
	modified:   docs/introduction/quick-start.md
	deleted:    docs/introduction/what-is-tendermint.md
	modified:   docs/networks/README.md
	modified:   docs/networks/docker-compose.md
	modified:   docs/package.json
	modified:   docs/qa/README.md
	modified:   docs/qa/method.md
	modified:   docs/qa/v034/README.md
	modified:   docs/qa/v037/README.md
	modified:   docs/rfc/README.md
	deleted:    docs/tendermint-core-image.jpg
	deleted:    docs/tendermint-core/block-structure.md
	deleted:    docs/tendermint-core/configuration.md
	deleted:    docs/tendermint-core/how-to-read-logs.md
	deleted:    docs/tendermint-core/running-in-production.md
	deleted:    docs/tendermint-core/subscription.md
	deleted:    docs/tendermint-core/using-tendermint.md
	modified:   docs/tools/README.md
	new file:   docs/tutorials/README.md
	deleted:    docs/tutorials/readme.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   docs/README.md
	both modified:   docs/app-dev/abci-cli.md
	both modified:   docs/app-dev/app-architecture.md
	both modified:   docs/app-dev/indexing-transactions.md
	both modified:   docs/core/block-structure.md
	both modified:   docs/core/configuration.md
	both modified:   docs/core/how-to-read-logs.md
	both modified:   docs/core/running-in-production.md
	both modified:   docs/core/subscription.md
	both modified:   docs/core/using-cometbft.md
	deleted by them: docs/introduction/architecture.md
	both modified:   docs/introduction/what-is-cometbft.md
	deleted by them: docs/tendermint-core/rpc.md
	both modified:   docs/tools/debugging.md
	both modified:   docs/tutorials/go-built-in.md
	both modified:   docs/tutorials/go.md
	both modified:   spec/consensus/consensus.md
	both modified:   spec/consensus/wal.md
	deleted by us:   spec/p2p/v0.34/README.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify
Rename Tendermint to CometBFT in /docs (#197)
e4ab909 
* docs/rename: simple github.com links renaming

* docs/rename: old links to spec repo replaced

* docs/rename: Go doc links renamed, currently broken

* docs/rename: fixing broken links, proper branches

* docs/rename: docs.tendermint.com -> docs.cometbft.com

* docs/rename: fixing front matter in .md files

* docs/rename: renaming in what is tendermint page

   * Tendermint in a Nutshell image removed

* docs/rename: cleaning, renaming docs introduction

* docs/rename: renaming in docs/app-dev/ dir

* docs/rename: links to main branch in docs/networks

* docs/rename: renaming in docs/tools/ dir

* docs/rename: renaming in docs/tutorials dir

* docs/rename: moving images to docs/imgs/ dir

* docs/rename: renaming in docs/tendermint-core/ dir

* docs/rename: docs/tendermint-core/ -> docs/core/

* docs/rename: renaming in docs/qa/ sub path

* docs/rename: renaming in .vuepress dir, logo removed

* docs/rename: renaming in READMEs

* docs/rename: removing Tendermint images and content

* docs/rename: removing references to removed diagram

* docs/rename: renaming in READMEs for RFCs and ADRs

* rename: links to docs/tendermint-core -> docs/core

* docs/rename: removing unused images from docs/imgs/

* docs/rename: cleaning of docs/imgs/, ADR images moved

* Apply suggestions from code review

Co-authored-by: Thane Thomson <connect@thanethomson.com>

* Apply suggestions from code review

Co-authored-by: Thane Thomson <connect@thanethomson.com>

* docs/rename: removing outdated Testnets section

Co-authored-by: Thane Thomson <connect@thanethomson.com>

* docs/rename: removing reference to tendermint/awesome repo

Co-authored-by: Thane Thomson <connect@thanethomson.com>

* docs/rename: contributing section updated

Co-authored-by: Thane Thomson <connect@thanethomson.com>

---------

Co-authored-by: Thane Thomson <connect@thanethomson.com>
(cherry picked from commit 9883814)

# Conflicts:
#	docs/README.md
#	docs/app-dev/abci-cli.md
#	docs/app-dev/app-architecture.md
#	docs/app-dev/indexing-transactions.md
#	docs/core/block-structure.md
#	docs/core/configuration.md
#	docs/core/how-to-read-logs.md
#	docs/core/running-in-production.md
#	docs/core/subscription.md
#	docs/core/using-cometbft.md
#	docs/introduction/architecture.md
#	docs/introduction/what-is-cometbft.md
#	docs/tendermint-core/rpc.md
#	docs/tools/debugging.md
#	docs/tutorials/go-built-in.md
#	docs/tutorials/go.md
#	spec/consensus/consensus.md
#	spec/consensus/wal.md
#	spec/p2p/v0.34/README.md
@mergify mergify bot requested review from a team as code owners February 1, 2023 12:01
@mergify mergify bot added the conflicts label Feb 1, 2023
@cason cason changed the title Rename Tendermint to CometBFT in /docs (backport #197) v0.37.x: Rename Tendermint to CometBFT in /docs (backport #197) Feb 3, 2023
@cason cason removed the conflicts label Feb 8, 2023
@cason cason self-assigned this Feb 8, 2023
cason
cason approved these changes Feb 8, 2023
View reviewed changes
Copy link

@cason cason left a comment

Choose a reason for hiding this comment

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

There were few conflicts in the backport, addressed by additional commits.

lasarojc
lasarojc approved these changes Feb 8, 2023
View reviewed changes
Copy link
Contributor

@lasarojc lasarojc left a comment

Choose a reason for hiding this comment

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

Could you update app-dev/abci-cli.md to refer to cmtos rather than tmos. Other than that, LGTM.

@cason cason merged commit feed0dd into v0.37.x Feb 8, 2023
@cason cason deleted the mergify/bp/v0.37.x/pr-197 branch February 8, 2023 12:10
@faddat faddat mentioned this pull request Jan 5, 2024
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@cason cason cason approved these changes

@lasarojc lasarojc lasarojc approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@cason cason

Labels

None yet

Projects

No open projects
CometBFT 2023
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@cason @lasarojc