Updating product language

config.yaml

@@ -49,21 +49,21 @@ menu:
       url: /products/
       hasChildren: true
       weight: 20
-    - identifier: products/data-mesh
-      name: Data Meshes
-      url: /products/data-mesh
+    - identifier: products/data-hub
+      name: Data Hubs
+      url: /products/data-hubs
       parent: products
-      weight: 201
-    - identifier: products/framework-services
-      name: Framework Services
-      url: /products/framework-services
+      weight: 203
+    - identifier: products/mesh-services
+      name: Mesh Services
+      url: /products/mesh-services
       parent: products
       weight: 202
     - identifier: products/data-commons
       name: Data Commons
       url: /products/data-commons
       parent: products
-      weight: 203
+      weight: 201
     - identifier: products/workspaces
       name: Workspaces
       url: /products/workspaces

content/products/_index.md

@@ -6,20 +6,20 @@ date: 2021-01-08
 g3Teaser:
   fig: /figs/productkv.svg
   title: Gen3 Products
-  detail: The Gen3 platform consists of a collection of open source software services for building and managing cloud-based data resources, namely, interoperable nodes in a data mesh, data commons, and analysis workspaces.
+  detail: The Gen3 platform consists of a collection of open-source software services for building and managing cloud-based data resources, namely, interoperable nodes in a data mesh, data commons, and analysis workspaces.
   para1: Each of the Gen3 services is designed to accomplish a specific function in a data ecosystem, and that is achieved by providing a publicly-accessible application programming interface (API) that users, applications, and other services can send requests to.
   para2: This page organizes and presents the Gen3 software services in terms of the different types of data resources mentioned above.
 g3DataFeature:
   f0:
-    title: Gen3 Data Meshes
-    subtitle: Data meshes consist of an interconnected network of data resources that are integrated by utilizing a common set of software services called the Gen3 Framework Services.  Meshes may also be referred to as fabrics or ecosystems. The framework services support the emergence of data meshes by empowering data resources to interoperate through providing common protocols for user authentication and authorization, data indexing, and metadata services.
+    title: Gen3 Data Hubs
+    subtitle: A Data Hub can search and discover data from across a data mesh and move the data to a Gen3 Workspace for exploring and analyzing the data.
     button:
-      link: /products/data-mesh
+      link: /products/data-hubs
   f1:
-    title: Gen3 Framework Services
+    title: Gen3 Mesh Services
     subtitle: User authentication with data object and metadata indexing.
     button:
-      link: /products/framework-services
+      link: /products/mesh-services
     contents:
       c1:
         name: Object Indexing

content/products/data-commons.md

@@ -6,7 +6,7 @@ date: 2021-01-08
 g3Teaser:
   title: Gen3 Data Commons
   detail: Gen3 Data Commons are cyberinfrastructure that co-locates data analysis, exploration and visualization tools with data management services for import and export of structured information like clinical, phenotypic, or biospecimen data, and data objects, like genomics data files or medical images.
-  para1: Gen3 Data Commons are capable of interoperation with other resources in a data mesh by utilizing the Gen3 Framework Services for user authentication and authorization, data object indexing, and metadata services.
+  para1: Gen3 Data Commons are capable of interoperation with other resources in a data mesh by utilizing the Gen3 Mesh Services for user authentication and authorization, data object indexing, and metadata services.
 g3Feature:
   f1:
     title: Data Search

content/products/data-mesh.md → content/products/data-hubs.md

@@ -1,17 +1,17 @@
 ---
-identifier: products/data-mesh
-title: Gen3 - Products - Data Meshes
-linktitle: /products/data-mesh
+identifier: products/data-hubs
+title: Gen3 - Products - Data Hubs
+linktitle: /products/data-hubs
 date: 2021-01-08
 aliases: /products/data-ecosystems
 g3Teaser:
-  title: Gen3 Data Meshes
-  detail: Data meshes consist of an interconnected network of data resources that are integrated by utilizing a common set of software services called the Gen3 Framework Services.  Meshes may also be referred to as fabrics or ecosystems. The framework services support the emergence of data meshes by empowering data resources to interoperate through providing common protocols for user authentication and authorization, data indexing, and metadata services.
-  para1: In a healthy data mesh, one finds multiple data commons, data repositories, knowledgebases, and other sources of data alongside cloud-computing platforms for large-scale processing of data and data portals, cloud-based workspaces, Jupyter notebooks and other applications for exploring and analyzing data.
+  title: Gen3 Data Hubs
+  detail: A data mesh (aka data ecosystem) consists of two or more data commons, data repositories, knowledgebases, and applications over a common set of services (called mesh services). A data hub can search and discover data from across the mesh and move the data to a Gen3 Workspace for exploring and analyzing the data.
+  para1: In a healthy data ecosystem, one finds multiple data commons, data repositories, knowledgebases, and other sources of data alongside cloud-computing platforms for large-scale processing of data and data portals, cloud-based workspaces, Jupyter notebooks and other applications for exploring and analyzing data.
 g3Feature:
   f1:
-    title: Gen3 Framework Services
-    detail: The Gen3 Framework Services are a minimal set of software services that provide open APIs for indexing data objects, associating metadata with the data objects, and controlling user access to data via a robust and flexible access control policy engine.
+    title: Gen3 Mesh Services
+    detail: The Gen3 Mesh Services are a minimal set of software services that provide open APIs for indexing data objects, associating metadata with the data objects, and controlling user access to data via a robust and flexible access control policy engine.
     fig1: /figs/features/index.svg
     fig2: /figs/features/auth.svg
     fig3: /figs/features/mds.svg

content/products/mesh-services.md

@@ -0,0 +1,87 @@
+---
+identifier: products/mesh-services
+title: Gen3 - Products - Mesh Services
+linktitle: /products/mesh-services
+date: 2021-01-08
+aliases: /products/framework-services
+g3Teaser:
+  title: Gen3 Mesh Services
+  detail: The Gen3 Mesh Services are a minimal set of software services that provide open APIs for indexing data objects, associating metadata with the data objects, and controlling user access to data via a robust and flexible access control policy engine.
+  para1: Data resources using the Gen3 Mesh Services get the minimal backend functionality necessary for managing data and controlling user access to it. Specifically, the services included in the Gen3 Mesh Services are those for data object indexing, storing and associating metadata with data objects, and user authentication and authorization.  Mesh services support both data commons and data meshes.
+g3Feature:
+  f1:
+    title: Object Indexing
+    fig: /figs/features/index.svg
+    detail: The Gen3 data object indexing service mints permanent digital IDs, called data GUIDs (globally unique IDs), for data objects. The service tracks the physical locations and hash of every asset (file) in the data commons object store. The Gen3 platform includes landing pages which support FAIR descriptions of the data objects.
+  f2:
+    title: User Authentication and Authorization
+    fig: /figs/features/auth.svg
+    detail: The Gen3 Framework Services include software services for user authentication and fine-grained authorization to services, metadata, and data objects via a flexible access control policy engine. Gen3 utilizes OpenID Connect for providing AuthN services with AuthZ specified on a per commons basis. Currently supported identity providers include Google and Shibboleth, supporting providers such as NIH iTrust, InCommon Federation, and eduGAIN.
+  f3:
+    title: Metadata Service
+    fig: /figs/features/mds.svg
+    detail: The Gen3 metadata service provides support for arbitrary JSON blobs attached to globally unique identifiers (GUIDs). This provides a simple and flexible way to add additional, non-schema-enforced metadata into the system without the need for a fully-fledged, harmonized data model.
+---
+
+<section class="g3-bg__yellow">
+  <div class="g3-outer-wrapper g3-flex-content">
+    <div class="g3-space__padding-lg-top g3-space__padding-lg-bottom g3-col__65">
+      <div class="g3-space__wrapper-gap-left">
+        <h1 class="g3-space__margin-sm-bottom">
+          {{< param "g3Teaser.title" >}}
+        </h1>
+        <p class="g3-space__margin-sm-bottom introduction">
+          {{< param "g3Teaser.detail" >}}
+        </p>
+      </div>
+    </div>
+  </div>
+</section>
+
+<section>
+  <div class="g3-space__margin-lg-bottom g3-inner-wrapper">
+    <div class="g3-flex-content g3-space__margin-md-top-bottom g3-space__margin-sm-left-right">
+      <div class="g3-col__35 g3-flex-content g3-flex-content_center g3-flex-content_flex-start">
+        <img class="g3-col__70" src="{{< param "g3Feature.f1.fig" >}}" />
+      </div>
+      <div class="g3-col__65 g3-flex-content g3-flex-content__col g3-flex-content__col-center">
+        <h3 class="g3-space__margin-sm-bottom">
+          {{< param "g3Feature.f1.title" >}}
+        </h3>
+        <p class="g3-space__margin-sm-bottom">
+          {{< param "g3Feature.f1.detail" >}}
+        </p>
+        <br>
+        <p class="g3-space__margin-sm-bottom">
+          {{< param "g3Feature.f1.para1" >}}
+        </p>
+      </div>
+    </div>
+    <div class="g3-flex-content g3-space__margin-md-top-bottom g3-space__margin-sm-left-right">
+      <div class="g3-col__65 g3-flex-content g3-flex-content__col g3-flex-content__col-center">
+        <h3 class="g3-space__margin-sm-bottom">
+          {{< param "g3Feature.f2.title" >}}
+        </h3>
+        <p class="g3-space__margin-sm-bottom">
+          {{< param "g3Feature.f2.detail" >}}
+        </p>
+      </div>
+      <div class="g3-col__35 g3-flex-content g3-flex-content_center g3-flex-content_flex-start g3-flex-content__reverse">
+        <img class="g3-col__70" src="{{< param "g3Feature.f2.fig" >}}" />
+      </div>
+    </div>
+    <div class="g3-flex-content g3-space__margin-md-top-bottom g3-space__margin-sm-left-right">
+      <div class="g3-col__35 g3-flex-content g3-flex-content_center g3-flex-content_flex-start">
+        <img class="g3-col__70" src="{{< param "g3Feature.f3.fig" >}}" />
+      </div>
+      <div class="g3-col__65 g3-flex-content g3-flex-content__col g3-flex-content__col-center">
+        <h3 class="g3-space__margin-sm-bottom">
+          {{< param "g3Feature.f3.title" >}}
+        </h3>
+        <p class="g3-space__margin-sm-bottom">
+          {{< param "g3Feature.f3.detail" >}}
+        </p>
+      </div>
+    </div>
+  </div>
+</section>

gen3/docs/products/index.md

@@ -1,6 +1,6 @@
 # Gen3 Products
 
-The Gen3 platform consists of a collection of open source software services for building and managing cloud-based data resources, namely, interoperable nodes in a data ecosystem, data commons, and analysis workspaces.
+The Gen3 platform consists of a collection of open source software services for building and managing cloud-based data resources, namely, interoperable nodes in a data mesh, data commons, and analysis workspaces.
 
 Each of the Gen3 services is designed to accomplish a specific function in a data ecosystem, and that is achieved by providing a publicly-accessible application programming interface (API) that users, applications, and other services can send requests to.
 
@@ -14,7 +14,7 @@ Data ecosystems consist of an interconnected network of data resources that are
     button:
       link: /products/data-ecosystems
 
-## Gen3 Framework Services
+## Gen3 Mesh Services
 
 User authentication with data object and metadata indexing.
     button: