Merge remote-tracking branch 'mainline/develop' into PWA-1101-alt

pwa-devdocs/src/_config.yml

@@ -24,17 +24,17 @@ defaults:
     scope:
       path: "technologies"
     values:
-      toc-group: "getting-started"
+      toc-group: "overview"
   -
     scope:
       path: "pwa-buildpack"
     values:
-      toc-group: "getting-started"
+      toc-group: "overview"
   -
     scope:
       path: "frequently-asked-questions"
     values:
-      toc-group: "getting-started"
+      toc-group: "overview"
 
   -
     scope:
@@ -52,7 +52,7 @@ defaults:
     scope:
       path: "peregrine"
     values:
-      toc-group: "getting-started"
+      toc-group: "overview"
 
   -
     scope:
@@ -64,7 +64,7 @@ defaults:
     scope:
       path: "venia-pwa-concept"
     values:
-      toc-group: "getting-started"
+      toc-group: "overview"
   -
     scope:
       path: "venia-ui/reference"

pwa-devdocs/src/_data/home-sections.yml

@@ -1,21 +1,21 @@
 - title: Overview
-  content: The Magento PWA Studio project is a set of developer tools that allow you to develop, deploy, and maintain a PWA storefront on top of Magento 2.
+  content: Learn about Magento's PWA Studio and the tools it provides.
   url: /technologies/overview/
 
-- title: Tutorials
-  content: Step-by-step instructions to help you become familiar with PWA Studio tools and concepts.
+- title: Getting Started
+  content: Follow this step-by-step tutorial for setting up your storefront project.
   url: /tutorials/
 
 - title: Basic Concepts
-  content: Things you need to know to work with the Magento PWA Studio tools.
+  content: Read up on the patterns and concepts used in PWA Studio.
   url: /technologies/basic-concepts/
 
 - title: Theme vs Storefront
   content: Learn the differences between a Magento theme and a PWA Studio storefront.
   url: /technologies/theme-vs-storefront/
 
-- title: Contribute to this project
-  content: Read our Contribution Guidelines to find out how you can help develop this project.
+- title: Contribute
+  content: Read the Contribution Guidelines to find out how you can help develop this project.
   url: /technologies/contribute/
 
 - title: Release notes

pwa-devdocs/src/_data/getting-started.yml → pwa-devdocs/src/_data/overview.yml

@@ -1,31 +1,31 @@
-title: Getting Started
+title: Overview
 entries:
-    - label: Overview
+
+    - label: PWA Studio Overview
       url: /technologies/overview/
+      entries:
+
+        - label: External tools and libraries
+          url: /technologies/tools-libraries/
 
-    - label: Frequently Asked Questions (FAQ)
-      url: /frequently-asked-questions/
+        - label: Versioning strategy
+          url: /technologies/versioning/
 
-    - label: Tools and libraries
-      url: /technologies/tools-libraries/
+        - label: Contributing to PWA Studio
+          url: /technologies/contribute/
+
+        - label: Frequently Asked Questions
+          url: /frequently-asked-questions/
 
     - label: Magento integration
       entries:
-          - label: Magento compatibility
+
+          - label: Version compatibility
             url: /technologies/magento-compatibility/
 
           - label: Magento theme vs PWA storefront
             url: /technologies/theme-vs-storefront/
 
-    - label: PWA Storefront architecture
-      url: /technologies/storefront-architecture/
-      entries:
-          - label: Runtime architecture
-            url: /technologies/storefront-architecture/runtime/
-
-          - label: Build-time architecture
-            url: /technologies/storefront-architecture/buildtime/
-
     - label: Basic concepts
       url: /technologies/basic-concepts/
       entries:
@@ -50,55 +50,64 @@ entries:
           - label: State management
             url: /technologies/basic-concepts/state-management/
 
-    - label: PWA Buildpack
-      url: /pwa-buildpack/
+    - label: PWA Storefront architecture
+      url: /technologies/storefront-architecture/
       entries:
-          - label: Configuration management
-            url: /pwa-buildpack/configuration-management/
 
-          - label: Extensibility framework
-            url: /pwa-buildpack/extensibility-framework/
+          - label: Runtime architecture
+            url: /technologies/storefront-architecture/runtime/
 
-          - label: Scaffolding
-            url: /pwa-buildpack/scaffolding/
+          - label: Build-time architecture
+            url: /technologies/storefront-architecture/buildtime/
 
-          - label: Custom project templates
-            url: /pwa-buildpack/scaffolding/custom-project-templates/
+    - label: Venia
+      url: /venia-pwa-concept/
+      entries:
 
-          - label: Troubleshooting
-            url: /pwa-buildpack/troubleshooting/
+          - label: Venia storefront setup
+            url: /venia-pwa-concept/setup/
+
+          - label: Install Venia sample data
+            url: /venia-pwa-concept/install-sample-data/
+
+          - label: Venia project structure
+            url: /venia-pwa-concept/project-structure/
+
+          - label: Modular components
+            url: /venia-pwa-concept/features/modular-components/
 
     - label: Peregrine
       url: /peregrine/
       entries:
+
           - label: Talons
             url: /peregrine/talons/
+
           - label: Routing in PWA Studio
             url: /peregrine/routing/
 
-    - label: Venia storefront concept
-      url: /venia-pwa-concept/
+    - label: PWA Buildpack tools
+      url: /pwa-buildpack/
       entries:
-          - label: Storefront setup
-            url: /venia-pwa-concept/setup/
 
-          - label: Install Venia sample data
-            url: /venia-pwa-concept/install-sample-data/
+          - label: Configuration management
+            url: /pwa-buildpack/configuration-management/
 
-          - label: Project structure
-            url: /venia-pwa-concept/project-structure/
+          - label: Extensibility framework
+            url: /pwa-buildpack/extensibility-framework/
 
-          - label: Modular components
-            url: /venia-pwa-concept/features/modular-components/
+          - label: Scaffolding
+            url: /pwa-buildpack/scaffolding/
+
+          - label: Custom project templates
+            url: /pwa-buildpack/scaffolding/custom-project-templates/
+
+          - label: Troubleshooting
+            url: /pwa-buildpack/troubleshooting/
 
     - label: UPWARD
       url: /technologies/upward/
       entries:
+
           - label: Reference implementation
             url: /technologies/upward/reference-implementation/
-
-    - label: Versioning strategy
-      url: /technologies/versioning/
-
-    - label: Contributing to PWA Studio
-      url: /technologies/contribute/

pwa-devdocs/src/_data/top-nav.yml

@@ -1,6 +1,6 @@
-- label: Getting Started
+- label: Overview
   children:
-      - label: Overview
+      - label: PWA Studio overview
         url: /technologies/overview/
 
       - label: Frequently Asked Questions
@@ -27,7 +27,7 @@
 - label: Tutorials
   url: /tutorials/
 
-- label: Reference API
+- label: API Reference
   children:
       - label: PWA Buildpack
         url: /pwa-buildpack/reference/buildpack-cli/