on master help sign in
Merge branch 'master' into master
469b444Zach Alberico
content/community/hoonschool.md+1−1
@@ -8,7 +8,7 @@ hideprevious = "true"
8hidenext = "true"
8hidenext = "true"
9+++
9+++
10
10
11−Interested in developing on Urbit? You’ll want to learn [Hoon](https://urbit.org/docs/tutorials/hoon/), a functional programming language that’s custom-designed for use with Arvo, the Urbit operating system.
11+Interested in developing on Urbit? You’ll want to learn [Hoon](https://urbit.org/docs/tutorials/hoon/hoon-school/), a functional programming language that’s custom-designed for use with Arvo, the Urbit operating system.
12
12
13We want you to learn Hoon, too. That’s why we’re offering Hoon School: a free, online, asynchronous program that’s fully supported by an instructor. We currently offer a 101-level course.
13We want you to learn Hoon, too. That’s why we’re offering Hoon School: a free, online, asynchronous program that’s fully supported by an instructor. We currently offer a 101-level course.
14
14
content/docs+1−1

Submodule changed.

content/faq.md+1−1
@@ -289,7 +289,7 @@ Landscape is an experimental Urbit OS web interface that includes social functio
289
289
290Follow our guide on how to boot a ship [here](@/using/install.md).
290Follow our guide on how to boot a ship [here](@/using/install.md).
291
291
292−Get on the [mailing list](https://urbit.us11.list-manage.com/subscribe/post?u=972a03db9e0c6c25bb58de8c8&id=be143888d2). Learn [Hoon](@/docs/tutorials/hoon/_index.md). Sign up for [Hoon School](@/community/hoonschool.md). [Make stuff](https://grants.urbit.org).
292+Get on the [mailing list](https://urbit.us11.list-manage.com/subscribe/post?u=972a03db9e0c6c25bb58de8c8&id=be143888d2). Learn [Hoon](@/docs/tutorials/hoon/hoon-school/_index.md). Sign up for [Hoon School](@/community/hoonschool.md). [Make stuff](https://grants.urbit.org).
293
293
294
294
295## Urbit Grants
295## Urbit Grants
content/using/develop.md+1−1
@@ -36,7 +36,7 @@ If you’re looking for some guidance, need help, or would prefer direct communi
36
36
37When creating user applications on Urbit, you aren’t tied to any particular user interface. They can work without providing a response to the user, or by printing to the Dojo, or with an interface in Landscape, which uses [Eyre](@/docs/tutorials/arvo/eyre.md) (the Arvo vane that serves HTTP to serve a React-based interface to the application through a web browser).
37When creating user applications on Urbit, you aren’t tied to any particular user interface. They can work without providing a response to the user, or by printing to the Dojo, or with an interface in Landscape, which uses [Eyre](@/docs/tutorials/arvo/eyre.md) (the Arvo vane that serves HTTP to serve a React-based interface to the application through a web browser).
38
38
39−When writing applications, you will often make use of [Gall](@/docs/tutorials/hoon/gall.md), the Arvo vane that manages user applications.
39+When writing applications, you will often make use of [Gall](@/docs/tutorials/hoon/hoon-school/gall.md), the Arvo vane that manages user applications.
40
40
41If you want to see examples of Urbit applications with common functionality requirements, you can see our [examples](https://github.com/urbit/examples) repository. If you want to get started building applications with a Landscape interface, check out our [create-landscape-app](https://github.com/urbit/create-landscape-app) repository.
41If you want to see examples of Urbit applications with common functionality requirements, you can see our [examples](https://github.com/urbit/examples) repository. If you want to get started building applications with a Landscape interface, check out our [create-landscape-app](https://github.com/urbit/create-landscape-app) repository.
42
42
content/using/install.md+2
@@ -112,6 +112,8 @@ http: live (insecure, loopback) on 12321
112
112
113When your ship is finished booting, you will see either the `~sampel_commet:dojo>` or `~sampel_commet:chat-cli/` prompt. If you're seeing `:chat-cli` press `Ctrl-x` to switch into Dojo. At that point, you should permanently erase your keyfile from your machine.
113When your ship is finished booting, you will see either the `~sampel_commet:dojo>` or `~sampel_commet:chat-cli/` prompt. If you're seeing `:chat-cli` press `Ctrl-x` to switch into Dojo. At that point, you should permanently erase your keyfile from your machine.
114
114
115+**Important:** once a key has been used to boot a ship onto the network, it cannot be used to boot that ship again later - doing so will cause communication problems with other ships. For this reason you should **delete the keyfile from your machine once your ship has booted successfully**. (If you do use the same key twice, you'll need to conduct a [personal breach](#breaches) to restore your ship to full functionality).
116+
115To exit Urbit, use `Ctrl-d`. To start your ship up again, run `./urbit mycomet` from the directory that you first booted from. Now let's do some basic commands from inside your ship.
117To exit Urbit, use `Ctrl-d`. To start your ship up again, run `./urbit mycomet` from the directory that you first booted from. Now let's do some basic commands from inside your ship.
116
118
117### The Dojo
119### The Dojo
content/using/operations/using-your-ship.md+1−1
@@ -599,7 +599,7 @@ Tall-form Hoon may require multiple lines:
599~your-urbit:dojo< 2
599~your-urbit:dojo< 2
600```
600```
601
601
602−Hoon uses something called [the subject](@/docs/tutorials/hoon/the-subject-and-its-legs.md).
602+Hoon uses something called [the subject](@/docs/tutorials/hoon/hoon-school/the-subject-and-its-legs.md).
603The Dojo has its own subject and that's where Hoon's equivalent of variables,
603The Dojo has its own subject and that's where Hoon's equivalent of variables,
604called faces, are stored.
604called faces, are stored.
605
605
static/scripts.js+1−10
@@ -412,13 +412,4 @@ if (document.body.classList.contains("page-indiced")) {
412 }
412 }
413 });
413 });
414 })
414 })
415−};
415+};
416−
417−let oceanvid = document.getElementById("ocean");
418−
419−if ((oceanvid !== null) && (window.innerWidth > window.innerHeight)) {
420− oceanvid.innerHTML = `<source
421− src="https://storage.googleapis.com/media.urbit.org/site/sea30-1440.mp4"
422− type="video/mp4"/>
423− Your browser does not support the video tag.`
424−}
templates/index.html+5−24
@@ -19,29 +19,10 @@
19 <meta name="description" content="Urbit is a simple, durable system for running a personal server that you own 100% and forever.">
19 <meta name="description" content="Urbit is a simple, durable system for running a personal server that you own 100% and forever.">
20{% endblock description %}
20{% endblock description %}
21{% block content %}
21{% block content %}
22−
22+<header class="mt7 mb7 c1-12 c2-11-md c3-11-lg">
23−<section class="full p0 vid-insert-wrap full-bleed">
24− <video
25− class="vid-insert bg-black"
26− id="ocean"
27− autoplay
28− muted
29− loop
30− poster="https://media.urbit.org/site/sea30-poster.jpg">
31− </video>
32−
33− <div class="grid12 w-100 h-100">
34− <div class="full c3-10-md c3-10-lg flex items-center align-center z10 white">
35− Urbit is a clean-slate OS and network for the 21st century.
23+ Urbit is a clean-slate OS and network for the 21st century.
36− </div>
24+</header>
37− </div>
38− <!-- VIMEO VERSION KEPT AS SHIM -->
39− <!-- <iframe src="https://player.vimeo.com/video/365353672?background=1"
40− class="w-100 ma0 h-100" frameborder="0" allow="autoplay;fullscreen" allowfullscreen="" style="
41− "></iframe> -->
42−</section>
43−
44−<section class="full lh-copy c2-7-md c3-7-lg mt5">
25+<section class="full lh-copy c2-7-md c3-7-lg mt4">
45 <p><strong>Urbit OS</strong> is a clean slate reimagining of the operating system as an 'overlay OS.' It runs on any Unix machine with an internet connection.</p>
26 <p><strong>Urbit OS</strong> is a clean slate reimagining of the operating system as an 'overlay OS.' It runs on any Unix machine with an internet connection.</p>
46 <p>It's a compact system for an individual to run their own permanent personal server.</p>
27 <p>It's a compact system for an individual to run their own permanent personal server.</p>
47 <p><strong>Urbit ID</strong> is a decentralized digital identity system. Your
28 <p><strong>Urbit ID</strong> is a decentralized digital identity system. Your
@@ -58,7 +39,7 @@
58</section>
39</section>
59
40
60
41
61−<section class="full lh-copy c7-12-md c7-11-lg mt5">
42+<section class="full lh-copy c7-12-md c7-11-lg mt4">
62 <p class="fw6">Latest Posts</p>
43 <p class="fw6">Latest Posts</p>
63 {% set s = get_section(path="updates/_index.md") %}
44 {% set s = get_section(path="updates/_index.md") %}
64 {% set e = get_section(path="blog/_index.md") %}
45 {% set e = get_section(path="blog/_index.md") %}
templates/sections/docs/hoon.html+1−1
@@ -25,7 +25,7 @@
25<div class="measure-wide mb4">
25<div class="measure-wide mb4">
26{{ section.content | safe }}
26{{ section.content | safe }}
27
27
28−{% set lessons = get_section(path="docs/tutorials/hoon/_index.md") %}
28+{% set lessons = get_section(path="docs/tutorials/hoon/hoon-school/_index.md") %}
29
29
30<ul>
30<ul>
31 <h2 class="mv4">Chapter 1</h2>
31 <h2 class="mv4">Chapter 1</h2>