on master help sign in
Merge branch 'master' into mp-urbitorg-next
commit0a0b6bf36c90a6c30ad4ad60839009ee52f60952 authorMatilde Park <matilde@tlon.io> dateWed 2 Oct 2019, 15:23 (7 years ago) parent3c653301c74abb
4 files changed+9−4
arvo/glossary.md+6−1 hoon/hoon-tutorial/gates.md+1−1 hoon/hoon-tutorial/list-of-numbers.md+1−1 hoon/hoon-tutorial/setup.md+1−1
arvo/glossary.md+6−1
@@ -121,7 +121,7 @@ Below are Arvo modules, which are called "vanes".
121121 Keystroke in Unix -> Vere (virtual machine) -> Arvo -> Dill -> the Dojo
122122 ```
123123
124− Dill is located at `/home/sys/vane/clay.hoon` within your urbit.
124+ Dill is located at `/home/sys/vane/dill.hoon` within your urbit.
125125
126126 More in-depth information on Dill can be found
127127 [`here`](@/docs/arvo/dill.md).
@@ -325,6 +325,11 @@ that can be. Some syntactically invalid expressions can be completed, but the
325325Dojo will prevent them from being entered as a command. You can play around
326326with this functionality learn what syntax is kosher.
327327
328+### desk
329+
330+A desk is independently revision-controlled branch of urbit filesystem.
331+
332+_See [filesystem](@/docs/using/filesystem.md) and [Clay](@/docs/learn/arvo/clay.md)._
328333
329334### duct
330335
hoon/hoon-tutorial/gates.md+1−1
@@ -101,7 +101,7 @@ The pretty printer represents the `$` arm of `inc` as `1.jgn`. To see the actua
101101
102102This is un-computed Nock. You don't need to understand any of this.
103103
104−It's worth pointing out that the arm name, `$`, can be used like any other name. We can compute `$` directly with `$:add` in the dojo:
104+It's worth pointing out that the arm name, `$`, can be used like any other name. We can compute `$` directly with `$:inc` in the dojo:
105105
106106```
107107> $:inc
hoon/hoon-tutorial/list-of-numbers.md+1−1
@@ -18,7 +18,7 @@ Below is a simple Hoon program that takes a single number `n` from the user as i
1818$(count (add 1 count)) :: 8
1919```
2020
21−As we mentioned in the previous lesson, the easiest way to use such a program is to run it as a _generator_. Saving a file in the `/home/gen` directory of your ship allows you to run it from your ship's Dojo (command line) as a generator. Save the above code there as `list.hoon`. Now you can run it in the Dojo as so:
21+As we mentioned in the previous lesson, the easiest way to use such a program is to run it as a _generator_. Mount your desk `|mount %` (if you didn't do it before), saving a file in the `/home/gen` directory of your ship and commiting these changes `|commit %home` allows you to run it from your ship's Dojo (command line) as a generator. Save the above code there as `list.hoon`. Now you can run it in the Dojo as so:
2222
2323`~your-ship:> +list 5`
2424
hoon/hoon-tutorial/setup.md+1−1
@@ -65,7 +65,7 @@ You asked dojo to evaluate `17` and it echoed the number back at you. This valu
6565
6666Generators are the most straightforward way to write Hoon programs. They are a concept in Arvo, and involve saving Hoon code in a `.hoon` text file. While they aren't strictly part of the Hoon language, we'll be dealing with generators throughout this tutorial.
6767
68−The simplest type of generator is the **naked generator**. All naked generators are `gates`: functions that take an argument and produce an output. So, to create a generator, all you need to do is write a `gate` and put it into a file in the `/home/gen` directory of your ship as a `.hoon` file. After this, you need to run `|commit %home` in dojo and the new file will be recognized by your ship. To run a generator named `mygen.hoon`, you would type `+mygen <argument>` in your ship's Dojo.
68+The simplest type of generator is the **naked generator**. All naked generators are `gates`: functions that take an argument and produce an output. Before creating generator you need to mount your `desk` to Unix, for So, to create a generator, all you need to do is write a `gate` and put it into a file in the `/home/gen` directory of your ship as a `.hoon` file. After this, you need to run `|commit %home` in dojo and the new file will be recognized by your ship. To run a generator named `mygen.hoon`, you would type `+mygen <argument>` in your ship's Dojo.
6969
7070If this doesn't make sense yet, that's okay. In the [next lesson](../list-of-numbers), we will walk you through an example `gate` that is run as a generator.
7171