Merge remote-tracking branch 'origin/master' into typedclay

Conflicts:
	urb/urbit.pill
This commit is contained in:
Philip C Monk 2015-03-10 15:47:22 -04:00
commit 277a301036
3 changed files with 7 additions and 6 deletions

View File

@ -631,12 +631,12 @@
=^ gim ..weft wisp
:_ +>.$
^- (list rock)
=+ wit=(met 13 q.gim)
=+ wit=(met ?:(fak.ton 18 13) q.gim)
?< =(0 wit)
?: =(1 wit)
=+ yup=(spit [our her] p.gim q.gim)
[yup ~]
=+ ruv=(rip 13 q.gim)
=+ ruv=(rip ?:(fak.ton 18 13) q.gim)
=+ gom=(shaf %thug q.gim)
=+ inx=0
|- ^- (list rock)
@ -1409,7 +1409,7 @@
=+ [nix=0 rax=*(list ,@)]
|- ^- @
?: =(p.duv nix)
(can 13 (turn (flop rax) |=(a=@ [1 a])))
(can ?:(fak.ton.fox 18 13) (turn (flop rax) |=(a=@ [1 a])))
$(nix +(nix), rax [(need (~(get by q.duv) nix)) rax])
-- :: --la:ho:um:am
::

View File

@ -42,8 +42,8 @@ Copy a file to a given location.
`~zod/try=> :grep 'literal'`
"grep" a file or standard input. Currently only supports literals, but
will eventuall support regular expressions.
"grep" a file or standard input. Currently only supports a literal cord,
but will eventuall support regular expressions.
------------------------------------------------------------------------
@ -61,7 +61,7 @@ in the process. Often used to ping ships to check connectivity.
`~zod/try=> :into /path/to/file 'contents'`
Write text to a file. If the specified file does not exist, create a
file by that name.
file by that name. If it does exist, replace its contents.
------------------------------------------------------------------------

View File

@ -1,3 +1,4 @@
:: Over/write to location, usage :into %/foo/txt 'Contents'
!:
::::
::