Skip to content

Commit 2b6c520

Browse files
authored
Merge pull request #280502 from MicrosoftDocs/main
7/10/2024 AM Publish
2 parents 3df4f4a + 20328da commit 2b6c520

File tree

52 files changed

+734
-502
lines changed

Some content is hidden

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

52 files changed

+734
-502
lines changed

articles/ai-services/openai/concepts/models.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ The following Embeddings models are available with [Azure Government](/azure/azu
312312

313313
### Assistants (Preview)
314314

315-
For Assistants you need a combination of a supported model, and a supported region. Certain tools and capabilities require the latest models. The following models are available in the Assistants API, SDK, Azure AI Studio and Azure OpenAI Studio. The following table is for pay-as-you-go. For information on Provisioned Throughput Unit (PTU) availability, see [provisioned throughput](./provisioned-throughput.md).
315+
For Assistants you need a combination of a supported model, and a supported region. Certain tools and capabilities require the latest models. The following models are available in the Assistants API, SDK, Azure AI Studio and Azure OpenAI Studio. The following table is for pay-as-you-go. For information on Provisioned Throughput Unit (PTU) availability, see [provisioned throughput](./provisioned-throughput.md). The listed models and regions can be used with both Assistants v1 and v2.
316316

317317
| Region | `gpt-35-turbo (0613)` | `gpt-35-turbo (1106)`| `fine tuned gpt-3.5-turbo-0125` | `gpt-4 (0613)` | `gpt-4 (1106)` | `gpt-4 (0125)` | `gpt-4o (2024-05-13)` |
318318
|-----|:---:|:---:|:---:|:---:|:---:|:---:|:---:|

articles/ai-services/openai/how-to/use-your-data-securely.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,10 @@ So far you have already setup each resource work independently. Next you need to
265265
|--|--|--|--|
266266
| `Search Index Data Reader` | Azure OpenAI | Azure AI Search | Inference service queries the data from the index. |
267267
| `Search Service Contributor` | Azure OpenAI | Azure AI Search | Inference service queries the index schema for auto fields mapping. Data ingestion service creates index, data sources, skill set, indexer, and queries the indexer status. |
268-
| `Storage Blob Data Contributor` | Azure OpenAI | Storage Account | Reads from the input container, and writes the preprocess result to the output container. |
269-
| `Cognitive Services OpenAI Contributor` | Azure AI Search | Azure OpenAI | Custom skill |
270-
| `Storage Blob Data Contributor` | Azure AI Search | Storage Account | Reads blob and writes knowledge store. |
268+
| `Storage Blob Data Contributor` | Azure OpenAI | Storage Account | Reads from the input container, and writes the preprocessed result to the output container. |
269+
| `Cognitive Services OpenAI Contributor` | Azure AI Search | Azure OpenAI | Custom skill. |
270+
| `Storage Blob Data Reader` | Azure AI Search | Storage Account | Reads document blobs and chunk blobs. |
271+
| `Cognitive Services OpenAI User` | Web app | Azure OpenAI | Inference. |
271272

272273

273274
In the above table, the `Assignee` means the system assigned managed identity of that resource.

articles/ai-services/speech-service/how-to-pronunciation-assessment.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,23 +91,23 @@ In the `SpeechRecognizer`, you can specify the language to learn or practice imp
9191
::: zone pivot="programming-language-csharp"
9292

9393
```csharp
94-
var recognizer = new SpeechRecognizer(config, "en-US", audioInput);
94+
var recognizer = new SpeechRecognizer(speechConfig, "en-US", audioConfig);
9595
```
9696

9797
::: zone-end
9898

9999
::: zone pivot="programming-language-cpp"
100100

101101
```cpp
102-
auto recognizer = SpeechRecognizer::FromConfig(config, "en-US", audioConfig);
102+
auto recognizer = SpeechRecognizer::FromConfig(speechConfig, "en-US", audioConfig);
103103
```
104104

105105
::: zone-end
106106

107107
::: zone pivot="programming-language-java"
108108

109109
```Java
110-
SpeechRecognizer recognizer = new SpeechRecognizer(config, "en-US", audioInput);
110+
SpeechRecognizer recognizer = new SpeechRecognizer(speechConfig, "en-US", audioConfig);
111111
```
112112

113113
::: zone-end
@@ -131,15 +131,15 @@ speechConfig.speechRecognitionLanguage = "en-US";
131131
::: zone pivot="programming-language-objectivec"
132132

133133
```ObjectiveC
134-
SPXSpeechRecognizer* speechRecognizer = [[SPXSpeechRecognizer alloc] initWithSpeechConfiguration:speechConfig language:@"en-US" audioConfiguration:pronAudioSource];
134+
SPXSpeechRecognizer* recognizer = [[SPXSpeechRecognizer alloc] initWithSpeechConfiguration:speechConfig language:@"en-US" audioConfiguration:audioConfig];
135135
```
136136
137137
::: zone-end
138138
139139
::: zone pivot="programming-language-swift"
140140
141141
```swift
142-
let reco = try! SPXSpeechRecognizer(speechConfiguration: speechConfig, language: "en-US", audioConfiguration: audioInput)
142+
let recognizer = try! SPXSpeechRecognizer(speechConfiguration: speechConfig, language: "en-US", audioConfiguration: audioConfig)
143143
```
144144

145145
::: zone-end

articles/aks/dapr-settings.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ ms.author: hannahhunter
66
ms.topic: article
77
ms.custom: build-2023, devx-track-azurecli, linux-related-content
88
ms.subservice: aks-developer
9-
ms.date: 04/01/2024
9+
ms.date: 07/09/2024
1010
---
1111

1212
# Configure the Dapr extension for your Azure Kubernetes Service (AKS) and Arc-enabled Kubernetes project
1313

14-
Once you've [created the Dapr extension](./dapr.md), you can configure the [Dapr](https://dapr.io/) extension to work best for you and your project using various configuration options, like:
14+
After [creating the Dapr extension](./dapr.md), you can configure the [Dapr](https://dapr.io/) extension to work best for you and your project using various configuration options, like:
1515

1616
- Limiting which of your nodes use the Dapr extension
17-
- Setting automatic CRD updates
17+
- Setting automatic custom resource definition (CRD) updates
1818
- Configuring the Dapr release namespace
1919

2020
The extension enables you to set Dapr configuration options by using the `--configuration-settings` parameter in the Azure CLI or `configurationSettings` property in a Bicep template.
@@ -137,7 +137,7 @@ properties: {
137137

138138
## Install Dapr in multiple availability zones while in HA mode
139139

140-
By default, the placement service uses a storage class of type `standard_LRS`. It is recommended to create a **zone redundant storage class** while installing Dapr in HA mode across multiple availability zones. For example, to create a `zrs` type storage class, add the `storageaccounttype` parameter:
140+
By default, the placement service uses a storage class of type `standard_LRS`. It's recommended to create a **zone redundant storage class** while installing Dapr in HA mode across multiple availability zones. For example, to create a `zrs` type storage class, add the `storageaccounttype` parameter:
141141

142142
```yaml
143143
kind: StorageClass
@@ -186,7 +186,7 @@ You can configure the release namespace.
186186

187187
# [Azure CLI](#tab/cli)
188188

189-
The Dapr extension gets installed in the `dapr-system` namespace by default. To override it, use `--release-namespace`. Include the cluster `--scope` to redefine the namespace.
189+
The Dapr extension gets installed in the `dapr-system` namespace by default. To override it, use `--release-namespace`. To redefine the namespace, include the cluster `--scope`.
190190

191191
```azurecli
192192
az k8s-extension create \
@@ -218,7 +218,7 @@ properties: {
218218

219219
---
220220

221-
[Learn how to configure the Dapr release namespace if you already have Dapr installed](./dapr-migration.md).
221+
[Learn how to configure the Dapr release namespace when migrating from Dapr open source to the Dapr extension](./dapr-migration.md).
222222

223223
## Show current configuration settings
224224

@@ -240,7 +240,7 @@ az k8s-extension show --cluster-type managedClusters \
240240
>
241241
> HA is enabled by default. Disabling it requires deletion and recreation of the extension.
242242

243-
To update your Dapr configuration settings, recreate the extension with the desired state. For example, assume we've previously created and installed the extension using the following configuration:
243+
To update your Dapr configuration settings, recreate the extension with the desired state. For example, let's say you previously created and installed the extension using the following configuration:
244244

245245
```azurecli-interactive
246246
az k8s-extension create --cluster-type managedClusters \
@@ -368,14 +368,13 @@ properties: {
368368

369369
## Meet network requirements
370370

371-
The Dapr extension for AKS and Arc for Kubernetes requires the following outbound URLs on `https://:443` to function:
371+
The Dapr extension requires the following outbound URLs on `https://:443` to function on AKS and Arc for Kubernetes:
372372
1. `https://mcr.microsoft.com/daprio` URL for pulling Dapr artifacts.
373-
2. `https://linuxgeneva-microsoft.azurecr.io/` URL for pulling some Dapr dependencies.
374-
3. The [outbound URLs required for AKS or Arc for Kubernetes](../azure-arc/kubernetes/network-requirements.md).
373+
1. The [outbound URLs required for AKS or Arc for Kubernetes](../azure-arc/kubernetes/network-requirements.md).
375374

376375
## Next Steps
377376

378-
Once you have successfully provisioned Dapr in your AKS cluster, try deploying a [sample application][sample-application].
377+
Once you successfully provisioned Dapr in your AKS cluster, try deploying a [sample application][sample-application].
379378

380379
<!-- LINKS INTERNAL -->
381380
[deploy-cluster]: ./tutorial-kubernetes-deploy-cluster.md

articles/app-service/environment/ase-multi-tenant-comparison.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ An App Service Environment is an Azure App Service feature that provides a fully
2121
|Dedicated host group|[Available](overview.md#dedicated-environment) |No |
2222
|Remote file storage|Fully dedicated to the App Service Environment |Remote file storage for the application is dedicated, but the storage is hosted on a shared file server |
2323
|Private inbound configuration|Yes, using ILB App Service Environment variation |Yes, via private endpoint |
24-
|Planned maintenance|[Manual upgrade preference is available](how-to-upgrade-preference.md) |The platform handles maintenance. [Service health notifications are available](../../app-service/routine-maintenance.md). |
24+
|Planned maintenance|[Manual upgrade preference is available](how-to-upgrade-preference.md) |[The platform handles maintenance](../../app-service/routine-maintenance.md) |
2525
|Aggregate remote file share storage limit|1 TB for all apps in an App Service Environment v3|250 GB for all apps in a single App Service plan. 500 GB for all apps across all App Service plans in a single resource group.|
2626

2727
### Scaling

articles/azure-functions/functions-dotnet-class-library.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Azure Functions supports C# and C# script programming languages. If you're looki
3232
### Updating to target .NET 8
3333

3434
> [!NOTE]
35-
> Targeting .NET 8 with the in-process model is not yet enabled for Linux, for apps hosted in App Service Environments, or for apps in sovereign clouds. Updates will be communicated on [this tracking thread on GitHub](https://github.com/Azure/azure-functions-host/issues/9951).
35+
> Targeting .NET 8 with the in-process model is not yet enabled for Linux or for apps in sovereign clouds. Updates will be communicated on [this tracking thread on GitHub](https://github.com/Azure/azure-functions-host/issues/9951).
3636
3737
Apps using the in-process model can target .NET 8 by following the steps outlined in this section. However, if you choose to exercise this option, you should still begin planning your [migration to the isolated worker model](./migrate-dotnet-to-isolated-model.md) in advance of [support ending for the in-process model on November 10, 2026](https://aka.ms/azure-functions-retirements/in-process-model).
3838

articles/azure-functions/migrate-cosmos-db-version-3-version-4.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: This article shows you how to upgrade your existing function apps u
44
ms.service: azure-functions
55
ms.custom: devx-track-extended-java, devx-track-js, devx-track-python
66
ms.topic: how-to
7-
ms.date: 05/07/2024
7+
ms.date: 07/10/2024
88
zone_pivot_groups: programming-languages-set-functions-lang-workers
99
---
1010

@@ -210,7 +210,7 @@ namespace CosmosDBSamples
210210
```
211211

212212
> [!NOTE]
213-
> If your scenario relied on the dynamic nature of the `Document` type to identify different schemas and types of events, you can use a base abstract type with the common properties across your types or dynamic types like `JObject` that allow to access properties like `Document` did.
213+
> If your scenario relied on the dynamic nature of the `Document` type to identify different schemas and types of events, you can use a base abstract type with the common properties across your types or dynamic types like `JObject` (when using `Microsoft.Azure.WebJobs.Extensions.CosmosDB`) and `JsonNode` (when using `Microsoft.Azure.Functions.Worker.Extensions.CosmosDB`) that allow to access properties like `Document` did.
214214
215215
Additionally, if you are using the Output Binding, please review the [change in item ID generation](#changes-to-item-id-generation) to verify if you need additional code changes.
216216

0 commit comments

Comments
 (0)