Merge branch 'master' into feature/finish-v1-of-marketplace-page

content/concepts/components.md

@@ -41,7 +41,7 @@ An example marketplace front-end for consumers to explore, download, and publish
 
 Client libraries used by applications (such as Pleuston or Jupyter notebooks) to interact with Ocean components, including Keepers, Aquarius nodes, Brizo nodes, etc.
 
-![How Squid is Used](images/Squid_role_diagram.jpg)
+![How Squid is Used](images/Squid_role_diagram_small.jpg)
 
 <repo name="squid-js"></repo>
 <repo name="squid-py"></repo>

content/setup/full-node.md

@@ -1,19 +0,0 @@
----
-title: Set Up a Full Node
-description: Run every Ocean component in one machine, all at once.
----
-
-A "full node" is a machine that runs all the [Ocean components](/concepts/components/), set up so they all work together.
-
-As a quick start, you can run a stand-alone full node by doing the following (which requires Git, Docker and Docker Compose):
-
-```bash
-git clone https://github.com/oceanprotocol/docker-images.git
-cd docker-images/
-
-./start_ocean.sh --latest
-```
-
-For more details, see the [docker-images repository](https://github.com/oceanprotocol/docker-images).
-
-<repo name="docker-images"></repo>

content/setup/keeper.md

@@ -1,4 +1,13 @@
 ---
-title: Set Up a Keeper
-description: Coming soon
+title: Run a Keeper
+description: How to Run a Keeper node in the Ocean network.
 ---
+
+The Ocean Protocol v0.9 (Trilobite) Testnet is an Ethereum [Proof-of-Authority (PoA) network](https://wiki.parity.io/Proof-of-Authority-Chains) where all the nodes (Keeper nodes) are running [Parity Ethereum](https://www.parity.io/ethereum/).
+There are two kinds of Keeper nodes in the Trilobite Testnet: authority nodes (voting nodes) and user nodes (non-voting nodes).
+
+Authority nodes have a say in determining which transactions are valid. _In the Trilobite Testnet_, the authority nodes are run by BigchainDB GmbH and its partners.
+
+Anyone can run a user node. It will stay in sync with the other nodes in the Trilobite Testnet, it just won't have a say on whether transactions are valid.
+Marketplaces and publishers should run user nodes.
+See the pages for [marketplaces](/setup/marketplace/) and [publishers](/setup/publisher/).

content/setup/publisher.md

@@ -1,4 +1,10 @@
 ---
 title: Publish Data or Services
-description: Coming soon
+description: How to operate as a publisher in the Ocean network.
 ---
+
+Suppose a data scientist purchased a license to use a particular data set. Then they must go through a publisher to get the actual data set. It might be stored on Azure. The publisher would hold the Azure access keys, and would do the checks necessary to ensure that the data scientist has access before letting them get the data set.
+
+Publishers should run Brizo and a Keeper node.
+
+Initially, there won't be many Ocean marketplaces or publishers, so most marketplaces will also act as publishers, and most publishers will also act as marketplaces. Therefore, for now, see [the docs for marketplaces](/setup/marketplace/).

content/setup/quickstart.md

@@ -0,0 +1,23 @@
+---
+title: Quickstart
+description: Do a quick test drive.
+---
+
+You can run and try every [Ocean software component](/concepts/components/) in your local machine, all at once, using Docker Compose:
+
+```bash
+git clone https://github.com/oceanprotocol/docker-images.git
+cd docker-images/
+
+./start_ocean.sh --latest
+```
+
+One everything is up and running, you can interact with the components. For example, to interact with Pleuston, go to:
+
+[http://localhost:3000/](http://localhost:3000/)
+
+Note that everything is running on your local machine, including a local Ethereum node, and it's not connected to any external Ethereum network.
+
+For the details of what components are running, see the [Ocean Protocol docker-images repository](https://github.com/oceanprotocol/docker-images).
+
+<repo name="docker-images"></repo>

data/sidebars/setup.yml

@@ -1,19 +1,19 @@
-- group: Full Nodes
+- group: Quickstart
   items:
-    - title: Set Up a Full Node
-      link: /setup/full-node/
+    - title: Run & Try Everything
+      link: /setup/quickstart/
 
 - group: Marketplaces
   items:
     - title: Set Up a Marketplace
       link: /setup/marketplace/
 
-- group: Keepers
-  items:
-    - title: Set Up a Keeper
-      link: /setup/keeper/
-
 - group: Publishers
   items:
     - title: Publish Data or Services
       link: /setup/publisher/
+
+- group: Keepers
+  items:
+    - title: Run a Keeper
+      link: /setup/keeper/