OriginProtocol
diff --git a/Diff for: ‎docs/_layouts/page.html
+4-20 b/Diff for: ‎docs/_layouts/page.html
+4-20
diff --git a/Diff for: ‎docs/assets/css/site.css
+2-5 b/Diff for: ‎docs/assets/css/site.css
+2-5
diff --git a/Diff for: ‎docs/assets/origin-logo-white.png
-1.94 KB b/Diff for: ‎docs/assets/origin-logo-white.png
-1.94 KB
diff --git a/Diff for: ‎docs/assets/origin-logo.png
-5.78 KB b/Diff for: ‎docs/assets/origin-logo.png
-5.78 KB
diff --git a/Diff for: ‎docs/assets/[email protected]
4 KB b/Diff for: ‎docs/assets/[email protected]
4 KB
diff --git a/Diff for: ‎docs/guides/concepts/messaging.md
+7-1 b/Diff for: ‎docs/guides/concepts/messaging.md
+7-1
diff --git a/Diff for: ‎docs/guides/getting_started/contributing.md
+13-24 b/Diff for: ‎docs/guides/getting_started/contributing.md
+13-24
diff --git a/Diff for: ‎docs/guides/getting_started/getting-started.md
-59 b/Diff for: ‎docs/guides/getting_started/getting-started.md
-59
diff --git a/Diff for: ‎docs/guides/getting_started/local-development.md
+4-2 b/Diff for: ‎docs/guides/getting_started/local-development.md
+4-2
diff --git a/Diff for: ‎docs/guides/index.md
+8-8 b/Diff for: ‎docs/guides/index.md
+8-8
@@ -10,29 +10,12 @@
 </head>
 <body>
     <div class="header">
-        <div class="logo"><a href="/">Origin Documentation</a> Docs</div>
-        <nav>
-                <a class="topNav {% unless page.dir contains 'software' %}current{% endunless %}" href="/">Overview</a>
-                <a class="topNav {% if page.dir contains 'software' %}current{% endif %}" href="/software/">Software</a>
-        </nav>
+        <div class="logo"><a href="/"><img src="/assets/[email protected]" height="23" alt="Origin Protocol logo"></a></div>
     </div>
 
     <div class="layout">
         <div class="sidebar">
-            {% assign menuPages = site.pages %}
-            {% if page.dir contains "software" %}
-                {% assign menuPages = site.pages | where_exp:"page",
-            "page.dir contains 'software'" %}
-            {% elsif page.dir contains "guides" %}
-                {% assign menuPages = site.pages | where_exp:"page",
-            "page.dir contains 'guides'" %}
-            {% else %}
-                {% assign menuPages = site.pages | where_exp:"page",
-            "page.dir contains 'guides'" %}
-            {% endif %}
-
-
-            {% assign menuPages = menuPages | sort: 'nav_weight' | reverse %}
+            {% assign menuPages = site.pages | sort: 'nav_weight' | reverse %}
             {% assign pageGroups = menuPages | group_by: "category" %}
             <ul>
             {% for cat in pageGroups %}
@@ -42,7 +25,8 @@
                 {% endif %}                   
                 {% for p in cat.items %}
                 <li class="normal"> 
-                    <a href="{{ p.url }}">{{ p.title }}</a> <!-- {{ p.nav_weight }}-->
+                    <a href="{{ p.url }}">{% if p.menu_title%}{{ p.menu_title }}{% else %}{{ p.title }}{% endif %}</a>
+                    
                     {% if p.toc == true and p.url == page.url %}
                         {{ content | toc_only }}
                     {% endif %}
 
@@ -65,14 +65,11 @@ th {
   display: flex;
   flex-direction: row;
   padding:20px;
-  background-color:#111d28;
+  background-color:#007cff;
 }
 .header > .logo {
   padding-left:10px;
-  background-image:url('/assets/origin-logo-white.png');
-  background-repeat: no-repeat;
-  text-indent:-999px;
-  width:98px;
+  width:99px;
   height:23px;
 }
 
 
@@ -5,4 +5,10 @@ nav_weight: 1
 category: "Concepts"
 ---
 
-(To be Written...)
+Origin messaging provides end to end encrypted communication between two users, using ethereum addresses as their identity.
+
+A room is everything exchanged between two users. Each room uses its own derived keys. This allows a user to give an arbitrator access to only the conversations between themselves and their counterparty, without having to open up other conversations.
+
+At a data level, a room is a list of both the messages from either party and the public keys used between them.
+
+Currently Origin Messaging hosts a service to exchange encrypted room messages, however more distributed message exchanges are possible.
@@ -13,10 +13,10 @@ We use a monorepo for almost all of our development -- see [Origin](https://gith
 
 You are most likely interested in these projects inside the monorepo:
 
-- [Origin.js](https://github.com/OriginProtocol/origin/tree/master/origin-js#origin-js) - Solidity contracts and JavaScript API
-- [Origin DApp](https://github.com/OriginProtocol/origin/tree/master/origin-dapp#origin-dapp) - example React-powered decentralized application
-- [Origin Bridge Server](https://github.com/OriginProtocol/origin/tree/master/origin-bridge#origin-bridge-server) - Python and JavaScript for indexing, attestations, and messaging
-- [Origin Box](https://github.com/OriginProtocol/origin/blob/master/DEVELOPMENT.md#using-docker-compose) - Docker container for simplifying local development
+- [Marketplace DApp](https://github.com/OriginProtocol/origin/tree/master/dapps/marketplace) - React-powered decentralized application built on Origin's platform
+- [Core Packages](https://github.com/OriginProtocol/origin/tree/master/packages) - A suite of smart contracts and standards for creating listings, offers, and identities on decentralized marketplaces
+- [Infrastructure](https://github.com/OriginProtocol/origin/tree/master/infra) - Services enabling functionality that is either impossible or impractical to do directly on-chain, such as indexing, messaging, and notifications
+- [Mobile App](https://github.com/OriginProtocol/origin/tree/master/mobile) - Native application that offers a fully-integrated marketplace experiences with a built-in Ethereum wallet
 
 Other repos of interest:
 
@@ -31,7 +31,7 @@ We work in public and our company Discord is open to all. If you have questions
 
 We have an open weekly engineering call on Google Hangouts every Wednesday at 12:30 Pacific Time. [Add to Calendar](https://calendar.google.com/event?action=TEMPLATE&tmeid=YXBiOThhc2s3cnE4NGltMXFwbWhpY3ZpNm9fMjAxOTAxMDlUMjAzMDAwWiBtaWNhaEBvcmlnaW5wcm90b2NvbC5jb20&tmsrc=micah%40originprotocol.com&scp=ALL)
 
-![Origin Engineering Call](/source/images/origin_engineering_call.png "Origin Engineering Call")
+<div style="background-color: #061d2a; border: 30px solid #061d2a;"><img src="/source/images/last-sun-oct.svg" alt="Origin Engineering Call" /></div>
 
 Join the call here: [https://meet.google.com/pws-cgyd-tqp](https://meet.google.com/pws-cgyd-tqp)
 
@@ -42,17 +42,14 @@ Everyone is welcome to join, even if you're just lurking. All we ask is that you
 
 ## Dive Right In
 
-If you're ready to start hacking on Origin right now and you just need an issue to focus on, check out our [open issues](https://github.com/search?utf8=%E2%9C%93&q=user%3AOriginProtocol+is%3Aopen+&type=Issues) especially those tagged as a [good first issue](
-https://github.com/search?utf8=%E2%9C%93&q=user%3AOriginProtocol+is%3Aopen++label%3A%22good+first+issue%22&type=Issues&ref=advsearch&l=&l=).
+If you're ready to start hacking on Origin right now and you just need an issue to focus on, check out our ["good first issues"](https://github.com/OriginProtocol/origin/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) and [let one of us know](https://www.originprotocol.com/discord) which one you plan to tackle.
 
-We use two week development sprints and you can see what we're currently prioritizing on [our Github project board](https://github.com/orgs/OriginProtocol/projects/2).
+We use [ZenHub](https://www.zenhub.com/) to manage our engineering tasks and product development. [Download their browser extension](https://www.zenhub.com/extension) and check out our open workspace at [github.com/originprotocol/origin#zenhub](https://github.com/originprotocol/origin#zenhub).
 
 Read our [development process](#contributing-email-development-process) and [community guidelines](#contributing-email-community-guidelines) first and have fun!
 
 ## Development Process
 
-Getting your local environment running is easy with [Origin Box](https://github.com/OriginProtocol/origin/tree/master/development#origin-box). We recommend using this Docker container for any development or testing that involves running a local blockchain.
-
 Our branching strategy is similar to [GitFlow](http://nvie.com/posts/a-successful-git-branching-model/), but we do all of our development in the `master` branch and have a `stable` branch for code that has been released.
 
 Your development flow should look like:
@@ -76,12 +73,6 @@ For JavaScript, we use [NPM's style](https://docs.npmjs.com/misc/coding-style),
 
 For Solidity, we use two space indents.
 
-## Troubleshooting a Development Environment
-
-* If you encounter errors while executing `npm install` for any of the Origin repositories, try running a recent LTS version of Node.js. [nvm](https://github.com/creationix/nvm) is a tool that can install specific versions of Node.js. After installing `nvm`, run `nvm install --lts`, remove your `node_modules` directory, and run `npm install` again.
-
-* If you are using `origin-box` Docker setup and are running OSX Sierra below 10.13.4 Docker volumes might randomly stop syncing. This results in problems where host machine source code updates do not get propagated to file system inside Docker. To resolve this issue update OSX Sierra to 10.13.4 or above. See [this thread](https://github.com/EugenMayer/docker-sync/issues/517) for more details. 
-
 ## Protocol Design
 
 When considering protocol or implementation design proposals, we are looking for:
@@ -108,24 +99,22 @@ We want to keep the Origin community awesome, growing and collaborative. We need
 
 ## Reporting Issues
 
-If you find bugs, mistakes or inconsistencies in the Origin project's code or
-documents, please let us know by filing an issue at the appropriate issue
-tracker (we use multiple repositories). 
+If you find bugs, mistakes or inconsistencies in Origin's code or
+documents, please let us know by filing a GitHub issue. 
 
 <aside class="notice">
 No issue is too small. Help us fix our tpyos!
 </aside>
 
 - [Good first issues](https://github.com/OriginProtocol/origin/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22+)
 - [Docs issues](https://github.com/OriginProtocol/origin/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3Adocs)
-- [Origin.js issues (JS API & Solidity contracts)](https://github.com/OriginProtocol/origin/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3Aorigin.js)
 - [DApp issues](https://github.com/OriginProtocol/origin/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3Adapp)
 - [Playground issues](https://github.com/OriginProtocol/origin-playground/issues)
 - [Company website issues](https://github.com/OriginProtocol/origin-website/issues)
 
 ## Security Issues
 
-The Origin Protocol and its implementations are still in early development, which means there may be problems with the protocol or in our implementations. We take security vulnerabilities very seriously. If you discover a security issue, please bring it to our attention right away!
+Origin is still in early development, which means there may be problems with the protocol or in our implementations. We take security vulnerabilities very seriously. If you discover a security issue, please bring it to our attention right away!
 
 If you find a vulnerability please send your report privately to [[email protected]](mailto:[email protected]) or [contact Josh Fraser via Keybase](https://keybase.io/joshfraser). Please DO NOT file a public issue.
 
@@ -137,12 +126,12 @@ Origin is just as much about community as it is about our technology.
 
 We need constant help in improving our documentation, building new tools to interface with our platform, spreading the word to new users, helping new users getting setup and much more.
 
-Please get in touch if you would like to help out. Our `general` channel on [Discord](https://discord.gg/jyxpUSe) is a great place to share ideas and volunteer to help.
+Please get in touch if you would like to help out. Our `general` channel on [Discord](https://www.originprotocol.com/discord) is a great place to share ideas and volunteer to help.
 
 ## Full Time Positions
 
 Origin occasionally hires developers for part time or full time positions. 
 
-We have a strong preference for hiring people who have already started contributing to the project. If you want a full time position on our team, your best shot is to engage with our team and start contributing code. It is very unlikely that we would offer you a full time position on our engineering team unless you've had at least a few pull requests merged.
+We have a strong preference for hiring people who have already started contributing to the project. If you want a full time position on our team, your best shot is to engage with our team and start contributing code. It is very unlikely that we would offer you a full-time position on our engineering team unless you've had at least a few pull requests merged.
 
-If you are interested, check out [the Origin Protocol job listings](https://angel.co/originprotocol/jobs). If you'd like to help in other ways, please propose your ideas in the [Origin Discord](https://discord.gg/jyxpUSe).
+If you are interested, check out [the Origin Protocol job listings](https://angel.co/originprotocol/jobs). If you'd like to help in other ways, please propose your ideas in [our Discord channel](https://www.originprotocol.com/discord).
@@ -36,11 +36,13 @@ npm start
 
 4. You will then need to connect to your locally running blockchain in MetaMask. Follow these steps:
 
+-  ⚠️ ***Be 100% sure that you have your existing wallet backed up!***
+
 - Log out of MetaMask.
 
 - Click `Restore from seed phrase`
 
-- Enter the following seed phrase (Mnemonic):
+- Enter the following seed phrase (mnemonic):
 
 ```
 candy maple cake sugar pudding cream honey rich smooth crumble sweet treat
@@ -146,7 +148,7 @@ If a container is failing with code 137 it could be that it has encountered Out
 
 #### Port errors
 
-The environment requires a number of ports to be free on your machine (3000, 5000, 5002, 8080, 8081 and 8545). If one of these ports isn't available spinning up the development environment may fail.
+The environment requires a number of ports to be free on your machine (3000, 5000, 5002, 8080, 8081 and 8545). If one of these ports isn't available, spinning up the development environment may fail.
 
 #### Metamask errors
 
 
@@ -6,26 +6,26 @@ category: "Overview"
 permalink: /
 ---
 
-Origin provides a simple and powerful javascript library for developers to build decentralized marketplaces, allowing buyers and sellers to meet and transact without requiring any trusted intermediaries.
+Origin provides a simple and powerful JavaScript library for developers to build decentralized marketplaces, allowing buyers and sellers to meet and transact without any trusted intermediaries.
 
 ### Usage
 
-Visit our Github: [https://github.com/OriginProtocol](https://github.com/OriginProtocol)
+Visit our GitHub: [https://github.com/OriginProtocol](https://github.com/OriginProtocol)
 
-This API documentation will explain how developers can use the origin.js library to create and manage decentralized marketplaces that are built on top of [IPFS](https://github.com/ipfs) and the [Ethereum network](https://www.ethereum.org/).
+This documentation will explain how developers can use the Origin platform to create and manage decentralized marketplaces that are built on top of [IPFS](https://github.com/ipfs) and the [Ethereum network](https://www.ethereum.org/).
 
-Origin.js aims to create an easy and flexible abstraction layer that:
+Origin aims to create an easy and flexible abstraction layer that:
 
 * Generates and deploys secure Ethereum smart contracts to the blockchain.
 * Creates and posts user and listing metadata to distributed IPFS nodes
 * Queries against open-source indexing servers to render content in decentralized applications (DApps)
 
-Origin.js enables developers to create DApps that onboard new users to the Origin platform, add new listings to the listings registry, create booking contracts, close out bookings (transfer funds, write reviews, etc.), and more.
+Origin enables developers to create DApps that allow users to create listings, make purchases, manage their identities, and more.
 
 ### Notes
 
-Please note this project is still in heavy development and many of the features described below have not been implemented yet. This library should not be considered as production-ready.
+Please note that this project is still under heavy development and many necessary features have not yet been implemented. This library should not be considered production-ready.
 
-Origin.js and the entire Origin Protocol project is 100% open-source and we welcome contributions from the community. There are many ways to help, from reporting issues and contributing code to helping us improve and grow our community.
+The entire Origin Protocol project is 100% open-source and we welcome contributions from the community. There are many ways to help, from reporting issues and contributing code, to helping us improve and grow our community.
 
-If you are interested in getting involved, please read our section on [contributing](getting_started/contributing.md). If at any point you get stuck, please [reach out](#getting-help) and we'll do our best to help. 
+If you are interested in getting involved, please read our section on [contributing](getting_started/contributing.md). If at any point you get stuck, please contact us on #engineering in [Discord](https://originprotocol.com/discord).