Skip to content

Commit bf0b8e6

Browse files
authored
Merge pull request #270295 from MicrosoftDocs/main
3/26/2024 PM Publish
2 parents d10d971 + 3e58009 commit bf0b8e6

File tree

220 files changed

+3032
-662
lines changed

Some content is hidden

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

220 files changed

+3032
-662
lines changed

articles/active-directory-b2c/identity-protection-investigate-risk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Investigate risk with Azure Active Directory B2C Identity Protection
33
description: Learn how to investigate risky users, and detections in Azure AD B2C Identity Protection
4-
ms.service: active-directory
4+
ms.service: entra-id
55
ms.subservice: conditional-access
66
ms.topic: overview
77
ms.date: 01/24/2024

articles/active-directory-b2c/partner-grit-iam.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.subservice: B2C
1616

1717
# Tutorial: Configure the Grit IAM B2B2C solution with Azure Active Directory B2C
1818

19-
In this tutorial, you learn how to integrate Azure Active Directory B2C (Azure AD B2C) authentication with a [Grit IAM B2B2C](https://www.gritiam.com/b2b2c) solution. You can use the solution to provide secure, reliable, self-serviceable, and user-friendly identity and access management to your customers. Shared profile data such as first name, last name, home address, and email used in web and mobile applications are stored in a centralized manner with consideration to compliance and regulatory needs.
19+
In this tutorial, you learn how to integrate Azure Active Directory B2C (Azure AD B2C) authentication with a [Grit IAM B2B2C](https://www.gritiam.com/b2b2c.html) solution. You can use the solution to provide secure, reliable, self-serviceable, and user-friendly identity and access management to your customers. Shared profile data such as first name, last name, home address, and email used in web and mobile applications are stored in a centralized manner with consideration to compliance and regulatory needs.
2020

2121

2222
Use Grit's B2BB2C solution for:
@@ -28,7 +28,7 @@ Use Grit's B2BB2C solution for:
2828

2929
To get started, ensure the following prerequisites are met:
3030

31-
- A Grit IAM account. You can go to [Grit IAM B2B2C solution](https://www.gritiam.com/b2b2c) to get a demo.
31+
- A Grit IAM account. You can go to [Grit IAM B2B2C solution](https://www.gritiam.com/b2b2c.html) to get a demo.
3232
- A Microsoft Entra subscription. If you don't have one, you can create a [free Azure account](https://azure.microsoft.com/free/).
3333
- An Azure AD B2C tenant linked to the Azure subscription. You can learn more at [Tutorial: Create an Azure Active Directory B2C tenant](tutorial-create-tenant.md).
3434
- Configure your application in the Azure portal.

articles/ai-services/cognitive-services-virtual-networks.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.service: azure-ai-services
99
ms.custom: devx-track-azurepowershell, devx-track-azurecli
1010
ms.topic: how-to
11-
ms.date: 02/13/2024
11+
ms.date: 03/25/2024
1212
ms.author: aahi
1313
---
1414

@@ -595,11 +595,21 @@ curl -i -X PATCH https://management.azure.com$rid?api-version=2023-10-01-preview
595595
'
596596
```
597597

598-
To revoke the exception, set `networkAcls.bypass` to `None`.
599-
600598
> [!NOTE]
601599
> The trusted service feature is only available using the command line described above, and cannot be done using the Azure portal.
602600
601+
To revoke the exception, set `networkAcls.bypass` to `None`.
602+
603+
To verify if the trusted service has been enabled from the Azure portal,
604+
605+
1. Use the **JSON View** from the Azure OpenAI resource overview page
606+
607+
:::image type="content" source="media/vnet/azure-portal-json-view.png" alt-text="A screenshot showing the JSON view option for resources in the Azure portal." lightbox="media/vnet/azure-portal-json-view.png":::
608+
609+
1. Choose your latest API version under **API versions**. Only the latest API version is supported, `2023-10-01-preview` .
610+
611+
:::image type="content" source="media/vnet/virtual-network-trusted-service.png" alt-text="A screenshot showing the trusted service is enabled." lightbox="media/vnet/virtual-network-trusted-service.png":::
612+
603613
### Pricing
604614

605615
For pricing details, see [Azure Private Link pricing](https://azure.microsoft.com/pricing/details/private-link).

articles/ai-services/document-intelligence/language-support-prebuilt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Azure AI Document Intelligence models provide multilingual document processing s
4040

4141
:::moniker range="doc-intel-4.0.0"
4242
> [!IMPORTANT]
43-
> Starting with Document Intelligence **v4.0 (preview)**, and going forward, the business card model (prebuilt-businessCard) is deprecated. To extract data from business cards, use the following:
43+
> Starting with Document Intelligence **v4.0 (preview)**, and going forward, the business card model (prebuilt-businessCard) is deprecated. To extract data from business cards, use earlier models.
4444
4545
| Feature | version| Model ID |
4646
|---------- |---------|--------|
145 KB
Loading
20.9 KB
Loading

articles/ai-services/openai/how-to/monitoring.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The following table summarizes the current subset of metrics available in Azure
5555
| `Generated Completion Tokens` | Usage | Sum | Number of generated tokens (output) from an OpenAI model. Applies to PayGo, PTU, and PTU-manged SKUs | `ApiName`, `ModelDeploymentName`,`ModelName`, `Region`|
5656
| `Processed FineTuned Training Hours` | Usage |Sum| Number of Training Hours Processed on an OpenAI FineTuned Model | `ApiName`, `ModelDeploymentName`,`ModelName`, `Region`|
5757
| `Processed Inference Tokens` | Usage | Sum| Number of inference tokens processed by an OpenAI model. Calculated as prompt tokens (input) + generated tokens. Applies to PayGo, PTU, and PTU-manged SKUs.|`ApiName`, `ModelDeploymentName`,`ModelName`, `Region`|
58-
| `Processed Input Tokens` | Usage | Sum | Total number of prompt tokens (input) processed on an OpenAI model. Applies to PayGo, PTU, and PTU-managed SKUs.|`ApiName`, `ModelDeploymentName`,`ModelName`, `Region`|
58+
| `Processed Prompt Tokens` | Usage | Sum | Total number of prompt tokens (input) processed on an OpenAI model. Applies to PayGo, PTU, and PTU-managed SKUs.|`ApiName`, `ModelDeploymentName`,`ModelName`, `Region`|
5959
| `Provision-managed Utilization` | Usage | Average | Provision-managed utilization is the utilization percentage for a given provisioned-managed deployment. Calculated as (PTUs consumed/PTUs deployed)*100. When utilization is at or above 100%, calls are throttled and return a 429 error code. | `ModelDeploymentName`,`ModelName`,`ModelVersion`, `Region`, `StreamType`|
6060

6161
## Configure diagnostic settings

articles/ai-services/speech-service/includes/how-to/compressed-audio-input/gstreamer-android.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ APP_PLATFORM = android-21
7373
APP_BUILD_SCRIPT = Android.mk
7474
```
7575

76-
You can build `libgstreamer_android.so` by using the following command on Ubuntu 18.04 or 20.04. The following command lines have been tested for [GStreamer Android version 1.14.4](https://gstreamer.freedesktop.org/download/) with [Android NDK b16b.](https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip)
76+
You can build `libgstreamer_android.so` by using the following command on Ubuntu 18.04 or 20.04. The following command lines have been tested for [GStreamer Android version 1.14.4] with [Android NDK b16b.](https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip)
7777

7878
```sh
7979
# Assuming wget and unzip are already installed on the system

articles/aks/artifact-streaming.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ms.service: azure-kubernetes-service
77
ms.custom: devx-track-azurecli
88
ms.topic: article
99
ms.date: 11/16/2023
10+
ms.subservice: aks-nodes
1011
---
1112

1213
# Reduce image pull time with Artifact Streaming on Azure Kubernetes Service (AKS) (Preview)

articles/aks/automated-deployments.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ ms.author: qpetraroia
55
ms.topic: tutorial
66
ms.custom: build-2023
77
ms.date: 05/10/2023
8+
ms.subservice: aks-developer
89
author: qpetraroia
910
---
1011

0 commit comments

Comments
 (0)