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

Update docs (bp #8751) #8894

Merged
merged 2 commits into from
Mar 16, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 16, 2021

This is an automatic backport of pull request #8751 done by Mergify.

Cherry-pick of 36f68eb has failed:

On branch mergify/bp/release/v0.42.x/pr-8751
Your branch is up to date with 'origin/release/v0.42.x'.

You are currently cherry-picking commit 36f68eb9e.
  (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/basics/accounts.md
	modified:   docs/building-modules/msg-services.md
	modified:   docs/building-modules/simulator.md
	modified:   docs/core/baseapp.md
	modified:   docs/core/cli.md
	modified:   docs/core/grpc_rest.md
	modified:   docs/core/node.md
	modified:   docs/core/ocap.md
	modified:   docs/core/store.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/basics/app-anatomy.md

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

* docs/basics/app-anatomy.md: update code snippets

* Update outdated code snippets

* docs/basics/accounts.md: update code snippets

* Update outdated code snippets

* docs/core/baseapp.md: update code snippets

* Update outdated code snippets

* docs/core/node.md: update code snippets

* Update outdated code snippets

* docs/core/store.md: fixed typos

* docs/core/grpc_rest.md: fix typos

* docs/core/cli.md: fix typos

* docs/core/ocap.md: fix code snippet

* docs/building-modules/msg-services.md: fix snippet

* Update stale code snippets

* docs/building-modules/simulator.md: snippets fix

* Update outdated code snippet

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 36f68eb)

# Conflicts:
#	docs/basics/app-anatomy.md
@mergify mergify bot added the conflicts label Mar 16, 2021
@amaury1093 amaury1093 added T:Docs Changes and features related to documentation. and removed conflicts labels Mar 16, 2021
@alessio alessio merged commit 51b163e into release/v0.42.x Mar 16, 2021
@alessio alessio deleted the mergify/bp/release/v0.42.x/pr-8751 branch March 16, 2021 17:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
T:Docs Changes and features related to documentation.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants