Skip to content

Commit

Permalink
updated README
Browse files Browse the repository at this point in the history
  • Loading branch information
simonjohnthompson committed Apr 11, 2019
1 parent 0af05db commit d6351bc
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions docs/tutorial-v2.0/README.md
Expand Up @@ -36,10 +36,14 @@ This tutorial formally introduces Marlowe as a Haskell data type, building on th
This tutorial gives a formal semantics for Marlowe by presenting a Haskell definition of the semantic `step` function, so that we have a _semantics that we can execute_. This tutorial gives a formal semantics for Marlowe by presenting a Haskell definition of the semantic `step` function, so that we have a _semantics that we can execute_.
-->

## [Embedded Marlowe](./embedded-marlowe.md) ## [Embedded Marlowe](./embedded-marlowe.md)


This tutorial shows how to use some simple features of Haskell to write Marlowe contracts that are more readable, maintainable and reusable, by revisiting the escrow contract. This tutorial shows how to use some simple features of Haskell to write Marlowe contracts that are more readable, maintainable and reusable, by revisiting the escrow contract.


<!--
## [Using Marlowe](./using-marlowe.md) ## [Using Marlowe](./using-marlowe.md)
This tutorial shows you how to use Marlowe from within Haskell, and in particular shows how to exercise a contract using the semantics given in the [earlier tutorial](./marlowe-semantics.md). This tutorial shows you how to use Marlowe from within Haskell, and in particular shows how to exercise a contract using the semantics given in the [earlier tutorial](./marlowe-semantics.md).
Expand All @@ -48,17 +52,21 @@ This tutorial shows you how to use Marlowe from within Haskell, and in particula
This tutorial introduces Meadow, and is accompanied by a video. Once you have followed this video you will be able to use Meadow to interact with the escrow and other Meadow contracts. This tutorial introduces Meadow, and is accompanied by a video. Once you have followed this video you will be able to use Meadow to interact with the escrow and other Meadow contracts.
-->

<!--
## [Other functions in Marlowe: analysis](./analysis.md) ## [Other functions in Marlowe: analysis](./analysis.md)
This tutorial shows how Marlowe contracts can be analysed _without_ having to be executed. This made much easier because Marlowe is a special-purpose DSL, rather than a general-purpose language like Plutus. This tutorial shows how Marlowe contracts can be analysed _without_ having to be executed. This made much easier because Marlowe is a special-purpose DSL, rather than a general-purpose language like Plutus.
-->


<!--
## [ACTUS and Marlowe](./actus-marlowe.md) ## [ACTUS and Marlowe](./actus-marlowe.md)
This tutorial gives an introduction to the general idea of the ACTUS taxonomy, plus examples implemented in Marlowe (at least the PAM contract, and hopefully others). This tutorial gives an introduction to the general idea of the ACTUS taxonomy, plus examples implemented in Marlowe (at least the PAM contract, and hopefully others).
-->


## [Implementing Marlowe in Plutus](./marlowe-plutus.md) ## [Implementing Marlowe in Plutus](./marlowe-plutus.md)


So far these tutorials have dealt with Marlowe as a “stand alone” artefact; this tutorial describes how Marlowe is implemented on blockchain, using the “mockchain” that provides a high-fidelity simulation of the Cardano SL layer. So far these tutorials have dealt with Marlowe as a “stand alone” artefact; this tutorial describes how Marlowe is implemented on blockchain, using the “mockchain” that provides a high-fidelity simulation of the Cardano SL layer.


-->

0 comments on commit d6351bc

Please sign in to comment.