Merge branch 'master' into dillbo

Conflicts:
	urb/zod/docs/pub/doc/guide/a-ford.md
This commit is contained in:
C. Guy Yarvin 2015-04-07 15:18:07 -07:00
commit 8072111d2c

View File

@ -597,8 +597,9 @@ generating html, it's a `.hook`, and our source file is just a `.hoon`.
In order to find our file one level up we need two `%%` to get to In order to find our file one level up we need two `%%` to get to
`/pub/fab/guide/exercise/9/`. Adding `lib` resolve to our neighboring `/pub/fab/guide/exercise/9/`. Adding `lib` resolve to our neighboring
file. You can read more about how `%clay` paths are parsed in the file. You can read more about how `%clay` paths are parsed in the
[`%clay` overview](). It's also pretty easy to try them out using [`%clay` overview](link). It's also pretty easy to try them out using
`:cd` and `:ls` in your `%arvo` terminal. `/=main=`, `/=try`, `/try/a/b/c/d`, etc.
and `:ls` in your `%arvo` terminal.
<hr> <hr>
</hr> </hr>