git.iko.soy/urbit.org
on master help sign in
Merge remote-tracking branch 'urbit/master' into fix-syntax
commit7568a67de987aaebfb7e89126722d822c3cd8f01 authorKeaton Dunsford <keaton@tlon.io> dateFri 7 Apr 2017, 11:11 (10 years ago) parentc8fbfe044b685d
3 files changed+17−20
compare with master
unifiedsplit
docs/hoon/library/2i.md+1−6 docs/using/admin.md+12−10 docs/using/web.md+4−4
docs/hoon/library/2i.md+1−6
@@ -506,7 +506,7 @@ Union
506506 $(b [n.b l.b $(b r.b, a [n.a ~ r.a])], a l.a)
507507
508508Produces 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.
510510
511511`a` is a map.
512512
@@ -523,11 +523,6 @@ shares a key with `a`, the tuple from `a` is preserved.
523523 > n
524524 {[p='a' q=1] [p='c' q=9]}
525525 > (~(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)
531526 {[p='d' q=4] [p='a' q=1] [p='c' q=9]}
532527
533528------------------------------------------------------------------------
docs/using/admin.md+12−10
@@ -2,10 +2,10 @@
22navhome: /docs/
33next: true
44sort: 3
5−title: Basic operation
5+title: Administration and Operation
66---
77
8−# Basic operation
8+# Administration
99
1010<div class="row">
1111<div class="col-md-8">
@@ -36,6 +36,16 @@ To log Urbit's command line output to a file, use `script`:
3636
3737 $ script urbit.log urbit your-urbit
3838
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+
3949## Console
4050
4151Your 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
8999
90100Moons 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.
91101
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−
100102## Continuity breaches
101103
102104While 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:
3434
3535 |serve %sandbox
3636
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):
3838
3939 # Hello
4040
4141 This is a simple markdown file.
4242
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.
4444
4545NOTE: 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`.
4747
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:
4949
5050 # Hello
5151