git.iko.soy/urbit.org
on master help sign in
Merge remote-tracking branch 'urbit/master' into fix-syntax
7568a67Keaton Dunsford
docs/hoon/library/2i.md+1−6
compare with master
unifiedsplit
@@ -506,7 +506,7 @@ Union
506 $(b [n.b l.b $(b r.b, a [n.a ~ r.a])], a l.a)
506 $(b [n.b l.b $(b r.b, a [n.a ~ r.a])], a l.a)
507
507
508Produces a map of the union between the keys of `a` and `b`. If `b`
508Produces a map of the union between the keys of `a` and `b`. If `b`
509−shares a key with `a`, the tuple from `a` is preserved.
509+shares a key with `a`, the tuple from `b` is preserved.
510
510
511`a` is a map.
511`a` is a map.
512
512
@@ -523,11 +523,6 @@ shares a key with `a`, the tuple from `a` is preserved.
523 > n
523 > n
524 {[p='a' q=1] [p='c' q=9]}
524 {[p='a' q=1] [p='c' q=9]}
525 > (~(uni by o) n)
525 > (~(uni by o) n)
526− {[p='d' q=4] [p='a' q=1] [p='c' q=3]}
527− > =n (mo `(list ,[@t *])`[['a' 1] ['c' 9] ~])
528− > n
529− {[p='a' q=1] [p='c' q=9]}
530− > (~(uni by o) n)
531 {[p='d' q=4] [p='a' q=1] [p='c' q=9]}
526 {[p='d' q=4] [p='a' q=1] [p='c' q=9]}
532
527
533------------------------------------------------------------------------
528------------------------------------------------------------------------
docs/using/admin.md+12−10
@@ -2,10 +2,10 @@
2navhome: /docs/
2navhome: /docs/
3next: true
3next: true
4sort: 3
4sort: 3
5−title: Basic operation
5+title: Administration and Operation
6---
6---
7
7
8−# Basic operation
8+# Administration
9
9
10<div class="row">
10<div class="row">
11<div class="col-md-8">
11<div class="col-md-8">
@@ -36,6 +36,16 @@ To log Urbit's command line output to a file, use `script`:
36
36
37 $ script urbit.log urbit your-urbit
37 $ script urbit.log urbit your-urbit
38
38
39+## Moving your pier
40+
41+Piers are designed to be portable, but it *must* be done while the Urbit is turned off. Urbit networking is stateful, so you can't run two copies of the same Urbit in two places.
42+
43+To move a pier, simply move the contents of the directory it lives in. To keep these files as small as possible we usually use the `--sparse` option in `tar`. With a pier `your-urbit/` something like this (from inside `urbit/`) should work:
44+
45+ tar -Scvzf your-urbit.tar.gz ./your-urbit/
46+
47+# Operation
48+
39## Console
49## Console
40
50
41Your Urbit terminal is separated into two parts: the prompt (the bottom line) and the record (everything above that). The record is shared; all the output from all the apps in your command set appears in it. The prompt is multiplexed.
51Your Urbit terminal is separated into two parts: the prompt (the bottom line) and the record (everything above that). The record is shared; all the output from all the apps in your command set appears in it. The prompt is multiplexed.
@@ -89,14 +99,6 @@ You can use the resulting output in the same installation flow from [install](/d
89
99
90Moons are automatically synced to their parent `%kids` desk, and can control applications on their parent planet using `|link`. You can read more about those things in the [filesystem](/docs/using/filesystem) and [console](/docs/using/shell) walkthroughs.
100Moons are automatically synced to their parent `%kids` desk, and can control applications on their parent planet using `|link`. You can read more about those things in the [filesystem](/docs/using/filesystem) and [console](/docs/using/shell) walkthroughs.
91
101
92−## Moving your pier
93−
94−Piers are designed to be portable, but it *must* be done while the Urbit is turned off. Urbit networking is stateful, so you can't run two copies of the same Urbit in two places.
95−
96−To move a pier, simply move the contents of the directory it lives in. To keep these files as small as possible we usually use the `--sparse` option in `tar`. With a pier `your-urbit/` something like this (from inside `urbit/`) should work:
97−
98− tar -Scvzf your-urbit.tar.gz ./your-urbit/
99−
100## Continuity breaches
102## Continuity breaches
101
103
102While the Urbit network is in this alpha state we sometimes have to reboot the whole network. This happens either when major changes need to be shipped or we hit a bug that can't be fixed over the air.
104While the Urbit network is in this alpha state we sometimes have to reboot the whole network. This happens either when major changes need to be shipped or we hit a bug that can't be fixed over the air.
docs/using/web.md+4−4
@@ -34,18 +34,18 @@ To switch the desk you're serving from:
34
34
35 |serve %sandbox
35 |serve %sandbox
36
36
37−To host a file on the web try putting the following in `/home/web/test.md` (from Unix):
37+To host a file on the web try putting the following in `/sandbox/web/test.md` (from Unix):
38
38
39 # Hello
39 # Hello
40
40
41 This is a simple markdown file.
41 This is a simple markdown file.
42
42
43−Create the directory `/home/web/test/` and add two more markdown files in it.
43+Create the directory `/sandbox/web/test/` and add two more markdown files in it.
44
44
45NOTE: Due to a bug in Urbit you may have to create the directory and the file in it in rapid
45NOTE: Due to a bug in Urbit you may have to create the directory and the file in it in rapid
46−succession using something like `mkdir home/web/test && touch home/web/test/first.md`.
46+succession using something like `mkdir sandbox/web/test && touch sandbox/web/test/first.md`.
47
47
48−Now modify `/home/web/test.md` to list the children using the `<list/>` JSX:
48+Now modify `/sandbox/web/test.md` to list the children using the `<list/>` JSX:
49
49
50 # Hello
50 # Hello
51
51