10000 docs: various small improvements (part 2) (backport #1683) by mergify[bot] · Pull Request #1686 · cometbft/cometbft · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

docs: various small improvements (part 2) (backport #1683) #1686

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

Merged
merged 2 commits into from
Nov 23, 2023

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Nov 23, 2023

This is an automatic backport of pull request #1683 done by Mergify.
Cherry-pick of 96abada has failed:

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

You are currently cherry-picking commit 96abadac1.
  (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/app-dev/abci-cli.md
	modified:   docs/core/state-sync.md
	modified:   docs/core/using-cometbft.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/app-dev/indexing-transactions.md
	both modified:   docs/core/block-structure.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

* docs: fix the number of connections CometBFT opens

to the ABCI app

* docs: fix link formatting

* docs: make it explicit that default is TCP for ABCI

* docs: replace 'supermajority' with 2/3+

2/3+ is easier to understand. also this is the first time the reader is
seeing the word 'supermajority', which might be confusing without the
defition. The defition for supermajority is absent (maybe it's in the
spec though)

* add a link to jq

* suggestions from Lasaro

(cherry picked from commit 96abada)

# Conflicts:
#	docs/app-dev/indexing-transactions.md
#	docs/core/block-structure.md
@mergify mergify bot requested a review from a team as a code owner November 23, 2023 16:19
@mergify mergify bot added the conflicts label Nov 23, 2023
@melekes melekes merged commit 656c1e4 into v0.37.x Nov 23, 2023
@melekes melekes deleted the mergify/bp/v0.37.x/pr-1683 branch November 23, 2023 16:29
nivasan1 pushed a commit to skip-mev/cometbft that referenced this pull request Jan 16, 2024
…ometbft#1686)

* docs: various small improvements (part 2) (cometbft#1683)

* docs: fix the number of connections CometBFT opens

to the ABCI app

* docs: fix link formatting

* docs: make it explicit that default is TCP for ABCI

* docs: replace 'supermajority' with 2/3+

2/3+ is easier to understand. also this is the first time the reader is
seeing the word 'supermajority', which might be confusing without the
defition. The defition for supermajority is absent (maybe it's in the
spec though)

* add a link to jq

* suggestions from Lasaro

(cherry picked from commit 96abada)

# Conflicts:
#	docs/app-dev/indexing-transactions.md
#	docs/core/block-structure.md

* fixes after merge

---------

Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant
0