fix conflicts

cosmos · Sep 21, 2023 · 00a6a6d · 00a6a6d
1 parent 0b800f7
commit 00a6a6d
Show file tree

Hide file tree

Showing 78 changed files with 9 additions and 4,002 deletions.
diff --git a/.github/workflows/md-link-checker.yml b/.github/workflows/md-link-checker.yml
@@ -7,12 +7,8 @@ jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
-      - uses: actions/checkout@v3
-=======
       - uses: actions/checkout@v4
       - run: cd docs && sh ./pre.sh
->>>>>>> 2efafee65 (chore: rename develop to learn (#17821))
       - uses: gaurav-nelson/[email protected]
         with:
           folder-path: "docs"

diff --git a/docs/.gitignore b/docs/.gitignore
@@ -24,8 +24,7 @@ docs/docs/packages/02-collections.md
 docs/docs/packages/03-orm.md
 docs/user/run-node/04-rosetta.md
 docs/build/migrations/02-upgrading.md
-<<<<<<< HEAD
-docs/develop/advanced/17-autocli.md
+docs/learn/advanced/17-autocli.md
 
 # Misc
 .DS_Store
@@ -37,6 +36,3 @@ docs/develop/advanced/17-autocli.md
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-=======
-docs/learn/advanced/17-autocli.md
->>>>>>> 2efafee65 (chore: rename develop to learn (#17821))
diff --git a/docs/docs/build/building-modules/06-keeper.md b/docs/docs/build/building-modules/06-keeper.md
@@ -47,14 +47,9 @@ https://github.com/cosmos/cosmos-sdk/blob/v0.50.0-alpha.0/x/staking/keeper/keepe
 Let us go through the different parameters:
 
 * An expected `keeper` is a `keeper` external to a module that is required by the internal `keeper` of said module. External `keeper`s are listed in the internal `keeper`'s type definition as interfaces. These interfaces are themselves defined in an `expected_keepers.go` file in the root of the module's folder. In this context, interfaces are used to reduce the number of dependencies, as well as to facilitate the maintenance of the module itself.
-<<<<<<< HEAD:docs/docs/build/building-modules/06-keeper.md
-* `storeKey`s grant access to the store(s) of the [multistore](../../develop/advanced/04-store.md) managed by the module. They should always remain unexposed to external modules.
-* `cdc` is the [codec](../../build/develop/advanced/05-encoding.md) used to marshall and unmarshall structs to/from `[]byte`. The `cdc` can be any of `codec.BinaryCodec`, `codec.JSONCodec` or `codec.Codec` based on your requirements. It can be either a proto or amino codec as long as they implement these interfaces. The authority listed is a module account or user account that has the right to change module level parameters. Previously this was handled by the param module, which has been deprecated.
-=======
 * `storeKey`s grant access to the store(s) of the [multistore](../../learn/advanced/04-store.md) managed by the module. They should always remain unexposed to external modules.
 * `cdc` is the [codec](../../learn/advanced/05-encoding.md) used to marshall and unmarshall structs to/from `[]byte`. The `cdc` can be any of `codec.BinaryCodec`, `codec.JSONCodec` or `codec.Codec` based on your requirements. It can be either a proto or amino codec as long as they implement these interfaces.
 * The authority listed is a module account or user account that has the right to change module level parameters. Previously this was handled by the param module, which has been deprecated.
->>>>>>> 2efafee65 (chore: rename develop to learn (#17821)):docs/build/building-modules/06-keeper.md
 
 Of course, it is possible to define different types of internal `keeper`s for the same module (e.g. a read-only `keeper`). Each type of `keeper` comes with its own constructor function, which is called from the [application's constructor function](../../learn/beginner/00-app-anatomy.md). This is where `keeper`s are instantiated, and where developers make sure to pass correct instances of modules' `keeper`s to other modules that require them.
 

diff --git a/docs/docs/develop/intro/00-what-is-sdk.md b/docs/docs/develop/intro/00-what-is-sdk.md
diff --git a/docs/docs/develop/advanced/00-baseapp.md → docs/docs/learn/advanced/00-baseapp.md b/docs/docs/develop/advanced/00-baseapp.md → docs/docs/learn/advanced/00-baseapp.md
diff --git a/.../docs/develop/advanced/01-transactions.md → docs/docs/learn/advanced/01-transactions.md b/.../docs/develop/advanced/01-transactions.md → docs/docs/learn/advanced/01-transactions.md
diff --git a/docs/docs/develop/advanced/02-context.md → docs/docs/learn/advanced/02-context.md b/docs/docs/develop/advanced/02-context.md → docs/docs/learn/advanced/02-context.md
diff --git a/docs/docs/develop/advanced/03-node.md → docs/docs/learn/advanced/03-node.md b/docs/docs/develop/advanced/03-node.md → docs/docs/learn/advanced/03-node.md
diff --git a/docs/docs/develop/advanced/04-store.md → docs/docs/learn/advanced/04-store.md b/docs/docs/develop/advanced/04-store.md → docs/docs/learn/advanced/04-store.md
diff --git a/docs/docs/develop/advanced/05-encoding.md → docs/docs/learn/advanced/05-encoding.md b/docs/docs/develop/advanced/05-encoding.md → docs/docs/learn/advanced/05-encoding.md
diff --git a/docs/docs/develop/advanced/06-grpc_rest.md → docs/docs/learn/advanced/06-grpc_rest.md b/docs/docs/develop/advanced/06-grpc_rest.md → docs/docs/learn/advanced/06-grpc_rest.md
diff --git a/docs/docs/develop/advanced/07-cli.md → docs/docs/learn/advanced/07-cli.md b/docs/docs/develop/advanced/07-cli.md → docs/docs/learn/advanced/07-cli.md
diff --git a/docs/docs/develop/advanced/08-events.md → docs/docs/learn/advanced/08-events.md b/docs/docs/develop/advanced/08-events.md → docs/docs/learn/advanced/08-events.md
diff --git a/docs/docs/develop/advanced/09-telemetry.md → docs/docs/learn/advanced/09-telemetry.md b/docs/docs/develop/advanced/09-telemetry.md → docs/docs/learn/advanced/09-telemetry.md
diff --git a/docs/docs/develop/advanced/10-ocap.md → docs/docs/learn/advanced/10-ocap.md b/docs/docs/develop/advanced/10-ocap.md → docs/docs/learn/advanced/10-ocap.md
diff --git a/...s/develop/advanced/11-runtx_middleware.md → ...ocs/learn/advanced/11-runtx_middleware.md b/...s/develop/advanced/11-runtx_middleware.md → ...ocs/learn/advanced/11-runtx_middleware.md
diff --git a/docs/docs/develop/advanced/12-simulation.md → docs/docs/learn/advanced/12-simulation.md b/docs/docs/develop/advanced/12-simulation.md → docs/docs/learn/advanced/12-simulation.md
diff --git a/docs/docs/develop/advanced/13-proto-docs.md → docs/docs/learn/advanced/13-proto-docs.md b/docs/docs/develop/advanced/13-proto-docs.md → docs/docs/learn/advanced/13-proto-docs.md
diff --git a/docs/docs/develop/advanced/15-upgrade.md → docs/docs/learn/advanced/15-upgrade.md b/docs/docs/develop/advanced/15-upgrade.md → docs/docs/learn/advanced/15-upgrade.md
diff --git a/docs/docs/develop/advanced/16-config.md → docs/docs/learn/advanced/16-config.md b/docs/docs/develop/advanced/16-config.md → docs/docs/learn/advanced/16-config.md
diff --git a/docs/docs/develop/advanced/_category_.json → docs/docs/learn/advanced/_category_.json b/docs/docs/develop/advanced/_category_.json → docs/docs/learn/advanced/_category_.json
diff --git a/...op/advanced/baseapp_state-begin_block.png → ...rn/advanced/baseapp_state-begin_block.png b/...op/advanced/baseapp_state-begin_block.png → ...rn/advanced/baseapp_state-begin_block.png
diff --git a/...evelop/advanced/baseapp_state-checktx.png → .../learn/advanced/baseapp_state-checktx.png b/...evelop/advanced/baseapp_state-checktx.png → .../learn/advanced/baseapp_state-checktx.png
diff --git a/...develop/advanced/baseapp_state-commit.png → ...s/learn/advanced/baseapp_state-commit.png b/...develop/advanced/baseapp_state-commit.png → ...s/learn/advanced/baseapp_state-commit.png
diff --git a/...lop/advanced/baseapp_state-deliver_tx.png → ...arn/advanced/baseapp_state-deliver_tx.png b/...lop/advanced/baseapp_state-deliver_tx.png → ...arn/advanced/baseapp_state-deliver_tx.png
diff --git a/...elop/advanced/baseapp_state-initchain.png → ...earn/advanced/baseapp_state-initchain.png b/...elop/advanced/baseapp_state-initchain.png → ...earn/advanced/baseapp_state-initchain.png
diff --git a/...dvanced/baseapp_state-prepareproposal.png → ...dvanced/baseapp_state-prepareproposal.png b/...dvanced/baseapp_state-prepareproposal.png → ...dvanced/baseapp_state-prepareproposal.png
diff --git a/...dvanced/baseapp_state-processproposal.png → ...dvanced/baseapp_state-processproposal.png b/...dvanced/baseapp_state-processproposal.png → ...dvanced/baseapp_state-processproposal.png
diff --git a/docs/docs/develop/advanced/baseapp_state.png → docs/docs/learn/advanced/baseapp_state.png b/docs/docs/develop/advanced/baseapp_state.png → docs/docs/learn/advanced/baseapp_state.png
diff --git a/docs/docs/develop/beginner/00-app-anatomy.md → docs/docs/learn/beginner/00-app-anatomy.md b/docs/docs/develop/beginner/00-app-anatomy.md → docs/docs/learn/beginner/00-app-anatomy.md
diff --git a/.../docs/develop/beginner/01-tx-lifecycle.md → docs/docs/learn/beginner/01-tx-lifecycle.md b/.../docs/develop/beginner/01-tx-lifecycle.md → docs/docs/learn/beginner/01-tx-lifecycle.md
diff --git a/...cs/develop/beginner/02-query-lifecycle.md → ...docs/learn/beginner/02-query-lifecycle.md b/...cs/develop/beginner/02-query-lifecycle.md → ...docs/learn/beginner/02-query-lifecycle.md
diff --git a/docs/docs/develop/beginner/03-accounts.md → docs/docs/learn/beginner/03-accounts.md b/docs/docs/develop/beginner/03-accounts.md → docs/docs/learn/beginner/03-accounts.md
diff --git a/docs/docs/develop/beginner/04-gas-fees.md → docs/docs/learn/beginner/04-gas-fees.md b/docs/docs/develop/beginner/04-gas-fees.md → docs/docs/learn/beginner/04-gas-fees.md
diff --git a/docs/docs/develop/beginner/_category_.json → docs/docs/learn/beginner/_category_.json b/docs/docs/develop/beginner/_category_.json → docs/docs/learn/beginner/_category_.json
diff --git a/docs/learn/intro/00-overview.md → docs/docs/learn/intro/00-overview.md b/docs/learn/intro/00-overview.md → docs/docs/learn/intro/00-overview.md
diff --git a/...docs/develop/intro/01-why-app-specific.md → docs/docs/learn/intro/01-why-app-specific.md b/...docs/develop/intro/01-why-app-specific.md → docs/docs/learn/intro/01-why-app-specific.md
diff --git a/.../develop/intro/02-sdk-app-architecture.md → ...cs/learn/intro/02-sdk-app-architecture.md b/.../develop/intro/02-sdk-app-architecture.md → ...cs/learn/intro/02-sdk-app-architecture.md
diff --git a/docs/docs/develop/intro/03-sdk-design.md → docs/docs/learn/intro/03-sdk-design.md b/docs/docs/develop/intro/03-sdk-design.md → docs/docs/learn/intro/03-sdk-design.md
diff --git a/docs/docs/develop/intro/_category_.json → docs/docs/learn/intro/_category_.json b/docs/docs/develop/intro/_category_.json → docs/docs/learn/intro/_category_.json
diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js
@@ -217,9 +217,9 @@ const config = {
         toExtensions: ["html"],
         createRedirects(existingPath) {
           return [
-            existingPath.replace('/core', '/develop/advanced'),
-            existingPath.replace('/basics', '/develop/beginner'),
-            existingPath.replace('/intro', '/develop/intro'),
+            existingPath.replace('/core', '/learn/advanced'),
+            existingPath.replace('/basics', '/learn/beginner'),
+            existingPath.replace('/intro', '/learn/intro'),
             existingPath.replace('/architecture', '/build/architecture/'),
             existingPath.replace('/building-apps', '/build/building-apps'),
             existingPath.replace('/building-modules', '/build/building-modules'),
@@ -432,7 +432,7 @@ const config = {
           },
           {
             from: ["/main/building-modules/autocli"],
-            to: "/main/develop/advanced/autocli",
+            to: "/main/learn/advanced/autocli",
           },
         ],
       },