Skip to content

Commit faf3c26

Browse files
authored
Merge pull request #204409 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents 0a457a9 + b5a999b commit faf3c26

File tree

113 files changed

+1829
-34117
lines changed

Some content is hidden

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

113 files changed

+1829
-34117
lines changed

articles/active-directory-b2c/configure-authentication-in-azure-static-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Once you've added the app ID and secrete, use the following steps to add the Azu
127127

128128
1. Navigate to `/.auth/login/aadb2c`. The `/.auth/login` points the Azure Static app login endpoint. The `aadb2c` references to your [OpenID Connect identity provider](#31-add-an-openid-connect-identity-provider). The following URL demonstrates an Azure Static app login endpoint: `https://witty-island-11111111.azurestaticapps.net/.auth/login/aadb2c`.
129129
1. Complete the sign up or sign in process.
130-
1. In your browser debugger, [run the following JavaScript in the Console](/microsoft-edge/devtools-guide-chromium/console/console-javascript.md). The JavaScript code will present information about the sign in user.
130+
1. In your browser debugger, [run the following JavaScript in the Console](/microsoft-edge/devtools-guide-chromium/console/console-javascript). The JavaScript code will present information about the sign in user.
131131

132132
```javascript
133133
async function getUserInfo() {
@@ -147,4 +147,4 @@ Once you've added the app ID and secrete, use the following steps to add the Azu
147147
## Next steps
148148
149149
* After successful authentication, you can show display name on the navigation bar. To view the claims that the Azure AD B2C token returns to your app, check out [Accessing user information in Azure Static Web Apps](../static-web-apps/user-information.md).
150-
* Learn how to [customize and enhance the Azure AD B2C authentication experience for your web app](enable-authentication-azure-static-app-options.md).
150+
* Learn how to [customize and enhance the Azure AD B2C authentication experience for your web app](enable-authentication-azure-static-app-options.md).

articles/active-directory-b2c/configure-authentication-in-azure-web-app-file-based.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.custom: "b2c-support"
1515

1616
# Configure authentication in an Azure Web App configuration file by using Azure AD B2C
1717

18-
This article explains how to add Azure Active Directory B2C (Azure AD B2C) authentication functionality to an Azure Web App. For more information, check out the [File-based configuration in Azure App Service authentication](/app-service/configure-authentication-file-based.md) article.
18+
This article explains how to add Azure Active Directory B2C (Azure AD B2C) authentication functionality to an Azure Web App. For more information, check out the [File-based configuration in Azure App Service authentication](/azure/app-service/configure-authentication-file-based) article.
1919

2020
## Overview
2121

@@ -141,6 +141,6 @@ From your server code, the provider-specific tokens are injected into the reques
141141

142142
## Next steps
143143

144-
* After successful authentication, you can show display name on the navigation bar. To view the claims that the Azure AD B2C token returns to your app, check out the [Work with user identities in Azure App Service authentication](/app-service/configure-authentication-user-identities).
145-
* Lear how to [Work with OAuth tokens in Azure App Service authentication](/app-service/configure-authentication-oauth-tokens).
144+
* After successful authentication, you can show display name on the navigation bar. To view the claims that the Azure AD B2C token returns to your app, check out the [Work with user identities in Azure App Service authentication](/azure/app-service/configure-authentication-user-identities).
145+
* Lear how to [Work with OAuth tokens in Azure App Service authentication](/azure/app-service/configure-authentication-oauth-tokens).
146146

articles/active-directory-b2c/configure-authentication-in-azure-web-app.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.custom: "b2c-support"
1515

1616
# Configure authentication in an Azure Web App by using Azure AD B2C
1717

18-
This article explains how to add Azure Active Directory B2C (Azure AD B2C) authentication functionality to an Azure Web App. For more information, check out the [configure your App Service or Azure Functions app to login using an OpenID Connect provider](/app-service/configure-authentication-provider-openid-connect.md) article.
18+
This article explains how to add Azure Active Directory B2C (Azure AD B2C) authentication functionality to an Azure Web App. For more information, check out the [configure your App Service or Azure Functions app to login using an OpenID Connect provider](/azure/app-service/configure-authentication-provider-openid-connect) article.
1919

2020
## Overview
2121

@@ -94,7 +94,7 @@ To register your application, follow these steps:
9494
1. For the **Client Secret** provide the Web App (client) secret from [step 2.2](#step-22-create-a-client-secret).
9595
9696
> [!TIP]
97-
> Your client secret will be stored as an app setting to ensure secrets are stored in a secure fashion. You can update that setting later to use [Key Vault references](/app-service/app-service-key-vault-references.md) if you wish to manage the secret in Azure Key Vault.
97+
> Your client secret will be stored as an app setting to ensure secrets are stored in a secure fashion. You can update that setting later to use [Key Vault references](/azure/app-service/app-service-key-vault-references) if you wish to manage the secret in Azure Key Vault.
9898
9999
1. Keep the rest of the settings with the default values.
100100
1. Press the **Add** button to finish setting up the identity provider.
@@ -119,6 +119,6 @@ From your server code, the provider-specific tokens are injected into the reques
119119
120120
## Next steps
121121
122-
* After successful authentication, you can show display name on the navigation bar. To view the claims that the Azure AD B2C token returns to your app, check out the [Work with user identities in Azure App Service authentication](/app-service/configure-authentication-user-identities).
123-
* Lear how to [Work with OAuth tokens in Azure App Service authentication](/app-service/configure-authentication-oauth-tokens).
122+
* After successful authentication, you can show display name on the navigation bar. To view the claims that the Azure AD B2C token returns to your app, check out the [Work with user identities in Azure App Service authentication](/azure/app-service/configure-authentication-user-identities).
123+
* Lear how to [Work with OAuth tokens in Azure App Service authentication](/azure/app-service/configure-authentication-oauth-tokens).
124124

articles/active-directory/cloud-infrastructure-entitlement-management/faqs.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,12 @@ Yes, non-Azure customers can use our solution. Permissions Management is a multi
4242

4343
## Is Permissions Management available for tenants hosted in the European Union (EU)?
4444

45-
No, the Permissions Management PREVIEW is currently not available for tenants hosted in the European Union (EU).
45+
Yes, Permissions Management is currently for tenants hosted in the European Union (EU).
4646

4747
## If I'm already using Azure AD Privileged Identity Management (PIM) for Azure, what value does Permissions Management provide?
4848

4949
Permissions Management complements Azure AD PIM. Azure AD PIM provides just-in-time access for admin roles in Azure (as well as Microsoft Online Services and apps that use groups), while Permissions Management allows multi-cloud discovery, remediation, and monitoring of privileged access across Azure, AWS, and GCP.
5050

51-
## What languages does Permissions Management support?
52-
53-
Permissions Management currently supports English.
54-
5551
## What public cloud infrastructures are supported by Permissions Management?
5652

5753
Permissions Management currently supports the three major public clouds: Amazon Web Services (AWS), Google Cloud Platform (GCP), and Microsoft Azure.
@@ -109,7 +105,6 @@ Yes, Permissions Management has various types of system report available that ca
109105

110106
For information about permissions usage reports, see [Generate and download the Permissions analytics report](product-permissions-analytics-reports.md).
111107

112-
113108
## Does Permissions Management integrate with third-party ITSM (Information Technology Service Management) tools?
114109

115110
Permissions Management integrates with ServiceNow.
@@ -144,7 +139,7 @@ We also have the ability to remove, export or modify specific data should the Gl
144139

145140
## Do I require a license to use Entra Permissions Management?
146141

147-
Yes, as of July 1st, 2022, new customers must acquire a free 90-trial license or a paid license to use the service. You can enable a trial or purchase licenses here: [https://aka.ms/TryPermissionsManagement](https://aka.ms/TryPermissionsManagement)
142+
Yes, as of July 1st, 2022, new customers must acquire a free 90-trial license or a paid license to use the service. You can enable a trial here: [https://aka.ms/TryPermissionsManagement](https://aka.ms/TryPermissionsManagement) or you can directly purchase resource-based licenses here: [https://aka.ms/BuyPermissionsManagement](https://aka.ms/BuyPermissionsManagement)
148143

149144
## What do I do if I’m using Public Preview version of Entra Permissions Management?
150145

articles/aks/csi-secrets-store-driver.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,19 +183,19 @@ az aks create -n myAKSCluster2 -g myResourceGroup --enable-addons azure-keyvault
183183
Or update an existing cluster with the add-on enabled:
184184

185185
```azurecli-interactive
186-
az aks update -g myResourceGroup -n myAKSCluster2 --enable-secret-rotation
186+
az aks addon update -g myResourceGroup -n myAKSCluster2 -a azure-keyvault-secrets-provider --enable-secret-rotation
187187
```
188188

189189
To specify a custom rotation interval, use the `rotation-poll-interval` flag:
190190

191191
```azurecli-interactive
192-
az aks update -g myResourceGroup -n myAKSCluster2 --enable-secret-rotation --rotation-poll-interval 5m
192+
az aks addon update -g myResourceGroup -n myAKSCluster2 -a azure-keyvault-secrets-provider --enable-secret-rotation --rotation-poll-interval 5m
193193
```
194194

195195
To disable autorotation, use the flag `disable-secret-rotation`:
196196

197197
```azurecli-interactive
198-
az aks update -g myResourceGroup -n myAKSCluster2 --disable-secret-rotation
198+
az aks addon update -g myResourceGroup -n myAKSCluster2 -a azure-keyvault-secrets-provider --disable-secret-rotation
199199
```
200200

201201
### Sync mounted content with a Kubernetes secret

articles/application-gateway/quick-create-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ az network public-ip create \
6666

6767
## Create the backend servers
6868

69-
A backend can have NICs, virtual machine scale sets, public IP addresses, internal IP addresses, fully qualified domain names (FQDN), and multi-tenant back-ends like Azure App Service. In this example, you create two virtual machines to use as backend servers for the application gateway. You also install IIS on the virtual machines to test the application gateway.
69+
A backend can have NICs, virtual machine scale sets, public IP addresses, internal IP addresses, fully qualified domain names (FQDN), and multi-tenant back-ends like Azure App Service. In this example, you create two virtual machines to use as backend servers for the application gateway. You also install NGINX on the virtual machines to test the application gateway.
7070

7171
#### Create two virtual machines
7272

articles/applied-ai-services/form-recognizer/compose-custom-models-preview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ To get started, you'll need the following resources:
3838
:::image border="true" type="content" source="media/containers/keys-and-endpoint.png" alt-text="Still photo showing how to access resource key and endpoint URL.":::
3939

4040
> [!TIP]
41-
> For more information, see* [**create a Form Recognizer resource**](create-a-form-recognizer-resource.md).
41+
> For more information, see [**create a Form Recognizer resource**](create-a-form-recognizer-resource.md).
4242
4343
* **An Azure storage account.** If you don't know how to create an Azure storage account, follow the [Azure Storage quickstart for Azure portal](../../storage/blobs/storage-quickstart-blobs-portal.md). You can use the free pricing tier (F0) to try the service, and upgrade later to a paid tier for production.
4444

articles/applied-ai-services/form-recognizer/concept-custom-neural.md

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: nitinme
77
ms.service: applied-ai-services
88
ms.subservice: forms-recognizer
99
ms.topic: conceptual
10-
ms.date: 06/06/2022
10+
ms.date: 07/11/2022
1111
ms.author: lajanuar
1212
ms.custom: references_regions
1313
recommendations: false
@@ -37,8 +37,8 @@ Custom neural models currently only support key-value pairs and selection marks,
3737

3838
With the release of API version **2022-06-30-preview**, custom neural models will support tabular fields (tables):
3939

40-
* Models trained with API version 2022-06-30-preview or later will accept tabular field labels.
41-
* Documents analyzed with custom neural models using API version 2022-06-30-preview or later will produce tabular fields aggregated across the tables.
40+
* Models trained with API version 2022-06-30-preview or later will accept tabular field labels.
41+
* Documents analyzed with custom neural models using API version 2022-06-30-preview or later will produce tabular fields aggregated across the tables.
4242
* The results can be found in the ```analyzeResult``` object's ```documents``` array that is returned following an analysis operation.
4343

4444
Tabular fields support **cross page tables** by default:
@@ -50,34 +50,22 @@ Tabular fields are also useful when extracting repeating information within a do
5050

5151
## Supported regions
5252

53-
For the **2022-06-30-preview**, custom neural models can only be trained in the following Azure regions:
54-
55-
* AustraliaEast
56-
* BrazilSouth
57-
* CanadaCentral
58-
* CentralIndia
59-
* CentralUS
60-
* EastUS
61-
* EastUS2
62-
* FranceCentral
63-
* JapanEast
64-
* JioIndiaWest
65-
* KoreaCentral
66-
* NorthEurope
67-
* SouthCentralUS
68-
* SoutheastAsia
69-
* UKSouth
70-
* WestEurope
71-
* WestUS
72-
* WestUS2
73-
* WestUS3
53+
As of August 01 2022, Form Recognizer custom neural model training will only be available in the following Azure regions until further notice:
54+
55+
* Brazil South
56+
* Canada Central
57+
* Central India
58+
* Japan East
59+
* North Europe
60+
* South Central US
61+
* Southeast Asia
7462

7563
> [!TIP]
76-
> You can copy a model trained in one of the select regions listed above to **any other region** and use it accordingly.
64+
> You can [copy a model](disaster-recovery.md) trained in one of the select regions listed above to **any other region** and use it accordingly.
7765
7866
## Best practices
7967

80-
Custom neural models differ from custom template models in a few different ways. The custom template or model relies on a consistent visual template to extract the labeled data. Custom neural models support structured, semi-structured, and unstructured documents to extract fields. When you're choosing between the two model types, start with a neural model and test to determine if it supports your functional needs.
68+
Custom neural models differ from custom template models in a few different ways. The custom template or model relies on a consistent visual template to extract the labeled data. Custom neural models support structured, semi-structured, and unstructured documents to extract fields. When you're choosing between the two model types, start with a neural model, and test to determine if it supports your functional needs.
8169

8270
### Dealing with variations
8371

@@ -98,7 +86,6 @@ Value tokens/words of one field must be either
9886

9987
Values in training cases should be diverse and representative. For example, if a field is named "date", values for this field should be a date. synthetic value like a random string can affect model performance.
10088

101-
10289
## Current Limitations
10390

10491
* The model doesn't recognize values split across page boundaries.
@@ -130,6 +117,7 @@ https://{endpoint}/formrecognizer/documentModels:build?api-version=2022-06-30
130117
}
131118
}
132119
```
120+
133121
## Next steps
134122

135123
* Train a custom model:
@@ -145,4 +133,4 @@ https://{endpoint}/formrecognizer/documentModels:build?api-version=2022-06-30
145133
* View the REST API:
146134

147135
> [!div class="nextstepaction"]
148-
> [Form Recognizer API v3.0](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-v3-0-preview-2/operations/AnalyzeDocument)
136+
> [Form Recognizer API v3.0](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-v3-0-preview-2/operations/AnalyzeDocument)

articles/applied-ai-services/form-recognizer/deploy-label-tool.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.author: lajanuar
1717
>
1818
> * For an enhanced experience and advanced model quality, try the [Form Recognizer v3.0 Studio (preview)](https://formrecognizer.appliedai.azure.com/studio).
1919
> * The v3.0 Studio supports any model trained with v2.1 labeled data.
20-
> * You can refer to the API migration guide for detailed information about migrating from v2.1 to v3.0.
20+
> * You can refer to the [API migration guide](v3-migration-guide.md) for detailed information about migrating from v2.1 to v3.0.
2121
> * *See* our [**REST API**](quickstarts/try-v3-rest-api.md) or [**C#**](quickstarts/try-v3-csharp-sdk.md), [**Java**](quickstarts/try-v3-java-sdk.md), [**JavaScript**](quickstarts/try-v3-javascript-sdk.md), or [Python](quickstarts/try-v3-python-sdk.md) SDK quickstarts to get started with the V3.0 preview.
2222
2323
> [!NOTE]

articles/applied-ai-services/form-recognizer/how-to-guides/build-custom-model-v3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The Form Recognizer Studio provides and orchestrates all the API calls required
4949
1. On the next step in the workflow, choose or create a Form Recognizer resource before you select continue.
5050

5151
> [!IMPORTANT]
52-
> Custom neural models models are only available in a few regions. If you plan on training a neural model, please select or create a resource in one of [these supported regions](../concept-custom-neural.md).
52+
> Custom neural models models are only available in a few regions. If you plan on training a neural model, please select or create a resource in one of [these supported regions](../concept-custom-neural.md#supported-regions).
5353
5454
:::image type="content" source="../media/how-to/studio-select-resource.png" alt-text="Screenshot: Select the Form Recognizer resource.":::
5555

0 commit comments

Comments
 (0)