Skip to content

Commit b8c9509

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-refresh
2 parents 7543e25 + f00d383 commit b8c9509

File tree

403 files changed

+4650
-6622
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

403 files changed

+4650
-6622
lines changed

articles/aks/servicemesh-about.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: About service meshes
33
description: Obtain an overview of service meshes, supported scenarios, selection criteria, and next steps to explore.
44
author: pgibson
55
ms.topic: article
6-
ms.date: 04/06/2023
6+
ms.date: 04/18/2023
77
ms.author: pgibson
88
---
99

@@ -37,14 +37,14 @@ Before you select a service mesh, make sure you understand your requirements and
3737

3838
## Next steps
3939

40-
Open Service Mesh (OSM) is a supported service mesh that runs Azure Kubernetes Service (AKS):
40+
Azure Kubernetes Service (AKS) offers officially supported add-ons for Istio and Open Service Mesh:
4141

4242
> [!div class="nextstepaction"]
43+
> [Learn more about Istio][istio-about]
4344
> [Learn more about OSM][osm-about]
4445
4546
There are also service meshes provided by open-source projects and third parties that are commonly used with AKS. These service meshes aren't covered by the [AKS support policy][aks-support-policy].
4647

47-
- [Istio][istio]
4848
- [Linkerd][linkerd]
4949
- [Consul Connect][consul]
5050

@@ -57,7 +57,6 @@ For more details on service mesh standardization efforts, see:
5757
- [Service Mesh Performance (SMP)][smp]
5858

5959
<!-- LINKS - external -->
60-
[istio]: https://istio.io/latest/docs/setup/install/
6160
[linkerd]: https://linkerd.io/getting-started/
6261
[consul]: https://learn.hashicorp.com/tutorials/consul/service-mesh-deploy
6362
[service-mesh-landscape]: https://layer5.io/service-mesh-landscape
@@ -67,4 +66,5 @@ For more details on service mesh standardization efforts, see:
6766

6867
<!-- LINKS - internal -->
6968
[osm-about]: ./open-service-mesh-about.md
69+
[istio-about]: ./istio-about.md
7070
[aks-support-policy]: support-policies.md

articles/azure-resource-manager/bicep/bicep-extensibility-kubernetes-provider.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Bicep extensibility Kubernetes provider
33
description: Learn how to Bicep Kubernetes provider to deploy .NET applications to Azure Kubernetes Service clusters.
44
ms.topic: conceptual
55
ms.custom: devx-track-bicep
6-
ms.date: 02/21/2023
6+
ms.date: 04/18/2023
77
---
88

99
# Bicep extensibility Kubernetes provider (Preview)
@@ -36,7 +36,7 @@ param kubeConfig string
3636
import '[email protected]' with {
3737
namespace: 'default'
3838
kubeConfig: kubeConfig
39-
}
39+
} as k8s
4040
```
4141

4242
- **namespace**: Specify the namespace of the provider.

articles/azure-resource-manager/bicep/installation-troubleshoot.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Troubleshoot problems with Bicep installation
33
description: How to resolve errors and problems with your Bicep installation.
44
ms.topic: conceptual
55
ms.custom: devx-track-bicep
6-
ms.date: 12/15/2021
6+
ms.date: 04/18/2023
77
---
88

99
# Troubleshoot Bicep installation
@@ -22,6 +22,9 @@ Failed to install .NET runtime v5.0
2222
Failed to download .NET 5.0.x ....... Error!
2323
```
2424

25+
> [!WARNING]
26+
> This is a last resort solution that may cause problems when updating versions.
27+
2528
To solve the problem, you can manually install .NET from the [.NET website](https://aka.ms/dotnet-core-download), and then configure Visual Studio Code to reuse an existing installation of .NET with the following settings:
2629

2730
**Windows**

articles/azure-resource-manager/templates/template-functions-numeric.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Template functions - numeric
33
description: Describes the functions to use in an Azure Resource Manager template (ARM template) to work with numbers.
44
ms.topic: conceptual
55
ms.custom: devx-track-arm-template
6-
ms.date: 03/10/2022
6+
ms.date: 04/18/2023
77
---
88

99
# Numeric functions for ARM templates
@@ -300,7 +300,7 @@ The output from the preceding example with the default values is:
300300

301301
| Name | Type | Value |
302302
| ---- | ---- | ----- |
303-
| mulResult | Int | 15 |
303+
| mulResult | Int | 45 |
304304

305305
## sub
306306

articles/cognitive-services/Speech-Service/includes/audio-input-format-chart.md

Lines changed: 0 additions & 15 deletions
This file was deleted.

articles/cognitive-services/Speech-Service/includes/cognitive-services-speech-service-get-subscription-key.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

articles/cognitive-services/Speech-Service/includes/common/delete-resource-openai.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

articles/cognitive-services/Speech-Service/includes/create-speech-resource.md

Lines changed: 0 additions & 33 deletions
This file was deleted.

articles/cognitive-services/Speech-Service/includes/quickstarts/call-center/cli.md

Lines changed: 0 additions & 14 deletions
This file was deleted.

articles/cognitive-services/Speech-Service/includes/quickstarts/call-center/cpp.md

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)