dapr
diff --git a/‎daprdocs/content/en/concepts/components-concept.md‎
Lines changed: 1 addition & 1 deletion b/‎daprdocs/content/en/concepts/components-concept.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎daprdocs/content/en/concepts/resiliency-concept.md‎
Lines changed: 39 additions & 0 deletions b/‎daprdocs/content/en/concepts/resiliency-concept.md‎
Lines changed: 39 additions & 0 deletions
diff --git a/‎daprdocs/content/en/developing-applications/building-blocks/observability/sidecar-health.md‎
Lines changed: 1 addition & 1 deletion b/‎daprdocs/content/en/developing-applications/building-blocks/observability/sidecar-health.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md‎
Lines changed: 3 additions & 2 deletions b/‎daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎daprdocs/content/en/developing-applications/building-blocks/pubsub/subscription-methods.md‎
Lines changed: 20 additions & 18 deletions b/‎daprdocs/content/en/developing-applications/building-blocks/pubsub/subscription-methods.md‎
Lines changed: 20 additions & 18 deletions
diff --git a/‎daprdocs/content/en/developing-applications/building-blocks/service-invocation/howto-invoke-discover-services.md‎
Lines changed: 2 additions & 2 deletions b/‎daprdocs/content/en/developing-applications/building-blocks/service-invocation/howto-invoke-discover-services.md‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎daprdocs/content/en/developing-applications/building-blocks/service-invocation/service-invocation-overview.md‎
Lines changed: 1 addition & 1 deletion b/‎daprdocs/content/en/developing-applications/building-blocks/service-invocation/service-invocation-overview.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎daprdocs/content/en/developing-applications/integrations/Azure/authenticating-azure.md‎
Lines changed: 1 addition & 1 deletion b/‎daprdocs/content/en/developing-applications/integrations/Azure/authenticating-azure.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎daprdocs/content/en/developing-applications/integrations/Azure/azure-api-management.md‎
Lines changed: 1 addition & 1 deletion b/‎daprdocs/content/en/developing-applications/integrations/Azure/azure-api-management.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎daprdocs/content/en/developing-applications/integrations/Azure/azure-kubernetes-service-extension.md‎
Lines changed: 2 additions & 2 deletions b/‎daprdocs/content/en/developing-applications/integrations/Azure/azure-kubernetes-service-extension.md‎
Lines changed: 2 additions & 2 deletions
@@ -11,7 +11,7 @@ Dapr uses a modular design where functionality is delivered as a component. Each
 You can contribute implementations and extend Dapr's component interfaces capabilities via:
 
 - The [components-contrib repository](https://github.com/dapr/components-contrib)
-- [Pluggable components]({{<ref "components-concept.md#pluggable-components" >}}).
+- [Pluggable components]({{<ref "components-concept.md#built-in-and-pluggable-components" >}}).
 
 A building block can use any combination of components. For example, the [actors]({{<ref "actors-overview.md">}}) and the [state management]({{<ref "state-management-overview.md">}}) building blocks both use [state components](https://github.com/dapr/components-contrib/tree/master/state).
 
 
@@ -0,0 +1,39 @@
+---
+type: docs
+title: "Resiliency"
+linkTitle: "Resiliency"
+weight: 400
+description: "Configure policies and monitor app and sidecar health"
+---
+
+Distributed applications are commonly comprised of many microservices, with dozens - sometimes hundreds - of instances scaling across underlying infrastructure. As these distributed solutions grow in size and complexity, the potential for system failures inevitably increases. Service instances can fail or become unresponsive due to any number of issues, including hardware failures, unexpected throughput, or application lifecycle events, such as scaling out and application restarts. Designing and implementing a self-healing solution with the ability to detect, mitigate, and respond to failure is critical.
+
+## Resiliency Policies
+<img src="/images/resiliency_diagram.png" width="1200" alt="Diagram showing the resiliency applied to Dapr APIs">
+
+Dapr provides a capability for defining and applying fault tolerance resiliency policies to your application. You can define policies for following resiliency patterns:
+
+- Timeouts
+- Retries/back-offs
+- Circuit breakers
+
+These policies can be applied to any Dapr API calls when calling components with a [resiliency spec]({{< ref resiliency-overview >}}).
+
+## App Health Checks
+<img src="/images/observability-app-health.webp" width="800" alt="Diagram showing the app health feature. Running Dapr with app health enabled causes Dapr to periodically probe the app for its health">
+
+Applications can become unresponsive for a variety of reasons. For example, they are too busy to accept new work, could have crashed, or be in a deadlock state. Sometimes the condition can be transitory or persistent.
+
+Dapr provides a capability for monitoring app health through probes that check the health of your application and react to status changes. When an unhealthy app is detected, Dapr stops accepting new work on behalf of the application.
+
+Read more on how to apply [app health checks]({{< ref app-health >}}) to your application.
+
+## Sidecar Health Checks
+<img src="/images/sidecar-health.png" width="800" alt="Diagram showing the app health feature. Running Dapr with app health enabled causes Dapr to periodically probe the app for its health">
+
+Dapr provides a way to determine its health using an [HTTP `/healthz` endpoint]({{< ref health_api.md >}}). With this endpoint, the *daprd* process, or sidecar, can be:
+
+- Probed for its health
+- Determined for readiness and liveness
+
+Read more on about how to apply [dapr health checks]({{< ref sidecar-health >}}) to your application.
@@ -6,7 +6,7 @@ weight: 200
 description: Dapr sidecar health checks
 ---
 
-Dapr provides a way to [determine its health using an [HTTP `/healthz` endpoint]({{< ref health_api.md >}}). With this endpoint, the *daprd* process, or sidecar, can be:
+Dapr provides a way to determine its health using an [HTTP `/healthz` endpoint]({{< ref health_api.md >}}). With this endpoint, the *daprd* process, or sidecar, can be:
 
 - Probed for its health
 - Determined for readiness and liveness
 
@@ -155,13 +155,14 @@ Learn more in the [declarative and programmatic subscriptions doc]({{< ref subsc
 Create a file named `subscription.yaml` and paste the following:
 
 ```yaml
-apiVersion: dapr.io/v1alpha1
+apiVersion: dapr.io/v2alpha1
 kind: Subscription
 metadata:
   name: order-pub-sub
 spec:
   topic: orders
-  route: /checkout
+  routes: 
+    default: /checkout
   pubsubname: order-pub-sub
 scopes:
 - orderprocessing
 
@@ -104,7 +104,6 @@ In your application code, subscribe to the topic specified in the Dapr pub/sub c
 
 ```csharp
  //Subscribe to a topic 
-[Topic("pubsub", "orders")]
 [HttpPost("checkout")]
 public void getCheckout([FromBody] int orderId)
 {
@@ -117,16 +116,15 @@ public void getCheckout([FromBody] int orderId)
 {{% codetab %}}
 
 ```java
+import io.dapr.client.domain.CloudEvent;
+
  //Subscribe to a topic
-@Topic(name = "orders", pubsubName = "pubsub")
 @PostMapping(path = "/checkout")
 public Mono<Void> getCheckout(@RequestBody(required = false) CloudEvent<String> cloudEvent) {
     return Mono.fromRunnable(() -> {
         try {
             log.info("Subscriber received: " + cloudEvent.getData());
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
+        } 
     });
 }
 ```
@@ -136,25 +134,30 @@ public Mono<Void> getCheckout(@RequestBody(required = false) CloudEvent<String>
 {{% codetab %}}
 
 ```python
+from cloudevents.sdk.event import v1
+
 #Subscribe to a topic 
-@app.subscribe(pubsub_name='pubsub', topic='orders')
-def mytopic(event: v1.Event) -> None:
+@app.route('/checkout', methods=['POST'])
+def checkout(event: v1.Event) -> None:
     data = json.loads(event.Data())
     logging.info('Subscriber received: ' + str(data))
-
-app.run(6002)
 ```
 
 {{% /codetab %}}
 
 {{% codetab %}}
 
 ```javascript
-//Subscribe to a topic
-await server.pubsub.subscribe("pubsub", "orders", async (orderId) => {
-    console.log(`Subscriber received: ${JSON.stringify(orderId)}`)
+const express = require('express')
+const bodyParser = require('body-parser')
+const app = express()
+app.use(bodyParser.json({ type: 'application/*+json' }));
+
+// listen to the declarative route
+app.post('/checkout', (req, res) => {
+  console.log(req.body);
+  res.sendStatus(200);
 });
-await server.startServer();
 ```
 
 {{% /codetab %}}
@@ -163,11 +166,10 @@ await server.startServer();
 
 ```go
 //Subscribe to a topic
-if err := s.AddTopicEventHandler(sub, eventHandler); err != nil {
-	log.Fatalf("error adding topic subscription: %v", err)
-}
-if err := s.Start(); err != nil && err != http.ErrServerClosed {
-	log.Fatalf("error listenning: %v", err)
+var sub = &common.Subscription{
+	PubsubName: "pubsub",
+	Topic:      "orders",
+	Route:      "/checkout",
 }
 
 func eventHandler(ctx context.Context, e *common.TopicEvent) (retry bool, err error) {
 
@@ -405,9 +405,9 @@ dapr invoke --app-id checkout --method checkout/100
 
 ### Namespaces
 
-When running on [namespace supported platforms]({{< ref "service_invocation_api.md#namespace-supported-platforms" >}}), you include the namespace of the target app in the app ID: `checkout.production`
+When running on [namespace supported platforms]({{< ref "service_invocation_api.md#namespace-supported-platforms" >}}), you include the namespace of the target app in the app ID. For example, following the `<app>.<namespace>` format, use `checkout.production`.
 
-For example, invoking the example service with a namespace would look like:
+Using this example, invoking the service with a namespace would look like:
 
 ```bash
 curl http://localhost:3602/v1.0/invoke/checkout.production/method/checkout/100 -X POST
 
@@ -134,4 +134,4 @@ For quick testing, try using the Dapr CLI for service invocation:
 - Read the [service invocation API specification]({{< ref service_invocation_api.md >}}). This reference guide for service invocation describes how to invoke methods on other services.
 - Understand the [service invocation performance numbers]({{< ref perf-service-invocation.md >}}).
 - Take a look at [observability]({{< ref monitoring.md >}}). Here you can dig into Dapr's monitoring tools like tracing, metrics and logging.
-- Read up on our [security practices]({{< ref monitoring.md >}}) around mTLS encryption, token authentication, and endpoint authorization.
+- Read up on our [security practices]({{< ref security-concept.md >}}) around mTLS encryption, token authentication, and endpoint authorization.
@@ -84,7 +84,7 @@ To start, create a new Azure AD application, which will also be used as Service
 
 Prerequisites:
 
-- [Azure Subscription](https://azure.microsoft.com/free/)
+- Azure Subscription
 - [Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli)
 - [jq](https://stedolan.github.io/jq/download/)
 - OpenSSL (included by default on all Linux and macOS systems, as well as on WSL)
 
@@ -6,6 +6,6 @@ description: "Publish APIs for Dapr services and components through Azure API Ma
 weight: 2000
 ---
 
-Azure API Management (APIM) is a way to create consistent and modern API gateways for back-end services, including as those built with Dapr. Dapr support can be enabled in self-hosted API Management gateways to allow them to forward requests to Dapr services, send messages to Dapr Pub/Sub topics, or trigger Dapr output bindings. For more information, read the guide on [API Management Dapr Integration policies](https://docs.microsoft.com/azure/api-management/api-management-dapr-policies) and try out the [Dapr & Azure API Management Integration Demo](https://github.com/dapr/samples/tree/master/dapr-apim-integration).
+Azure API Management (APIM) is a way to create consistent and modern API gateways for back-end services, including those built with Dapr. Dapr support can be enabled in self-hosted API Management gateways to allow them to forward requests to Dapr services, send messages to Dapr Pub/Sub topics, or trigger Dapr output bindings. For more information, read the guide on [API Management Dapr Integration policies](https://docs.microsoft.com/azure/api-management/api-management-dapr-policies) and try out the [Dapr & Azure API Management Integration Demo](https://github.com/dapr/samples/tree/master/dapr-apim-integration).
 
 {{< button text="Learn more" link="https://docs.microsoft.com/azure/api-management/api-management-dapr-policies" >}}
@@ -7,7 +7,7 @@ weight: 4000
 ---
 
 # Prerequisites
-- [Azure subscription](https://azure.microsoft.com/free/?WT.mc_id=A261C142F)
+- Azure subscription
 - [Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli-windows?tabs=azure-cli) and the ***aks-preview*** extension.
 - [Azure Kubernetes Service (AKS) cluster](https://docs.microsoft.com/azure/aks/tutorial-kubernetes-deploy-cluster?tabs=azure-cli)
 
@@ -106,4 +106,4 @@ dapr-sidecar-injector-9555889bc-rpjwl   1/1     Running   0          1h
 dapr-sidecar-injector-9555889bc-rqjgt   1/1     Running   0          1h
 ```
 
-For further information such as configuration options and targeting specific versions of Dapr, see the official [AKS Dapr Extension Docs](https://docs.microsoft.com/azure/aks/dapr).
+For more information about configuration options and targeting specific Dapr versions, see the official [AKS Dapr Extension Docs](https://docs.microsoft.com/azure/aks/dapr).