on master help sign in
mid-way through clean-up
commita7e9c845f5f335a084dece9d87f667b775b4a666 authorMorgan Sutherland <morgan@morgansutherland.com> dateMon 14 Jan 2019, 08:51 (8 years ago) parent393f1ff
5 files changed+3−11
introduction.udon−5 learn/arvo/nock.udon+1−1 learn/azimuth/blockchain.udon+2−3 reference/library/1a.udon−1 reference/library/1c.udon−1
introduction.udon−5
@@ -36,10 +36,5 @@ If you're interested in contributing to the Urbit project, building applications
3636
3737If you're a developer looking for Arvo reference documentation, this section is for you.
3838
39−<<<<<<< Updated upstream
40−- Confused about all the new words? Check out the [Glossary](/docs/reference/glossary).
41−- Don't miss the helpful Hoon rune [Cheat Sheet](/docs/reference/cheat-sheet).
42−=======
4339- Confused about all the new words? Check out the [Glossary](docs/reference/glossary).
4440- Don't miss the helpful Hoon rune [Cheat Sheet](docs/reference/cheat-sheet).
45−>>>>>>> Stashed changes
learn/arvo/nock.udon+1−1
@@ -1,6 +1,6 @@
11:- :~ navhome/'/docs/'
22 navuptwo/'true'
3− sort/'1'
3+ sort/'3'
44 title/'Nock'
55 ==
66;>
learn/azimuth/blockchain.udon+2−3
@@ -1,5 +1,5 @@
11:- :~ title/'Why Urbit Uses a Blockchain'
2− sort/'1'/
2+ sort/'1'
33 ==
44;>
55
@@ -14,8 +14,7 @@ Each point has associated authentication and encryption keys for networking.
1414Think of a point as an IP address, a domain name, and a PGP key-pair.
1515
1616There are a limited number of points and, as you might expect, scarcity gives
17−points value. This means that bad actors -- spammers, scammers, and
18−malware-spreaders -- can be made economically unviable. Points being
17+points value. This means that bad actors – spammers, scammers, and malware-spreaders – can be made economically unviable. Points being
1918immutable allows for reputation systems to be built on top,
2019keeping the network friendly and giving users information to help them decide
2120who to treat as a trusted peer.
reference/library/1a.udon−1
@@ -5,7 +5,6 @@
55
66;>
77
8−
98# 1a: basic arithmetic
109
1110### `++add`
reference/library/1c.udon−1
@@ -5,7 +5,6 @@
55
66;>
77
8−
98# 1c: molds and mold builders
109
1110### `++bloq`