updates to nav bar for v1.5 (#2645)

* update navbar and links Signed-off-by: Hannah Hunter <[email protected]> * archived Signed-off-by: Hannah Hunter <[email protected]> * remove # Signed-off-by: Hannah Hunter <[email protected]>
dapr · Jul 12, 2022 · b5f9093 · b5f9093
1 parent 0e346f1
commit b5f9093
Show file tree

Hide file tree

Showing 29 changed files with 52 additions and 42 deletions.
diff --git a/daprdocs/config.toml b/daprdocs/config.toml
@@ -181,11 +181,17 @@ archived_version = true
 url_latest_version = "https://docs.dapr.io"
 
 [[params.versions]]
-  version = "v1.7 (preview)"
+  version = "v1.9 (preview)"
+  url = "https://v1-9.docs.dapr.io"
+[[params.versions]]
+  version = "v1.8 (latest)"
+  url = "https://docs.dapr.io"
+[[params.versions]]
+  version = "v1.7"
   url = "https://v1-7.docs.dapr.io"
 [[params.versions]]
-  version = "v1.6 (latest)"
-  url = "#"
+  version = "v1.6"
+  url = "https://v1-6.docs.dapr.io"
 [[params.versions]]
   version = "v1.5"
   url = "https://v1-5.docs.dapr.io"

diff --git a/...ontent/en/developing-applications/building-blocks/bindings/bindings-overview.md b/...ontent/en/developing-applications/building-blocks/bindings/bindings-overview.md
@@ -50,5 +50,5 @@ Read the [Use output bindings to interface with external resources]({{< ref howt
 * Follow these guides on:
     * [How-To: Trigger a service from different resources with input bindings]({{< ref howto-triggers.md >}})
     * [How-To: Use output bindings to interface with external resources]({{< ref howto-bindings.md >}})
-* Try out the [bindings quickstart](https://github.com/dapr/quickstarts/tree/master/bindings/README.md) which shows how to bind to a Kafka queue
+* Try out the [bindings tutorial](https://github.com/dapr/quickstarts/tree/master/tutorials/bindings) which shows how to bind to a Kafka queue
 * Read the [bindings API specification]({{< ref bindings_api.md >}})
diff --git a/...s/content/en/developing-applications/building-blocks/bindings/howto-bindings.md b/...s/content/en/developing-applications/building-blocks/bindings/howto-bindings.md
@@ -7,7 +7,7 @@ weight: 300
 ---
 
 Output bindings enable you to invoke external resources without taking dependencies on special SDK or libraries.
-For a complete sample showing output bindings, visit this [link](https://github.com/dapr/quickstarts/tree/master/bindings).
+For a complete sample showing output bindings, visit this [link](https://github.com/dapr/quickstarts/tree/master/tutorials/bindings).
 
 ## Example:
 

diff --git a/...ing-applications/building-blocks/observability/w3c-tracing/w3c-tracing-howto.md b/...ing-applications/building-blocks/observability/w3c-tracing/w3c-tracing-howto.md
@@ -294,4 +294,4 @@ You can now correlate the calls in your app and across services with Dapr using
 - [How To set up Application Insights for distributed tracing with OpenTelemetry]({{< ref open-telemetry-collector.md >}})
 - [How to set up Zipkin for distributed tracing]({{< ref zipkin.md >}})
 - [W3C trace context specification](https://www.w3.org/TR/trace-context/)
-- [Observability quickstart](https://github.com/dapr/quickstarts/tree/master/observability)
+- [Observability sample](https://github.com/dapr/quickstarts/tree/master/tutorials/observability)
diff --git a/...-applications/building-blocks/observability/w3c-tracing/w3c-tracing-overview.md b/...-applications/building-blocks/observability/w3c-tracing/w3c-tracing-overview.md
@@ -108,4 +108,4 @@ In the gRPC API calls, trace context is passed through `grpc-trace-bin` header.
 - [How To set up Application Insights for distributed tracing with OpenTelemetry]({{< ref open-telemetry-collector.md >}})
 - [How To set up Zipkin for distributed tracing]({{< ref zipkin.md >}})
 - [W3C trace context specification](https://www.w3.org/TR/trace-context/)
-- [Observability sample](https://github.com/dapr/quickstarts/tree/master/observability)
+- [Observability sample](https://github.com/dapr/quickstarts/tree/master/tutorials/observability)
diff --git a/...nt/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md b/...nt/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md
@@ -698,7 +698,7 @@ Invoke-RestMethod -Method Post -ContentType 'application/cloudevents+json' -Body
 
 ## Next steps
 
-- Try the [Pub/Sub quickstart sample](https://github.com/dapr/quickstarts/tree/master/pub-sub)
+- Try the [Pub/Sub tutorial sample](https://github.com/dapr/quickstarts/tree/master/tutorials/pub-sub)
 - Learn about [PubSub routing]({{< ref howto-route-messages >}})
 - Learn about [topic scoping]({{< ref pubsub-scopes.md >}})
 - Learn about [message time-to-live]({{< ref pubsub-message-ttl.md >}})

diff --git a/...cs/content/en/developing-applications/building-blocks/pubsub/pubsub-overview.md b/...cs/content/en/developing-applications/building-blocks/pubsub/pubsub-overview.md
@@ -112,7 +112,7 @@ The publish/subscribe API is located in the [API reference]({{< ref pubsub_api.m
 * Follow these guides on:
     * [How-To: Publish a message and subscribe to a topic]({{< ref howto-publish-subscribe.md >}})
     * [How-To: Configure Pub/Sub components with multiple namespaces]({{< ref pubsub-namespaces.md >}})
-* Try out the [Pub/Sub quickstart sample](https://github.com/dapr/quickstarts/tree/master/pub-sub)
+*  Try out the [Pub/Sub tutorial sample](https://github.com/dapr/quickstarts/tree/master/tutorials/pub-sub)
 * Learn about [topic scoping]({{< ref pubsub-scopes.md >}})
 * Learn about [message time-to-live (TTL)]({{< ref pubsub-message-ttl.md >}})
 * Learn about [pubsub without CloudEvent]({{< ref pubsub-raw.md >}})

diff --git a/...ocs/content/en/developing-applications/building-blocks/secrets/howto-secrets.md b/...ocs/content/en/developing-applications/building-blocks/secrets/howto-secrets.md
@@ -270,4 +270,5 @@ main();
 - [Configure a secret store]({{<ref setup-secret-store>}})
 - [Supported secrets]({{<ref supported-secret-stores>}})
 - [Using secrets in components]({{<ref component-secrets>}})
-- [Secret stores quickstart](https://github.com/dapr/quickstarts/tree/master/secretstore)
+- [Secret stores tutorial](https://github.com/dapr/quickstarts/tree/master/tutorials/secretstore)
+
diff --git a/...-applications/building-blocks/service-invocation/service-invocation-overview.md b/...-applications/building-blocks/service-invocation/service-invocation-overview.md
@@ -109,7 +109,7 @@ Dapr allows users to keep their own proto services and work natively with gRPC.
 
 ## Example
 
-Following the above call sequence, suppose you have the applications as described in the [hello world quickstart](https://github.com/dapr/quickstarts/blob/master/hello-world/README.md), where a python app invokes a node.js app. In such a scenario, the python app would be "Service A" , and a Node.js app would be "Service B".
+Following the above call sequence, suppose you have the applications as described in the [hello world quickstart](https://github.com/dapr/quickstarts/tree/master/tutorials/hello-world), where a python app invokes a node.js app. In such a scenario, the python app would be "Service A" , and a Node.js app would be "Service B".
 
 The diagram below shows sequence 1-7 again on a local machine showing the API calls:
 
@@ -129,6 +129,6 @@ The diagram below shows sequence 1-7 again on a local machine showing the API ca
   - [How-to: Invoke services using HTTP]({{< ref howto-invoke-discover-services.md >}})
   - [How-To: Configure Dapr to use gRPC]({{< ref grpc >}})
   - [How-to: Invoke services using gRPC]({{< ref howto-invoke-services-grpc.md >}})
-- Try out the [hello world quickstart](https://github.com/dapr/quickstarts/blob/master/hello-world/README.md) which shows how to use HTTP service invocation or try the samples in the [Dapr SDKs]({{< ref sdks >}})
+- Try out the [hello world tutorial](https://github.com/dapr/quickstarts/tree/master/tutorials/hello-world) which shows how to use HTTP service invocation or try the samples in the [Dapr SDKs]({{< ref sdks >}})
 - Read the [service invocation API specification]({{< ref service_invocation_api.md >}})
 - Understand the [service invocation performance]({{< ref perf-service-invocation.md >}}) numbers
diff --git a/...ping-applications/building-blocks/state-management/state-management-overview.md b/...ping-applications/building-blocks/state-management/state-management-overview.md
@@ -117,7 +117,7 @@ The state management API can be found in the [state management API reference]({{
     * [How-To: Query state]({{< ref howto-state-query-api.md >}})
     * [How-To: Encrypt application state]({{< ref howto-encrypt-state.md >}})
     * [State Time-to-Live]({{< ref state-store-ttl.md >}})
-* Try out the [hello world quickstart](https://github.com/dapr/quickstarts/blob/master/hello-world/README.md) which shows how to use state management or try the samples in the [Dapr SDKs]({{< ref sdks >}})
+* Try out the [hello world tutorial](https://github.com/dapr/quickstarts/tree/master/tutorials/hello-world) which shows how to use state management or try the samples in the [Dapr SDKs]({{< ref sdks >}})
 * List of [state store components]({{< ref supported-state-stores.md >}})
 * Read the [state management API reference]({{< ref state_api.md >}})
 * Read the [actors API reference]({{< ref actors_api.md >}})
diff --git a/daprdocs/content/en/developing-applications/debugging/bridge-to-kubernetes.md b/daprdocs/content/en/developing-applications/debugging/bridge-to-kubernetes.md
@@ -12,7 +12,7 @@ Bridge to Kubernetes allows you to run and debug code on your development comput
 
 ## Debug Dapr apps
 
-Bridge to Kubernetes supports debugging Dapr apps on your machine, while still having them interact with the services and applications running on your Kubernetes cluster. This example showcases Bridge to Kubernetes enabling a developer to debug the [distributed calculator quickstart](https://github.com/dapr/quickstarts/tree/master/distributed-calculator):
+Bridge to Kubernetes supports debugging Dapr apps on your machine, while still having them interact with the services and applications running on your Kubernetes cluster. This example showcases Bridge to Kubernetes enabling a developer to debug the [distributed calculator quickstart](https://github.com/dapr/quickstarts/tree/master/tutorials/distributed-calculator):
 
 <div class="embed-responsive embed-responsive-16by9">
 <iframe width="560" height="315" src="https://www.youtube.com/embed/rxwg-__otso" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>

diff --git a/...s/content/en/developing-applications/debugging/debug-k8s/debug-dapr-services.md b/...s/content/en/developing-applications/debugging/debug-k8s/debug-dapr-services.md
@@ -111,4 +111,4 @@ All done. Now you can point to port 40000 and start a remote debug session from
 
 - [Overview of Dapr on Kubernetes]({{< ref kubernetes-overview >}})
 - [Deploy Dapr to a Kubernetes cluster]({{< ref kubernetes-deploy >}})
-- [Dapr Kubernetes Quickstart](https://github.com/dapr/quickstarts/tree/master/hello-kubernetes)
+- [Dapr Kubernetes Quickstart](https://github.com/dapr/quickstarts/tree/master/tutorials/hello-kubernetes)
diff --git a/daprdocs/content/en/developing-applications/debugging/debug-k8s/debug-daprd.md b/daprdocs/content/en/developing-applications/debugging/debug-k8s/debug-daprd.md
@@ -42,7 +42,7 @@ Then step into 'dapr' directory from your cloned [dapr/dapr repository](https://
 helm install dapr charts/dapr --namespace dapr-system --values values.yml --wait
 ```
 
-To enable debug mode for daprd, you need to put an extra annotation `dapr.io/enable-debug` in your application's deployment file. Let's use [quickstarts/hello-kubernetes](https://github.com/dapr/quickstarts/tree/master/hello-kubernetes) as an example. Modify 'deploy/node.yaml' like below:
+To enable debug mode for daprd, you need to put an extra annotation `dapr.io/enable-debug` in your application's deployment file. Let's use [quickstarts/tutorials/hello-kubernetes](https://github.com/dapr/quickstarts/tree/master/tutorials/hello-kubernetes) as an example. Modify 'deploy/node.yaml' like below:
 
 ```diff
 diff --git a/hello-kubernetes/deploy/node.yaml b/hello-kubernetes/deploy/node.yaml
@@ -61,7 +61,7 @@ index 23185a6..6cdb0ae 100644
 
 The annotation `dapr.io/enable-debug` will hint Dapr injector to inject Dapr sidecar into the debug mode. You can also specify the debug port with annotation `dapr.io/debug-port`, otherwise the default port will be "40000".
 
-Deploy the application with the following command. For the complete guide refer to the [Dapr Kubernetes Quickstart](https://github.com/dapr/quickstarts/tree/master/hello-kubernetes):
+Deploy the application with the following command. For the complete guide refer to the [Dapr Kubernetes tutorial](https://github.com/dapr/quickstarts/tree/master/tutorials/hello-kubernetes):
 
 ```bash
 kubectl apply -f ./deploy/node.yaml
@@ -92,4 +92,4 @@ All done. Now you can point to port 40000 and start a remote debug session to da
 - [Overview of Dapr on Kubernetes]({{< ref kubernetes-overview >}})
 - [Deploy Dapr to a Kubernetes cluster]({{< ref kubernetes-deploy >}})
 - [Debug Dapr services on Kubernetes]({{< ref debug-dapr-services >}})
-- [Dapr Kubernetes Quickstart](https://github.com/dapr/quickstarts/tree/master/hello-kubernetes)
+- [Dapr Kubernetes Quickstart](https://github.com/dapr/quickstarts/tree/master/tutorials/hello-kubernetes)
diff --git a/...n/developing-applications/ides/vscode/vscode-how-to-debug-multiple-dapr-apps.md b/...n/developing-applications/ides/vscode/vscode-how-to-debug-multiple-dapr-apps.md
@@ -18,12 +18,12 @@ dapr run --app-id nodeapp --app-port 3000 --dapr-http-port 3500 app.js
 
 One approach to attaching the debugger to your service is to first run daprd with the correct arguments from the command line and then launch your code and attach the debugger. While this is a perfectly acceptable solution, it does require a few extra steps and some instruction to developers who might want to clone your repo and hit the "play" button to begin debugging.
 
-If your application is a collection of microservices, each with a Dapr sidecar, it will be useful to debug them together in Visual Studio Code. This page will use the [hello world quickstart](https://github.com/dapr/quickstarts/tree/master/hello-world) to showcase how to configure VSCode to debug multiple Dapr application using [VSCode debugging](https://code.visualstudio.com/Docs/editor/debugging).
+If your application is a collection of microservices, each with a Dapr sidecar, it will be useful to debug them together in Visual Studio Code. This page will use the [hello world tutorial](https://github.com/dapr/quickstarts/tree/master/tutorials/hello-world) to showcase how to configure VSCode to debug multiple Dapr application using [VSCode debugging](https://code.visualstudio.com/Docs/editor/debugging).
 
 ## Prerequisites
 
 - Install the [Dapr extension]({{< ref vscode-dapr-extension.md >}}). You will be using the [tasks](https://code.visualstudio.com/docs/editor/tasks) it offers later on.
-- Optionally clone the [hello world quickstart](https://github.com/dapr/quickstarts/tree/master/hello-world)
+- Optionally clone the [hello world tutorial](https://github.com/dapr/quickstarts/tree/master/tutorials/hello-world)
 
 ## Step 1: Configure launch.json
 

diff --git a/.../content/en/developing-applications/ides/vscode/vscode-remote-dev-containers.md b/.../content/en/developing-applications/ides/vscode/vscode-remote-dev-containers.md
@@ -13,10 +13,11 @@ Dapr has pre-built Docker remote containers for NodeJS and C#. You can pick the
 ### Setup a remote dev container
 
 #### Prerequisites
+<!-- IGNORE_LINKS -->
 - [Docker Desktop](https://www.docker.com/products/docker-desktop)
 - [Visual Studio Code](https://code.visualstudio.com/)
 - [VSCode Remote Development extension pack](https://aka.ms/vscode-remote/download/extension)
-
+<!-- END_IGNORE -->
 #### Create remote Dapr container
 1. Open your application workspace in VS Code
 2. In the command command palette (`CTRL+SHIFT+P`) type and select `Remote-Containers: Add Development Container Configuration Files...`

diff --git a/daprdocs/content/en/developing-applications/middleware.md b/daprdocs/content/en/developing-applications/middleware.md
@@ -74,4 +74,3 @@ After the components-contrib change has been accepted, submit another pull reque
 
 * [Component schema]({{< ref component-schema.md >}})
 * [Configuration overview]({{< ref configuration-overview.md >}})
-* [Middleware sample](https://github.com/dapr/samples/tree/master/middleware-oauth-google)
diff --git a/daprdocs/content/en/operations/components/setup-pubsub/_index.md b/daprdocs/content/en/operations/components/setup-pubsub/_index.md
@@ -47,7 +47,7 @@ Visit [this guide]({{< ref "howto-publish-subscribe.md#step-3-publish-a-topic" >
 ## Related links
 
 - Overview of the Dapr [Pub/Sub building block]({{< ref pubsub-overview.md >}})
-- Try the [Pub/Sub quickstart sample](https://github.com/dapr/quickstarts/tree/master/pub-sub)
+- Try the [Pub/Sub tutorial sample](https://github.com/dapr/quickstarts/tree/master/tutorials/pub-sub)
 - Read the [guide on publishing and subscribing]({{< ref howto-publish-subscribe.md >}})
 - Learn about [topic scoping]({{< ref pubsub-scopes.md >}})
 - Learn about [message time-to-live]({{< ref pubsub-message-ttl.md >}})

diff --git a/daprdocs/content/en/operations/components/setup-pubsub/pubsub-namespaces.md b/daprdocs/content/en/operations/components/setup-pubsub/pubsub-namespaces.md
@@ -12,7 +12,7 @@ In some scenarios, applications can be spread across namespaces and share a queu
 Namespaces are a Dapr concept used for scoping applications and components. This example uses Kubernetes namespaces, however the Dapr component namespace scoping can be used on any supported platform. Read [How-To: Scope components to one or more applications]({{< ref "component-scopes.md" >}}) for more information on scoping components.
 {{% /alert %}}
 
-This example uses the [PubSub sample](https://github.com/dapr/quickstarts/tree/master/pub-sub). The Redis installation and the subscribers are in `namespace-a` while the publisher UI is in `namespace-b`. This solution will also work if Redis is installed on another namespace or if you use a managed cloud service like Azure ServiceBus, AWS SNS/SQS or GCP PubSub.
+This example uses the [PubSub sample](https://github.com/dapr/quickstarts/tree/master/tutorials/pub-sub). The Redis installation and the subscribers are in `namespace-a` while the publisher UI is in `namespace-b`. This solution will also work if Redis is installed on another namespace or if you use a managed cloud service like Azure ServiceBus, AWS SNS/SQS or GCP PubSub.
 
 This is a diagram of the example using namespaces.
 
@@ -33,7 +33,7 @@ The table below shows which resources are deployed to which namespaces:
 ## Pre-requisites
 
 * [Dapr installed on Kubernetes]({{< ref "kubernetes-deploy.md" >}}) in any namespace since Dapr works at the cluster level.
-* Checkout and cd into the directory for [PubSub quickstart](https://github.com/dapr/quickstarts/tree/master/pub-sub).
+* Checkout and cd into the directory for [PubSub tutorial](https://github.com/dapr/quickstarts/tree/master/tutorials/pub-sub).
 
 ## Setup `namespace-a`
 

diff --git a/daprdocs/content/en/operations/configuration/invoke-allowlist.md b/daprdocs/content/en/operations/configuration/invoke-allowlist.md
@@ -235,7 +235,7 @@ spec:
 ```
 
 ### Self-hosted mode
-This example uses the [hello world](https://github.com/dapr/quickstarts/tree/master/hello-world/README.md) quickstart.
+This example uses the [hello world](https://github.com/dapr/quickstarts/tree/master/tutorials/hello-world) tutorial.
 
 The following steps run the Sentry service locally with mTLS enabled, set up necessary environment variables to access certificates, and then launch both the node app and python app each referencing the Sentry service to apply the ACLs.
 
@@ -318,7 +318,7 @@ The following steps run the Sentry service locally with mTLS enabled, set up nec
 8. You should see the calls to the node app fail in the python app command prompt based due to the **deny** operation action in the nodeappconfig file. Change this action to **allow** and re-run the apps and you should then see this call succeed.
 
 ### Kubernetes mode
-This example uses the [hello kubernetes](https://github.com/dapr/quickstarts/tree/master/hello-kubernetes/README.md) quickstart.
+This example uses the [hello kubernetes](https://github.com/dapr/quickstarts/tree/master/tutorials/hello-kubernetes) tutorial.
 
 You can create and apply the above configuration files `nodeappconfig.yaml` and `pythonappconfig.yaml` as described in the [configuration]({{< ref "configuration-concept.md" >}}) to the Kubernetes deployments.
 

diff --git a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-overview.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-overview.md
@@ -42,7 +42,7 @@ For information about pulling your application images from a private registry, r
 
 ## Quickstart
 
-You can see some examples [here](https://github.com/dapr/quickstarts/tree/master/hello-kubernetes) in the Kubernetes getting started quickstart.
+You can see some examples [here](https://github.com/dapr/quickstarts/tree/master/tutorials/hello-kubernetes) in the Kubernetes getting started tutorial.
 
 ## Supported versions
 Dapr support for Kubernetes is aligned with [Kubernetes Version Skew Policy](https://kubernetes.io/releases/version-skew-policy).
@@ -52,5 +52,5 @@ Dapr support for Kubernetes is aligned with [Kubernetes Version Skew Policy](htt
 - [Deploy Dapr to a Kubernetes cluster]({{< ref kubernetes-deploy >}})
 - [Upgrade Dapr on a Kubernetes cluster]({{< ref kubernetes-upgrade >}})
 - [Production guidelines for Dapr on Kubernetes]({{< ref kubernetes-production.md >}})
-- [Dapr Kubernetes Quickstart](https://github.com/dapr/quickstarts/tree/master/hello-kubernetes)
+- [Dapr Kubernetes tutorial](https://github.com/dapr/quickstarts/tree/master/tutorials/hello-kubernetes)
 - [Use Bridge to Kubernetes to debug Dapr apps locally, while connected to your Kubernetes cluster]({{< ref bridge-to-kubernetes >}})
diff --git a/daprdocs/content/en/operations/monitoring/metrics/grafana.md b/daprdocs/content/en/operations/monitoring/metrics/grafana.md
@@ -165,13 +165,13 @@ First you need to connect Prometheus as a data source to Grafana.
    {{% /alert %}}
 
 ## References
-
+<!-- IGNORE_LINKS -->
 * [Dapr Observability]({{<ref observability-concept.md >}})
 * [Prometheus Installation](https://github.com/prometheus-community/helm-charts)
 * [Prometheus on Kubernetes](https://github.com/coreos/kube-prometheus)
 * [Prometheus Query Language](https://prometheus.io/docs/prometheus/latest/querying/basics/)
 * [Supported Dapr metrics](https://github.com/dapr/dapr/blob/master/docs/development/dapr-metrics.md)
-
+<!-- END_IGNORE -->
 ## Example
 
 <div class="embed-responsive embed-responsive-16by9">

diff --git a/daprdocs/content/en/operations/monitoring/metrics/prometheus.md b/daprdocs/content/en/operations/monitoring/metrics/prometheus.md
@@ -117,6 +117,7 @@ dapr-prom-prometheus-server-694fd8d7c-q5d59         2/2     Running   0
 </div>
 
 ## References
-
+<!-- IGNORE_LINKS -->
 * [Prometheus Installation](https://github.com/prometheus-community/helm-charts)
-* [Prometheus Query Language](https://prometheus.io/docs/prometheus/latest/querying/basics/)
+* [Prometheus Query Language](https://prometheus.io/docs/prometheus/latest/querying/basics/)
+<!-- END_IGNORE -->