git.iko.soy/urbit.org
on master help sign in
Merge remote-tracking branch 'origin/master' into cleanorg
16ac6a7production server
docs/hoon/concepts.md+4−4
compare with master
unifiedsplit
@@ -78,7 +78,7 @@ Turing-complete, non-lambda combinator function. The function
78takes a cell `{subject formula}`, and produces a noun `product`.
78takes a cell `{subject formula}`, and produces a noun `product`.
79
79
80To program in Hoon, this is all you need to know about Nock. But
80To program in Hoon, this is all you need to know about Nock. But
81−it's still bfun and useful to [learn more](../../nock).
81+it's still fun and useful to [learn more](../../nock).
82
82
83## Compilation concepts
83## Compilation concepts
84
84
@@ -121,7 +121,7 @@ contain flat twigs, but not vice versa.
121
121
122Regular forms always start with a *sigil*, which is either a
122Regular forms always start with a *sigil*, which is either a
123*keyword* or a *rune* at the programmer's choice. A keyword is
123*keyword* or a *rune* at the programmer's choice. A keyword is
124−the stem cord,
124+the stem cord.
125
125
126For most stems, tall regular form has no delimiter or terminator,
126For most stems, tall regular form has no delimiter or terminator,
127eliminating the `)))))` problem common in functional languages.
127eliminating the `)))))` problem common in functional languages.
@@ -143,7 +143,7 @@ b
143```
143```
144or the tall rune syntax (here on one line, with double spaces):
144or the tall rune syntax (here on one line, with double spaces):
145```
145```
146−:- a b
146+%- a b
147```
147```
148
148
149### `span` (type, as range)
149### `span` (type, as range)
@@ -156,7 +156,7 @@ no syntax for spans; they are always defined by inference (ie, by
156### `gate` (function)
156### `gate` (function)
157
157
158A `gate` is a Hoon function (lambda or closure). Other
158A `gate` is a Hoon function (lambda or closure). Other
159−constructs Urbit are functions in the mathematical sense -- for
159+constructs in Urbit are functions in the mathematical sense -- for
160instance, a Nock formula is also a function. But a gate is not a
160instance, a Nock formula is also a function. But a gate is not a
161formula. The gate's argument is its *sample*; the result is its
161formula. The gate's argument is its *sample*; the result is its
162*product*.
162*product*.
docs/hoon/syntax.md+5−5
@@ -54,7 +54,7 @@ the eye to tell whether a token on the screen is a feature of the
54language, or a label in the program. For example, in Lisp a
54language, or a label in the program. For example, in Lisp a
55special form has the same syntax as a function call.
55special form has the same syntax as a function call.
56
56
57−The worst-case result of FLC is "DSL cancer". Every source file
57+The worst-case result of FLC is "DSL cancer." Every source file
58is effectively written in its own domain-specific language. To
58is effectively written in its own domain-specific language. To
59read a new file is to learn a new language -- "write-only code."
59read a new file is to learn a new language -- "write-only code."
60
60
@@ -139,10 +139,10 @@ Some twigs (simple leafy ones) have *only* irregular forms.
139A regular form starts with a *sigil*, which is either a
139A regular form starts with a *sigil*, which is either a
140*keyword* or a *rune* -- at the programmer's choice.
140*keyword* or a *rune* -- at the programmer's choice.
141
141
142−A *keyword* is `:` and then the stem label - eg, `:cons`.
142+A *keyword* is `:` and then the stem label - e.g., `:cons`.
143
143
144−A *rune* is a pair of ASCII punctuation marks (a digraph) - eg,
144+A *rune* is a pair of ASCII punctuation marks (a digraph) - e.g.,
145−`:-`. The first glyph in the rune indicates the category - eg,
145+`:-`. The first glyph in the rune indicates the category - e.g.,
146`:` runes make cells. Runes can be pronounced by their glyphs or
146`:` runes make cells. Runes can be pronounced by their glyphs or
147by their stem -- for `:-`, you can say either "colhep" or "cons".
147by their stem -- for `:-`, you can say either "colhep" or "cons".
148
148
@@ -196,7 +196,7 @@ both tall/flat mode switches and well-shaped gaps. (Hoon layout
196could probably be done automatically with reasonable quality.
196could probably be done automatically with reasonable quality.
197But it would at least take machine learning, not a rule engine.)
197But it would at least take machine learning, not a rule engine.)
198
198
199−There only two real *rules* in Hoon whitespace design: don't
199+There are only two real *rules* in Hoon whitespace design: don't
200go past 80 characters, and don't use (completely) blank lines.
200go past 80 characters, and don't use (completely) blank lines.
201Otherwise, if it looks good and is easy to read, it's good. But
201Otherwise, if it looks good and is easy to read, it's good. But
202the best way to learn the art is to do everything by convention
202the best way to learn the art is to do everything by convention
docs/nock/definition.md+1−1
@@ -109,7 +109,7 @@ in the subject.
109
109
110A formula `[1 b]` produces the constant noun `b`.
110A formula `[1 b]` produces the constant noun `b`.
111
111
112−A formula `[2 b c]` treats `b` and `c` is formulas, resolves each
112+A formula `[2 b c]` treats `b` and `c` as formulas, resolves each
113against the subject, then computes Nock again with the product of
113against the subject, then computes Nock again with the product of
114`b` as the subject, `c` as the formula.
114`b` as the subject, `c` as the formula.
115
115
docs/using/install.md+1−1
@@ -77,6 +77,6 @@ Once your dependencies are installed the rest is easy:
77 git clone https://github.com/urbit/urbit
77 git clone https://github.com/urbit/urbit
78 cd urbit
78 cd urbit
79 make
79 make
80− curl -o urbit.pill https://bootstrap.urbit.org/latest.pill
80+ curl -o urbit.pill http://bootstrap.urbit.org/latest.pill
81
81
82After running `make`, your Urbit executable lives at `bin/urbit`. The `.pill` file is a compiled binary of Arvo that Urbit uses to bootstrap itself.
82After running `make`, your Urbit executable lives at `bin/urbit`. The `.pill` file is a compiled binary of Arvo that Urbit uses to bootstrap itself.