Merge branch 'master' of http://github.com/urbit/arvo

lib/down-jet/parse.hoon

@@ -616,7 +616,7 @@
   ::
   ++  proc-inline                                       ::  parse inline kids
     |=  pac/_pars:inli                               ::  cache
-    |=  a/elem
+    |=  a/elem  ^+  a
     ?^  -.a  a(q (flop (turn q.a ..$)))
     ?+  -.a  a
       $code  

ren/rss-xml.hoon

@@ -19,7 +19,7 @@
 ::  urb:front attrs confuse RSS validators, readers
 =+  no-meta=|=(a/marl ^+(a ?~(a ~ ?.(?=($meta n.g.i.a) a $(a t.a)))))
 ::
-%-  crip  %-  print
+%-  crip  %-  en-xml
 ;rss(version "2.0")
   ;channel
     ;title: *{hed.sum}

ren/tree/head.hoon

@@ -48,7 +48,7 @@
     ;script(type "text/javascript", src "{(cdnjs "react/0.14.6/react")}");
     ;script(type "text/javascript", src "{(cdnjs "react/0.14.6/react-dom")}");
     ;script(type "text/javascript", src "{(cdnjs "flux/2.1.1/Flux")}");
-    ;*  (turn (~(tap by extras)) |=({@ a/@t} ;script(type "text/javascript"):"{(trip a)}"))
+    ;*  (turn ~(tap by extras) |=({@ a/@t} ;script(type "text/javascript"):"{(trip a)}"))
 ::     ;script(type "text/javascript", src "//cdnjs.cloudflare.com/ajax/libs/codemirror/4.3.0/codemirror.js");
 ::     ;script(type "text/javascript", src "//cdnjs.cloudflare.com/ajax/libs/".
 ::       "codemirror/4.3.0/mode/markdown/markdown.min.js");

ren/tree/json.hoon

@@ -19,11 +19,11 @@
 ++  plist   (list {term $@(mark plist)})
 ++  query
   $%  {$kids p/(list query)}
-      {$ktts $t}
+      {$name $t}
       {$path $t}
       {$spur $t}
   ::
-      {$dtls $t}
+      {$bump $t}
       {$beak $t}
       {$comt $j}
       {$plan $j}
@@ -56,11 +56,11 @@
   |=  a/query
   :-  -.a
   ?-  -.a
-    $ktts  (from-type +.a ?^(s.bem i.s.bem q.bem))
+    $name  (from-type +.a ?^(s.bem i.s.bem q.bem))
     $beak  (from-type +.a (crip (spud (en-beam bem(s /)))))
     $path  (from-type +.a (crip (spud (flop s.bem))))
     $spur  (from-type +.a (crip (spud s.bem)))
-    $dtls  (from-type +.a bump.dat)
+    $bump  (from-type +.a bump.dat)
     $plan  (from-type +.a plan.dat)
     $comt  (from-type +.a comt.dat)
     $head  (from-type +.a head.dat)

sys/zuse.hoon

@@ -4332,7 +4332,7 @@
     |=  who/ship  ^-  ship
     =+  mir=(clan who)
     ?-  mir
-      $czar  ~zod
+      $czar  who
       $king  (end 3 1 who)
       $duke  (end 4 1 who)
       $earl  (end 5 1 who)