diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 117ce04a..a4b7cd8a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -87,7 +87,7 @@ Before you submit your pull request consider the following guidelines: Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files. -* Before creating the Pull Request, ensure your branch sits on top of main (as opposed to branch off a branch). This ensures the reviewer will need only minimal effort to integrate your work by fast-fowarding main: +* Before creating the Pull Request, ensure your branch sits on top of main (as opposed to branch off a branch). This ensures the reviewer will need only minimal effort to integrate your work by fast-forwarding main: ```text git rebase upstream/main diff --git a/DEVELOPERS.md b/DEVELOPERS.md index 323a466e..66bd51d6 100644 --- a/DEVELOPERS.md +++ b/DEVELOPERS.md @@ -29,6 +29,6 @@ npm run build:api ``` ## Commits -When commiting your changes, it is required you adhere to the [commit message conventions]. This is important because the release notes are automatically generated from these messages. +When committing your changes, it is required you adhere to the [commit message conventions]. This is important because the release notes are automatically generated from these messages. [commit message conventions]: https://www.conventionalcommits.org/en/v1.0.0/ diff --git a/docs/assets/specification/ErgoSpec.Common.Result.html b/docs/assets/specification/ErgoSpec.Common.Result.html index 7ec58afe..69dee89a 100644 --- a/docs/assets/specification/ErgoSpec.Common.Result.html +++ b/docs/assets/specification/ErgoSpec.Common.Result.html @@ -145,7 +145,7 @@

Module ErgoSpec.Common.Result

        match qe with
        | DataResult.CompilationError msg => ECompilationError prov msg
        | DataResult.TypeError msg => ETypeError prov msg
-        | DataResult.UserError msg => ESystemError prov "User error occured in backend"
+        | DataResult.UserError msg => ESystemError prov "User error occurred in backend"
        end.

      Definition eresult_of_qresult {A:Set} (prov:provenance) (a:qresult A) : eresult A :=
@@ -237,9 +237,9 @@

Module ErgoSpec.Common.Result

    Definition eval_foreach_not_on_array_error {A} prov : eresult A :=
      efailure (ERuntimeError prov "Foreach needs to be called on an array").
    Definition template_type_not_found_error {A} prov : eresult A :=
-      efailure (ERuntimeError prov ("Cannot find template type (one declared type should extend either AcccordContract or AccordClause)")).
+      efailure (ERuntimeError prov ("Cannot find template type (one declared type should extend either AccordContract or AccordClause)")).
    Definition more_than_one_template_type_error {A} prov msg : eresult A :=
-      efailure (ERuntimeError prov ("Multiple template type (at most one of " ++ msg ++ " should extend either AcccordContract or AccordClause)")).
+      efailure (ERuntimeError prov ("Multiple template type (at most one of " ++ msg ++ " should extend either AccordContract or AccordClause)")).

System errors
    Definition no_ergo_module_error {A} prov : eresult A :=
diff --git a/docs/markup-commonmark.md b/docs/markup-commonmark.md index eb2eb509..f4e223c4 100644 --- a/docs/markup-commonmark.md +++ b/docs/markup-commonmark.md @@ -154,7 +154,7 @@ To create a list within another, indent each item in the sublist by four spaces. - enter into any abnormal contracts... 2. Matters related to the assets - sell or otherwise dispose... - - mortage, ... + - mortgage, ... ``` will be rendered as: diff --git a/docs/markup-templatemark.md b/docs/markup-templatemark.md index 5b11cdcb..9eace082 100644 --- a/docs/markup-templatemark.md +++ b/docs/markup-templatemark.md @@ -5,7 +5,7 @@ title: TemplateMark TemplateMark is an extension to CommonMark used to write the text in Accord Project templates. The extension includes new markdown for variables, inline and container elements of the markdown and template formulas. -The kind of extension which can be used is based on the _type_ of the variable in the [Concerto Model](https://concerto.accordproject.org/docs/intro) for your template. For each type in your model differrent markdown elements apply: variable markdown for atomic types in the model, list blocks for array types in the model, optional blocks for optional types in the model, etc. +The kind of extension which can be used is based on the _type_ of the variable in the [Concerto Model](https://concerto.accordproject.org/docs/intro) for your template. For each type in your model different markdown elements apply: variable markdown for atomic types in the model, list blocks for array types in the model, optional blocks for optional types in the model, etc. ## Variables @@ -261,7 +261,7 @@ The general format for the amount is `0{sep}0({sep}0+)?` where `{sep}` is a sing #### Examples -The following examples show formating for `Integer` or `Long` values. +The following examples show formatting for `Integer` or `Long` values. ``` The manuscript shall be completed within {{days as "0,0"}} days. diff --git a/docs/ref-cicero-api.md b/docs/ref-cicero-api.md index 2e676d67..88a664c5 100644 --- a/docs/ref-cicero-api.md +++ b/docs/ref-cicero-api.md @@ -227,7 +227,7 @@ retrieve instances from [Template](#Template) | readme | String | the README.md for the template (may be null) | | samples | object | the sample markdown for the template in different locales, | | request | object | the JS object for the sample request | -| logo | Buffer | the bytes data for the image represented as an object whose keys are the locales and whose values are the sample markdown. For example: { default: 'default sample markdown', en: 'sample text in english', fr: 'exemple de texte français' } Locale keys (with the exception of default) conform to the IETF Language Tag specification (BCP 47). THe `default` key represents sample template text in a non-specified language, stored in a file called `sample.md`. | +| logo | Buffer | the bytes data for the image represented as an object whose keys are the locales and whose values are the sample markdown. For example: { default: 'default sample markdown', en: 'sample text in english', fr: 'example de texte français' } Locale keys (with the exception of default) conform to the IETF Language Tag specification (BCP 47). THe `default` key represents sample template text in a non-specified language, stored in a file called `sample.md`. | @@ -906,7 +906,7 @@ Create the CompositeArchiveLoader. Used to delegate to a set of ArchiveLoaders. ### compositeArchiveLoader.addArchiveLoader(archiveLoader) -Adds a ArchiveLoader implemenetation to the ArchiveLoader +Adds a ArchiveLoader implementation to the ArchiveLoader **Kind**: instance method of [CompositeArchiveLoader](#CompositeArchiveLoader) diff --git a/docs/ref-ergo-cli.md b/docs/ref-ergo-cli.md index cc327c27..08945e67 100644 --- a/docs/ref-ergo-cli.md +++ b/docs/ref-ergo-cli.md @@ -146,7 +146,7 @@ Although this looks very similar to what `ergo trigger` returns, it is important `ergo initialize` allows you to obtain the initial state of the contract. This is the state of the contract without requests or responses. ```md -Usage: ergo intialize --data [file] --params [file] [cto files] [ergo files] +Usage: ergo initialize --data [file] --params [file] [cto files] [ergo files] Options: --help Show help [boolean] diff --git a/docs/tutorial-create.md b/docs/tutorial-create.md index d221ee53..c0d26ec2 100644 --- a/docs/tutorial-create.md +++ b/docs/tutorial-create.md @@ -30,7 +30,7 @@ bash-3.2$ yo @accordproject/cicero-template _-----_ ╭──────────────────────────╮ | | │ Welcome to the │ - |--(o)--| │ generator-cicero-templat │ + |--(o)--| │ generator-cicero-template │ `---------´ │ e generator! │ ( _´U`_ ) ╰──────────────────────────╯ /___A___\ / diff --git a/docs/tutorial-templates.md b/docs/tutorial-templates.md index 2ddf9e66..fe4235a6 100644 --- a/docs/tutorial-templates.md +++ b/docs/tutorial-templates.md @@ -34,7 +34,7 @@ Archive: helloworld@0.14.0.cta ## Template Components -Once you have unziped the archive, the directory should contain the following files and sub-directories: +Once you have unzipped the archive, the directory should contain the following files and sub-directories: ```text package.json diff --git a/website/static/css/main.css b/website/static/css/main.css index 0bb9eb90..83c6d27f 100644 --- a/website/static/css/main.css +++ b/website/static/css/main.css @@ -3180,7 +3180,7 @@ a:hover { text-decoration: none; } -/* Code Snipets */ +/* Code Snippets */ .post article .hljs { background-color: #15203c; } diff --git a/website/versioned_docs/version-0.30.1/accordproject-faq.md b/website/versioned_docs/version-0.30.1/accordproject-faq.md index 8cd09c0d..2f87941d 100644 --- a/website/versioned_docs/version-0.30.1/accordproject-faq.md +++ b/website/versioned_docs/version-0.30.1/accordproject-faq.md @@ -18,7 +18,7 @@ While the Accord Project technology is targeted at the development of smart lega ### How is an Accord Project "Smart Contract" different from "Smart Contracts" on the blockchain? -Accord Project Smart legal contracts should not be confused with so-called blockchain “smart contracts”, which are scripts that necesarily operate on a blockchain. On the blockchain a smart contract is often written in a specific language like solidity that executes and operates on the blockchain. It lives in a closed world. An Accord Project Smart Contract contains text based template that integrates with a data model and the Ergo language. The three components are integrated into a whole. Using Ergo an Accord Project Smart contract can communicate with other systems, it can send and receive data, it can perform calculations and it can interact with a blockchain. +Accord Project Smart legal contracts should not be confused with so-called blockchain “smart contracts”, which are scripts that necessarily operate on a blockchain. On the blockchain a smart contract is often written in a specific language like solidity that executes and operates on the blockchain. It lives in a closed world. An Accord Project Smart Contract contains text based template that integrates with a data model and the Ergo language. The three components are integrated into a whole. Using Ergo an Accord Project Smart contract can communicate with other systems, it can send and receive data, it can perform calculations and it can interact with a blockchain. ### What benefits do Smart Legal Contracts provide? diff --git a/website/versioned_docs/version-0.30.1/markup-templatemark.md b/website/versioned_docs/version-0.30.1/markup-templatemark.md index 66db66b0..659d1fcd 100644 --- a/website/versioned_docs/version-0.30.1/markup-templatemark.md +++ b/website/versioned_docs/version-0.30.1/markup-templatemark.md @@ -6,7 +6,7 @@ original_id: markup-templatemark TemplateMark is an extension to CommonMark used to write the text in Accord Project templates. The extension includes new markdown for variables, inline and container elements of the markdown and template formulas. -The kind of extension which can be used is based on the _type_ of the variable in the [Concerto Model](https://concerto.accordproject.org/docs/intro) for your template. For each type in your model differrent markdown elements apply: variable markdown for atomic types in the model, list blocks for array types in the model, optional blocks for optional types in the model, etc. +The kind of extension which can be used is based on the _type_ of the variable in the [Concerto Model](https://concerto.accordproject.org/docs/intro) for your template. For each type in your model different markdown elements apply: variable markdown for atomic types in the model, list blocks for array types in the model, optional blocks for optional types in the model, etc. ## Variables @@ -262,7 +262,7 @@ The general format for the amount is `0{sep}0({sep}0+)?` where `{sep}` is a sing #### Examples -The following examples show formating for `Integer` or `Long` values. +The following examples show formatting for `Integer` or `Long` values. ``` The manuscript shall be completed within {{days as "0,0"}} days.