Merge branch 'master' into feature/github-repo-contents

config.js

@@ -2,7 +2,7 @@ module.exports = {
     siteTitle: 'Ocean Protocol Documentation',
     siteShortTitle: 'Docs',
     siteDescription:
-        'Learn everything you need to know to develop with Ocean Protocol. This should be a bit longer cause it is also the meta description so why not write some more.',
+        'Learn about the components of the Ocean Protocol software stack, and how to run or use the components relevant to you.',
     siteUrl: process.env.SITE_URL || 'https://docs.oceanprotocol.com',
     siteIcon: 'src/images/profile.png',
     siteCompany: 'Ocean Protocol Foundation Ltd.',

content/concepts/components.md

@@ -41,6 +41,8 @@ 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)
+
 <repo name="squid-js"></repo>
 <repo name="squid-py"></repo>
 <repo name="squid-java"></repo>

content/tutorials/introduction.md

@@ -0,0 +1,16 @@
+---
+title: Overview of the Tutorials
+description: What you can expect to find in these Ocean Protocol tutorials.
+---
+
+These tutorials give examples of how to use Pleuston (a demo marketplace app) and Python to:
+
+- publish a data set
+- publish a compute service
+- get and use a data set
+- get and use a compute service
+
+The Python tutorials use [Jupyter notebooks](http://jupyter.org/).
+For now, check out [the Mantaray repository](https://github.com/oceanprotocol/mantaray). In the future, we hope to have live online Jupyter notebooks.
+
+<repo name="mantaray"></repo>

content/tutorials/jupyter.md

@@ -1,7 +0,0 @@
----
-title: Use Jupyter Notebooks to interact with the Ocean network
----
-
-For now, check out [the Mantaray repository](https://github.com/oceanprotocol/mantaray). In the future, we hope to have live online Jupyter notebooks.
-
-<repo name="mantaray"></repo>

data/sections.yml

@@ -10,5 +10,5 @@
 
 - title: Tutorials
   description: Browse tutorials for most common setup and development use-cases.
-  link: /tutorials/jupyter/
+  link: /tutorials/introduction/
   color: orange

data/sidebars/tutorials.yml

@@ -1,4 +1,18 @@
-- group: Data Science
+- group: Overview
   items:
-    - title: Jupyter Notebooks
-      link: /tutorials/jupyter/
+    - title: Introduction
+      link: /tutorials/introduction/
+
+- group: Publish
+  items:
+    - title: Publish a Data Set
+      link: /tutorials/publish-data-set/
+    - title: Publish a Compute Service
+      link: /tutorials/publish-compute-service/
+
+- group: Consume
+  items:
+    - title: Get & Use a Data Set
+      link: /tutorials/get-use-data-set/
+    - title: Get & Use a Compute Service
+      link: /tutorials/get-use-compute-service/