Merge branch 'dev' into 'dev'

Fix Various Issues With The Docs

See merge request ligolang/ligo!58

gitlab-pages/README.md

@@ -4,6 +4,11 @@
 
 The website will be available at [http://localhost:3000](http://localhost:3000)
 
-```zsh
+To get the website running you want to do the commands:
+
+```
+cd website
+npm run version next
+cd ..
 docker-compose up
 ```

gitlab-pages/docs/language-basics/cheat-sheet.md

@@ -16,6 +16,7 @@ title: Cheat Sheet
 |Natural numbers | `42n`, `7n`|
 |Unit| `unit`|
 |Boolean|<pre><code>const hasDriversLicense: bool = False;<br/>const adult: bool = True;</code></pre> |
+|Boolean Logic|<pre><code>(not True) == False == (False and True) == (False or False)</code></pre>|
 |Mutez (micro tez)| `42mtz`, `7mtz` |
 |Address | `"tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx"`, `"KT1JepfBfMSqkQyf9B1ndvURghGsSB8YCLMD"`|
 |Addition |`3 + 4`, `3n + 4n`|
@@ -26,16 +27,18 @@ title: Cheat Sheet
 |Includes|```#include "library.ligo"```|
 |Functions (short form)|<pre><code>function add (const a : int ; const b : int) : int is<br/>&nbsp;&nbsp;block { skip } with a + b</code></pre>|
 |Functions (long form)|<pre><code>function add (const a : int ; const b : int) : int is<br/>&nbsp;&nbsp;block { <br/>&nbsp;&nbsp;&nbsp;&nbsp;const result: int = a + b;<br/>&nbsp;&nbsp;} with result</code></pre>|
+| If Statement | <pre><code>if age < 16 <br/>then fail("Too young to drive."); <br/>else const new_id: int = prev_id + 1;</code></pre>|  
 |Options|<pre><code>type middleName is option(string);<br/>const middleName : middleName = Some("Foo");<br/>const middleName : middleName = None;</code></pre>|
 |Assignment| ```const age: int = 5;```|
 |Assignment on an existing variable <br/></br>*⚠️ This feature is not supported at the top-level scope, you can use it e.g. within functions. Works for Records and Maps as well.*| ```age := 18;```, ```p.age := 21``` |
-|Annotations| ```("tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" : address)```|
+|Type Annotations| ```("tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" : address)```|
 |Variants|<pre><code>type action is<br/>&#124; Increment of int<br/>&#124; Decrement of int</code></pre>|
 |Variant *(pattern)* matching|<pre><code>const a: action = Increment(5);<br/>case a of<br/>&#124; Increment(n) -> n + 1<br/>&#124; Decrement(n) -> n - 1<br/>end</code></pre>|
 |Records|<pre><code>type person is record<br/>&nbsp;&nbsp;age: int ;<br/>&nbsp;&nbsp;name: string ;<br/>end<br/><br/>const john : person = record<br/>&nbsp;&nbsp;age = 18;<br/>&nbsp;&nbsp;name = "John Doe";<br/>end<br/><br/>const name: string = john.name;</code></pre>|
-|Maps|<pre><code>type prices is map(nat, tez);<br/><br/>const prices : prices = map<br/>&nbsp;&nbsp;10n -> 60mtz;<br/>&nbsp;&nbsp;50n -> 30mtz;<br/>&nbsp;&nbsp;100n -> 10mtz;<br/>end<br/><br/>const price: option(tez) = prices[50n];</code></pre>|
+|Maps|<pre><code>type prices is map(nat, tez);<br/><br/>const prices : prices = map<br/>&nbsp;&nbsp;10n -> 60mtz;<br/>&nbsp;&nbsp;50n -> 30mtz;<br/>&nbsp;&nbsp;100n -> 10mtz;<br/>end<br/><br/>const price: option(tez) = prices[50n];<br/><br/>prices[200n] := 5mtz;</code></pre>|
 |Contracts & Accounts|<pre><code>const destinationAddress : address = "tz1...";<br/>const contract : contract(unit) = get_contract(destinationAddress);</code></pre>|
 |Transactions|<pre><code>const payment : operation = transaction(unit, amount, receiver);</code></pre>|
+|Exception/Failure|`fail("Your descriptive error message for the user goes here.")`|
 
 <!--END_DOCUSAURUS_CODE_TABS-->
 

gitlab-pages/docs/language-basics/operators.md

@@ -11,4 +11,5 @@ title: Operators
 |---	|---	|---	|
 | `SENDER` | `sender` | Address that initiated the current transaction
 | `SOURCE` | `source` | Address that initiated the transaction, which triggered the current transaction. (useful e.g. when there's a transaction sent by another contract)
-| `AMOUNT` | `amount` | Amount of tez sent by the transaction that invoked the contract
+| `AMOUNT` | `amount` | Amount of tez sent by the transaction that invoked the contract
+| `NOW`    | `now`    | Timestamp of the block whose validation triggered execution of the contract, i.e. current time when the contract is run.

gitlab-pages/docs/setup/installation.md

@@ -3,14 +3,19 @@ id: installation
 title: Installation
 ---
 
-There are currently two ways to get started with Ligo, both of those will allow you to use the Ligo CLI with your contracts. You can choose to use either the Docker image, or to compile & build the Ligo CLI yourself.
+There are currently two ways to get started with Ligo, both of those will allow you to use the Ligo CLI with your contracts. You can choose to use either a Docker image, or to compile & build the Ligo CLI yourself.
 
 ## Dockerized installation (recommended)
 
 > 🐳 You can find instructions on how to install Docker [here](https://docs.docker.com/install/).
 
-Easiest way to use LIGO is through the Docker image available at [Docker Hub](https://hub.docker.com/r/ligolang/ligo). Sources for the image can be found on [Gitlab](https://gitlab.com/ligolang/ligo/blob/dev/docker/Dockerfile).
-You can either run the docker image yourself, or you can setup a global ligo executable as shown below.
+It's easiest to use LIGO through one of its Docker images. You have two options,
+the first is to use our installation script to set up a globally available LIGO
+executable (see below). This manages the Docker bits for you. The second
+is to directly use the Docker image available at [Docker Hub](https://hub.docker.com/r/ligolang/ligo).
+This lets you run multiple versions and keep your installation(s) self contained, but requires more familiarity with Docker.
+Sources for the image can be found on [Gitlab](https://gitlab.com/ligolang/ligo/blob/master/docker/Dockerfile).
+If this is your first time using Docker, you probably want to set up a global ligo executable as shown below.
 
 ### Setting up a globally available `ligo` executable
 

gitlab-pages/docs/tutorials/get-started/tezos-taco-shop-smart-contract.md

@@ -59,6 +59,8 @@ current_purchase_price = max_price / available_stock
 
 In this tutorial, we'll use LIGO's dockerized version for the sake of simplicity. You can find the installation instructions [here](setup/installation.md#dockerized-installation-recommended).
 
+The best way to install the dockerized LIGO is as a **global executable** through the installation script, as shown in the screenshot below:
+
 <img src="/img/tutorials/get-started/tezos-taco-shop-smart-contract/install-ligo.png" />
 <div style="opacity: 0.7; text-align: center; font-size: 12px; margin-top:-24px;">Installing the <b>next</b> version of LIGO's CLI</div>
 

gitlab-pages/website/blog/2019-06-13-public-launch-of-ligo.md

@@ -95,7 +95,7 @@ We are looking to develop a Super Type System that has the following features:
 The current version explicitly excludes non-essential features which can produce unexpected explosions in gas costs. To alleviate this constraint, we plan to integrate gas benchmarks on all top-level declarations with some fuzzing. This will allow developers and users to estimate the cost of their contracts in real time.
 
 ## Getting Started and Contact
-Come visit [our website](ligolang.org)! You can also join our [Discord](https://discord.gg/CmTwFM), Riot (*#ligo-public:matrix.org*) or Telegram Chat (Ligo Public channel).
+Come visit [our website](https://ligolang.org)! You can also join our [Discord](https://discord.gg/9rhYaEt), Riot (*#ligo-public:matrix.org*) or Telegram Chat (Ligo Public channel).
 
 
 

gitlab-pages/website/pages/en/index.js

@@ -97,6 +97,8 @@ class HomeSplash extends React.Component {
           <PromoSection>
             <Button href={docUrl('setup/installation.html')}>Get Started</Button>
             <Button href={docUrl('tutorials/get-started/tezos-taco-shop-smart-contract.html')}>Tutorials</Button>
+            <Button href={docUrl('setup-installation.html')}>Get Started</Button>
+            <Button href={docUrl('tutorials/get-started/tezos-taco-shop-smart-contract')}>Tutorials</Button>
             <Button href={docUrl('contributors/origin.html')}>Contribute</Button>
           </PromoSection>
         </div>