Skip to content

Commit 798c41c

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 067850a + 23011dd commit 798c41c

File tree

156 files changed

+1080
-870
lines changed

Some content is hidden

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

156 files changed

+1080
-870
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14968,6 +14968,11 @@
1496814968
"redirect_url": "/azure/defender-for-iot/organizations/tutorial-qradar",
1496914969
"redirect_document_id": false
1497014970
},
14971+
{
14972+
"source_path_from_root": "/articles/iot-edge/how-to-devops-starter.md",
14973+
"redirect_url": "/azure/iot-edge/how-to-continuous-integration-continuous-deployment-classic/",
14974+
"redirect_document_id": false
14975+
},
1497114976
{
1497214977
"source_path_from_root": "/articles/ansible/index.yml",
1497314978
"redirect_url": "/azure/developer/ansible/",

articles/active-directory/authentication/how-to-certificate-based-authentication.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
title: How to configure Azure AD certificate-based authentication without federation (Preview) - Azure Active Directory
33
description: Topic that shows how to configure Azure AD certificate-based authentication in Azure Active Directory
44

5-
services: active-directory
65
ms.service: active-directory
76
ms.subservice: authentication
87
ms.topic: how-to
@@ -79,7 +78,7 @@ You can validate the crlDistributionPoint value you provide in the above PowerSh
7978

8079
The below table and graphic indicate how to map information from the CA Certificate to the attributes of the downloaded CRL.
8180

82-
| CA Certificate Info | |Downloaded CRL Info|
81+
| CA Certificate Info |= |Downloaded CRL Info|
8382
|----|:-:|----|
8483
|Subject |=|Issuer |
8584
|Subject Key Identifier |=|Authority Key Identifier (KeyID) |

articles/active-directory/develop/mark-app-as-publisher-verified.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.workload: identity
1111
ms.date: 09/27/2021
1212
ms.author: ryanwi
1313
ms.custom: aaddev
14-
ms.reviewer: jesakowi
14+
ms.reviewer: ardhanap, jesakowi
1515
---
1616

1717
# Mark your app as publisher verified

articles/active-directory/develop/publisher-verification-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.workload: identity
1111
ms.date: 06/01/2021
1212
ms.author: ryanwi
1313
ms.custom: aaddev
14-
ms.reviewer: jesakowi
14+
ms.reviewer: ardhanap, jesakowi
1515
---
1616

1717
# Publisher verification
@@ -58,7 +58,7 @@ There are a few pre-requisites for publisher verification, some of which will ha
5858

5959
- In Partner Center this user must have of the following [roles](/partner-center/permissions-overview): MPN Admin, Accounts Admin, or a Global Admin (this is a shared role mastered in Azure AD).
6060

61-
- The user performing verification must sign in using [multifactor authentication](../authentication/howto-mfa-getstarted.md).
61+
- The user performing verification must sign in using [multi-factor authentication](../authentication/howto-mfa-getstarted.md).
6262

6363
- The publisher agrees to the [Microsoft identity platform for developers Terms of Use](/legal/microsoft-identity-platform/terms-of-use).
6464

articles/active-directory/develop/troubleshoot-publisher-verification.md

Lines changed: 33 additions & 33 deletions
Large diffs are not rendered by default.

articles/aks/aks-resource-health.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ Resource Health receives signals for your managed cluster to determine the clust
4444

4545
- **Degraded**: When there is a health issue requiring your action, Resource Health reports your cluster as *Degraded*.
4646

47+
Note that the Resource Health for an AKS cluster is different than the Resource Health of its individual resources (*Virtual Machines, ScaleSet Instances, Load Balancer, etc...*).
4748
For additional details on what each health status indicates, visit [Resource Health overview](../service-health/resource-health-overview.md#health-status).
4849

4950
### View historical data
@@ -52,4 +53,4 @@ You can also view the past 30 days of historical Resource Health information in
5253

5354
## Next steps
5455

55-
Run checks on your cluster to further troubleshoot cluster issues by using [AKS Diagnostics](./concepts-diagnostics.md).
56+
Run checks on your cluster to further troubleshoot cluster issues by using [AKS Diagnostics](./concepts-diagnostics.md).

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ Custom models can be one of two types, [**custom template**](concept-custom-temp
2323

2424
### Custom template model
2525

26-
The custom template or custom form model relies on a consistent visual template to extract the labeled data. The accuracy of your model is affected by variances in the visual structure of your documents. Structured forms such as questionnaires or applications are examples of consistent visual templates. Your training set will consist of structured documents where the formatting and layout are static and constant from one document instance to the next. Custom template models support key-value pairs, selection marks, tables, signature fields and regions and can be trained on documents in any of the [supported languages](language-support.md). For more information, *see* [custom template models](concept-custom-template.md ).
26+
The custom template or custom form model relies on a consistent visual template to extract the labeled data. The accuracy of your model is affected by variances in the visual structure of your documents. Structured forms such as questionnaires or applications are examples of consistent visual templates.
27+
28+
Your training set will consist of structured documents where the formatting and layout are static and constant from one document instance to the next. Custom template models support key-value pairs, selection marks, tables, signature fields, and regions. Template models and can be trained on documents in any of the [supported languages](language-support.md). For more information, *see* [custom template models](concept-custom-template.md ).
2729

2830
> [!TIP]
2931
>
@@ -33,15 +35,15 @@ Custom models can be one of two types, [**custom template**](concept-custom-temp
3335
3436
### Custom neural model
3537

36-
The custom neural (custom document) model is a deep learning model type that relies on a base model trained on a large collection of documents. This model is then fine-tuned or adapted to your data when you train the model with a labeled dataset. Custom neural models support structured, semi-structured, and unstructured documents to extract fields. Custom neural models currently support English-language documents. When you're choosing between the two model types, start with a neural model if it meets your functional needs. See [neural models](concept-custom-neural.md) to learn more about custom document models.
38+
The custom neural (custom document) model uses deep learning models and base model trained on a large collection of documents. This model is then fine-tuned or adapted to your data when you train the model with a labeled dataset. Custom neural models support structured, semi-structured, and unstructured documents to extract fields. Custom neural models currently support English-language documents. When you're choosing between the two model types, start with a neural model if it meets your functional needs. See [neural models](concept-custom-neural.md) to learn more about custom document models.
3739

3840
## Build mode
3941

4042
The build custom model operation has added support for the *template* and *neural* custom models. Previous versions of the REST API and SDKs only supported a single build mode that is now known as the *template* mode.
4143

4244
* Template models only accept documents that have the same basic page structure—a uniform visual appearance—or the same relative positioning of elements within the document.
4345

44-
* Neural models support documents that have the same information, but different page structures. Examples of these documents include United States W2 forms, which share the same information, but may vary in appearance by the company that created the document. Neural models currently only support English text.
46+
* Neural models support documents that have the same information, but different page structures. Examples of these documents include United States W2 forms, which share the same information, but may vary in appearance across companies. Neural models currently only support English text.
4547

4648
This table provides links to the build mode programming language SDK references and code samples on GitHub:
4749

@@ -68,15 +70,15 @@ The table below compares custom template and custom neural features:
6870

6971
The following tools are supported by Form Recognizer v2.1:
7072

71-
| Feature | Resources |
72-
|----------|-------------------------|
73-
|Custom model| <ul><li>[Form Recognizer labeling tool](https://fott-2-1.azurewebsites.net)</li><li>[REST API](quickstarts/try-sdk-rest-api.md?pivots=programming-language-rest-api#analyze-forms-with-a-custom-model)</li><li>[Client library SDK](quickstarts/try-sdk-rest-api.md)</li><li>[Form Recognizer Docker container](containers/form-recognizer-container-install-run.md?tabs=custom#run-the-container-with-the-docker-compose-up-command)</li></ul>|
73+
| Feature | Resources | Model ID|
74+
|---|---|:---|
75+
|Custom model| <ul><li>[Form Recognizer labeling tool](https://fott-2-1.azurewebsites.net)</li><li>[REST API](quickstarts/try-sdk-rest-api.md?pivots=programming-language-rest-api#analyze-forms-with-a-custom-model)</li><li>[Client library SDK](quickstarts/try-sdk-rest-api.md)</li><li>[Form Recognizer Docker container](containers/form-recognizer-container-install-run.md?tabs=custom#run-the-container-with-the-docker-compose-up-command)</li></ul>|***custom-model-id***|
7476

7577
The following tools are supported by Form Recognizer v3.0:
7678

77-
| Feature | Resources |
78-
|----------|-------------|
79-
|Custom model| <ul><li>[Form Recognizer Studio](https://formrecognizer.appliedai.azure.com/studio/customform/projects)</li><li>[REST API](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-v3-0-preview-2/operations/AnalyzeDocument)</li><li>[C# SDK](quickstarts/try-v3-csharp-sdk.md)</li><li>[Python SDK](quickstarts/try-v3-python-sdk.md)</li></ul>|
79+
| Feature | Resources | Model ID|
80+
|---|---|:---|
81+
|Custom model| <ul><li>[Form Recognizer Studio](https://formrecognizer.appliedai.azure.com/studio/customform/projects)</li><li>[REST API](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-v3-0-preview-2/operations/AnalyzeDocument)</li><li>[C# SDK](quickstarts/try-v3-csharp-sdk.md)</li><li>[Python SDK](quickstarts/try-v3-python-sdk.md)</li></ul>|***custom-model-id***|
8082

8183
### Try Form Recognizer
8284

articles/applied-ai-services/form-recognizer/quickstarts/try-v3-csharp-sdk.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ Analyze and extract text, tables, structure, key-value pairs, and named entities
152152
> * We've added the file URI value to the `Uri fileUri` variable at the top of the script.
153153
> * For simplicity, all the entity fields that the service returns are not shown here. To see the list of all supported fields and corresponding types, see the [General document](../concept-general-document.md#named-entity-recognition-ner-categories) concept page.
154154
155-
### Add the following code to the Program.cs file:
155+
**Add the following code sample to the Program.cs file:**
156156

157157
```csharp
158158
using Azure;
@@ -268,7 +268,7 @@ for (int i = 0; i < result.Tables.Count; i++)
268268
### General document model output
269269

270270
Visit the Azure samples repository on GitHub to view the [general document model output](https://github.com/Azure-Samples/cognitive-services-quickstart-code/blob/master/dotnet/FormRecognizer/v3-csharp-sdk-general-document-output.md).
271-
271+
___
272272

273273
## Layout model
274274

@@ -280,7 +280,7 @@ Extract text, selection marks, text styles, table structures, and bounding regio
280280
> * We've added the file URI value to the `Uri fileUri` variable at the top of the script.
281281
> * To extract the layout from a given file at a URI, use the `StartAnalyzeDocumentFromUri` method and pass `prebuilt-layout` as the model ID. The returned value is an `AnalyzeResult` object containing data from the submitted document.
282282
283-
#### Add the following code to the Program.cs file:
283+
**Add the following code sample to the Program.cs file:**
284284

285285
```csharp
286286
using Azure;
@@ -383,7 +383,7 @@ Analyze and extract common fields from specific document types using a prebuilt
383383
> * To analyze a given file at a URI, use the `StartAnalyzeDocumentFromUri` method and pass `prebuilt-invoice` as the model ID. The returned value is an `AnalyzeResult` object containing data from the submitted document.
384384
> * For simplicity, all the key-value pairs that the service returns are not shown here. To see the list of all supported fields and corresponding types, see our [Invoice](../concept-invoice.md#field-extraction) concept page.
385385
386-
#### Add the following code to your Program.cs file:
386+
**Add the following code sample to your Program.cs file:**
387387

388388
```csharp
389389

0 commit comments

Comments
 (0)