Skip to content

Commit 58c8d3c

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ob-ilip-nat
2 parents 1347775 + 04a8900 commit 58c8d3c

File tree

16 files changed

+56
-52
lines changed

16 files changed

+56
-52
lines changed

articles/active-directory/enterprise-users/directory-service-limits-restrictions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.workload: identity
1414
ms.date: 10/27/2021
1515
ms.author: curtand
1616
ms.custom: aaddev;it-pro
17-
ms.reviewer: jeffsta
17+
ms.reviewer: vincesm
1818

1919
ms.collection: M365-identity-device-management
2020
---

articles/active-directory/saas-apps/documo-provisioning-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The scenario outlined in this tutorial assumes that you already have the followi
4242

4343
## Step 2. Configure Documo to support provisioning with Azure AD
4444

45-
1. [Generate an API key](https://help.documo.com/en/articles/891930-how-to-enable-api-and-retrieve-api-key) to use for Azure AD provisioning.
45+
1. [Generate an API key](https://help.documo.com/support/solutions/articles/72000513690-how-to-enable-api-and-retrieve-api-key) to use for Azure AD provisioning.
4646
1. Find and remember your API URL. The default API URL is `https://api.documo.com`. If you have a custom Documo API domain, you can reference it in the domain tab of the Documo branding settings page.
4747

4848
## Step 3. Add Documo from the Azure AD application gallery
@@ -135,4 +135,4 @@ Once you've configured provisioning, use the following resources to monitor your
135135

136136
## Next steps
137137

138-
* [Learn how to review logs and get reports on provisioning activity](../app-provisioning/check-status-user-account-provisioning.md)
138+
* [Learn how to review logs and get reports on provisioning activity](../app-provisioning/check-status-user-account-provisioning.md)

articles/app-service/toc.yml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,23 +68,28 @@
6868
items:
6969
- name: Overview
7070
href: tutorial-connect-overview.md
71-
- name: Managed identity with SQL DB
72-
href: tutorial-connect-msi-sql-database.md
73-
- name: Key vault with Cognitive Services
74-
href: tutorial-connect-msi-key-vault.md
75-
76-
- name: Secure app accesses storage, and Microsoft Graph
71+
- name: With secrets in App Settings
72+
href: configure-common.md?tabs=portal
73+
- name: With Managed Identity
74+
items:
75+
- name: Connect to SQL DB
76+
href: tutorial-connect-msi-sql-database.md
77+
- name: Connect to Storage
78+
href: scenario-secure-app-access-storage.md
79+
- name: Connect to Microsoft Graph
80+
href: scenario-secure-app-access-microsoft-graph-as-app.md
81+
- name: With Key Vault
82+
items:
83+
- name: Connect to Cognitive Services
84+
href: tutorial-connect-msi-key-vault.md
85+
- name: Securely connect to Azure resources on behalf of user
7786
items:
7887
- name: Overview
7988
href: scenario-secure-app-overview.md
8089
- name: Set up App Service authentication
8190
href: scenario-secure-app-authentication-app-service.md
82-
- name: Secure app accesses storage
83-
href: scenario-secure-app-access-storage.md
84-
- name: Secure app accesses Microsoft Graph as the user
91+
- name: Access Microsoft Graph as the user
8592
href: scenario-secure-app-access-microsoft-graph-as-user.md
86-
- name: Secure app accesses Microsoft Graph as the app
87-
href: scenario-secure-app-access-microsoft-graph-as-app.md
8893
- name: Clean up resources
8994
href: scenario-secure-app-clean-up-resources.md
9095
- name: Isolate network traffic

articles/applied-ai-services/form-recognizer/whats-new.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ NuGet package version 3.1.0-beta.4
345345

346346
* The client defaults to the latest supported service version, which is currently **2.1-preview.3**.
347347

348-
* **[StartRecognizeCustomForms](/dotnet/api/azure.ai.formrecognizer.formrecognizerclient.startrecognizecustomforms?view=azure-dotnet-preview&preserve-view=true#Azure_AI_FormRecognizer_FormRecognizerClient_StartRecognizeCustomForms_System_String_System_IO_Stream_Azure_AI_FormRecognizer_RecognizeCustomFormsOptions_System_Threading_CancellationToken_)** method now throws a `RequestFailedException()` when an invalid file is passed.
348+
* **[StartRecognizeCustomForms](/dotnet/api/azure.ai.formrecognizer.formrecognizerclient.startrecognizecustomforms?view=azure-dotnet-preview&preserve-view=true)** method now throws a `RequestFailedException()` when an invalid file is passed.
349349

350350
### [**Java**](#tab/java)
351351

@@ -391,9 +391,9 @@ npm package version 3.1.0-beta.3
391391

392392
* **New methods to analyze data from identity documents**:
393393

394-
**[beginRecognizeIdDocumentsFromUrl](/javascript/api/@azure/ai-form-recognizer/formrecognizerclient?view=azure-node-preview&preserve-view=true&branch=main#beginRecognizeIdDocumentsFromUrl_string__BeginRecognizeIdDocumentsOptions_)**
394+
**[azure-ai-form-recognizer-formrecognizerclient-beginrecognizeidentitydocumentsfromurl](/javascript/api/@azure/ai-form-recognizer/formrecognizerclient?view=azure-node-preview&preserve-view=true&branch=main#beginRecognizeIdDocumentsFromUrl_string__BeginRecognizeIdDocumentsOptions_)**
395395

396-
**[beginRecognizeIdDocuments](/javascript/api/@azure/ai-form-recognizer/formrecognizerclient?view=azure-node-preview&preserve-view=true&branch=main#beginRecognizeIdDocuments_FormRecognizerRequestBody__BeginRecognizeIdDocumentsOptions_)**
396+
**[beginRecognizeIdDocuments](/javascript/api/@azure/ai-form-recognizer/formrecognizerclient?view=azure-node-preview&preserve-view=true&branch=main#@azure-ai-form-recognizer-formrecognizerclient-beginrecognizeidentitydocuments)**
397397

398398
For a list of field values, _see_ [Fields extracted](./concept-id-document.md) in our Form Recognizer documentation.
399399

@@ -434,29 +434,29 @@ pip package version 3.1.0b4
434434

435435
* **New keyword argument `pages` supported by the following methods**:
436436

437-
**[begin_recognize_receipts](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true&branch=main#begin-recognize-receipts-receipt----kwargs-)**
437+
**[begin_recognize_receipts](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true&branch=main#azure-ai-formrecognizer-formrecognizerclient-begin-recognize-receipts)**
438438

439-
**[begin_recognize_receipts_from_url](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true#begin-recognize-receipts-from-url-receipt-url----kwargs-)**
439+
**[begin_recognize_receipts_from_url](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true#azure-ai-formrecognizer-formrecognizerclient-begin-recognize-receipts-from-url)**
440440

441-
**[begin_recognize_business_cards](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true#begin-recognize-business-cards-business-card----kwargs-)**
441+
**[begin_recognize_business_cards](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true#azure-ai-formrecognizer-formrecognizerclient-begin-recognize-business-cards)**
442442

443-
**[begin_recognize_business_cards_from_url](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true#begin-recognize-business-cards-from-url-business-card-url----kwargs-)**
443+
**[begin_recognize_business_cards_from_url](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true#azure-ai-formrecognizer-formrecognizerclient-begin-recognize-business-cards-from-url)**
444444

445-
**[begin_recognize_invoices](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true#begin-recognize-invoices-invoice----kwargs-)**
445+
**[begin_recognize_invoices](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true#azure-ai-formrecognizer-formrecognizerclient-begin-recognize-invoices)**
446446

447-
**[begin_recognize_invoices_from_url](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true#begin-recognize-invoices-from-url-invoice-url----kwargs-)**
447+
**[begin_recognize_invoices_from_url](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true#azure-ai-formrecognizer-formrecognizerclient-begin-recognize-invoices-from-url)**
448448

449-
**[begin_recognize_content](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true#begin-recognize-content-form----kwargs-)**
449+
**[begin_recognize_content](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true#azure-ai-formrecognizer-formrecognizerclient-begin-recognize-content)**
450450

451-
**[begin_recognize_content_from_url](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true#begin-recognize-content-from-url-form-url----kwargs-)**
451+
**[begin_recognize_content_from_url](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true#azure-ai-formrecognizer-formrecognizerclient-begin-recognize-content-from-url-)**
452452

453453
The `pages` keyword argument allows you to select individual or a range of pages for multi-page PDF and TIFF documents. For individual pages, enter the page number, for example, `3`. For a range of pages (like page 2 and pages 5-7) enter the page numbers and ranges separated by commas: `2, 5-7`.
454454

455455
* **New keyword argument `readingOrder` supported for the following methods**:
456456

457-
**[begin_recognize_content](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true#begin-recognize-content-form----kwargs-)**
457+
**[begin_recognize_content](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true#azure-ai-formrecognizer-formrecognizerclient-begin-recognize-content)**
458458

459-
**[begin_recognize_content_from_url](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true#begin-recognize-content-from-url-form-url----kwargs-)**
459+
**[begin_recognize_content_from_url](/python/api/azure-ai-formrecognizer/azure.ai.formrecognizer.formrecognizerclient?view=azure-python-preview&preserve-view=true#azure-ai-formrecognizer-formrecognizerclient-begin-recognize-content-from-url)**
460460

461461
The `readingOrder` keyword argument is an optional parameter that allows you to specify which reading order algorithm—`basic` or `natural`—should be applied to order the extraction of text elements. If not specified, the default value is `basic`.
462462

articles/azure-functions/durable/durable-functions-timers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.devlang: csharp, javascript, powershell, python
1111

1212
[Durable Functions](durable-functions-overview.md) provides *durable timers* for use in orchestrator functions to implement delays or to set up timeouts on async actions. Durable timers should be used in orchestrator functions instead of `Thread.Sleep` and `Task.Delay` (C#), or `setTimeout()` and `setInterval()` (JavaScript), or `time.sleep()` (Python).
1313

14-
You create a durable timer by calling the [`CreateTimer` (.NET)](/dotnet/api/microsoft.azure.webjobs.extensions.durabletask.idurableorchestrationcontext.createtimer), the [`createTimer` (JavaScript)](/javascript/api/durable-functions/durableorchestrationcontext#createTimer_Date_), or the [`create_timer` (Python)](/python/api/azure-functions-durable/azure.durable_functions.durableorchestrationcontext#create-timer-fire-at--datetime-datetime-----azure-durable-functions-models-task-task) method of the [orchestration trigger binding](durable-functions-bindings.md#orchestration-trigger). The method returns a task that completes on a specified date and time.
14+
You create a durable timer by calling the [`CreateTimer` (.NET)](/dotnet/api/microsoft.azure.webjobs.extensions.durabletask.idurableorchestrationcontext.createtimer), the [`createTimer` (JavaScript)](/javascript/api/durable-functions/durableorchestrationcontext#durable-functions-durableorchestrationcontext-createtimer), or the [`create_timer` (Python)](/python/api/azure-functions-durable/azure.durable_functions.durableorchestrationcontext#azure-durable-functions-durableorchestrationcontext-create-timer) method of the [orchestration trigger binding](durable-functions-bindings.md#orchestration-trigger). The method returns a task that completes on a specified date and time.
1515

1616
## Timer limitations
1717

articles/azure-monitor/containers/container-insights-onboard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ To enable Container insights, use one of the methods that's described in the fol
127127
| New Kubernetes cluster | [Create an AKS cluster by using the Azure CLI](../../aks/kubernetes-walkthrough.md#create-aks-cluster)| You can enable monitoring for a new AKS cluster that you create by using the Azure CLI. |
128128
| | [Create an AKS cluster by using Terraform](container-insights-enable-new-cluster.md#enable-using-terraform)| You can enable monitoring for a new AKS cluster that you create by using the open-source tool Terraform. |
129129
| | [Create an OpenShift cluster by using an Azure Resource Manager template](container-insights-azure-redhat-setup.md#enable-for-a-new-cluster-using-an-azure-resource-manager-template) | You can enable monitoring for a new OpenShift cluster that you create by using a preconfigured Azure Resource Manager template. |
130-
| | [Create an OpenShift cluster by using the Azure CLI](/cli/azure/openshift#az_openshift_create) | You can enable monitoring when you deploy a new OpenShift cluster by using the Azure CLI. |
130+
| | [Create an OpenShift cluster by using the Azure CLI](/cli/azure/openshift#az-openshift-create) | You can enable monitoring when you deploy a new OpenShift cluster by using the Azure CLI. |
131131
| Existing AKS cluster | [Enable monitoring of an AKS cluster by using the Azure CLI](container-insights-enable-existing-clusters.md#enable-using-azure-cli) | You can enable monitoring for an AKS cluster that's already deployed by using the Azure CLI. |
132132
| |[Enable for AKS cluster using Terraform](container-insights-enable-existing-clusters.md#enable-using-terraform) | You can enable monitoring for an AKS cluster that's already deployed by using the open-source tool Terraform. |
133133
| | [Enable for AKS cluster from Azure Monitor](container-insights-enable-existing-clusters.md#enable-from-azure-monitor-in-the-portal)| You can enable monitoring for one or more AKS clusters that are already deployed from the multi-cluster page in Azure Monitor. |

articles/azure-sql/azure-hybrid-benefit.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ To set or update the license type using PowerShell:
5454

5555
To set or update the license type using the Azure CLI:
5656

57-
- [az sql db create](/cli/azure/sql/db#az_sql_db_create) with the --license-type parameter
57+
- [az sql db create](/cli/azure/sql/db#az-sql-db-create) with the --license-type parameter
5858

5959
#### [REST API](#tab/rest)
6060

@@ -86,8 +86,8 @@ To set or update the license type using PowerShell:
8686

8787
To set or update the license type using the Azure CLI:
8888

89-
- [az sql mi create](/cli/azure/sql/mi#az_sql_mi_create) with the --license-type parameter
90-
- [az sql mi update](/cli/azure/sql/mi#az_sql_mi_update) with the --license-type parameter
89+
- [az sql mi create](/cli/azure/sql/mi#az-sql-mi-create) with the --license-type parameter
90+
- [az sql mi update](/cli/azure/sql/mi#az-sql-mi-update) with the --license-type parameter
9191

9292
#### [REST API](#tab/rest)
9393

articles/cognitive-services/Translator/translator-overview.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ keywords: translator, text translation, machine translation, translation service
1515
---
1616
# What is Translator?
1717

18-
:::image type="content" source="media/translator-icon.png" alt-text="Translator icon from the Azure portal.":::
19-
20-
Translator is a cloud-based neural machine translation service that is part of the [Azure Cognitive Services](../what-are-cognitive-services.md) family of REST APIs. Translator can be used with any operating system and powers many Microsoft products and services used by thousands of businesses worldwide to perform language translation and other language-related operations. In this overview, you'll learn how Translator can enable you to build intelligent, multi-language solutions for your applications across all [supported languages](./language-support.md).
18+
Translator is a cloud-based neural machine translation service that is part of the [Azure Cognitive Services](../what-are-cognitive-services.md) family of REST APIs. Translator can be used with any operating system and powers many Microsoft products and services used by thousands of businesses worldwide to perform language translation and other language-related operations. In this overview, you'll learn how Translator can enable you to build intelligent, multi-language solutions for your applications across all [supported languages](./language-support.md).
2119

2220
Translator documentation contains the following article types:
2321

articles/iot-hub/iot-hub-dev-guide-sas.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ HTTPS implements authentication by including a valid token in the **Authorizatio
220220
For example, Username (DeviceId is case-sensitive):
221221
`iothubname.azure-devices.net/DeviceId`
222222

223-
Password (You can generate a SAS token with the CLI extension command [az iot hub generate-sas-token](/cli/azure/iot/hub#az_iot_hub_generate_sas_token), or the [Azure IoT Tools for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-tools)):
223+
Password (You can generate a SAS token with the CLI extension command [az iot hub generate-sas-token](/cli/azure/iot/hub#az-iot-hub-generate-sas-token), or the [Azure IoT Tools for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-tools)):
224224

225225
`SharedAccessSignature sr=iothubname.azure-devices.net%2fdevices%2fDeviceId&sig=kPszxZZZZZZZZZZZZZZZZZAhLT%2bV7o%3d&se=1487709501`
226226

@@ -319,7 +319,7 @@ The result, which grants access to all functionality for device1, would be:
319319
`SharedAccessSignature sr=myhub.azure-devices.net%2fdevices%2fdevice1&sig=13y8ejUk2z7PLmvtwR5RqlGBOVwiq7rQR3WZ5xZX3N4%3D&se=1456971697`
320320

321321
> [!NOTE]
322-
> It's possible to generate a SAS token with the CLI extension command [az iot hub generate-sas-token](/cli/azure/iot/hub#az_iot_hub_generate_sas_token), or the [Azure IoT Tools for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-tools).
322+
> It's possible to generate a SAS token with the CLI extension command [az iot hub generate-sas-token](/cli/azure/iot/hub#az-iot-hub-generate-sas-token), or the [Azure IoT Tools for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-tools).
323323
324324
#### Use a shared access policy to access on behalf of a device
325325

0 commit comments

Comments
 (0)