Merge pull request #4184 from hhunter-ms/issue_4183

Reorder TOC and update diagrams to match

daprdocs/content/en/concepts/building-blocks-concept.md

@@ -21,12 +21,12 @@ Dapr provides the following building blocks:
 | Building Block | Endpoint | Description |
 |----------------|----------|-------------|
 | [**Service-to-service invocation**]({{< ref "service-invocation-overview.md" >}}) | `/v1.0/invoke` | Service invocation enables applications to communicate with each other through well-known endpoints in the form of http or gRPC messages. Dapr provides an endpoint that acts as a combination of a reverse proxy with built-in service discovery, while leveraging built-in distributed tracing and error handling.
-| [**State management**]({{< ref "state-management-overview.md" >}}) | `/v1.0/state` | Application state is anything an application wants to preserve beyond a single session. Dapr provides a key/value-based state and query APIs with pluggable state stores for persistence.
 | [**Publish and subscribe**]({{< ref "pubsub-overview.md" >}}) | `/v1.0/publish` `/v1.0/subscribe`|  Pub/Sub is a loosely coupled messaging pattern where senders (or publishers) publish messages to a topic, to which subscribers subscribe. Dapr supports the pub/sub pattern between applications.
+| [**Workflows**]({{< ref "workflow-overview.md" >}}) | `/v1.0-beta1/workflow` | The Workflow API enables you to define long running, persistent processes or data flows that span multiple microservices using Dapr workflows or workflow components. The Workflow API can be combined with other Dapr API building blocks. For example, a workflow can call another service with service invocation or retrieve secrets, providing flexibility and portability. 
+| [**State management**]({{< ref "state-management-overview.md" >}}) | `/v1.0/state` | Application state is anything an application wants to preserve beyond a single session. Dapr provides a key/value-based state and query APIs with pluggable state stores for persistence.
 | [**Bindings**]({{< ref "bindings-overview.md" >}}) | `/v1.0/bindings` | A binding provides a bi-directional connection to an external cloud/on-premise service or system. Dapr allows you to invoke the external service through the  Dapr binding API, and it allows your application to be triggered by events sent by the connected service.
 | [**Actors**]({{< ref "actors-overview.md" >}}) | `/v1.0/actors` |  An actor is an isolated, independent unit of compute and state with single-threaded execution. Dapr provides an actor implementation based on the virtual actor pattern which provides a single-threaded programming model and where actors are garbage collected when not in use.
 | [**Secrets**]({{< ref "secrets-overview.md" >}}) | `/v1.0/secrets` | Dapr provides a secrets building block API and integrates with secret stores such as public cloud stores, local stores and Kubernetes to store the secrets. Services can call the secrets API to retrieve secrets, for example to get a connection string to a database.
 | [**Configuration**]({{< ref "configuration-api-overview.md" >}}) | `/v1.0/configuration` | The Configuration API enables you to retrieve and subscribe to application configuration items for supported configuration stores. This enables an application to retrieve specific configuration information, for example, at start up or when configuration changes are made in the store. 
 | [**Distributed lock**]({{< ref "distributed-lock-api-overview.md" >}}) | `/v1.0-alpha1/lock` | The distributed lock API enables you to take a lock on a resource so that multiple instances of an application can access the resource without conflicts and provide consistency guarantees.  
-| [**Workflows**]({{< ref "workflow-overview.md" >}}) | `/v1.0-beta1/workflow` | The Workflow API enables you to define long running, persistent processes or data flows that span multiple microservices using Dapr workflows or workflow components. The Workflow API can be combined with other Dapr API building blocks. For example, a workflow can call another service with service invocation or retrieve secrets, providing flexibility and portability. 
 | [**Cryptography**]({{< ref "cryptography-overview.md" >}}) | `/v1.0-alpha1/crypto` | The Cryptography API enables you to perform cryptographic operations, such as encrypting and decrypting messages, without exposing keys to your application.

daprdocs/content/en/concepts/components-concept.md

@@ -64,13 +64,6 @@ The component is unavailable for a short period of time during reload and reinit
 
 The following are the component types provided by Dapr:
 
-### State stores
-
-State store components are data stores (databases, files, memory) that store key-value pairs as part of the [state management]({{< ref "state-management-overview.md" >}}) building block.
-
-- [List of state stores]({{< ref supported-state-stores >}})
-- [State store implementations](https://github.com/dapr/components-contrib/tree/master/state)
-
 ### Name resolution
 
 Name resolution components are used with the [service invocation]({{< ref "service-invocation-overview.md" >}}) building block to integrate with the hosting environment and provide service-to-service discovery. For example, the Kubernetes name resolution component integrates with the Kubernetes DNS service, self-hosted uses mDNS and clusters of VMs can use the Consul name resolution component.
@@ -85,6 +78,20 @@ Pub/sub broker components are message brokers that can pass messages to/from ser
 - [List of pub/sub brokers]({{< ref supported-pubsub >}})
 - [Pub/sub broker implementations](https://github.com/dapr/components-contrib/tree/master/pubsub)
 
+### Workflows
+
+A [workflow]({{< ref workflow-overview.md >}}) is custom application logic that defines a reliable business process or data flow. Workflow components are workflow runtimes (or engines) that run the business logic written for that workflow and store their state into a state store.  
+
+<!--- [List of supported workflows]()
+- [Workflow implementations](https://github.com/dapr/components-contrib/tree/master/workflows)-->
+
+### State stores
+
+State store components are data stores (databases, files, memory) that store key-value pairs as part of the [state management]({{< ref "state-management-overview.md" >}}) building block.
+
+- [List of state stores]({{< ref supported-state-stores >}})
+- [State store implementations](https://github.com/dapr/components-contrib/tree/master/state)
+
 ### Bindings
 
 External resources can connect to Dapr in order to trigger a method on an application or be called from an application as part of the [bindings]({{< ref bindings-overview.md >}}) building block.
@@ -113,13 +120,6 @@ Lock components are used as a distributed lock to provide mutually exclusive acc
 - [List of supported locks]({{< ref supported-locks >}})
 - [Lock implementations](https://github.com/dapr/components-contrib/tree/master/lock)
 
-### Workflows
-
-A [workflow]({{< ref workflow-overview.md >}}) is custom application logic that defines a reliable business process or data flow. Workflow components are workflow runtimes (or engines) that run the business logic written for that workflow and store their state into a state store.  
-
-<!--- [List of supported workflows]()
-- [Workflow implementations](https://github.com/dapr/components-contrib/tree/master/workflows)-->
-
 ### Cryptography
 
 [Cryptography]({{< ref cryptography-overview.md >}}) components are used to perform crypographic operations, including encrypting and decrypting messages, without exposing keys to your application.

daprdocs/content/en/concepts/overview.md

@@ -45,14 +45,14 @@ Each of these building block APIs is independent, meaning that you can use any n
 | Building Block | Description |
 |----------------|-------------|
 | [**Service-to-service invocation**]({{< ref "service-invocation-overview.md" >}})  | Resilient service-to-service invocation enables method calls, including retries, on remote services, wherever they are located in the supported hosting environment.
-|  [**State management**]({{< ref "state-management-overview.md" >}}) | With state management for storing and querying key/value pairs, long-running, highly available, stateful services can be easily written alongside stateless services in your application. The state store is pluggable and examples include AWS DynamoDB, Azure Cosmos DB, Azure SQL Server, GCP Firebase, PostgreSQL or Redis, among others.
 | [**Publish and subscribe**]({{< ref "pubsub-overview.md" >}}) | Publishing events and subscribing to topics between services enables event-driven architectures to simplify horizontal scalability and make them resilient to failure. Dapr provides at-least-once message delivery guarantee, message TTL, consumer groups and other advance features.
+| [**Workflows**]({{< ref "workflow-overview.md" >}}) | The workflow API can be combined with other Dapr building blocks to define long running, persistent processes or data flows that span multiple microservices using Dapr workflows or workflow components. 
+| [**State management**]({{< ref "state-management-overview.md" >}}) | With state management for storing and querying key/value pairs, long-running, highly available, stateful services can be easily written alongside stateless services in your application. The state store is pluggable and examples include AWS DynamoDB, Azure Cosmos DB, Azure SQL Server, GCP Firebase, PostgreSQL or Redis, among others.
 | [**Resource bindings**]({{< ref "bindings-overview.md" >}}) | Resource bindings with triggers builds further on event-driven architectures for scale and resiliency by receiving and sending events to and from any external source such as databases, queues, file systems, etc.
 | [**Actors**]({{< ref "actors-overview.md" >}}) | A pattern for stateful and stateless objects that makes concurrency simple, with method and state encapsulation. Dapr provides many capabilities in its actor runtime, including concurrency, state, and life-cycle management for actor activation/deactivation, and timers and reminders to wake up actors.
 | [**Secrets**]({{< ref "secrets-overview.md" >}}) | The secrets management API integrates with public cloud and local secret stores to retrieve the secrets for use in application code.
 | [**Configuration**]({{< ref "configuration-api-overview.md" >}})  | The configuration API enables you to retrieve and subscribe to application configuration items from configuration stores. 
 | [**Distributed lock**]({{< ref "distributed-lock-api-overview.md" >}})  | The distributed lock API enables your application to acquire a lock for any resource that gives it exclusive access until either the lock is released by the application, or a lease timeout occurs. 
-| [**Workflows**]({{< ref "workflow-overview.md" >}}) | The workflow API can be combined with other Dapr building blocks to define long running, persistent processes or data flows that span multiple microservices using Dapr workflows or workflow components. 
 | [**Cryptography**]({{< ref "cryptography-overview.md" >}}) | The cryptography API provides an abstraction layer on top of security infrastructure such as key vaults. It contains APIs that allow you to perform cryptographic operations, such as encrypting and decrypting messages, without exposing keys to your applications.
 
 ### Cross-cutting APIs

daprdocs/content/en/developing-applications/building-blocks/actors/_index.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Actors"
 linkTitle: "Actors"
-weight: 50
+weight: 60
 description: Encapsulate code and data in reusable actor objects as a common microservices design pattern
 ---
 

daprdocs/content/en/developing-applications/building-blocks/bindings/_index.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Bindings"
 linkTitle: "Bindings"
-weight: 40
+weight: 50
 description: Interface with or be triggered from external systems
 ---
 

daprdocs/content/en/developing-applications/building-blocks/cryptography/_index.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Cryptography"
 linkTitle: "Cryptography"
-weight: 110
+weight: 100
 description: "Perform cryptographic operations without exposing keys to your application"  
 ---
 

daprdocs/content/en/developing-applications/building-blocks/pubsub/_index.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Publish & subscribe messaging"
 linkTitle: "Publish & subscribe"
-weight: 30
+weight: 20
 description: Secure, scalable messaging between services
 ---
 

daprdocs/content/en/developing-applications/building-blocks/state-management/_index.md

@@ -2,7 +2,7 @@
 type: docs
 title: "State management"
 linkTitle: "State management"
-weight: 20
+weight: 40
 description: Create long running stateful services
 ---
 

daprdocs/content/en/developing-applications/building-blocks/workflow/_index.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Workflow"
 linkTitle: "Workflow"
-weight: 100
+weight: 30
 description: "Orchestrate logic across various microservices" 
 ---
 

daprdocs/content/en/getting-started/quickstarts/_index.md

@@ -22,13 +22,13 @@ Hit the ground running with our Dapr quickstarts, complete with code samples aim
 
 | Quickstarts | Description |
 | ----------- | ----------- |
-| [Publish and Subscribe]({{< ref pubsub-quickstart.md >}}) |  Asynchronous communication between two services using messaging. |
 | [Service Invocation]({{< ref serviceinvocation-quickstart.md >}}) | Synchronous communication between two services using HTTP or gRPC. |
+| [Publish and Subscribe]({{< ref pubsub-quickstart.md >}}) |  Asynchronous communication between two services using messaging. |
+| [Workflow]({{< ref workflow-quickstart.md >}}) | Orchestrate business workflow activities in long running, fault-tolerant, stateful applications. |
 | [State Management]({{< ref statemanagement-quickstart.md >}}) | Store a service's data as key/value pairs in supported state stores. |
 | [Bindings]({{< ref bindings-quickstart.md >}}) | Work with external systems using input bindings to respond to events and output bindings to call operations. |
 | [Actors]({{< ref actors-quickstart.md >}}) | Run a microservice and a simple console client to demonstrate stateful object patterns in Dapr Actors. |
 | [Secrets Management]({{< ref secrets-quickstart.md >}}) | Securely fetch secrets. |
 | [Configuration]({{< ref configuration-quickstart.md >}}) | Get configuration items and subscribe for configuration updates. |
 | [Resiliency]({{< ref resiliency >}}) | Define and apply fault-tolerance policies to your Dapr API requests. |
-| [Workflow]({{< ref workflow-quickstart.md >}}) | Orchestrate business workflow activities in long running, fault-tolerant, stateful applications. |
 | [Cryptography]({{< ref cryptography-quickstart.md >}}) | Encrypt and decrypt data using Dapr's cryptographic APIs. |

daprdocs/content/en/getting-started/quickstarts/actors-quickstart.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Quickstart: Actors"
 linkTitle: "Actors"
-weight: 75
+weight: 76
 description: "Get started with Dapr's Actors building block"
 ---
 

daprdocs/content/en/getting-started/quickstarts/bindings-quickstart.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Quickstart: Input & Output Bindings"
 linkTitle: "Bindings"
-weight: 74
+weight: 75
 description: "Get started with Dapr's Binding building block"
 ---
 

daprdocs/content/en/getting-started/quickstarts/configuration-quickstart.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Quickstart: Configuration"
 linkTitle: Configuration
-weight: 77
+weight: 78
 description: Get started with Dapr's Configuration building block
 ---
 

daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Quickstart: Publish and Subscribe"
 linkTitle: "Publish and Subscribe"
-weight: 73
+weight: 72
 description: "Get started with Dapr's Publish and Subscribe building block"
 ---
 

daprdocs/content/en/getting-started/quickstarts/secrets-quickstart.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Quickstart: Secrets Management"
 linkTitle: "Secrets Management"
-weight: 76
+weight: 77
 description: "Get started with Dapr's Secrets Management building block"
 ---
 

daprdocs/content/en/getting-started/quickstarts/statemanagement-quickstart.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Quickstart: State Management"
 linkTitle: "State Management"
-weight: 72
+weight: 74
 description: "Get started with Dapr's State Management building block"
 ---
 

daprdocs/content/en/getting-started/quickstarts/workflow-quickstart.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Quickstart: Workflow"
 linkTitle: Workflow
-weight: 78
+weight: 73
 description: Get started with the Dapr Workflow building block
 ---
 

daprdocs/content/en/reference/api/actors_api.md

@@ -3,7 +3,7 @@ type: docs
 title: "Actors API reference"
 linkTitle: "Actors API"
 description: "Detailed documentation on the actors API"
-weight: 500
+weight: 600
 ---
 
 Dapr provides native, cross-platform, and cross-language virtual actor capabilities.

daprdocs/content/en/reference/api/bindings_api.md

@@ -3,7 +3,7 @@ type: docs
 title: "Bindings API reference"
 linkTitle: "Bindings API"
 description: "Detailed documentation on the bindings API"
-weight: 400
+weight: 500
 ---
 
 Dapr provides bi-directional binding capabilities for applications and a consistent approach to interacting with different cloud/on-premise services or systems.

daprdocs/content/en/reference/api/configuration_api.md

@@ -3,7 +3,7 @@ type: docs
 title: "Configuration API reference"
 linkTitle: "Configuration API"
 description: "Detailed documentation on the configuration API"
-weight: 700
+weight: 800
 ---
 
 ## Get Configuration

daprdocs/content/en/reference/api/distributed_lock_api.md

@@ -3,7 +3,7 @@ type: docs
 title: "Distributed Lock API reference"
 linkTitle: "Distributed Lock API"
 description: "Detailed documentation on the distributed lock API"
-weight: 800
+weight: 900
 ---
 
 ## Lock

daprdocs/content/en/reference/api/pubsub_api.md

@@ -3,7 +3,7 @@ type: docs
 title: "Pub/sub API reference"
 linkTitle: "Pub/Sub API"
 description: "Detailed documentation on the pub/sub API"
-weight: 300
+weight: 200
 ---
 
 ## Publish a message to a given topic

daprdocs/content/en/reference/api/secrets_api.md

@@ -3,7 +3,7 @@ type: docs
 title: "Secrets API reference"
 linkTitle: "Secrets API"
 description: "Detailed documentation on the secrets API"
-weight: 600
+weight: 700
 ---
 
 ## Get Secret

daprdocs/content/en/reference/api/state_api.md

@@ -3,7 +3,7 @@ type: docs
 title: "State management API reference"
 linkTitle: "State management API"
 description: "Detailed documentation on the state management API"
-weight: 200
+weight: 400
 ---
 
 ## Component file

daprdocs/content/en/reference/api/workflow_api.md

@@ -3,7 +3,7 @@ type: docs
 title: "Workflow API reference"
 linkTitle: "Workflow API"
 description: "Detailed documentation on the workflow API"
-weight: 900
+weight: 300
 ---
 
 {{% alert title="Note" color="primary" %}}

daprdocs/content/en/reference/components-reference/supported-bindings/_index.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Bindings component specs"
 linkTitle: "Bindings"
-weight: 3000
+weight: 4000
 description: The supported external bindings that interface with Dapr
 aliases:
   - "/operations/components/setup-bindings/supported-bindings/"

daprdocs/content/en/reference/components-reference/supported-configuration-stores/_index.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Configuration store component specs"
 linkTitle: "Configuration stores"
-weight: 5000
+weight: 6000
 description: The supported configuration stores that interface with Dapr
 aliases:
   - "/operations/components/setup-configuration-store/supported-configuration-stores/"

daprdocs/content/en/reference/components-reference/supported-cryptography/_index.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Cryptography component specs"
 linkTitle: "Cryptography"
-weight: 7000
+weight: 8000
 description: The supported cryptography components that interface with Dapr
 no_list: true
 ---

daprdocs/content/en/reference/components-reference/supported-locks/_index.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Lock component specs"
 linkTitle: "Locks"
-weight: 6000
+weight: 7000
 description: The supported locks that interface with Dapr
 no_list: true
 ---

daprdocs/content/en/reference/components-reference/supported-middleware/_index.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Middleware component specs"
 linkTitle: "Middleware"
-weight: 9000
+weight: 10000
 description: List of all the supported middleware components that can be injected in Dapr's processing pipeline.
 no_list: true
 aliases:

daprdocs/content/en/reference/components-reference/supported-name-resolution/_index.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Name resolution provider component specs"
 linkTitle: "Name resolution"
-weight: 8000
+weight: 9000
 description: The supported name resolution providers to enable Dapr service invocation
 no_list: true
 ---

daprdocs/content/en/reference/components-reference/supported-pubsub/_index.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Pub/sub brokers component specs"
 linkTitle: "Pub/sub brokers"
-weight: 2000
+weight: 1000
 description: The supported pub/sub brokers that interface with Dapr
 aliases:
   - "/operations/components/setup-pubsub/supported-pubsub/"

daprdocs/content/en/reference/components-reference/supported-secret-stores/_index.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Secret store component specs"
 linkTitle: "Secret stores"
-weight: 4000
+weight: 5000
 description: The supported secret stores that interface with Dapr
 aliases:
   - "/operations/components/setup-secret-store/supported-secret-stores/"

daprdocs/content/en/reference/components-reference/supported-state-stores/_index.md

@@ -3,7 +3,7 @@ type: docs
 title: "State store component specs"
 linkTitle: "State stores"
 description: "The supported state stores that interface with Dapr"
-weight: 1000
+weight: 4000
 aliases:
   - "/operations/components/setup-state-store/supported-state-stores/"
 no_list: true

daprdocs/content/en/reference/components-reference/supported-workflow-backend/_index.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Workflow backend component specs"
 linkTitle: "Workflow backend"
-weight: 9000
+weight: 2000
 description: The supported workflow backend that orchestrate workflow and save workflow state
 no_list: true
 ---