on master help sign in
Merge branch 'master' of github.com:urbit/urbit.org into zola-port
commit251db099afd1abd7fb4001380562115d61596283 authorMorgan Sutherland <morgan@morgansutherland.com> dateThu 9 May 2019, 18:40 (7 years ago) parentb3e993f5e862b5
13 files changed+27−15
README+5−1 content/docs+1−1 content/posts/an-urbit-overview.md+3−3 content/posts/beliefs-and-principles.md+1−1 content/posts/common-objections-to-urbit.md+1−1 content/posts/interim-constitution.md+1−1 content/posts/magic.md+1−1 content/posts/the-urbit-address-space.md+2−2 content/posts/urbit-and-the-blockchain.md+1−1 content/posts/what-is-urbit-for.md+1−1 content/posts/why-urbit-probably-does-not-need-a-blockchain.md+1−1 static/_redirects+8 templates/primer.html+1−1
README+5−1
@@ -7,4 +7,8 @@ The website for the Urbit project.
771. git clone this repository
882. Install [zola](https://www.getzola.org/documentation/getting-started/installation/)
993. `cd` into `content/docs` and run `git pull`
10−4. In the root directory of `urbit.org`, run `zola build` or `zola serve`
10+4. In the root directory of `urbit.org`, run `zola build` or `zola serve`
11+
12+## Deploy
13+
14+Commits to master are automatically deployed with Netlify.
content/docs+1−1

Submodule changed.

content/posts/an-urbit-overview.md+3−3
@@ -6,7 +6,7 @@ description = "A high-level overview of Urbit."
66[taxonomies]
77posts = ["Essays"]
88+++
9−![](http://media.urbit.org/site/blog-0.jpg)
9+![](https://media.urbit.org/site/blog-0.jpg)
1010
1111## What Urbit is
1212
@@ -42,7 +42,7 @@ never shows you ads. Or loses your data. Or updates without
4242your consent.
4343
4444Technically, Urbit is a new kind of OS that has a precise formal
45−definition. (Urbit is actually a [single mathematical function](http://media.urbit.org/whitepaper.pdf).) One advantage of a math-based OS is that Urbit is perfectly
45+definition. (Urbit is actually a [single mathematical function](https://media.urbit.org/whitepaper.pdf).) One advantage of a math-based OS is that Urbit is perfectly
4646portable. It can't tell whether it's in a cloud data center or on
4747your home PC.
4848
@@ -205,4 +205,4 @@ evaluate Urbit's [beliefs and principles](../beliefs-and-principles) or its
205205[interim constitution](../interim-constitution).
206206
207207(For technical readers, check out our [documentation](https://urbit.org/docs/) or
208−the [whitepaper](http://media.urbit.org/whitepaper.pdf)).
208+the [whitepaper](https://media.urbit.org/whitepaper.pdf)).
content/posts/beliefs-and-principles.md+1−1
@@ -6,7 +6,7 @@ description = "We believe."
66[taxonomies]
77posts = ["Essays"]
88+++
9−![](http://media.urbit.org/site/blog-2.jpg)
9+![](https://media.urbit.org/site/blog-2.jpg)
1010
1111## Beliefs
1212
content/posts/common-objections-to-urbit.md+1−1
@@ -6,7 +6,7 @@ description = "Some common objections to Urbit, discussed."
66[taxonomies]
77posts = ["Essays"]
88+++
9−![](http://media.urbit.org/site/blog-9.jpg)
9+![](https://media.urbit.org/site/blog-9.jpg)
1010
1111We love crowdsourced criticism. We've heard a lot of great
1212objections to Urbit. Surely there's more out there! If so,
content/posts/interim-constitution.md+1−1
@@ -6,7 +6,7 @@ description = "The governing rules for the early days of the Urbit network."
66[taxonomies]
77posts = ["Essays"]
88+++
9−![](http://media.urbit.org/site/blog-7.jpg)
9+![](https://media.urbit.org/site/blog-7.jpg)
1010
1111## Declaration of purpose
1212
content/posts/magic.md+1−1
@@ -6,7 +6,7 @@ description = "A thought-experiment to explain the Urbit user experience."
66[taxonomies]
77posts = ["Essays"]
88+++
9−![](http://media.urbit.org/site/blog-7.jpg)
9+![](https://media.urbit.org/site/blog-7.jpg)
1010
1111It's easy to get too obsessed with Urbit's alien technology. We
1212didn't build Urbit for its tech. We built it for people to use.
content/posts/the-urbit-address-space.md+2−2
@@ -6,7 +6,7 @@ description = "An overview of Urbit's cryptographic address space."
66[taxonomies]
77posts = ["Essays"]
88+++
9−![](http://media.urbit.org/site/blog-3.jpg)
9+![](https://media.urbit.org/site/blog-3.jpg)
1010
1111## Basics
1212
@@ -63,7 +63,7 @@ It does need governance; but it governs itself as a digital republic.
6363
6464As an Urbit user, these basics are all you need to know. As a
6565developer, a few more details might interest you. (An even more
66−comprehensive treatment is in the [whitepaper](http://media.urbit.org/whitepaper.pdf)).
66+comprehensive treatment is in the [whitepaper](https://media.urbit.org/whitepaper.pdf)).
6767
6868### Design goals
6969
content/posts/urbit-and-the-blockchain.md+1−1
@@ -6,7 +6,7 @@ description = "A bit about the 'idea maze' of choosing to bootstrap from Ethereu
66[taxonomies]
77posts = ["Essays"]
88+++
9−![](http://media.urbit.org/site/blog-1.jpg)
9+![](https://media.urbit.org/site/blog-1.jpg)
1010
1111One core principle of the Urbit network is that *Urbit doesn't take sides*.
1212This is true in all kinds of conflicts -- and especially blockchain wars.
content/posts/what-is-urbit-for.md+1−1
@@ -6,7 +6,7 @@ description = "A vision of the Urbit-powered future."
66[taxonomies]
77posts = ["Essays"]
88+++
9−![](http://media.urbit.org/site/blog-1.jpg)
9+![](https://media.urbit.org/site/blog-1.jpg)
1010
1111Open platforms don't beat closed systems just because they're open.
1212They win because you can do more exciting things with them. We
content/posts/why-urbit-probably-does-not-need-a-blockchain.md+1−1
@@ -6,7 +6,7 @@ description = "Urbit (probably) doesn't need a blockchain, because the Urbit add
66[taxonomies]
77posts = ["Essays"]
88+++
9−![](http://media.urbit.org/site/blog-1.jpg)
9+![](https://media.urbit.org/site/blog-1.jpg)
1010
1111TLDR: Urbit (probably) doesn't need a blockchain, because the Urbit
1212address-space PKI is a special case of a consensus ledger (itself a
static/_redirectsnew file+8
@@ -0,0 +1,8 @@
1+/docs /docs/getting-started/
2+/docs/introduction /docs/concepts/
3+/docs/getting-started/azimuth /docs/getting-started/using-bridge/
4+/landscape /docs/concepts/contributing/
5+/docs/getting-started/using-a-star /docs/getting-started/operating-a-star/
6+/docs/bridge /docs/getting-started/azimuth/
7+/docs/pki /docs/concepts/arvo-vs-azimuth/
8+/fora /docs/using/messaging/
templates/primer.html+1−1
@@ -566,7 +566,7 @@
566566 <p>Clay, our filesystem, is a reactive, <i>typed</i>, distributed revision-control store that defines an authenticated global immutable namespace. </p>
567567 <p>Ford, our functional build system, can auto-update a page in your browser when someone checks in a change to a math function in a back-end rendering library. </p>
568568 <p>With compiler, libraries, Arvo and modules, the whole OS is ~30,000 lines of code. </p>
569− <p>Urbit is also a nontrivial list of other features and components. You can read more in our long, peculiar, mildly outdated <a href="http://media.urbit.org/whitepaper.pdf">whitepaper</a>. <i>Caveat lector</i>, it&#39;s a tad academic. </p>
569+ <p>Urbit is also a nontrivial list of other features and components. You can read more in our long, peculiar, mildly outdated <a href="https://media.urbit.org/whitepaper.pdf">whitepaper</a>. <i>Caveat lector</i>, it&#39;s a tad academic. </p>
570570 <p>Today, Urbit is a stable testnet. Urbit hosts its own site, forum, and federated chat. Its last unplanned breach (global hard fork) was in 2016. </p>
571571 <p>Urbit now has a practical clean-room Vere alternative, Jaque, built on Graal/Truffle. Jaque can boot a ship and join the network. It still has some stack issues. </p>
572572 <p>Urbit is not done. It needs optimization, documentation, a lot of polish and even a bit of architecture. But it certainly does work! </p>